diff options
| author | Michael Widenius <monty@mysql.com> | 2009-11-16 17:34:08 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-11-16 17:34:08 +0200 |
| commit | 815b9fedefa59b2807a5736b60a89c5ed98178d1 (patch) | |
| tree | 159eca1f4fe3a921cdcb33f25eca32fa6271e094 /sql/sql_delete.cc | |
| parent | 9dfe197da96e89994b598edd76dd0c3e8b5d2e0c (diff) | |
| download | mariadb-git-815b9fedefa59b2807a5736b60a89c5ed98178d1.tar.gz | |
Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t
Don't retry test cases by default
Fixed bug where we could (under unlikely error conditions) access not initialized variable
include/my_tree.h:
Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t
(Pointed out by Bryan Aker)
mysql-test/mysql-test-run.pl:
Don't retry test cases by default
This makes it too easy to miss failures and we have anyway to fix race conditions, not ignore them.
mysys/tree.c:
Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t
sql/sql_delete.cc:
Fixed bug where we could (under unlikely error conditions) access not initialized variable.
(Pointed out by Bryan Aker)
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 8a5afa8da17..096f176ef4a 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1073,8 +1073,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) /* If it is a temporary table, close and regenerate it */ if (!dont_send_ok && (table= find_temporary_table(thd, table_list))) { - handlerton *table_type= table->s->db_type(); TABLE_SHARE *share= table->s; + handlerton *table_type= share->db_type(); if (!ha_check_storage_engine_flag(table_type, HTON_CAN_RECREATE)) goto trunc_by_del; @@ -1088,7 +1088,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) if ((error= (int) !(open_temporary_table(thd, share->path.str, share->db.str, share->table_name.str, 1)))) - (void) rm_temporary_table(table_type, path); + (void) rm_temporary_table(table_type, share->path.str); else thd->thread_specific_used= TRUE; |