1. 28 Mar, 2008 1 commit
    • unknown's avatar
      BUG#29020 (Event results not correctly replicated to slave in RBR): · f56d77da
      unknown authored
      The bug allow multiple executing transactions working with non-transactional
      to interfere with each others by interleaving the events of different trans-
      actions.
      
      Bug is fixed by writing non-transactional events to the transaction cache and
      flushing the cache to the binary log at statement commit. To mimic the behavior
      of normal statement-based replication, we flush the transaction cache in row-
      based mode when there is no committed statements in the transaction cache,
      which means we are committing the first one. This means that it will be written
      to the binary log as a "mini-transaction" with just the rows for the statement.
      
      Note that the changes here does not take effect when building the server with
      HAVE_TRANSACTIONS set to false, but it is not clear if this was possible before
      this patch either.
      
      For row-based logging, we also have that when AUTOCOMMIT=1, the code now always
      generates a BEGIN/COMMIT pair for single statements, or BEGIN/ROLLBACK pair in the
      case of non-transactional changes in a statement that was rolled back. Note that
      for the case where changes to a non-transactional table causes a rollback due
      to error, the statement will now be logged with a BEGIN/ROLLBACK pair, even
      though some changes has been committed to the non-transactional table.
      
      
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Removing SHOW BINLOG EVENTS causing test to be non-deterministic.
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_base64_flag.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_multi_engine.result:
        Result file change.
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Result file change.
      mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
        Result file change.
      mysql-test/suite/binlog/r/binlog_row_insert_select.result:
        Result file change.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result file change.
      mysql-test/suite/binlog/r/binlog_stm_binlog.result:
        Result file change.
      mysql-test/suite/binlog/t/binlog_base64_flag.test:
        Removing table that will be used in test to prevent failing if preceeding
        tests forgot to drop the table.
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_delayed_ins.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_log.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_row_until.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_slave_skip.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
        Result file change.
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        Result file change.
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Binlog position change.
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
        Binlog position change.
      mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
        Binlog position change. Added stop position to mysqlbinlog argments to prevent
        extreneous output.
      mysql-test/suite/rpl/t/rpl_row_until.test:
        Binlog position change.
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        Binlog position change.
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
        Removing extreneous SHOW BINLOG EVENTS causing test to be non-deterministic.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
        Result change.
      sql/log.cc:
        Adding variable at_least_one_stmt to denote that there is at least one
        statement committed to the transaction cache (but there might be more).
        
        Removing duplicate checks from binlog_end_trans(). The transaction cache
        should always be committed or rolled back when this function is called.
        
        Correcting conditions for binlog_rollback() and binlog_commit() and removing
        the previous "invisible commit" in favor of always using explicit commits
        in the binary log.
      sql/log_event.cc:
        Marking table map event to be cached. Removing Muted_query_log_event from code.
      sql/log_event.h:
        Removing unused class Muted_query_log_event.
      sql/sql_insert.cc:
        Adding missing call to ha_autocommit_or_rollback() for delayed thread. Marking
        CREATE-SELECT statements as transactional, since they don't need to be logged.
      f56d77da
  2. 05 Mar, 2008 5 commits
    • unknown's avatar
      Adding missing drop of view last in test. · 41a80039
      unknown authored
      
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Dropping view created in test.
      41a80039
    • unknown's avatar
      Updating result file. · cc3bf068
      unknown authored
      
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result file change.
      cc3bf068
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · ad1a1a3e
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      ad1a1a3e
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · d9833dc4
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/handler.cc:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      d9833dc4
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 · d20bfbbe
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
      
      
      d20bfbbe
  3. 04 Mar, 2008 3 commits
  4. 03 Mar, 2008 3 commits
  5. 02 Mar, 2008 2 commits
  6. 29 Feb, 2008 3 commits
  7. 28 Feb, 2008 8 commits
    • unknown's avatar
      Merge buzz.(none):/home/davi/mysql-5.0-runtime · 05480a88
      unknown authored
      into  buzz.(none):/home/davi/mysql-5.1-runtime
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_user_variables.result:
        Manual merge
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        Manual merge
      sql/sql_yacc.yy:
        Manual merge
      05480a88
    • unknown's avatar
      Post-merge fix for Bug 33851. The initialization order of members · 8b779456
      unknown authored
      must match the order which they were declared in the class definition. 
      
      
      sql/item.cc:
        Fix initialization order, parameter was the last one declared.
      8b779456
    • unknown's avatar
      Bug#32663, Bug#33045, Bug#23533, WL#4091 · caf60428
      unknown authored
      
      mysql-test/suite/binlog/r/binlog_multi_engine.result:
        updated result
      mysql-test/suite/binlog/t/binlog_multi_engine.test:
        fix for bug#32663
      mysql-test/suite/binlog/t/disabled.def:
        updated
      mysql-test/suite/rpl/r/rpl_invoked_features.result:
        updated result
      mysql-test/suite/rpl/t/disabled.def:
        updated
      mysql-test/suite/rpl/t/rpl_invoked_features.test:
        fix for bug#33045
      mysql-test/suite/bugs/r/rpl_bug23533.result:
        result file
      mysql-test/suite/bugs/t/rpl_bug23533.test:
        test case for bug#23533
      caf60428
    • unknown's avatar
      Bug#34655 Compile error · 33a4e760
      unknown authored
      Rename client_last_error to last_error and client_last_errno to last_errno
      to not break connectors which use the internal net structure for error handling.
      
      
      include/mysql_com.h:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      include/mysql_h.ic:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/libmysql.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysql/manager.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/lib_sql.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      libmysqld/libmysqld.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      server-tools/instance-manager/mysql_connection.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql-common/client.c:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/log_event_old.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/net_serv.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      sql/repl_failsafe.cc:
        Rename client_last_error to last_error, client_last_errno to last_errno.
      33a4e760
    • unknown's avatar
      Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210 · 1164e2bc
      unknown authored
      The problem is that passing anything other than a integer to a limit
      clause in a prepared statement would fail. This limitation was introduced
      to avoid replication problems (e.g: replicating the statement with a
      string argument would cause a parse failure in the slave).
      
      The solution is to convert arguments to the limit clause to a integer
      value and use this converted value when persisting the query to the log.
      
      
      mysql-test/r/limit.result:
        Update test case result.
      mysql-test/r/ps.result:
        Add test case result for Bug#33851
      mysql-test/r/rpl_user_variables.result:
        Test case result for replication of prepared statement with
        limit clause.
      mysql-test/t/limit.test:
        Test parameters to limit clause.
      mysql-test/t/ps.test:
        Add test case for Bug#33851
      mysql-test/t/rpl_user_variables.test:
        Test replication of a parameter which value is converted.
      sql/item.cc:
        Convert value to integer if it's a parameter to a limit clause.
      sql/item.h:
        Flag signal that item is a parameter to a limit clause.
      sql/item_func.cc:
        Const member functions, object is not mutated.
      sql/sql_class.h:
        Const member functions, object is not mutated.
      sql/sql_yacc.yy:
        Flag that item is a parameter to a limit clause.
      1164e2bc
    • unknown's avatar
      Disable test case due to Bug#34891: sp_notembedded.test fails · 944f2599
      unknown authored
      sporadically.
      
      
      mysql-test/r/sp_notembedded.result:
        Disable test case.
      mysql-test/t/sp_notembedded.test:
        Disable test case.
      944f2599
    • unknown's avatar
      Fix for Bug#34852: SHOW OPEN TABLES output is not repeatable · ce7b8e12
      unknown authored
      (show_check.test fails sporadically).
      
      Fix test case for Bug#12183 to make it stable.
      
      
      mysql-test/r/show_check.result:
        Fix result file.
      mysql-test/t/show_check.test:
        Make test case for Bug#12183 stable.
      ce7b8e12
    • unknown's avatar
      WL#4091, replace sleeps · 5c78f829
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
        updated result
      mysql-test/suite/rpl/r/rpl_row_view01.result:
        updated result
      mysql-test/suite/rpl/t/rpl_change_master.test:
        replace sleep
      mysql-test/suite/rpl/t/rpl_drop_temp.test:
        replace sleep
      mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
        replace sleep
      mysql-test/suite/rpl/t/rpl_relayspace.test:
        replace waiting of state to wait_for_slave_param.inc
      mysql-test/suite/rpl/t/rpl_row_view01.test:
        replace sleep
      mysql-test/suite/rpl/t/rpl_trunc_temp.test:
        replace sleep
      mysql-test/include/wait_for_binlog_event.inc:
        New primitive: waiting an event in binlog on master
      5c78f829
  8. 27 Feb, 2008 11 commits
  9. 26 Feb, 2008 4 commits
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt · fe7035a7
      unknown authored
      into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
      
      
      mysql-test/r/view.result:
        Auto merged
      fe7035a7
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 · 336f2c7e
      unknown authored
      into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_connect.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Manually merged.
      mysql-test/t/disabled.def:
        Manually merged.
      336f2c7e
    • unknown's avatar
      Merge quad.:/mnt/raid/alik/MySQL/devel/5.0 · a86e504f
      unknown authored
      into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
      
      
      mysql-test/r/view.result:
        Auto merged
      a86e504f
    • unknown's avatar
      Merge mysql.com:/Users/davi/mysql/bugs/34424-5.1 · fb3f8bdb
      unknown authored
      into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
      
      
      fb3f8bdb