Skip to content

MDEV-40996 Support --sync_with_master 0, $variable in mysqltest #5619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ParadoxV5 wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-40996 Support --sync_with_master 0, $variable in mysqltest #5619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions client/mysqltest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5340,7 +5340,7 @@ void do_sync_with_master(struct st_command *command)
long offset= 0;
char *p= command->first_argument;
const char *offset_start= p;
char *start, *buff= 0;
char *start, *buff= 0, *str;
start= const_cast<char*>("");

if (*offset_start)
Expand All @@ -5358,15 +5358,15 @@ void do_sync_with_master(struct st_command *command)
p++;
while (*p && my_isspace(charset_info, *p))
p++;
start= buff= (char*)my_malloc(PSI_NOT_INSTRUMENTED, strlen(p)+1,
MYF(MY_WME|MY_FAE));
get_string(&buff, &p, command);
str= buff= (char*)my_malloc(PSI_NOT_INSTRUMENTED, strlen(p)+1,
MYF(MY_WME|MY_FAE));
start= get_string(&str, &p, command);
}
command->last_argument= p;
}
do_sync_with_master2(command, offset, start);
if (buff)
my_free(start);
my_free(buff);
return;
}

Expand Down Expand Up @@ -8417,7 +8417,7 @@ void do_get_errcodes(struct st_command *command)


/*
Get a string; Return ptr to end of string
Get a string; Return ptr to start of string
Strings may be surrounded by " or '

If string is a '$variable', return the value of the variable.
Expand Down
21 changes: 21 additions & 0 deletions mysql-test/suite/rpl/r/mysqltest_sync_with_master_named.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
connect master, 127.0.0.1, root, , , $MASTER_MYPORT;
FLUSH BINARY LOGS;
connect slave, 127.0.0.1, root, , , $SLAVE_MYPORT;
SET @@SESSION.default_master_connection= 'literal';
CHANGE MASTER TO
master_host='127.0.0.1', master_port=MASTER_MYPORT, master_user='root';
include/start_slave.inc
include/stop_slave.inc
RESET SLAVE ALL;
# MDEV-40996
connection master;
FLUSH BINARY LOGS;
connection slave;
SET @@SESSION.default_master_connection= 'variable';
CHANGE MASTER TO
master_host='127.0.0.1', master_port=MASTER_MYPORT, master_user='root';
include/start_slave.inc
include/stop_slave.inc
RESET SLAVE ALL;
disconnect master;
disconnect slave;
42 changes: 42 additions & 0 deletions mysql-test/suite/rpl/t/mysqltest_sync_with_master_named.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--source include/have_binlog_format_mixed.inc # format-agnostic


--connect (master, 127.0.0.1, root, , , $MASTER_MYPORT)
FLUSH BINARY LOGS;
--save_master_pos

--connect (slave, 127.0.0.1, root, , , $SLAVE_MYPORT)
SET @@SESSION.default_master_connection= 'literal';
--replace_result $MASTER_MYPORT MASTER_MYPORT
eval CHANGE MASTER TO
master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root';
--source include/start_slave.inc

--sync_with_master 0, literal

--source include/stop_slave.inc
RESET SLAVE ALL;


--echo # MDEV-40996

--connection master
FLUSH BINARY LOGS;
--save_master_pos

--connection slave
--let $connection= variable
--eval SET @@SESSION.default_master_connection= '$connection'
--replace_result $MASTER_MYPORT MASTER_MYPORT
eval CHANGE MASTER TO
master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root';
--source include/start_slave.inc

--sync_with_master 0, $connection

--source include/stop_slave.inc
RESET SLAVE ALL;


--disconnect master
--disconnect slave