From faea23dc023027d02bff8eccaefab8d9ee2d4cb8 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 Jun 2006 20:03:39 +0200 Subject: don't assume bdb is enabled in the ps_1general.test --- mysql-test/t/ps_1general.test | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/ps_1general.test') diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index f61a7820afe..0b9a46ad4d3 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -321,13 +321,15 @@ execute stmt4; prepare stmt4 from ' show variables like ''sql_mode'' '; execute stmt4; prepare stmt4 from ' show engine bdb logs '; -# The output depends on the history (actions of the bdb engine). +# The output depends on the bdb being enabled and on the history +# history (actions of the bdb engine). # That is the reason why, we switch the output here off. # (The real output will be tested in ps_6bdb.test) -# --replace_result $MYSQL_TEST_DIR TEST_DIR +--disable_warnings --disable_result_log execute stmt4; --enable_result_log +--enable_warnings prepare stmt4 from ' show grants for user '; --error 1295 prepare stmt4 from ' show create table t2 '; -- cgit v1.2.1