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

Fix for a segfault in my previous cset (about WL#2712 and WL#2977).

Browse Source
This commit is contained in:
guilhem@mysql.com
2006-02-26 00:03:52 +01:00
parent eb4688330d
commit 3f3473cfb5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_load.cc
View File

@@ -948,8 +948,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
if (get_it_from_net) if (get_it_from_net)
cache.read_function = _my_b_net_read; cache.read_function = _my_b_net_read;
if (((LOAD_FILE_INFO*)cache.arg)->thd->current_stmt_binlog_row_based && if (mysql_bin_log.is_open())
mysql_bin_log.is_open())
cache.pre_read = cache.pre_close = cache.pre_read = cache.pre_close =
(IO_CACHE_CALLBACK) log_loaded_block; (IO_CACHE_CALLBACK) log_loaded_block;
#endif #endif

2
sql/sql_repl.cc
View File

@@ -1576,6 +1576,8 @@ int log_loaded_block(IO_CACHE* file)
if (!(block_len = (char*) file->read_end - (char*) buffer)) if (!(block_len = (char*) file->read_end - (char*) buffer))
return 0; return 0;
lf_info = (LOAD_FILE_INFO*) file->arg; lf_info = (LOAD_FILE_INFO*) file->arg;
if (lf_info->thd->current_stmt_binlog_row_based)
return 0;
if (lf_info->last_pos_in_file != HA_POS_ERROR && if (lf_info->last_pos_in_file != HA_POS_ERROR &&
lf_info->last_pos_in_file >= file->pos_in_file) lf_info->last_pos_in_file >= file->pos_in_file)
return 0; return 0;