1. 12 Dec, 2007 3 commits
    • unknown's avatar
      bug#31552 manual merge and post-make-test-run changes. · 32c5d070
      unknown authored
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        changes due to the strict mode gets default. This hunk is being added after merging
        with changes from another bug fixes.
      mysql-test/suite/rpl/r/rpl_ignore_table.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        results changed
      mysql-test/suite/rpl/t/rpl_ignore_table.test:
        two queries on mysql db tables are replicated according to binlog_format, ie
        in row-based when that is requested. Due to cancelling the idempotent default
        row based events that previously exectuted successfully now stop the slave sql
        thread.
        We have to explicitly request the idempotent slave execution mode.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        results changed. They are being committed only now since there was another
        bug which fixes my working clone did not have.
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        results changed
      sql/log_event.cc:
        typo in manual merge earlier
      32c5d070
    • unknown's avatar
      Merge elkin@aelkin2.mysql.internal:MySQL/TEAM/FIXES/5.1/bug31609-conflict_detection · 230f589f
      unknown authored
      into  dl145j.mysql.com:/tmp/andrei/bug31552
      
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        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_ndb/r/rpl_row_basic_7ndb.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/log_event.cc:
        manual merge
      230f589f
    • unknown's avatar
      Bug#31552 Replication breaks when deleting rows from out-of-sync table · 96a51b7f
      unknown authored
          without PK
      Bug#31609 Not all RBR slave errors reported as errors
      bug#32468 delete rows event on a table with foreign key constraint fails
      
      The first two bugs comprise idempotency issues.
      First, there was no error code reported under conditions of the bug
      description although the slave sql thread halted.
      Second, executions were different with and without presence of prim key in
      the table.
      Third, there was no way to instruct the slave whether to ignore an error
      and skip to the following event or to halt.
      Fourth, there are handler errors which might happen due to idempotent
      applying of binlog but those were not listed among the "idempotent" error
      list.
      
      All the named issues are addressed.
      Wrt to the 3rd, there is the new global system variable, changeble at run
      time, which controls the slave sql thread behaviour.
      The new variable allows further extensions to mimic the sql_mode
      session/global variable.
      To address the 4th, the new bug#32468 had to be fixed as it was staying
      in the way.
      
      
      include/my_bitmap.h:
        basic operations with bits of an integer type are added.
      mysql-test/extra/rpl_tests/rpl_foreign_key.test:
        regression test for bug#32468
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        changes due to bug#31552/31609 idempotency is not default any longer
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
        changes due to bug#31552/31609 idempotency is not default any longer
      mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result:
        results changed
      mysql-test/suite/rpl/r/rpl_idempotency.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_mystery22.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        results changed
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        results changed
      mysql-test/suite/rpl/r/rpl_temporary_errors.result:
        results changed
      mysql-test/suite/rpl/t/rpl_idempotency.test:
        extenstions to the test providing testing of complements to the
        idempotent error set and checking how slave halts when it faces an error
        from the list when the mode is STRICT.
      mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
        changes due to bug#31552/31609 idempotency is not default any longer.
      mysql-test/suite/rpl/t/rpl_row_mystery22.test:
        changes due to bug#31552/31609 idempotency is not default any longer
      mysql-test/suite/rpl/t/rpl_temporary_errors.test:
        changes due to bug#31552/31609 idempotency is not default any longer
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
        results changed
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        results changed
      sql/log_event.cc:
        the fix for bug#32468 delete rows event on a table with foreign key constraint fails
        ensures the flags are set at proper time so that their values will be caught
        by innodb.
        reseting the flags is done along the common error and errorless execution
        path.
        The list of idempotent error is extended with foreign keys related items.
        NDB engine write events are designed with the replace sematics in mind.
        Therefore the corrsponding ndb handler's flag are (re)set regardless of
        the slave's execution mode.
        Rows_log_event::write_row() starts using the bool replace argument as its
        caller sets it depending on the event's execution mode.
      sql/log_event.h:
        adding a new member to hold the slave's mode during execution of the event.
      sql/mysql_priv.h:
        changes to link the command line option with the new global sys var.
      sql/mysqld.cc:
        introduction of the new command line option.
        providing its initialization to a default.
        changes to link the command line option with the new global sys var.
      sql/rpl_rli.cc:
        rli post-event-execution cleanup restores the default bits.
      sql/set_var.cc:
        The new "standard" sys_var_set class' and the new global system var related
        declarations and definitions.
        fix_slave_exec_mode() is used as with the update method of a new class so
        as at time of the command line arguments parsing.
      sql/set_var.h:
        new declarations. The class for the new global sys var is based on
        yet another new "standard" one.
      sql/share/errmsg.txt:
        slave_exec_mode setting error;
        slave inconsistency error which may be not an error when the intention
        is "idempotent". I.e consisting of row-based events binlog is being
        applied for the 2nd (more) time.
      sql/sql_class.h:
        The names for the bits of the new sever slave_exec_mode_options.
      mysql-test/suite/rpl/t/rpl_idempotency-master.opt:
        innodb is necessary
      mysql-test/suite/rpl/t/rpl_idempotency-slave.opt:
        innodb is necessary, as well as the tests start with non-default
        IDEMPOTENT slave execution mode.
      96a51b7f
  2. 06 Dec, 2007 1 commit
    • unknown's avatar
      WL#4091, part1. replace --sleep by include/wait_condition.inc · d27196b4
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_start_stop_slave.result:
        updated result
      mysql-test/suite/rpl/t/rpl_critical_errors.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_init_slave.test:
        remove --sleep
      mysql-test/suite/rpl/t/rpl_insert.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_loadfile.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_row_sp001.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_row_sp005.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_row_stop_middle.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_row_trig001.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_row_trig003.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_ssl1.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_start_stop_slave.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        replace --sleep
      mysql-test/suite/rpl/t/rpl_temporary.test:
        replace --sleep
      d27196b4
  3. 29 Nov, 2007 1 commit
  4. 28 Nov, 2007 2 commits
  5. 27 Nov, 2007 2 commits
  6. 26 Nov, 2007 11 commits
  7. 24 Nov, 2007 1 commit
  8. 23 Nov, 2007 11 commits
    • unknown's avatar
      Add mysql-test/lib/*.sql to dists* · 0e0322c9
      unknown authored
      
      mysql-test/Makefile.am:
        Add mysql-test/include/*.sql to dist
      scripts/make_binary_distribution.sh:
        Add mysql-test/include/*.sql to bindist
      0e0322c9
    • unknown's avatar
      Remove printout · e4d2c9d3
      unknown authored
      e4d2c9d3
    • unknown's avatar
      - Don't process already skipped testcases one more time · 1ada48ba
      unknown authored
      in optimization phase
      - Don't check specified binlog format if hasn't been assigned one
      
      
      1ada48ba
    • unknown's avatar
      Add lib to extra dist · b048e1fb
      unknown authored
      b048e1fb
    • unknown's avatar
      Apply patch for BUG#30630 · 269b6f35
      unknown authored
      269b6f35
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-rpl · 7c338deb
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1-rpl-wl3949
      
      
      7c338deb
    • unknown's avatar
      Move the "use lib" directive to mtr.pl · ea9d91e8
      unknown authored
      ea9d91e8
    • unknown's avatar
      Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · e6e30345
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bk/b32580-mysql-5.1-rpl
      
      
      e6e30345
    • unknown's avatar
      BUG#32580 (mysqlbinlog cannot read binlog event generated by user variable usage): · dc8d5bc7
      unknown authored
      The client program 'mysqlbinlog' crashed when trying to print a User_var_log_event holding
      a floating-point value since the format specifier for my_b_printf() does not support
      floating-point format specifiers.
      
      This patch prints the floating-point number to an internal buffer, and then writes
      that buffer to the output instead.
      
      
      mysql-test/r/mysqlbinlog.result:
        Result file change.
      mysql-test/t/mysqlbinlog.test:
        Adding test that mysqlbinlog can write and read back User_var_log_event
        for real, decimal, integer, and string. These are the only types supported
        for user variables.
      sql/log_event.cc:
        Using my_sprintf() to print floating-point value of User_var_log_event value to a
        character buffer and then to the real output, since my_b_printf() does not
        support floating-point format. Also adding macro to give buffer size needed 
        for printing floating-point numbers in %g format.
      dc8d5bc7
    • unknown's avatar
      WL#3949 Test should set binlog format dnamically · 59574a6e
      unknown authored
      - Reorganize collect a little to make it easier to apply optimizations
        and settings to collected test cases.
      - Add suite/rpl/combination file
      - Rename include/set_binlog_format_x.inc to .sql since thay are run by "mysql"
       
      
      
      mysql-test/include/set_binlog_format_mixed.sql:
        Rename: mysql-test/include/set_binlog_format_mixed.inc -> mysql-test/include/set_binlog_format_mixed.sql
      mysql-test/include/set_binlog_format_row.sql:
        Rename: mysql-test/include/set_binlog_format_row.inc -> mysql-test/include/set_binlog_format_row.sql
      mysql-test/include/set_binlog_format_statement.sql:
        Rename: mysql-test/include/set_binlog_format_statement.inc -> mysql-test/include/set_binlog_format_statement.sql
      mysql-test/lib/mtr_cases.pl:
        Reorganize code to
         - collect a suite
         - multiply the tests in the suite with any combinations the suite has
         - optimize the suite by skipping test not supported with current settings
        Use My::Config to read combinations file in my.cnf file format, this
        allowas a "short name" to be used for the combination instead of
        the full name wich is set to the extra arguments the combination applies
        Add function 'print_testcase' that can be used to print the testcases
        during different stages of the collect phase
      mysql-test/lib/mtr_report.pl:
        Print <testname> '<combination>' if combination is set
      mysql-test/mysql-test-run.pl:
        Add comments, fix indentation
        Rename .in to .sql files
        Only set binlog format dynamicall for master, slav is always restarted
      mysql-test/lib/My/Config.pm:
        New BitKeeper file ``mysql-test/lib/My/Config.pm''
      mysql-test/suite/rpl/combinations:
        New BitKeeper file ``mysql-test/suite/rpl/combinations''
      59574a6e
    • unknown's avatar
      Post-merge fixes. · 850fed3e
      unknown authored
      
      mysql-test/r/innodb.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_binlog_grant.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
        Result change.
      mysql-test/suite/rpl/t/disabled.def:
        Enabling some tests.
      mysql-test/suite/rpl/t/rpl_binlog_grant.test:
        Adding missing master-slave.inc, causing previous tests to pollute
        the binary log.
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Enabling some tests.
      850fed3e
  9. 22 Nov, 2007 2 commits
  10. 21 Nov, 2007 6 commits
    • unknown's avatar
      Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · de9bc5c4
      unknown authored
      into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
      
      
      de9bc5c4
    • unknown's avatar
      WL#3949, added skip combinations for some conditions · f2cff6b6
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        added --skip-combination option
      mysql-test/lib/mtr_cases.pl:
        skip combination code for some conditions
      mysql-test/include/have_binlog_format_row_or_statement.inc:
        include file
      f2cff6b6
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 692f0e4f
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/suite/ndb/r/ndb_dd_basic.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
        Auto merged
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        Auto merged
      mysql-test/t/ctype_uca.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.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_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/innodb.result:
        Manual merge.
      692f0e4f
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 787316f2
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      787316f2
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 1fb0a096
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      1fb0a096
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · a393b62e
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      support-files/compiler_warnings.supp:
        merge fix
      a393b62e