database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Igor Babaev
2018-06-03 10:34:41 -07:00
parent ffe83e8e7b ee5124d714
commit cab1d63826
1308 changed files with 50217 additions and 28761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/encryption/r/innodb-bad-key-change3.result
View File

@@ -14,6 +14,7 @@ t1 CREATE TABLE `t1` (
INSERT INTO t1 VALUES (1,'foobar'),(2,'barfoo');
FLUSH TABLE t1 FOR EXPORT;
# List before copying files
db.opt
t1.cfg
t1.frm
t1.ibd

3
mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
View File

@@ -38,6 +38,7 @@ backup: te_crc32
backup: t_crc32
backup: tpe_crc32
backup: tp_crc32
db.opt
t_crc32.cfg
t_crc32.frm
t_crc32.ibd
@@ -247,6 +248,7 @@ backup: te_innodb
backup: t_innodb
backup: tpe_innodb
backup: tp_innodb
db.opt
t_innodb.cfg
t_innodb.frm
t_innodb.ibd
@@ -456,6 +458,7 @@ backup: te_none
backup: t_none
backup: tpe_none
backup: tp_none
db.opt
t_none.cfg
t_none.frm
t_none.ibd

1
mysql-test/suite/encryption/r/innodb-discard-import-change.result
View File

@@ -24,6 +24,7 @@ backup: t2
backup: t3
backup: t4
backup: t5
db.opt
t1.cfg
t1.frm
t1.ibd

2
mysql-test/suite/encryption/r/innodb-discard-import.result
View File

@@ -44,6 +44,7 @@ count(*)
2000
FLUSH TABLE t1,t2,t3,t4 FOR EXPORT;
# List before copying files
db.opt
t1.cfg
t1.frm
t1.ibd
@@ -60,6 +61,7 @@ backup: t1
backup: t2
backup: t3
backup: t4
db.opt
t1.cfg
t1.frm
t1.ibd

2
mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
View File

@@ -25,6 +25,7 @@ NOT FOUND /foobar/ in t1.ibd
NOT FOUND /temp/ in t2.ibd
# t3 ... on expecting NOT FOUND
NOT FOUND /barfoo/ in t3.ibd
db.opt
t1.frm
t1.ibd
t2.frm
@@ -35,6 +36,7 @@ FLUSH TABLES t1, t2, t3 FOR EXPORT;
backup: t1
backup: t2
backup: t3
db.opt
t1.cfg
t1.frm
t1.ibd