summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/innodb-wl5522.result
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-04-11 16:50:32 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-04-30 19:34:08 +0400
commit9a8498066865b508239b36853403f2700800af2b (patch)
tree265e8c8abb576d57960a8f43ac6e5b4e0b9f9bf2 /mysql-test/suite/innodb/r/innodb-wl5522.result
parent8bbcc0d5050dcbd44c0bc396c6b1acd488d3dfe2 (diff)
downloadmariadb-git-9a8498066865b508239b36853403f2700800af2b.tar.gz
MDEV-12645 - mysql_install_db: no install test db option
Added --skip-test-db option to mysql_install_db. If specified, no test database created and relevant grants issued. Removed --skip-auth-anonymous-user option of mysql_install_db. Now it is covered by --skip-test-db. Dropped some Debian patches that did the same. Removed unused make_win_bin_dist.1, make_win_bin_dist and mysql_install_db.pl.in.
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-wl5522.result')
-rw-r--r--mysql-test/suite/innodb/r/innodb-wl5522.result14
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-wl5522.result b/mysql-test/suite/innodb/r/innodb-wl5522.result
index 4ef92cdfed9..1ed857af473 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522.result
@@ -31,12 +31,14 @@ a b c
822 Devotion asdfuihknaskdf
821 Cavalry ..asdasdfaeraf
CREATE TABLE t2(a INT PRIMARY KEY) ENGINE=InnoDB ROW_FORMAT=COMPACT;
+db.opt
t1.frm
t1.ibd
t2.frm
t2.ibd
FLUSH TABLE t1, t2 FOR EXPORT;
# List before copying files
+db.opt
t1.cfg
t1.frm
t1.ibd
@@ -61,12 +63,14 @@ a b c
# Restarting server
# Done restarting server
# List before t1 DISCARD
+db.opt
t1.frm
t1.ibd
t2.frm
t2.ibd
ALTER TABLE t1 DISCARD TABLESPACE;
# List after t1 DISCARD
+db.opt
t1.frm
t2.frm
t2.ibd
@@ -85,6 +89,7 @@ a b c
823 Evolution lsjndofiabsoibeg
822 Devotion asdfuihknaskdf
821 Cavalry ..asdasdfaeraf
+db.opt
t1.cfg
t1.frm
t1.ibd
@@ -107,6 +112,7 @@ DROP TABLE t1;
ALTER TABLE t2 ROW_FORMAT=DYNAMIC;
ALTER TABLE t2 DISCARD TABLESPACE;
# List after t2 DISCARD
+db.opt
t2.frm
ALTER TABLE t2 IMPORT TABLESPACE;
ERROR HY000: Schema mismatch (Table flags don't match, server table has 0x21 and the meta-data file has 0x1)
@@ -135,6 +141,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
t1.frm
t1.ibd
FLUSH TABLES t1 FOR EXPORT;
@@ -142,6 +149,7 @@ SELECT COUNT(*) FROM t1;
COUNT(*)
16
backup: t1
+db.opt
t1.cfg
t1.frm
t1.ibd
@@ -154,6 +162,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
+db.opt
t1.cfg
t1.frm
t1.ibd
@@ -173,6 +182,7 @@ INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
INSERT INTO t1(c2) SELECT c2 FROM t1;
+db.opt
t1.frm
t1.ibd
FLUSH TABLES t1 FOR EXPORT;
@@ -180,10 +190,12 @@ SELECT COUNT(*) FROM t1;
COUNT(*)
16
backup: t1
+db.opt
t1.cfg
t1.frm
t1.ibd
UNLOCK TABLES;
+db.opt
t1.frm
t1.ibd
INSERT INTO t1(c2) SELECT c2 FROM t1;
@@ -196,6 +208,7 @@ ALTER TABLE t1 DISCARD TABLESPACE;
SELECT * FROM t1;
ERROR HY000: Tablespace has been discarded for table `t1`
restore: t1 .ibd and .cfg files
+db.opt
t1.cfg
t1.frm
t1.ibd
@@ -220,6 +233,7 @@ SELECT COUNT(*) FROM t1 WHERE c2 = 1;
COUNT(*)
16
backup: t1
+db.opt
t1.cfg
t1.frm
t1.ibd