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

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3b7fced9bc5..3f212a8f8c6 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -65,6 +65,8 @@ class MYSQL_LOG {
   bool write_error,inited;
   uint32 log_seq; // current event sequence number
   // needed this for binlog
+  uint file_id; // current file sequence number for load data infile
+  // binary logging
   bool no_rotate; // for binlog - if log name can never change
   // we should not try to rotate it or write any rotation events
   // the user should use FLUSH MASTER instead of FLUSH LOGS for
@@ -99,6 +101,7 @@ public:
   int find_first_log(LOG_INFO* linfo, const char* log_name);
   int find_next_log(LOG_INFO* linfo);
   int get_current_log(LOG_INFO* linfo);
+  uint next_file_id();
 
   inline bool is_open() { return log_type != LOG_CLOSED; }
   char* get_index_fname() { return index_file_name;}