tsmith@quadxeon.mysql.com
6dbfd2156e
Fix braindead bad merge of mysqldump test.
2007-05-01 06:29:34 +02:00
tsmith@quadxeon.mysql.com
f440e299e1
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-30 23:32:13 +02:00
tnurnberg@maint1.mysql.com
4f321a0964
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tnurnberg/51-27293
2007-04-30 12:57:24 +02:00
tnurnberg@mysql.com/blasphemy.mysql.com
205dfa4401
Bug#27293: mysqldump crashes when dumping procedure defined by different user
...
mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE. If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code. If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.
Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge mysql.com:/home/tnurnberg/27293/50-27293
into mysql.com:/home/tnurnberg/27293/51-27293
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/27293/51-27293
2007-04-30 12:32:57 +02:00
tnurnberg@maint1.mysql.com
a22ae7362f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/tnurnberg/50-27293
2007-04-30 11:46:22 +02:00
kaa@polly.local
4b5079fe99
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-30 13:33:13 +04:00
tnurnberg@mysql.com/blasphemy.mysql.com
ce1074f6fe
Bug#27293: mysqldump crashes when dumping procedure defined by different user
...
mysqldump didn't properly handle getting no data on
SHOW CREATE PROCEDURE. If S/C/P fails (due to dumping
user's insufficient privileges on mysql.proc, say),
mysqldump will print a comment to that effect to the
output and return an error-code. If the -f (force) option
is used, the dump will continue, otherwise, it will abort
right there and then.
Also fixes Bug#22761, "mysqldump reports no errors when using
--routines without mysql.proc privileges"
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/tnurnberg/27293/50-27293
2007-04-30 11:30:07 +02:00
kaa@polly.local
3bed463963
If isinf() is not available on a target platform, use our own imlementation via finite() and isnan(). If either of the last two is not available as well, use simple replacements which are platform-neutral, but slower than compiler intrinsics.
2007-04-29 16:57:17 +04:00
kaa@polly.local
2b8bad592f
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-28 23:27:24 +04:00
kaa@polly.local
edf6b73302
Avoid compiler warnings in Windows builds introduced by the patch for bug #24912 "problems with bigint in abs() ceiling() ruond() truncate() mod()"
2007-04-28 23:25:31 +04:00
kaa@polly.local
95a0c5e757
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-28 23:20:19 +04:00
kaa@polly.local
561bd78654
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-04-28 20:26:14 +04:00
kaa@polly.local
83e8b70983
Merge polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-28 20:08:58 +04:00
kaa@polly.local
a45b654ed7
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
...
into polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
2007-04-28 20:04:03 +04:00
kaa@polly.local
050c6723e8
Fix for bug #24912 "problems with bigint in abs() ceiling() round() truncate() mod()" and a number of related problems:
...
- unsigned flag was not handled correctly for a number of mathematical funcions, which led to incorrect results
- passing large values as the number of decimals to ROUND() resulted in incorrect results and even server crashes in some cases
- reverted the fix and the testcase for bug #10083 as it violates the manual
- fixed some testcases which relied on broken ROUND() behavior
2007-04-28 20:01:01 +04:00
tsmith@quadxeon.mysql.com
65dbbb9fb0
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-28 02:15:59 +02:00
tsmith@quadxeon.mysql.com
6348d0806c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-28 01:50:16 +02:00
tsmith@quadxeon.mysql.com
acee0c8e20
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-04-28 01:48:59 +02:00
tsmith@quadxeon.mysql.com
df2d9ca90a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-04-28 01:40:06 +02:00
tsmith@quadxeon.mysql.com
5b4264b8fb
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-28 01:37:59 +02:00
tsmith@quadxeon.mysql.com
bfb0448a4d
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-28 01:36:09 +02:00
tsmith@quadxeon.mysql.com
33a74e41fc
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27653/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-04-28 01:31:15 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2
Bug #27390 : mysqld_multi --config-file= not working as documented
...
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
2007-04-28 01:27:54 +02:00
kaa@polly.local
01b20b95e1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-04-27 15:51:16 +04:00
kaa@polly.local
d4c25d308c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-27 15:48:11 +04:00
kaa@polly.local
e8917d0d0f
Merge polly.local:/home/kaa/src/maint/bug22364/my51-bug22364
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-27 13:06:24 +04:00
kaa@polly.local
d7d0337482
Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364
...
into polly.local:/home/kaa/src/maint/bug22364/my51-bug22364
2007-04-27 12:42:15 +04:00
tsmith@quadxeon.mysql.com
119ca8702f
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-27 00:37:18 +02:00
tsmith@quadxeon.mysql.com
70a742f817
mysql_install_db.sh: Fix algorithm for finding pkgdata directory
2007-04-27 00:35:09 +02:00
tsmith@quadxeon.mysql.com
124f9d5415
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-26 23:07:33 +02:00
tsmith@quadxeon.mysql.com
abcb45d21f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/b27390/50
2007-04-26 23:01:04 +02:00
svoj@april.(none)
21087b05d2
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-04-27 01:35:56 +05:00
svoj@april.(none)
640b3e4e74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-04-27 01:33:16 +05:00
svoj@mysql.com/april.(none)
29d2d5dccb
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-04-27 00:58:59 +05:00
svoj@mysql.com/april.(none)
ce55046fbd
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-04-27 00:56:50 +05:00
svoj@mysql.com/april.(none)
f698977298
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2007-04-27 00:32:51 +05:00
kaa@polly.local
02f2616ee3
Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-04-26 20:51:02 +04:00
joerg@trift-lap.fambruehe
044f2e110e
Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
03f4492b5b
Merge trift-lap.fambruehe:/MySQL/M50/clone-5.0
...
into trift-lap.fambruehe:/MySQL/M50/push-5.0
2007-04-26 16:48:53 +02:00
joerg@trift-lap.fambruehe
f7bac607cf
Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:15:52 +02:00
joerg@trift-lap.fambruehe
5af470eef5
Merge trift-lap.fambruehe:/MySQL/M41/push-4.1
...
into trift-lap.fambruehe:/MySQL/M50/push-5.0
2007-04-26 16:13:32 +02:00
joerg@trift-lap.fambruehe
69d39592b9
Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1
...
into trift-lap.fambruehe:/MySQL/M41/push-4.1
2007-04-26 16:09:19 +02:00
joerg@trift-lap.fambruehe
2ed383302f
Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0
...
into trift-lap.fambruehe:/MySQL/M50/push-5.0
2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:03:02 +02:00
msvensson@pilot.blaudden
27418637d7
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-26 13:58:33 +02:00
msvensson@pilot.blaudden
667cb17942
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-26 13:18:19 +02:00
df@pippilotta.erinye.com
fcea1c66e2
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-26 09:38:15 +02:00
df@pippilotta.erinye.com
d384d67af2
Two test cases didn't work without Blackhole compiled into the server.
2007-04-26 08:22:05 +02:00
tsmith@quadxeon.mysql.com
c6f625bdbc
Add --symbolic-links=1 for partition_not_windows-master.opt.
2007-04-25 22:55:19 +02:00
df@pippilotta.erinye.com
69395833bc
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-04-25 21:48:28 +02:00
