mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with MySQL 5.1.47

Browse source 
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
This commit is contained in:
Michael Widenius 2010-05-26 21:55:40 +03:00
commit 4aa9d903c1
309 changed files with 7466 additions and 5067 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_parse.cc
View file

@ -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));