fix big tests for -ps

mysql-test/suite/funcs_1/t/myisam_views-big.test

@@ -9,6 +9,7 @@
 #
 # Set $engine_type
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
+--enable_prepare_warnings
 let $engine_type= myisam;
 
 # Create some objects needed in many testcases
@@ -27,6 +28,7 @@ let $message= Attention: The nesting level @max_level in Testcase 3.3.1.A6
               MyISAM(only) performance issues Bug#11948;
 --source include/show_msg80.inc
 SET @limit1 = 20;
+--disable_prepare_warnings
 --source suite/funcs_1/views/views_master.inc
 
 DROP DATABASE test1;

mysql-test/suite/innodb/r/doublewrite.result

@@ -28,10 +28,8 @@ commit work;
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if first page of user
 # tablespace is full of zeroes.
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 begin;
 insert into t1 values (6, repeat('%', 12));
 # Ensure that dirty pages of table t1 are flushed.
@@ -62,10 +60,8 @@ f1	f2
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if first page of user
 # tablespace is corrupted.
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
@@ -93,10 +89,8 @@ f1	f2
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if 2nd page of user
 # tablespace is full of zeroes.
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;
@@ -124,10 +118,8 @@ f1	f2
 # ---------------------------------------------------------------
 # Test Begin: Test if recovery works if 2nd page of user
 # tablespace is corrupted.
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
-Warnings:
-Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
 unlock tables;

mysql-test/suite/innodb/t/doublewrite.test

@@ -52,8 +52,8 @@ commit work;
 --echo # Test Begin: Test if recovery works if first page of user
 --echo # tablespace is full of zeroes.
 
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 
 begin;
 insert into t1 values (6, repeat('%', 12));
@@ -152,8 +152,8 @@ select f1, f2 from t1;
 --echo # Test Begin: Test if recovery works if first page of user
 --echo # tablespace is corrupted.
 
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 
 --echo # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
@@ -196,8 +196,8 @@ select f1, f2 from t1;
 --echo # Test Begin: Test if recovery works if 2nd page of user
 --echo # tablespace is full of zeroes.
 
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 
 --echo # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;
@@ -239,8 +239,8 @@ select f1, f2 from t1;
 --echo # Test Begin: Test if recovery works if 2nd page of user
 --echo # tablespace is corrupted.
 
-select space from information_schema.innodb_sys_tables
-where name = 'test/t1' into @space_id;
+select space into @space_id from information_schema.innodb_sys_tables
+where name = 'test/t1';
 
 --echo # Ensure that dirty pages of table t1 is flushed.
 flush tables t1 for export;

mysql-test/suite/parts/r/rpl_partition.result

@@ -59,16 +59,12 @@ INSERT INTO t1 VALUES (NULL, NOW(), USER() , UUID(),
 ins_count,'Going to test MBR for MySQL');
 SET ins_count = ins_count - 1;
 END WHILE;
-SELECT MAX(id) FROM t1 INTO del_count;
+SELECT MAX(id) INTO del_count FROM t1;
 WHILE del_count > 0 DO
 DELETE FROM t1 WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CREATE PROCEDURE p2()
 BEGIN
 DECLARE ins_count INT DEFAULT 1000; 
@@ -84,16 +80,12 @@ INSERT INTO t2 VALUES (NULL, NOW(), USER() , UUID(),
 ins_count,'Going to test MBR for MySQL');
 SET ins_count = ins_count - 1;
 END WHILE;
-SELECT MAX(id) FROM t2 INTO del_count;
+SELECT MAX(id) INTO del_count FROM t2;
 WHILE del_count > 0 DO
 DELETE FROM t2 WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 CREATE PROCEDURE p3()
 BEGIN
 DECLARE ins_count INT DEFAULT 1000; 
@@ -109,16 +101,12 @@ INSERT INTO t3 VALUES (NULL, NOW(), USER(), UUID(),
 ins_count,'Going to test MBR for MySQL');
 SET ins_count = ins_count - 1;
 END WHILE;
-SELECT MAX(id) FROM t3 INTO del_count;
+SELECT MAX(id) INTO del_count FROM t3;
 WHILE del_count > 0 DO
 DELETE FROM t3 WHERE id = del_count;
 SET del_count = del_count - 2;
 END WHILE;
 END|
-Warnings:
-Level	Warning
-Code	1287
-Message	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
 begin;
 CALL p1();
 commit;

mysql-test/suite/parts/t/rpl_partition.test

@@ -74,7 +74,7 @@ BEGIN
      SET ins_count = ins_count - 1;
    END WHILE;
    
-   SELECT MAX(id) FROM t1 INTO del_count;
+   SELECT MAX(id) INTO del_count FROM t1;
    WHILE del_count > 0 DO
      DELETE FROM t1 WHERE id = del_count;
      SET del_count = del_count - 2;
@@ -99,7 +99,7 @@ BEGIN
      SET ins_count = ins_count - 1;
    END WHILE;
    
-   SELECT MAX(id) FROM t2 INTO del_count;
+   SELECT MAX(id) INTO del_count FROM t2;
    WHILE del_count > 0 DO
      DELETE FROM t2 WHERE id = del_count;
      SET del_count = del_count - 2;
@@ -124,7 +124,7 @@ BEGIN
      SET ins_count = ins_count - 1;
    END WHILE;
 
-   SELECT MAX(id) FROM t3 INTO del_count;
+   SELECT MAX(id) INTO del_count FROM t3;
    WHILE del_count > 0 DO
      DELETE FROM t3 WHERE id = del_count;
    SET del_count = del_count - 2;