diff options
| author | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
| commit | f11b934a7d387be27c51134197234fbbcdb05034 (patch) | |
| tree | f466a4f954ca82d8aae5e4d3ab0a985e7fdce2f7 /sql/sql_insert.cc | |
| parent | 0ebd63dea225081254e0d127822c421317dd56c6 (diff) | |
| parent | 3feab771aa2d30a04666a2a92392f2c467f5b5a2 (diff) | |
| download | mariadb-git-f11b934a7d387be27c51134197234fbbcdb05034.tar.gz | |
merge with 4.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
include/mysql_com.h:
Merge
sql/filesort.cc:
merge
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e08838886ae..5741804bdae 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -948,7 +948,8 @@ public: thd.current_tablenr=0; thd.version=refresh_version; thd.command=COM_DELAYED_INSERT; - thd.lex->current_select= 0; /* for my_message_sql */ + thd.lex->current_select= 0; // for my_message_sql + thd.lex->sql_command= SQLCOM_INSERT; // For innodb::store_lock() bzero((char*) &thd.net, sizeof(thd.net)); // Safety bzero((char*) &table_list, sizeof(table_list)); // Safety |