Merge mysql.com:/home/kostja/work/mysql-4.0-6761

into mysql.com:/home/kostja/work/mysql-4.1-root


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2005-01-12 19:00:04 +03:00
commit c1bc964a8e

View File

@ -1547,7 +1547,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
packet, (uint) (pend-packet), thd->charset()); packet, (uint) (pend-packet), thd->charset());
table_list.alias= table_list.real_name= conv_name.str; table_list.alias= table_list.real_name= conv_name.str;
packet= pend+1; packet= pend+1;
// command not cachable => no gap for data base name thd->query_length= strlen(packet); // for simplicity: don't optimize
if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1))) if (!(thd->query=fields=thd->memdup(packet,thd->query_length+1)))
break; break;
mysql_log.write(thd,command,"%s %s",table_list.real_name,fields); mysql_log.write(thd,command,"%s %s",table_list.real_name,fields);