Commits · e3bec9449355c95a8158a036b744d2f7a914f201 · nexedi / MariaDB

27 Sep, 2006 4 commits

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · e3bec944

unknown authored Sep 27, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/valgrind.supp:
  Merge suppressions 5.0 -> 5.1

e3bec944

Add suppressions seen on maint1, nothing new just a nother version of libc · 5454ca75
unknown authored Sep 27, 2006

5454ca75

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 9d23c72d

unknown authored Sep 27, 2006

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1

9d23c72d

When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available · 9a00f96f

unknown authored Sep 27, 2006

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

26 Sep, 2006 10 commits

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 22f0c934
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my51-work


netware/BUILD/mwenv:
  Auto merged
```
22f0c934

Fir problem with winepath in mwenv · 792b2b6b

unknown authored Sep 26, 2006


netware/BUILD/mwenv:
  Add extra / after $base for winepath to work correctly
  Add / between $base and WINE_BUILD_DIR

792b2b6b

Merge neptunus.(none):/home/msvensson/mysql/netware/my51-netware · 6fcaf5f6
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
6fcaf5f6
Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969 · effadd7c
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
```
effadd7c

Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware · 9eedd8e3

unknown authored Sep 26, 2006

into  neptunus.(none):/home/msvensson/mysql/netware/my51-netware


netware/Makefile.am:
  Auto merged
netware/BUILD/mwenv:
  Merge 5.0 -> 5.1

9eedd8e3

Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4) · 83717cb7
unknown authored Sep 26, 2006

83717cb7
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import · 29ebdae0
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
29ebdae0
Update patch that restores slave databases from snapshots before start for 5.1 · 014e0d41
unknown authored Sep 26, 2006

014e0d41

Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 · f9cfbe72

unknown authored Sep 26, 2006

into  neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1

f9cfbe72

Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails · e9a84303

unknown authored Sep 26, 2006

 - 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

25 Sep, 2006 11 commits

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 5e2a38b0
unknown authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
5e2a38b0
Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped · 17e3f899
unknown authored Sep 25, 2006

17e3f899
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 17c81bc0
unknown authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/Makefile.am:
  Auto merged
```
17c81bc0
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 4e927376
unknown authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my50-work


sql/Makefile.am:
  Auto merged
```
4e927376

Bug#18888 Trying to overwrite sql/lex_hash.h during build · 6f3c9bfa

unknown authored Sep 25, 2006

 -Backport fix for bug19738 to 4.1 


sql/Makefile.am:
  Generated source should depend on their sources not the tool

6f3c9bfa

Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 61758bab

unknown authored Sep 25, 2006

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

61758bab

Import yaSSL version 1.4.0 · 62d2cadb

unknown authored Sep 25, 2006


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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 6862670e
unknown authored Sep 25, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
6862670e
Merge polly.local:/tmp/22129/bug22129/my51-bug22129 · 895efbbe
unknown authored Sep 25, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
895efbbe
Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · 06e9a32b
unknown authored Sep 25, 2006
```
into  polly.local:/tmp/22129/bug22129/my51-bug22129


mysql-test/r/strict.result:
  Auto merged
```
06e9a32b
Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129) · 0fca1e8b
unknown authored Sep 25, 2006

0fca1e8b

23 Sep, 2006 10 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b561dd1e

unknown authored Sep 23, 2006

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

b561dd1e

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 · a5d82874

unknown authored Sep 23, 2006

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

a5d82874

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · d339895f

unknown authored Sep 23, 2006

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

d339895f

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · f3172a89

unknown authored Sep 23, 2006

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

f3172a89

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 97c3a273
unknown authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
97c3a273

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 1e84e31c

unknown authored Sep 23, 2006

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

1e84e31c

Disabling test case · 3bd90044
unknown authored Sep 23, 2006

3bd90044

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 7671fbc2

unknown authored Sep 23, 2006

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

7671fbc2

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 2bfeecca

unknown authored Sep 23, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

2bfeecca

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 14ad51e0

unknown authored Sep 23, 2006

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

14ad51e0

22 Sep, 2006 5 commits

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb · 56c7e8b3

unknown authored Sep 22, 2006

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

56c7e8b3

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 02848f89
unknown authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
02848f89

Netware changes for build with yaSSL · 3c7b5e3e

unknown authored Sep 22, 2006

- 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

3c7b5e3e

Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · a8bd76a0

unknown authored Sep 22, 2006

into  polly.local:/tmp/22129/bug22129/my51-bug22129


mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged

a8bd76a0

Merge polly.local:/tmp/22129/bug22129/my41-bug22129 · 0c72b05a

unknown authored Sep 22, 2006

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

0c72b05a