1. 07 Feb, 2008 5 commits
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 1c48bea2
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Auto merged
      1c48bea2
    • unknown's avatar
      Renaming some saved binary log files to avoid 99 characters · 2a482933
      unknown authored
      limit for v7 tar.
      
      
      mysql-test/suite/binlog/std_data/ver_5_1_17.001:
        Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_17.001
      mysql-test/suite/binlog/std_data/ver_5_1_23.001:
        Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_23.001
      mysql-test/suite/binlog/std_data/ver_5_1-telco.001:
        Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-telco.001
      mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001:
        Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001
      mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001:
        Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001
      mysql-test/suite/binlog/std_data/bug32407.001:
        Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 -> mysql-test/suite/binlog/std_data/bug32407.001
      2a482933
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 3b44afb0
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      sql/slave.cc:
        Auto merged
      3b44afb0
    • unknown's avatar
      Disabling declaration of debug variable for non-debug builds. · 7144184c
      unknown authored
      
      sql/slave.cc:
        Disabling declaration in non-debug builds.
      7144184c
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 5cb34d74
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      sql/slave.cc:
        Auto merged
      sql/sql_binlog.cc:
        Auto merged
      5cb34d74
  2. 06 Feb, 2008 4 commits
    • unknown's avatar
      Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl · ea7ecda2
      unknown authored
      into  riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl
      
      
      client/mysqlbinlog.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      ea7ecda2
    • unknown's avatar
      Replace windows path separator backslash by unix path separator forward · 7b82376f
      unknown authored
      slash in filenames also for Create_file_log_event.
      
      
      client/mysqlbinlog.cc:
        BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
        Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
        containing LOAD DATA INFILE, it outputs backslashes as path separators in
        filenames. However, the output is typically piped to a client, and client
        expects forward slashes.
        Fix: Replace '\\' by '/' in filenames.
      7b82376f
    • unknown's avatar
      Patch to eliminate some valgrind warnings in debug printout code. · be5a46a6
      unknown authored
      
      sql/rpl_rli.cc:
        Adding variable to mark an instance of Relay_log_info as fake.
      sql/rpl_rli.h:
        Adding variable to mark an instance of Relay_log_info as fake.
      sql/slave.cc:
        Not printing debug information if we are working with a fake
        instance of Relay_log_info. This because the result of calling
        update is nonsense, and trying to print it generates valgrind
        warnings.
      sql/sql_binlog.cc:
        Marking newly created instance of Relay_log_info as a fake instance.
      be5a46a6
    • unknown's avatar
      Removing duplicate code from mysql-test-run.pl · 6cb9dfed
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Removing duplicate code.
      6cb9dfed
  3. 05 Feb, 2008 6 commits
    • unknown's avatar
      Updating result file for rpl_loaddata_map. · 781de196
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        Result change.
      781de196
    • unknown's avatar
      Fixes to make tests pass on vanilla build. · f0f95695
      unknown authored
      
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.
      f0f95695
    • unknown's avatar
      Bug #34305 show slave status handling segfaults when slave io is about · 3b6a71a4
      unknown authored
          to leave
      
      The artifact was caused by
      a flaw in concurrent accessing the slave's io thd by
      the io itself and a handling show slave status thread.
      Namely, show_master_info did not acquire mi->run_lock mutex that is
      specified for mi->io_thd member.
      
      Fixed with deploying the mutex locking and unlocking. The mutex is kept
      short time and without interleaving with mi->data_lock mutex.
      
      Todo: to report and fix an issue with 
          sys_var_slave_skip_counter::{methods} 
      seem to acquire incorrectly
           active_mi->rli.run_lock
      instead of the specified
           active_mi->rli.data_lock
      
      A test case is difficult to compose, so rpl_packet should continue serving
      as the indicator.
      
      
      sql/slave.cc:
        implementing a TODO left at 4.1 time:
        mending access to mi->io_thd with the specified mutex;
      sql/slave.h:
        adding a member name to the list of that run_lock guards.
      3b6a71a4
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · a63ef17f
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      include/my_base.h:
        Auto merged
      mysql-test/include/show_binlog_events2.inc:
        Auto merged
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
        Auto merged
      mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/sql_binlog.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_loaddata_map.result:
        Manual merge.
      mysql-test/suite/rpl/r/rpl_user.result:
        Manual merge.
      mysql-test/suite/rpl/t/rpl_loaddata_map.test:
        Manual merge.
      mysql-test/suite/rpl/t/rpl_user.test:
        Manual merge.
      sql/log_event.cc:
        Manual merge.
      sql/rpl_record.cc:
        Manual merge.
      a63ef17f
    • unknown's avatar
      Adding some more filtering for tests that kills queries and · df2cf8c7
      unknown authored
      cause sporadic, but benign, errors.
      
      
      mysql-test/lib/mtr_report.pl:
        Filtering out sporadic but benign error in rpl_err_ignoredtable.
      df2cf8c7
    • unknown's avatar
      Disabling test case binlog_old_version for embedded server. · 57c599b3
      unknown authored
      
      mysql-test/lib/mtr_report.pl:
        Ignoring benign error message (killing query causes unpredictable
        error messages).
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        Disabling test case for embedded server.
      sql/rpl_rli.cc:
        Inititializing uninitialized variable causing valgrind warning.
      57c599b3
  4. 04 Feb, 2008 10 commits
  5. 03 Feb, 2008 2 commits
    • unknown's avatar
      Removing expected errors from slave from the warnings file. · eca69689
      unknown authored
      
      mysql-test/lib/mtr_report.pl:
        Removing some expected warnings and errors from the slave for
        tests rpl_idempotency and rpl_skip_error.
      eca69689
    • unknown's avatar
      Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if · 5d66c356
      unknown authored
                 exists t1,t2,t3'
      Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
      Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
                 'mysql/ndb_apply_status'
      
      Tests cases didn't wait for cluster to come up due to a typo
      in have_multi_ndb.inc.
      
      
      mysql-test/include/have_multi_ndb.inc:
        SHOW TABLES is case-sensitive in the pattern to LIKE.
      mysql-test/suite/ndb/t/disabled.def:
        Enabling tests.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        Adding include of have_debug since test requires that.
      sql/sql_repl.cc:
        Replacing 'return' with 'DBUG_RETURN' in debug-traced function.
      5d66c356
  6. 02 Feb, 2008 1 commit
    • unknown's avatar
      Disabling various tests and reporting bugs for them. · 29245b93
      unknown authored
      
      mysql-test/suite/ndb/t/disabled.def:
        Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi,
        and rpl_ndb_transaction.
      mysql-test/suite/parts/t/disabled.def:
        Disabling various partition tests.
      29245b93
  7. 01 Feb, 2008 12 commits
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 10aaf68b
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      10aaf68b
    • unknown's avatar
      Fixes to make tests pass in pushbuild. · f72adc70
      unknown authored
      
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_start_comment.test:
        Removing --short-form since that cause test to fail.
      f72adc70
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl-merge · c078b5c5
      unknown authored
      into  mysql_cab_desk.:D:/source/c++/mysql-5.0-rpl-merge
      
      
      c078b5c5
    • unknown's avatar
      BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine · b0747b45
      unknown authored
      This patch adds code to convert the path for LOAD DATA INFILE 
      events to a Unix path which is needed for running mysql client
      on Windows. 
      
      
      client/mysqlbinlog.cc:
        BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
        
        This patch adds code to convert the path for LOAD DATA INFILE 
        events to a Unix path which is needed for running mysql client
        on Windows. 
        
        The 'd:\x\y\z' path becomes 'd:xyz' when run in the client.
      b0747b45
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 44e89ac0
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        SCCS merged
      44e89ac0
    • unknown's avatar
      Again blanking out some numbers in file names that is dependent · 0a9fa826
      unknown authored
      on the context.
      
      
      mysql-test/r/mysqlbinlog.result:
        Result file change.
      mysql-test/t/mysqlbinlog.test:
        Blanking out yet some numbers in file names.
      0a9fa826
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 7fabc514
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      7fabc514
    • unknown's avatar
      Fixes to make tests pass in pushbuild. · 818358ed
      unknown authored
      
      mysql-test/r/mysqlbinlog.result:
        Result file change.
      mysql-test/t/mysqlbinlog.test:
        Fixing test to not be dependent on the sequence numbers
        for file names generated by mysqlbinlog.
      818358ed
    • unknown's avatar
      Fixes to makes tests pass on Windows and vanilla build. · 1e40902c
      unknown authored
      
      mysql-test/suite/binlog/t/binlog_old_versions.test:
        MYSQL_BINLOG was missing --local-load option.
        MYSQL was missing --local-infile=1 option.
      1e40902c
    • unknown's avatar
      Re-creating binlog_start_comment.test to make sure that changes · 2d57d780
      unknown authored
      are propagated from earlier versions.
      
      
      BitKeeper/deleted/.del-binlog_start_comment.result:
        Delete: mysql-test/suite/binlog/r/binlog_start_comment.result
      mysql-test/suite/binlog/r/binlog_start_comment.result:
        Rename: mysql-test/suite/r/binlog_start_comment.result -> mysql-test/suite/binlog/r/binlog_start_comment.result
      BitKeeper/deleted/.del-binlog_start_comment.test:
        Delete: mysql-test/suite/binlog/t/binlog_start_comment.test
      mysql-test/suite/binlog/t/binlog_start_comment.test:
        Rename: mysql-test/suite/t/binlog_start_comment.test -> mysql-test/suite/binlog/t/binlog_start_comment.test
      2d57d780
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 32555d82
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      BitKeeper/deleted/.del-binlog_start_comment.test:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      32555d82
    • unknown's avatar
      Various fixes to make tests pass on Windows. · d3151177
      unknown authored
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Result change
      mysql-test/t/binlog_start_comment.test:
        Adding --local-load to mysqlbinlog to prevent it from failing
        on Windows. Also adding --short-form.
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Extending LIKE pattern to use either \n or \r\n in order to work
        on Windows.
      d3151177