1. 15 Sep, 2007 1 commit
    • unknown's avatar
      Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl · e35c1ab9
      unknown authored
      into  dl145j.mysql.com:/tmp/andrei/5.1-merge
      
      
      BitKeeper/deleted/.del-sp_trans_log.result:
        Auto merged
      BitKeeper/deleted/.del-sp_trans_log.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_packet.result:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        should be re-recorded
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        manual merge
      mysql-test/suite/rpl/t/rpl_packet.test:
        manual merge
      sql/slave.cc:
        manual merge
      sql/sql_insert.cc:
        manual merge - installing 5.0 patch logics
      sql/sql_load.cc:
        manual merge
      e35c1ab9
  2. 14 Sep, 2007 2 commits
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · 48f38afb
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_30790
      
      
      48f38afb
    • unknown's avatar
      BUG#30790 : Suspicious code in rpl_utility.cc · 431fd2c1
      unknown authored
      This patch clarifies some of the coding choices with documentationa and
      removes a limitation in the code for future expansion of the CHAR and
      BINARY fields to length > 255.
      
      
      sql/field.cc:
        BUG#30790 : Suspicious code in rpl_utility.cc
        
        This patch adds an assertion to ensure we are not attempting to encode
        negative values.
      sql/log_event.cc:
        BUG#30790 : Suspicious code in rpl_utility.cc
        
        This patch adds comments to help explain the choice of variable types.
      sql/rpl_utility.cc:
        BUG#30790 : Suspicious code in rpl_utility.cc
        
        This patch removes code from the calc_field_size that is not needed and
        was ambiguous. Originally intended to future expansion, the code was
        not needed.
        
        Also added are comments to help explain some portions of the code.
        
        A change was made to the korr method to use the unsigned version to 
        avoid extended sign problems.
      sql/rpl_utility.h:
        BUG#30790 : Suspicious code in rpl_utility.cc
        
        This patch corrects some type discrepencies and removes an extra cast.
      431fd2c1
  3. 07 Sep, 2007 1 commit
  4. 04 Sep, 2007 1 commit
    • unknown's avatar
      Disabling rpl_ndb_2other test. · 0e466b54
      unknown authored
      
      mysql-test/suite/rpl_ndb/t/disabled.def:
        The rpl_ndb_2other test must be disabled until replication correctly
        handles endianess issues.
      0e466b54
  5. 30 Aug, 2007 1 commit
  6. 29 Aug, 2007 5 commits
    • unknown's avatar
      Bug #30209 rpl_packet.test: Slave_running mismatch (timing bug?) · ce291125
      unknown authored
      explicit --sleep is removed in favor of wait_for_slave_io_to_stop.inc.
      The status reporting uses `SHOW SLAVE STATUS' *not* possibly buggy "SHOW STATUS LIKE 'Slave_running'".
      
      
      mysql-test/r/rpl_packet.result:
        Recording the necessary Slave_IO_Running status at the end of the bug test.
        It must be No.
      mysql-test/t/rpl_packet.test:
        Removing sleep; wait_for_slave_io_to_stop.inc instead;
        Original "SHOW STATUS LIKE 'Slave_running'" seems to be buggy (to be reported) as with the macro above
        there were evidence slave IO was stopped indeed but "SHOW STATUS" did not find that (see failures in pb)
      ce291125
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 3d5a1d26
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b29968-mysql-5.1-rpl
      
      
      3d5a1d26
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · eb6cd348
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b29968-merge-5.1-rpl
      
      
      sql/slave.h:
        Auto merged
      sql/slave.cc:
        Manual merge.
      eb6cd348
    • unknown's avatar
      BUG#29968 (rpl_ndb_circular.test and rpl_ndb_log.test fail): · e5c8240a
      unknown authored
      Removing unguarded read of slave_running field from inside
      terminate_slave_threads(). This could cause premature exit in the event
      that the slave thread already were shutting down, but isn't finished yet.
      
      The fields slave_running, io_thd, and sql_thread are guarded by an
      associated run_lock. A read of these fields were not guarded inside
      terminate_slave_threads(), which caused an assertion to fire. The
      assertion was removed, and the code reorganized slightly.
      
      
      sql/slave.cc:
        Changing signature of terminate_slave_thread() to accept a skip_lock
        parameter instead of two mutexes. This mimics the signature of the
        terminate_slave_threads() function. Code is also changed as a result
        of this.
        
        Removing unguarded check of slave_running field in the master info and
        relay log info structure since that could cause premature exit of
        terminate_slave_threads().
        
        The thread variable for each of the slave threads can change before
        acquiring the run_lock mutex inside terminate_slave_thread(). Hence
        an assertion was removed that read the variable without guarding it
        with run_lock.
        
        Code that checked *slave_running status inside terminate_slave_thread()
        was reorganized slightly.
      sql/slave.h:
        Moving terminate_slave_thread() to use internal linkage.
      e5c8240a
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · b0051cce
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug21132
      
      
      sql/slave.cc:
        Auto merged
      b0051cce
  7. 28 Aug, 2007 1 commit
  8. 27 Aug, 2007 5 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22 · 23eb9650
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
      
      
      sql/log_event.cc:
        Auto merged
      23eb9650
    • unknown's avatar
      BUG#21842: There was an inconsistency in the use of table->record[0] and · cd7d837b
      unknown authored
      table->record[1] buffers inside Rows_log_event::find_row() function. 
      The patch fixes this.
      
      
      sql/log_event.cc:
        Use table->record[0] to read records from table and table->record[1] to
        store a copy of the original record for comparisons.
      cd7d837b
    • unknown's avatar
      WL#3694 Replication of Invocation and Invoked Features Testing. · 013c96ce
      unknown authored
      Bug#29020 Event results not correctly replicated to slave in RBR: partially.
      
      
      mysql-test/suite/rpl/r/rpl_invoked_features.result:
        Updated result file.
      mysql-test/suite/rpl/t/disabled.def:
        removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)
      mysql-test/suite/rpl/t/rpl_invoked_features.test:
        Added comments, implemented the waiting via include/wait_condition, minor fixes.
      013c96ce
    • unknown's avatar
      Post merge fixes. · 79f951ad
      unknown authored
      
      sql/log_event.cc:
        - Rename RELAY_LOG_INFO -> Relay_log_info.
        - Rows_log_event fields which are used for event application not 
          included when compiling in MYSQL_CLIENT mode.
      sql/log_event.h:
        - Rename RELAY_LOG_INFO -> Relay_log_info.
        - Rows_log_event fields which are used for event application not 
          included when compiling in MYSQL_CLIENT mode.
      sql/log_event_old.cc:
        - Rename RELAY_LOG_INFO -> Relay_log_info.
      sql/log_event_old.h:
        - Rename RELAY_LOG_INFO -> Relay_log_info.
      sql/sql_yacc.yy:
        Reverting to version used in the rpl tree.
      79f951ad
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22 · f7bb00ab
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
      
      
      mysql-test/suite/ndb/r/ndb_dd_basic.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/rpl_record.cc:
        Auto merged
      sql/rpl_record.h:
        Auto merged
      sql/rpl_utility.cc:
        Auto merged
      sql/rpl_utility.h:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      sql/log_event.cc:
        Manual merge.
      sql/log_event.h:
        Manual merge.
      sql/log_event_old.h:
        Manual merge.
      f7bb00ab
  9. 26 Aug, 2007 1 commit
    • unknown's avatar
      BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134 · 642eda22
      unknown authored
      using TPC-B):
       
      Problem: A RBR event can contain incomplete row data (only key value and
      fields which have been changed). In that case, when the row is unpacked
      into record and written to a table, the missing fields get incorrect NULL
      values leading to master-slave inconsistency.
       
      Solution: Use values found in slave's table for columns which are not given
      in the rows event. The code for writing a single row uses the following 
      algorithm: 
      
      1. unpack row_data into table->record[0],
      2. try to insert record,
      3. if duplicate record found, fetch it into table->record[0],
      4. unpack row_data into table->record[0],
      5. write table->record[0] into the table.
      
      Where row_data is the row as stored in the data area of a rows event. 
      Thus:
      
      a) unpacking of row_data happens at the time when row is written into 
       a table,
      
      b) when unpacking (in step 4), only columns present in row_data are 
       overwritten - all other columns remain as they were found in the table.
       
      Since all data needed for the above algorithm is stored inside 
      Rows_log_event class, functions which locate and write rows are turned 
      into methods of that class.
      
      replace_record()     -> Rows_log_event::write_row()
      find_and_fetch_row() -> Rows_log_event::find_row()
      
      Both methods take row data from event's data buffer - the row being 
      processed is pointed by m_curr_row. They unpack the data as needed into 
      table's record buffers record[0] or record[1]. When row is unpacked, 
      m_curr_row_end is set to point at next row in the data buffer.
      
      Other changes introduced in this changeset:
      
      - Change signature of unpack_row(): don't report errors and don't
      setup table's rw_set here. Errors can happen only when setting default 
      values in prepare_record() function and are detected there.
       
      - In Rows_log_event and derived classes, don't pass arguments to
      the execution primitives (do_...() member functions) but use class
      members instead.
      
      - Move old row handling code into log_event_old.cc to be used by 
      *_rows_log_event_old classes.
      
      Also, a new test rpl_ndb_2other is added which tests basic replication 
      from master using ndb tables to slave storing the same tables using 
      (possibly) different engine (myisam,innodb).
        
      Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb. 
      However, these tests doesn't work for various reasons and currently are 
      disabled (see BUG#19227).
        
      The new test differs from the ones it is based on as follows:
        
      1. Single test tests replication with different storage engines on slave 
      (myisam, innodb, ndb).
        
      2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing 
      original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test 
      which doesn't contain tests using partitioned tables as these don't work 
      currently. Instead, it tests replication to a slave which has more or 
      less columns than master.
        
      3. Include file include/rpl_multi_engine3.inc is replaced with 
      include/rpl_multi_engine2.inc. The later differs by performing slightly 
      different operations (updating more than one row in the table) and 
      clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM" 
      as replication of "DELETE" doesn't work well in this setting.
        
      4. Slave must use option --log-slave-updates=0 as otherwise execution of 
      replication events generated by ndb fails if table uses a different 
      storage engine on slave (see BUG#29569).
      
      
      sql/log_event.cc:
        - Initialization of new Rows_log_event members.
        - Fixing some typos in documentation.
        
        In Rows_log_event::do_apply_event:
        - Set COMPLETE_ROWS_F flag (when master and slave have the same number of 
        columns and all colums are present in the row)
        - Move initialization of tables write/read sets here, outside the rows
        processing loop (and out of unpack_row() function).
        - Remove calls to do_prepare_row() - no longer needed.
        - Add code managing m_curr_row and m_curr_row_end pointers.
        
        - Change signatures of row processing methods of Rows_log_event and it
        descendants - now most arguments are taken from class members.
        - Remove do_prepare_row() methods which are no longer used.
        - The auto_afree_ptr template is moved to rpl_utility.h (so that it can
        be used in log_event_old.cc).
        - Removed copy_extra_fields() function - no longer used.
        
        In Rows_log_event::write_row (former replace_record):
        - The old code is moved to log_event_old.cc.
        - Use prepare_record() and non-destructive unpack_current_row() to fill record
        with data.
        - In case a record being inserted already exists on slave and row data is 
        incomplete use the record found and non-destructive unpack_current_row() to 
        combine new column values with existing ones.
        - More debug info added.
        
        In Rows_log_event::find_row (former find_and_fetch_row function):
        - The old code is moved to log_event_old.cc.
        - Unpacking of the row is moved here.
        - In case of search using PK, the key data is prepared here.
        - More debug info added.
        
        - Remove initialization of Rows_log_event::m_after_image buffer which is no
        longer used. 
        - Use new row unpacking methods in Update_rows_log_event::do_exec_row() to 
        create before and after image.
        
        Note: all existing code used by Rows_log_event::do_apply_event() has been moved
        to log_event_old.cc to be used by *_rows_log_event_old classes.
      sql/log_event.h:
        - Add new COMPLETE_ROWS_F flag in Rows_log_event.
        - Add Rows_log_event members describing the row being processed.
        - Add a pointer to key buffer which is used in derived classes.
        - Add new methods: find__row(), write_row() and unpack_current_row().
        - Change signatures of do_...() methods (replace method arguments by
        class members).
        - Remove do_prepare_row() method which is no longer used.
        - Update method documentation.
        - Add Old_rows_log_event class, which contains the old row processing code, as
        a friend of Rows_log_event so that it can access all members of an event 
        instance.
      sql/log_event_old.cc:
        Move here old implementation of Rows_log_event::do_apply_event() and 
        helper methods.
      sql/log_event_old.h:
        - Define new class Old_rows_log_event encapsulating old version of
        Rows_log_event::do_apply_event() and the helper methods.
        - Add the Old_rows_log_event class as a base for *_old versions of RBR event
        classes, ensure that the old version of do_apply_event() is called.
        - For *_old classes, declare the helper methods used in the old version of
        do_apply_event().
      sql/rpl_record.cc:
        - Make unpack_row non-destructive for columns not present in the row.
        - Don't fill read/write set here as it is done outside these functions.
        - Move initialization of a record with default values to a separate
        function prepare_record().
      sql/rpl_record.h:
        - Change signature of unpack_row().
        - Declare function prepare_record().
      sql/rpl_utility.cc:
        Make tabe_def::calc_field_size() a const method.
      sql/rpl_utility.h:
        Make table_def::calc_field_size() a const method.
        
        Move auto_afree_ptr template here so that it can be re-used (currently
        in log_event.cc and log_event_old.cc). Similar with DBUG_PRINT_BITSET 
        macro.
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test:
        Modification of rpl_ndb_2multi_eng test. Tests with partitioned tables 
        are removed and a setup with slave having different number of columns 
        than master is added.
      mysql-test/include/rpl_multi_engine2.inc:
        Modification of rpl_multi_engine3.inc which operates on more rows and
        replaces "DELETE FROM t1" with "TRUNCATE TABLE t1" as the first form
        doesn't replicate in NDB -> non-NDB setting (BUG#28538).
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result:
        Results of the test.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt:
        Test options. --log-slave-updates=0 is compulsory as otherwise non-NDB 
        slave applying row events from NDB master will fail when trying to log
        them.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test:
        Test replication of NDB table to slave using other engine. The main test
        is in extra/rpl_tests/rpl_ndb_2multi_basic.test. It is included here
        several times with different settings of default storage engine on slave.
      642eda22
  10. 22 Aug, 2007 5 commits
    • unknown's avatar
      Bug#30359 · fc766e51
      unknown authored
        "Test federated_bug_25714 issues non-existing shell command"
        Problem caused by missing '$' symbol in eval statement causing it
        to always attempt to run test even if the test was not compiled.
      
      
      mysql-test/include/have_bug25714.inc:
        bug30359
          missing '$' in eval statement
      fc766e51
    • unknown's avatar
      Fix the version number. · 7c5aa8a6
      unknown authored
      
      configure.in:
        Version is 5.1.22 !
      7c5aa8a6
    • unknown's avatar
      Merge trift2.:/MySQL/M51/clone-5.1 · b07fc544
      unknown authored
      into  trift2.:/MySQL/M51/target-5.1.22
      
      
      b07fc544
    • unknown's avatar
      bug#23333 · 116995f9
      unknown authored
      fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)
      
      
      mysql-test/r/sp_trans_log.result:
        results changed as prescribed
      mysql-test/t/sp_trans_log.test:
        Replacing the reporting pattern
        
        ### a possible bug: 
        #show master status /* the offset must denote there is the query */|
        # displays different offests in ps-protocol
        
        with 
          show binlog events
      116995f9
    • unknown's avatar
      bug#27417 · bdfe0b52
      unknown authored
      refining of cleanup of the tests.
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        results changed.
      mysql-test/t/mix_innodb_myisam_binlog.test:
        proper cleanup.
      bdfe0b52
  11. 21 Aug, 2007 2 commits
    • unknown's avatar
      ndb_dd_dump.test, ndb_dd_dump.result: · 833afa54
      unknown authored
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      
      
      mysql-test/suite/ndb/t/ndb_dd_dump.test:
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      mysql-test/suite/ndb/r/ndb_dd_dump.result:
        uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas
      833afa54
    • unknown's avatar
      Bug #23333 stored function + non-transac table + transac table = breaks stmt-based binlog · a0849011
      unknown authored
      Binlogging of the statement with a side effect like a modified non-trans table did not happen.
      The artifact involved all binloggable dml queries.
      
      Fixed with changing the binlogging conditions all over the code to exploit thd->transaction.stmt.modified_non_trans_table
      introduced by the patch for bug@27417.
      
      Multi-delete case has own specific addressed by another bug@29136. Multi-update case has been addressed by bug#27716 and
      patch and will need merging.
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        results changed
      mysql-test/r/sp_trans_log.result:
        results changed
      mysql-test/t/mix_innodb_myisam_binlog.test:
        specific to the bug tests added
      mysql-test/t/sp_trans_log.test:
        refining of the proof of that there is an event in binlog
      sql/sql_delete.cc:
        deploying the binlogging check with thd->transaction.stmt.modified_non_trans_table
      sql/sql_insert.cc:
        binlogging when thd->transaction.stmt.modified_non_trans_table is TRUE. Merge with Bug#29571.
      sql/sql_load.cc:
        binlogging when thd->transaction.stmt.modified_non_trans_table is true
      sql/sql_update.cc:
        binlogging when thd->transaction.stmt.modified_non_trans_table is true
      a0849011
  12. 20 Aug, 2007 4 commits
  13. 17 Aug, 2007 4 commits
  14. 16 Aug, 2007 7 commits
    • unknown's avatar
      Empty changeset to restart pushbuild · 8f8eab9c
      unknown authored
      8f8eab9c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-marvel · 02f1b317
      unknown authored
      into  mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release
      
      
      sql/log_event.cc:
        Auto merged
      02f1b317
    • unknown's avatar
      Set back version number after pulling bugfix · c319ade1
      unknown authored
      c319ade1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 6b10f518
      unknown authored
      into  mysql.com:/data0/mysqldev/my/mysql-5.1-30367
      
      
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/log_event.cc:
        Manual merge, later version of the fix takes precedence.
      6b10f518
    • unknown's avatar
      Post-merge fix of error number · 51c9bbf4
      unknown authored
      51c9bbf4
    • unknown's avatar
      Fixed errors found by pushbuild: · 10ef77fc
      unknown authored
      Fixed failing func_misc test for embedded server
      Added casts to avoid compiler warnings
      Removed Table_locks_immediate as it's depending on log file cacheing
      Changed type of get_time() to avoid warnings
      Removed testing if purger master logs succeded as this is not deterministic
      
      
      libmysqld/lib_sql.cc:
        Fixed failing func_misc test for embedded server
      mysql-test/mysql-test-run.pl:
        Shut first down slaves, then masters.
        This should avoid some errors in the log file about not being able to connect to master during shutdown
      mysql-test/r/func_misc.result:
        Move DROP TABLE's first
      mysql-test/r/status.result:
        Removed Table_locks_immediate as it's depending on log file cacheing
      mysql-test/suite/ndb/r/ndb_binlog_basic.result:
        Removed testing if purger master logs succeded as this is not deterministic
      mysql-test/suite/ndb/t/ndb_binlog_basic.test:
        Removed testing if purger master logs succeded as this is not deterministic
      mysql-test/t/func_misc.test:
        Move DROP TABLE's first
      mysql-test/t/status.test:
        Removed Table_locks_immediate as it's depending on log file cacheing
      sql/log_event.cc:
        Added cast to avoid warnings
      sql/log_event.h:
        Changed type of get_time() to avoid warnings
      10ef77fc
    • unknown's avatar
      Minor code fixes to help Doxygen generate good documentation. · 29393eaf
      unknown authored
      
      sql/rpl_rli.h:
        Removing redundant "class" keyword.
      29393eaf