summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-08-30 17:32:53 +0500
committerunknown <ramil@mysql.com>2005-08-30 17:32:53 +0500
commit2599491a6784458c54c561f9629ec45112767773 (patch)
tree3b6db3de05e12d704fde784742177f47d26a5f41 /mysql-test
parent8a1a4996f46e237bf6b9faff68e2bc6948a53851 (diff)
parent8a06f4ecb9891ff1e497e55f5e933da91b9b1420 (diff)
downloadmariadb-git-2599491a6784458c54c561f9629ec45112767773.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9613
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/variables.result3
-rw-r--r--mysql-test/t/variables.test7
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 14260cd04f9..efcc3d21144 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -491,3 +491,6 @@ SHOW VARIABLES LIKE 'table_cache';
Variable_name Value
table_cache 1
SET GLOBAL table_cache=DEFAULT;
+select @@have_innodb;
+@@have_innodb
+#
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 7743b70d0cd..f888541f17a 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -381,3 +381,10 @@ SHOW VARIABLES LIKE 'table_cache';
SET GLOBAL table_cache=DEFAULT;
# End of 4.1 tests
+
+#
+# Bug #9613: @@have_innodb
+#
+
+--replace_column 1 #
+select @@have_innodb;