• unknown's avatar
    Added options --auto-increment-increment and --auto-increment-offset. · ffc0d185
    unknown authored
    This allows one to setup a master <-> master replication with non conflicting auto-increment series.
    Cleaned up binary log code to make it easyer to add new state variables.
    Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
    Simplified binary log handling.
    Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)
    
    
    
    
    mysql-test/r/mix_innodb_myisam_binlog.result:
      Disable End_log_pos column from 'show binlog events' as this is now different from before
    mysql-test/t/mix_innodb_myisam_binlog.test:
      Disable End_log_pos column from 'show binlog events' as this is now different from before
    sql/ha_berkeley.cc:
      Changed prototype for get_auto_increment()
    sql/ha_berkeley.h:
      Changed prototype for get_auto_increment()
    sql/ha_heap.cc:
      Changed prototype for get_auto_increment()
    sql/ha_heap.h:
      Changed prototype for get_auto_increment()
    sql/ha_innodb.cc:
      Change how auto-increment is calculated.
      Now the auto-increment logic is done in 'update_auto_increment()' to ensure that all handlers has the same auto-increment usage
    sql/ha_innodb.h:
      Changed prototype for get_auto_increment()
    sql/ha_myisam.cc:
      Changed prototype for get_auto_increment()
    sql/ha_myisam.h:
      Changed prototype for get_auto_increment()
    sql/ha_ndbcluster.cc:
      Changed prototype for get_auto_increment()
    sql/ha_ndbcluster.h:
      Changed prototype for get_auto_increment()
    sql/handler.cc:
      Remove some usage of current_thd
      Changed how auto_increment works with SET INSERT_ID to make it more predictable
      (Now we should generate same auto-increment serie on a slave, even if the table has rows that was not on the master.
      Use auto_increment_increment and auto_increment_offset
    sql/handler.h:
      Changed prototype for get_auto_increment()
    sql/log.cc:
      Remove usage of 'set_log_pos()' to make code simpler. (Now log_pos is set in write_header())
      Use 'data_written' instead of 'get_event_len()' to calculate how much data was written in the log
    sql/log_event.cc:
      Simple optimizations.
      Remove cached_event_len (not used variable)
      Made comments fit into 79 chars
      Removed Log_event::set_log_pos(). Now we calculate log_pos in write_header().
      Renamed write_data() to write() as the original write() function was not needed anymore.
      Call writing of event header from event::write() functions. This made it easier to calculate the length of an event.
      Simplified 'write_header' and remove 'switches' from it.
      Changed all write() functions to return 'bool'. (The previous return values where not consistent)
      Store auto_increment_increment and auto_increment_offset in binary log
      Simplified how Query_log_event's where written and read. Now it's much easier to add now status variables for a query event to the binary log.
      Removed some old MySQL 4.x code to make it easier to grep for functions used in 5.0
    sql/log_event.h:
      Changed return type of write() functions to bool. (Before we returned -1 or 1 for errors)
      write_data() -> write()
      Added 'data_written' member to make it easier to get length of written event.
      Removed 'cached_event_len' and 'get_event_len()'
      Added usage of auto_increment_increment and auto_increment_offset
      Added 'artifical_event' to Start_log_event_v3, to hide logic that we in the binary log use log_pos=0 as a flag for an artifical event.
    sql/mysqld.cc:
      Added options --auto-increment-increment and --auto-increment-offset
    sql/set_var.cc:
      Added variables auto_increment_increment and auto_increment_offset
    sql/slave.cc:
      Changed errors -> warnings & information (in error log)
    sql/sql_class.cc:
      Added THD::cleanup_after_query(). This makes some code simpler and allows us to clean up 'next_insert_id' after query
    sql/sql_class.h:
      Added new auto_increment_xxx variables
      Moved some functions/variables in THD class
    sql/sql_help.cc:
      Removed compiler warning
    sql/sql_insert.cc:
      Call 'restore_auto_increment()' if row was not inserted.
      This makes it easier for handler to reuse the last generated auto-incrment value that was not used (for example in case of duplicate key)
    sql/sql_parse.cc:
      Use cleanup_after_query()
    sql/sql_prepare.cc:
      Use cleanup_after_query()
    sql/sql_table.cc:
      R
    ffc0d185
mix_innodb_myisam_binlog.test 3.82 KB