summaryrefslogtreecommitdiff
path: root/mysql-test/include/handler.inc
diff options
context:
space:
mode:
authormalff/marcsql@weblab.(none) <>2007-08-20 17:50:42 -0600
committermalff/marcsql@weblab.(none) <>2007-08-20 17:50:42 -0600
commitc76cd081d81135910589a857eeb50ee6e3c38fdc (patch)
treefa5bf34f9121e0dc62759e0147f56cfd81512226 /mysql-test/include/handler.inc
parenta01da34f721568fddedcdfad20f59bba462c9566 (diff)
downloadmariadb-git-c76cd081d81135910589a857eeb50ee6e3c38fdc.tar.gz
Fixed 5.0 -> 5.1 merge
Diffstat (limited to 'mysql-test/include/handler.inc')
-rw-r--r--mysql-test/include/handler.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/handler.inc b/mysql-test/include/handler.inc
index 7d7ac050682..a5b8c6cc7c9 100644
--- a/mysql-test/include/handler.inc
+++ b/mysql-test/include/handler.inc
@@ -471,7 +471,7 @@ drop table if exists t1;
--disable_warnings
drop table if exists t1;
--enable_warnings
-create table t1 (a int) ENGINE=MEMORY;
+eval create table t1 (a int) ENGINE=$other_engine_type;
--echo --> client 2
connection con2;
--error 1031