MySQL Lists: commits: bk commit into 5.1 tree (malff:1.2522)

List:	Commits	« Previous Message Next Message »
From:	marc.alff	Date:	February 7 2008 8:00pm
Subject:	bk commit into 5.1 tree (malff:1.2522)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of malff.  When malff does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-07 12:00:48-07:00, malff@stripped. +2 -0
  test update

  mysql-test/r/ps_ddl.result@stripped, 2008-02-07 12:00:45-07:00,
malff@stripped. +2338 -1060
    test update

  mysql-test/t/ps_ddl.test@stripped, 2008-02-07 12:00:45-07:00,
malff@stripped. +303 -315
    test update

diff -Nrup a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result
--- a/mysql-test/r/ps_ddl.result	2007-12-14 17:46:22 -07:00
+++ b/mysql-test/r/ps_ddl.result	2008-02-07 12:00:45 -07:00
@@ -1,10 +1,11 @@
+SELECT VARIABLE_VALUE from
+INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
+into @base_count ;
+set @expected = 0;
 =====================================================================
 Testing 1: NOTHING -> TABLE transitions
 =====================================================================
 drop table if exists t1;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 prepare stmt from 'select * from t1';
 ERROR 42S02: Table 'test.t1' doesn't exist
 =====================================================================
@@ -17,92 +18,144 @@ Testing 3: NOTHING -> VIEW transitions
 Testing 4: TABLE -> NOTHING transitions
 =====================================================================
 drop table if exists t4;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t4(a int);
 prepare stmt from 'select * from t4';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t4;
 execute stmt;
 ERROR 42S02: Table 'test.t4' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42S02: Table 'test.t4' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 =====================================================================
 Testing 5: TABLE -> TABLE (DDL) transitions
 =====================================================================
 drop table if exists t5;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t5(a int);
-prepare stmt from 'select * from t5';
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+prepare stmt from 'select a from t5';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t5 add column (b int);
+set @expected = @expected + 1;
 execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t5;
 =====================================================================
 Testing 6: TABLE -> TABLE (TRIGGER) transitions
 =====================================================================
 drop table if exists t6;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t6(a int);
 prepare stmt from 'insert into t6(a) value (?)';
 set @val=1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=2;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create trigger t6_bi before insert on t6 for each row
 begin
 set @message= "t6_bi";
@@ -110,20 +163,33 @@ end
 $$
 set @message="none";
 set @val=3;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
 set @val=4;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
@@ -131,20 +197,32 @@ prepare stmt from 'insert into t6(a) val
 set @message="none";
 set @val=5;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
 set @message="none";
 set @val=6;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
@@ -155,21 +233,34 @@ end
 $$
 set @message="none";
 set @val=7;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
 set @message="none";
 set @val=8;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
@@ -177,20 +268,32 @@ prepare stmt from 'insert into t6(a) val
 set @message="none";
 set @val=9;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
 set @message="none";
 set @val=10;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi
@@ -202,20 +305,33 @@ end
 $$
 set @message="none";
 set @val=11;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
 set @val=12;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
@@ -223,20 +339,32 @@ prepare stmt from 'insert into t6(a) val
 set @message="none";
 set @val=13;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
 set @message="none";
 set @val=14;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
@@ -248,21 +376,34 @@ end
 $$
 set @message="none";
 set @val=15;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
 set @message="none";
 set @val=16;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
@@ -270,40 +411,65 @@ prepare stmt from 'insert into t6(a) val
 set @message="none";
 set @val=17;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
 set @message="none";
 set @val=18;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 t6_bi (2)
 drop trigger t6_bi;
 set @message="none";
 set @val=19;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
 set @val=20;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
@@ -311,38 +477,63 @@ prepare stmt from 'insert into t6(a) val
 set @message="none";
 set @val=21;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
 set @val=22;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
 drop trigger t6_bd;
 set @val=23;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
 set @val=24;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select @message;
 @message
 none
@@ -386,9 +577,6 @@ drop table if exists t7_audit;
 drop procedure if exists audit_proc;
 drop function if exists audit_func;
 drop view if exists audit_view;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t7_proc(a int);
 create table t7_func(a int);
 create table t7_view(a int);
@@ -414,155 +602,294 @@ for each row set NEW.reason="trigger v1"
 prepare stmt_proc from 'insert into t7_proc(a) value (?)';
 set @val=101;
 execute stmt_proc using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=102;
 execute stmt_proc using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure audit_proc;
 create procedure audit_proc(a int)
 insert into t7_audit values (NULL, a, "proc v2");
 set @val=103;
+set @expected = @expected + 1;
 execute stmt_proc using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=104;
 execute stmt_proc using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_func from 'insert into t7_func(a) value (?)';
 set @val=201;
 execute stmt_func using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=202;
 execute stmt_func using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function audit_func;
 create function audit_func() returns varchar(50)
 return "func v2";
 set @val=203;
+set @expected = @expected + 1;
 execute stmt_func using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=204;
 execute stmt_func using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_view from 'insert into t7_view(a) value (?)';
 set @val=301;
 execute stmt_view using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=302;
 execute stmt_view using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view audit_view;
 create view audit_view as select "view v2" as reason from dual;
 set @val=303;
+set @expected = @expected + 1;
 execute stmt_view using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=304;
 execute stmt_view using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_table from 'insert into t7_table(a) value (?)';
 set @val=401;
 execute stmt_table using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=402;
 execute stmt_table using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t7_dependent_table add column comments varchar(100) default NULL;
 set @val=403;
+set @expected = @expected + 1;
 execute stmt_table using @val;
 ERROR 21S01: Column count doesn't match value count at row 1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=404;
+set @expected = @expected + 1;
 execute stmt_table using @val;
 ERROR 21S01: Column count doesn't match value count at row 1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t7_dependent_table drop column comments;
 set @val=405;
+set @expected = @expected + 1;
 execute stmt_table using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=406;
 execute stmt_table using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_table_trigger from 'insert into t7_table(a) value (?)';
 set @val=501;
 execute stmt_table_trigger using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=502;
 execute stmt_table_trigger using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop trigger t7_table_trigger_bi;
 create trigger t7_table_trigger_bi before insert on t7_dependent_table
 for each row set NEW.reason="trigger v2";
 set @val=503;
+set @expected = @expected + 1;
 execute stmt_table_trigger using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=504;
 execute stmt_table_trigger using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select * from t7_audit order by new_a;
 old_a	new_a	reason
 NULL	101	proc v1
