diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-10-11 16:51:26 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-10-11 16:51:26 +0300 |
| commit | 8da8c60d0d852d4839ffd09ba209b3e39eb26280 (patch) | |
| tree | 42df249e9614dd14386d5978fd4435aa03db2d13 /sql/wsrep_mysqld.cc | |
| parent | 37b3d9447733e7e69db71bcd4a64de81caa9bc6b (diff) | |
| download | mariadb-git-8da8c60d0d852d4839ffd09ba209b3e39eb26280.tar.gz | |
Fix temporary table search
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 5fa6385f224..8a04c5cfd79 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -859,14 +859,11 @@ static bool wsrep_prepare_keys_for_isolation(THD* thd, ka->keys_len= 0; extern TABLE* find_temporary_table(THD*, const TABLE_LIST*); + extern TABLE* find_temporary_table(THD*, const char *, const char *); if (db || table) { - TABLE_LIST tmp_table; - bzero((char*) &tmp_table,sizeof(tmp_table)); - tmp_table.table_name= (char*)db; - tmp_table.db= (char*)table; - if (!table || !find_temporary_table(thd, &tmp_table)) + if (!table || !find_temporary_table(thd, db, table)) { if (!(ka->keys= (wsrep_key_t*)my_malloc(sizeof(wsrep_key_t), MYF(0)))) { @@ -898,7 +895,7 @@ static bool wsrep_prepare_keys_for_isolation(THD* thd, { wsrep_key_t* tmp; tmp= (wsrep_key_t*)my_realloc( - ka->keys, (ka->keys_len + 1) * sizeof(wsrep_key_t), + ka->keys, (ka->keys_len + 1) * sizeof(wsrep_key_t), MYF(MY_ALLOW_ZERO_PTR)); if (!tmp) { |