MNDR

- enum_mysqlnd_protocol_type -> enum_mysqlnd_session_protocol_type

diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 8ec6ef7235ae90d2ec74a1db77363b7a719f7eb9..8f4bc06ef7ae5c1cad2046e1c223cca3b946858d 100644 (file)
--- 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 7738b3cbfa9dac1d873a88a3d523a2f8c5751a75..fd3e6e51d13f1e83bd3d3aef98894dfd463f5385 100644 (file)
--- 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 */