table_flags fix

- "debug" deviation is now gone.

6 files changed, 17 insertions, 237 deletions

diff --git a/mysql-test/suite/innodb/r/table_flags,32k,debug.rdiff b/mysql-test/suite/innodb/r/table_flags,32k,debug.rdiff
deleted file mode 100644
index babcd88bd91..00000000000
--- a/mysql-test/suite/innodb/r/table_flags,32k,debug.rdiff
+++ /dev/null
@@ -1,110 +0,0 @@
---- suite/innodb/r/table_flags.result
-+++ suite/innodb/r/table_flags,32k,debug.reject
-@@ -6,6 +6,8 @@
- SET innodb_strict_mode=OFF;
- 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=DYNAMIC.
- SET innodb_strict_mode=ON;
- CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC
- PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
-@@ -11,71 +11,71 @@
- PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
- SYS_TABLES clustered index root page (8):
- N_RECS=8; LEVEL=0; INDEX_ID=0x0000000000000001
--header=0x01000003008d (NAME=0x696e66696d756d00)
--header=0x0000101500d5 (NAME='SYS_FOREIGN',
-+header=0x0100000300de (NAME=0x696e66696d756d00)
-+header=0x000018150126 (NAME='SYS_FOREIGN',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000b,
-+ ID=0x000000000000000c,
-  N_COLS=0x00000004,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
-+header=0x000020150173 (NAME='SYS_FOREIGN_COLS',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000c,
-+ ID=0x000000000000000d,
-  N_COLS=0x00000004,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x0000201501ae (NAME='SYS_VIRTUAL',
-+header=0x0000281501bb (NAME='SYS_VIRTUAL',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000d,
-+ ID=0x000000000000000e,
-  N_COLS=0x00000003,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x0400301501f2 (NAME='test/tc',
-+header=0x0400301501ff (NAME='test/tc',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000f,
-+ ID=0x0000000000000010,
-  N_COLS=0x80000001,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000002)
--header=0x00003815027a (NAME='test/td',
-+header=0x000038150287 (NAME='test/td',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000010,
-+ ID=0x0000000000000011,
-  N_COLS=0x80000001,
-  TYPE=0x00000021,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000003)
--header=0x00004815016a (NAME='test/tp',
-+header=0x00004815008d (NAME='test/tp',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000012,
-+ ID=0x0000000000000013,
-  N_COLS=0x80000001,
-  TYPE=0x000009a1,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000005)
--header=0x000028150236 (NAME='test/tr',
-+header=0x000010150243 (NAME='test/tr',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000e,
-+ ID=0x000000000000000f,
-  N_COLS=0x00000001,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-@@ -85,9 +85,9 @@
- header=0x000040150074 (NAME='test/tz',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000011,
-+ ID=0x0000000000000012,
-  N_COLS=0x80000001,
-- TYPE=0x00000023,
-+ TYPE=0x00000021,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
diff --git a/mysql-test/suite/innodb/r/table_flags,32k,release.rdiff b/mysql-test/suite/innodb/r/table_flags,32k.rdiff
index ce1ff623d50..ce1ff623d50 100644
--- a/mysql-test/suite/innodb/r/table_flags,32k,release.rdiff
+++ b/mysql-test/suite/innodb/r/table_flags,32k.rdiff
diff --git a/mysql-test/suite/innodb/r/table_flags,64k,debug.rdiff b/mysql-test/suite/innodb/r/table_flags,64k,debug.rdiff
deleted file mode 100644
index c8763b4c093..00000000000
--- a/mysql-test/suite/innodb/r/table_flags,64k,debug.rdiff
+++ /dev/null
@@ -1,110 +0,0 @@
---- suite/innodb/r/table_flags.result
-+++ suite/innodb/r/table_flags,64k,debug.reject
-@@ -6,6 +6,8 @@
- SET innodb_strict_mode=OFF;
- 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=DYNAMIC.
- SET innodb_strict_mode=ON;
- CREATE TABLE tp(a INT PRIMARY KEY)ENGINE=InnoDB ROW_FORMAT=DYNAMIC
- PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
-@@ -11,71 +11,71 @@
- PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
- SYS_TABLES clustered index root page (8):
- N_RECS=8; LEVEL=0; INDEX_ID=0x0000000000000001
--header=0x01000003008d (NAME=0x696e66696d756d00)
--header=0x0000101500d5 (NAME='SYS_FOREIGN',
-+header=0x0100000300de (NAME=0x696e66696d756d00)
-+header=0x000018150126 (NAME='SYS_FOREIGN',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000b,
-+ ID=0x000000000000000c,
-  N_COLS=0x00000004,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
-+header=0x000020150173 (NAME='SYS_FOREIGN_COLS',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000c,
-+ ID=0x000000000000000d,
-  N_COLS=0x00000004,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x0000201501ae (NAME='SYS_VIRTUAL',
-+header=0x0000281501bb (NAME='SYS_VIRTUAL',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000d,
-+ ID=0x000000000000000e,
-  N_COLS=0x00000003,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000040,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000000)
--header=0x0400301501f2 (NAME='test/tc',
-+header=0x0400301501ff (NAME='test/tc',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000f,
-+ ID=0x0000000000000010,
-  N_COLS=0x80000001,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000002)
--header=0x00003815027a (NAME='test/td',
-+header=0x000038150287 (NAME='test/td',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000010,
-+ ID=0x0000000000000011,
-  N_COLS=0x80000001,
-  TYPE=0x00000021,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000003)
--header=0x00004815016a (NAME='test/tp',
-+header=0x00004815008d (NAME='test/tp',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000012,
-+ ID=0x0000000000000013,
-  N_COLS=0x80000001,
-  TYPE=0x000009a1,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
-  SPACE=0x00000005)
--header=0x000028150236 (NAME='test/tr',
-+header=0x000010150243 (NAME='test/tr',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x000000000000000e,
-+ ID=0x000000000000000f,
-  N_COLS=0x00000001,
-  TYPE=0x00000001,
-  MIX_ID=0x0000000000000000,
-@@ -85,9 +85,9 @@
- header=0x000040150074 (NAME='test/tz',
-  DB_TRX_ID=0x000000000000,
-  DB_ROLL_PTR=0x80000000000000,
-- ID=0x0000000000000011,
-+ ID=0x0000000000000012,
-  N_COLS=0x80000001,
-- TYPE=0x00000023,
-+ TYPE=0x00000021,
-  MIX_ID=0x0000000000000000,
-  MIX_LEN=0x00000050,
-  CLUSTER_NAME=NULL(0 bytes),
diff --git a/mysql-test/suite/innodb/r/table_flags,64k,release.rdiff b/mysql-test/suite/innodb/r/table_flags,64k.rdiff
index f2ba1280be3..f2ba1280be3 100644
--- a/mysql-test/suite/innodb/r/table_flags,64k,release.rdiff
+++ b/mysql-test/suite/innodb/r/table_flags,64k.rdiff
diff --git a/mysql-test/suite/innodb/r/table_flags,debug.rdiff b/mysql-test/suite/innodb/r/table_flags,debug.rdiff
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/mysql-test/suite/innodb/r/table_flags,debug.rdiff
+++ /dev/null
diff --git a/mysql-test/suite/innodb/r/table_flags.result b/mysql-test/suite/innodb/r/table_flags.result
index 210d370aab4..d040a8d7fa3 100644
--- a/mysql-test/suite/innodb/r/table_flags.result
+++ b/mysql-test/suite/innodb/r/table_flags.result
@@ -11,71 +11,71 @@ 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):
 N_RECS=8; LEVEL=0; INDEX_ID=0x0000000000000001
-header=0x01000003008d (NAME=0x696e66696d756d00)
-header=0x0000101500d5 (NAME='SYS_FOREIGN',
+header=0x0100000300de (NAME=0x696e66696d756d00)
+header=0x000018150126 (NAME='SYS_FOREIGN',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x000000000000000b,
+ ID=0x000000000000000c,
  N_COLS=0x00000004,
  TYPE=0x00000001,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000040,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000000)
-header=0x000018150122 (NAME='SYS_FOREIGN_COLS',
+header=0x000020150173 (NAME='SYS_FOREIGN_COLS',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x000000000000000c,
+ ID=0x000000000000000d,
  N_COLS=0x00000004,
  TYPE=0x00000001,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000040,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000000)
-header=0x0000201501ae (NAME='SYS_VIRTUAL',
+header=0x0000281501bb (NAME='SYS_VIRTUAL',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x000000000000000d,
+ ID=0x000000000000000e,
  N_COLS=0x00000003,
  TYPE=0x00000001,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000040,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000000)
-header=0x0400301501f2 (NAME='test/tc',
+header=0x0400301501ff (NAME='test/tc',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x000000000000000f,
+ ID=0x0000000000000010,
  N_COLS=0x80000001,
  TYPE=0x00000001,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000050,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000002)
-header=0x00003815027a (NAME='test/td',
+header=0x000038150287 (NAME='test/td',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x0000000000000010,
+ ID=0x0000000000000011,
  N_COLS=0x80000001,
  TYPE=0x00000021,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000050,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000003)
-header=0x00004815016a (NAME='test/tp',
+header=0x00004815008d (NAME='test/tp',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x0000000000000012,
+ ID=0x0000000000000013,
  N_COLS=0x80000001,
  TYPE=0x000009a1,
  MIX_ID=0x0000000000000000,
  MIX_LEN=0x00000050,
  CLUSTER_NAME=NULL(0 bytes),
  SPACE=0x00000005)
-header=0x000028150236 (NAME='test/tr',
+header=0x000010150243 (NAME='test/tr',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x000000000000000e,
+ ID=0x000000000000000f,
  N_COLS=0x00000001,
  TYPE=0x00000001,
  MIX_ID=0x0000000000000000,
@@ -85,7 +85,7 @@ header=0x000028150236 (NAME='test/tr',
 header=0x000040150074 (NAME='test/tz',
  DB_TRX_ID=0x000000000000,
  DB_ROLL_PTR=0x80000000000000,
- ID=0x0000000000000011,
+ ID=0x0000000000000012,
  N_COLS=0x80000001,
  TYPE=0x00000023,
  MIX_ID=0x0000000000000000,
@@ -179,7 +179,7 @@ call mtr.add_suppression("ERROR HY000: Can't create table `test`.`t1`");
 CREATE TABLE t1(f1 INT, f2 VARCHAR(1), KEY k1(f2),
 FULLTEXT KEY(f2),
 FOREIGN KEY (f2) REFERENCES t1(f3))ENGINE=InnoDB;
-ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
+ERROR 42000: Incorrect foreign key definition for 'f3': referenced field not found
 #
 # MDEV-23199 page_compression flag is missing
 #	for full_crc32 tablespace