1. 16 Nov, 2006 4 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1-mrg · e971334e
      unknown authored
      into  mysql.com:/home/hf/work/mysql-5.0-mrg
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/status.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      Makefile.am:
        merging
      BitKeeper/deleted/.del-mysql_client.test:
        merging
      include/mysql.h:
        SCCS merged
      libmysql/libmysql.c:
        merging
      libmysqld/lib_sql.cc:
        merging
      mysql-test/r/order_by.result:
        SCCS merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/order_by.test:
        merging
      mysql-test/t/subselect.test:
        SCCS merged
      sql/item_subselect.cc:
        merging
      sql/item_subselect.h:
        merging
      sql/protocol.cc:
        merging
      sql/sql_class.h:
        merging
      e971334e
    • unknown's avatar
      merging · e78fd1d1
      unknown authored
      e78fd1d1
    • unknown's avatar
      merging · 83a7bbf7
      unknown authored
      83a7bbf7
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 17c238a1
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1-mrg
      
      
      include/mysql.h:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_class.h:
        Auto merged
      Makefile.am:
        merging
      client/mysqltest.c:
        merging
      mysql-test/t/mysql_client.test:
        merging
      17c238a1
  2. 15 Nov, 2006 7 commits
  3. 14 Nov, 2006 9 commits
  4. 13 Nov, 2006 5 commits
    • unknown's avatar
      Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 1613ad2c
      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
      1613ad2c
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · e56742d7
      unknown authored
      into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
      
      
      e56742d7
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-5.0-rpl · 181c9b4d
      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
      181c9b4d
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1-rpl · 8fd48cce
      unknown authored
      into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
      
      
      8fd48cce
    • unknown's avatar
      Bug #19216: Client crashes on long SELECT · f53af7b8
      unknown authored
       The server sends a number of columns to the client.
       It uses a limited "fast" function for that instead of the
       general one. This fast function cannot send numbers larger 
       than 2 bytes. 
       This causes the client to expect smaller number of columns. 
       The client writes outside of the allocated memory buffer 
       as a result.
       Fixed the server to use the general function to send column
       count.
       Fixed the client to check the column count before writing
       column data. 
      
      
      mysql-test/t/mysql_client.test:
        Bug #19216: Client crashes on long SELECT
         - test case
      sql/protocol.cc:
        Bug #19216: Client crashes on long SELECT
         - renamed the function for bether comprehention
           and made it local
         - used the right (non-local) function to transfer 
           the column count in Protocol::send_fields
      sql/protocol.h:
        Bug #19216: Client crashes on long SELECT
         - made optimized net_store_length local
      sql-common/client.c:
        Bug #19216: Client crashes on long SELECT
         - fixed the client to check for older servers (without the fix).
      f53af7b8
  5. 12 Nov, 2006 3 commits
    • unknown's avatar
      bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 57ba34ff
      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
      57ba34ff
    • unknown's avatar
      Correcting BUG/WL identifier extraction to allow multiple references to auxilary · a403c2f9
      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
      a403c2f9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 383fbde5
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      383fbde5
  6. 11 Nov, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 3af223ed
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      3af223ed
    • unknown's avatar
      mysql-test-run.pl: · c6d31783
      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
      c6d31783
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 75a0878f
      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)
      75a0878f
  7. 10 Nov, 2006 9 commits