MDEV-36787 Error 153: No savepoint with that name upon ROLLBACK TO SAVEPOINT, assertion failure

InnoDB was rolling back a transaction internally, while
the server thought the transaction stayed open.

this was fixed
in 10.11 by 387fe5e to rollback the transaction in the server
and in 12.3 by d228f23 to not rollback in InnoDB

let's keep 12.3 behavior, update test results to match.
but combine two nearly indentical test cases into one.

Author: vuvova

mysql-test/main/temp_table.result

@@ -697,31 +697,8 @@ TRUNCATE TABLE t1;
 TRUNCATE TABLE t1;
 UNLOCK TABLES;
 DROP TABLE t1;
-#
 # End of 10.6 tests
 #
-#
-# Failed CREATE TEMPORARY ... SELECT must not roll back transaction
-#
-CREATE TABLE t (pk INT PRIMARY KEY) ENGINE=InnoDB;
-START TRANSACTION;
-INSERT INTO t VALUES (0);
-INSERT INTO t VALUES (1);
-CREATE TEMPORARY TABLE tmp2 (a INT) ENGINE=InnoDB SELECT 'x' AS a;
-ERROR 22007: Incorrect integer value: 'x' for column `test`.`tmp2`.`a` at row 1
-SELECT * FROM t ORDER BY pk;
-pk
-0
-1
-INSERT INTO t VALUES (1);
-ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-COMMIT;
-SELECT * FROM t ORDER BY pk;
-pk
-0
-1
-DROP TABLE t;
-#
 # MDEV-38716: Server crashes in TABLE::evaluate_update_default_function
 #
 # Test case where ALTER doesn't add any new columns with default values

mysql-test/main/temp_table.test

@@ -765,26 +765,7 @@ TRUNCATE TABLE t1;
 UNLOCK TABLES;
 DROP TABLE t1;
 
---echo #
 --echo # End of 10.6 tests
---echo #
-
---echo #
---echo # Failed CREATE TEMPORARY ... SELECT must not roll back transaction
---echo #
-
-CREATE TABLE t (pk INT PRIMARY KEY) ENGINE=InnoDB;
-START TRANSACTION;
-INSERT INTO t VALUES (0);
-INSERT INTO t VALUES (1);
---error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
-CREATE TEMPORARY TABLE tmp2 (a INT) ENGINE=InnoDB SELECT 'x' AS a;
-SELECT * FROM t ORDER BY pk;
---error ER_DUP_ENTRY
-INSERT INTO t VALUES (1);
-COMMIT;
-SELECT * FROM t ORDER BY pk;
-DROP TABLE t;
 
 --echo #
 --echo # MDEV-38716: Server crashes in TABLE::evaluate_update_default_function

mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result

@@ -363,6 +363,8 @@ INSERT INTO t1 values (3,3);
 CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 ROLLBACK;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
 DROP TABLE IF EXISTS t2;
 Warnings:
 Note	1051	Unknown table 'test.t2'

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

@@ -329,6 +329,8 @@ INSERT INTO t1 values (3,3);
 CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 ROLLBACK;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
 DROP TABLE IF EXISTS t2;
 Warnings:
 Note	1051	Unknown table 'test.t2'

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

@@ -139,8 +139,7 @@ DROP TABLE t;
 #
 CREATE TABLE t (a INT) ENGINE=InnoDB;
 START TRANSACTION;
-SELECT * FROM t;
-a
+INSERT t VALUES (0),(1);
 SAVEPOINT A;
 select @@in_transaction;
 @@in_transaction
@@ -149,8 +148,12 @@ CREATE TEMPORARY TABLE tmp (a TINYINT) ENGINE=InnoDB AS SELECT 256 AS a;
 ERROR 22003: Out of range value for column 'a' at row 1
 select @@in_transaction;
 @@in_transaction
-0
+1
 ROLLBACK TO SAVEPOINT A;
-ERROR 42000: SAVEPOINT A does not exist
+COMMIT;
+SELECT * FROM t;
+a
+0
+1
 DROP TABLE t;
 # End of 10.11 tests

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

@@ -148,14 +148,15 @@ DROP TABLE t;
 --echo #
 CREATE TABLE t (a INT) ENGINE=InnoDB;
 START TRANSACTION;
-SELECT * FROM t;
+INSERT t VALUES (0),(1);
 SAVEPOINT A;
 select @@in_transaction;
 --error ER_WARN_DATA_OUT_OF_RANGE
 CREATE TEMPORARY TABLE tmp (a TINYINT) ENGINE=InnoDB AS SELECT 256 AS a;
 select @@in_transaction;
---error ER_SP_DOES_NOT_EXIST
 ROLLBACK TO SAVEPOINT A;
+COMMIT;
+SELECT * FROM t;
 DROP TABLE t;
 
 --echo # End of 10.11 tests