1. 28 Sep, 2006 12 commits
  2. 27 Sep, 2006 15 commits
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint · 8e72d7db
      unknown authored
      into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
      
      
      8e72d7db
    • unknown's avatar
      Temporary fix for bug#22268 (official patch will come soon) · 6930d9d2
      unknown authored
      Don't cap threads at 1000 on Windows any more.
      
      
      6930d9d2
    • unknown's avatar
      Bug#21476: (Thread stack overrun not caught, causing SEGV) · 7f221a18
      unknown authored
      The STACK_MIN_SIZE is currently set to 8192, when we actually need 
      (emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
      Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.
      
      I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
      word sizes and stack behaviors.
      
      The added test verifies in a cross-platform way that there are no gaps 
      between the space that we think we need and what we actually need to report 
      an error.
      
      DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
      an argument to expand variables therein.  (Only right of the "=", of course.)
      
      
      client/mysqltest.c:
        Add "let" to the list of mysqltest commands that evaluates its arguments (only
        the right-hand-side of the equals-sign expression).
      mysql-test/r/mysqltest.result:
        Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
        expand the backslash test).
      mysql-test/t/mysqltest.test:
        Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
        expand the backslash test).
      sql/mysql_priv.h:
        Increase the amount we require to be available for the stack, since 
        experience told us that the previous amount was too little by at least
        1044 bytes.
      mysql-test/r/execution_constants.result:
        New BitKeeper file ``mysql-test/r/execution_constants.result''
      mysql-test/t/execution_constants.test:
        New BitKeeper file ``mysql-test/t/execution_constants.test''
      7f221a18
    • unknown's avatar
      additional 'after merge' fix · c316933e
      unknown authored
      c316933e
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · f7e37479
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      f7e37479
    • unknown's avatar
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 4afea248
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      4afea248
    • unknown's avatar
      Fix compile failure on Sun C++ 5.7 in yaSSL code · a714c2cf
      unknown authored
       - Trying to use unctions declared as static being used from another file, change them to be inline
      
      
      extra/yassl/taocrypt/mySTL/helpers.hpp:
        Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.
      a714c2cf
    • unknown's avatar
      after merge fix · c1e264a5
      unknown authored
      c1e264a5
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 6d77ba47
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/table.cc:
        Auto merged
      include/mysql_com.h:
        manual merge
      mysql-test/r/ctype_utf8.result:
        manual merge
      mysql-test/t/ctype_utf8.test:
        manual merge
      sql/sql_acl.cc:
        manual merge
      6d77ba47
    • unknown's avatar
      Patch for bug#21432 is reverted · abd883f4
      unknown authored
      abd883f4
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · fa97f0fa
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      fa97f0fa
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 9f9e8dc6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      9f9e8dc6
    • unknown's avatar
      Import yaSSL version 1.4.3 · 8d4ad172
      unknown authored
      
      extra/yassl/examples/echoserver/echoserver.cpp:
        Import patch yassl.diff
      extra/yassl/examples/server/server.cpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/misc.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/test.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/crypto.cpp:
        Import patch yassl.diff
      8d4ad172
    • unknown's avatar
      When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available · 9a00f96f
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
        Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
        correct supressions, that means if "/usr/lib/debug" is available, it should be added to
        LD_LIBRARY_PATH
      9a00f96f
  3. 26 Sep, 2006 8 commits
  4. 25 Sep, 2006 5 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 8230220e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/Makefile.am:
        Auto merged
      8230220e
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 7731acb5
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      7731acb5
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 4e927376
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/work/my50-work
      
      
      sql/Makefile.am:
        Auto merged
      4e927376
    • unknown's avatar
      Bug#18888 Trying to overwrite sql/lex_hash.h during build · 6f3c9bfa
      unknown authored
       -Backport fix for bug19738 to 4.1 
      
      
      sql/Makefile.am:
        Generated source should depend on their sources not the tool
      6f3c9bfa
    • unknown's avatar
      Import yaSSL version 1.4.0 · 62d2cadb
      unknown authored
      
      extra/yassl/FLOSS-EXCEPTIONS:
        Import patch yassl.diff
      extra/yassl/README:
        Import patch yassl.diff
      extra/yassl/examples/client/client.cpp:
        Import patch yassl.diff
      extra/yassl/examples/echoclient/echoclient.cpp:
        Import patch yassl.diff
      extra/yassl/examples/echoserver/echoserver.cpp:
        Import patch yassl.diff
      extra/yassl/examples/server/server.cpp:
        Import patch yassl.diff
      extra/yassl/include/buffer.hpp:
        Import patch yassl.diff
      extra/yassl/include/cert_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/crypto_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/factory.hpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/include/socket_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_error.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_imp.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_int.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_types.hpp:
        Import patch yassl.diff
      extra/yassl/src/cert_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/crypto_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.cpp:
        Import patch yassl.diff
      extra/yassl/src/socket_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/ssl.cpp:
        Import patch yassl.diff
      extra/yassl/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_error.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_imp.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/COPYING:
        Import patch yassl.diff
      extra/yassl/taocrypt/INSTALL:
        Import patch yassl.diff
      extra/yassl/taocrypt/README:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/asn.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/block.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/blowfish.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/error.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/file.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/integer.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/misc.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/pwdbased.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/twofish.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/algorithm.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/helpers.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/list.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/memory.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/memory_array.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/pair.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/stdexcept.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/vector.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/algebra.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/asn.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/blowfish.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/des.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/dh.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/integer.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md4.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md5.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/random.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/ripemd.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/sha.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/test.hpp:
        Import patch yassl.diff
      BitKeeper/deleted/.del-algorithm.hpp:
        Delete: extra/yassl/mySTL/algorithm.hpp
      BitKeeper/deleted/.del-helpers.hpp:
        Delete: extra/yassl/mySTL/helpers.hpp
      BitKeeper/deleted/.del-list.hpp:
        Delete: extra/yassl/mySTL/list.hpp
      BitKeeper/deleted/.del-pair.hpp:
        Delete: extra/yassl/mySTL/pair.hpp
      BitKeeper/deleted/.del-stdexcept.hpp:
        Delete: extra/yassl/mySTL/stdexcept.hpp
      BitKeeper/deleted/.del-vector.hpp:
        Delete: extra/yassl/mySTL/vector.hpp
      BitKeeper/deleted/.del-memory.hpp:
        Delete: extra/yassl/mySTL/memory.hpp
      extra/yassl/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/src/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/taocrypt/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/taocrypt/benchmark/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/taocrypt/src/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/taocrypt/src/misc.cpp:
        Remove the functions CRYPTO_lock and CRYPTO_add_lock as they would collide with OpenSSL functions
      extra/yassl/taocrypt/test/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      extra/yassl/testsuite/Makefile.am:
        mySTL directory has moved from yassl/ to yassl/taocrypt
      62d2cadb