Commit c1bc964a authored by unknown's avatar unknown
Browse files

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
parents bbaa4ea8 b692ca4f

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
			packet, (uint) (pend-packet), thd->charset());

    table_list.alias= table_list.real_name= conv_name.str;

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

      break;

    mysql_log.write(thd,command,"%s %s",table_list.real_name,fields);