1. 15 Nov, 2006 4 commits
  2. 14 Nov, 2006 8 commits
  3. 13 Nov, 2006 13 commits
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 7e558c68
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/triggers/post-commit:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/slave.cc:
        Manual merge
      7e558c68
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 6f276969
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      BitKeeper/triggers/post-commit:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/log_event.h:
        Manual merge
      sql/slave.cc:
        Manual merge
      6f276969
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 47816114
      unknown authored
      into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      47816114
    • unknown's avatar
      Fixing problem in injector code making NDB tests fire an assertion. · 71392db1
      unknown authored
      
      sql/ha_ndbcluster_binlog.cc:
        Removing extreneous setting of current_stmt_binlog_row_based.
      sql/rpl_injector.cc:
        Since current_stmt_binlog_row_based is reset as the end of a transaction
        it needs to be set at the beginning of a transaction.
      71392db1
    • unknown's avatar
      configure.in: · 46642dc2
      unknown authored
        Raise version number after cloning 5.1.13
      
      
      configure.in:
        Raise version number after cloning 5.1.13
      46642dc2
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · bd060683
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/collapsed:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      bd060683
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 03980f4b
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
      
      
      BitKeeper/etc/collapsed:
        auto-union
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      03980f4b
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · 7ca151b5
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
      
      
      BitKeeper/etc/collapsed:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      7ca151b5
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1-rpl · 0ce4e107
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
      
      0ce4e107
    • unknown's avatar
      WL#3368 mixed binlog_format default · 5091d2a8
      unknown authored
        
        An amendment for parsing argument in case NDB is compiled and active.
        NDB switches from mixed to row-based and back per each query. The previous patch
        was not aware of such behaviour and made exceptional assingment to row-based when
        no command line arg --binlog-format provided.
        
        Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server 
        was build without NDB using binlog nothing to care.
        Test for this piece of code is rather specific. While there is active bug23110
        ndb_alter_table and some other should fail if no explict --binlog-format is given:
        mysql-test-run ndb_alter_table
      
      
      sql/mysqld.cc:
        ndb accepts mixed binlog_format switching to row internally via calling
        thd->set_binlog_format_row_if_mixed at the beginning and careful
        the->reset_current_stmt_binlog_row_based(). There is 
        bug#23110 to implement it all carefully for DDL.
      5091d2a8
    • unknown's avatar
      support-files/mysql.spec.sh : Make the server report its features in the first test run. · c8e7e74b
      unknown authored
      
      support-files/mysql.spec.sh:
        1) Ensure that the features of each server built are reported in the first test run it takes.
        2) Add "--with-partition" to the change log (missing on previous push).
      c8e7e74b
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 2fd22b10
      unknown authored
      into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
      
      
      sql/log_event.cc:
        Auto merged
      2fd22b10
    • unknown's avatar
      Build the generic RPMs including the "partition" feature. bug#23949 · 15cb9dab
      unknown authored
      
      support-files/mysql.spec.sh:
        Add the "partition" feature to the server configuration, whether debugging or not.
        (bug#23949)
      15cb9dab
  4. 12 Nov, 2006 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 7f51633b
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      7f51633b
    • unknown's avatar
      bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · fdaef4e7
      unknown authored
      comments are fixed as was suggested in reviews.
      
      
      sql/log_event.h:
        fixing comments
      sql/slave.cc:
        fixing comments
      sql/sql_repl.cc:
        fixing comments
      fdaef4e7
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · b96dbe6e
      unknown authored
      into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
      
      
      storage/federated/ha_federated.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      b96dbe6e
    • unknown's avatar
      Correcting BUG/WL identifier extraction to allow multiple references to auxilary · 34f12b36
      unknown authored
      bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
      the first in the comments. The referred bugs wls can be typed in same as the targeted
      clickable format.
      If the the target of the fix is a WL and there are some references to bugs
      then the first found reference is regarded as "co-target" so that the bug's identifier
      comes up on the subject line along with the WL's and commit mail will update
      the bug page. The latter feature can be disarmed (if there is no need to update
      the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).
      
      This paticular cset will generate subject line containing bug#0 (as it was the first
      referred) whereas the old version would put in the subject line the last referred
      pattern (e.g bug#2147483648).
      
      
      BitKeeper/triggers/post-commit:
        fixing greedyness of old extraction
      34f12b36
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ed146a13
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      ed146a13
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2433e766
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      2433e766
  5. 11 Nov, 2006 5 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 · 82190b9d
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      82190b9d
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 31481f02
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      31481f02
    • unknown's avatar
      mysql-test-run.pl: · c60d8fb1
      unknown authored
        Test for base directory when a RPM install corrected
      
      
      mysql-test/mysql-test-run.pl:
        Test for base directory when a RPM install corrected
      c60d8fb1
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · dbf89ef5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      dbf89ef5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ae4c26e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      mysql-test/t/rename.test:
        Use local (resolve a conflict)
      5ae4c26e
  6. 10 Nov, 2006 4 commits
    • unknown's avatar
      Merge trift2.:/M50/mysql-5.0 · 5f34139f
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      5f34139f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · d4be3654
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
        Auto merged
      configure.in:
        Auto merged
      include/my_time.h:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run-shell.sh:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/time.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      d4be3654
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 8398b8cf
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      8398b8cf
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · d30742f3
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      d30742f3