diff options
| author | unknown <monty@mysql.com> | 2005-01-03 21:04:33 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-03 21:04:33 +0200 |
| commit | a1a4c2c647d4eb16c90561aaa614303fa0d8609e (patch) | |
| tree | ca151e2a0c44dc6a1c8ca642907f92d7be53c489 /sql/sql_insert.cc | |
| parent | b7b3275b00137e1d572d9328d6a6312e9a220c19 (diff) | |
| download | mariadb-git-a1a4c2c647d4eb16c90561aaa614303fa0d8609e.tar.gz | |
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
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 0 insertions, 6 deletions
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 @@ -1736,12 +1736,6 @@ bool mysql_insert_select_prepare(THD *thd) 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 */ |