1. 26 Sep, 2006 7 commits
  2. 25 Sep, 2006 7 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 2f8e34a7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/Makefile.am:
        Auto merged
      2f8e34a7
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 16f4a6bc
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/work/my50-work
      
      
      sql/Makefile.am:
        Auto merged
      16f4a6bc
    • unknown's avatar
      Bug#18888 Trying to overwrite sql/lex_hash.h during build · 0dcb1b89
      unknown authored
       -Backport fix for bug19738 to 4.1 
      
      
      sql/Makefile.am:
        Generated source should depend on their sources not the tool
      0dcb1b89
    • unknown's avatar
      Import yaSSL version 1.4.0 · 3a34f4c9
      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
      3a34f4c9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f8cd12ba
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      f8cd12ba
    • unknown's avatar
      Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · d3ef845c
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      mysql-test/r/strict.result:
        Auto merged
      d3ef845c
    • unknown's avatar
  3. 23 Sep, 2006 6 commits
  4. 22 Sep, 2006 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 069141ec
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      069141ec
    • unknown's avatar
      Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · c4057b00
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      c4057b00
    • unknown's avatar
      Netware changes for build with yaSSL · 0cfda1da
      unknown authored
      - Make mwenv automatically adapt the setting to current build dir.
      - Fix include paths that mwccnlm does not understand
      - Link libmysl with yassl  
      
      
      netware/BUILD/mwccnlm:
        Update mwccnlm to convert -I../.. to -I../../
      netware/BUILD/mwenv:
        Automatically detect current build dir and based on that calculate current build dir in winw format.
        Allow caller to define MYDEV to override the defatul "F:/mydev"
        Set all paths from these three variables
      netware/Makefile.am:
        Link libmysql with yassl_libs
      0cfda1da
    • unknown's avatar
      Merge polly.local:/tmp/22129/bug22129/my41-bug22129 · c46e285b
      unknown authored
      into  polly.local:/tmp/22129/bug22129/my50-bug22129
      
      
      strings/strtod.c:
        Auto merged
      mysql-test/r/type_float.result:
        SCCS merged
      mysql-test/t/type_float.test:
        SCCS merged
      c46e285b
    • unknown's avatar
      Fixed bug #22129: A small double precision number becomes zero · 0b583e6e
      unknown authored
      Better checks for underflow/overflow
      
      
      mysql-test/r/type_float.result:
        Added testcase for bug #22129
      mysql-test/t/type_float.test:
        Added testcase for bug #22129
      0b583e6e
    • unknown's avatar
      Fix for bug #19121: Windows incompatible udf_example · 3e85b24c
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        fixed path for udf_example.so when running testsuite on Windows
      sql/CMakeLists.txt:
        Added missing udf_example
      sql/Makefile.am:
        Added udf_example files for make dist
      sql/udf_example.c:
        fix for Windows: Windows doesn't have socket.h and friends
        
        Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
      sql/udf_example.def:
        BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
      3e85b24c
    • unknown's avatar
      Added build rule for mysql_upgrade.exe · fa16278b
      unknown authored
      fa16278b
  5. 21 Sep, 2006 13 commits