Merge branch 'PHP-5.4' into PHP-5.5

faizshukri · faizshukri · commit 6b77c3aaa1f0 · 2014-01-28T15:33:16.000+02:00
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -561,6 +561,10 @@ enum mysqlnd_packet_type
 };
 
 
+/*
+  After adding new elements please update
+  `mysqlnd_command_to_text` in mysqlnd_wireprotocol.c
+*/
 enum php_mysqlnd_server_command
 {
 	COM_SLEEP = 0,
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -90,7 +90,8 @@ const char * const mysqlnd_command_to_text[COM_END] =
   "TIME", "DELAYED_INSERT", "CHANGE_USER", "BINLOG_DUMP",
   "TABLE_DUMP", "CONNECT_OUT", "REGISTER_SLAVE",
   "STMT_PREPARE", "STMT_EXECUTE", "STMT_SEND_LONG_DATA", "STMT_CLOSE",
-  "STMT_RESET", "SET_OPTION", "STMT_FETCH", "DAEMON"
+  "STMT_RESET", "SET_OPTION", "STMT_FETCH", "DAEMON", "BINLOG_DUMP_GTID",
+  "RESET_CONNECTION"
 };
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,10 @@ enum mysqlnd_packet_type`
`561`	`561`	`};`
`562`	`562`
`563`	`563`
	`564`	`+/*`
	`565`	`+ After adding new elements please update`
	`566`	+ `mysqlnd_command_to_text` in mysqlnd_wireprotocol.c
	`567`	`+*/`
`564`	`568`	`enum php_mysqlnd_server_command`
`565`	`569`	`{`
`566`	`570`	`COM_SLEEP = 0,`