@@ -601,150 +928,237 @@ drop view audit_view;
 Testing 8: TABLE -> TEMPORARY TABLE transitions
 =====================================================================
 drop table if exists t8;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t8(a int);
 prepare stmt from 'select * from t8';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t8;
 create temporary table t8(a int);
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t8;
 =====================================================================
 Testing 9: TABLE -> VIEW transitions
 =====================================================================
 drop table if exists t9;
 drop table if exists t9_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t9(a int);
 create table t9_b(a int);
 prepare stmt from 'select * from t9';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t9;
 create view t9 as select * from t9_b;
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t9;
 drop table t9_b;
 =====================================================================
 Testing 10: TEMPORARY TABLE -> NOTHING transitions
 =====================================================================
 drop temporary table if exists t10;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create temporary table t10(a int);
 prepare stmt from 'select * from t10';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop temporary table t10;
 execute stmt;
 ERROR 42S02: Table 'test.t10' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42S02: Table 'test.t10' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 =====================================================================
 Testing 11: TEMPORARY TABLE -> TABLE transitions
 =====================================================================
 drop table if exists t11;
 drop temporary table if exists t11;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t11(a int);
 insert into t11(a) value (1);
 create temporary table t11(a int);
 prepare stmt from 'select * from t11';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop temporary table t11;
+set @expected = @expected + 1;
 execute stmt;
 a
 1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a
 1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select * from t11;
 a
 1
@@ -753,37 +1167,59 @@ drop table t11;
 Testing 12: TEMPORARY TABLE -> TEMPORARY TABLE (DDL) transitions
 =====================================================================
 drop temporary table if exists t12;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create temporary table t12(a int);
-prepare stmt from 'select * from t12';
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+prepare stmt from 'select a from t12';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop temporary table t12;
 create temporary table t12(a int, b int);
+set @expected = @expected + 1;
 execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select * from t12;
 a	b
 drop table t12;
@@ -792,38 +1228,60 @@ Testing 13: TEMPORARY TABLE -> VIEW tran
 =====================================================================
 drop temporary table if exists t13;
 drop table if exists t13_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create temporary table t13(a int);
 create table t13_b(a int);
 prepare stmt from 'select * from t13';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop temporary table t13;
 create view t13 as select * from t13_b;
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t13;
 drop table t13_b;
 =====================================================================
@@ -831,75 +1289,120 @@ Testing 14: VIEW -> NOTHING transitions
 =====================================================================
 drop view if exists t14;
 drop table if exists t14_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t14_b(a int);
 create view t14 as select * from t14_b;
 prepare stmt from 'select * from t14';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t14;
+set @expected = @expected + 1;
 execute stmt;
 ERROR 42S02: Table 'test.t14' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
 execute stmt;
 ERROR 42S02: Table 'test.t14' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t14_b;
 =====================================================================
 Testing 15: VIEW -> TABLE transitions
 =====================================================================
 drop view if exists t15;
 drop table if exists t15_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t15_b(a int);
 create view t15 as select * from t15_b;
 prepare stmt from 'select * from t15';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t15;
 create table t15(a int);
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t15_b;
 drop table t15;
 =====================================================================
@@ -907,38 +1410,60 @@ Testing 16: VIEW -> TEMPORARY TABLE tran
 =====================================================================
 drop view if exists t16;
 drop table if exists t16_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t16_b(a int);
 create view t16 as select * from t16_b;
 prepare stmt from 'select * from t16';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t16;
 create temporary table t16(a int);
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t16_b;
 drop temporary table t16;
 =====================================================================
@@ -946,9 +1471,6 @@ Testing 17: VIEW -> VIEW (DDL) transitio
 =====================================================================
 drop view if exists t17;
 drop table if exists t17_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t17_b(a int);
 insert into t17_b values (10), (20), (30);
 create view t17 as select a, 2*a as b, 3*a as c from t17_b;
@@ -963,44 +1485,69 @@ a	b	c
 10	20	30
 20	40	60
 30	60	90
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b	c
 10	20	30
 20	40	60
 30	60	90
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view t17;
-create view t17 as select a, 2*a as b, 10*a as c from t17_b;
+create view t17 as select a, 2*a as b, 5*a as c from t17_b;
 select * from t17;
 a	b	c
-10	20	100
-20	40	200
-30	60	300
+10	20	50
+20	40	100
+30	60	150
+set @expected = @expected + 1;
 execute stmt;
 a	b	c
-10	20	100
-20	40	200
-30	60	300
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+10	20	50
+20	40	100
+30	60	150
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b	c
-10	20	100
-20	40	200
-30	60	300
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+10	20	50
+20	40	100
+30	60	150
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t17_b;
 drop view t17;
 =====================================================================
@@ -1013,9 +1560,6 @@ drop view if exists t18_view;
 drop view if exists t18_table;
 drop function if exists view_func;
 drop view if exists view_view;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t18(a int);
 insert into t18 values (1), (2), (3);
 create function view_func(x int) returns int
@@ -1031,117 +1575,192 @@ a	b
 1	2
 2	3
 3	4
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_func;
 a	b
 1	2
 2	3
 3	4
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function view_func;
 create function view_func(x int) returns int
 return x*x;
+set @expected = @expected + 1;
 execute stmt_func;
 a	b
 1	1
 2	4
 3	9
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_func;
 a	b
 1	1
 2	4
 3	9
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_view from 'select * from t18_view';
 execute stmt_view;
 a	b
 1	view v1
 2	view v1
 3	view v1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_view;
 a	b
 1	view v1
 2	view v1
 3	view v1
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view view_view;
 create view view_view as select "view v2" as reason from dual;
+set @expected = @expected + 1;
 execute stmt_view;
 a	b
 1	view v2
 2	view v2
 3	view v2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_view;
 a	b
 1	view v2
 2	view v2
 3	view v2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 prepare stmt_table from 'select * from t18_table';
 execute stmt_table;
 a
 1
 2
 3
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_table;
 a
 1
 2
 3
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t18 add column comments varchar(50) default NULL;
+set @expected = @expected + 1;
 execute stmt_table;
 a
 1
 2
 3
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_table;
 a
 1
 2
 3
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t18;
 drop table t18_dependent_table;
 drop view t18_func;
@@ -1153,9 +1772,6 @@ drop view view_view;
 Testing 19: Special tables (INFORMATION_SCHEMA)
 =====================================================================
 drop procedure if exists proc_19;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 prepare stmt from
 'select ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE
  from INFORMATION_SCHEMA.ROUTINES where
