diff options
Diffstat (limited to 'mysql-test/suite/maria/t')
-rw-r--r-- | mysql-test/suite/maria/t/maria-connect.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-no-logging.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-preload-master.opt | 1 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-recovery-rtree-ft.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-recovery.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-recovery2.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria-recovery3.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria.test | 15 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria2.test | 1 | ||||
-rw-r--r-- | mysql-test/suite/maria/t/maria3.test | 2 |
10 files changed, 12 insertions, 19 deletions
diff --git a/mysql-test/suite/maria/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test index 9efb5844bc2..79ba45d2b13 100644 --- a/mysql-test/suite/maria/t/maria-connect.test +++ b/mysql-test/suite/maria/t/maria-connect.test @@ -27,7 +27,7 @@ insert t1 values (1),(2),(3); --error ER_DUP_ENTRY insert t1 values (4),(2),(5); select * from t1; -SHOW BINLOG EVENTS FROM 106; +SHOW BINLOG EVENTS FROM 107; drop table t1; set binlog_format=default; diff --git a/mysql-test/suite/maria/t/maria-no-logging.test b/mysql-test/suite/maria/t/maria-no-logging.test index f0533686588..7055a842510 100644 --- a/mysql-test/suite/maria/t/maria-no-logging.test +++ b/mysql-test/suite/maria/t/maria-no-logging.test @@ -4,7 +4,7 @@ # can't restart server in embedded --source include/not_embedded.inc -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; --disable_warnings drop database if exists mysqltest; diff --git a/mysql-test/suite/maria/t/maria-preload-master.opt b/mysql-test/suite/maria/t/maria-preload-master.opt deleted file mode 100644 index 959cf74c816..00000000000 --- a/mysql-test/suite/maria/t/maria-preload-master.opt +++ /dev/null @@ -1 +0,0 @@ ---skip-safemalloc diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test index a943185d12f..b39b36ed3e1 100644 --- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test +++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test @@ -7,7 +7,7 @@ --source include/have_debug.inc --source include/have_maria.inc -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; let $MARIA_LOG=.; --disable_warnings diff --git a/mysql-test/suite/maria/t/maria-recovery.test b/mysql-test/suite/maria/t/maria-recovery.test index 6eb91c59dc1..b0f01f37d0d 100644 --- a/mysql-test/suite/maria/t/maria-recovery.test +++ b/mysql-test/suite/maria/t/maria-recovery.test @@ -5,7 +5,7 @@ --source include/have_debug.inc --source include/have_maria.inc -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; let $MARIA_LOG=../../tmp; --disable_warnings diff --git a/mysql-test/suite/maria/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test index 81ea45fbd42..c1081d033ac 100644 --- a/mysql-test/suite/maria/t/maria-recovery2.test +++ b/mysql-test/suite/maria/t/maria-recovery2.test @@ -8,7 +8,7 @@ call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2\\)"); call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r"); -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; let $MARIA_LOG=../../tmp; --disable_warnings diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test index 192361633ca..a5fd55499a2 100644 --- a/mysql-test/suite/maria/t/maria-recovery3.test +++ b/mysql-test/suite/maria/t/maria-recovery3.test @@ -5,7 +5,7 @@ --source include/have_debug.inc --source include/have_maria.inc -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; let $MARIA_LOG=../../tmp; --disable_warnings diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test index ccbe2c99037..482f49d2ca1 100644 --- a/mysql-test/suite/maria/t/maria.test +++ b/mysql-test/suite/maria/t/maria.test @@ -14,7 +14,7 @@ set global storage_engine=aria; set session storage_engine=aria; set global aria_page_checksum=0; let $default_log_file_size=`select @@global.aria_log_file_size`; -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; # Initialise --disable_warnings @@ -551,6 +551,7 @@ commit; disconnect root; connection default; select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; +unlock tables; drop table t1,t2; set autocommit=1; # @@ -569,6 +570,7 @@ disconnect con1; connection default; SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2 WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1; +unlock tables; DROP TABLE t1,t2; # @@ -1793,6 +1795,7 @@ lock table t1 write concurrent; # should be fixed with fully implemented versioning --error ER_CHECK_NOT_IMPLEMENTED delete from t1; +unlock tables; drop table t1; # @@ -1852,16 +1855,6 @@ alter table t1 partition by list (s1) (partition p1 values in (2)); drop table t1; # -# Bug #39226 Aria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES - -create table t1 (c1 int); -create table t2 (c1 int); -lock table t1 read, t2 read; -flush tables with read lock; -unlock tables; -drop table t1, t2; - -# # Bug #40311 # Crash when aborting inserting of row with 2 blobs where first is short # diff --git a/mysql-test/suite/maria/t/maria2.test b/mysql-test/suite/maria/t/maria2.test index 00bbea165ee..df691569e05 100644 --- a/mysql-test/suite/maria/t/maria2.test +++ b/mysql-test/suite/maria/t/maria2.test @@ -83,6 +83,7 @@ insert into t1 values (2); alter table t1 modify i bigint default 1; select count(*) from t1; select * from t1; +unlock tables; drop table t1,t2; # diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test index 55b5959a970..3cf395f66e7 100644 --- a/mysql-test/suite/maria/t/maria3.test +++ b/mysql-test/suite/maria/t/maria3.test @@ -8,7 +8,7 @@ set global storage_engine=aria; set session storage_engine=aria; set global aria_page_checksum=0; let $default_log_file_size=`select @@global.aria_log_file_size`; -set global aria_log_file_size=4294967295; +set global aria_log_file_size=4294959104; # Initialise --disable_warnings |