diff options
| author | unknown <guilhem@mysql.com> | 2006-02-26 00:03:52 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-26 00:03:52 +0100 |
| commit | e562a20159741ef3a3f3fa20a4d86388731e6c32 (patch) | |
| tree | baf4c0a4bf4df6cde36826fffb0fd4316050c38f /sql/sql_load.cc | |
| parent | 9cd6325b63975391e9016cd89125e01642af7c42 (diff) | |
| download | mariadb-git-e562a20159741ef3a3f3fa20a4d86388731e6c32.tar.gz | |
Fix for a segfault in my previous cset (about WL#2712 and WL#2977).
sql/sql_load.cc:
fix for segfault in my previous cset
sql/sql_repl.cc:
if RBR, log_loaded_block() returns immediately (code moved from sql_load.cc)
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 1 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 |