diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-11-27 18:20:24 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-11-27 18:20:24 -0700 |
commit | 08fc358542509a63e04eb544885d03f10c576a22 (patch) | |
tree | 9162f72dd22e4223cb1b3da255a9e1e53e07632a /sql/sql_base.cc | |
parent | 312e5e82c0b17983bc3ac43b50fac891cccf0ea2 (diff) | |
download | mariadb-git-08fc358542509a63e04eb544885d03f10c576a22.tar.gz |
fixed alias drop bug in binlog
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.
mysql-test/r/rpl000016.result:
updated test result
mysql-test/t/rpl000013.test:
test alias bug
mysql-test/t/rpl000016.test:
test for proper skip when the user messes up
sql/slave.cc:
proper skip even when the user goofs up
sql/sql_base.cc:
drop real name, not last used alias in the log
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 70dc2ed058d..656758623bc 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -527,10 +527,10 @@ void close_temporary_tables(THD *thd) if (query) // we might be out of memory, but this is not fatal { // skip temporary tables not created directly by the user - if (table->table_name[0] != '#') + if (table->real_name[0] != '#') { end = strxmov(end,table->table_cache_key,".", - table->table_name,",", NullS); + table->real_name,",", NullS); // here we assume table_cache_key always starts // with \0 terminated db name found_user_tables = 1; |