-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 10.0 into 10.1, plus fixup for MDEV-12873
Cover innodb.table_flags with the new innodb_page_size.combinations 32k and 64k. dict_sys_tables_type_validate(): Remove an assertion that made a check in the function redundant. Remove the excessive output to the error log, as the invalid SYS_TABLES.TYPE value is already being output.
- Loading branch information
Showing
10 changed files
with
723 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
--- suite/innodb/r/table_flags.result | ||
+++ suite/innodb/r/table_flags,32k.reject | ||
@@ -4,6 +4,8 @@ | ||
CREATE TABLE td(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC; | ||
CREATE TABLE tz(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=COMPRESSED | ||
KEY_BLOCK_SIZE=1; | ||
+Warnings: | ||
+Warning 1478 InnoDB: Cannot create a COMPRESSED table when innodb_page_size > 16k. Assuming ROW_FORMAT=COMPACT. | ||
CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC | ||
PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9; | ||
SYS_TABLES clustered index root page (8): | ||
@@ -11,7 +13,7 @@ | ||
header=0x01000003016e (NAME=0x696e66696d756d00) | ||
header=0x00002815008d (NAME='SYS_DATAFILES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320194, | ||
+ DB_ROLL_PTR=0x81000001310194, | ||
ID=0x000000000000000e, | ||
N_COLS=0x00000002, | ||
TYPE=0x00000001, | ||
@@ -21,7 +23,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0000101500d5 (NAME='SYS_FOREIGN', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0110, | ||
+ DB_ROLL_PTR=0x800000012c0110, | ||
ID=0x000000000000000b, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -31,7 +33,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000018150122 (NAME='SYS_FOREIGN_COLS', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0201, | ||
+ DB_ROLL_PTR=0x800000012c0201, | ||
ID=0x000000000000000c, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -41,7 +43,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0400201501fc (NAME='SYS_TABLESPACES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320110, | ||
+ DB_ROLL_PTR=0x81000001310110, | ||
ID=0x000000000000000d, | ||
N_COLS=0x00000003, | ||
TYPE=0x00000001, | ||
@@ -51,7 +53,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000038150240 (NAME='test/tc', | ||
DB_TRX_ID=0x000000000303, | ||
- DB_ROLL_PTR=0x83000001360110, | ||
+ DB_ROLL_PTR=0x83000001350110, | ||
ID=0x0000000000000010, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000001, | ||
@@ -61,7 +63,7 @@ | ||
SPACE=0x00000002) | ||
header=0x0000401502c8 (NAME='test/td', | ||
DB_TRX_ID=0x000000000304, | ||
- DB_ROLL_PTR=0x84000001370110, | ||
+ DB_ROLL_PTR=0x84000001360110, | ||
ID=0x0000000000000011, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -71,7 +73,7 @@ | ||
SPACE=0x00000003) | ||
header=0x0000501501b8 (NAME='test/tp', | ||
DB_TRX_ID=0x000000000306, | ||
- DB_ROLL_PTR=0x86000001390110, | ||
+ DB_ROLL_PTR=0x86000001380110, | ||
ID=0x0000000000000013, | ||
N_COLS=0x80000001, | ||
TYPE=0x000009a1, | ||
@@ -81,7 +83,7 @@ | ||
SPACE=0x00000005) | ||
header=0x000030150284 (NAME='test/tr', | ||
DB_TRX_ID=0x000000000302, | ||
- DB_ROLL_PTR=0x82000001350110, | ||
+ DB_ROLL_PTR=0x82000001340110, | ||
ID=0x000000000000000f, | ||
N_COLS=0x00000001, | ||
TYPE=0x00000001, | ||
@@ -91,10 +93,10 @@ | ||
SPACE=0x00000001) | ||
header=0x000048150074 (NAME='test/tz', | ||
DB_TRX_ID=0x000000000305, | ||
- DB_ROLL_PTR=0x85000001380110, | ||
+ DB_ROLL_PTR=0x85000001370110, | ||
ID=0x0000000000000012, | ||
N_COLS=0x80000001, | ||
- TYPE=0x00000023, | ||
+ TYPE=0x00000021, | ||
MIX_ID=0x0000000000000000, | ||
MIX_LEN=0x00000050, | ||
CLUSTER_NAME=NULL(0 bytes), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
--- suite/innodb/r/table_flags.result | ||
+++ suite/innodb/r/table_flags,4k.reject | ||
@@ -13,7 +13,7 @@ | ||
header=0x01000003016e (NAME=0x696e66696d756d00) | ||
header=0x00002815008d (NAME='SYS_DATAFILES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320194, | ||
+ DB_ROLL_PTR=0x81000003260194, | ||
ID=0x000000000000000e, | ||
N_COLS=0x00000002, | ||
TYPE=0x00000001, | ||
@@ -23,7 +23,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0000101500d5 (NAME='SYS_FOREIGN', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0110, | ||
+ DB_ROLL_PTR=0x80000003200110, | ||
ID=0x000000000000000b, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -33,7 +33,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000018150122 (NAME='SYS_FOREIGN_COLS', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0201, | ||
+ DB_ROLL_PTR=0x80000003200201, | ||
ID=0x000000000000000c, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -43,7 +43,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0400201501fc (NAME='SYS_TABLESPACES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320110, | ||
+ DB_ROLL_PTR=0x81000003260110, | ||
ID=0x000000000000000d, | ||
N_COLS=0x00000003, | ||
TYPE=0x00000001, | ||
@@ -53,7 +53,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000038150240 (NAME='test/tc', | ||
DB_TRX_ID=0x000000000303, | ||
- DB_ROLL_PTR=0x83000001360110, | ||
+ DB_ROLL_PTR=0x830000032b0110, | ||
ID=0x0000000000000010, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000001, | ||
@@ -63,7 +63,7 @@ | ||
SPACE=0x00000002) | ||
header=0x0000401502c8 (NAME='test/td', | ||
DB_TRX_ID=0x000000000304, | ||
- DB_ROLL_PTR=0x84000001370110, | ||
+ DB_ROLL_PTR=0x840000032c0110, | ||
ID=0x0000000000000011, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -73,7 +73,7 @@ | ||
SPACE=0x00000003) | ||
header=0x0000501501b8 (NAME='test/tp', | ||
DB_TRX_ID=0x000000000306, | ||
- DB_ROLL_PTR=0x86000001390110, | ||
+ DB_ROLL_PTR=0x860000032e0110, | ||
ID=0x0000000000000013, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -83,7 +83,7 @@ | ||
SPACE=0x00000005) | ||
header=0x000030150284 (NAME='test/tr', | ||
DB_TRX_ID=0x000000000302, | ||
- DB_ROLL_PTR=0x82000001350110, | ||
+ DB_ROLL_PTR=0x820000032a0110, | ||
ID=0x000000000000000f, | ||
N_COLS=0x00000001, | ||
TYPE=0x00000001, | ||
@@ -93,7 +93,7 @@ | ||
SPACE=0x00000001) | ||
header=0x000048150074 (NAME='test/tz', | ||
DB_TRX_ID=0x000000000305, | ||
- DB_ROLL_PTR=0x85000001380110, | ||
+ DB_ROLL_PTR=0x850000032d0110, | ||
ID=0x0000000000000012, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000023, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
--- suite/innodb/r/table_flags.result | ||
+++ suite/innodb/r/table_flags,64k.reject | ||
@@ -4,6 +4,8 @@ | ||
CREATE TABLE td(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC; | ||
CREATE TABLE tz(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=COMPRESSED | ||
KEY_BLOCK_SIZE=1; | ||
+Warnings: | ||
+Warning 1478 InnoDB: Cannot create a COMPRESSED table when innodb_page_size > 16k. Assuming ROW_FORMAT=COMPACT. | ||
CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC | ||
PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9; | ||
SYS_TABLES clustered index root page (8): | ||
@@ -11,7 +13,7 @@ | ||
header=0x01000003016e (NAME=0x696e66696d756d00) | ||
header=0x00002815008d (NAME='SYS_DATAFILES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320194, | ||
+ DB_ROLL_PTR=0x81000001310194, | ||
ID=0x000000000000000e, | ||
N_COLS=0x00000002, | ||
TYPE=0x00000001, | ||
@@ -21,7 +23,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0000101500d5 (NAME='SYS_FOREIGN', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0110, | ||
+ DB_ROLL_PTR=0x800000012c0110, | ||
ID=0x000000000000000b, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -31,7 +33,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000018150122 (NAME='SYS_FOREIGN_COLS', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0201, | ||
+ DB_ROLL_PTR=0x800000012c0201, | ||
ID=0x000000000000000c, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -41,7 +43,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0400201501fc (NAME='SYS_TABLESPACES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320110, | ||
+ DB_ROLL_PTR=0x81000001310110, | ||
ID=0x000000000000000d, | ||
N_COLS=0x00000003, | ||
TYPE=0x00000001, | ||
@@ -51,7 +53,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000038150240 (NAME='test/tc', | ||
DB_TRX_ID=0x000000000303, | ||
- DB_ROLL_PTR=0x83000001360110, | ||
+ DB_ROLL_PTR=0x83000001350110, | ||
ID=0x0000000000000010, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000001, | ||
@@ -61,7 +63,7 @@ | ||
SPACE=0x00000002) | ||
header=0x0000401502c8 (NAME='test/td', | ||
DB_TRX_ID=0x000000000304, | ||
- DB_ROLL_PTR=0x84000001370110, | ||
+ DB_ROLL_PTR=0x84000001360110, | ||
ID=0x0000000000000011, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -71,7 +73,7 @@ | ||
SPACE=0x00000003) | ||
header=0x0000501501b8 (NAME='test/tp', | ||
DB_TRX_ID=0x000000000306, | ||
- DB_ROLL_PTR=0x86000001390110, | ||
+ DB_ROLL_PTR=0x86000001380110, | ||
ID=0x0000000000000013, | ||
N_COLS=0x80000001, | ||
TYPE=0x000009a1, | ||
@@ -81,7 +83,7 @@ | ||
SPACE=0x00000005) | ||
header=0x000030150284 (NAME='test/tr', | ||
DB_TRX_ID=0x000000000302, | ||
- DB_ROLL_PTR=0x82000001350110, | ||
+ DB_ROLL_PTR=0x82000001340110, | ||
ID=0x000000000000000f, | ||
N_COLS=0x00000001, | ||
TYPE=0x00000001, | ||
@@ -91,10 +93,10 @@ | ||
SPACE=0x00000001) | ||
header=0x000048150074 (NAME='test/tz', | ||
DB_TRX_ID=0x000000000305, | ||
- DB_ROLL_PTR=0x85000001380110, | ||
+ DB_ROLL_PTR=0x85000001370110, | ||
ID=0x0000000000000012, | ||
N_COLS=0x80000001, | ||
- TYPE=0x00000023, | ||
+ TYPE=0x00000021, | ||
MIX_ID=0x0000000000000000, | ||
MIX_LEN=0x00000050, | ||
CLUSTER_NAME=NULL(0 bytes), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
--- suite/innodb/r/table_flags.result | ||
+++ suite/innodb/r/table_flags,8k.reject | ||
@@ -13,7 +13,7 @@ | ||
header=0x01000003016e (NAME=0x696e66696d756d00) | ||
header=0x00002815008d (NAME='SYS_DATAFILES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320194, | ||
+ DB_ROLL_PTR=0x81000001d70194, | ||
ID=0x000000000000000e, | ||
N_COLS=0x00000002, | ||
TYPE=0x00000001, | ||
@@ -23,7 +23,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0000101500d5 (NAME='SYS_FOREIGN', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0110, | ||
+ DB_ROLL_PTR=0x80000001d10110, | ||
ID=0x000000000000000b, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -33,7 +33,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000018150122 (NAME='SYS_FOREIGN_COLS', | ||
DB_TRX_ID=0x000000000300, | ||
- DB_ROLL_PTR=0x800000012d0201, | ||
+ DB_ROLL_PTR=0x80000001d10201, | ||
ID=0x000000000000000c, | ||
N_COLS=0x00000004, | ||
TYPE=0x00000001, | ||
@@ -43,7 +43,7 @@ | ||
SPACE=0x00000000) | ||
header=0x0400201501fc (NAME='SYS_TABLESPACES', | ||
DB_TRX_ID=0x000000000301, | ||
- DB_ROLL_PTR=0x81000001320110, | ||
+ DB_ROLL_PTR=0x81000001d70110, | ||
ID=0x000000000000000d, | ||
N_COLS=0x00000003, | ||
TYPE=0x00000001, | ||
@@ -53,7 +53,7 @@ | ||
SPACE=0x00000000) | ||
header=0x000038150240 (NAME='test/tc', | ||
DB_TRX_ID=0x000000000303, | ||
- DB_ROLL_PTR=0x83000001360110, | ||
+ DB_ROLL_PTR=0x83000001db0110, | ||
ID=0x0000000000000010, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000001, | ||
@@ -63,7 +63,7 @@ | ||
SPACE=0x00000002) | ||
header=0x0000401502c8 (NAME='test/td', | ||
DB_TRX_ID=0x000000000304, | ||
- DB_ROLL_PTR=0x84000001370110, | ||
+ DB_ROLL_PTR=0x84000001dc0110, | ||
ID=0x0000000000000011, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -73,7 +73,7 @@ | ||
SPACE=0x00000003) | ||
header=0x0000501501b8 (NAME='test/tp', | ||
DB_TRX_ID=0x000000000306, | ||
- DB_ROLL_PTR=0x86000001390110, | ||
+ DB_ROLL_PTR=0x86000001de0110, | ||
ID=0x0000000000000013, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000021, | ||
@@ -83,7 +83,7 @@ | ||
SPACE=0x00000005) | ||
header=0x000030150284 (NAME='test/tr', | ||
DB_TRX_ID=0x000000000302, | ||
- DB_ROLL_PTR=0x82000001350110, | ||
+ DB_ROLL_PTR=0x82000001da0110, | ||
ID=0x000000000000000f, | ||
N_COLS=0x00000001, | ||
TYPE=0x00000001, | ||
@@ -93,7 +93,7 @@ | ||
SPACE=0x00000001) | ||
header=0x000048150074 (NAME='test/tz', | ||
DB_TRX_ID=0x000000000305, | ||
- DB_ROLL_PTR=0x85000001380110, | ||
+ DB_ROLL_PTR=0x85000001dd0110, | ||
ID=0x0000000000000012, | ||
N_COLS=0x80000001, | ||
TYPE=0x00000023, |
Oops, something went wrong.