diff options
| author | Andrey Hristov <andrey@php.net> | 2014-01-28 15:33:16 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-01-28 15:33:16 +0200 |
| commit | 6b77c3aaa1f0c546980c49f1c4095569fac45009 (patch) | |
| tree | 1920ffa7f13588c37fabc21ac585f406ffc5d68b | |
| parent | a87125c1e8cf98c3b6f5296de136d466ae3cdb9f (diff) | |
| parent | 79cbcd9ded58824ab40378c469bf91878a226281 (diff) | |
| download | php-git-6b77c3aaa1f0c546980c49f1c4095569fac45009.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/mysqlnd/mysqlnd_enum_n_def.h | 4 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 1b88105a64..5511db433a 100644 --- 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 index d78d29a2f1..df9dde592a 100644 --- 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" }; /* }}} */ |