Commit 913d34fd authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  linux.site:/home/reggie/work/mysql-5.1-bug16718
parents 9a8432a2 03c2cc07

mysql-test/include/have_partition.inc

+1 −1
Original line number Diff line number Diff line 
-- require r/have_partition.require

disable_query_log;

show variables like "have_partition_engine";

show variables like "have_partitioning";

enable_query_log;

mysql-test/r/have_partition.require

+1 −1
Original line number Diff line number Diff line 
Variable_name	Value

have_partition_engine	YES
 
have_partitioning	YES

sql/set_var.cc

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ sys_var_have_variable sys_have_innodb("have_innodb", &have_innodb); 
sys_var_have_variable sys_have_isam("have_isam", &have_isam);

sys_var_have_variable sys_have_ndbcluster("have_ndbcluster", &have_ndbcluster);

sys_var_have_variable sys_have_openssl("have_openssl", &have_openssl);

sys_var_have_variable sys_have_partition_db("have_partition_engine",

sys_var_have_variable sys_have_partition_db("have_partitioning",

                                            &have_partition_db);

sys_var_have_variable sys_have_query_cache("have_query_cache",

                                           &have_query_cache);