From 54d93c41530655ef0d50c2654c80fd12d13ea8d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Feb 2004 01:14:51 +0200 Subject: 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 --- sql/sql_olap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_olap.cc') diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index efc4cf0921d..026ddbae7c7 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -152,7 +152,7 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex) List all_fields(select_lex->item_list); - if (setup_tables((TABLE_LIST *)select_lex->table_list.first, 0) || + if (setup_tables((TABLE_LIST *)select_lex->table_list.first) || setup_fields(lex->thd, 0, (TABLE_LIST *)select_lex->table_list.first, select_lex->item_list, 1, &all_fields,1) || setup_fields(lex->thd, 0, (TABLE_LIST *)select_lex->table_list.first, -- cgit v1.2.1