1. 11 Jul, 2005 1 commit
  2. 13 Jun, 2005 9 commits
  3. 11 Jun, 2005 2 commits
    • unknown's avatar
      Merge · b85705cc
      unknown authored
      
      mysql-test/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/include/modes.hpp:
        SCCS merged
      b85705cc
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 871977f2
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/lowercase_table2.result:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      871977f2
  4. 10 Jun, 2005 28 commits
    • unknown's avatar
      Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 · da4838a0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      da4838a0
    • unknown's avatar
      Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base · 9b7f8f70
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-5.0-base
      
      
      myisam/mi_open.c:
        Auto merged
      9b7f8f70
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-9500 · 0670a02c
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      0670a02c
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · d02e86de
      unknown authored
      into mdk10.(none):/home/reggie/bk/50test2
      
      
      d02e86de
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 41bb9bf9
      unknown authored
      into mdk10.(none):/home/reggie/bk/41test3
      
      
      41bb9bf9
    • unknown's avatar
      Bug #10947 mysqlshow wildcard failure on Windows · c2c0d653
      unknown authored
      
      client/mysqlshow.c:
        change to using mysql_real_escape_string
        Also, passing in length of from string "table" instead of to string "rows"
      c2c0d653
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 4ecc9757
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      4ecc9757
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · 5d4a3fa5
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      5d4a3fa5
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · adb8df42
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      adb8df42
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · f83cd87c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      f83cd87c
    • unknown's avatar
      Post-merge fix. · bea2fe87
      unknown authored
      bea2fe87
    • unknown's avatar
      bug#11225 - distinct.test fails · 039a01a1
      unknown authored
      039a01a1
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 0a4600a1
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      
      0a4600a1
    • unknown's avatar
      Merge with latest yaSSL. · 2314cb1c
      unknown authored
      Fixes IsAligned yaSSL assertion failure.
      
      
      extra/yassl/include/buffer.hpp:
        Merge with latest yaSSL.
      extra/yassl/include/factory.hpp:
        Merge with latest yaSSL.
      extra/yassl/include/openssl/ssl.h:
        Merge with latest yaSSL.
      extra/yassl/include/yassl_int.hpp:
        Merge with latest yaSSL.
      extra/yassl/include/yassl_types.hpp:
        Merge with latest yaSSL.
      extra/yassl/mySTL/stdexcept.hpp:
        Merge with latest yaSSL.
      extra/yassl/src/buffer.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/socket_wrapper.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/ssl.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/block.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/hash.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/hmac.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/integer.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/modes.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/rsa.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/aes.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/dsa.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/hash.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/integer.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/md5.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/misc.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/ripemd.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/rsa.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/sha.cpp:
        Merge with latest yaSSL.
      2314cb1c
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 4b0264df
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_rcontext.cc:
        Auto merged
      4b0264df
    • unknown's avatar
      Post review and additional fix for BUG#10968: Stored procedures: crash if long loop. · 03949f8c
      unknown authored
        Fixed valgrind complaints. This fixes the memory leak problems for
        procedured, and partially for functions. There's still a leak involving
        results from functions that turned out to be too involved, so it will be
        fixed separately.
      
      
      mysql-test/r/sp.result:
        Fixed some minor mistake (spotted while debugging).
      mysql-test/t/sp.test:
        Fixed some minor mistake (spotted while debugging).
      sql/item_func.cc:
        Moved Item_func_sp::cleanup() from item_func.h to ease debugging,
        and made a debug output come out right.
      sql/item_func.h:
        Moved Item_func_sp::cleanup() to item_func.cc to ease debugging.
      sql/sp_head.cc:
        Fixed valgrind problems with the previous memory leak fix (unit cleanup and
        putting result field in a differen mem_root), and removed prealloc flag from
        init_alloc_root() calls.
      sql/sp_rcontext.cc:
        New mem_root pointer used for return fields from functions.
      sql/sp_rcontext.h:
        New mem_root pointer used for return fields from functions.
      03949f8c
    • unknown's avatar
      Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0 · 846d6be7
      unknown authored
      into mysql.com:/home/omer/source/src50_0609
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      846d6be7
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-build · d7a17f0d
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      mysql-test/Makefile.am:
        Auto merged
      d7a17f0d
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-merge · 7568579a
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      7568579a
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1-merge · d9813c8e
      unknown authored
      into mysql.com:/space/my/mysql-5.0.7-clone
      
      
      mysql-test/Makefile.am:
        Auto merged
      d9813c8e
    • unknown's avatar
      9b294f59
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 71e9d6ef
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      71e9d6ef
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 5bcd1651
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      5bcd1651
    • unknown's avatar
      ndb - · 05b34194
      unknown authored
      Fix mem leak in testBlobs
      
      
      ndb/test/ndbapi/testBlobs.cpp:
        Fix mem leak in testBlobs
      05b34194
    • unknown's avatar
      os0sync.c, os0file.c: · 25203acb
      unknown authored
        Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
      
      
      innobase/os/os0file.c:
        Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
      innobase/os/os0sync.c:
        Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
      25203acb
    • unknown's avatar
      mysql-test/mysql-test-run.sh · 19d66f2b
      unknown authored
          don't start ndb cluster if no test uses it.
      
      
      mysql-test/mysql-test-run.sh:
        don't start ndb cluster if no test uses it.
      19d66f2b
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 2ee292fb
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      2ee292fb
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 3d749dbc
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/common/logger/Logger.cpp:
        Auto merged
      3d749dbc