mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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
This commit is contained in:
@@ -174,7 +174,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
|
||||
thd->proc_info="init";
|
||||
thd->used_tables=0; // Updated by setup_fields
|
||||
|
||||
if (setup_fields(thd,tables,fields,1,&all_fields) ||
|
||||
if (setup_tables(tables) ||
|
||||
setup_fields(thd,tables,fields,1,&all_fields) ||
|
||||
setup_conds(thd,tables,&conds) ||
|
||||
setup_order(thd,tables,fields,all_fields,order) ||
|
||||
setup_group(thd,tables,fields,all_fields,group,&hidden_group_fields) ||
|
||||
|
||||
Reference in New Issue
Block a user