diff options
Diffstat (limited to 'mysql-test/main/sp.result')
| -rw-r--r-- | mysql-test/main/sp.result | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index 62da6359e40..35e58f3ad62 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -1,3 +1,5 @@ +set @save_character_set_client=@@character_set_client; +set @save_userstat=@@global.userstat, @@global.userstat= 0; use test; drop table if exists t1,t2,t3,t4; drop view if exists v1; @@ -3346,7 +3348,8 @@ läbel1: begin end| call bug6063()| call bug7088_1()| call bug7088_2()| -set character set default| +set @@character_set_client=@save_character_set_client| +set @@character_set_results=@save_character_set_client| show create procedure bug6063| Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation bug6063 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug6063`() @@ -6229,7 +6232,8 @@ END| CALL p1(); áâä NULL -SET NAMES default; +set @@character_set_client=@save_character_set_client; +set @@character_set_results=@save_character_set_client; DROP PROCEDURE p1; drop procedure if exists proc_25411_a; drop procedure if exists proc_25411_b; @@ -7622,6 +7626,7 @@ c1 c2 count(c3) 2012-03-01 02:00:00 3 1 DROP PROCEDURE p1; # End of 5.5 test +FLUSH USER_STATISTICS; CREATE PROCEDURE sp() ALTER TABLE non_existing_table OPTIMIZE PARTITION p0; CALL sp; Table Op Msg_type Msg_text @@ -8805,6 +8810,7 @@ Note 1050 Table 't1' already exists drop procedure p4; drop table t1; set @@sql_mode=@save_sql_mode; +set @@global.userstat= @save_userstat; # # MDEV-17363 Compressed columns cannot be restored from dump # COMPRESSED conflicted between data type and SP label, |