From d08e5cfad2161784bb40682a81a161f768a3ff22 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Dec 2010 09:48:30 +0100 Subject: [PATCH] Fix problems seen in Buildbot: - Make sure creation of t1 is replicated before trying to create trigger on it on slave - Use safe #ifdef for declaration as for definition to avoid warning about unused static function. --- mysql-test/extra/rpl_tests/rpl_auto_increment.test | 1 + sql/set_var.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mysql-test/extra/rpl_tests/rpl_auto_increment.test b/mysql-test/extra/rpl_tests/rpl_auto_increment.test index 06e3a154bc3..8d2f6c32233 100644 --- a/mysql-test/extra/rpl_tests/rpl_auto_increment.test +++ b/mysql-test/extra/rpl_tests/rpl_auto_increment.test @@ -251,6 +251,7 @@ connection master; CREATE TABLE t1(s VARCHAR(10)) ENGINE=myisam; # -slave.opt has --replicate-ignore-table=test.t_ignored1 CREATE TABLE t_ignored1(id INT AUTO_INCREMENT PRIMARY KEY) ENGINE=myisam; +sync_slave_with_master; connection slave; diff --git a/sql/set_var.cc b/sql/set_var.cc index 3270976e6a0..b9bd68747d3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -128,7 +128,9 @@ static void fix_net_write_timeout(THD *thd, enum_var_type type); static void fix_net_retry_count(THD *thd, enum_var_type type); static void fix_max_join_size(THD *thd, enum_var_type type); static void fix_query_cache_size(THD *thd, enum_var_type type); +#ifdef HAVE_QUERY_CACHE static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type); +#endif static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type); static void fix_max_binlog_size(THD *thd, enum_var_type type); static void fix_max_relay_log_size(THD *thd, enum_var_type type);