diff options
Diffstat (limited to 'storage/rocksdb/mysql-test/storage_engine/trx')
7 files changed, 122 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/delete.rdiff b/storage/rocksdb/mysql-test/storage_engine/trx/delete.rdiff new file mode 100644 index 00000000..dac23b83 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/delete.rdiff @@ -0,0 +1,10 @@ +--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/delete.result 2017-06-22 00:33:46.423995639 +0300 ++++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/delete.reject 2017-06-22 19:29:36.827567276 +0300 +@@ -68,5 +68,7 @@ + DELETE FROM t1; + INSERT INTO t1 (a,b) VALUES (1,'a'); + ROLLBACK TO SAVEPOINT spt1; ++ERROR HY000: MyRocks currently does not support ROLLBACK TO SAVEPOINT if modifying rows. + COMMIT; ++ERROR HY000: This transaction was rolled back and cannot be committed. Only supported operation is to roll it back, so all pending changes will be discarded. Please restart another transaction. + DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/disabled.def b/storage/rocksdb/mysql-test/storage_engine/trx/disabled.def new file mode 100644 index 00000000..4e227c10 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/disabled.def @@ -0,0 +1,4 @@ +cons_snapshot_serializable : Not supported +level_read_uncommitted : Not supported +level_serializable : Not supported +xa_recovery : MDEV-13155 - XA recovery not supported for RocksDB diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/insert.rdiff b/storage/rocksdb/mysql-test/storage_engine/trx/insert.rdiff new file mode 100644 index 00000000..36a71076 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/insert.rdiff @@ -0,0 +1,24 @@ +--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/insert.result 2017-06-22 00:33:46.423995639 +0300 ++++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/insert.reject 2017-06-22 19:29:39.131567262 +0300 +@@ -37,18 +37,18 @@ + INSERT INTO t1 SET a = 11, b = 'f'; + INSERT t1 SET b = DEFAULT; + ROLLBACK TO SAVEPOINT spt1; ++ERROR HY000: MyRocks currently does not support ROLLBACK TO SAVEPOINT if modifying rows. + INSERT INTO t1 (b,a) VALUES ('test1',10); ++ERROR HY000: This transaction was rolled back and cannot be committed. Only supported operation is to roll it back, so all pending changes will be discarded. Please restart another transaction. + COMMIT; ++ERROR HY000: This transaction was rolled back and cannot be committed. Only supported operation is to roll it back, so all pending changes will be discarded. Please restart another transaction. + SELECT a,b FROM t1; + a b + 1 a +-10 NULL + 10 foo +-10 test1 + 100 foo + 11 abc + 2 b +-20 NULL + 3 c + 4 d + 5 e diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/level_read_committed.rdiff b/storage/rocksdb/mysql-test/storage_engine/trx/level_read_committed.rdiff new file mode 100644 index 00000000..6b9e4a3f --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/level_read_committed.rdiff @@ -0,0 +1,10 @@ +--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/level_read_committed.result 2017-06-22 00:33:46.423995639 +0300 ++++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/level_read_committed.reject 2017-06-22 19:29:41.459567247 +0300 +@@ -77,6 +77,7 @@ + CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; + SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; + START TRANSACTION WITH CONSISTENT SNAPSHOT; ++ERROR HY000: Only REPEATABLE READ isolation level is supported for START TRANSACTION WITH CONSISTENT SNAPSHOT in RocksDB Storage Engine. + connection con2; + INSERT INTO t1 (a) VALUES (1); + connection con1; diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/level_repeatable_read.rdiff b/storage/rocksdb/mysql-test/storage_engine/trx/level_repeatable_read.rdiff new file mode 100644 index 00000000..cf770755 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/level_repeatable_read.rdiff @@ -0,0 +1,35 @@ +--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/level_repeatable_read.result 2017-06-22 00:33:46.423995639 +0300 ++++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/level_repeatable_read.reject 2017-06-22 20:33:13.935543284 +0300 +@@ -24,8 +24,7 @@ + SELECT a FROM t1; + a + INSERT INTO t1 (a) SELECT a+100 FROM t1; +-ERROR HY000: Lock wait timeout exceeded; try restarting transaction +-# WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. ++# WARNING: Statement ended with errno 0, errname ''. + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a +@@ -47,22 +46,16 @@ + # If it differs from the result file, it might indicate a problem. + SELECT a FROM t1; + a +-201 +-202 + COMMIT; + SELECT a FROM t1; + a + 1 + 2 +-201 +-202 + connection con2; + SELECT a FROM t1; + a + 1 + 2 +-201 +-202 + connection default; + disconnect con1; + disconnect con2; diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt b/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt new file mode 100644 index 00000000..d77a8227 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/suite.opt @@ -0,0 +1 @@ +--ignore-db-dirs=#rocksdb --plugin-load=$HA_ROCKSDB_SO --binlog_format=ROW --loose-rocksdb_flush_log_at_trx_commit=0 diff --git a/storage/rocksdb/mysql-test/storage_engine/trx/update.rdiff b/storage/rocksdb/mysql-test/storage_engine/trx/update.rdiff new file mode 100644 index 00000000..ab181947 --- /dev/null +++ b/storage/rocksdb/mysql-test/storage_engine/trx/update.rdiff @@ -0,0 +1,38 @@ +--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/update.result 2017-06-22 00:33:46.423995639 +0300 ++++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/trx/update.reject 2017-06-22 19:29:57.267567148 +0300 +@@ -29,20 +29,23 @@ + SAVEPOINT spt1; + UPDATE t1 SET b = ''; + ROLLBACK TO SAVEPOINT spt1; ++ERROR HY000: MyRocks currently does not support ROLLBACK TO SAVEPOINT if modifying rows. + UPDATE t1 SET b = 'upd' WHERE a = 10050; ++ERROR HY000: This transaction was rolled back and cannot be committed. Only supported operation is to roll it back, so all pending changes will be discarded. Please restart another transaction. + COMMIT; ++ERROR HY000: This transaction was rolled back and cannot be committed. Only supported operation is to roll it back, so all pending changes will be discarded. Please restart another transaction. + SELECT a,b FROM t1; + a b +-10050 upd +-10050 upd +-51 update2 +-51 update2 +-52 update2 +-52 update2 +-53 update2 +-53 update2 +-54 update2 +-54 update2 +-55 update2 +-55 update2 ++10050 NULL ++10050 NULL ++51 NULL ++51 NULL ++52 NULL ++52 NULL ++53 NULL ++53 NULL ++54 NULL ++54 NULL ++55 NULL ++55 NULL + DROP TABLE t1; |