diff options
| author | unknown <monty@tik.mysql.fi> | 2001-03-21 20:13:46 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-03-21 20:13:46 +0200 |
| commit | 4b56b0ee43843dae2f5503718bd851f8debbd561 (patch) | |
| tree | 9acce646cec7017f770114fcd46d65bd4d8e0bf9 /sql/sql_insert.cc | |
| parent | 6257ee7613836c397bda6c3533ca4a114d60e045 (diff) | |
| download | mariadb-git-4b56b0ee43843dae2f5503718bd851f8debbd561.tar.gz | |
Split setup_fields to setup_tables and setup_fields
Fixed problem with UPDATE TABLE when keys wheren't always used.
Docs/manual.texi:
Added comment to ALTER TABLE
scripts/mysql_install_db.sh:
Added test for mysqld in libexec
sql/ha_innobase.cc:
Removed compiler warning
sql/mysql_priv.h:
Split setup_fields to setup_tables and setup_fields
sql/sql_base.cc:
Split setup_fields to setup_tables and setup_fields
sql/sql_insert.cc:
Split setup_fields to setup_tables and setup_fields
sql/sql_load.cc:
Split setup_fields to setup_tables and setup_fields
sql/sql_parse.cc:
Fixed missing 'mysql_info" with now clients.
sql/sql_select.cc:
Split setup_fields to setup_tables and setup_fields
sql/sql_update.cc:
Fixed problem with UPDATE TABLE when keys wheren't always used.
sql/sql_yacc.yy:
Small isolation change
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e92c5255ef8..192dd3898b3 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -78,7 +78,7 @@ check_insert_fields(THD *thd,TABLE *table,List<Item> &fields, table_list.grant=table->grant; thd->dupp_field=0; - if (setup_fields(thd,&table_list,fields,1,0)) + if (setup_tables(&table_list) || setup_fields(thd,&table_list,fields,1,0)) return -1; if (thd->dupp_field) { @@ -151,7 +151,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, save_time_stamp=table->time_stamp; values= its++; if (check_insert_fields(thd,table,fields,*values,1) || - setup_fields(thd,table_list,*values,0,0)) + setup_tables(table_list) || setup_fields(thd,table_list,*values,0,0)) { table->time_stamp=save_time_stamp; goto abort; @@ -168,7 +168,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, table->time_stamp=save_time_stamp; goto abort; } - if (setup_fields(thd,table_list,*values,0,0)) + if (setup_tables(table_list) || setup_fields(thd,table_list,*values,0,0)) { table->time_stamp=save_time_stamp; goto abort; |