mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
mysqlbinlog now prints "# Number of rows" and stops on errors
Main problem was that no log-event print function checked for disk full error on the IO_CACHE. All changes in this patch only affects mysqlbinlog, not the server! - Changed all log-event print functions to return 1 on error - Fixed memory usage when not using --flashback. - Added printing of number of rows in row events. Can be disabled with --print-row-count=0 - Print annotated rows when using mysqlbinlog --short-form - Fixed that mysqlbinlog --debug works - Fixed create_drop_binlog.test test failure - Reorganized fields in PRINT_EVENT_INFO to be according to size to optimize storage - Don't change print_row_event_position or print_row_counts if set by user - Remove some testing of argument to my_free is 0 - base64-output=never is now supported and works in all context - Updated help information for --base64-output and --short-form - print_row_count is now on by default. Reset automatically if --short-form is used - Removed obsolote warning for mysql 5.6.0 - More DBUG_PRINT for mysqltest.cc - my_b_write_byte() now checks for flush failures. This fixed a memory overrun on disk full - my_b_printf() now returns 1 on failure, 0 on ok. This simplifies code and no old code was using the old return value of my_b_printf(). - my_b_Write_backtick_quote() now returns 1 on failure and 0 on ok - Fixed some error conditions in log printing that was not previously handled. - Slave_rows_error_report() can now handle longlong positions - Write_on_release_cache() rewritten so that we can detect errors on flush. Not depending on automatic release anymore. - Changed types for Pos and End_log_pos to 64 bit in SHOW BINLOG EVENTS - Fixed that copy_event_cache_to_string_and_reinit() works with strings longer than 4G (Changed to use LEX_STRING instead of String) - Restricted binlog_rows_event_max_size to UINT32_MAX-1 as String's are anyway restricted to UINT32_MAX - Fixed bug in rpl_binlog_state::write_to_iocache() which hide write failures (duplicate variable name) - Fixed bug in String::append if original string was not allocated - Stop mysqlbinlog output at once if there is an error. - Before printing error message, flush result file. This ensures that the error message is printed last. (Easier to find)
This commit is contained in:
Monty
@@ -2543,6 +2543,7 @@ BEGIN
|
||||
### @77=1 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000000' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=1 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -2724,6 +2725,7 @@ BEGIN
|
||||
### @77=3 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000111' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=2 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -3071,6 +3073,7 @@ BEGIN
|
||||
### @77=2 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000110' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=4 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 2
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -3410,6 +3413,7 @@ BEGIN
|
||||
### @77=3 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000111' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=1 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -3754,6 +3758,7 @@ BEGIN
|
||||
### @77=1 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000000' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=2 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -4096,6 +4101,7 @@ BEGIN
|
||||
### @77=2 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000110' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=3 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -4441,6 +4447,7 @@ BEGIN
|
||||
### @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
|
||||
### @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
|
||||
### @79=4 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -4620,6 +4627,7 @@ BEGIN
|
||||
### @77=3 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000111' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=1 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -4796,6 +4804,7 @@ BEGIN
|
||||
### @77=1 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000000' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=2 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -4975,6 +4984,7 @@ BEGIN
|
||||
### @77=2 /* ENUM(1 byte) meta=63233 nullable=1 is_null=0 */
|
||||
### @78=b'00000110' /* SET(1 bytes) meta=63489 nullable=1 is_null=0 */
|
||||
### @79=3 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5152,6 +5162,7 @@ BEGIN
|
||||
### @77=NULL /* ENUM(1 byte) meta=63233 nullable=1 is_null=1 */
|
||||
### @78=NULL /* SET(1 bytes) meta=63489 nullable=1 is_null=1 */
|
||||
### @79=4 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 1
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5345,6 +5356,7 @@ BEGIN
|
||||
### @1='2008:08:09' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-09' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
|
||||
### @3=9 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 9
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5423,6 +5435,7 @@ BEGIN
|
||||
### @1='2008:08:17' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
|
||||
### @3=7 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 7
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5473,6 +5486,7 @@ BEGIN
|
||||
### @1='2008:08:17' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
|
||||
### @3=7 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 7
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5766,6 +5780,7 @@ BEGIN
|
||||
### @1='2008:01:09' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-01-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
|
||||
### @3=19 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 9
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5835,6 +5850,7 @@ BEGIN
|
||||
### @1='2008:02:09' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-02-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
|
||||
### @3=29 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 9
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -5904,6 +5920,7 @@ BEGIN
|
||||
### @1='2008:03:09' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-03-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
|
||||
### @3=39 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 9
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -6093,6 +6110,7 @@ BEGIN
|
||||
### @1='2038:03:07' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
|
||||
### @3=7 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 18
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -6207,6 +6225,7 @@ BEGIN
|
||||
### @1='2038:03:07' /* DATE meta=0 nullable=1 is_null=0 */
|
||||
### @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
|
||||
### @3=7 /* INT meta=0 nullable=1 is_null=0 */
|
||||
# Number of rows: 18
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
@@ -6338,6 +6357,7 @@ BEGIN
|
||||
### @1=5 /* INT meta=0 nullable=1 is_null=0 */
|
||||
### @2=6 /* INT meta=0 nullable=1 is_null=0 */
|
||||
### @3='Wow' /* VARSTRING(60) meta=60 nullable=1 is_null=0 */
|
||||
# Number of rows: 3
|
||||
# at #
|
||||
#010909 4:46:40 server id 1 end_log_pos # CRC32 XXX Xid = #
|
||||
COMMIT/*!*/;
|
||||
|
||||
Reference in New Issue
Block a user