summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <reggie@linux.site>2006-01-23 22:13:12 -0600
committerunknown <reggie@linux.site>2006-01-23 22:13:12 -0600
commit913d34fd51dba757cffff3f8790cfe536190a002 (patch)
tree0686e6995b2ddcfde9c9318004fcb5e165c7f207 /mysql-test
parent9a8432a2a794c8cc32aa01d7afe1d4d38d692390 (diff)
parent03c2cc072bb6a74631faa7a12ebab91aac0c1a72 (diff)
downloadmariadb-git-913d34fd51dba757cffff3f8790cfe536190a002.tar.gz
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into linux.site:/home/reggie/work/mysql-5.1-bug16718
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/have_partition.inc2
-rw-r--r--mysql-test/r/have_partition.require2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/have_partition.inc b/mysql-test/include/have_partition.inc
index 4b663c71c19..898b9c51773 100644
--- a/mysql-test/include/have_partition.inc
+++ b/mysql-test/include/have_partition.inc
@@ -1,4 +1,4 @@
-- require r/have_partition.require
disable_query_log;
-show variables like "have_partition_engine";
+show variables like "have_partitioning";
enable_query_log;
diff --git a/mysql-test/r/have_partition.require b/mysql-test/r/have_partition.require
index 8fdd98032c2..324c04eed6f 100644
--- a/mysql-test/r/have_partition.require
+++ b/mysql-test/r/have_partition.require
@@ -1,2 +1,2 @@
Variable_name Value
-have_partition_engine YES
+have_partitioning YES