diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-07-02 15:02:21 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-07-27 19:00:54 +0200 |
| commit | c7c7755e0de494ef8e898708c5b13c6f7abf24ee (patch) | |
| tree | 205ebf6ea2f25a88ba768245b748a8d8d2634a07 /sql/sql_parse.cc | |
| parent | 41535a435dff427252cf56abe07f69a356cdcb38 (diff) | |
| download | mariadb-git-10.2-MDEV-9114.tar.gz | |
Separate command removed.10.2-MDEV-9114
Default value indicator for INSERT added.
Bugs fixed.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 27dcdd713d6..7780755a5fe 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -394,7 +394,7 @@ const LEX_STRING command_name[257]={ { 0, 0 }, //250 { 0, 0 }, //251 { 0, 0 }, //252 - { C_STRING_WITH_LEN("Execute_bulk") }, //253 + { 0, 0 }, //253 { C_STRING_WITH_LEN("Com_multi") }, //254 { C_STRING_WITH_LEN("Error") } // Last command number 255 }; @@ -1731,12 +1731,12 @@ bool dispatch_command(enum enum_server_command command, THD *thd, } case COM_STMT_EXECUTE: { - mysqld_stmt_execute(thd, packet, packet_length); - break; - } - case COM_STMT_BULK_EXECUTE: - { - mysqld_stmt_bulk_execute(thd, packet, packet_length); + ulong iterations= uint4korr(packet + 5); + if (iterations < 2 || + (thd->client_capabilities & MARIADB_CLIENT_STMT_BULK_OPERATIONS)) + mysqld_stmt_execute(thd, packet, packet_length); + else + mysqld_stmt_bulk_execute(thd, packet, packet_length); break; } case COM_STMT_FETCH: |