Commit graph

31318 commits

Author SHA1 Message Date
unknown
8b3ef8c11c Change error code to test for "unknown error" with to 10000 2006-08-01 11:29:10 +02:00
unknown
f8497a1624 Merge 192.168.0.20:mysql/bug21217/my50-bug21217
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2006-07-31 14:42:06 +02:00
unknown
71c896c2bf Bug#21042 mysql client segfaults on importing a mysqldump export
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
 - Add test case


client/mysql.cc:
  Use strmake instead of strxnmov as that function will make sure the string is terminated by 0
mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test case
2006-07-31 14:22:32 +02:00
unknown
d55c770ac0 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 13:12:49 +02:00
unknown
414dda4949 perror returns 2 if it does not understand the option --ndb
Move that perror test to ndb_basic so it's only run when there is support for --ndb


mysql-test/r/ndb_basic.result:
  Move test of "perror --ndb" to this file
mysql-test/r/perror.result:
  Move test of "perror --ndb" to ndb_basic
mysql-test/t/ndb_basic.test:
  Move test of "perror --ndb" to this file
mysql-test/t/perror.test:
  Move test of "perror --ndb" to ndb_basic
2006-07-31 13:11:21 +02:00
unknown
f0aec16d55 Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF.
By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
Add an else bracnh that does the initialization.


sql/mysqld.cc:
  Intialize the "lowercase_filesystem" variable also when "lowercase_table_names" is 1
2006-07-31 12:47:56 +02:00
unknown
3709da1ab7 Merge shellback.(none):/home/msvensson/mysql/bug21217/my41-bug21217
into  shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217


client/mysqltest.c:
  Manual merge 4.1->5.0
2006-07-30 19:33:48 +02:00
unknown
83c87624fa BUG#21217 "mysqltest" client is inconsistent when to log a line number
- Init start_lineno to 0


client/mysqltest.c:
  Init start_lineno to 0 and set it back to zero before comparing result file.
2006-07-30 19:30:20 +02:00
unknown
4d6efe891a Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-19498
2006-07-27 11:42:34 -07:00
unknown
249465e1fd Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-27 12:31:50 +02:00
unknown
a49144c8c9 Bug#21042 mysql client segfaults on importing a mysqldump export
- Use strxnmov to protect the "buff" variable from overrun


client/mysql.cc:
  Use strxnmov to protect the "buff" variable from overrun
2006-07-27 12:28:49 +02:00
unknown
6528be27b5 Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-26 14:22:23 +02:00
unknown
595fdd6ba0 Update test result for perror
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
2006-07-26 14:21:40 +02:00
unknown
de41f4e7bb Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
- 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
2006-07-26 14:09:20 +02:00
unknown
b03b6c868e Bug#19890 mysqltest: "query" command is broken
- 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
2006-07-26 14:02:24 +02:00
unknown
d2f447a9b4 Bug #19265 describe command does not work from mysql prompt
- Add test case


mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test for mysql using DESC command
2006-07-24 19:01:54 +02:00
unknown
a96669395c Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 18:21:15 +02:00
unknown
0227a7b066 Bug#20145 perror segfault when call it with error nr
- 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''
2006-07-24 18:05:00 +02:00
unknown
d2ed03936f Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug19745
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 16:36:13 +02:00
unknown
af7430645f Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug15690
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 11:07:41 +02:00
unknown
7b8285c956 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 11:06:08 +02:00
unknown
4a0b822be2 Bug#10877 mysqldump should use consistent last line
- 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
2006-07-24 10:56:33 +02:00
unknown
a2df3e6365 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 16:26:12 +05:00
unknown
c2c79987fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 15:45:00 +05:00
unknown
2522343924 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b8143
2006-07-23 15:28:50 +05:00
unknown
16878843e0 Fix for bug #8143: A date with value 0 is treated as a NULL value
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.
2006-07-23 15:25:30 +05:00
unknown
8819a677cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370


mysql-test/r/date_formats.result:
  Auto merged
2006-07-23 13:43:44 +05:00
unknown
774300afe4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
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
2006-07-23 12:58:26 +05:00
unknown
464cadc99d Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-21 21:57:05 +02:00
unknown
4730550ab1 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-20 17:38:09 +02:00
unknown
61ee095571 Bug#15690 mysqlimport tries to set options the server doesn't understand
- "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
2006-07-20 17:30:44 +02:00
unknown
7c7949b05b Merge bk-internal:/home/bk/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
2006-07-20 16:25:02 +02:00
unknown
a9102767a3 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517
into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517


configure.in:
  Auto merged
2006-07-20 14:11:37 +02:00
unknown
22a963080b Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498
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
2006-07-20 13:41:50 +02:00
unknown
63a098f364 Bug #14448: delimiter in 'prompt'
"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.
2006-07-19 14:33:56 -04:00
unknown
20c2ddaf0c Bug #19498: Inconsistent support for DEFAULT in TEXT columns
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.
2006-07-18 16:04:18 -07:00
unknown
d13a39b583 Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-17903
2006-07-18 10:58:44 -07:00
unknown
7c7396cee5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg
2006-07-18 14:53:19 +02:00
unknown
b33085b49a merging 2006-07-18 16:43:39 +05:00
unknown
7f2140d3ed Bug#18539 uncompress(d) is null: impossible?
- 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.
2006-07-18 12:41:41 +02:00
unknown
2dfdcae398 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
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
2006-07-18 14:52:29 +05:00
unknown
4910fe7e66 Merge neptunus.(none):/home/msvensson/mysql/my50-maint-yassl-20060717
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-07-18 09:52:14 +02:00
unknown
b46c81e109 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-18 09:50:46 +02:00
unknown
09e11e20e7 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/sql_udf.cc:
  Auto merged
2006-07-18 09:32:49 +02:00
unknown
3bf84bad87 Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-18539


sql/item_strfunc.h:
  Auto merged
2006-07-17 12:21:30 -07:00
unknown
119808045d Merge shellback.(none):/home/msvensson/mysql/my50-yassl
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
2006-07-17 11:27:12 +02:00
unknown
d5b27ec1dd Import yaSSL version 1.3.7
- 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
2006-07-17 10:50:20 +02:00
unknown
8f5681c919 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
2006-07-15 21:44:25 +02:00
unknown
1486a426df 4.1 -> 5.0 merge 2006-07-14 13:30:23 -07:00
unknown
2e3ed9c127 Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
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
2006-07-14 06:52:25 -07:00