diff options
| author | lars@mysql.com <> | 2005-10-10 21:52:50 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-10-10 21:52:50 +0200 |
| commit | bef189cc4ec6f040d3feeb4cf485bff4aeb0a640 (patch) | |
| tree | 5a1a21a5548ff1d9ed4beb5b2b3b788adb77c9df /sql | |
| parent | 3d0082d3b01b355d81549cb7339e0a7f09f6fe69 (diff) | |
| parent | 5456afc60366b33d8ddce8ae5e491ba2d41caed1 (diff) | |
| download | mariadb-git-bef189cc4ec6f040d3feeb4cf485bff4aeb0a640.tar.gz | |
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/users/lthalmann/bkroot/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 999fc792229..88718f6c8c9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3208,6 +3208,7 @@ end_with_restore_list: if ((res= mysql_multi_update_prepare(thd))) break; +#ifdef HAVE_REPLICATION /* Check slave filtering rules */ if (thd->slave_thread && all_tables_not_ok(thd, all_tables)) { @@ -3215,6 +3216,7 @@ end_with_restore_list: my_error(ER_SLAVE_IGNORED_TABLE, MYF(0)); break; } +#endif /* HAVE_REPLICATION */ res= mysql_multi_update(thd, all_tables, &select_lex->item_list, |