Commits · 4d6efe891aab591d8e9da61993eed87e659065a2 · Kirill Smelkov / mariadb

27 Jul, 2006 1 commit
- Merge bk-internal:/home/bk/mysql-5.0-maint · 4d6efe89
  unknown authored Jul 27, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-19498
```
  4d6efe89
26 Jul, 2006 4 commits

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145 · 6528be27
unknown authored Jul 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
6528be27

Update test result for perror · 595fdd6b

unknown authored Jul 26, 2006


mysql-test/r/perror.result:
  Add error result for 1186
  Remove the result for the others
mysql-test/t/perror.test:
  As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null

595fdd6b

Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror · de41f4e7

unknown authored Jul 26, 2006

 - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.


extra/perror.c:
  Move the !found out one level
mysql-test/t/perror.test:
  Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
  Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code

de41f4e7

Bug#19890 mysqltest: "query" command is broken · b03b6c86

unknown authored Jul 26, 2006

 - Allow "query" to be used as a prefix for focing a command to be sent to server
 - Add testcases


client/mysqltest.c:
  To force something being sent as a query to the mysqld one can
  use the prefix "query". Remove "query" from string before executing.
mysql-test/r/mysqltest.result:
  Add test case for "query" command
mysql-test/t/mysqltest.test:
  Add test case for "query" command

b03b6c86

24 Jul, 2006 7 commits

Bug #19265 describe command does not work from mysql prompt · d2f447a9

unknown authored Jul 24, 2006

 - Add test case


mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test for mysql using DESC command

d2f447a9

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145 · a9666939
unknown authored Jul 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
a9666939

Bug#20145 perror segfault when call it with error nr · 0227a7b0

unknown authored Jul 24, 2006

  - Add test case(execute perror)
  - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
  - Thanks to Steven Xie for pointing out how to fix. 


extra/perror.c:
  strerror might return NULL on Solaris 2.8
mysql-test/mysql-test-run.pl:
  Add possibility to execute perror from test case
mysql-test/r/have_perror.require:
  New BitKeeper file ``mysql-test/r/have_perror.require''
mysql-test/r/perror.result:
  New BitKeeper file ``mysql-test/r/perror.result''
mysql-test/t/perror.test:
  New BitKeeper file ``mysql-test/t/perror.test''

0227a7b0

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug19745 · d2ed0393
unknown authored Jul 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
d2ed0393
Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug15690 · af743064
unknown authored Jul 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
af743064
Merge bk-internal:/home/bk/mysql-5.0-maint · 7b8285c9
unknown authored Jul 24, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
7b8285c9

Bug#10877 mysqldump should use consistent last line · 4a0b822b

unknown authored Jul 24, 2006

 - Add printout in write_footer to tell that mysqldump has completed.
   Ex: -- Dump completed 2006-07-24  8:55:05


client/Makefile.am:
  Build mysqldump with mf_getdate.c
client/mysqldump.c:
  Add printout in write_footer that will print info that mysqldump has completed

4a0b822b

23 Jul, 2006 6 commits

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a2df3e63
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b19370
```
a2df3e63
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c2c79987
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b19370
```
c2c79987
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 25223439
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b8143
```
25223439

Fix for bug #8143: A date with value 0 is treated as a NULL value · 16878843

unknown authored Jul 23, 2006


mysql-test/r/delete.result:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test result
mysql-test/t/delete.test:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test case
sql/sql_delete.cc:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - during SELECT queries processing we convert 'date[time]_field is null' 
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null 
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.
      Also it may simplify and speed up DELETE queries execution.

16878843

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8819a677
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b19370


mysql-test/r/date_formats.result:
  Auto merged
```
8819a677

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 774300af

unknown authored Jul 23, 2006

into  mysql.com:/usr/home/ram/work/5.0.b10966


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

774300af

21 Jul, 2006 1 commit
- Merge bk-internal:/home/bk/mysql-5.0-maint · 464cadc9
  unknown authored Jul 21, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  464cadc9
20 Jul, 2006 5 commits

Merge bk-internal:/home/bk/mysql-5.0-maint · 4730550a
unknown authored Jul 20, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
4730550a

Bug#15690 mysqlimport tries to set options the server doesn't understand · 61ee0955

unknown authored Jul 20, 2006

 - "set @@character_set_database" should be ignored by servers prior to 4.1.1


client/mysqlimport.c:
  Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

61ee0955

Merge bk-internal:/home/bk/mysql-5.0-maint · 7c7949b0
unknown authored Jul 20, 2006
```
into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
```
7c7949b0
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517 · a9102767
unknown authored Jul 20, 2006
```
into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517


