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
ebaa6006
Commit
ebaa6006
authored
Oct 05, 2011
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
merge 5.1-mtr => 5.1
parents
cff85ac1
9c68ca63
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
9 additions
and
70 deletions
+9
-70
mysql-test/include/mtr_check.sql
mysql-test/include/mtr_check.sql
+2
-1
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+5
-2
mysql-test/r/partition_innodb_plugin.result
mysql-test/r/partition_innodb_plugin.result
+0
-2
mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
+0
-1
mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
+0
-1
mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
+0
-9
mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
+0
-9
mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
+0
-9
mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
+0
-9
mysql-test/suite/innodb_plugin/t/innodb-create-options.test
mysql-test/suite/innodb_plugin/t/innodb-create-options.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb-index.test
mysql-test/suite/innodb_plugin/t/innodb-index.test
+0
-9
mysql-test/suite/innodb_plugin/t/innodb-zip.test
mysql-test/suite/innodb_plugin/t/innodb-zip.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb_bug47167-master.opt
mysql-test/suite/innodb_plugin/t/innodb_bug47167-master.opt
+1
-0
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
+0
-2
mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
+0
-4
mysql-test/suite/innodb_plugin/t/innodb_file_format-master.opt
...-test/suite/innodb_plugin/t/innodb_file_format-master.opt
+1
-0
mysql-test/t/partition_innodb_plugin.test
mysql-test/t/partition_innodb_plugin.test
+0
-2
No files found.
mysql-test/include/mtr_check.sql
View file @
ebaa6006
...
...
@@ -27,7 +27,8 @@ BEGIN
-- Dump all global variables except those
-- that are supposed to change
SELECT
*
FROM
INFORMATION_SCHEMA
.
GLOBAL_VARIABLES
WHERE
variable_name
!=
'timestamp'
ORDER
BY
VARIABLE_NAME
;
WHERE
variable_name
NOT
IN
(
'timestamp'
,
'innodb_file_format_check'
)
ORDER
BY
VARIABLE_NAME
;
-- Dump all databases, there should be none
-- except those that was created during bootstrap
...
...
mysql-test/lib/mtr_cases.pm
View file @
ebaa6006
...
...
@@ -222,8 +222,11 @@ sub collect_test_cases ($$$) {
sub
split_testname
{
my
(
$test_name
)
=
@_
;
# Get rid of directory part and split name on .'s
my
@parts
=
split
(
/\./
,
basename
(
$test_name
));
# If .test file name is used, get rid of directory part
$test_name
=
basename
(
$test_name
)
if
$test_name
=~
/\.test$/
;
# Now split name on .'s
my
@parts
=
split
(
/\./
,
$test_name
);
if
(
@parts
==
1
){
# Only testname given, ex: alias
...
...
mysql-test/r/partition_innodb_plugin.result
View file @
ebaa6006
...
...
@@ -2,7 +2,6 @@ call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB
#
# Bug#55091: Server crashes on ADD PARTITION after a failed attempt
#
SET @old_innodb_file_format_check = @@global.innodb_file_format_check;
SET @old_innodb_file_format = @@global.innodb_file_format;
SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
...
...
@@ -70,7 +69,6 @@ DROP TABLE t1;
SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
SET @@global.innodb_file_format = @old_innodb_file_format;
SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
SET @@global.innodb_file_format_check = @old_innodb_file_format_check;
SET NAMES utf8;
CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a))
ENGINE=InnoDB
...
...
mysql-test/suite/innodb_plugin/r/innodb_bug52745.result
View file @
ebaa6006
...
...
@@ -126,5 +126,4 @@ Warning 1265 Data truncated for column 'col79' at row 1
Warning 1264 Out of range value for column 'col84' at row 1
DROP TABLE bug52745;
SET GLOBAL innodb_file_format=Antelope;
SET GLOBAL innodb_file_format_check=Antelope;
SET GLOBAL innodb_file_per_table=0;
mysql-test/suite/innodb_plugin/r/innodb_bug53591.result
View file @
ebaa6006
...
...
@@ -12,5 +12,4 @@ Error 1118 Row size too large. The maximum row size for the used table type, not
Error 1030 Got error 139 from storage engine
DROP TABLE bug53591;
SET GLOBAL innodb_file_format=Antelope;
SET GLOBAL innodb_file_format_check=Antelope;
SET GLOBAL innodb_file_per_table=0;
mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
View file @
ebaa6006
...
...
@@ -2,8 +2,6 @@
# embedded server ignores 'delayed', so skip this
--
source
include
/
not_embedded
.
inc
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
...
...
@@ -20,10 +18,3 @@ SHOW CREATE TABLE t1;
INSERT
INTO
t1
VALUES
(
null
);
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
#
# restore environment to the state it was before this test execution
#
--
disable_query_log
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
View file @
ebaa6006
...
...
@@ -2,8 +2,6 @@
# embedded server ignores 'delayed', so skip this
--
source
include
/
not_embedded
.
inc
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
...
...
@@ -34,10 +32,3 @@ SHOW CREATE TABLE t1;
INSERT
INTO
t1
VALUES
(
null
);
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
#
# restore environment to the state it was before this test execution
#
--
disable_query_log
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
View file @
ebaa6006
--
source
include
/
have_innodb_plugin
.
inc
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
##
# Bug #56228: dropping tables from within an active statement crashes server
#
...
...
@@ -33,10 +31,3 @@ SELECT bug56228();
DROP
FUNCTION
bug56228
;
DROP
TEMPORARY
TABLE
t2_56228
;
DROP
TEMPORARY
TABLE
IF
EXISTS
t1_56228
;
#
# restore environment to the state it was before this test execution
#
--
disable_query_log
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
View file @
ebaa6006
...
...
@@ -2,8 +2,6 @@
# embedded server ignores 'delayed', so skip this
--
source
include
/
not_embedded
.
inc
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
--
disable_warnings
drop
table
if
exists
t1
;
--
enable_warnings
...
...
@@ -639,10 +637,3 @@ INSERT INTO t1 VALUES (18446744073709551615);
--
source
include
/
restart_mysqld
.
inc
SHOW
CREATE
TABLE
t1
;
DROP
TABLE
t1
;
#
# restore environment to the state it was before this test execution
#
--
disable_query_log
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb-create-options.test
View file @
ebaa6006
...
...
@@ -61,7 +61,6 @@ SET storage_engine=InnoDB;
--
disable_query_log
# These values can change during the test
LET
$innodb_file_format_orig
=
`select @@innodb_file_format`
;
LET
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
LET
$innodb_file_per_table_orig
=
`select @@innodb_file_per_table`
;
LET
$innodb_strict_mode_orig
=
`select @@session.innodb_strict_mode`
;
--
enable_query_log
...
...
@@ -568,7 +567,6 @@ DROP TABLE IF EXISTS t1;
--
disable_query_log
EVAL
SET
GLOBAL
innodb_file_format
=
$innodb_file_format_orig
;
EVAL
SET
GLOBAL
innodb_file_format_check
=
$innodb_file_format_check_orig
;
EVAL
SET
GLOBAL
innodb_file_per_table
=
$innodb_file_per_table_orig
;
EVAL
SET
SESSION
innodb_strict_mode
=
$innodb_strict_mode_orig
;
--
enable_query_log
...
...
mysql-test/suite/innodb_plugin/t/innodb-index.test
View file @
ebaa6006
...
...
@@ -2,8 +2,6 @@
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
let
$per_table
=
`select @@innodb_file_per_table`
;
let
$format
=
`select @@innodb_file_format`
;
set
global
innodb_file_per_table
=
on
;
...
...
@@ -680,10 +678,3 @@ DROP TABLE t1;
DROP
TABLE
t1_purge
,
t2_purge
,
t3_purge
,
t4_purge
;
DROP
TABLE
t12637786
;
DROP
TABLE
t12963823
;
#
# restore environment to the state it was before this test execution
#
--
disable_query_log
eval
SET
GLOBAL
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb-zip.test
View file @
ebaa6006
...
...
@@ -2,7 +2,6 @@
let
$per_table
=
`select @@innodb_file_per_table`
;
let
$format
=
`select @@innodb_file_format`
;
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
set
global
innodb_file_per_table
=
off
;
set
global
innodb_file_format
=
`0`
;
...
...
@@ -337,4 +336,3 @@ drop table normal_table, zip_table;
--
disable_query_log
eval
set
global
innodb_file_format
=
$format
;
eval
set
global
innodb_file_per_table
=
$per_table
;
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
View file @
ebaa6006
...
...
@@ -15,7 +15,6 @@ SET storage_engine=InnoDB;
--
disable_result_log
let
$file_format
=
`select @@innodb_file_format`
;
let
$file_format_check
=
`select @@innodb_file_format_check`
;
let
$file_per_table
=
`select @@innodb_file_per_table`
;
SET
GLOBAL
innodb_file_format
=
'Barracuda'
;
SET
GLOBAL
innodb_file_per_table
=
on
;
...
...
@@ -28,5 +27,4 @@ INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.90
CHECK
TABLE
table0
EXTENDED
;
DROP
TABLE
table0
;
EVAL
SET
GLOBAL
innodb_file_format
=
$file_format
;
EVAL
SET
GLOBAL
innodb_file_format_check
=
$file_format_check
;
EVAL
SET
GLOBAL
innodb_file_per_table
=
$file_per_table
;
mysql-test/suite/innodb_plugin/t/innodb_bug47167-master.opt
0 → 100644
View file @
ebaa6006
--force-restart
mysql-test/suite/innodb_plugin/t/innodb_bug52745.test
View file @
ebaa6006
--
source
include
/
have_innodb_plugin
.
inc
let
$file_format
=
`select @@innodb_file_format`
;
let
$file_format_check
=
`select @@innodb_file_format_check`
;
let
$file_per_table
=
`select @@innodb_file_per_table`
;
SET
GLOBAL
innodb_file_format
=
'Barracuda'
;
SET
GLOBAL
innodb_file_per_table
=
on
;
...
...
@@ -105,5 +104,4 @@ SHOW WARNINGS;
DROP
TABLE
bug52745
;
EVAL
SET
GLOBAL
innodb_file_format
=
$file_format
;
EVAL
SET
GLOBAL
innodb_file_format_check
=
$file_format_check
;
EVAL
SET
GLOBAL
innodb_file_per_table
=
$file_per_table
;
mysql-test/suite/innodb_plugin/t/innodb_bug53591.test
View file @
ebaa6006
--
source
include
/
have_innodb_plugin
.
inc
let
$file_format
=
`select @@innodb_file_format`
;
let
$file_format_check
=
`select @@innodb_file_format_check`
;
let
$file_per_table
=
`select @@innodb_file_per_table`
;
SET
GLOBAL
innodb_file_format
=
'Barracuda'
;
...
...
@@ -18,5 +17,4 @@ SHOW WARNINGS;
DROP
TABLE
bug53591
;
EVAL
SET
GLOBAL
innodb_file_format
=
$file_format
;
EVAL
SET
GLOBAL
innodb_file_format_check
=
$file_format_check
;
EVAL
SET
GLOBAL
innodb_file_per_table
=
$file_per_table
;
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
View file @
ebaa6006
...
...
@@ -7,7 +7,6 @@
SET
@
tx_isolation_orig
=
@@
tx_isolation
;
SET
@
innodb_file_per_table_orig
=
@@
innodb_file_per_table
;
SET
@
innodb_file_format_orig
=
@@
innodb_file_format
;
SET
@
innodb_file_format_check_orig
=
@@
innodb_file_format_check
;
# The flag innodb_change_buffering_debug is only available in debug builds.
# It instructs InnoDB to try to evict pages from the buffer pool when
# change buffering is possible, so that the change buffer will be used
...
...
@@ -137,6 +136,5 @@ DROP TABLE bug56680;
SET
GLOBAL
tx_isolation
=
@
tx_isolation_orig
;
SET
GLOBAL
innodb_file_per_table
=
@
innodb_file_per_table_orig
;
SET
GLOBAL
innodb_file_format
=
@
innodb_file_format_orig
;
SET
GLOBAL
innodb_file_format_check
=
@
innodb_file_format_check_orig
;
--
error
0
,
ER_UNKNOWN_SYSTEM_VARIABLE
SET
GLOBAL
innodb_change_buffering_debug
=
@
innodb_change_buffering_debug_orig
;
mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
View file @
ebaa6006
...
...
@@ -3,8 +3,6 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb_plugin
.
inc
let
$innodb_file_format_check_orig
=
`select @@innodb_file_format_check`
;
CREATE
TABLE
t
(
a
INT
PRIMARY
KEY
,
b
INT
)
ENGINE
=
InnoDB
;
INSERT
INTO
t
VALUES
(
2
,
2
),(
4
,
4
),(
8
,
8
),(
16
,
16
),(
32
,
32
);
COMMIT
;
...
...
@@ -66,5 +64,3 @@ XA COMMIT '789';
SELECT
*
FROM
t
;
DROP
TABLE
t
;
--
disable_query_log
eval
set
global
innodb_file_format_check
=
$innodb_file_format_check_orig
;
mysql-test/suite/innodb_plugin/t/innodb_file_format-master.opt
0 → 100644
View file @
ebaa6006
--force-restart
mysql-test/t/partition_innodb_plugin.test
View file @
ebaa6006
...
...
@@ -9,7 +9,6 @@ call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB
--
echo
#
--
echo
# Bug#55091: Server crashes on ADD PARTITION after a failed attempt
--
echo
#
SET
@
old_innodb_file_format_check
=
@@
global
.
innodb_file_format_check
;
SET
@
old_innodb_file_format
=
@@
global
.
innodb_file_format
;
SET
@
old_innodb_file_per_table
=
@@
global
.
innodb_file_per_table
;
SET
@
old_innodb_strict_mode
=
@@
global
.
innodb_strict_mode
;
...
...
@@ -68,7 +67,6 @@ DROP TABLE t1;
SET
@@
global
.
innodb_strict_mode
=
@
old_innodb_strict_mode
;
SET
@@
global
.
innodb_file_format
=
@
old_innodb_file_format
;
SET
@@
global
.
innodb_file_per_table
=
@
old_innodb_file_per_table
;
SET
@@
global
.
innodb_file_format_check
=
@
old_innodb_file_format_check
;
#
# Bug#32430 - show engine innodb status causes errors
...
...
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