mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
This commit is contained in:
122
mysql-test/suite/innodb/r/table_flags,debug.rdiff
Normal file
122
mysql-test/suite/innodb/r/table_flags,debug.rdiff
Normal file
@ -0,0 +1,122 @@
|
||||
--- suite/innodb/r/table_flags.result
|
||||
+++ suite/innodb/r/table_flags,debug.reject
|
||||
@@ -10,91 +10,91 @@
|
||||
PAGE_COMPRESSED=1 PAGE_COMPRESSION_LEVEL=9;
|
||||
SYS_TABLES clustered index root page (8):
|
||||
N_RECS=10; LEVEL=0; INDEX_ID=0x0000000000000001
|
||||
-header=0x01000003016e (NAME=0x696e66696d756d00)
|
||||
-header=0x00002815008d (NAME='SYS_DATAFILES',
|
||||
+header=0x0100000301bf (NAME=0x696e66696d756d00)
|
||||
+header=0x0000301500de (NAME='SYS_DATAFILES',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x000000000000000e,
|
||||
+ ID=0x000000000000000f,
|
||||
N_COLS=0x00000002,
|
||||
TYPE=0x00000001,
|
||||
MIX_ID=0x0000000000000000,
|
||||
MIX_LEN=0x00000040,
|
||||
CLUSTER_NAME=NULL(0 bytes),
|
||||
SPACE=0x00000000)
|
||||
-header=0x0000101500d5 (NAME='SYS_FOREIGN',
|
||||
+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=0x0400201501b8 (NAME='SYS_TABLESPACES',
|
||||
+header=0x040028150209 (NAME='SYS_TABLESPACES',
|
||||
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=0x000030150244 (NAME='SYS_VIRTUAL',
|
||||
+header=0x000038150251 (NAME='SYS_VIRTUAL',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x000000000000000f,
|
||||
+ ID=0x0000000000000010,
|
||||
N_COLS=0x00000003,
|
||||
TYPE=0x00000001,
|
||||
MIX_ID=0x0000000000000000,
|
||||
MIX_LEN=0x00000040,
|
||||
CLUSTER_NAME=NULL(0 bytes),
|
||||
SPACE=0x00000000)
|
||||
-header=0x000040150288 (NAME='test/tc',
|
||||
+header=0x000040150295 (NAME='test/tc',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x0000000000000011,
|
||||
+ ID=0x0000000000000012,
|
||||
N_COLS=0x80000001,
|
||||
TYPE=0x00000001,
|
||||
MIX_ID=0x0000000000000000,
|
||||
MIX_LEN=0x00000050,
|
||||
CLUSTER_NAME=NULL(0 bytes),
|
||||
SPACE=0x00000002)
|
||||
-header=0x000048150310 (NAME='test/td',
|
||||
+header=0x00004815031d (NAME='test/td',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x0000000000000012,
|
||||
+ ID=0x0000000000000013,
|
||||
N_COLS=0x80000001,
|
||||
TYPE=0x00000021,
|
||||
MIX_ID=0x0000000000000000,
|
||||
MIX_LEN=0x00000050,
|
||||
CLUSTER_NAME=NULL(0 bytes),
|
||||
SPACE=0x00000003)
|
||||
-header=0x000058150200 (NAME='test/tp',
|
||||
+header=0x00005815008d (NAME='test/tp',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x0000000000000014,
|
||||
+ ID=0x0000000000000015,
|
||||
N_COLS=0x80000001,
|
||||
TYPE=0x000009a1,
|
||||
MIX_ID=0x0000000000000000,
|
||||
MIX_LEN=0x00000050,
|
||||
CLUSTER_NAME=NULL(0 bytes),
|
||||
SPACE=0x00000005)
|
||||
-header=0x0000381502cc (NAME='test/tr',
|
||||
+header=0x0000101502d9 (NAME='test/tr',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x0000000000000010,
|
||||
+ ID=0x0000000000000011,
|
||||
N_COLS=0x00000001,
|
||||
TYPE=0x00000001,
|
||||
MIX_ID=0x0000000000000000,
|
||||
@@ -104,7 +104,7 @@
|
||||
header=0x000050150074 (NAME='test/tz',
|
||||
DB_TRX_ID=0x000000000000,
|
||||
DB_ROLL_PTR=0x80000000000000,
|
||||
- ID=0x0000000000000013,
|
||||
+ ID=0x0000000000000014,
|
||||
N_COLS=0x80000001,
|
||||
TYPE=0x00000023,
|
||||
MIX_ID=0x0000000000000000,
|
Reference in New Issue
Block a user