An error occurred fetching the project authors.
  1. 30 Mar, 2007 6 commits
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 02a79476
      unknown authored
      into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
      
      
      mysql-test/r/rpl_udf.result:
        Manual merge.
      02a79476
    • unknown's avatar
      - Fixing binary log positions · 5a7b2fc7
      unknown authored
      - Eliminating some compiler warnings
      
      
      mysql-test/extra/binlog_tests/blackhole.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/include/show_binlog_events.inc:
        Fixing regex replace to handle XIDs as well.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_blackhole.result:
        Result change
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_udf.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Fixing binary log position
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Fixing binary log position.
      sql/log_event.cc:
        Eliminating compiler warnings.
      5a7b2fc7
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-5.0.b22638 · 9aa4bf2f
      unknown authored
      into  mysql.com:/home/bar/mysql-5.1.test
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      9aa4bf2f
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 905bc913
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b22638
      
      
      905bc913
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 81a4074b
      unknown authored
      into  romeo.(none):/home/bkroot/mysql-5.1-rpl
      
      
      81a4074b
    • unknown's avatar
      Post merge fixes of result files. · c4bab45b
      unknown authored
      mysql-test/r/binlog_stm_binlog.result:
        Result change.
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change.
      mysql-test/r/binlog_stm_insert_select.result:
        Result change.
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change.
      mysql-test/r/flush_block_commit_notembedded.result:
        Result change.
      mysql-test/r/rpl_000015.result:
        Result change.
      mysql-test/r/rpl_change_master.result:
        Result change.
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change.
      mysql-test/r/rpl_flushlog_loop.result:
        Result change.
      mysql-test/r/rpl_known_bugs_detection.result:
        Result change.
      mysql-test/r/rpl_loaddata.result:
        Result change.
      mysql-test/r/rpl_loaddata_s.result:
        Result change.
      mysql-test/r/rpl_log_pos.result:
        Result change.
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change.
      mysql-test/r/rpl_rotate_logs.result:
        Result change.
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change.
      mysql-test/r/rpl_server_id1.result:
        Result change.
      mysql-test/r/rpl_server_id2.result:
        Result change.
      mysql-test/r/rpl_sp.result:
        Result change.
      mysql-test/r/rpl_stm_charset.result:
        Result change.
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change.
      mysql-test/r/rpl_stm_log.result:
        Result change.
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change.
      mysql-test/r/rpl_stm_multi_query.result:
        Result change.
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change.
      mysql-test/r/rpl_stm_until.result:
        Result change.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change.
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change.
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change.
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change.
      mysql-test/r/user_var-binlog.result:
        Result change.
      c4bab45b
  2. 29 Mar, 2007 19 commits
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · 39176e9f
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
      
      
      39176e9f
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · d3ef3c9f
      unknown authored
          
      This patch changes test to remove Windows-specific limitations and potential
      rounding errors in the calculation of a UDF.
      
      Also corrects a minor merge conflict.
      
      
      mysql-test/include/rpl_udf.inc:
        WL#3629 - Replication of Invocation and Invoked Features
            
        This patch changes test to remove Windows-specific results by replacing the
        library name in the SELECT from mysql.func to "UDF_LIB" to allow for the 
        differences in platform (.so vs .dll).
        
        The patch also changes the function body of myfuncsql_double to a calculation
        that does not result in potential rounding errors from the test data.
      mysql-test/r/rpl_udf.result:
        WL#3629 - Replication of Invocation and Invoked Features
            
        This patch changes the result file for the test to match the new expected
        values for the SELECT from mysql.func and the return of myfuncsql_double.
      scripts/mysql_system_tables_fix.sql:
        WL#3629 - Replication of Invocation and Invoked Features
            
        This patch corrects a merge error encountered in a previous merge. The
        column originator should be listed before time_zone in mysql.event.
      d3ef3c9f
    • unknown's avatar
      Post-merge patch. · 85f7c677
      unknown authored
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Position change
      sql/log_event.h:
        Event number change
      85f7c677
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 2c86b5ad
      unknown authored
      into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
      
      
      client/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/rpl_injector.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Manual merge
        ,
      mysql-test/r/flush_block_commit_notembedded.result:
        Manual merge
      mysql-test/r/rpl_000015.result:
        Manual merge
      mysql-test/r/rpl_change_master.result:
        Manual merge
      mysql-test/r/rpl_deadlock_innodb.result:
        Manual merge
      mysql-test/r/rpl_flushlog_loop.result:
        Manual merge
        ,
      mysql-test/r/rpl_loaddata.result:
        manual merge
      mysql-test/r/rpl_loaddata_s.result:
        manual merge
        ,
      mysql-test/r/rpl_log_pos.result:
        manual merge
      mysql-test/r/rpl_ndb_charset.result:
        manual merge
      mysql-test/r/rpl_ndb_log.result:
        manual merge
        ,
      mysql-test/r/rpl_ndb_multi.result:
        manual merge
      mysql-test/r/rpl_rbr_to_sbr.result:
        manual merge
      mysql-test/r/rpl_rotate_logs.result:
        Manual merge
      mysql-test/r/rpl_row_basic_11bugs.result:
        Manual merge
      mysql-test/r/rpl_row_charset.result:
        Manual merge
      mysql-test/r/rpl_row_create_table.result:
        Manual merge
      mysql-test/r/rpl_row_delayed_ins.result:
        Manual merge
      mysql-test/r/rpl_row_drop.result:
        Manual merge
      mysql-test/r/rpl_row_flsh_tbls.result:
        Manual merge
      mysql-test/r/rpl_row_inexist_tbl.result:
        Manual merge
      mysql-test/r/rpl_row_log.result:
        Manual merge
      mysql-test/r/rpl_row_log_innodb.result:
        Manual merge
      mysql-test/r/rpl_row_max_relay_size.result:
        Manual merge
      mysql-test/r/rpl_row_reset_slave.result:
        Manual merge
      mysql-test/r/rpl_row_until.result:
        Manual merge
      mysql-test/r/rpl_server_id1.result:
        Manual merge
      mysql-test/r/rpl_server_id2.result:
        Manual merge
      mysql-test/r/rpl_sp.result:
        Manual merge
      mysql-test/r/rpl_stm_charset.result:
        Manual merge
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Manual merge
      mysql-test/r/rpl_stm_log.result:
        Manual merge
      mysql-test/r/rpl_stm_max_relay_size.result:
        Manual merge
      mysql-test/r/rpl_stm_multi_query.result:
        Manual merge
      mysql-test/r/rpl_stm_reset_slave.result:
        Manual merge
      mysql-test/r/rpl_stm_until.result:
        Manual merge
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Manual merge
      mysql-test/r/rpl_truncate_2myisam.result:
        Manual merge
      mysql-test/r/rpl_truncate_3innodb.result:
        Manual merge
      mysql-test/r/rpl_truncate_7ndb.result:
        Manual merge
      mysql-test/r/user_var-binlog.result:
        Manual merge
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Manual merge
      mysql-test/extra/binlog_tests/binlog.test:
        Binlog position change.
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        Binlog position change.
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Binlog position change.
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Binlog position change.
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Binlog position change.
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Binlog position change.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Binlog position change.
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Binlog position change.
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Binlog position change.
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Binlog position change.
      mysql-test/include/show_binlog_events.inc:
        Binlog position change.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Binlog position change.
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Binlog position change.
      mysql-test/t/mysqlbinlog.test:
        Binlog position change.
      mysql-test/t/mysqlbinlog2.test:
        Binlog position change.
      mysql-test/t/rpl_loaddata_s.test:
        Binlog position change.
      mysql-test/t/rpl_log_pos.test:
        Binlog position change.
      mysql-test/t/rpl_row_basic_11bugs.test:
        Binlog position change.
      mysql-test/t/rpl_row_create_table.test:
        Binlog position change.
      mysql-test/t/rpl_row_flsh_tbls.test:
        Binlog position change.
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Binlog position change.
      mysql-test/t/rpl_sp.test:
        Binlog position change.
      mysql-test/t/rpl_stm_flsh_tbls.test:
        Binlog position change.
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Binlog position change.
      mysql-test/t/user_var-binlog.test:
        Binlog position change.
      sql/share/errmsg.txt:
        Merging error messages
      2c86b5ad
    • unknown's avatar
      WL#3464: Add replication event to denote gap in replication · adaf162b
      unknown authored
      Adding an event that can be used to denote that an incident occured
      on the master. The event can be used to denote a gap in the replication
      stream, but can also be used to denote other incidents.
      
      In addition, the injector interface is extended with functions to
      generate an incident event. The function will also rotate the binary
      log after generating an incident event to get a fresh binary log.
      
      
      client/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      mysql-test/extra/binlog_tests/binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_log.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp002.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp003.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Binlog position change
      mysql-test/include/show_binlog_events.inc:
        Binlog position change
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change
      mysql-test/r/flush_block_commit_notembedded.result:
        Result change
      mysql-test/r/rpl_000015.result:
        Result change
      mysql-test/r/rpl_change_master.result:
        Result change
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change
      mysql-test/r/rpl_flushlog_loop.result:
        Result change
      mysql-test/r/rpl_loaddata.result:
        Result change
      mysql-test/r/rpl_loaddata_s.result:
        Result change
      mysql-test/r/rpl_log_pos.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change
      mysql-test/r/rpl_rotate_logs.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_server_id1.result:
        Result change
      mysql-test/r/rpl_server_id2.result:
        Result change
      mysql-test/r/rpl_sp.result:
        Result change
      mysql-test/r/rpl_stm_charset.result:
        Result change
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change
      mysql-test/r/rpl_stm_multi_query.result:
        Result change
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change
      mysql-test/r/rpl_stm_until.result:
        Result change
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change
      mysql-test/r/user_var-binlog.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Binlog position change
      mysql-test/t/mysqlbinlog.test:
        Binlog position change
      mysql-test/t/mysqlbinlog2.test:
        Binlog position change
      mysql-test/t/rpl_loaddata_s.test:
        Binlog position change
      mysql-test/t/rpl_log_pos.test:
        Binlog position change
      mysql-test/t/rpl_row_basic_11bugs.test:
        Binlog position change
      mysql-test/t/rpl_row_create_table.test:
        Binlog position change
      mysql-test/t/rpl_row_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Binlog position change
      mysql-test/t/rpl_sp.test:
        Binlog position change
      mysql-test/t/rpl_stm_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Binlog position change
      mysql-test/t/user_var-binlog.test:
        Binlog position change
      sql/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      sql/log_event.cc:
        Changing prototype for read_str() to be const-correct and changing code to match that.
        Adding incident log event.
      sql/log_event.h:
        Adding incident log event.
      sql/rpl_injector.cc:
        Adding support for generating incidents into the binary log.
      sql/rpl_injector.h:
        Adding support for generating incidents into the binary log.
      sql/share/errmsg.txt:
        Adding new error message to indicate an incident.
      sql/sql_parse.cc:
        Adding code to generate an incident log event just before executing a REPLACE
        if the variable "incident_database_resync_on_replace" is set.
      mysql-test/r/rpl_incident.result:
        New BitKeeper file ``mysql-test/r/rpl_incident.result''
      mysql-test/t/rpl_incident.test:
        New BitKeeper file ``mysql-test/t/rpl_incident.test''
      sql/rpl_constants.h:
        New BitKeeper file ``sql/rpl_constants.h''
      adaf162b
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · 092c0522
      unknown authored
      This patch corrects an error in the header file concerning a method declaration
      in the header file. Compiles ok on Windows, but not on Linux. 
      
      
      sql/event_data_objects.h:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in the header file concerning a method declaration
        in the header file.
      092c0522
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · af26b2b8
      unknown authored
        
      This patch corrects errors that occurred in a local manual merge.
      It adds the originator column in the results of the SHOW EVENTS command
      for a series of tests.
      
      The only code change is to correct references to the classname in
      enums.
      
      
      mysql-test/r/events.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/events_bugs.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/events_time_zone.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/mysqldump.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/r/ps.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the originator column in the results of the SHOW EVENTS command.
      sql/event_data_objects.cc:
        WL#3629 - Replication of Invocation and Invoked Features
          
        This patch corrects errors that occurred in a local manual merge.
        It adds the classname to the enums appearing in another patch.
      af26b2b8
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 4a0f5887
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
      
      
      mysql-test/t/events.test:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/events.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      BitKeeper/deleted/.del-mysql_create_system_tables.sh:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      mysql-test/r/events.result:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      mysql-test/r/events_grant.result:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      mysql-test/r/events_restart_phase1.result:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      mysql-test/r/system_mysql_db.result:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      mysql-test/t/events_restart_phase1.test:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      scripts/mysql_system_tables.sql:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      scripts/mysql_system_tables_fix.sql:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      sql/event_data_objects.cc:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      sql/event_data_objects.h:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      sql/event_db_repository.cc:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      sql/event_db_repository.h:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      sql/sql_udf.cc:
        WL#3629 : Replication of Invocation and Invoked Features
        
        Manual merge prior to pushing patches.
      4a0f5887
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl · 7e43b1f5
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
      
      
      sql/slave.cc:
        Auto merged
      7e43b1f5
    • unknown's avatar
      post-merge test fixes · cbbb4034
      unknown authored
      cbbb4034
    • unknown's avatar
      WL#3629 - Replication of Invocation and Invoked Features · 75686dc7
      unknown authored
      This patch corrects errors that occurred in a local manual merge as a result
      of updating the local repository and includes changes necessary to correct 
      problems found during the recalculation of next execution of events in RBR.
      
      
      mysql-test/include/rpl_events.inc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch changes the rpl_events test to be more comprehensive in catching
        errors as a result of RBR. Changes include clarification of SELECTs with
        WHERE clauses and synchronization with master and slave.
      mysql-test/r/rpl_events.result:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch changes the results for the rpl_events test to accomodate the changes
        in the test.
      scripts/mysql_system_tables.sql:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch adds the originator column and a new enum value to the mysql.event table.
        This change was necessary to accomodate changes as a result of other patches.
      sql/event_data_objects.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        The status check was changed to include either ENABLED or DISABLED in the
        gate to change the status to SLAVESIDE_DISABLED for events replicated to 
        the slave.
        
        This patch also includes an update to correct a problem encountered during
        testing after the local merge. The update_timing_fields method is replicating
        the timing changes in RBR to the slave thereby over writing the change to the
        status column in the process. This code includes a check to turn off the next
        binlog event if in RBR.
      sql/event_queue.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        The code was corrected to include both types of disabled status enums
        (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
      sql/sql_show.cc:
        WL#3629 - Replication of Invocation and Invoked Features
        
        This patch corrects an error in merging that occurred during manual merge.
        It corrects the order in which the originator column appears in the show
        structures. The error caused incorrect output on SHOW EVENTS commands.
      75686dc7
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · aae14104
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      aae14104
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · c033e15e
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
      
      
      client/mysqlbinlog.cc:
        Auto merged
      mysql-test/extra/binlog_tests/binlog.test:
        Auto merged
      mysql-test/r/binlog_row_binlog.result:
        Auto merged
      mysql-test/r/binlog_stm_binlog.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/rpl_ndb_log.result:
        Manual merge main->rpl 5.1
      mysql-test/r/rpl_truncate_7ndb.result:
        Manual merge main->rpl 5.1
      sql/log.cc:
        Manual merge main->rpl 5.1
      sql/log_event.cc:
        Manual merge main->rpl 5.1
      c033e15e
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · e420488e
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      e420488e
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-5.0.b27079 · 5de36f39
      unknown authored
      into  mysql.com:/home/bar/mysql-5.1-new-rpl
      
      
      5de36f39
    • unknown's avatar
      Code layout fix for bug N 27079 · ee0475bf
      unknown authored
      Thanks to Gluh for suggestion.
      
      
      ee0475bf
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6370f622
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b27079
      
      
      6370f622
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-5.0.b22378 · 39104456
      unknown authored
      into  mysql.com:/home/bar/mysql-5.1-new-rpl
      
      
      strings/ctype-utf8.c:
        Auto merged
      BUILD/compile-pentium-debug-max:
        After merge fix
      39104456
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · dbc12e4a
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b22378
      
      
      dbc12e4a
  3. 28 Mar, 2007 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · e3d3f302
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      e3d3f302
    • unknown's avatar
      Bug#22638 SOUNDEX broken for international characters · b5cc4fa6
      unknown authored
      Problem: SOUNDEX returned an invalid string for international
      characters in multi-byte character sets.
      For example: for a Chinese/Japanese 3-byte long character
      _utf8 0xE99885 it took only the very first byte 0xE9,
      put it into the outout string and then appended with three 
      DIGIT ZERO characters, so the result was 0xE9303030 - which
      is an invalide utf8 string.
      Fix: make SOUNDEX() multi-byte aware and - put only complete
      characters into result, thus return only valid strings.
      This patch also makes SOUNDEX() compatible with UCS2.
      
      
      mysql-test/r/ctype_ucs.result:
        Adding tests
      mysql-test/r/ctype_utf8.result:
        Adding tests
      mysql-test/t/ctype_ucs.test:
        Adding tests
      mysql-test/t/ctype_utf8.test:
        Adding tests
      sql/item_strfunc.cc:
        Making soundex multi-byte aware.
      b5cc4fa6
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 5f7d12e4
      unknown authored
      into  romeo.(none):/home/bkroot/mysql-5.1-rpl
      
      
      5f7d12e4
    • unknown's avatar
      Eliminating some warnings. · 8de46d0d
      unknown authored
      sql/field.h:
        Using my_ptrdiff_t for offset instead of uint.
      sql/log_event.cc:
        Removing debug code that generated warnings on Windows build.
      8de46d0d
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · c9371f25
      unknown authored
      into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bugBug27015-s_query_q_append
      
      
      c9371f25
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-5.0.b25946 · 88d2792a
      unknown authored
      into  mysql.com:/home/bar/mysql-5.1.b25946
      
      
      client/mysql.cc:
        Auto merged
      88d2792a
    • unknown's avatar
      Bug#27015 s_query.q_append() called without s_query.reserve()? · cd36f9cf
      unknown authored
      there is a way to miss allocation for the punctuation marks,
      namely if (q == EOF) is true inside of append_identifier(), i.e in case names are not quoted
      (not by default).
      
      Replacing q_append with the method with reallocation if needed.
      
      
      sql/sql_base.cc:
        changing the method that uses reallocation if necessary
      cd36f9cf
  4. 27 Mar, 2007 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ceffe745
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      ceffe745
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0e625692
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      0e625692
    • unknown's avatar
      0e9a844f
    • unknown's avatar
      Eliminating some compiler warnings. · 04c0f3cb
      unknown authored
      sql/log_event.cc:
        Adding non-reachable return statement at end of function to keep compiler
        happy.
      sql/slave.cc:
        In order to keep compiler happy: using variable only used in debug code
        instead of recalling virtual function.
      04c0f3cb
    • unknown's avatar
      BUG#22583 (RBR between MyISAM and non-MyISAM tables containing a BIT · 47d5ed7f
      unknown authored
      field does not work):
      
      Enabling previously disabled test.
      
      
      mysql-test/t/disabled.def:
        Enabling test rpl_multi_engine.
      47d5ed7f
    • unknown's avatar
      BUG#27441 (There is no COLS bitmap for the after image of an update · 32b9ab07
      unknown authored
      rows event):
      
      Adding a after image COLS bitmap to Update_rows_log_event (for telling
      what columns that are present in the after image of each row update).
      
      Also fixing case where Rows_log_event length was not correctly computed
      (happened when the number of columns in a table was more than 251). 
      
      
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change.
      sql/log_event.cc:
        Extending Rows_log_event with two new fields: m_bitbuf_ai and m_cols_ai.  These fields are only used for the Update_rows_log_event.
        Adding implementation of Update_rows_log_event destructor.
        Using new after image fields inside the Update_rows_log_event.
        Factoring out common constructor bodies into Update_rows_log_event::init()
        function.
        
        Fixing case where length of Rows_log_event was not correctly computed (for
        tables with more than 251 columns).
      sql/log_event.h:
        Moving implementation of Rows_log_event::get_data_size() into .cc file.
        Adding Update_rows_log_event constructor accepting both before image
        and after image COLS vector.
        Adding Update_rows_log_vector destructor.
        Adding fields m_bitbuf_ai and m_cols_ai to Rows_log_event.
        Fixing is_valid() to look at m_cols_ai as well.
      32b9ab07
    • unknown's avatar
      Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared · b1c23f11
      unknown authored
      - Fixing utf8_general_cs according to recent changes.
      - Compiling utf8_general_cs in pentium-debug-max configuration
        to avoid these problems in the future.
      
      
      BUILD/compile-pentium-debug-max:
        Enable compiling of experimental collations in compile-pentium-debug-max
      config/ac-macros/character_sets.m4:
        Adding hidden flag --with-experimental-collations,
        not seen in "configure --help".
      strings/ctype-utf8.c:
        Compilation failure changes:
        catching up with previous character set changes:
        - uni_plane is now not a global variables
        - adding new parameter into my_strnncollsp_utf8_cs
        - adding my_strnxfrm_len into MY_COLLATION_HANDLER 
          for utf8_general_cs
      b1c23f11
    • unknown's avatar
      Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 14315122
      unknown authored
      into  trift-lap.fambruehe:/MySQL/M51/push-5.1
      
      
      mysql-test/t/query_cache_sql_prepare.test:
        Auto merged
      14315122