mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-33239: mysqlbinlog always stops at timestamp 0xffffffff

Browse source 
Do not use the magic value 0xffffffff as meaning "no --stop-datetime option
specified", as this is a valid timestamp value. Use an explicit boolean flag
instead.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen 2024-11-30 21:27:29 +01:00
parent d60efa269e
commit a090a3c571
3 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/mysqlbinlog.cc
View file

@ -164,7 +164,8 @@ static Domain_gtid_event_filter *domain_id_gtid_filter= NULL;
static Server_gtid_event_filter *server_id_gtid_filter= NULL;
static char *start_datetime_str, *stop_datetime_str;
static my_time_t start_datetime= 0, stop_datetime= MY_TIME_T_MAX;
static my_time_t start_datetime= 0, stop_datetime= 0;
static bool stop_datetime_given= false;
static ulonglong rec_count= 0;
static MYSQL* mysql = NULL;
static const char* dirname_for_local_load= 0;
@ -1032,7 +1033,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
if (ev_type != ROTATE_EVENT && is_server_id_excluded(ev->server_id))
goto end;
}
if ((ev->when >= stop_datetime)
if ((stop_datetime_given && ev->when >= stop_datetime)
|| (pos >= stop_position_mot))
{
/* end the program */
@ -2125,6 +2126,7 @@ get_one_option(const struct my_option *opt, const char *argument,
break;
case OPT_STOP_DATETIME:
stop_datetime= convert_str_to_timestamp(stop_datetime_str);
stop_datetime_given= true;
break;
case OPT_BASE64_OUTPUT_MODE:
int val;
@ -3198,7 +3200,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
Emit a warning in the event that we finished processing input
before reaching the boundary indicated by --stop-datetime.
*/
if (stop_datetime != MY_TIME_T_MAX &&
if (stop_datetime_given &&
stop_datetime > last_ev_when)
{
retval = OK_STOP;
@ -3305,7 +3307,7 @@ int main(int argc, char** argv)
if (stop_position != (ulonglong)(~(my_off_t)0))
warning("The --stop-position option is ignored in raw mode");
if (stop_datetime != MY_TIME_T_MAX)
if (stop_datetime_given)
warning("The --stop-datetime option is ignored in raw mode");
result_file= 0;
if (result_file_name)

19
mysql-test/main/mysqlbinlog.result
View file

@ -1300,4 +1300,23 @@ ERROR: Bad syntax in rewrite-db. Expected syntax is FROM->TO.
ERROR: Bad syntax in rewrite-db. Expected syntax is FROM->TO.
ERROR: Bad syntax in rewrite-db. Expected syntax is FROM->TO.
ERROR: Bad syntax in rewrite-db. Expected syntax is FROM->TO.
#
# MDEV-33239: mysqlbinlog always stops at timestamp 0xffffffff
#
RESET MASTER;
CREATE TABLE t (a INT);
INSERT INTO t VALUES (1);
SET @@timestamp= 0 + 0xffffffff;
INSERT INTO t VALUES (2);
SELECT * FROM t ORDER BY a;
a
1
2
FLUSH BINARY LOGS;
DROP TABLE t;
SELECT * FROM t ORDER BY a;
a
1
2
DROP TABLE t;
ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;

25
mysql-test/main/mysqlbinlog.test
View file

@ -641,4 +641,29 @@ FLUSH LOGS;
--exec $MYSQL_BINLOG --rewrite-db=" test -> foo " --short-form $MYSQLD_DATADIR/master-bin.000001 > /dev/null 2> $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn
--echo #
--echo # MDEV-33239: mysqlbinlog always stops at timestamp 0xffffffff
--echo #
RESET MASTER;
CREATE TABLE t (a INT);
INSERT INTO t VALUES (1);
# The 0xffffffff timestamp is truncated on 32-bit, gives warning.
--disable_warnings
SET @@timestamp= 0 + 0xffffffff;
--enable_warnings
INSERT INTO t VALUES (2);
SELECT * FROM t ORDER BY a;
FLUSH BINARY LOGS;
DROP TABLE t;
# The bug was that mysqlbinlog would stop before the event with timestamp
# 0xffffffff, so the second insert would be missing from the table.
--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 | $MYSQL test
SELECT * FROM t ORDER BY a;
DROP TABLE t;
--source include/test_db_charset_restore.inc