diff options
| author | unknown <istruewing@stella.local> | 2007-12-11 17:09:43 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-12-11 17:09:43 +0100 |
| commit | cd34354e6c8d86d19fb397912d98803254bebaaf (patch) | |
| tree | 3d24c8f4f0325ffc59ec0c65b251a86363351a4d /sql/sql_insert.cc | |
| parent | 9e5ed26076c1999f4437eca4a7ef133962f2e30f (diff) | |
| parent | 36486ee86c8ba3eddeaed752e5e0c87498502058 (diff) | |
| download | mariadb-git-cd34354e6c8d86d19fb397912d98803254bebaaf.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-amain
into stella.local:/home2/mydev/mysql-5.0-axmrg
mysql-test/r/func_misc.result:
Manual merge
mysql-test/t/func_misc.test:
Manual merge
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; /* |