Commits · 4afea2482e788fbf8d0574abfee7ce9ca7474211 · nexedi / MariaDB

27 Sep, 2006 6 commits

Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 4afea248
unknown authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
4afea248

Fix compile failure on Sun C++ 5.7 in yaSSL code · a714c2cf

unknown authored Sep 27, 2006

 - Trying to use unctions declared as static being used from another file, change them to be inline


extra/yassl/taocrypt/mySTL/helpers.hpp:
  Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.

a714c2cf

Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · fa97f0fa
unknown authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
fa97f0fa

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

unknown authored Sep 27, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

9f9e8dc6

Import yaSSL version 1.4.3 · 8d4ad172

unknown authored Sep 27, 2006


extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/crypto.cpp:
  Import patch yassl.diff

8d4ad172

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 7 commits

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · c4ceab1a
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
c4ceab1a

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/my50-netware · bcf376b9
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
bcf376b9
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/my50-yassl_import · f21ac7b6

unknown authored Sep 26, 2006

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

Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 · 7bf40904
unknown authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
```
7bf40904

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 7 commits

Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 8230220e
unknown authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/Makefile.am:
  Auto merged
```
8230220e
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

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.0-maint · 98493e2d
unknown authored Sep 25, 2006
```
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
```
98493e2d

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

unknown authored Sep 25, 2006

into  polly.local:/home/kaa/src/maint/m50-maint--07OGt


mysql-test/r/strict.result:
  Auto merged

313e74c5

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 6 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7732a590

unknown authored Sep 23, 2006

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

7732a590

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

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 7 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d3269f88
unknown authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
```
d3269f88
Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · 09e8459a
unknown authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
```
09e8459a

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/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

Fixed bug #22129: A small double precision number becomes zero · 2299727e

unknown authored Sep 22, 2006

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

2299727e

Fix for bug #19121: Windows incompatible udf_example · 0c5d3627

unknown authored Sep 22, 2006


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

0c5d3627

Added build rule for mysql_upgrade.exe · fcd21bd4
unknown authored Sep 22, 2006

fcd21bd4

21 Sep, 2006 7 commits
- After-merge fix (null merge). · a008b072
  unknown authored Sep 21, 2006
  
  a008b072
- Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1 · 67c65a66
  unknown authored Sep 21, 2006
```
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.
```
  67c65a66
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · bebf8674
  unknown authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  bebf8674
- Add a dummy file for "Docs/manual.chm" as we need it for "make dist" to work. · d1dfac0b
  unknown authored Sep 21, 2006
```
Docs/manual.chm:
  BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm
```
  d1dfac0b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dab27eaa
  unknown authored Sep 21, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-toteam
```
  dab27eaa
- Merge trift2.:/MySQL/M50/extract1-5.0 · 113f983e
  unknown authored Sep 21, 2006
```
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
```
  113f983e
- After merge fixes · 9de027bd
  unknown authored Sep 21, 2006
  
  9de027bd