diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 11:13:05 -0700 |
| commit | d95ec59726ad44cc26bee2e32c9bffa0052b0a51 (patch) | |
| tree | 66e0033b6a729fa25769f98640f7ec7b1bfc719f /sql/sql_parse.cc | |
| parent | 241e25389f99fa5a536ac3a0bb50d269ec637f07 (diff) | |
| parent | 7648e3bc3c3dd27f97b878760938f748499fd378 (diff) | |
| download | mariadb-git-d95ec59726ad44cc26bee2e32c9bffa0052b0a51.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
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 195a7a4f525..06335b36284 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 |