diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-25 23:29:01 -0700 |
| commit | c3cc5856a5d9ee8fa3d01207613f961ae110b2cd (patch) | |
| tree | a230abbd46e3341756e3e5629a69736b6a057239 /sql/sql_parse.cc | |
| parent | 80db9fb3c95519383bbae73aa8cfc0773bf7c40f (diff) | |
| download | mariadb-git-c3cc5856a5d9ee8fa3d01207613f961ae110b2cd.tar.gz | |
Fixed temp tables to work with replication. It will not work if you stop the slave
while slave thread has temp tables - not hard to fix though, but it is time to go to bed
added a new test case for temp table replication and Slave_open_temp_tables
status variable.
Misc fixes
client/mysqltest.c:
added disconnect command
mysql-test/create-test-result:
fixed bugs so it actually works
mysql-test/t/include/master-slave.inc:
establish alternate connections to master and slave
sql/mysql_priv.h:
Slave_open_temp_tables
sql/mysqlbinlog.cc:
fixed a bug in reading local binlogs
sql/mysqld.cc:
added Slave_open_temp_tables status variable
sql/slave.cc:
fixed freed memory reference in the error message
sql/sql_class.cc:
slave_proxy_id
sql/sql_class.h:
slave_proxy_id
sql/sql_parse.cc:
small optimization - reorder eval in &&
BitKeeper/etc/ignore:
Added mysql-test/r/3.23/rpl000001.b.result.reject mysql-test/r/3.23/rpl000012.result.reject to the ignore list
sql/sql_table.cc:
added THD arg to rename_temporary_table
sql/unireg.h:
the table_cache_key is now 4 bytes longer
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8e9584bc9d7..531b1f39840 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -860,7 +860,7 @@ mysql_execute_command(void) TABLE_LIST *tables=(TABLE_LIST*) lex->table_list.first; DBUG_ENTER("mysql_execute_command"); - if(thd->slave_thread && table_rules_on && tables && !tables_ok(thd,tables)) + if(table_rules_on && thd->slave_thread && tables && !tables_ok(thd,tables)) DBUG_VOID_RETURN; // skip if we are in the slave thread, some table // rules have been given and the table list says the query should not be // replicated |