database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  linux.site:/home/reggie/work/mysql-5.1-bug16718
This commit is contained in:
reggie@linux.site
2006-01-23 22:13:12 -06:00
parent 5ea8f304bf c5f2f9180f
commit 631b9af2be
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/have_partition.inc
View File

@ -1,4 +1,4 @@
-- require r/have_partition.require -- require r/have_partition.require
disable_query_log; disable_query_log;
show variables like "have_partition_engine"; show variables like "have_partitioning";
enable_query_log; enable_query_log;

2
mysql-test/r/have_partition.require
View File

@ -1,2 +1,2 @@
Variable_name Value Variable_name Value
have_partition_engine YES have_partitioning YES

2
sql/set_var.cc
View File

@ -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_isam("have_isam", &have_isam);
sys_var_have_variable sys_have_ndbcluster("have_ndbcluster", &have_ndbcluster); 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_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); &have_partition_db);
sys_var_have_variable sys_have_query_cache("have_query_cache", sys_var_have_variable sys_have_query_cache("have_query_cache",
&have_query_cache); &have_query_cache);