configure.in:
  Auto merged
```
a9102767

Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498 · 22a96308

unknown authored Jul 20, 2006

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


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

22a96308

19 Jul, 2006 1 commit

Bug #14448: delimiter in 'prompt' · 63a098f3

unknown authored Jul 19, 2006

"I want to have the current delimiter in the prompt so that I can know at 
a glance which is set."

Add a 'l' format specifier that represents the current statement delimiter.


client/mysql.cc:
  Add a 'l' prompt format specifier, which becomes the current delimiter
  string in the prompt.

63a098f3

18 Jul, 2006 9 commits

Bug #19498: Inconsistent support for DEFAULT in TEXT columns · 20c2ddaf

unknown authored Jul 18, 2006

  When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.


mysql-test/r/federated.result:
  Update results
mysql-test/r/fulltext_distinct.result:
  Update results
mysql-test/r/fulltext_update.result:
  Update results
mysql-test/r/gis-rtree.result:
  Update results
mysql-test/r/gis.result:
  Update results
mysql-test/r/join_outer.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/type_blob.result:
  Add new results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/type_blob.test:
  Add new test
sql/field.cc:
  Issue a warning when setting '' as the default on a BLOB/TEXT column,
  and make it an error in strict mode. Also, clarify comments about when
  NO_DEFAULT_VALUE_FLAG is set.

20c2ddaf

Merge bk-internal:/home/bk/mysql-5.0-maint · d13a39b5
unknown authored Jul 18, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-17903
```
d13a39b5
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c7396ce
unknown authored Jul 18, 2006
```
into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
```
7c7396ce
merging · b33085b4
unknown authored Jul 18, 2006

b33085b4

Bug#18539 uncompress(d) is null: impossible? · 7f2140d3

unknown authored Jul 18, 2006

 - Add a check that length of field to uncompress is longer than 4 bytes.
   This can be dones as the length of uncompressed data is written as 
   first four bytes of field and thus it can't be valid compressed data.


mysql-test/r/func_compress.result:
  Update test results
sql/item_strfunc.cc:
  Is size of field is less than or equal to 4 bytes, indicate data is uncompressable/corrupt.

7f2140d3

Merge mysql.com:/home/hf/work/mysql-4.1.mrg · 2dfdcae3

unknown authored Jul 18, 2006

into  mysql.com:/home/hf/work/mysql-5.0.mrg


libmysqld/embedded_priv.h:
  Auto merged
sql-common/client.c:
  Auto merged
include/mysql.h:
  merging
libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging
libmysqld/libmysqld.c:
  merging
sql/sql_parse.cc:
  merging

2dfdcae3

Merge neptunus.(none):/home/msvensson/mysql/my50-maint-yassl-20060717 · 4910fe7e
unknown authored Jul 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
4910fe7e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · b46c81e1
unknown authored Jul 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
b46c81e1

Merge bk-internal:/home/bk/mysql-5.0-maint · 09e11e20

unknown authored Jul 18, 2006

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


sql/sql_udf.cc:
  Auto merged

09e11e20

17 Jul, 2006 3 commits

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


sql/item_strfunc.h:
  Auto merged
```
3bf84bad

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

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

11980804

Import yaSSL version 1.3.7 · d5b27ec1

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

d5b27ec1

15 Jul, 2006 1 commit
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 · 8f5681c9
  unknown authored Jul 15, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
```
  8f5681c9
14 Jul, 2006 2 commits

4.1 -> 5.0 merge · 1486a426
unknown authored Jul 14, 2006

1486a426

Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2e3ed9c1

unknown authored Jul 14, 2006

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/merge-4.1_2_5.0


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged

2e3ed9c1