archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.4' into PHP-5.5

Browse source
This commit is contained in:
Andrey Hristov 2014-01-28 15:33:16 +02:00
commit 6b77c3aaa1
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mysqlnd/mysqlnd_enum_n_def.h
View file

@ -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,

3
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -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"
};
/* }}} */