From 3c1b5f54f0ff74c564c8f41bc14c2775772cb9ca Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 19:08:27 +0100 Subject: [PATCH 1/7] bug#7626 - ndb - non portable uint_ptr ndb/include/ndb_types.h: redo UintPtr handling using SIZEOF_CHARP ndb/test/tools/Makefile.am: remove unused defines --- ndb/include/ndb_types.h | 28 ++++++++++------------------ ndb/test/tools/Makefile.am | 1 - 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index 0d603cc2ab3..ea820df19a1 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -30,31 +30,23 @@ typedef unsigned int Uint32; typedef unsigned int UintR; -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#else -#include -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_INTTYPES_H -#include -#endif -#if defined(WIN32) || defined(NDB_WIN32) -typedef Uint32 UintPtr; -#else -typedef uintptr_t UintPtr; -#endif -#endif - #if defined(WIN32) || defined(NDB_WIN32) typedef unsigned __int64 Uint64; typedef signed __int64 Int64; -typedef UintPtr ssize_t; #else typedef unsigned long long Uint64; typedef signed long long Int64; #endif +#ifdef __SIZE_TYPE__ +typedef __SIZE_TYPE__ UintPtr; +#else +#if SIZEOF_CHARP == 4 +typedef Uint32 UintPtr; +#else +typedef Uint64 UintPtr; +#endif +#endif + #endif diff --git a/ndb/test/tools/Makefile.am b/ndb/test/tools/Makefile.am index 6b5e127b03d..873136e254d 100644 --- a/ndb/test/tools/Makefile.am +++ b/ndb/test/tools/Makefile.am @@ -3,7 +3,6 @@ ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hug # transproxy -hugoCalculator_SOURCES = hugoCalculator.cpp hugoFill_SOURCES = hugoFill.cpp hugoLoad_SOURCES = hugoLoad.cpp hugoLockRecords_SOURCES = hugoLockRecords.cpp From e197fa459d331be2027aa7ce8e4bf61a9da4f4f7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 19:39:09 +0100 Subject: [PATCH 2/7] bug#7626 - ndb UintPtr handling ndb/include/ndb_types.h: redo UintPtr handling --- ndb/include/ndb_types.h | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index 0d603cc2ab3..1284ace3bbc 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -30,31 +30,22 @@ typedef unsigned int Uint32; typedef unsigned int UintR; -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#else -#include -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_INTTYPES_H -#include -#endif -#if defined(WIN32) || defined(NDB_WIN32) -typedef Uint32 UintPtr; -#else -typedef uintptr_t UintPtr; -#endif -#endif - #if defined(WIN32) || defined(NDB_WIN32) typedef unsigned __int64 Uint64; typedef signed __int64 Int64; -typedef UintPtr ssize_t; #else typedef unsigned long long Uint64; typedef signed long long Int64; #endif +#ifdef __SIZE_TYPE__ +typedef __SIZE_TYPE__ UintPtr; +#else +#if SIZEOF_CHARP == 4 +typedef Uint32 UintPtr; +#else +typedef Uint64 UintPtr; +#endif +#endif #endif From 2bcaed348d59fb00b82bddf9284e7d70e87b5622 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 21:04:33 +0200 Subject: [PATCH 3/7] Better handling of ensuring that setup_tables() are not called twice This fixed a bug in prepared statements when used with outher joins Fixed a bug in SUM(DISTINCT) when used with prepared statements. Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests mysql-test/r/mysqldump.result: Safety fix if a previous test would fail mysql-test/r/show_check.result: Safety fix if a previous test would fail mysql-test/r/sp.result: Fix for --ps-protocol mysql-test/r/synchronization.result: Safety fix if a previous test would fail mysql-test/r/system_mysql_db.result: Safety fix if a previous test would fail mysql-test/t/mysqldump.test: Safety fix if a previous test would fail mysql-test/t/select.test: Safety fix if a previous test would fail mysql-test/t/show_check.test: Safety fix if a previous test would fail mysql-test/t/sp.test: fix for --ps-protocol mysql-test/t/strict.test: Fix for --ps-protocol mysql-test/t/synchronization.test: Safety fix if a previous test would fail mysql-test/t/system_mysql_db.test: Safety fix if a previous test would fail sql/item_sum.cc: Fix bug in SUM(DISTINCT...) when using with prepared statements sql/item_sum.h: Fix bug in SUM(DISTINCT...) when using with prepared statements sql/mysql_priv.h: Better handling of ensuring that setup_tables() are not called twice sql/sql_base.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_insert.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_parse.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_prepare.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_select.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_union.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_update.cc: Better handling of ensuring that setup_tables() are not called twice sql/table.h: Better handling of ensuring that setup_tables() are not called twice --- mysql-test/r/mysqldump.result | 2 +- mysql-test/r/show_check.result | 1 + mysql-test/r/sp.result | 7 ++----- mysql-test/r/synchronization.result | 1 + mysql-test/r/system_mysql_db.result | 1 + mysql-test/t/mysqldump.test | 2 +- mysql-test/t/select.test | 2 +- mysql-test/t/show_check.test | 1 + mysql-test/t/sp.test | 8 ++++++-- mysql-test/t/strict.test | 2 +- mysql-test/t/synchronization.test | 7 ++++++- mysql-test/t/system_mysql_db.test | 5 +++++ sql/item_sum.cc | 14 ++++++++------ sql/item_sum.h | 3 ++- sql/mysql_priv.h | 7 +++++-- sql/sql_base.cc | 4 ---- sql/sql_insert.cc | 6 ------ sql/sql_parse.cc | 9 +++++---- sql/sql_prepare.cc | 27 +++++++++++++++------------ sql/sql_select.cc | 19 +++++++++++++------ sql/sql_union.cc | 12 ++++++++++-- sql/sql_update.cc | 6 ++---- sql/table.h | 1 - 23 files changed, 87 insertions(+), 60 deletions(-) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 74f4a30a2b8..cea0733766e 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1,4 +1,4 @@ -DROP TABLE IF EXISTS t1, `"t"1`; +DROP TABLE IF EXISTS t1, `"t"1`, t1aa,t2aa; drop database if exists mysqldump_test_db; CREATE TABLE t1(a int); INSERT INTO t1 VALUES (1), (2); diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 4955dec12aa..aa2f83ee2b8 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1,4 +1,5 @@ drop table if exists t1,t2; +drop table if exists t1aa,t2aa; drop database if exists mysqltest; delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; delete from mysql.db where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index d480d5a3f2e..1fd519bc729 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -1639,12 +1639,9 @@ yz,yz drop procedure bug3368| drop table t3| drop table if exists t3| -create table t3 (f1 int, f2 int); -insert into t3 values (1,1); ---disable_warnings| +create table t3 (f1 int, f2 int)| +insert into t3 values (1,1)| drop procedure if exists bug4579_1| -Warnings: -Note 1305 PROCEDURE bug4579_1 does not exist create procedure bug4579_1 () begin declare sf1 int; diff --git a/mysql-test/r/synchronization.result b/mysql-test/r/synchronization.result index ad9443c86da..0b84697066c 100644 --- a/mysql-test/r/synchronization.result +++ b/mysql-test/r/synchronization.result @@ -1,3 +1,4 @@ +drop table if exists t1; CREATE TABLE t1 (x1 int); ALTER TABLE t1 CHANGE x1 x2 int; CREATE TABLE t2 LIKE t1; diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 2bc96136778..a012f300139 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -1,3 +1,4 @@ +drop table if exists t1,t1aa,t2aa; show tables; Tables_in_db columns_priv diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index cbefc2f0f7a..4b74dcbe1fb 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1,5 +1,5 @@ --disable_warnings -DROP TABLE IF EXISTS t1, `"t"1`; +DROP TABLE IF EXISTS t1, `"t"1`, t1aa,t2aa; drop database if exists mysqldump_test_db; --enable_warnings diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index e548aba29fe..85a5f6d0ee1 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -9,7 +9,7 @@ --disable_warnings drop table if exists t1,t2,t3,t4; # The following may be left from older tests -drop table if exists t1_1,t1_2,t9_1,t9_2; +drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa; drop view if exists v1; --enable_warnings diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 9646de56832..ae58e2fa5e4 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -4,6 +4,7 @@ --disable_warnings drop table if exists t1,t2; +drop table if exists t1aa,t2aa; drop database if exists mysqltest; delete from mysql.user where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 5261267b58e..5f912622101 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -945,10 +945,12 @@ insert into t2 values (append("xxx", "yyy"), mul(4,3), e())| insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))| # These don't work yet. +--disable_ps_protocol select * from t2 where s = append("a", "b")| select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2)| select * from t2 where d = e()| select * from t2| +--enable_ps_protocol delete from t2| drop function e| @@ -1263,8 +1265,10 @@ end| call rc()| select row_count()| +--disable_ps_protocol update t1 set data=42 where id = "b"; select row_count()| +--enable_ps_protocol delete from t1| select row_count()| delete from t1| @@ -2022,8 +2026,8 @@ drop table t3| --disable_warnings drop table if exists t3| --enable_warnings -create table t3 (f1 int, f2 int); -insert into t3 values (1,1); +create table t3 (f1 int, f2 int)| +insert into t3 values (1,1)| --disable_warnings drop procedure if exists bug4579_1| diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test index 42d5ca5e8e1..4711934b9fd 100644 --- a/mysql-test/t/strict.test +++ b/mysql-test/t/strict.test @@ -557,7 +557,7 @@ INSERT IGNORE INTO t1 (col1) values (1/0); INSERT IGNORE INTO t1 VALUES (+1.9E+309,-1.9E+309); INSERT IGNORE INTO t1 VALUES ('+2.0E+309','-2.0E+309'); # stupid... ---replace_result -0 0 +--replace_result -0 0 1.7976931348623e+308 1.79769313486232e+308 SELECT * FROM t1; DROP TABLE t1; diff --git a/mysql-test/t/synchronization.test b/mysql-test/t/synchronization.test index 7bdeaa8a740..09324b32b97 100644 --- a/mysql-test/t/synchronization.test +++ b/mysql-test/t/synchronization.test @@ -1,7 +1,12 @@ # -# Test for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table +# Test for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination +# table # +--disable_warnings +drop table if exists t1; +--enable_warnings + connect (con1,localhost,root,,); connect (con2,localhost,root,,); diff --git a/mysql-test/t/system_mysql_db.test b/mysql-test/t/system_mysql_db.test index a6d683489c3..acd19f47728 100644 --- a/mysql-test/t/system_mysql_db.test +++ b/mysql-test/t/system_mysql_db.test @@ -2,6 +2,11 @@ # This test must examine integrity of system database "mysql" # +# First delete some tables maybe left over from previous tests +--disable_warnings +drop table if exists t1,t1aa,t2aa; +--enable_warnings + -- disable_query_log use mysql; -- enable_query_log diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 92c91b2e866..1c005cf60a9 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -303,12 +303,6 @@ Item_sum_sum_distinct::Item_sum_sum_distinct(THD *thd, } -Item_sum_sum_distinct::~Item_sum_sum_distinct() -{ - delete tree; -} - - Item * Item_sum_sum_distinct::copy_or_same(THD *thd) { @@ -356,6 +350,14 @@ void Item_sum_sum_distinct::clear() tree->reset(); } +void Item_sum_sum_distinct::cleanup() +{ + Item_sum_num::cleanup(); + delete tree; + tree= 0; +} + + bool Item_sum_sum_distinct::add() { /* args[0]->val_real() may reset args[0]->null_value */ diff --git a/sql/item_sum.h b/sql/item_sum.h index 157791722f6..68899268b31 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -167,10 +167,11 @@ private: Item_sum_sum_distinct(THD *thd, Item_sum_sum_distinct *item); public: Item_sum_sum_distinct(Item *item_par); - ~Item_sum_sum_distinct(); + ~Item_sum_sum_distinct() {} bool setup(THD *thd); void clear(); + void cleanup(); bool add(); double val_real(); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 88260bb7b1b..c5568bf52a4 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -248,6 +248,8 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; #define OPTION_RELAXED_UNIQUE_CHECKS (1L << 27) #define SELECT_NO_UNLOCK (1L << 28) #define OPTION_SCHEMA_TABLE (1L << 29) +/* Flag set if setup_tables already done */ +#define OPTION_SETUP_TABLES_DONE (1L << 30) /* The rest of the file is included in the server only */ #ifndef MYSQL_CLIENT @@ -565,7 +567,8 @@ int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, List &fields, List &all_fields, ORDER *order, bool *hidden_group_fields); -bool handle_select(THD *thd, LEX *lex, select_result *result); +bool handle_select(THD *thd, LEX *lex, select_result *result, + ulong setup_tables_done_option); bool mysql_select(THD *thd, Item ***rref_pointer_array, TABLE_LIST *tables, uint wild_num, List &list, COND *conds, uint og_num, ORDER *order, ORDER *group, @@ -578,7 +581,7 @@ bool mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit, int mysql_explain_select(THD *thd, SELECT_LEX *sl, char const *type, select_result *result); bool mysql_union(THD *thd, LEX *lex, select_result *result, - SELECT_LEX_UNIT *unit); + SELECT_LEX_UNIT *unit, ulong setup_tables_done_option); int mysql_handle_derived(LEX *lex, int (*processor)(THD *thd, LEX *lex, TABLE_LIST *table)); diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4d34ce425b1..b6510e53679 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2794,10 +2794,6 @@ bool setup_tables(THD *thd, TABLE_LIST *tables, Item **conds, TABLE_LIST *first_select_table= (select_insert ? tables->next_local: 0); - if (!tables || tables->setup_is_done) - DBUG_RETURN(0); - tables->setup_is_done= 1; - if (!(*leaves)) make_leaves_list(leaves, tables); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 41cc6ebf101..701ffe60cb3 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1735,12 +1735,6 @@ bool mysql_insert_select_prepare(THD *thd) &lex->select_lex.where, TRUE)) DBUG_RETURN(TRUE); - /* - setup was done in mysql_prepare_insert_check_table, but we have to mark - first local table - */ - if (first_select_table) - first_select_table->setup_is_done= 1; /* exclude first table from leaf tables list, because it belong to INSERT diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 096d6fa8e45..9ebeb9fe06d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2212,7 +2212,7 @@ mysql_execute_command(THD *thd) if (!result && !(result= new select_send())) goto error; query_cache_store_query(thd, all_tables); - res= handle_select(thd, lex, result); + res= handle_select(thd, lex, result, 0); if (result != lex->result) delete result; } @@ -2635,7 +2635,7 @@ mysql_execute_command(THD *thd) and item_list belong to SELECT */ select_lex->resolve_mode= SELECT_LEX::SELECT_MODE; - res=handle_select(thd, lex, result); + res= handle_select(thd, lex, result, 0); select_lex->resolve_mode= SELECT_LEX::NOMATTER_MODE; delete result; } @@ -3005,7 +3005,7 @@ create_error: and item_list belong to SELECT */ lex->select_lex.resolve_mode= SELECT_LEX::SELECT_MODE; - res= handle_select(thd, lex, result); + res= handle_select(thd, lex, result, OPTION_SETUP_TABLES_DONE); lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE; delete result; } @@ -3092,7 +3092,8 @@ create_error: 0, (ORDER *)NULL, (ORDER *)NULL, (Item *)NULL, (ORDER *)NULL, select_lex->options | thd->options | - SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK, + SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK | + OPTION_SETUP_TABLES_DONE, result, unit, select_lex); delete result; } diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 0a35b2dda8a..9a47a3b8953 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1106,7 +1106,11 @@ static int mysql_test_select(Prepared_statement *stmt, thd->used_tables= 0; // Updated by setup_fields - // JOIN::prepare calls + /* + JOIN::prepare calls + It is not SELECT COMMAND for sure, so setup_tables will be called as + usual, and we pass 0 as setup_tables_done_option + */ if (unit->prepare(thd, 0, 0)) { goto err_prep; @@ -1239,7 +1243,8 @@ error: */ static bool select_like_statement_test(Prepared_statement *stmt, TABLE_LIST *tables, - bool (*specific_prepare)(THD *thd)) + bool (*specific_prepare)(THD *thd), + ulong setup_tables_done_option) { DBUG_ENTER("select_like_statement_test"); THD *thd= stmt->thd; @@ -1258,7 +1263,7 @@ static bool select_like_statement_test(Prepared_statement *stmt, thd->used_tables= 0; // Updated by setup_fields // JOIN::prepare calls - if (lex->unit.prepare(thd, 0, 0)) + if (lex->unit.prepare(thd, 0, setup_tables_done_option)) { res= TRUE; } @@ -1298,7 +1303,7 @@ static int mysql_test_create_table(Prepared_statement *stmt) select_lex->item_list.elements) { select_lex->resolve_mode= SELECT_LEX::SELECT_MODE; - res= select_like_statement_test(stmt, tables, 0); + res= select_like_statement_test(stmt, tables, 0, 0); select_lex->resolve_mode= SELECT_LEX::NOMATTER_MODE; } @@ -1333,7 +1338,8 @@ static bool mysql_test_multiupdate(Prepared_statement *stmt, here we do not pass tables for opening, tables will be opened and locked by mysql_multi_update_prepare */ - return select_like_statement_test(stmt, 0, &mysql_multi_update_prepare); + return select_like_statement_test(stmt, 0, &mysql_multi_update_prepare, + OPTION_SETUP_TABLES_DONE); } @@ -1362,7 +1368,8 @@ static int mysql_test_multidelete(Prepared_statement *stmt, if ((res= multi_delete_precheck(stmt->thd, tables, &fake_counter))) return res; if ((res= select_like_statement_test(stmt, tables, - &mysql_multi_delete_prepare))) + &mysql_multi_delete_prepare, + OPTION_SETUP_TABLES_DONE))) return res; if (!tables->table) { @@ -1415,7 +1422,8 @@ static int mysql_test_insert_select(Prepared_statement *stmt, and item_list belong to SELECT */ lex->select_lex.resolve_mode= SELECT_LEX::SELECT_MODE; - res= select_like_statement_test(stmt, tables, &mysql_insert_select_prepare); + res= select_like_statement_test(stmt, tables, &mysql_insert_select_prepare, + OPTION_SETUP_TABLES_DONE); /* revert changes*/ lex->select_lex.table_list.first= (byte*) first_local_table; lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE; @@ -1770,11 +1778,6 @@ void reset_stmt_for_execute(THD *thd, LEX *lex) for (order= (ORDER *)sl->order_list.first; order; order= order->next) order->item= &order->item_ptr; } - { - TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first; - if (tables) - tables->setup_is_done= 0; - } { SELECT_LEX_UNIT *unit= sl->master_unit(); unit->unclean(); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ced26d7567b..6d0504802db 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -206,18 +206,24 @@ static void add_group_and_distinct_keys(JOIN *join, JOIN_TAB *join_tab); This handles SELECT with and without UNION */ -bool handle_select(THD *thd, LEX *lex, select_result *result) +bool handle_select(THD *thd, LEX *lex, select_result *result, + ulong setup_tables_done_option) { bool res; register SELECT_LEX *select_lex = &lex->select_lex; DBUG_ENTER("handle_select"); if (select_lex->next_select()) - res= mysql_union(thd, lex, result, &lex->unit); + res= mysql_union(thd, lex, result, &lex->unit, setup_tables_done_option); else { SELECT_LEX_UNIT *unit= &lex->unit; unit->set_limit(unit->global_parameters, select_lex); + /* + 'options' of mysql_select will be set in JOIN, as far as JOIN for + every PS/SP execution new, we will not need reset this flag if + setup_tables_done_option changed for next rexecution + */ res= mysql_select(thd, &select_lex->ref_pointer_array, (TABLE_LIST*) select_lex->table_list.first, select_lex->with_wild, select_lex->item_list, @@ -228,7 +234,8 @@ bool handle_select(THD *thd, LEX *lex, select_result *result) (ORDER*) select_lex->group_list.first, select_lex->having, (ORDER*) lex->proc_list.first, - select_lex->options | thd->options, + select_lex->options | thd->options | + setup_tables_done_option, result, unit, select_lex); } DBUG_PRINT("info",("res: %d report_error: %d", res, @@ -311,8 +318,9 @@ JOIN::prepare(Item ***rref_pointer_array, /* Check that all tables, fields, conds and order are ok */ - if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, - FALSE, FALSE) || + if ((!(select_options & OPTION_SETUP_TABLES_DONE) && + setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, + FALSE, FALSE)) || setup_wild(thd, tables_list, fields_list, &all_fields, wild_num) || select_lex->setup_ref_array(thd, og_num) || setup_fields(thd, (*rref_pointer_array), tables_list, fields_list, 1, @@ -1082,7 +1090,6 @@ JOIN::reinit() /* conds should not be used here, it is added just for safety */ if (tables_list) { - tables_list->setup_is_done= 0; if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, TRUE, FALSE)) DBUG_RETURN(1); diff --git a/sql/sql_union.cc b/sql/sql_union.cc index d0a33163a38..012a26a6f4d 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -25,11 +25,12 @@ #include "sql_select.h" bool mysql_union(THD *thd, LEX *lex, select_result *result, - SELECT_LEX_UNIT *unit) + SELECT_LEX_UNIT *unit, ulong setup_tables_done_option) { DBUG_ENTER("mysql_union"); bool res; - if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK))) + if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK | + setup_tables_done_option))) res= unit->exec(); if (!res && thd->cursor && thd->cursor->is_open()) { @@ -210,6 +211,13 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, JOIN *join= new JOIN(thd_arg, sl->item_list, sl->options | thd_arg->options | additional_options, tmp_result); + /* + setup_tables_done_option should be set only for very first SELECT, + because it protect from secont setup_tables call for select-like non + select commands (DELETE/INSERT/...) and they use only very first + SELECT (for union it can be only INSERT ... SELECT). + */ + additional_options&= ~OPTION_SETUP_TABLES_DONE; if (!join) goto err; diff --git a/sql/sql_update.cc b/sql/sql_update.cc index d10c54f6fab..4d30ffbda9b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -771,9 +771,6 @@ bool mysql_multi_update_prepare(THD *thd) for (TABLE_LIST *tbl= table_list; tbl; tbl= tbl->next_global) tbl->cleanup_items(); - /* undone setup_tables() */ - table_list->setup_is_done= 0; - if (setup_tables(thd, table_list, &lex->select_lex.where, &lex->select_lex.leaf_tables, FALSE, FALSE) || (lex->select_lex.no_wrap_view_item= 1, @@ -842,7 +839,8 @@ bool mysql_multi_update(THD *thd, total_list, conds, 0, (ORDER *) NULL, (ORDER *)NULL, (Item *) NULL, (ORDER *)NULL, - options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK, + options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK | + OPTION_SETUP_TABLES_DONE, result, unit, select_lex); delete result; thd->abort_on_warning= 0; diff --git a/sql/table.h b/sql/table.h index 404ca762615..391b4908f96 100644 --- a/sql/table.h +++ b/sql/table.h @@ -369,7 +369,6 @@ typedef struct st_table_list /* used in multi-upd/views privilege check */ bool table_in_first_from_clause; bool skip_temporary; /* this table shouldn't be temporary */ - bool setup_is_done; /* setup_tables() is done */ /* TRUE if this merged view contain auto_increment field */ bool contain_auto_increment; /* FRMTYPE_ERROR if any type is acceptable */ From 9ecd9ac6b984f999b89a62fae782e1d6f277495a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 20:10:23 +0100 Subject: [PATCH 4/7] bug#7626 - post review version ndb/include/ndb_global.h.in: move types into ndb_global.h.in Check sizeof of Uint8, Uint32 & Uint64 ndb/include/ndb_types.h: move types into ndb_global.h.in --- ndb/include/ndb_global.h.in | 36 ++++++++++++++++++++++++++++++++++++ ndb/include/ndb_types.h | 27 +-------------------------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index aefb319730c..cadbb8cabf2 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -16,12 +16,48 @@ #define HAVE_STRCASECMP #define strcasecmp _strcmpi #pragma warning(disable: 4503 4786) +typedef unsigned __int64 Uint64; +typedef signed __int64 Int64; #else #undef NDB_WIN32 #define DIR_SEPARATOR "/" +typedef unsigned long long Uint64; +typedef signed long long Int64; #endif #include + +typedef signed char Int8; +typedef unsigned char Uint8; +typedef signed short Int16; +typedef unsigned short Uint16; +typedef signed int Int32; +typedef unsigned int Uint32; + +typedef unsigned int UintR; + +#ifdef __SIZE_TYPE__ +typedef __SIZE_TYPE__ UintPtr; +#elif SIZEOF_CHARP == 4 +typedef Uint32 UintPtr; +#elif SIZEOF_CHARP == 8 +typedef Uint64 UintPtr; +#else +#error "Unknown size of (char *)" +#endif + +#if ! (SIZEOF_CHAR == 1) +#error "Invalid define for Uint8" +#endif + +#if ! (SIZEOF_INT == 4) +#error "Invalid define for Uint32" +#endif + +#if ! (SIZEOF_LONG_LONG == 8) +#error "Invalid define for Uint64" +#endif + #include #ifdef _AIX diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index 1284ace3bbc..6cf9bb40d7f 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -21,31 +21,6 @@ #ifndef NDB_TYPES_H #define NDB_TYPES_H -typedef signed char Int8; -typedef unsigned char Uint8; -typedef signed short Int16; -typedef unsigned short Uint16; -typedef signed int Int32; -typedef unsigned int Uint32; - -typedef unsigned int UintR; - -#if defined(WIN32) || defined(NDB_WIN32) -typedef unsigned __int64 Uint64; -typedef signed __int64 Int64; -#else -typedef unsigned long long Uint64; -typedef signed long long Int64; -#endif - -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#else -#if SIZEOF_CHARP == 4 -typedef Uint32 UintPtr; -#else -typedef Uint64 UintPtr; -#endif -#endif +#include "ndb_global.h" #endif From 386f1f35fac71a0366f124a19f3e0ec7f86229a0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 22:16:54 +0200 Subject: [PATCH 5/7] fixed reporting error --- sql/sql_prepare.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 9a47a3b8953..4b6f1bd79fe 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1043,6 +1043,7 @@ static int mysql_test_delete(Prepared_statement *stmt, if (!open_and_lock_tables(thd, table_list)) { + bool res; if (!table_list->table) { DBUG_ASSERT(table_list->view && @@ -1052,9 +1053,9 @@ static int mysql_test_delete(Prepared_statement *stmt, DBUG_RETURN(-1); } - mysql_prepare_delete(thd, table_list, &lex->select_lex.where); + res= mysql_prepare_delete(thd, table_list, &lex->select_lex.where); lex->unit.cleanup(); - DBUG_RETURN(FALSE); + DBUG_RETURN(res); } /* TODO: here we should send types of placeholders to the client. */ DBUG_RETURN(TRUE); From d474247d1fd6386a20281f24c18b3949f4696684 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 21:27:17 +0100 Subject: [PATCH 6/7] sync0sync.h, sync0rw.h: Fix Bug#7624 innobase/include/sync0rw.h: Fix Bug#7624 innobase/include/sync0sync.h: Fix Bug#7624 --- innobase/include/sync0rw.h | 3 +-- innobase/include/sync0sync.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/innobase/include/sync0rw.h b/innobase/include/sync0rw.h index bcf0749e05d..911c8ac3f4a 100644 --- a/innobase/include/sync0rw.h +++ b/innobase/include/sync0rw.h @@ -61,8 +61,7 @@ Creates, or rather, initializes an rw-lock object in a specified memory location (which must be appropriately aligned). The rw-lock is initialized to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free is necessary only if the memory block containing it is freed. */ -#define rw_lock_create(L) rw_lock_create_func(\ - (L), __FILE__, __LINE__, __STRING(L)) +#define rw_lock_create(L) rw_lock_create_func((L), __FILE__, __LINE__, #L) /*=====================*/ /********************************************************************** diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h index 600b12a5385..e9b343ba8a6 100644 --- a/innobase/include/sync0sync.h +++ b/innobase/include/sync0sync.h @@ -37,7 +37,7 @@ location (which must be appropriately aligned). The mutex is initialized in the reset state. Explicit freeing of the mutex with mutex_free is necessary only if the memory block containing it is freed. */ -#define mutex_create(M) mutex_create_func((M), __FILE__, __LINE__, __STRING(M)) +#define mutex_create(M) mutex_create_func((M), __FILE__, __LINE__, #M) /*===================*/ /********************************************************************** Creates, or rather, initializes a mutex object in a specified memory From 3cd62d82fc25d13e0582e95df9186fcbd8d5fb8c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jan 2005 22:58:29 +0100 Subject: [PATCH 7/7] merge error --- ndb/include/ndb_types.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index b6f34fabee5..6cf9bb40d7f 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -23,14 +23,4 @@ #include "ndb_global.h" -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#else -#if SIZEOF_CHARP == 4 -typedef Uint32 UintPtr; -#else -typedef Uint64 UintPtr; -#endif -#endif - #endif