mariadb/mysql-test/suite/innodb/r/table_flags,32k.rdiff
Marko Mäkelä 9ed325efc1 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.
2017-06-13 18:30:37 +03:00

96 lines
2.7 KiB
Text

--- 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),