- 26 Sep, 2006 3 commits
-
-
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
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
-
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.
-
- 25 Sep, 2006 7 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint sql/Makefile.am: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/work/my50-work sql/Makefile.am: Auto merged
-
unknown authored
-Backport fix for bug19738 to 4.1 sql/Makefile.am: Generated source should depend on their sources not the tool
-
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
-
unknown authored
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
-
unknown authored
into polly.local:/home/kaa/src/maint/m50-maint--07OGt mysql-test/r/strict.result: Auto merged
-
unknown authored
-
- 23 Sep, 2006 6 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged sql/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge BitKeeper/etc/ignore: auto-union mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge BitKeeper/etc/ignore: auto-union mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge sql/ha_ndbcluster.cc: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge BitKeeper/etc/ignore: auto-union mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/sql_select.cc: Auto merged
-
- 22 Sep, 2006 6 commits
-
-
unknown authored
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
-
unknown authored
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
-
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
-
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
-
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
-
unknown authored
-
- 21 Sep, 2006 15 commits
-
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint ndb/config/common.mk.am: Null merge. ndb/src/common/portlib/Makefile.am: Null merge. ndb/src/kernel/Makefile.am: Null merge.
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
Docs/manual.chm: BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-toteam
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge mysql-test/r/rpl_insert_id.result: Merge 4.1-5.0 mysql-test/r/rpl_max_relay_size.result: Merge 4.1-5.0 mysql-test/t/rpl_insert_id.test: Merge 4.1-5.0 mysql-test/t/rpl_max_relay_size.test: Merge 4.1-5.0
-
unknown authored
mysql-test/r/rpl_insert_id.result: Updated result file
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/inno/50
-
unknown authored
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-toteam sql/opt_range.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
-
- 20 Sep, 2006 3 commits
-
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge sql/sql_yacc.yy: Auto merged
-
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
-
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)
-