Commits · 11f8af8af250c11e7cce433a86f593b4710a4c86 · nexedi / MariaDB

26 Jul, 2006 1 commit

Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing) · 11f8af8a

unknown authored Jul 26, 2006

 - Define MAX_PATH if not already defined by system header files.
 - Thanks to Christian for the report and patch!


ndb/include/ndb_global.h.in:
  PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco
  so it thakes effect as soon as MAX_PATH is not available

11f8af8a

24 Jul, 2006 7 commits

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

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

f89c001d

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

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

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

e9821627

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

Bug#10877 mysqldump should use consistent last line · 6a5167c3

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

6a5167c3

23 Jul, 2006 6 commits

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 3f030774
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b19370
```
3f030774
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0b486ebf
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b19370
```
0b486ebf
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 043567bc
unknown authored Jul 23, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b8143
```
043567bc

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

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.

63b29af4

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


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

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 434b1f42

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

434b1f42

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

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

Bug#15690 mysqlimport tries to set options the server doesn't understand · 65b5020a

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

65b5020a

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


configure.in:
  Auto merged
```
77bc9591

Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498 · 5e501787

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

5e501787

19 Jul, 2006 1 commit

Bug #14448: delimiter in 'prompt' · d5ca630a

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.

d5ca630a

18 Jul, 2006 8 commits

Merge bk-internal:/home/bk/mysql-5.0-maint · 2634c5bc
unknown authored Jul 18, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-17903
```
2634c5bc
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b57e9789
unknown authored Jul 18, 2006
```
into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
```
b57e9789
merging · 1263e1f0
unknown authored Jul 18, 2006

1263e1f0

Bug#18539 uncompress(d) is null: impossible? · 4377083c

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.

4377083c

Merge mysql.com:/home/hf/work/mysql-4.1.mrg · 5e849120

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

5e849120

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

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

15 Jul, 2006 1 commit
- Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461 · 233b14ff
  unknown authored Jul 15, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
```
  233b14ff
14 Jul, 2006 3 commits
- 4.1 -> 5.0 merge · 988f351e
  unknown authored Jul 14, 2006
  
  988f351e
- Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c5d6c7b
  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
```
  4c5d6c7b
- 4.1 -> 5.0 merge fixes · f01cd1f8
  unknown authored Jul 14, 2006
  
  f01cd1f8
13 Jul, 2006 4 commits

4.1 -> 5.0 merge · 6471005c

unknown authored Jul 13, 2006


client/mysql.cc:
  Auto merged
client/sql_string.h:
  Auto merged
configure.in:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged

6471005c

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 · f7bbf78a
unknown authored Jul 14, 2006
```
into  mysql.com:/home/tnurnberg/work/mysql-5.0-21014
```
f7bbf78a

Bug#21014: Segmentation fault of mysqldump on view · 3b714a08

unknown authored Jul 14, 2006

mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump.  this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.


client/mysqldump.c:
  Bug#21014: Segmentation fault of mysqldump on view
  
  failsafe: if "select ... from information_schema.views" returns an
  empty set, don't deref NULL; throw an error instead.
  
  fix: select the correct database not only before dumping tables, but
  before dumping views, as well.
mysql-test/r/mysqldump.result:
  Bug#21014: Segmentation fault of mysqldump on view
  
  show that mysqldump selects the correct database before trying to dump
  views from it.
mysql-test/t/mysqldump.test:
  Bug#21014: Segmentation fault of mysqldump on view
  
  show that mysqldump selects the correct database before trying to dump
  views from it.

3b714a08

Merge bk@192.168.21.1:mysql-4.1 · 54d9b861

unknown authored Jul 13, 2006

into  mysql.com:/home/hf/work/mysql-4.1.16017


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

54d9b861