database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge kaamos.(none):/data/src/mysql-5.1

Browse Source 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
This commit is contained in:
kaa@kaamos.(none)
2008-01-10 20:44:23 +03:00
parent a0fbcc0326 a714053711
commit 0cec5f8e4b
41 changed files with 678 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/repl_failsafe.cc
View File

@ -927,7 +927,7 @@ bool load_master_data(THD* thd)
0, (SLAVE_IO | SLAVE_SQL)))
my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
strmake(active_mi->master_log_name, row[0],
sizeof(active_mi->master_log_name));
sizeof(active_mi->master_log_name) -1);
active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error_2);
/* at least in recent versions, the condition below should be false */
if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE)