Fixes for tests after merge from 5.0

mysql-test/r/grant.result:
  Fixed a result. Editor added wrong characters.
mysql-test/r/mysqlbinlog2.result:
  Fixed
mysql-test/r/sp.result:
  Fixed a result, moved lines around.
mysql-test/r/sp_trans.result:
  Fixed a result, moved lines around.
mysql-test/t/mysqlbinlog2.test:
  Merged tests from 5.0
mysql-test/t/sp_trans.test:
  Merged test from 5.0 and fixed to be compatible with 5.1
sql/sql_class.cc:
  Merged from 5.0
sql/sql_error.cc:
  Fixed push_warning()

mysql-test/r/grant.result

@@ -260,29 +260,29 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' IDENTIFIED BY PASSWORD '*2470C0C
 GRANT SELECT, INSERT, UPDATE ON `test`.* TO 'mysqltest_1'@'localhost'
 drop user mysqltest_1@localhost;
 SET NAMES koi8r;
-CREATE DATABASE ﾂﾄ;
+CREATE DATABASE ÂÄ;
-USE ﾂﾄ;
+USE ÂÄ;
-CREATE TABLE ﾔﾁﾂ (ﾋﾏﾌ int);
+CREATE TABLE ÔÁÂ (ËÏÌ int);
-GRANT SELECT ON ﾂﾄ.* TO ﾀﾚﾅﾒ@localhost;
+GRANT SELECT ON ÂÄ.* TO ÀÚÅÒ@localhost;
-SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;
+SHOW GRANTS FOR ÀÚÅÒ@localhost;
-Grants for ﾀﾚﾅﾒ@localhost
+Grants for ÀÚÅÒ@localhost
-GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT USAGE ON *.* TO 'ÀÚÅÒ'@'localhost'
-GRANT SELECT ON `ﾂﾄ`.* TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT SELECT ON `ÂÄ`.* TO 'ÀÚÅÒ'@'localhost'
-REVOKE SELECT ON ﾂﾄ.* FROM ﾀﾚﾅﾒ@localhost;
+REVOKE SELECT ON ÂÄ.* FROM ÀÚÅÒ@localhost;
-GRANT SELECT ON ﾂﾄ.ﾔﾁﾂ TO ﾀﾚﾅﾒ@localhost;
+GRANT SELECT ON ÂÄ.ÔÁÂ TO ÀÚÅÒ@localhost;
-SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;
+SHOW GRANTS FOR ÀÚÅÒ@localhost;
-Grants for ﾀﾚﾅﾒ@localhost
+Grants for ÀÚÅÒ@localhost
-GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT USAGE ON *.* TO 'ÀÚÅÒ'@'localhost'
-GRANT SELECT ON `ﾂﾄ`.`ﾔﾁﾂ` TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT SELECT ON `ÂÄ`.`ÔÁÂ` TO 'ÀÚÅÒ'@'localhost'
-REVOKE SELECT ON ﾂﾄ.ﾔﾁﾂ FROM ﾀﾚﾅﾒ@localhost;
+REVOKE SELECT ON ÂÄ.ÔÁÂ FROM ÀÚÅÒ@localhost;
-GRANT SELECT (ﾋﾏﾌ) ON ﾂﾄ.ﾔﾁﾂ TO ﾀﾚﾅﾒ@localhost;
+GRANT SELECT (ËÏÌ) ON ÂÄ.ÔÁÂ TO ÀÚÅÒ@localhost;
-SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;
+SHOW GRANTS FOR ÀÚÅÒ@localhost;
-Grants for ﾀﾚﾅﾒ@localhost
+Grants for ÀÚÅÒ@localhost
-GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT USAGE ON *.* TO 'ÀÚÅÒ'@'localhost'
-GRANT SELECT (ﾋﾏﾌ) ON `ﾂﾄ`.`ﾔﾁﾂ` TO 'ﾀﾚﾅﾒ'@'localhost'
+GRANT SELECT (ËÏÌ) ON `ÂÄ`.`ÔÁÂ` TO 'ÀÚÅÒ'@'localhost'
-REVOKE SELECT (ﾋﾏﾌ) ON ﾂﾄ.ﾔﾁﾂ FROM ﾀﾚﾅﾒ@localhost;
+REVOKE SELECT (ËÏÌ) ON ÂÄ.ÔÁÂ FROM ÀÚÅÒ@localhost;
-DROP USER ﾀﾚﾅﾒ@localhost;
+DROP USER ÀÚÅÒ@localhost;
-DROP DATABASE ﾂﾄ;
+DROP DATABASE ÂÄ;
 SET NAMES latin1;
 USE test;
 CREATE TABLE t1 (a int );
@@ -613,22 +613,22 @@ set @user123="non-existent";
 select * from mysql.db where user=@user123;
 Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv	Trigger_priv
 set names koi8r;
-create database ﾂﾄ;
+create database ÂÄ;
-grant select on ﾂﾄ.* to root@localhost;
+grant select on ÂÄ.* to root@localhost;
-select hex(Db) from mysql.db where Db='ﾂﾄ';
+select hex(Db) from mysql.db where Db='ÂÄ';
 hex(Db)
 D0B1D0B4
 show grants for root@localhost;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
-GRANT SELECT ON `ﾂﾄ`.* TO 'root'@'localhost'
+GRANT SELECT ON `ÂÄ`.* TO 'root'@'localhost'
 flush privileges;
 show grants for root@localhost;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
-GRANT SELECT ON `ﾂﾄ`.* TO 'root'@'localhost'
+GRANT SELECT ON `ÂÄ`.* TO 'root'@'localhost'
-drop database ﾂﾄ;
+drop database ÂÄ;
-revoke all privileges on ﾂﾄ.* from root@localhost;
+revoke all privileges on ÂÄ.* from root@localhost;
 show grants for root@localhost;
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

mysql-test/r/mysqlbinlog2.result

@@ -134,7 +134,6 @@ SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
 insert into t1 values(null, "d")/*!*/;
-SET INSERT_ID=5/*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
@@ -512,7 +511,6 @@ SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
 insert into t1 values(null, "d")/*!*/;
-SET INSERT_ID=5/*!*/;
 DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;

mysql-test/r/sp.result

@@ -5643,90 +5643,6 @@ t3_id_1	t3_id_2	t4_id
 DROP PROCEDURE p1|
 DROP VIEW v1, v2|
 DROP TABLE t3, t4|
