diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-04 05:48:58 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-04 05:48:58 -0600 |
| commit | 39045174a55972dba7c2d208dfbc98824ee70832 (patch) | |
| tree | df20b670229c5cc4c79a31f63dc4f74b32dc6ad9 /sql/log_event.cc | |
| parent | 8d89555e4602d817b6ebc449635cca47e3380b90 (diff) | |
| download | mariadb-git-39045174a55972dba7c2d208dfbc98824ee70832.tar.gz | |
new file_id generation method
mysql-test/r/rpl_log.result:
fixed result for new file_id generating method
BitKeeper/etc/ignore:
Added vio/viotest-ssl to the ignore list
sql/log.cc:
use a different method to generate unique file_id
sql/log_event.cc:
new file_id generationg method
sql/sql_class.h:
new file_id generationg method
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 279bb9fbde3..14524216076 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -45,6 +45,7 @@ static void pretty_print_char(FILE* file, int c) #ifndef MYSQL_CLIENT + static void pretty_print_char(String* packet, int c) { packet->append('\''); @@ -1106,7 +1107,7 @@ Create_file_log_event::Create_file_log_event(THD* thd_arg, sql_exchange* ex, char* block_arg, uint block_len_arg): Load_log_event(thd_arg,ex,db_arg,table_name_arg,fields_arg,handle_dup), fake_base(0),block(block_arg),block_len(block_len_arg), - file_id(thd_arg->file_id = thd_arg->query_id) + file_id(thd_arg->file_id = mysql_bin_log.next_file_id()) { } #endif |