com php-src: MNDR - enum_mysqlnd_protocol_type -> e num_mysqlnd_session_protocol_type: ext/mysqlnd/mysq lnd_enum_n_def.h ext/mysqlnd/mysqlnd_structs.h
| From: | Andrey Hristov | Date: | Thu, 12 Nov 2015 15:19:16 +0000 |
| Subject: | com php-src: MNDR - enum_mysqlnd_protocol_type -> e num_mysqlnd_session_protocol_type: ext/mysqlnd/mysq lnd_enum_n_def.h ext/mysqlnd/mysqlnd_structs.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89829@lists.php.net to get a copy of this message | ||
Commit: 4c83582c74f1a553e19635d0b2880d5120fde5ef
Author: Andrey Hristov <andrey@php.net> Fri, 2 Oct 2015 14:56:27 +0200
Parents: 3091a01799634681b52bc859684656c376b5fadd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c83582c74f1a553e19635d0b2880d5120fde5ef
Log:
MNDR
- enum_mysqlnd_protocol_type -> enum_mysqlnd_session_protocol_type
Changed paths:
M ext/mysqlnd/mysqlnd_enum_n_def.h
M ext/mysqlnd/mysqlnd_structs.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def..h
index 8ec6ef7..8f4bc06 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -234,7 +234,7 @@ typedef enum mysqlnd_client_option
MYSQLND_OPT_AUTH_PROTOCOL = 211
} enum_mysqlnd_client_option;
-typedef enum mysqlnd_protocol_type
+typedef enum mysqlnd_session_protocol_type
{
MYSQL_PROTOCOL_DEFAULT = 0,
MYSQL_PROTOCOL_TCP, /* all, supported */
@@ -242,7 +242,7 @@ typedef enum mysqlnd_protocol_type
MYSQL_PROTOCOL_PIPE, /* win32, not-supported */
MYSQL_PROTOCOL_MEMORY, /* win32, not-supported */
MYSQL_PROTOCOL_LAST
-} enum_mysqlnd_protocol_type;
+} enum_mysqlnd_session_protocol_type;
typedef enum mysqlnd_field_types
{
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 7738b3c..fd3e6e5 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -179,7 +179,7 @@ typedef struct st_mysqlnd_session_options
char * unused2;
char * unused3;
- enum_mysqlnd_protocol_type protocol;
+ enum_mysqlnd_session_protocol_type protocol;
char *charset_name;
/* maximum allowed packet size for communication */