- 28 Sep, 2006 2 commits
- 27 Sep, 2006 4 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/work/my51-work mysql-test/valgrind.supp: Merge suppressions 5.0 -> 5.1
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/work/my51-work mysql-test/mysql-test-run.pl: Merge 5.0 -> 5.1
-
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
-
- 26 Sep, 2006 10 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/work/my51-work netware/BUILD/mwenv: Auto merged
-
unknown authored
netware/BUILD/mwenv: Add extra / after $base for winepath to work correctly Add / between $base and WINE_BUILD_DIR
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/netware/my51-netware netware/Makefile.am: Auto merged netware/BUILD/mwenv: Merge 5.0 -> 5.1
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969 mysql-test/mysql-test-run.pl: Merge 5.0 -> 5.1
-
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 11 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-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
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import extra/yassl/include/openssl/ssl.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/src/Makefile.am: Auto merged extra/yassl/src/ssl.cpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged extra/yassl/src/yassl_int.cpp: 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 extra/yassl/Makefile.am: Manual merge 5.0 -> 5.1 extra/yassl/taocrypt/Makefile.am: Manual merge 5.0 -> 5.1
-
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/m51-new-maint--07OGx
-
unknown authored
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
-
unknown authored
into polly.local:/tmp/22129/bug22129/my51-bug22129 mysql-test/r/strict.result: Auto merged
-
unknown authored
-
- 23 Sep, 2006 10 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/Makefile.am: Auto merged sql/sql_yacc.yy: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bkroot/mysql-5.1 client/mysqldump.c: Auto merged mysql-test/t/disabled.def: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged mysql-test/t/ndb_multi.test: Manual merge
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge BitKeeper/etc/ignore: auto-union mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/udf_example.c: Auto merged BitKeeper/deleted/.del-udf_example.def: Delete: sql/udf_example.def mysql-test/mysql-test-run.pl: Manual merge 5.0->5.1 sql/Makefile.am: Manual merge 5.0->5.1
-
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
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge BitKeeper/etc/ignore: auto-union mysql-test/t/disabled.def: Auto merged sql/CMakeLists.txt: Auto merged sql/Makefile.am: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged storage/innobase/handler/ha_innodb.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 3 commits
-
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 mysql-test/t/disabled.def: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_ndbcluster_binlog.h: Auto merged sql/sql_show.cc: Auto merged
-
unknown authored
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
-
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
-