database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge work.mysql.com:/home/bk/mysql

Browse Source 
into work.mysql.com:/home/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
This commit is contained in:
unknown
2001-06-01 03:13:02 +02:00
parent a2458dd71e 7032533d4c
commit 2085b1950d
12 changed files with 210 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_repl.cc
View File

@@ -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));