database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Split setup_fields to setup_tables and setup_fields

Browse Source 
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
This commit is contained in:
unknown
2001-03-21 20:13:46 +02:00
parent 6257ee7613
commit 4b56b0ee43
11 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_insert.cc
View File

@@ -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;