Commits · 0514709c7f05f01334665d71620e2211c1839bc8 · nexedi / MariaDB

18 Jul, 2006 1 commit

Merge bk-internal:/home/bk/mysql-5.0-maint · 0514709c

unknown authored Jul 18, 2006

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


sql/sql_udf.cc:
  Auto merged

0514709c

17 Jul, 2006 3 commits

Merge bk-internal:/home/bk/mysql-5.0-maint · a3d67219
unknown authored Jul 17, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-18539


sql/item_strfunc.h:
  Auto merged
```
a3d67219

Merge shellback.(none):/home/msvensson/mysql/my50-yassl · a586ad48

unknown authored Jul 17, 2006

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


extra/yassl/src/socket_wrapper.cpp:
  Auto merged
extra/yassl/taocrypt/include/runtime.hpp:
  Auto merged
extra/yassl/src/handshake.cpp:
  Manual merge

a586ad48

Import yaSSL version 1.3.7 · 8a1760ab

unknown authored Jul 17, 2006

 - Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"


extra/yassl/FLOSS-EXCEPTIONS:
  Import patch yassl.diff
extra/yassl/README:
  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/handshake.hpp:
  Import patch yassl.diff
extra/yassl/include/lock.hpp:
  Import patch yassl.diff
extra/yassl/include/log.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/timer.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/mySTL/algorithm.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/memory.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/pair.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/stdexcept.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/vector.hpp:
  Import patch yassl.diff
extra/yassl/src/buffer.cpp:
  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/lock.cpp:
  Import patch yassl.diff
extra/yassl/src/log.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/timer.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/include/aes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/algebra.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/arc4.hpp:
  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/coding.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/dh.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/dsa.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/hash.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hmac.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/kernelc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md2.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md4.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/md5.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modarith.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/pwdbased.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/random.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/ripemd.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/rsa.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/twofish.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/type_traits.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aestables.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/arc4.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/bftables.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/blowfish.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/coding.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/dsa.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/file.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/hash.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/md2.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/misc.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/rsa.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/taocrypt/src/tftables.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/twofish.cpp:
  Import patch yassl.diff

8a1760ab

13 Jul, 2006 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d1b58f55
unknown authored Jul 13, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
```
d1b58f55

Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 · 2bb833ae

unknown authored Jul 13, 2006

into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  manual merge

2bb833ae

Bug #19779: mysql_explain_log documentation is outdated. · 38c5a0e2

unknown authored Jul 13, 2006


scripts/mysql_explain_log.sh:
  Changed explain_log.pl to mysql_explain_log.  Added usage information for printerror. Minor cleanup.

38c5a0e2

12 Jul, 2006 4 commits

Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470 · 8cef0498
unknown authored Jul 12, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P


configure.in:
  Auto merged
```
8cef0498
Fix a valgrind warning in type_date test. · b3180c89
unknown authored Jul 12, 2006
```
sql/item_timefunc.cc:
  Fix a valgrind warning in type_date test.	
```
b3180c89

Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops · 0daad2ff

unknown authored Jul 12, 2006

The bug is thqt we use some nonstandard assembly codes in our strings
source, and some assemblers don't know what to do with them: Specifically,
Sun's Solaris assembler and Apple's Darwin assembler balk at them.

This patch, rather than trying to test for properties of the assembler,
which Autoconf doesn't have any decent facilites for, instead tries to
compile the code in question and disables assembly if it fails.

There's still the problem of unportable assembly, but I'll leave that
to someone who feels like rewriting and debugging it.

configure.in:
Actually try to compile the code in question, since a test for the CPU
type is insufficient to determine whether our code will compile.

0daad2ff

Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 · 4136cfc3

unknown authored Jul 12, 2006

into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

4136cfc3

11 Jul, 2006 7 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a06032b

unknown authored Jul 11, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


sql/sql_table.cc:
  Auto merged

9a06032b

Merge chilla.local:/home/mydev/mysql-5.0-release · edbc99d9

unknown authored Jul 11, 2006

into  chilla.local:/home/mydev/mysql-5.0-amerge


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

edbc99d9

Raise the version number. · 3d5d9e0b
unknown authored Jul 11, 2006

3d5d9e0b
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf7a380b
unknown authored Jul 11, 2006
```
into  trift2.:/M50/mysql-5.0
```
cf7a380b

Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl · 94342039

unknown authored Jul 11, 2006

into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged

94342039

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0bb02ba4

unknown authored Jul 11, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


sql/opt_range.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.

0bb02ba4

Bug #18539: uncompress(d) is null: impossible? · 404fbcd9

unknown authored Jul 10, 2006

  The UNCOMPRESS() function was not marked as maybe_null, even though
  it returns NULL on invalid data. This confused the optimizer.


mysql-test/r/func_compress.result:
  Add new results
mysql-test/t/func_compress.test:
  Add new regression test
sql/item_strfunc.h:
  Set maybe_null within Item_func_uncompress::fix_length_and_dec()

404fbcd9

10 Jul, 2006 22 commits

Fix yet another Windows build failure: "true" -> TRUE · 79c44420
unknown authored Jul 11, 2006
```
sql/sql_locale.cc:
  "true" -> TRUE
