Fixed issues in test suite when running with --ps-protocol

mysql-test/t/features.test:
  --ps-protocol counts both prepare and execute
mysql-test/t/last_value.test:
  Disable ps-protocol for metadata tests

1 files changed, 4 insertions, 0 deletions

diff --git a/mysql-test/t/features.test b/mysql-test/t/features.test
index a54b09a3fd3..cdfc9413da5 100644
--- a/mysql-test/t/features.test
+++ b/mysql-test/t/features.test
@@ -46,6 +46,8 @@ select * from t1 where MATCH(a,b) AGAINST ("collections");
 select * from t1 where MATCH(a,b) AGAINST ("indexes");
 drop table t1;
 
+# We need the following when running with --ps-protocol
+--replace_result 4 2
 show status like "feature_fulltext";
 
 
@@ -68,6 +70,7 @@ create table t1 (a int);
 insert into t1 values (2);
 select (select a from t1 where t1.a=t2.a), a from t1 as t2;
 drop table t1;
+--replace_result 8 4
 show status like "feature_subquery";
 
 --echo #
@@ -104,4 +107,5 @@ SET @xml='<a aa1="aa1" aa2="aa2">a1<b ba1="ba1">b1<c>c1</c>b2</b>a2</a>';
 SELECT extractValue(@xml,'/a');
 select updatexml('<div><div><span>1</span><span>2</span></div></div>',
                  '/','<tr><td>1</td><td>2</td></tr>') as upd1;
+--replace_result 4 2
 show status like "feature_xml";