diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 08:24:52 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-29 08:24:52 +0400 |
| commit | b8a60e6ba313be103490bb498afbd5afdf8e15c2 (patch) | |
| tree | 69c45e51b5ad646cfafebd6892cd0541e4a558c3 /sql/sql_insert.cc | |
| parent | 7991e6a61dac3dd741e25712d51701b1c6537cc7 (diff) | |
| parent | 503755256d9bb4c07a4f0fd62cec5de64c7ae21a (diff) | |
| download | mariadb-git-b8a60e6ba313be103490bb498afbd5afdf8e15c2.tar.gz | |
Merge mysql.com:/home/ram/work/mysql-5.0-engines
into mysql.com:/home/ram/work/b32676/b32676.5.0
mysql-test/r/delayed.result:
Auto merged
mysql-test/t/delayed.test:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 65d8bb23706..7273fbf74e3 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -585,7 +585,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, bool log_on= (thd->options & OPTION_BIN_LOG) || (!(thd->security_ctx->master_access & SUPER_ACL)); #endif - thr_lock_type lock_type = table_list->lock_type; + thr_lock_type lock_type; Item *unused_conds= 0; DBUG_ENTER("mysql_insert"); @@ -620,6 +620,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(TRUE); } + lock_type= table_list->lock_type; thd->proc_info="init"; thd->used_tables=0; @@ -637,7 +638,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, /* mysql_prepare_insert set table_list->table if it was not set */ table= table_list->table; - lock_type= table_list->lock_type; context= &thd->lex->select_lex.context; /* |