diff options
| author | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-29 18:32:16 +0200 |
| commit | be46289855f01c0d563671beb5135c22b7bad2aa (patch) | |
| tree | dc6d00358536a5dca27f806f929ab5e25a000c92 /sql/sql_repl.cc | |
| parent | e2a5c3e4cd331d9addc2342549e2c47ac7e9cb7a (diff) | |
| download | mariadb-git-be46289855f01c0d563671beb5135c22b7bad2aa.tar.gz | |
New error messages
Test of unsigned BIGINT values
Fixes for queries-per-hour
Cleanup of replication code (comments and portability fixes)
Make most of the binary log code 4G clean
Changed syntax for GRANT ... QUERIES PER HOUR
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 146490c7b87..0b408920703 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -763,7 +763,6 @@ int change_master(THD* thd, MASTER_INFO* mi) 1 /* wait for start*/, mi,master_info_file,relay_log_info_file, restart_thread_mask); -err: unlock_slave_threads(mi); thd->proc_info = 0; if (error) @@ -1006,9 +1005,9 @@ int log_loaded_block(IO_CACHE* file) /* file->request_pos contains position where we started last read */ char* buffer = (char*) file->request_pos; - if (!(block_len = file->read_end - buffer)) + if (!(block_len = (char*) file->read_end - (char*) buffer)) return 0; - lf_info = (LOAD_FILE_INFO*)file->arg; + lf_info = (LOAD_FILE_INFO*) file->arg; if (lf_info->last_pos_in_file != HA_POS_ERROR && lf_info->last_pos_in_file >= file->pos_in_file) return 0; @@ -1030,5 +1029,3 @@ int log_loaded_block(IO_CACHE* file) } return 0; } - - |