Commit graph

31308 commits

Author SHA1 Message Date
jimw@rama.(none)
e4d32625ca 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
msvensson@neptunus.(none)
10f3b6aa9f 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
msvensson@neptunus.(none)
7e8cfe3830 Update test result for perror 2006-07-26 14:21:40 +02:00
msvensson@neptunus.(none)
9e000766b7 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.
2006-07-26 14:09:20 +02:00
msvensson@neptunus.(none)
2bb5f5662f 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
2006-07-26 14:02:24 +02:00
msvensson@neptunus.(none)
8f21e375a2 Bug #19265 describe command does not work from mysql prompt
- Add test case
2006-07-24 19:01:54 +02:00
msvensson@neptunus.(none)
839e87d115 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
msvensson@neptunus.(none)
bbf6c985c8 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.
2006-07-24 18:05:00 +02:00
msvensson@neptunus.(none)
e6b324097b 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
msvensson@neptunus.(none)
9aa18a4bb6 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
msvensson@neptunus.(none)
119c5f2682 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
msvensson@neptunus.(none)
3aa99c062f 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
2006-07-24 10:56:33 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2c36a11d08 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
ramil/ram@mysql.com/myoffice.izhnet.ru
6955f87be4 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
ramil/ram@mysql.com/myoffice.izhnet.ru
a03dcf3f47 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
ramil/ram@mysql.com/myoffice.izhnet.ru
1c04310e30 Fix for bug #8143: A date with value 0 is treated as a NULL value 2006-07-23 15:25:30 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
41ba943964 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 13:43:44 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a810a2a437 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b10966
2006-07-23 12:58:26 +05:00
msvensson@neptunus.(none)
2ea50d6d84 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
msvensson@neptunus.(none)
d5eaa03ee4 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
msvensson@neptunus.(none)
dbb5a408ea 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
2006-07-20 17:30:44 +02:00
msvensson@maint1.mysql.com
d5b41988cd 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
msvensson@maint1.mysql.com
f1ef4af700 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517
into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
2006-07-20 14:11:37 +02:00
msvensson@neptunus.(none)
cb23cd759e Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-20 13:41:50 +02:00
cmiller@zippy.cornsilk.net
34256fb8f5 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.
2006-07-19 14:33:56 -04:00
jimw@rama.(none)
d18eacc71d 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.
2006-07-18 16:04:18 -07:00
jimw@rama.(none)
0bdb8fcd0b 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
holyfoot/abotchkov@production.mysql.com
fbd94751b8 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
holyfoot/hf@mysql.com/deer.(none)
00f56da9af merging 2006-07-18 16:43:39 +05:00
msvensson@neptunus.(none)
2d43d0675e 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.
2006-07-18 12:41:41 +02:00
holyfoot/hf@mysql.com/deer.(none)
bed7b69243 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into  mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-18 14:52:29 +05:00
msvensson@neptunus.(none)
f0300aff5b 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
msvensson@neptunus.(none)
ec183566cc 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
msvensson@neptunus.(none)
c83b9a5c1e Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-18 09:32:49 +02:00
jimw@rama.(none)
9f308f676a Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-18539
2006-07-17 12:21:30 -07:00
msvensson@shellback.(none)
0af88d0eb3 Merge shellback.(none):/home/msvensson/mysql/my50-yassl
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-17 11:27:12 +02:00
msvensson@shellback.(none)
011f57e0ec Import yaSSL version 1.3.7
- Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
2006-07-17 10:50:20 +02:00
pekka@orca.ndb.mysql.com
14519de0fc 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
igreenhoe/greenman@anubis.greendragongames.com
20de038887 4.1 -> 5.0 merge 2006-07-14 13:30:23 -07:00
igreenhoe/greenman@anubis.greendragongames.com
9beb95f0ed 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
2006-07-14 06:52:25 -07:00
igreenhoe/greenman@anubis.greendragongames.com
b170112cae 4.1 -> 5.0 merge fixes 2006-07-14 05:56:30 -07:00
igreenhoe/greenman@anubis.greendragongames.com
abb75129f8 4.1 -> 5.0 merge 2006-07-13 16:35:25 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
7350cb8b5e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/tnurnberg/work/mysql-5.0-21014
2006-07-14 01:26:19 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4316f715d3 Bug#21014: Segmentation fault of mysqldump on view
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.
2006-07-14 01:25:13 +02:00
holyfoot/hf@mysql.com/deer.(none)
eddaafb12b Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mysql-4.1.16017
2006-07-13 22:32:18 +05:00
cmiller@zippy.(none)
b4c8f53661 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
2006-07-13 13:10:59 -04:00
cmiller@zippy.(none)
fafc11205c Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
2006-07-13 13:03:36 -04:00
cmiller@zippy.(none)
878107eb4a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/m50--07C2P
2006-07-13 13:01:30 -04:00
cmiller@zippy.(none)
87dd9b978c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:12:41 -04:00
cmiller@zippy.(none)
2c5308a703 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:11:20 -04:00