An error occurred fetching the project authors.
  1. 29 Mar, 2007 14 commits
    • 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
  2. 28 Mar, 2007 6 commits
  3. 27 Mar, 2007 13 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
    • unknown's avatar
      Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values · 27b333b7
      unknown authored
      Fix: adding namespace reference into "mysql --xml" output,
      to make it work similary to "mysqldump --xml".
      
      
      client/mysql.cc:
        Adding namespace reference.
      mysql-test/r/client_xml.result:
        Fixing test results
      27b333b7
    • unknown's avatar
      Bug#27079 Crash while grouping empty ucs2 strings · 916245f9
      unknown authored
      Problem: GROUP BY on empty ucs2 strings crashed server.
      Reason: sometimes mi_unique_hash() is executed with
      ptr=null and length=0, which means "empty string".
      The branch of code handling UCS2 character set
      was not safe against ptr=null and fell into and
      endless loop even if length=0 because of poiter
      arithmetic overflow.
      Fix: adding special check for length=0 to avoid pointer arithmetic
      overflow.
      
      
      mysql-test/r/ctype_uca.result:
        Adding test case
      mysql-test/t/ctype_uca.test:
        Adding test case
      strings/ctype-uca.c:
        Fix my_uca_scanner_init_ucs2 to be safe against
        strings with length=0 and ptr=0.
      916245f9
    • unknown's avatar
      Making sure thar archive is inited for info AUTO call. · e33f3709
      unknown authored
      storage/archive/ha_archive.cc:
        Adding init for HA_STATUS_AUTO call
      e33f3709
    • unknown's avatar
      Merge piggy:/home/brian/mysql-5.1-arch · ac8c78bb
      unknown authored
      into  zim.(none):/home/brian/mysql/pread-archive-5.1
      
      
      storage/archive/ha_archive.cc:
        Auto merged
      ac8c78bb
    • unknown's avatar
      · ba63bc68
      unknown authored
      Centralized init logic for starting a scan. 
      
      
      storage/archive/ha_archive.cc:
        Removed multiple execution logic
      ba63bc68
  4. 26 Mar, 2007 7 commits