@@ -1164,115 +1780,178 @@ create procedure proc_19() select "hi th
 execute stmt;
 ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE
 test	proc_19	PROCEDURE
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE
 test	proc_19	PROCEDURE
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure proc_19;
 create procedure proc_19() select "hi there, again";
 execute stmt;
 ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE
 test	proc_19	PROCEDURE
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE
 test	proc_19	PROCEDURE
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure proc_19;
 =====================================================================
 Testing 20: Special tables (log tables)
 =====================================================================
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 prepare stmt from
 'select * from mysql.general_log where argument=\'IMPOSSIBLE QUERY STRING\'';
 execute stmt;
 event_time	user_host	thread_id	server_id	command_type	argument
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 event_time	user_host	thread_id	server_id	command_type	argument
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 event_time	user_host	thread_id	server_id	command_type	argument
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 event_time	user_host	thread_id	server_id	command_type	argument
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 =====================================================================
 Testing 21: Special tables (system tables)
 =====================================================================
 drop procedure if exists proc_21;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 prepare stmt from
 'select type, db, name from mysql.proc where name=\'proc_21\'';
 create procedure proc_21() select "hi there";
 execute stmt;
 type	db	name
 PROCEDURE	test	proc_21
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 type	db	name
 PROCEDURE	test	proc_21
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure proc_21;
 create procedure proc_21() select "hi there, again";
 execute stmt;
 type	db	name
 PROCEDURE	test	proc_21
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 type	db	name
 PROCEDURE	test	proc_21
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure proc_21;
 =====================================================================
 Testing 22: Special tables (views temp tables)
 =====================================================================
 drop table if exists t22_b;
 drop view if exists t22;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t22_b(a int);
 create algorithm=temptable view t22 as select a*a as a2 from t22_b;
 show create view t22;
@@ -1285,19 +1964,31 @@ a2
 1
 4
 9
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a2
 1
 4
 9
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 insert into t22_b values (4), (5), (6);
 execute stmt;
 a2
@@ -1307,10 +1998,16 @@ a2
 16
 25
 36
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a2
 1
@@ -1319,10 +2016,16 @@ a2
 16
 25
 36
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t22_b;
 drop view t22;
 =====================================================================
