diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-17 01:14:51 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-17 01:14:51 +0200 |
| commit | 54d93c41530655ef0d50c2654c80fd12d13ea8d9 (patch) | |
| tree | a619c58eaa61934c229e4af77c6ea8c60678beb5 /sql/sql_update.cc | |
| parent | e8b6456f25656d339bb4f2bb64272679fa4f42d1 (diff) | |
| download | mariadb-git-54d93c41530655ef0d50c2654c80fd12d13ea8d9.tar.gz | |
ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure
mysql-test/r/union.result:
fix for union test becuase now not all fields in UNION allow NULLS
fix of test
test suite for BUG#2809
mysql-test/t/union.test:
test suite for BUG#2809
sql/mysql_priv.h:
removed unused parameter of setup_tables()
sql/sql_base.cc:
removed unused parameter of setup_tables()
cleanup of unused code
sql/sql_class.h:
removed unused field
sql/sql_help.cc:
removed unused parameter of setup_tables()
sql/sql_insert.cc:
removed unused parameter of setup_tables()
sql/sql_lex.cc:
excluded duplicate tables finding for UNION
sql/sql_load.cc:
removed unused parameter of setup_tables()
sql/sql_olap.cc:
removed unused parameter of setup_tables()
sql/sql_prepare.cc:
removed unused parameter of setup_tables()
sql/sql_select.cc:
removed unused parameter of setup_tables()
revert old BUG#2508 patch
sql/sql_union.cc:
revert old BUG#2508 patch
removed unused code
sql/sql_update.cc:
removed unused parameter of setup_tables()
sql/table.h:
shared used only for multi-update for now
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index df7b2cf809f..b228cfad9bb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -94,7 +94,7 @@ int mysql_update(THD *thd, tables.table= table; tables.alias= table_list->alias; - if (setup_tables(update_table_list, 0) || + if (setup_tables(update_table_list) || setup_conds(thd,update_table_list,&conds) || thd->lex->select_lex.setup_ref_array(thd, order_num) || setup_order(thd, thd->lex->select_lex.ref_pointer_array, |