diff options
| author | guilhem@mysql.com <> | 2006-02-26 00:03:52 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2006-02-26 00:03:52 +0100 |
| commit | 3f3473cfb570c8994e8af59397f94a61c4d71941 (patch) | |
| tree | baf4c0a4bf4df6cde36826fffb0fd4316050c38f /sql | |
| parent | eb4688330d5cddc93981276bde9cb36cae6d17ec (diff) | |
| download | mariadb-git-3f3473cfb570c8994e8af59397f94a61c4d71941.tar.gz | |
Fix for a segfault in my previous cset (about WL#2712 and WL#2977).
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_load.cc | 3 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index e816b792005..30d83370255 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -948,8 +948,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs, if (get_it_from_net) cache.read_function = _my_b_net_read; - if (((LOAD_FILE_INFO*)cache.arg)->thd->current_stmt_binlog_row_based && - mysql_bin_log.is_open()) + if (mysql_bin_log.is_open()) cache.pre_read = cache.pre_close = (IO_CACHE_CALLBACK) log_loaded_block; #endif diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index bf9a6078a8f..743a0a6b565 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1576,6 +1576,8 @@ int log_loaded_block(IO_CACHE* file) if (!(block_len = (char*) file->read_end - (char*) buffer)) return 0; 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 && lf_info->last_pos_in_file >= file->pos_in_file) return 0; |