mirror of
https://github.com/MariaDB/server.git
synced 2025-08-14 08:03:06 +03:00
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
This commit is contained in:
BitKeeper/etc
Docs
include
innobase/include
libmysql
mysys
sql
@@ -764,14 +764,18 @@ int change_master(THD* thd)
|
||||
// if we change host or port, we must reset the postion
|
||||
glob_mi.log_file_name[0] = 0;
|
||||
glob_mi.pos = 4; // skip magic number
|
||||
glob_mi.pending = 0;
|
||||
}
|
||||
|
||||
if(lex_mi->log_file_name)
|
||||
strmake(glob_mi.log_file_name, lex_mi->log_file_name,
|
||||
sizeof(glob_mi.log_file_name));
|
||||
if(lex_mi->pos)
|
||||
{
|
||||
glob_mi.pos = lex_mi->pos;
|
||||
|
||||
glob_mi.pending = 0;
|
||||
}
|
||||
|
||||
if(lex_mi->host)
|
||||
{
|
||||
strmake(glob_mi.host, lex_mi->host, sizeof(glob_mi.host));
|
||||
|
Reference in New Issue
Block a user