a couple of fixes for pbxt tests

2 files changed, 14 insertions, 0 deletions

diff --git a/mysql-test/suite/pbxt/t/grant_cache.test b/mysql-test/suite/pbxt/t/grant_cache.test
index f3faa579035..ce53a88ac0c 100644
--- a/mysql-test/suite/pbxt/t/grant_cache.test
+++ b/mysql-test/suite/pbxt/t/grant_cache.test
@@ -5,6 +5,17 @@
 --source include/add_anonymous_users.inc
 
 #
+# some statements have different results in ps-mode
+#
+let $actual1=4;
+let $actual2=5;
+if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL + $VIEW_PROTOCOL > 0`)
+{
+  let $actual1=3;
+  let $actual2=4;
+}
+
+#
 # Test grants with query cache
 #
 --disable_warnings
@@ -112,6 +123,7 @@ select * from t2;
 select mysqltest.t1.c from test.t1,mysqltest.t1;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
+--replace_result $actual1 4
 show status like "Qcache_not_cached";
 
 # Connect without a database
@@ -128,6 +140,7 @@ select a from mysqltest.t1;
 select a from mysqltest.t1;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
+--replace_result $actual2 5
 show status like "Qcache_not_cached";
 
 # Cleanup
diff --git a/mysql-test/suite/pbxt/t/mysqlshow.test b/mysql-test/suite/pbxt/t/mysqlshow.test
index d8f5c20afcd..41505cc0b10 100644
--- a/mysql-test/suite/pbxt/t/mysqlshow.test
+++ b/mysql-test/suite/pbxt/t/mysqlshow.test
@@ -1,5 +1,6 @@
 # Can't run test of external client with embedded server
 -- source include/not_embedded.inc
+-- source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,test1,test2;