ramil/ram@ramil.myoffice.izhnet.ru
b1ffa1605e
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31438/b31438.5.1
2007-10-09 16:34:56 +05:00
iggy@alf.(none)
a4ba236948
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into alf.(none):/src/bug28774/my51-bug28774
2007-10-08 22:37:07 -04:00
iggy@alf.(none)
c9a19e5454
Merge alf.(none):/src/bug28774/my50-bug28774
...
into alf.(none):/src/bug28774/my51-bug28774
2007-10-08 22:32:26 -04:00
iggy@alf.(none)
19107288e4
Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and
...
doesn't clean them up
- Make sure to cleanup temporary files after use.
2007-10-08 22:30:41 -04:00
iggy@alf.(none)
dfe6c1772a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into alf.(none):/src/bug28535/my51-bug28535
2007-10-08 17:46:14 -04:00
iggy@alf.(none)
6a7947b8ab
Bug#28535 mistake in mysqldump error message
...
- Fixed error message.
2007-10-08 17:43:32 -04:00
cmiller@zippy.cornsilk.net
04296df344
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
29dca6ef33
Fix for bug #31438 : updatexml still crashes
...
Problem: check missed if the second updatexml() argument is valid.
Fix: check it.
2007-10-08 16:52:15 +05:00
tnurnberg@sin.intern.azundris.com
0ff1b80bf0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
2007-10-06 03:05:02 +02:00
tnurnberg@sin.intern.azundris.com
d42135724f
Bug #31253 : crash comparing datetime to double
...
after-merge fixies
2007-10-06 03:01:30 +02:00
tnurnberg@sin.intern.azundris.com
e4ba79d21d
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
2007-10-06 00:05:41 +02:00
msvensson@pilot.mysql.com
f0fa6936c7
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-05 19:58:20 +02:00
msvensson@pilot.mysql.com
495dcdcc6b
Merge pilot.mysql.com:/data/msvensson/mysql/bug27789/my50-bug27789
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-05 19:56:25 +02:00
msvensson@pilot.mysql.com
0a07b64d8a
Fixed Bug #27789 "Wrong permissions of sql/share/language directories"
2007-10-05 19:55:00 +02:00
msvensson@pilot.mysql.com
53975763b8
Merge msvensson2.mysql.internal:mysql/mysql-5.0-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-05 19:32:14 +02:00
msvensson@shellback.(none)
c2f6d59db1
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 19:29:55 +02:00
msvensson@shellback.(none)
6132e82888
Update test case to allow the .reject file to be in either var/log or r/
2007-10-05 19:28:09 +02:00
msvensson@shellback.(none)
be40fefd73
Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
2007-10-05 19:23:44 +02:00
cmiller@zippy.cornsilk.net
eedde95a33
Change URLs.
...
Our web server has been restructured several times, and references
to it in our source code has stayed the same. This patch from Paul
DuBois updates all URLs to modern semantics.
2007-10-05 13:16:54 -04:00
tnurnberg@sin.intern.azundris.com
38ccaa1f6e
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
2007-10-05 18:36:26 +02:00
msvensson@shellback.(none)
c86bd100c8
Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error
2007-10-05 18:36:23 +02:00
msvensson@shellback.(none)
c78ef4128a
Remove printout
2007-10-05 18:24:48 +02:00
msvensson@shellback.(none)
9571e7ec87
Update for 5.1 format of dirname_part
2007-10-05 18:22:28 +02:00
msvensson@shellback.(none)
d376c3da5e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 18:19:37 +02:00
msvensson@shellback.(none)
39a069b296
Bug#31398 problems with mysql-test-run, part2
...
Write .reject file to r/ if it's writable else use opt_logdir
2007-10-05 18:18:50 +02:00
msvensson@shellback.(none)
ed724e15d8
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 17:55:30 +02:00
msvensson@shellback.(none)
626faeecd9
Bug#31398 problems with mysql-test-run
...
- "mysqld --verbose --help" need to be started in a writable directory
2007-10-05 17:54:19 +02:00
msvensson@shellback.(none)
e9fc7548ad
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-10-05 14:45:35 +02:00
msvensson@shellback.(none)
1e4fac1677
Bug#31400 mysql-test-run inconvenience problems running a certain test
...
- Allow test case names to be specied in various different ways
2007-10-05 14:42:38 +02:00
tnurnberg@sin.intern.azundris.com
66cc732748
Merge sin.intern.azundris.com:/home/tnurnberg/19828/50-19828
...
into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
2007-10-05 13:11:38 +02:00
tnurnberg@sin.intern.azundris.com
00135f1ced
Merge sin.intern.azundris.com:/home/tnurnberg/31253/50-31253
...
into sin.intern.azundris.com:/home/tnurnberg/31253/51-31253
2007-10-05 13:00:11 +02:00
tnurnberg@sin.intern.azundris.com
455c05abcf
Bug #31253 : crash comparing datetime to double
...
convert(<invalid time>, datetime) in WHERE caused crash as function
returned (void*)NULL, but did not flag SQL NULL. It does now.
2007-10-05 12:08:38 +02:00
tnurnberg@sin.intern.azundris.com
bb86597dc2
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/31227/51-31227
2007-10-05 10:07:08 +02:00
tnurnberg@sin.intern.azundris.com
5f45fd05bf
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
2007-10-05 10:04:45 +02:00
tnurnberg@sin.intern.azundris.com
a34ce28c55
Merge sin.intern.azundris.com:/home/tnurnberg/31227/50-31227
...
into sin.intern.azundris.com:/home/tnurnberg/31227/51-31227
2007-10-05 09:47:14 +02:00
tnurnberg@sin.intern.azundris.com
caaf8f56bd
Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
...
Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
2007-10-05 09:38:57 +02:00
tnurnberg@sin.intern.azundris.com
8402823d41
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 19:06:27 +02:00
tnurnberg@sin.intern.azundris.com
567ceed59d
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 19:02:31 +02:00
kaa@polly.(none)
8121b06a8f
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:52:41 +04:00
kaa@polly.(none)
605f0b05a8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:45:45 +04:00
kaa@polly.(none)
84659e2de1
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:38:58 +04:00
kaa@polly.(none)
bd885daa4f
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:29:37 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
9d0318a22c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 14:14:11 +05:00
kaa@polly.(none)
8f204ea029
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-04 13:07:11 +04:00
kaa@polly.(none)
1ba3f4f56b
Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
...
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
2007-10-04 12:34:00 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b5347808ed
Merge mysql.com:/home/ram/work/b31070/b31070.5.0
...
into mysql.com:/home/ram/work/b31070/b31070.5.1
2007-10-04 12:10:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6e6727d244
merging: results adjusted
2007-10-04 12:09:22 +05:00
tnurnberg@sin.intern.azundris.com
34d43d3b04
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 08:53:39 +02:00
tnurnberg@sin.intern.azundris.com
c8a6f30a5b
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
2007-10-04 08:42:36 +02:00
tnurnberg@sin.intern.azundris.com
2686905392
Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
...
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444
2007-10-04 08:38:27 +02:00