1 files changed, 1 insertions, 160 deletions
diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result
index 657f26c27c3..b0a4a173289 100644
--- a/mysql-test/suite/handler/aria.result
+++ b/mysql-test/suite/handler/aria.result
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = Aria;
+SET SESSION DEFAULT_STORAGE_ENGINE = Aria;
 drop table if exists t1,t3,t4,t5;
 create table t1 (a int, b char(10), key a using btree (a), key b using btree (a,b));
 insert into t1 values
@@ -1132,166 +1132,7 @@ connection default;
 # Reaping 'select * from t2'
 ERROR 42S02: Table 'test.t2' doesn't exist
 handler t1 close;
-#
-# ROLLBACK TO SAVEPOINT releases transactional locks,
-# but has no effect on open HANDLERs
-#
-create table t2 like t1;
-create table t3 like t1;
-begin;
-# Have something before the savepoint
-select * from t3;
-a
-savepoint sv;
-handler t1 open;
-handler t1 read a first;
-a
-1
-handler t1 read a next;
-a
-2
-select * from t2;
-a
-connection con1;
-# Sending:
 drop table t1;
-connection con2;
-# Sending:
-drop table t2;
-connection default;
-# Let DROP TABLE statements sync in. We must use
-# a separate connection for that, because otherwise SELECT
-# will auto-close the HANDLERs, becaues there are pending
-# exclusive locks against them.
-connection con3;
-# Waiting for 'drop table t1' to get blocked...
-# Waiting for 'drop table t2' to get blocked...
-# Demonstrate that t2 lock was released and t2 was dropped
-# after ROLLBACK TO SAVEPOINT
-connection default;
-rollback to savepoint sv;
-connection con2;
-# Reaping 'drop table t2'...
-# Demonstrate that ROLLBACK TO SAVEPOINT didn't release the handler
-# lock.
-connection default;
-handler t1 read a next;
-a
-3
-handler t1 read a next;
-a
-4
-# Demonstrate that the drop will go through as soon as we close the 
-# HANDLER
-handler t1 close;
-connection con1;
-# Reaping 'drop table t1'...
-connection default;
-commit;
-drop table t3;
-#
-# A few special cases when using SAVEPOINT/ROLLBACK TO
-# SAVEPOINT and HANDLER.
-#
-# Show that rollback to the savepoint taken in the beginning
-# of the transaction doesn't release mdl lock on
-# the HANDLER that was opened later.
-#
-create table t1 (a int, key using btree (a));
-insert into t1 (a) values (1), (2), (3), (4), (5);
-create table t2 like t1;
-begin;
-savepoint sv;
-handler t1 open;
-handler t1 read a first;
-a
-1
-handler t1 read a next;
-a
-2
-select * from t2;
-a
-connection con1;
-# Sending:
-drop table t1;
-connection con2;
-# Sending:
-drop table t2;
-connection default;
-# Let DROP TABLE statements sync in. We must use
-# a separate connection for that, because otherwise SELECT
-# will auto-close the HANDLERs, becaues there are pending
-# exclusive locks against them.
-connection con3;
-# Waiting for 'drop table t1' to get blocked...
-# Waiting for 'drop table t2' to get blocked...
-# Demonstrate that t2 lock was released and t2 was dropped
-# after ROLLBACK TO SAVEPOINT
-connection default;
-rollback to savepoint sv;
-connection con2;
-# Reaping 'drop table t2'...
-# Demonstrate that ROLLBACK TO SAVEPOINT didn't release the handler
-# lock.
-connection default;
-handler t1 read a next;
-a
-3
-handler t1 read a next;
-a
-4
-# Demonstrate that the drop will go through as soon as we close the 
-# HANDLER
-handler t1 close;
-connection con1;
-# Reaping 'drop table t1'...
-connection default;
-commit;
-#
-# Show that rollback to the savepoint taken in the beginning
-# of the transaction works properly (no valgrind warnins, etc),
-# even though it's done after the HANDLER mdl lock that was there
-# at the beginning is released and added again.
-#
-create table t1 (a int, key using btree (a));
-insert into t1 (a) values (1), (2), (3), (4), (5);
-create table t2 like t1;
-create table t3 like t1;
-insert into t3 (a) select a from t1;
-begin;
-handler t1 open;
-savepoint sv;
-handler t1 read a first;
-a
-1
-select * from t2;
-a
-handler t1 close;
-handler t3 open;
-handler t3 read a first;
-a
-1
-rollback to savepoint sv;
-connection con1;
-drop table t1, t2;
-# Sending:
-drop table t3;
-# Let DROP TABLE statement sync in.
-connection con2;
-# Waiting for 'drop table t3' to get blocked...
-# Demonstrate that ROLLBACK TO SAVEPOINT didn't release the handler
-# lock.
-connection default;
-handler t3 read a next;
-a
-2
-# Demonstrate that the drop will go through as soon as we close the 
-# HANDLER
-handler t3 close;
-connection con1;
-# Reaping 'drop table t3'...
-connection default;
-commit;
 # 
 # If we have to wait on an exclusive locks while having
 # an open HANDLER, ER_LOCK_DEADLOCK is reported.