1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00

MDEV-22964: archive.archive and main.mysqlbinlog_{row,stmt}_compressed)

zlib-ng results in different compression length. The compression
length isn't that important as the test output examines the uncompressed
results.

fixes for zlib-ng

backport of 75488a57f2
This commit is contained in:
Sergei Golubchik
2024-04-20 00:17:30 +02:00
committed by Daniel Black
parent d98ac8511e
commit 17cb65593a
5 changed files with 163 additions and 165 deletions

View File

@@ -15,21 +15,21 @@ FLUSH BINARY LOGS;
/*!40019 SET @@session.max_insert_delayed_threads=0*/; /*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
# at 4 # at <pos>
#<date> server id 1 end_log_pos 256 CRC32 XXX Start: xxx #<date> server id 1 end_log_pos <pos> CRC32 XXX Start: xxx
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at 256 # at <pos>
#<date> server id 1 end_log_pos 285 CRC32 XXX Gtid list [] #<date> server id 1 end_log_pos <pos> CRC32 XXX Gtid list []
# at 285 # at <pos>
#<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 #<date> server id 1 end_log_pos <pos> CRC32 XXX Binlog checkpoint master-bin.000001
# at 329 # at <pos>
#<date> server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-1 ddl
/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; /*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; /*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*M!100001 SET @@session.server_id=1*//*!*/; /*M!100001 SET @@session.server_id=1*//*!*/;
/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; /*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at 371 # at <pos>
#<date> server id 1 end_log_pos 533 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
SET @@session.pseudo_thread_id=5/*!*/; SET @@session.pseudo_thread_id=5/*!*/;
@@ -42,26 +42,26 @@ SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 533 # at <pos>
#<date> server id 1 end_log_pos 575 CRC32 XXX GTID 0-1-2 ddl #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-2 ddl
/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; /*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at 575 # at <pos>
#<date> server id 1 end_log_pos 727 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 727 # at <pos>
#<date> server id 1 end_log_pos 769 CRC32 XXX GTID 0-1-3 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-3
/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; /*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 769 # at <pos>
# at 843 # at <pos>
#<date> server id 1 end_log_pos 843 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "") #Q> INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
#<date> server id 1 end_log_pos 899 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 899 # at <pos>
#<date> server id 1 end_log_pos 967 CRC32 XXX Write_compressed_rows: table id 32 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Write_compressed_rows: table id <tblid> flags: STMT_END_F
### INSERT INTO `test`.`t1` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -74,23 +74,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 1 # Number of rows: 1
# at 967 # at <pos>
#<date> server id 1 end_log_pos 1040 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1040 # at <pos>
#<date> server id 1 end_log_pos 1082 CRC32 XXX GTID 0-1-4 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-4
/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; /*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1082 # at <pos>
# at 1158 # at <pos>
#<date> server id 1 end_log_pos 1158 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL) #Q> INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
#<date> server id 1 end_log_pos 1214 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1214 # at <pos>
#<date> server id 1 end_log_pos 1281 CRC32 XXX Write_compressed_rows: table id 32 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Write_compressed_rows: table id <tblid> flags: STMT_END_F
### INSERT INTO `test`.`t1` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=11 /* INT meta=0 nullable=0 is_null=0 */ ### @1=11 /* INT meta=0 nullable=0 is_null=0 */
@@ -103,23 +103,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */ ### @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
# Number of rows: 1 # Number of rows: 1
# at 1281 # at <pos>
#<date> server id 1 end_log_pos 1354 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1354 # at <pos>
#<date> server id 1 end_log_pos 1396 CRC32 XXX GTID 0-1-5 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-5
/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; /*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1396 # at <pos>
# at 1474 # at <pos>
#<date> server id 1 end_log_pos 1474 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A") #Q> INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
#<date> server id 1 end_log_pos 1530 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1530 # at <pos>
#<date> server id 1 end_log_pos 1596 CRC32 XXX Write_compressed_rows: table id 32 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Write_compressed_rows: table id <tblid> flags: STMT_END_F
### INSERT INTO `test`.`t1` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=12 /* INT meta=0 nullable=0 is_null=0 */ ### @1=12 /* INT meta=0 nullable=0 is_null=0 */
@@ -132,23 +132,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 1 # Number of rows: 1
# at 1596 # at <pos>
#<date> server id 1 end_log_pos 1669 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1669 # at <pos>
#<date> server id 1 end_log_pos 1711 CRC32 XXX GTID 0-1-6 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-6
/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; /*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1711 # at <pos>
# at 1786 # at <pos>
#<date> server id 1 end_log_pos 1786 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A") #Q> INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
#<date> server id 1 end_log_pos 1842 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 1842 # at <pos>
#<date> server id 1 end_log_pos 1909 CRC32 XXX Write_compressed_rows: table id 32 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Write_compressed_rows: table id <tblid> flags: STMT_END_F
### INSERT INTO `test`.`t1` ### INSERT INTO `test`.`t1`
### SET ### SET
### @1=13 /* INT meta=0 nullable=0 is_null=0 */ ### @1=13 /* INT meta=0 nullable=0 is_null=0 */
@@ -161,23 +161,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 1 # Number of rows: 1
# at 1909 # at <pos>
#<date> server id 1 end_log_pos 1982 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1982 # at <pos>
#<date> server id 1 end_log_pos 2024 CRC32 XXX GTID 0-1-7 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-7
/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; /*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2024 # at <pos>
# at 2078 # at <pos>
#<date> server id 1 end_log_pos 2078 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> INSERT INTO t2 SELECT * FROM t1 #Q> INSERT INTO t2 SELECT * FROM t1
#<date> server id 1 end_log_pos 2134 CRC32 XXX Table_map: `test`.`t2` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2134 # at <pos>
#<date> server id 1 end_log_pos 2225 CRC32 XXX Write_compressed_rows: table id 33 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Write_compressed_rows: table id <tblid> flags: STMT_END_F
### INSERT INTO `test`.`t2` ### INSERT INTO `test`.`t2`
### SET ### SET
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -223,23 +223,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 4 # Number of rows: 4
# at 2225 # at <pos>
#<date> server id 1 end_log_pos 2298 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2298 # at <pos>
#<date> server id 1 end_log_pos 2340 CRC32 XXX GTID 0-1-8 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-8
/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; /*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2340 # at <pos>
# at 2406 # at <pos>
#<date> server id 1 end_log_pos 2406 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL #Q> UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
#<date> server id 1 end_log_pos 2462 CRC32 XXX Table_map: `test`.`t2` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 2462 # at <pos>
#<date> server id 1 end_log_pos 2561 CRC32 XXX Update_compressed_rows: table id 33 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Update_compressed_rows: table id <tblid> flags: STMT_END_F
### UPDATE `test`.`t2` ### UPDATE `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -304,23 +304,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 3 # Number of rows: 3
# at 2561 # at <pos>
#<date> server id 1 end_log_pos 2634 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2634 # at <pos>
#<date> server id 1 end_log_pos 2676 CRC32 XXX GTID 0-1-9 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-9
/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; /*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2676 # at <pos>
# at 2713 # at <pos>
#<date> server id 1 end_log_pos 2713 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> DELETE FROM t1 #Q> DELETE FROM t1
#<date> server id 1 end_log_pos 2769 CRC32 XXX Table_map: `test`.`t1` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t1` mapped to number num
# at 2769 # at <pos>
#<date> server id 1 end_log_pos 2861 CRC32 XXX Delete_compressed_rows: table id 32 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Delete_compressed_rows: table id <tblid> flags: STMT_END_F
### DELETE FROM `test`.`t1` ### DELETE FROM `test`.`t1`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -366,23 +366,23 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 4 # Number of rows: 4
# at 2861 # at <pos>
#<date> server id 1 end_log_pos 2934 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2934 # at <pos>
#<date> server id 1 end_log_pos 2976 CRC32 XXX GTID 0-1-10 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-10
/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; /*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2976 # at <pos>
# at 3013 # at <pos>
#<date> server id 1 end_log_pos 3013 CRC32 XXX Annotate_rows: #<date> server id 1 end_log_pos <pos> CRC32 XXX Annotate_rows:
#Q> DELETE FROM t2 #Q> DELETE FROM t2
#<date> server id 1 end_log_pos 3069 CRC32 XXX Table_map: `test`.`t2` mapped to number num #<date> server id 1 end_log_pos <pos> CRC32 XXX Table_map: `test`.`t2` mapped to number num
# at 3069 # at <pos>
#<date> server id 1 end_log_pos 3154 CRC32 XXX Delete_compressed_rows: table id 33 flags: STMT_END_F #<date> server id 1 end_log_pos <pos> CRC32 XXX Delete_compressed_rows: table id <tblid> flags: STMT_END_F
### DELETE FROM `test`.`t2` ### DELETE FROM `test`.`t2`
### WHERE ### WHERE
### @1=10 /* INT meta=0 nullable=0 is_null=0 */ ### @1=10 /* INT meta=0 nullable=0 is_null=0 */
@@ -428,13 +428,13 @@ START TRANSACTION
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# Number of rows: 4 # Number of rows: 4
# at 3154 # at <pos>
#<date> server id 1 end_log_pos 3227 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 3227 # at <pos>
#<date> server id 1 end_log_pos 3275 CRC32 XXX Rotate to master-bin.000002 pos: 4 #<date> server id 1 end_log_pos <pos> CRC32 XXX Rotate to master-bin.000002 pos: 4
DELIMITER ; DELIMITER ;
# End of log file # End of log file
ROLLBACK /* added by mysqlbinlog */; ROLLBACK /* added by mysqlbinlog */;

