1. 26 Sep, 2006 3 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · f21ac7b6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      extra/yassl/src/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/benchmark/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/src/Makefile.am:
        Auto merged
      extra/yassl/taocrypt/test/Makefile.am:
        Auto merged
      extra/yassl/testsuite/Makefile.am:
        Auto merged
      f21ac7b6
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 · 7bf40904
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      7bf40904
    • unknown's avatar
      Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails · e9a84303
      unknown authored
       - As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
       - Count max number of slaves used in testcases
       - Use copy_install_db to speed up "Installing db" phase
      
      
      mysql-test/mysql-test-run.pl:
        Count max number of slaves used for a test run and use that when installing slave databases etc.
        Use "copy_install_db" for all but the first db to install
        After having stopped the slave database, restore it's database files from the snapshot.
      e9a84303
  2. 25 Sep, 2006 7 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 · 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
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 98493e2d
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      98493e2d
    • unknown's avatar
      Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · 313e74c5
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      mysql-test/r/strict.result:
        Auto merged
      313e74c5
    • unknown's avatar
  3. 23 Sep, 2006 6 commits
  4. 22 Sep, 2006 6 commits
  5. 21 Sep, 2006 15 commits
  6. 20 Sep, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 679ed1c8
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      679ed1c8
    • unknown's avatar
      Fix of result files from merge · aede420d
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix of result file (adding the echo's)
      mysql-test/r/rpl_view.result:
        Added end of 5.0 echo
      mysql-test/t/rpl_view.test:
        Added end of 5.0 echo
      aede420d
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · edbab357
      unknown authored
      into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      client/mysqldump.c:
        Merge main->rpl
      mysql-test/r/mysqldump.result:
        Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
        Printouts not yet added to result file
      mysql-test/t/mysqldump.test:
        Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
      edbab357