diff options
author | Andrey Hristov <andrey@php.net> | 2014-01-28 15:38:14 +0200 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2014-01-28 15:38:14 +0200 |
commit | c1141d43e907d4d8927f60e7ec9d79ab6aabde65 (patch) | |
tree | a7b76c88e406eae77f1648b1956164d6066b5563 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
parent | a63c0950330997361a082bd35c9e62a70417ec66 (diff) | |
parent | 6b77c3aaa1f0c546980c49f1c4095569fac45009 (diff) | |
download | php-git-c1141d43e907d4d8927f60e7ec9d79ab6aabde65.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 3 |
1 files changed, 2 insertions, 1 deletions
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" }; /* }}} */ |