View File

@@ -4,7 +4,6 @@
--source include/have_log_bin.inc --source include/have_log_bin.inc
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
--source include/have_normal_zlib.inc
# #
# #
@@ -30,7 +29,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /table id \d+/table id <tblid>/ /end_log_pos \d+/end_log_pos <pos>/ /# at \d+/# at <pos>/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
--echo --echo

View File

@@ -15,21 +15,21 @@ FLUSH BINARY LOGS;
/*!40019 SET @@session.max_insert_delayed_threads=0*/; /*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
DELIMITER /*!*/; DELIMITER /*!*/;
# at 4 # at <pos>
#<date> server id 1 end_log_pos 256 CRC32 XXX Start: xxx #<date> server id 1 end_log_pos <pos> CRC32 XXX Start: xxx
ROLLBACK/*!*/; ROLLBACK/*!*/;
# at 256 # at <pos>
#<date> server id 1 end_log_pos 285 CRC32 XXX Gtid list [] #<date> server id 1 end_log_pos <pos> CRC32 XXX Gtid list []
# at 285 # at <pos>
#<date> server id 1 end_log_pos 329 CRC32 XXX Binlog checkpoint master-bin.000001 #<date> server id 1 end_log_pos <pos> CRC32 XXX Binlog checkpoint master-bin.000001
# at 329 # at <pos>
#<date> server id 1 end_log_pos 371 CRC32 XXX GTID 0-1-1 ddl #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-1 ddl
/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/; /*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
/*M!100001 SET @@session.gtid_domain_id=0*//*!*/; /*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
/*M!100001 SET @@session.server_id=1*//*!*/; /*M!100001 SET @@session.server_id=1*//*!*/;
/*M!100001 SET @@session.gtid_seq_no=1*//*!*/; /*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at 371 # at <pos>
#<date> server id 1 end_log_pos 533 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
SET @@session.pseudo_thread_id=5/*!*/; SET @@session.pseudo_thread_id=5/*!*/;
@@ -42,136 +42,136 @@ SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/; SET @@session.collation_database=DEFAULT/*!*/;
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 533 # at <pos>
#<date> server id 1 end_log_pos 575 CRC32 XXX GTID 0-1-2 ddl #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-2 ddl
/*M!100001 SET @@session.gtid_seq_no=2*//*!*/; /*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at 575 # at <pos>
#<date> server id 1 end_log_pos 727 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
# at 727 # at <pos>
#<date> server id 1 end_log_pos 769 CRC32 XXX GTID 0-1-3 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-3
/*M!100001 SET @@session.gtid_seq_no=3*//*!*/; /*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 769 # at <pos>
#<date> server id 1 end_log_pos 897 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "") INSERT INTO t1 VALUES (10, 1, 2, 3, 4, 5, 6, 7, "")
/*!*/; /*!*/;
# at 897 # at <pos>
#<date> server id 1 end_log_pos 970 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 970 # at <pos>
#<date> server id 1 end_log_pos 1012 CRC32 XXX GTID 0-1-4 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-4
/*M!100001 SET @@session.gtid_seq_no=4*//*!*/; /*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1012 # at <pos>
#<date> server id 1 end_log_pos 1140 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL) INSERT INTO t1 VALUES (11, 1, 2, 3, 4, 5, 6, 7, NULL)
/*!*/; /*!*/;
# at 1140 # at <pos>
#<date> server id 1 end_log_pos 1213 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1213 # at <pos>
#<date> server id 1 end_log_pos 1255 CRC32 XXX GTID 0-1-5 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-5
/*M!100001 SET @@session.gtid_seq_no=5*//*!*/; /*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1255 # at <pos>
#<date> server id 1 end_log_pos 1385 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A") INSERT INTO t1 VALUES (12, 1, 2, 3, NULL, 5, 6, 7, "A")
/*!*/; /*!*/;
# at 1385 # at <pos>
#<date> server id 1 end_log_pos 1458 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1458 # at <pos>
#<date> server id 1 end_log_pos 1500 CRC32 XXX GTID 0-1-6 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-6
/*M!100001 SET @@session.gtid_seq_no=6*//*!*/; /*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1500 # at <pos>
#<date> server id 1 end_log_pos 1627 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A") INSERT INTO t1 VALUES (13, 1, 2, 3, 0, 5, 6, 7, "A")
/*!*/; /*!*/;
# at 1627 # at <pos>
#<date> server id 1 end_log_pos 1700 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1700 # at <pos>
#<date> server id 1 end_log_pos 1742 CRC32 XXX GTID 0-1-7 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-7
/*M!100001 SET @@session.gtid_seq_no=7*//*!*/; /*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1742 # at <pos>
#<date> server id 1 end_log_pos 1850 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
INSERT INTO t2 SELECT * FROM t1 INSERT INTO t2 SELECT * FROM t1
/*!*/; /*!*/;
# at 1850 # at <pos>
#<date> server id 1 end_log_pos 1923 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 1923 # at <pos>
#<date> server id 1 end_log_pos 1965 CRC32 XXX GTID 0-1-8 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-8
/*M!100001 SET @@session.gtid_seq_no=8*//*!*/; /*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 1965 # at <pos>
#<date> server id 1 end_log_pos 2082 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL UPDATE t2 SET f4=5 WHERE f4>0 or f4 is NULL
/*!*/; /*!*/;
# at 2082 # at <pos>
#<date> server id 1 end_log_pos 2155 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2155 # at <pos>
#<date> server id 1 end_log_pos 2197 CRC32 XXX GTID 0-1-9 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-9
/*M!100001 SET @@session.gtid_seq_no=9*//*!*/; /*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2197 # at <pos>
#<date> server id 1 end_log_pos 2288 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
DELETE FROM t1 DELETE FROM t1
/*!*/; /*!*/;
# at 2288 # at <pos>
#<date> server id 1 end_log_pos 2361 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2361 # at <pos>
#<date> server id 1 end_log_pos 2403 CRC32 XXX GTID 0-1-10 #<date> server id 1 end_log_pos <pos> CRC32 XXX GTID 0-1-10
/*M!100001 SET @@session.gtid_seq_no=10*//*!*/; /*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
START TRANSACTION START TRANSACTION
/*!*/; /*!*/;
# at 2403 # at <pos>
#<date> server id 1 end_log_pos 2494 CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query_compressed thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
DELETE FROM t2 DELETE FROM t2
/*!*/; /*!*/;
# at 2494 # at <pos>
#<date> server id 1 end_log_pos 2567 CRC32 XXX Query thread_id=5 exec_time=x error_code=0 #<date> server id 1 end_log_pos <pos> CRC32 XXX Query thread_id=5 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
# at 2567 # at <pos>
#<date> server id 1 end_log_pos 2615 CRC32 XXX Rotate to master-bin.000002 pos: 4 #<date> server id 1 end_log_pos <pos> CRC32 XXX Rotate to master-bin.000002 pos: 4
DELIMITER ; DELIMITER ;
# End of log file # End of log file
ROLLBACK /* added by mysqlbinlog */; ROLLBACK /* added by mysqlbinlog */;

View File

@@ -4,7 +4,6 @@
--source include/have_log_bin.inc --source include/have_log_bin.inc
--source include/have_binlog_format_statement.inc --source include/have_binlog_format_statement.inc
--source include/have_normal_zlib.inc
# #
# #
# mysqlbinlog: compressed query event # mysqlbinlog: compressed query event
@@ -29,7 +28,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/ /mapped to number \d*/mapped to number num/ /CRC32 0x[0-9a-f]+/CRC32 XXX/ /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ /xid=\d*/xid=<xid>/ /table id \d+/table id <tblid>/ /end_log_pos \d+/end_log_pos <pos>/ /# at \d+/# at <pos>/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
--echo --echo

View File

@@ -1613,7 +1613,7 @@ SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test'; INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
INSERT INTO t1 VALUES(1, 'sampleblob1'),(2, 'sampleblob2'); INSERT INTO t1 VALUES(1, 'sampleblob1'),(2, 'sampleblob2');
# Compression length depends on zip library # Compression length depends on zip library
--replace_result 583 584 291 292 --replace_result 583 584 585 584 291 292
SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM SELECT DATA_LENGTH, AVG_ROW_LENGTH FROM
INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test'; INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test';
DROP TABLE t1; DROP TABLE t1;