Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
253ed701
Commit
253ed701
authored
Nov 28, 2013
by
Elena Stepanova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix for MySQL#65146 introduced a new warning.
Minor wording changes in skip messages.
parent
3fc77434
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
4 deletions
+42
-4
mysql-test/suite/storage_engine/have_engine.inc
mysql-test/suite/storage_engine/have_engine.inc
+1
-1
storage/innobase/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff
...-test/storage_engine/trx/cons_snapshot_serializable.rdiff
+18
-0
storage/innobase/mysql-test/storage_engine/trx/disabled.def
storage/innobase/mysql-test/storage_engine/trx/disabled.def
+0
-2
storage/innobase/mysql-test/storage_engine/trx/level_read_committed.rdiff
.../mysql-test/storage_engine/trx/level_read_committed.rdiff
+11
-0
storage/innobase/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff
...ysql-test/storage_engine/trx/level_read_uncommitted.rdiff
+11
-0
storage/myisammrg/mysql-test/storage_engine/disabled.def
storage/myisammrg/mysql-test/storage_engine/disabled.def
+1
-1
No files found.
mysql-test/suite/storage_engine/have_engine.inc
View file @
253ed701
...
...
@@ -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,
...
...
storage/innobase/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff
0 → 100644
View file @
253ed701
--- 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;
storage/innobase/mysql-test/storage_engine/trx/disabled.def
deleted
100644 → 0
View file @
3fc77434
cons_snapshot_serializable : MySQL:65146 (CONSISTENT SNAPSHOT does not work with SERIALIZABLE)
storage/innobase/mysql-test/storage_engine/trx/level_read_committed.rdiff
0 → 100644
View file @
253ed701
--- 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;
storage/innobase/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff
0 → 100644
View file @
253ed701
--- 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;
storage/myisammrg/mysql-test/storage_engine/disabled.def
View file @
253ed701
alter_table_online : M
ySQL:57657
(Temporary MERGE table with temporary underlying is broken by ALTER)
alter_table_online : M
DEV-5266
(Temporary MERGE table with temporary underlying is broken by ALTER)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment