1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
This commit is contained in:
unknown 2003-07-02 17:37:23 -04:00
commit 8c113acf96
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqlbinlog.cc
View File

@ -327,7 +327,7 @@ static void dump_remote_log_entries(const char* logname)
len = net_safe_read(mysql);
if (len == packet_error)
die("Error reading packet from server: %s", mysql_error(mysql));
if (len == 1 && net->read_pos[0] == 254)
if (len < 8 && net->read_pos[0] == 254)
break; // end of data
DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n",
len, net->read_pos[5]));

3
sql/sql_parse.cc
View File

@ -1160,7 +1160,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
pos = uint4korr(packet);
flags = uint2korr(packet + 4);
thd->server_id=0; /* avoid suicide */
kill_zombie_dump_threads(slave_server_id = uint4korr(packet+6));
if ((slave_server_id= uint4korr(packet+6)))
kill_zombie_dump_threads(slave_server_id);
thd->server_id = slave_server_id;
mysql_binlog_send(thd, thd->strdup(packet + 10), (my_off_t) pos, flags);
unregister_slave(thd,1,1);

8
sql/sql_repl.cc
View File

@ -522,6 +522,11 @@ Increase max_allowed_packet on master";
case LOG_READ_EOF:
DBUG_PRINT("wait",("waiting for data in binary log"));
if (thd->server_id==0)
{
pthread_mutex_unlock(log_lock);
goto end;
}
if (!thd->killed)
{
/* Note that the following call unlocks lock_log */
@ -611,6 +616,7 @@ Increase max_allowed_packet on master";
}
}
end:
end_io_cache(&log);
(void)my_close(file, MYF(MY_WME));
@ -621,7 +627,7 @@ Increase max_allowed_packet on master";
pthread_mutex_unlock(&LOCK_thread_count);
DBUG_VOID_RETURN;
err:
err:
thd->proc_info = "waiting to finalize termination";
end_io_cache(&log);
/*