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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ebdf70db
Commit
ebdf70db
authored
Jan 27, 2017
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure on innodb-wl5522
Added flush tables to avoid corruption of mtr/test_suppressions table.
parent
fea4959a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
mysql-test/suite/innodb/r/innodb-wl5522.result
mysql-test/suite/innodb/r/innodb-wl5522.result
+2
-0
mysql-test/suite/innodb/t/innodb-wl5522.test
mysql-test/suite/innodb/t/innodb-wl5522.test
+2
-0
No files found.
mysql-test/suite/innodb/r/innodb-wl5522.result
View file @
ebdf70db
call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT.");
call mtr.add_suppression("InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT.");
FLUSH TABLES;
CREATE TABLE t1
CREATE TABLE t1
(a INT AUTO_INCREMENT PRIMARY KEY,
(a INT AUTO_INCREMENT PRIMARY KEY,
b char(22),
b char(22),
...
@@ -1013,3 +1014,4 @@ DROP TABLE t1;
...
@@ -1013,3 +1014,4 @@ DROP TABLE t1;
call mtr.add_suppression("Got error -1 when reading table '.*'");
call mtr.add_suppression("Got error -1 when reading table '.*'");
call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'.*");
call mtr.add_suppression("InnoDB: Error: tablespace id and flags in file '.*'.*");
call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded");
call mtr.add_suppression("InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded");
FLUSH TABLES;
mysql-test/suite/innodb/t/innodb-wl5522.test
View file @
ebdf70db
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
call
mtr
.
add_suppression
(
"InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT."
);
call
mtr
.
add_suppression
(
"InnoDB: Unable to import tablespace .* because it already exists. Please DISCARD the tablespace before IMPORT."
);
FLUSH
TABLES
;
let
$MYSQLD_TMPDIR
=
`SELECT @@tmpdir`
;
let
$MYSQLD_TMPDIR
=
`SELECT @@tmpdir`
;
let
$MYSQLD_DATADIR
=
`SELECT @@datadir`
;
let
$MYSQLD_DATADIR
=
`SELECT @@datadir`
;
...
@@ -858,6 +859,7 @@ DROP TABLE t1;
...
@@ -858,6 +859,7 @@ DROP TABLE t1;
call
mtr
.
add_suppression
(
"Got error -1 when reading table '.*'"
);
call
mtr
.
add_suppression
(
"Got error -1 when reading table '.*'"
);
call
mtr
.
add_suppression
(
"InnoDB: Error: tablespace id and flags in file '.*'.*"
);
call
mtr
.
add_suppression
(
"InnoDB: Error: tablespace id and flags in file '.*'.*"
);
call
mtr
.
add_suppression
(
"InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded"
);
call
mtr
.
add_suppression
(
"InnoDB: The table .* doesn't have a corresponding tablespace, it was discarded"
);
FLUSH
TABLES
;
# cleanup
# cleanup
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
cfg
--
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
t1
.
cfg
...
...
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