diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
| commit | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (patch) | |
| tree | af3f0dfb833c3c4aabaa69ce50cfb64202ecd479 /sql/sql_parse.cc | |
| parent | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (diff) | |
| parent | af6d89a6aa9feb3545de068f461cf91bfb281dd2 (diff) | |
| download | mariadb-git-4aa9d903c11554cc4887eeffe7f0592c52e8bc99.tar.gz | |
Merge with MySQL 5.1.47
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb
configure.in:
Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not anymore locked in init
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a93c7467c8c..8256842e456 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1309,7 +1309,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, TABLE_LIST table_list; char db_buff[NAME_LEN+1]; uint32 db_length; - uint dummy_errors; + uint dummy_errors, query_length; /* used as fields initializator */ lex_start(thd); @@ -1320,11 +1320,12 @@ bool dispatch_command(enum enum_server_command command, THD *thd, break; /* We have name + wildcard in packet, separated by endzero + (The packet is guaranteed to end with an end zero) */ wildcard= strend(packet); db_length= wildcard - packet; wildcard++; - uint query_length= (uint) (packet_end - wildcard); // Don't count end \0 + query_length= (uint) (packet_end - wildcard); // Don't count end \0 if (db_length > NAME_LEN || query_length > NAME_LEN) { my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0)); |