1. 07 Aug, 2006 2 commits
  2. 06 Aug, 2006 3 commits
  3. 03 Aug, 2006 16 commits
  4. 02 Aug, 2006 16 commits
    • unknown's avatar
      Disable a failing test case (filed a p1 bug) · 3c8150b7
      unknown authored
      3c8150b7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e44e344c
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/r/udf.result:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      mysql-test/t/udf.test:
        Manual merge.
      e44e344c
    • unknown's avatar
      A post-merge fix. · a0efaba3
      unknown authored
      a0efaba3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1cf65f31
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      client/mysql.cc:
        Auto merged
      1cf65f31
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a5812433
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      a5812433
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql · 0825bad9
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/Makefile.am:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      client/mysqltest.c:
        Manual merge
      0825bad9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c102fe94
      unknown authored
      into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge
      mysql-test/t/sp.test:
        Manual merge
      c102fe94
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-4.1 · 328e8c74
      unknown authored
      into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      328e8c74
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-4.1 · 84ece59c
      unknown authored
      into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      84ece59c
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 504e3756
      unknown authored
      into  mysql.com:/home/hf/work/mysql-4.1.20317
      
      
      504e3756
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f3919e92
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
      
      
      include/mysql.h:
        Auto merged
      include/sql_common.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      mysql-test/r/ps.result:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/t/ps.test:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      sql/sql_prepare.cc:
        Manual merge.
      sql/table.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      f3919e92
    • unknown's avatar
      Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed19079c
      unknown authored
      into  lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
      
      
      ed19079c
    • unknown's avatar
      Fix a compilation failiure on QNX · cb6e70a5
      unknown authored
      
      sql/udf_example.c:
        Declare tmp_error at the beginning of the block (this is C now)
      cb6e70a5
    • unknown's avatar
      Bug #21396: Wrong error number generated for a missing table · a29f10e8
      unknown authored
      
      BitKeeper/etc/collapsed:
        BitKeeper file /home/georg/work/mysql/prod/mysql-5.0/BitKeeper/etc/collapsed
      mysys/my_open.c:
        Win64 bit fix: Replacing 32-bit value (0xFFFFFFFF) by a generic error constant.
      a29f10e8
    • unknown's avatar
      Disable test case for for bug 21042 · 10ee3a50
      unknown authored
      10ee3a50
    • unknown's avatar
      .del-sp.test.orig: · 53cc83fe
      unknown authored
        Delete: mysql-test/t/sp.test.orig
      
      
      BitKeeper/deleted/.del-sp.test.orig:
        Delete: mysql-test/t/sp.test.orig
      53cc83fe
  5. 01 Aug, 2006 3 commits
    • unknown's avatar
      Applied innodb-5.0-ss677 snapshot. · 75e40b16
      unknown authored
      Fixes:
      - bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
      - bug #21112: InnoDB slow with > 100,000 .ibd files
      - bug #21113: Duplicate printout in SHOW INNODB STATUS
      
      
      innobase/fil/fil0fil.c:
        Applied innodb-5.0-ss677 snapshot.
          Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss677 snapshot.
          ibuf_print(): Don't print redundant information. Fixes bug #21113.
      sql/ha_innodb.cc:
        Applied innodb-5.0-ss677 snapshot.
          ha_innobase::start_stmt(): patch from Heikki:
          Do not call read_view_close_for_mysql().  (Bug #19834)
      75e40b16
    • unknown's avatar
      Merge 192.168.0.20:mysql/mysql-5.0-maint · a5c45ac6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      extra/yassl/taocrypt/include/asn.hpp:
        Auto merged
      extra/yassl/taocrypt/src/asn.cpp:
        Auto merged
      a5c45ac6
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 1081dd6f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      configure.in:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      1081dd6f