```
79c44420
Merge trift2.:/M50/clone-5.0 · b6e3a53a
unknown authored Jul 10, 2006
```
into  trift2.:/M50/mysql-5.0


configure.in:
  Auto merged
```
b6e3a53a
Raise the version number. · 6362eafe
unknown authored Jul 10, 2006

6362eafe

A patch to Bug#17667 didn't take into consideration that the vardir, which contains · a7eef6e3

unknown authored Jul 10, 2006

the server's binlog file, might be set to a different directory.  This adds a new
"vardir" parameter, which takes the name of the directory as a value, so that the 
test_bug17667() test can find the binlog.  


mysql-test/mysql-test-run.pl:
  Add the "vardir" to the options passed to "mysql_test_client", so we know 
  where to find the binlog file.
tests/mysql_client_test.c:
  Receive a new option, "vardir".
  
  Use the vardir option to find the binlog file in test_bug17667() .

a7eef6e3

Fix a Windows build failure. · fdbe0141

unknown authored Jul 10, 2006


sql/sql_locale.cc:
  Fix Windows compilation failure "cannot convert from 'const char [6]' 
  to 'const BOOL'" and an apparent bug (use of "FALSE" instead of FALSE
  for initialization of is_ascii member of MY_LOCALE)

fdbe0141

Revoking patch for Bug#10952 on behalf of Brian. · 2c3fd953
unknown authored Jul 10, 2006

2c3fd953
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 9d85551a
unknown authored Jul 10, 2006
```
into  gbichot3.local:/home/mysql_src/mysql-5.0
```
9d85551a

Fix test results to be vardir-independent. · 889f1b3d

unknown authored Jul 10, 2006


mysql-test/r/myisam.result:
  Fix test results.
mysql-test/t/myisam.test:
  In 5.0 show create table also outputs data directory.
  For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way
  to replace it with anything else in test output.

889f1b3d

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 · 49ce58f4

unknown authored Jul 10, 2006

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

49ce58f4

ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) · 7bb7cd45

unknown authored Jul 10, 2006


ndb/src/kernel/blocks/dbdict/DictLock.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/test/run-test/daily-basic-tests.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD

7bb7cd45

ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) · ae7f89a6

unknown authored Jul 10, 2006


ndb/include/kernel/GlobalSignalNumbers.h:
  5.0 : add NODE_START_REP from 5.1
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.hpp:
  5.0 : add NODE_START_REP from 5.1

ae7f89a6

A post-merge fix (Bug#8706 "temporary table with data directory option · f7e1cd34
unknown authored Jul 10, 2006
```
fails"


mysql-test/t/myisam.test:
  Fix myisam.test to work with non-default mysqltest var directory.
```
f7e1cd34

Merge bk-internal:/home/bk/mysql-5.0-maint · 3df86ea6

unknown authored Jul 10, 2006

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


sql/sql_udf.cc:
  Auto merged

3df86ea6

Add sql_locale.cpp to our windows build scripts. · bb8e0660

unknown authored Jul 10, 2006


VC++Files/libmysqld/libmysqld.dsp:
  Add sql_locale.cpp
VC++Files/libmysqld/libmysqld.vcproj:
  Add sql_locale.cpp
VC++Files/sql/mysqld.dsp:
  Add sql_locale.cpp
VC++Files/sql/mysqld.vcproj:
  Add sql_locale.cpp

bb8e0660

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · af691276
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
```
af691276
ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) · 7b153bb5
unknown authored Jul 10, 2006
```
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
```
7b153bb5

Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1 · 2adcbfc4

unknown authored Jul 10, 2006

into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog


sql/sql_base.cc:
  Manual merge

2adcbfc4

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f9a1427
unknown authored Jul 10, 2006
```
into  trift2.:/M50/mysql-5.0
```
0f9a1427

support-files/mysql.spec.sh : Fix a typing error. · b22d8cee

unknown authored Jul 10, 2006


support-files/mysql.spec.sh:
  Fix a typing error in the "make" target for the Perl script to run the tests.

b22d8cee

Merge trift2.:/M50/clone-5.0 · 85996bab

unknown authored Jul 10, 2006

into  trift2.:/M50/back23-5.0


support-files/mysql.spec.sh:
  Auto merged

85996bab

Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 33d751ef
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
33d751ef
mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) · d32ca715
unknown authored Jul 10, 2006
```
mysql-test/Makefile.am:
  fix cp of mode 444 files
```
d32ca715