diff options
author | unknown <konstantin@mysql.com> | 2005-01-12 19:00:04 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-01-12 19:00:04 +0300 |
commit | c1bc964a8e7473f9a090260cf3cad90fa58e5310 (patch) | |
tree | 24a1fc4da336027d41125e3f946d4c0c9ed2e9ef | |
parent | bbaa4ea8e719a5a8b1d3c576dbb06cde1f104866 (diff) | |
parent | b692ca4fd5e8a455e408178ecb49d87a3a83f7f1 (diff) | |
download | mariadb-git-c1bc964a8e7473f9a090260cf3cad90fa58e5310.tar.gz |
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
-rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index cd8e73c446d..2b273f4b84c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); |