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

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-30 09:34:07 +03:00
parent 88ce8a3d8b a4d753758f
commit 5c69e93630
126 changed files with 3592 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_zip/r/innochecksum.result
View File

@@ -14,7 +14,8 @@ FOUND 1 /Error: --no-check must be associated with --write option./ in my_restar
FOUND 1 /unknown variable 'strict-check=innodb'/ in my_restart.err
[7]: check the innochecksum with short form strict-check & no-check , an error is expected
FOUND 1 /unknown option '-C'/ in my_restart.err
FOUND 1 /unknown variable 'write=crc32'/ in my_restart.err
FOUND 1 /ignoring option '--write' due to invalid value 'crc32'/ in my_restart.err
FOUND 1 /Error: --no-check must be associated with --write option/ in my_restart.err
# restart
SELECT * FROM tab1;
c1 c2

3
mysql-test/suite/innodb_zip/r/innochecksum_2.result
View File

@@ -27,6 +27,7 @@ end-page 0
page 0
no-check FALSE
allow-mismatches 0
write FALSE
page-type-summary FALSE
page-type-dump MYSQLTEST_VARDIR/tmp/dump.txt
per-page-details FALSE
@@ -54,6 +55,7 @@ See https://mariadb.com/kb/en/library/innochecksum/ for usage hints.
-n, --no-check Ignore the checksum verification.
-a, --allow-mismatches=#
Maximum checksum mismatch allowed.
-w, --write Rewrite the checksum.
-S, --page-type-summary
Display a count of each page type in a tablespace.
-D, --page-type-dump=name
@@ -75,6 +77,7 @@ end-page 0
page 0
no-check FALSE
allow-mismatches 0
write FALSE
page-type-summary FALSE
page-type-dump (No default value)
per-page-details FALSE

1
mysql-test/suite/innodb_zip/r/innochecksum_3.result
View File

@@ -133,6 +133,7 @@ end-page 0
page 0
no-check FALSE
allow-mismatches 0
write FALSE
page-type-summary FALSE
page-type-dump MYSQLTEST_VARDIR/tmp/dump.txt
per-page-details FALSE