diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-17 01:52:33 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-17 01:52:33 +0200 |
| commit | 7b6b03f340320c60ab3d14e30814c05680f692ed (patch) | |
| tree | 774c48a5f290d9837d859f1703fb2e9a8953733b /sql/sql_insert.cc | |
| parent | 709356d47343af2951cdcd02419c71fc49c35f85 (diff) | |
| parent | 271b11b3d902996ff518bb3741bb62e70c97029e (diff) | |
| download | mariadb-git-7b6b03f340320c60ab3d14e30814c05680f692ed.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.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 6ed3dca63e3..ccb8296b929 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -84,7 +84,7 @@ check_insert_fields(THD *thd,TABLE *table,List<Item> &fields, table_list.grant=table->grant; thd->dupp_field=0; - if (setup_tables(&table_list, 0) || + if (setup_tables(&table_list) || setup_fields(thd, 0, &table_list,fields,1,0,0)) return -1; if (thd->dupp_field) @@ -204,7 +204,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, } if (check_insert_fields(thd,table,fields,*values,1) || - setup_tables(insert_table_list, 0) || + setup_tables(insert_table_list) || setup_fields(thd, 0, insert_table_list, *values, 0, 0, 0) || (duplic == DUP_UPDATE && (setup_fields(thd, 0, insert_table_list, update_fields, 0, 0, 0) || |