1. 16 Nov, 2007 1 commit
    • unknown's avatar
      Bug#32435: · d3ab5b93
      unknown authored
      DROP DATABASE statement writes changes to mysql.proc table under RBR
      
      When replicating a DROP DATABASE statement with a database holding
      stored procedures, the changes to the mysql.proc table was recorded
      in the binary log under row-based replication.
      
      With this patch, the thread uses statement-logging format for the
      duration of the DROP DATABASE statement. The logging format is
      (already) reset at the end of the statement, so no additional code
      for resetting the logging format is necessary.
      
      
      sql/sql_db.cc:
        Clearing the row-based statement flag for the DROP DATABASE statement
        since it should always be replicated as a statement.
      mysql-test/extra/binlog_tests/database.test:
        New BitKeeper file ``mysql-test/extra/binlog_tests/database.test''
      mysql-test/suite/binlog/r/binlog_database.result:
        New BitKeeper file ``mysql-test/suite/binlog/r/binlog_database.result''
      mysql-test/suite/binlog/t/binlog_database.test:
        New BitKeeper file ``mysql-test/suite/binlog/t/binlog_database.test''
      d3ab5b93
  2. 14 Nov, 2007 3 commits
    • unknown's avatar
      Post-merge fixes. · 14c17015
      unknown authored
      
      sql/sql_delete.cc:
        Correcting merge error.
      14c17015
    • unknown's avatar
      Reverting changes to debug printouts to ha_ndbcluster.cc. · 31c5c758
      unknown authored
      
      sql/ha_ndbcluster.cc:
        Reverting previous changes done to DBUG_ENTER strings.
      31c5c758
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · c2b45624
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
      
      
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_bug31076.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_bug31076.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        Auto merged
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        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_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/partition.test:
        Manual merge.
      BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
        Manual merge.
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
        Manual merge.
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
        Manual merge.
      mysql-test/suite/rpl/t/disabled.def:
        Manual merge.
      sql/sql_delete.cc:
        Manual merge.
      c2b45624
  3. 12 Nov, 2007 2 commits
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · c11fd18b
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        manual merge
      c11fd18b
    • unknown's avatar
      BUG#31611 (Security risk with BINLOG statement): · 01d72106
      unknown authored
      Adding missing drop of user created for test case.
      
      
      mysql-test/r/mysqlbinlog.result:
        Result file change.
      mysql-test/t/mysqlbinlog.test:
        Dropping user that was added earlier in the test.
      01d72106
  4. 09 Nov, 2007 3 commits
    • unknown's avatar
      BUG#31552 (Replication breaks when deleting rows from out-of-sync table without PK): · 98121ec3
      unknown authored
      Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.
      
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Adding test to see that no error is given on slave when deleting
        rows that don't exist on table without primary key.
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
        Result change.
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        Result change.
      98121ec3
    • unknown's avatar
      Fixing some tests to make the replication team tree green. · 9e7ae298
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_found_rows.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_found_rows.test:
        Adding ORDER BY to avoid order dependencies.
        Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
        Dropping procedures that polluted later test results.
      9e7ae298
    • unknown's avatar
      Bug #31170 rpl_innodb_bug28430 fails: varying timing, ports, and log use · 46a9b976
      unknown authored
      Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
      by means of using the standard include-macro.
      
      The masked-out parameters are not needed by the logics of the original
      tests. What is need to demonstre that replication is not stopped remains.
      
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        results changed
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        using the standard macro that takes care of masking out env specific values
      46a9b976
  5. 08 Nov, 2007 3 commits
  6. 07 Nov, 2007 4 commits
  7. 06 Nov, 2007 19 commits
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags · 7e873ae0
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_killed.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Auto merged
      mysql-test/suite/rpl/t/rpl_temporary.test:
        manual merge
      sql/log.cc:
        manual merge
      7e873ae0
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · df210b74
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
      
      df210b74
    • unknown's avatar
      bug#27571 · 62e9ce16
      unknown authored
      refining non-deterministic tests.
      The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
       
      
      
      mysql-test/r/binlog_killed.result:
        results changed
      mysql-test/t/binlog_killed.test:
        refining the tests as killing is inherently non-deterministic;
        leaving todos.
      62e9ce16
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · e95c116d
      unknown authored
      into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-runtime
      
      e95c116d
    • unknown's avatar
      bug#27571 · 9c4b1f65
      unknown authored
      tests fixing: refreshing the results file.
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      9c4b1f65
    • unknown's avatar
      BUG#12092 (FOUND_ROWS() not replicated): · 374359d2
      unknown authored
      In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
      works only in mixed mode under 5.1. There is a workaround that
      can be used in statement-based mode either under 5.0 or 5.1
      where the result of FOUND_ROWS() is stored into a user vari-
      able and used that way instead. This will replicate correctly
      even under statement-based replication, since it will write
      a User_var entry to the binary log. For some other cases, the
      value has to be passed explicitly.
      
      This patch adds tests to demonstrate that the workarounds docu-
      mented for statement-based replication works as advertised, and
      does more extensive tests for cases that does not work under sta-
      tement-based replication actually work under mixed mode by switch-
      ing to row-based replication.
      
      
      mysql-test/include/reset_master_and_slave.inc:
        New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''
      mysql-test/suite/rpl/r/rpl_found_rows.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''
      mysql-test/suite/rpl/t/rpl_found_rows.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''
      374359d2
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 38e8d5c4
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade
      
      38e8d5c4
    • unknown's avatar
      results from 5.0 is not needed · 20f5aff4
      unknown authored
      
      BitKeeper/deleted/.del-binlog_killed_simulate.result:
        Delete: mysql-test/r/binlog_killed_simulate.result
      20f5aff4
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · f7be180b
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Auto merged
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Auto merged
      f7be180b
    • unknown's avatar
      bug#27571 · 06a48161
      unknown authored
      fixing tests
      
      
      mysql-test/r/binlog_killed_simulate.result:
        the new tests' result
      06a48161
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 86c550d4
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B31974-5.1-runtime
      
      86c550d4
    • unknown's avatar
      Bug #31974: additional commit (test case updates) · 8ced7dc3
      unknown authored
       loose index scan enabled for subqueries
      
      
      mysql-test/r/group_min_max.result:
        Bug #31974: test case updates
         loose index scan enabled for subqueries
      mysql-test/r/index_merge_myisam.result:
        Bug #31974: test case updates
         loose index scan enabled for subqueries
      8ced7dc3
    • unknown's avatar
      bug#27571 · 71cb6a6f
      unknown authored
      removing extra tests (on 5.1 that's been already done)
      
      
      BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
        Delete: mysql-test/t/binlog_killed_bug27571-master.opt
      BitKeeper/deleted/.del-binlog_killed_bug27571.test:
        Delete: mysql-test/t/binlog_killed_bug27571.test
      71cb6a6f
    • unknown's avatar
      Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · 8f882c5c
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        manual merge ul
      mysql-test/suite/binlog/t/binlog_killed.test:
        manual merge with 5.0 specific tests; use local
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
         manual merge with 5.0 specific tests; use local
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_regexp.test:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        automerge
      mysql-test/r/ctype_utf8.result:
        automerge
      mysql-test/r/func_regexp.result:
        automerge
      mysql-test/t/ctype_utf8.test:
        automerge
      sql/item_cmpfunc.cc:
        automerge
      sql/item_cmpfunc.h:
        automerge
      sql/sql_class.h:
        automerge
      sql/sql_insert.cc:
        automerge
      sql/sql_parse.cc:
        automerge
      sql/sql_update.cc:
        automerge
      8f882c5c
    • unknown's avatar
      bug#27571 · 61d0ece4
      unknown authored
      commit is specific for 5.0 to eliminated non-deterministic tests.
      Those tests run only in 5.1 env where there is a necessary devices such
      as processlist table of info_schema.
      
      
      mysql-test/r/binlog_killed.result:
        results changed
      mysql-test/t/binlog_killed.test:
        removing non-deterministic part of the test
      mysql-test/t/binlog_killed_simulate.test:
        adding the guard same as for 5.1 version
      61d0ece4
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 1a12422b
      unknown authored
      into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
      
      
      sql/sql_insert.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      1a12422b
    • unknown's avatar
      bug#27571 · 9b524eae
      unknown authored
      non-deterministic tests refining.
      This particular patch tested on two archs.
      
      
      mysql-test/suite/binlog/t/binlog_killed.test:
        deploying synchronization of killing with reaching the explected state
        of the prey's connection.
      9b524eae
    • unknown's avatar
      bug#27571 · 30774977
      unknown authored
      non-deterministic tests execution on some platforms.
      
      
      mysql-test/suite/binlog/r/binlog_killed.result:
        results changed
      mysql-test/suite/binlog/t/binlog_killed.test:
        correcting the prev test's cleanup;
        increasing time to wait by to be killed query;
        adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query
      30774977
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 210da549
      unknown authored
      into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
      
      210da549
  8. 05 Nov, 2007 5 commits