-drop function if exists bug20777|
-drop table if exists examplebug20777|
-create function bug20777(f1 bigint unsigned) returns bigint unsigned
-begin
-set f1 = (f1 - 10); set f1 = (f1 10);
-return f1;
-end|
-select bug20777(9223372036854775803) as '9223372036854775803   2**63-5';
-9223372036854775803   2**63-5
-9223372036854775803
-select bug20777(9223372036854775804) as '9223372036854775804   2**63-4';
-9223372036854775804   2**63-4
-9223372036854775804
-select bug20777(9223372036854775805) as '9223372036854775805   2**63-3';
-9223372036854775805   2**63-3
-9223372036854775805
-select bug20777(9223372036854775806) as '9223372036854775806   2**63-2';
-9223372036854775806   2**63-2
-9223372036854775806
-select bug20777(9223372036854775807) as '9223372036854775807   2**63-1';
-9223372036854775807   2**63-1
-9223372036854775807
-select bug20777(9223372036854775808) as '9223372036854775808   2**63+0';
-9223372036854775808   2**63+0
-9223372036854775808
-select bug20777(9223372036854775809) as '9223372036854775809   2**63+1';
-9223372036854775809   2**63+1
-9223372036854775809
-select bug20777(9223372036854775810) as '9223372036854775810   2**63+2';
-9223372036854775810   2**63+2
-9223372036854775810
-select bug20777(-9223372036854775808) as 'lower bounds signed bigint';
-lower bounds signed bigint
-0
-select bug20777(9223372036854775807) as 'upper bounds signed bigint';
-upper bounds signed bigint
-9223372036854775807
-select bug20777(0) as 'lower bounds unsigned bigint';
-lower bounds unsigned bigint
-0
-select bug20777(18446744073709551615) as 'upper bounds unsigned bigint';
-upper bounds unsigned bigint
-18446744073709551615
-select bug20777(18446744073709551616) as 'upper bounds unsigned bigint 1';
-upper bounds unsigned bigint 1
-18446744073709551615
-select bug20777(-1) as 'lower bounds unsigned bigint - 1';
-lower bounds unsigned bigint - 1
-0
-create table examplebug20777 as select 
-0 as 'i',
-bug20777(9223372036854775806) as '2**63-2',
-bug20777(9223372036854775807) as '2**63-1',
-bug20777(9223372036854775808) as '2**63',
-bug20777(9223372036854775809) as '2**63+1',
-bug20777(18446744073709551614) as '2**64-2',
-bug20777(18446744073709551615) as '2**64-1', 
-bug20777(18446744073709551616) as '2**64',
-bug20777(0) as '0',
-bug20777(-1) as '-1';
-insert into examplebug20777 values (1, 9223372036854775806, 9223372036854775807, 223372036854775808, 9223372036854775809, 18446744073709551614, 18446744073709551615, 8446744073709551616, 0, -1);
-show create table examplebug20777;
-Table	Create Table
-examplebug20777	CREATE TABLE `examplebug20777` (
-  `i` int(1) NOT NULL DEFAULT '0',
-  `2**63-2` bigint(20) unsigned DEFAULT NULL,
-  `2**63-1` bigint(20) unsigned DEFAULT NULL,
-  `2**63` bigint(20) unsigned DEFAULT NULL,
-  `2**63+1` bigint(20) unsigned DEFAULT NULL,
-  `2**64-2` bigint(20) unsigned DEFAULT NULL,
-  `2**64-1` bigint(20) unsigned DEFAULT NULL,
-  `2**64` bigint(20) unsigned DEFAULT NULL,
-  `0` bigint(20) unsigned DEFAULT NULL,
-  `-1` bigint(20) unsigned DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-select * from examplebug20777 order by i;
-i	2**63-2	2**63-1	2**63	2**63+1	2**64-2	2**64-1	2**64	0	-1
-0	9223372036854775806	9223372036854775807	9223372036854775808	9223372036854775809	18446744073709551614	18446744073709551615	18446744073709551615	0	0
-1	9223372036854775806	9223372036854775807	223372036854775808	9223372036854775809	18446744073709551614	18446744073709551615	8446744073709551616	0	0
-drop table examplebug20777;
-select bug20777(18446744073709551613)+1;
-bug20777(18446744073709551613)+1
-18446744073709551614
-drop function bug20777;
 End of 5.0 tests
 Begin of 5.1 tests
 drop function if exists pi;
@@ -6160,6 +6076,91 @@ DATABASE()
 NULL
 DROP DATABASE mysqltest1|
 use test|
+drop function if exists bug20777|
+drop table if exists examplebug20777|
+create function bug20777(f1 bigint unsigned) returns bigint unsigned
+begin
+set f1 = (f1 - 10); set f1 = (f1 + 10);
+return f1;
+end|
+select bug20777(9223372036854775803) as '9223372036854775803   2**63-5';
+9223372036854775803   2**63-5
+9223372036854775803
+select bug20777(9223372036854775804) as '9223372036854775804   2**63-4';
+9223372036854775804   2**63-4
+9223372036854775804
+select bug20777(9223372036854775805) as '9223372036854775805   2**63-3';
+9223372036854775805   2**63-3
+9223372036854775805
+select bug20777(9223372036854775806) as '9223372036854775806   2**63-2';
+9223372036854775806   2**63-2
+9223372036854775806
+select bug20777(9223372036854775807) as '9223372036854775807   2**63-1';
+9223372036854775807   2**63-1
+9223372036854775807
+select bug20777(9223372036854775808) as '9223372036854775808   2**63+0';
+9223372036854775808   2**63+0
+9223372036854775808
+select bug20777(9223372036854775809) as '9223372036854775809   2**63+1';
+9223372036854775809   2**63+1
+9223372036854775809
+select bug20777(9223372036854775810) as '9223372036854775810   2**63+2';
+9223372036854775810   2**63+2
+9223372036854775810
+select bug20777(-9223372036854775808) as 'lower bounds signed bigint';
+lower bounds signed bigint
+0
+select bug20777(9223372036854775807) as 'upper bounds signed bigint';
+upper bounds signed bigint
+9223372036854775807
+select bug20777(0) as 'lower bounds unsigned bigint';
+lower bounds unsigned bigint
+0
+select bug20777(18446744073709551615) as 'upper bounds unsigned bigint';
+upper bounds unsigned bigint
+18446744073709551615
+select bug20777(18446744073709551616) as 'upper bounds unsigned bigint + 1';
+upper bounds unsigned bigint + 1
+18446744073709551615
+select bug20777(-1) as 'lower bounds unsigned bigint - 1';
+lower bounds unsigned bigint - 1
+0
+create table examplebug20777 as select 
+0 as 'i',
+bug20777(9223372036854775806) as '2**63-2',
+bug20777(9223372036854775807) as '2**63-1',
+bug20777(9223372036854775808) as '2**63',
+bug20777(9223372036854775809) as '2**63+1',
+bug20777(18446744073709551614) as '2**64-2',
+bug20777(18446744073709551615) as '2**64-1', 
+bug20777(18446744073709551616) as '2**64',
+bug20777(0) as '0',
+bug20777(-1) as '-1';
+insert into examplebug20777 values (1, 9223372036854775806, 9223372036854775807, 223372036854775808, 9223372036854775809, 18446744073709551614, 18446744073709551615, 8446744073709551616, 0, -1);
+show create table examplebug20777;
+Table	Create Table
+examplebug20777	CREATE TABLE `examplebug20777` (
+  `i` int(1) NOT NULL DEFAULT '0',
+  `2**63-2` bigint(20) unsigned DEFAULT NULL,
+  `2**63-1` bigint(20) unsigned DEFAULT NULL,
+  `2**63` bigint(20) unsigned DEFAULT NULL,
+  `2**63+1` bigint(20) unsigned DEFAULT NULL,
+  `2**64-2` bigint(20) unsigned DEFAULT NULL,
+  `2**64-1` bigint(20) unsigned DEFAULT NULL,
+  `2**64` bigint(20) unsigned DEFAULT NULL,
+  `0` bigint(20) unsigned DEFAULT NULL,
+  `-1` bigint(20) unsigned DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+select * from examplebug20777 order by i;
+i	2**63-2	2**63-1	2**63	2**63+1	2**64-2	2**64-1	2**64	0	-1
+0	9223372036854775806	9223372036854775807	9223372036854775808	9223372036854775809	18446744073709551614	18446744073709551615	18446744073709551615	0	0
+1	9223372036854775806	9223372036854775807	223372036854775808	9223372036854775809	18446744073709551614	18446744073709551615	8446744073709551616	0	0
+drop table examplebug20777;
+select bug20777(18446744073709551613)+1;
+bug20777(18446744073709551613)+1
+18446744073709551614
+drop function bug20777;
+End of 5.0 tests.
 drop table t1,t2;
 CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;
 CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;

mysql-test/r/sp_trans.result

@@ -530,27 +530,6 @@ count(*)
 drop table t3, t4|
 drop procedure bug14210|
 set @@session.max_heap_table_size=default|
-drop function if exists bug23333|
-drop table if exists t1,t2|
-CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
-CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
-insert into t2 values (1,1)|
-create function bug23333() 
-RETURNS int(11)
-DETERMINISTIC
-begin
-insert into t1 values (null);
-select count(*) from t1 into @a;
-return @a;
-end|
-reset master|
-insert into t2 values (bug23333(),1)|
-ERROR 23000: Duplicate entry '1' for key 1
-show binlog events from 98 /* with fixes for #23333 will show there is the query */|
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-select count(*),@a from t1 /* must be 1,1 */|
-count(*)	@a
-1	1
 CREATE DATABASE db_bug7787|
 use db_bug7787|
 CREATE PROCEDURE p1()
@@ -577,3 +556,28 @@ f1	bug13575(f1)
 3	ccc
 drop function bug13575|
 drop table t3|
+drop function if exists bug23333|
+drop table if exists t1,t2|
+CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
+CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
+insert into t2 values (1,1)|
+create function bug23333() 
+RETURNS int(11)
+DETERMINISTIC
+begin
+insert into t1 values (null);
+select count(*) from t1 into @a;
+return @a;
+end|
+reset master|
+insert into t2 values (bug23333(),1)|
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+show binlog events from 106 /* with fixes for #23333 will show there is the query */|
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Table_map	1	#	#
+master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Query	1	#	#
+select count(*),@a from t1 /* must be 1,1 */|
+count(*)	@a
+1	1

mysql-test/t/mysqlbinlog2.test

@@ -60,7 +60,7 @@ select "--- stop-position --" as "";
 --disable_query_log
 select "--- start and stop positions ---" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=600 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -115,14 +115,14 @@ select "--- start-position --" as "";
 --enable_query_log
 --exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
-select "--- start and stop positions ---" as "";
---enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=600 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
---disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
 --exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
+select "--- start and stop positions ---" as "";
+--enable_query_log
+--exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
 --exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001

mysql-test/t/sp_trans.test

@@ -617,10 +617,10 @@ begin
 end|
 
 reset master|
---error ER_DUP_ENTRY
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t2 values (bug23333(),1)| 
 --replace_column 2 # 5 # 6 #
-show binlog events from 98 /* with fixes for #23333 will show there is the query */|
+show binlog events from 106 /* with fixes for #23333 will show there is the query */|
 select count(*),@a from t1 /* must be 1,1 */|
 
 #

sql/sql_class.cc

@@ -367,6 +367,7 @@ void THD::init(void)
   if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
     server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
   options= thd_startup_options;
+  no_trans_update.stmt= no_trans_update.all= FALSE;
   open_options=ha_open_options;
   update_lock_default= (variables.low_priority_updates ?
 			TL_WRITE_LOW_PRIORITY :
@@ -437,6 +438,7 @@ void THD::cleanup(void)
   DBUG_ENTER("THD::cleanup");
   DBUG_ASSERT(cleanup_done == 0);
 
+  killed= KILL_CONNECTION;
 #ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE
   if (transaction.xid_state.xa_state == XA_PREPARED)
   {

sql/sql_error.cc

@@ -147,15 +147,9 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
 
   if (thd->warn_list.elements < thd->variables.max_error_count)
   {
-    /*
+    /* We have to use warn_root, as mem_root is freed after each query */
-      The following code is here to change the allocation to not
+    if ((err= new (&thd->warn_root) MYSQL_ERROR(thd, code, level, msg)))
-      use the thd->mem_root, which is freed after each query
-    */
-    MEM_ROOT *old_root= thd->mem_root;
-    thd->mem_root= &thd->warn_root;
-    if ((err= new MYSQL_ERROR(thd, code, level, msg)))
       thd->warn_list.push_back(err);
-    thd->mem_root= old_root;
   }
   thd->warn_count[(uint) level]++;
   thd->total_warn_count++;