mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A fix for MySQL#65146 introduced a new warning.

Browse source 
Minor wording changes in skip messages.
This commit is contained in:
Elena Stepanova 2013-11-28 19:54:07 +04:00
parent 3fc7743435
commit 253ed701e9
6 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/storage_engine/have_engine.inc
View file

@ -38,7 +38,7 @@ let $default_char_type = CHAR(8);
if (!$ENGINE)
{
--skip ERROR: Storage engine under test is not defined, export ENGINE env variable or set it in define_engine.inc
--skip Storage engine under test is not defined, export ENGINE env variable or set it in define_engine.inc
}
# Check that the storage engine is loaded. Here we don't need to worry about the case,

18
storage/innobase/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff Normal file
View file

@ -0,0 +1,18 @@
--- suite/storage_engine/trx/cons_snapshot_serializable.result 2013-11-27 18:46:36.000000000 +0400
+++ suite/storage_engine/trx/cons_snapshot_serializable.reject 2013-11-28 19:17:02.000000000 +0400
@@ -5,12 +5,15 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
+Warnings:
+Warning 138 InnoDB: WITH CONSISTENT SNAPSHOT was ignored because this phrase can only be used with REPEATABLE READ isolation level.
connection con2;
INSERT INTO t1 (a) VALUES (1);
connection con1;
# If consistent read works on this isolation level (SERIALIZABLE), the following SELECT should not return the value we inserted (1)
SELECT a FROM t1;
a
+1
COMMIT;
connection default;
disconnect con1;

2
storage/innobase/mysql-test/storage_engine/trx/disabled.def
View file

@ -1,2 +0,0 @@
cons_snapshot_serializable : MySQL:65146 (CONSISTENT SNAPSHOT does not work with SERIALIZABLE)

11
storage/innobase/mysql-test/storage_engine/trx/level_read_committed.rdiff Normal file
View file

@ -0,0 +1,11 @@
--- suite/storage_engine/trx/level_read_committed.result 2013-11-28 19:18:48.000000000 +0400
+++ suite/storage_engine/trx/level_read_committed.reject 2013-11-28 19:18:59.000000000 +0400
@@ -77,6 +77,8 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
+Warnings:
+Warning 138 InnoDB: WITH CONSISTENT SNAPSHOT was ignored because this phrase can only be used with REPEATABLE READ isolation level.
connection con2;
INSERT INTO t1 (a) VALUES (1);
connection con1;

11
storage/innobase/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff Normal file
View file

@ -0,0 +1,11 @@
--- suite/storage_engine/trx/level_read_uncommitted.result 2013-11-28 19:18:48.000000000 +0400
+++ suite/storage_engine/trx/level_read_uncommitted.reject 2013-11-28 19:19:50.000000000 +0400
@@ -102,6 +102,8 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
+Warnings:
+Warning 138 InnoDB: WITH CONSISTENT SNAPSHOT was ignored because this phrase can only be used with REPEATABLE READ isolation level.
connection con2;
INSERT INTO t1 (a) VALUES (1);
connection con1;

2
storage/myisammrg/mysql-test/storage_engine/disabled.def
View file

@ -1,2 +1,2 @@
alter_table_online : MySQL:57657 (Temporary MERGE table with temporary underlying is broken by ALTER)
alter_table_online : MDEV-5266 (Temporary MERGE table with temporary underlying is broken by ALTER)