diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-08-02 11:54:35 +0400 |
| commit | 53fb954ddefdddc5484626fc9392e2f3d557eabc (patch) | |
| tree | 6d923a32bd3804ae141bd4559c52d2b112b9dd34 /sql/sql_insert.cc | |
| parent | 8625a873d2ee555cd8abe8903183b51f3a355c40 (diff) | |
| parent | 3468b55a215d1c4b489dbb925f19176e12c9f242 (diff) | |
| download | mariadb-git-53fb954ddefdddc5484626fc9392e2f3d557eabc.tar.gz | |
5.1 -> 5.5 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 d2118a16566..5dc2a7e2abb 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -717,7 +717,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, lock_type= table_list->lock_type; thd_proc_info(thd, "init"); - thd->used_tables=0; + thd->lex->used_tables=0; values= its++; value_count= values->elements; @@ -872,7 +872,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, } else { - if (thd->used_tables) // Column used in values() + if (thd->lex->used_tables) // Column used in values() restore_record(table,s->default_values); // Get empty record else { |