@@ -1330,9 +2033,6 @@ Testing 23: Special tables (internal joi
 =====================================================================
 drop table if exists t23_a;
 drop table if exists t23_b;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t23_a(a int);
 create table t23_b(b int);
 prepare stmt from 'select * from t23_a join t23_b';
@@ -1349,10 +2049,16 @@ a	b
 1	30
 2	30
 3	30
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b
 1	10
@@ -1364,10 +2070,16 @@ a	b
 1	30
 2	30
 3	30
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 insert into t23_a values (4);
 insert into t23_b values (40);
 execute stmt;
@@ -1388,10 +2100,16 @@ a	b
 2	40
 3	40
 4	40
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b
 1	10
@@ -1410,45 +2128,72 @@ a	b
 2	40
 3	40
 4	40
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t23_a;
 drop table t23_b;
 =====================================================================
 Testing 24: Special statements
 =====================================================================
 drop table if exists t24_alter;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t24_alter(a int);
 prepare stmt from 'alter table t24_alter add column b int';
 execute stmt;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_alter;
 create table t24_alter(a1 int, a2 int);
 execute stmt;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_alter drop column b;
 execute stmt;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_alter drop column b;
 execute stmt;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_alter;
 drop table if exists t24_repair;
 create table t24_repair(a int);
@@ -1457,36 +2202,60 @@ prepare stmt from 'repair table t24_repa
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_repair	repair	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_repair;
 create table t24_repair(a1 int, a2 int);
 insert into t24_repair values (1, 10), (2, 20), (3, 30);
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_repair	repair	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_repair add column b varchar(50) default NULL;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_repair	repair	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_repair drop column b;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_repair	repair	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_repair;
 drop table if exists t24_analyze;
 create table t24_analyze(a int);
@@ -1495,36 +2264,60 @@ prepare stmt from 'analyze table t24_ana
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_analyze	analyze	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_analyze;
 create table t24_analyze(a1 int, a2 int);
 insert into t24_analyze values (1, 10), (2, 20), (3, 30);
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_analyze	analyze	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_analyze add column b varchar(50) default NULL;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_analyze	analyze	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_analyze drop column b;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_analyze	analyze	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_analyze;
 drop table if exists t24_optimize;
 create table t24_optimize(a int);
@@ -1533,176 +2326,308 @@ prepare stmt from 'optimize table t24_op
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_optimize	optimize	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_optimize;
 create table t24_optimize(a1 int, a2 int);
 insert into t24_optimize values (1, 10), (2, 20), (3, 30);
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_optimize	optimize	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_optimize add column b varchar(50) default NULL;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_optimize	optimize	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t24_optimize drop column b;
 execute stmt;
 Table	Op	Msg_type	Msg_text
 test.t24_optimize	optimize	status	OK
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_optimize;
 drop procedure if exists changing_proc;
 prepare stmt from 'show create procedure changing_proc';
 execute stmt;
 ERROR 42000: PROCEDURE changing_proc does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42000: PROCEDURE changing_proc does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create procedure changing_proc() begin end;
 execute stmt;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database
Collation
 changing_proc		CREATE DEFINER=`root`@`localhost` PROCEDURE `changing_proc`()
 begin end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database
Collation
 changing_proc		CREATE DEFINER=`root`@`localhost` PROCEDURE `changing_proc`()
 begin end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure changing_proc;
 create procedure changing_proc(x int, y int) begin end;
 execute stmt;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database
Collation
 changing_proc		CREATE DEFINER=`root`@`localhost` PROCEDURE `changing_proc`(x int, y int)
 begin end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database
Collation
 changing_proc		CREATE DEFINER=`root`@`localhost` PROCEDURE `changing_proc`(x int, y int)
 begin end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop procedure changing_proc;
 execute stmt;
 ERROR 42000: PROCEDURE changing_proc does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42000: PROCEDURE changing_proc does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function if exists changing_func;
 prepare stmt from 'show create function changing_func';
 execute stmt;
 ERROR 42000: FUNCTION changing_func does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42000: FUNCTION changing_func does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create function changing_func() returns int return 0;
 execute stmt;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database
Collation
 changing_func		CREATE DEFINER=`root`@`localhost` FUNCTION `changing_func`() RETURNS
int(11)
 return 0	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database
Collation
 changing_func		CREATE DEFINER=`root`@`localhost` FUNCTION `changing_func`() RETURNS
int(11)
 return 0	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function changing_func;
 create function changing_func(x int, y int) returns int return x+y;
 execute stmt;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database
Collation
 changing_func		CREATE DEFINER=`root`@`localhost` FUNCTION `changing_func`(x int, y int)
RETURNS int(11)
 return x+y	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database
Collation
 changing_func		CREATE DEFINER=`root`@`localhost` FUNCTION `changing_func`(x int, y int)
RETURNS int(11)
 return x+y	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function changing_func;
 execute stmt;
 ERROR 42000: FUNCTION changing_func does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42000: FUNCTION changing_func does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table if exists t24_trigger;
 create table t24_trigger(a int);
 prepare stmt from 'show create trigger t24_bi;';
 execute stmt;
 ERROR HY000: Trigger does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR HY000: Trigger does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create trigger t24_bi before insert on t24_trigger for each row
 begin
 set @message= "t24_bi";
@@ -1714,239 +2639,427 @@ t24_bi		CREATE DEFINER=`root`@`localhost
 begin
 set @message= "t24_bi";
 end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Trigger	sql_mode	SQL Original
Statement	character_set_client	collation_connection	Database Collation
 t24_bi		CREATE DEFINER=`root`@`localhost` trigger t24_bi before insert on t24_trigger for
each row
 begin
 set @message= "t24_bi";
 end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop trigger t24_bi;
 create trigger t24_bi before insert on t24_trigger for each row
 begin
 set @message= "t24_bi (2)";
 end
 $$
+set @expected = @expected + 1;
 execute stmt;
 Trigger	sql_mode	SQL Original
Statement	character_set_client	collation_connection	Database Collation
 t24_bi		CREATE DEFINER=`root`@`localhost` trigger t24_bi before insert on t24_trigger for
each row
 begin
 set @message= "t24_bi (2)";
 end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 Trigger	sql_mode	SQL Original
Statement	character_set_client	collation_connection	Database Collation
 t24_bi		CREATE DEFINER=`root`@`localhost` trigger t24_bi before insert on t24_trigger for
each row
 begin
 set @message= "t24_bi (2)";
 end	latin1	latin1_swedish_ci	latin1_swedish_ci
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop trigger t24_bi;
 execute stmt;
 ERROR HY000: Trigger does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR HY000: Trigger does not exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t24_trigger;
 =====================================================================
 Testing 25: Testing the strength of TABLE_SHARE version
 =====================================================================
 drop table if exists t25_num_col;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t25_num_col(a int);
-prepare stmt from 'select * from t25_num_col';
+prepare stmt from 'select a from t25_num_col';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_num_col add column b varchar(50) default NULL;
+set @expected = @expected + 1;
 execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_num_col;
 drop table if exists t25_col_name;
 create table t25_col_name(a int);
 prepare stmt from 'select * from t25_col_name';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_col_name change a b int;
+set @expected = @expected + 1;
 execute stmt;
-b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
-execute stmt;
-b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
+execute stmt;
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_col_name;
 drop table if exists t25_col_type;
 create table t25_col_type(a int);
 prepare stmt from 'select * from t25_col_type';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_col_type change a a varchar(10);
+set @expected = @expected + 1;
 execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
+execute stmt;
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_col_type;
 drop table if exists t25_col_type_length;
 create table t25_col_type_length(a varchar(10));
 prepare stmt from 'select * from t25_col_type_length';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-3
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_col_type_length change a a varchar(20);
+set @expected = @expected + 1;
 execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
+execute stmt;
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_col_type_length;
 drop table if exists t25_col_null;
 create table t25_col_null(a varchar(10));
 prepare stmt from 'select * from t25_col_null';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-4
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_col_null change a a varchar(10) NOT NULL;
+set @expected = @expected + 1;
 execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
+execute stmt;
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_col_null;
 drop table if exists t25_col_default;
 create table t25_col_default(a int, b int DEFAULT 10);
 prepare stmt from 'insert into t25_col_default(a) values (?)';
 set @val=1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=2;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_col_default change b b int DEFAULT 20;
 set @val=3;
+set @expected = @expected + 1;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 set @val=4;
 execute stmt using @val;
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 select * from t25_col_default;
 a	b
 1	10
@@ -1959,29 +3072,54 @@ create table t25_index(a varchar(10));
 prepare stmt from 'select * from t25_index';
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-5
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create index i1 on t25_index(a);
+set @expected = @expected + 1;
 execute stmt;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-6
-execute stmt;
-a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-6
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_index;
 drop table if exists t25_index_unique;
 create table t25_index_unique(a varchar(10), b varchar(10));
@@ -1996,16 +3134,28 @@ t25_index_unique	CREATE TABLE `t25_index
 prepare stmt from 'select * from t25_index_unique';
 execute stmt;
 a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-6
-execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-6
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a	b
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 alter table t25_index_unique drop index i1;
 create unique index i1 on t25_index_unique(a, b);
 show create table t25_index_unique;
@@ -2015,18 +3165,31 @@ t25_index_unique	CREATE TABLE `t25_index
   `b` varchar(10) DEFAULT NULL,
   UNIQUE KEY `i1` (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+set @expected = @expected + 1;
 execute stmt;
 a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-7
-execute stmt;
-a	b
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-7
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+execute stmt;
+a	b
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t25_index_unique;
 =====================================================================
 Testing reported bugs
@@ -2035,9 +3198,6 @@ drop table if exists table_12093;
 drop function if exists func_12093;
 drop function if exists func_12093_unrelated;
 drop procedure if exists proc_12093;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table table_12093(a int);
 create function func_12093()
 returns int
@@ -2055,88 +3215,137 @@ prepare stmt_sp from 'call proc_12093(fu
 execute stmt_sf;
 func_12093()
 0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_sp;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function func_12093_unrelated;
 drop procedure proc_12093_unrelated;
 execute stmt_sf;
 func_12093()
 0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_sp;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_sf;
 func_12093()
 0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt_sp;
 a
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 deallocate prepare stmt_sf;
 deallocate prepare stmt_sp;
 drop table table_12093;
 drop function func_12093;
 drop procedure proc_12093;
 drop function if exists func_21294;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create function func_21294() returns int return 10;
 prepare stmt from "select func_21294()";
 execute stmt;
 func_21294()
 10
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function func_21294;
 create function func_21294() returns int return 10;
 execute stmt;
 func_21294()
 10
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop function func_21294;
 create function func_21294() returns int return 20;
+set @expected = @expected + 1;
 execute stmt;
 func_21294()
 20
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 deallocate prepare stmt;
 drop function func_21294;
 drop table if exists t_27420_100;
 drop table if exists t_27420_101;
 drop view if exists v_27420;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t_27420_100(a int);
 insert into t_27420_100 values (1), (2);
 create table t_27420_101(a int);
@@ -2149,35 +3358,52 @@ execute stmt;
 X	Y
 1	1
 2	2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop view v_27420;
 create table v_27420(X int, Y int);
+set @expected = @expected + 1;
 execute stmt;
 X	Y
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table v_27420;
 create table v_27420 (a int, b int, filler char(200));
+set @expected = @expected + 1;
 execute stmt;
-a	b	filler
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-2
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 deallocate prepare stmt;
 drop table t_27420_100;
 drop table t_27420_101;
 drop table v_27420;
 drop table if exists t_27430_1;
 drop table if exists t_27430_2;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t_27430_1 (a int not null, oref int not null, key(a));
 insert into t_27430_1 values
 (1, 1),
@@ -2199,20 +3425,32 @@ oref	a	Z
 2	2	0
 3	1234	0
 4	1234	0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 oref	a	Z
 1	1	1
 2	2	0
 3	1234	0
 4	1234	0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table t_27430_1, t_27430_2;
 create table t_27430_1 (a int, oref int, key(a));
 insert into t_27430_1 values 
@@ -2227,35 +3465,38 @@ insert into t_27430_2 values
 (2,2),
 (NULL, 3),
 (NULL, 4);
+set @expected = @expected + 1;
 execute stmt;
-oref	a	Z
-1	1	1
-2	2	0
-3	NULL	NULL
-4	NULL	0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
-execute stmt;
-oref	a	Z
-1	1	1
-2	2	0
-3	NULL	NULL
-4	NULL	0
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
+set @expected = @expected + 1;
+execute stmt;
+ERROR HY000: Prepared statement result set has changed, rebind needed
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 deallocate prepare stmt;
 drop table t_27430_1;
 drop table t_27430_2;
 drop table if exists t_27690_1;
 drop view if exists v_27690_1;
 drop table if exists v_27690_2;
-SELECT VARIABLE_VALUE from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
-into @base_count ;
 create table t_27690_1 (a int, b int);
 insert into t_27690_1 values (1,1),(2,2);
 create table v_27690_1 as select * from t_27690_1;
@@ -2267,34 +3508,59 @@ a	b	a	b
 2	2	1	1
 1	1	2	2
 2	2	2	2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b	a	b
 1	1	1	1
 2	2	1	1
 1	1	2	2
 2	2	2	2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 drop table v_27690_1;
 execute stmt;
 ERROR 42S02: Table 'test.v_27690_1' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 ERROR 42S02: Table 'test.v_27690_1' doesn't exist
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-0
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 create view v_27690_1 as select A.a, A.b from t_27690_1 A, t_27690_1 B;
+set @expected = @expected + 1;
 execute stmt;
 a	b	a	b
 1	1	1	1
@@ -2305,10 +3571,16 @@ a	b	a	b
 2	2	2	2
 1	1	2	2
 2	2	2	2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 execute stmt;
 a	b	a	b
 1	1	1	1
@@ -2319,10 +3591,16 @@ a	b	a	b
 2	2	2	2
 1	1	2	2
 2	2	2	2
-SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
-REPREPARED
-1
+SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+AS `CHECK`, 
+(VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+where variable_name='COM_STMT_REPREPARE' ;
+CHECK	OFFSET
+PASSED	0
 deallocate prepare stmt;
 drop table t_27690_1;
 drop view v_27690_1;
diff -Nrup a/mysql-test/t/ps_ddl.test b/mysql-test/t/ps_ddl.test
--- a/mysql-test/t/ps_ddl.test	2007-12-14 17:46:22 -07:00
+++ b/mysql-test/t/ps_ddl.test	2008-02-07 12:00:45 -07:00
@@ -55,8 +55,28 @@ let $base_count = SELECT VARIABLE_VALUE 
 INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE'
 into @base_count ;
 
-let $reprepared = SELECT VARIABLE_VALUE - @base_count AS REPREPARED from
-INFORMATION_SCHEMA.SESSION_STATUS where variable_name='COM_STMT_REPREPARE' ;
+let $check = SELECT CASE (VARIABLE_VALUE - @base_count - @expected)
+  WHEN 0 THEN "PASSED"
+  ELSE "FAILED"
+  END
+ AS `CHECK`, 
+ (VARIABLE_VALUE - @base_count - @expected) AS `OFFSET`
+ from INFORMATION_SCHEMA.SESSION_STATUS
+ where variable_name='COM_STMT_REPREPARE' ;
+
+eval $base_count;
+set @expected = 0;
+
+# Maintainer:
+# When not expecting a re-prepare, write the test like this:
+#   execute stmt;
+#   eval $check;
+#
+# When expecting a re-prepare, write the test like this:
+#   set @expected = @expected + 1;
+#   execute stmt;
+#   eval $check;
+#
 
 --echo =====================================================================
 --echo Testing 1: NOTHING -> TABLE transitions
@@ -66,8 +86,6 @@ INFORMATION_SCHEMA.SESSION_STATUS where 
 drop table if exists t1;
 --enable_warnings
 
-eval $base_count;
-
 # can not be tested since prepare failed
 --error ER_NO_SUCH_TABLE
 prepare stmt from 'select * from t1';
@@ -92,23 +110,21 @@ prepare stmt from 'select * from t1';
 drop table if exists t4;
 --enable_warnings
 
-eval $base_count;
-
 create table t4(a int);
 
 prepare stmt from 'select * from t4';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t4;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 
 --echo =====================================================================
 --echo Testing 5: TABLE -> TABLE (DDL) transitions
@@ -118,23 +134,21 @@ eval $reprepared;
 drop table if exists t5;
 --enable_warnings
 
-eval $base_count;
-
 create table t5(a int);
 
-prepare stmt from 'select * from t5';
+prepare stmt from 'select a from t5';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t5 add column (b int);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t5;
 
@@ -155,17 +169,15 @@ drop table t5;
 drop table if exists t6;
 --enable_warnings
 
-eval $base_count;
-
 create table t6(a int);
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @val=1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 set @val=2;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 
 # Relevant trigger: execute should reprepare
 delimiter $$;
@@ -178,25 +190,25 @@ delimiter ;$$
 
 set @message="none";
 set @val=3;
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @val=4;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @message="none";
 set @val=5;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=6;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 # Unrelated trigger: execute can pass of fail, implementation dependent
@@ -210,25 +222,26 @@ delimiter ;$$
 
 set @message="none";
 set @val=7;
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=8;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @message="none";
 set @val=9;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=10;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 # Relevant trigger: execute should reprepare
@@ -243,25 +256,25 @@ delimiter ;$$
 
 set @message="none";
 set @val=11;
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @val=12;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @message="none";
 set @val=13;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=14;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 # Unrelated trigger: execute can pass of fail, implementation dependent
@@ -276,63 +289,62 @@ delimiter ;$$
 
 set @message="none";
 set @val=15;
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=16;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @message="none";
 set @val=17;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @message="none";
 set @val=18;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 drop trigger t6_bi;
 
 set @message="none";
 set @val=19;
-# safe to re-execute
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @val=20;
-# safe to re-execute
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 prepare stmt from 'insert into t6(a) value (?)';
 set @message="none";
 set @val=21;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @val=22;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 drop trigger t6_bd;
 
 set @val=23;
-# safe to re-execute
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 set @val=24;
-# safe to re-execute
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 select @message;
 
 select * from t6 order by a;
@@ -363,8 +375,6 @@ drop function if exists audit_func;
 drop view if exists audit_view;
 --enable_warnings
 
-eval $base_count;
-
 create table t7_proc(a int);
 create table t7_func(a int);
 create table t7_view(a int);
@@ -400,10 +410,10 @@ create trigger t7_table_trigger_bi befor
 prepare stmt_proc from 'insert into t7_proc(a) value (?)';
 set @val=101;
 execute stmt_proc using @val;
-eval $reprepared;
+eval $check;
 set @val=102;
 execute stmt_proc using @val;
-eval $reprepared;
+eval $check;
 
 drop procedure audit_proc;
 
@@ -411,20 +421,21 @@ create procedure audit_proc(a int)
   insert into t7_audit values (NULL, a, "proc v2");
 
 set @val=103;
+set @expected = @expected + 1;
 execute stmt_proc using @val;
-eval $reprepared;
+eval $check;
 set @val=104;
 execute stmt_proc using @val;
-eval $reprepared;
+eval $check;
 
 
 prepare stmt_func from 'insert into t7_func(a) value (?)';
 set @val=201;
 execute stmt_func using @val;
-eval $reprepared;
+eval $check;
 set @val=202;
 execute stmt_func using @val;
-eval $reprepared;
+eval $check;
 
 drop function audit_func;
 
@@ -432,19 +443,20 @@ create function audit_func() returns var
   return "func v2";
 
 set @val=203;
+set @expected = @expected + 1;
 execute stmt_func using @val;
-eval $reprepared;
+eval $check;
 set @val=204;
 execute stmt_func using @val;
-eval $reprepared;
+eval $check;
 
 prepare stmt_view from 'insert into t7_view(a) value (?)';
 set @val=301;
 execute stmt_view using @val;
-eval $reprepared;
+eval $check;
 set @val=302;
 execute stmt_view using @val;
-eval $reprepared;
+eval $check;
 
 drop view audit_view;
 
@@ -455,52 +467,53 @@ create view audit_view as select "view v
 # This is because the table trigger is cached and is not invalidated.
 
 set @val=303;
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt_view using @val;
-eval $reprepared;
+eval $check;
 set @val=304;
 execute stmt_view using @val;
-eval $reprepared;
+eval $check;
 
 
 prepare stmt_table from 'insert into t7_table(a) value (?)';
 set @val=401;
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 set @val=402;
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 
 alter table t7_dependent_table add column comments varchar(100) default NULL;
 
 set @val=403;
-# REPREPARED +1
+set @expected = @expected + 1;
 --error ER_WRONG_VALUE_COUNT_ON_ROW
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 set @val=404;
+set @expected = @expected + 1;
 --error ER_WRONG_VALUE_COUNT_ON_ROW
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 
 alter table t7_dependent_table drop column comments;
 
 set @val=405;
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 set @val=406;
 execute stmt_table using @val;
-eval $reprepared;
+eval $check;
 
 
 prepare stmt_table_trigger from 'insert into t7_table(a) value (?)';
 set @val=501;
 execute stmt_table_trigger using @val;
-eval $reprepared;
+eval $check;
 set @val=502;
 execute stmt_table_trigger using @val;
-eval $reprepared;
+eval $check;
 
 drop trigger t7_table_trigger_bi;
 
@@ -508,12 +521,12 @@ create trigger t7_table_trigger_bi befor
   for each row set NEW.reason="trigger v2";
 
 set @val=503;
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt_table_trigger using @val;
-eval $reprepared;
+eval $check;
 set @val=504;
 execute stmt_table_trigger using @val;
-eval $reprepared;
+eval $check;
 
 select * from t7_audit order by new_a;
 
@@ -538,24 +551,22 @@ drop view audit_view;
 drop table if exists t8;
 --enable_warnings
 
-eval $base_count;
-
 create table t8(a int);
 
 prepare stmt from 'select * from t8';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t8;
 create temporary table t8(a int);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t8;
 
@@ -568,25 +579,23 @@ drop table if exists t9;
 drop table if exists t9_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t9(a int);
 create table t9_b(a int);
 
 prepare stmt from 'select * from t9';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t9;
 create view t9 as select * from t9_b;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t9;
 drop table t9_b;
@@ -599,23 +608,21 @@ drop table t9_b;
 drop temporary table if exists t10;
 --enable_warnings
 
-eval $base_count;
-
 create temporary table t10(a int);
 
 prepare stmt from 'select * from t10';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop temporary table t10;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 
 --echo =====================================================================
 --echo Testing 11: TEMPORARY TABLE -> TABLE transitions
@@ -626,25 +633,23 @@ drop table if exists t11;
 drop temporary table if exists t11;
 --enable_warnings
 
-eval $base_count;
-
 create table t11(a int);
 insert into t11(a) value (1);
 create temporary table t11(a int);
 
 prepare stmt from 'select * from t11';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop temporary table t11;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 select * from t11;
 drop table t11;
@@ -657,24 +662,22 @@ drop table t11;
 drop temporary table if exists t12;
 --enable_warnings
 
-eval $base_count;
-
 create temporary table t12(a int);
 
-prepare stmt from 'select * from t12';
+prepare stmt from 'select a from t12';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop temporary table t12;
 create temporary table t12(a int, b int);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 select * from t12;
 drop table t12;
@@ -688,25 +691,23 @@ drop temporary table if exists t13;
 drop table if exists t13_b;
 --enable_warnings
 
-eval $base_count;
-
 create temporary table t13(a int);
 create table t13_b(a int);
 
 prepare stmt from 'select * from t13';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop temporary table t13;
 create view t13 as select * from t13_b;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t13;
 drop table t13_b;
@@ -720,26 +721,25 @@ drop view if exists t14;
 drop table if exists t14_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t14_b(a int);
 create view t14 as select * from t14_b;
 
 prepare stmt from 'select * from t14';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t14;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t14_b;
 
@@ -752,25 +752,23 @@ drop view if exists t15;
 drop table if exists t15_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t15_b(a int);
 create view t15 as select * from t15_b;
 
 prepare stmt from 'select * from t15';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t15;
 create table t15(a int);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t15_b;
 drop table t15;
@@ -784,25 +782,23 @@ drop view if exists t16;
 drop table if exists t16_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t16_b(a int);
 create view t16 as select * from t16_b;
 
 prepare stmt from 'select * from t16';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t16;
 create temporary table t16(a int);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t16_b;
 drop temporary table t16;
@@ -816,8 +812,6 @@ drop view if exists t17;
 drop table if exists t17_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t17_b(a int);
 insert into t17_b values (10), (20), (30);
 
@@ -826,19 +820,19 @@ select * from t17;
 
 prepare stmt from 'select * from t17';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop view t17;
-create view t17 as select a, 2*a as b, 10*a as c from t17_b;
+create view t17 as select a, 2*a as b, 5*a as c from t17_b;
 select * from t17;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t17_b;
 drop view t17;
@@ -865,8 +859,6 @@ drop function if exists view_func;
 drop view if exists view_view;
 --enable_warnings
 
-eval $base_count;
-
 # TODO: insertable view -> trigger
 # TODO: insertable view -> trigger -> proc ?
 
@@ -886,47 +878,48 @@ create view t18_table as select * from t
 
 prepare stmt_func from 'select * from t18_func';
 execute stmt_func;
-eval $reprepared;
+eval $check;
 execute stmt_func;
-eval $reprepared;
+eval $check;
 
 drop function view_func;
 create function view_func(x int) returns int
   return x*x;
 
+set @expected = @expected + 1;
 execute stmt_func;
-eval $reprepared;
+eval $check;
 execute stmt_func;
-eval $reprepared;
+eval $check;
 
 prepare stmt_view from 'select * from t18_view';
 execute stmt_view;
-eval $reprepared;
+eval $check;
 execute stmt_view;
-eval $reprepared;
+eval $check;
 
 drop view view_view;
 create view view_view as select "view v2" as reason from dual;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt_view;
-eval $reprepared;
+eval $check;
 execute stmt_view;
-eval $reprepared;
+eval $check;
 
 prepare stmt_table from 'select * from t18_table';
 execute stmt_table;
-eval $reprepared;
+eval $check;
 execute stmt_table;
-eval $reprepared;
+eval $check;
 
 alter table t18 add column comments varchar(50) default NULL;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt_table;
-eval $reprepared;
+eval $check;
 execute stmt_table;
-eval $reprepared;
+eval $check;
 
 drop table t18;
 drop table t18_dependent_table;
@@ -944,8 +937,6 @@ drop view view_view;
 drop procedure if exists proc_19;
 --enable_warnings
 
-eval $base_count;
-
 # Using a temporary table internally should not confuse the prepared
 # statement code, and should not raise ER_PS_INVALIDATED errors
 prepare stmt from
@@ -956,17 +947,17 @@ prepare stmt from
 create procedure proc_19() select "hi there";
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure proc_19;
 create procedure proc_19() select "hi there, again";
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure proc_19;
 
@@ -974,19 +965,17 @@ drop procedure proc_19;
 --echo Testing 20: Special tables (log tables)
 --echo =====================================================================
 
-eval $base_count;
-
 prepare stmt from
  'select * from mysql.general_log where argument=\'IMPOSSIBLE QUERY STRING\'';
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 --echo =====================================================================
 --echo Testing 21: Special tables (system tables)
@@ -996,25 +985,23 @@ eval $reprepared;
 drop procedure if exists proc_21;
 --enable_warnings
 
-eval $base_count;
-
 prepare stmt from
  'select type, db, name from mysql.proc where name=\'proc_21\'';
 
 create procedure proc_21() select "hi there";
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure proc_21;
 create procedure proc_21() select "hi there, again";
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure proc_21;
 
@@ -1027,8 +1014,6 @@ drop table if exists t22_b;
 drop view if exists t22;
 --enable_warnings
 
-eval $base_count;
-
 create table t22_b(a int);
 
 create algorithm=temptable view t22 as select a*a as a2 from t22_b;
@@ -1041,15 +1026,15 @@ prepare stmt from 'select * from t22';
 
 insert into t22_b values (1), (2), (3);
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 insert into t22_b values (4), (5), (6);
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t22_b;
 drop view t22;
@@ -1063,8 +1048,6 @@ drop table if exists t23_a;
 drop table if exists t23_b;
 --enable_warnings
 
-eval $base_count;
-
 create table t23_a(a int);
 create table t23_b(b int);
 
@@ -1075,16 +1058,16 @@ prepare stmt from 'select * from t23_a j
 insert into t23_a values (1), (2), (3);
 insert into t23_b values (10), (20), (30);
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 insert into t23_a values (4);
 insert into t23_b values (40);
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t23_a;
 drop table t23_b;
@@ -1099,28 +1082,26 @@ drop table t23_b;
 drop table if exists t24_alter;
 --enable_warnings
 
-eval $base_count;
-
 create table t24_alter(a int);
 
 prepare stmt from 'alter table t24_alter add column b int';
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_alter;
 create table t24_alter(a1 int, a2 int);
 
 # t24_alter has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_alter drop column b;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_alter drop column b;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_alter;
 
@@ -1135,7 +1116,7 @@ insert into t24_repair values (1), (2), 
 
 prepare stmt from 'repair table t24_repair';
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_repair;
 create table t24_repair(a1 int, a2 int);
@@ -1143,15 +1124,15 @@ insert into t24_repair values (1, 10), (
 
 # t24_repair has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_repair add column b varchar(50) default NULL;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_repair drop column b;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_repair;
 
@@ -1166,7 +1147,7 @@ insert into t24_analyze values (1), (2),
 
 prepare stmt from 'analyze table t24_analyze';
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_analyze;
 create table t24_analyze(a1 int, a2 int);
@@ -1174,15 +1155,15 @@ insert into t24_analyze values (1, 10), 
 
 # t24_analyze has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_analyze add column b varchar(50) default NULL;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_analyze drop column b;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_analyze;
 
@@ -1197,7 +1178,7 @@ insert into t24_optimize values (1), (2)
 
 prepare stmt from 'optimize table t24_optimize';
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_optimize;
 create table t24_optimize(a1 int, a2 int);
@@ -1205,15 +1186,15 @@ insert into t24_optimize values (1, 10),
 
 # t24_optimize has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_optimize add column b varchar(50) default NULL;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t24_optimize drop column b;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_optimize;
 
@@ -1226,35 +1207,35 @@ drop procedure if exists changing_proc;
 prepare stmt from 'show create procedure changing_proc';
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 create procedure changing_proc() begin end;
 
 # changing_proc has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure changing_proc;
 create procedure changing_proc(x int, y int) begin end;
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop procedure changing_proc;
 
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 # SQLCOM_SHOW_CREATE_FUNC:
 
@@ -1265,35 +1246,35 @@ drop function if exists changing_func;
 prepare stmt from 'show create function changing_func';
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 create function changing_func() returns int return 0;
 
 # changing_proc has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop function changing_func;
 create function changing_func(x int, y int) returns int return x+y;
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop function changing_func;
 
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_SP_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 # SQLCOM_SHOW_CREATE_TRIGGER:
 
@@ -1306,10 +1287,10 @@ create table t24_trigger(a int);
 prepare stmt from 'show create trigger t24_bi;';
 --error ER_TRG_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_TRG_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 delimiter $$;
 create trigger t24_bi before insert on t24_trigger for each row
@@ -1321,9 +1302,9 @@ delimiter ;$$
 
 # t24_bi has changed, and it's not a problem
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop trigger t24_bi;
 delimiter $$;
@@ -1335,19 +1316,20 @@ $$
 delimiter ;$$
 
 # t24_bi has changed, and it's not a problem
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop trigger t24_bi;
 
 --error ER_TRG_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 --error ER_TRG_DOES_NOT_EXIST
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t24_trigger;
 
@@ -1361,23 +1343,21 @@ drop table t24_trigger;
 drop table if exists t25_num_col;
 --enable_warnings
 
-eval $base_count;
-
 create table t25_num_col(a int);
 
-prepare stmt from 'select * from t25_num_col';
+prepare stmt from 'select a from t25_num_col';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_num_col add column b varchar(50) default NULL;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_num_col;
 
@@ -1391,17 +1371,20 @@ create table t25_col_name(a int);
 
 prepare stmt from 'select * from t25_col_name';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_col_name change a b int;
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_col_name;
 
@@ -1415,17 +1398,20 @@ create table t25_col_type(a int);
 
 prepare stmt from 'select * from t25_col_type';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_col_type change a a varchar(10);
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_col_type;
 
@@ -1439,17 +1425,20 @@ create table t25_col_type_length(a varch
 
 prepare stmt from 'select * from t25_col_type_length';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_col_type_length change a a varchar(20);
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_col_type_length;
 
@@ -1463,17 +1452,20 @@ create table t25_col_null(a varchar(10))
 
 prepare stmt from 'select * from t25_col_null';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_col_null change a a varchar(10) NOT NULL;
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_col_null;
 
@@ -1488,22 +1480,23 @@ create table t25_col_default(a int, b in
 prepare stmt from 'insert into t25_col_default(a) values (?)';
 set @val=1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 set @val=2;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 
 alter table t25_col_default change b b int DEFAULT 20;
 
 set @val=3;
 # Must insert the correct default value for b
+set @expected = @expected + 1;
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 
 set @val=4;
 # Must insert the correct default value for b
 execute stmt using @val;
-eval $reprepared;
+eval $check;
 
 select * from t25_col_default;
 
@@ -1519,17 +1512,17 @@ create table t25_index(a varchar(10));
 
 prepare stmt from 'select * from t25_index';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 create index i1 on t25_index(a);
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_index;
 
@@ -1546,20 +1539,20 @@ show create table t25_index_unique;
 
 prepare stmt from 'select * from t25_index_unique';
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 alter table t25_index_unique drop index i1;
 create unique index i1 on t25_index_unique(a, b);
 
 show create table t25_index_unique;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table t25_index_unique;
 
@@ -1579,8 +1572,6 @@ drop function if exists func_12093_unrel
 drop procedure if exists proc_12093;
 --enable_warnings
 
-eval $base_count;
-
 connect (con1,localhost,root,,);
 
 connection default;
@@ -1609,9 +1600,9 @@ prepare stmt_sf from 'select func_12093(
 prepare stmt_sp from 'call proc_12093(func_12093())';
 
 execute stmt_sf;
-eval $reprepared;
+eval $check;
 execute stmt_sp;
-eval $reprepared;
+eval $check;
 
 connection con1;
 
@@ -1622,17 +1613,17 @@ connection default;
 
 # previously, failed with --error 1305
 execute stmt_sf;
-eval $reprepared;
+eval $check;
 # previously, failed with --error 1305
 execute stmt_sp;
-eval $reprepared;
+eval $check;
 
 # previously, failed with --error 1305
 execute stmt_sf;
-eval $reprepared;
+eval $check;
 # previously, failed with --error 1305
 execute stmt_sp;
-eval $reprepared;
+eval $check;
 
 deallocate prepare stmt_sf;
 deallocate prepare stmt_sp;
@@ -1652,26 +1643,25 @@ drop procedure proc_12093;
 drop function if exists func_21294;
 --enable_warnings
 
-eval $base_count;
-
 create function func_21294() returns int return 10;
 
 prepare stmt from "select func_21294()";
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop function func_21294;
 create function func_21294() returns int return 10;
 
 # might pass or fail, implementation dependent
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop function func_21294;
 create function func_21294() returns int return 20;
 
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 deallocate prepare stmt;
 drop function func_21294;
@@ -1687,8 +1677,6 @@ drop table if exists t_27420_101;
 drop view if exists v_27420;
 --enable_warnings
 
-eval $base_count;
-
 connect (con1,localhost,root,,);
 
 connection default;
@@ -1706,7 +1694,7 @@ create view v_27420 as select t_27420_10
 prepare stmt from 'select * from v_27420';
 
 execute stmt;
-eval $reprepared;
+eval $check;
 
 connection con1;
 
@@ -1715,9 +1703,9 @@ create table v_27420(X int, Y int);
 
 connection default;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 connection con1;
 
@@ -1727,9 +1715,10 @@ create table v_27420 (a int, b int, fill
 
 connection default;
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 disconnect con1;
 
@@ -1748,8 +1737,6 @@ drop table if exists t_27430_1;
 drop table if exists t_27430_2;
 --enable_warnings
 
-eval $base_count;
-
 create table t_27430_1 (a int not null, oref int not null, key(a));
 insert into t_27430_1 values
   (1, 1),
@@ -1769,9 +1756,9 @@ prepare stmt from 
  'select oref, a, a in (select a from t_27430_1 where oref=t_27430_2.oref) Z from
t_27430_2';
 
 execute stmt; 
-eval $reprepared;
+eval $check;
 execute stmt; 
-eval $reprepared;
+eval $check;
 
 drop table t_27430_1, t_27430_2;
 
@@ -1790,11 +1777,14 @@ insert into t_27430_2 values
   (NULL, 3),
   (NULL, 4);
 
-# REPREPARED +1
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
+set @expected = @expected + 1;
+--error ER_PS_REBIND
 execute stmt;
-eval $reprepared;
+eval $check;
 
 deallocate prepare stmt;
 drop table t_27430_1;
@@ -1811,8 +1801,6 @@ drop view if exists v_27690_1;
 drop table if exists v_27690_2;
 --enable_warnings
 
-eval $base_count;
-
 create table t_27690_1 (a int, b int);
 insert into t_27690_1 values (1,1),(2,2);
 
@@ -1822,27 +1810,27 @@ create table v_27690_2 as select * from 
 prepare stmt from 'select * from v_27690_1, v_27690_2'; 
 
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 drop table v_27690_1;
 
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 
 --error ER_NO_SUCH_TABLE
 execute stmt;
-eval $reprepared;
+eval $check;
 
 create view v_27690_1 as select A.a, A.b from t_27690_1 A, t_27690_1 B;
 
-# REPREPARED +1
+set @expected = @expected + 1;
 execute stmt;
-eval $reprepared;
+eval $check;
 execute stmt;
-eval $reprepared;
+eval $check;
 
 deallocate prepare stmt;
 drop table t_27690_1;
Thread
• bk commit into 5.1 tree (malff:1.2522)	marc.alff	7 Feb