holyfoot/hf@mysql.com/deer.(none)
06dea50855
merging
2006-11-09 12:41:15 +04:00
tsmith@quadxeon.mysql.com
9e3e6a7c0b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
2006-11-09 00:28:31 +01:00
tsmith@quadxeon.mysql.com
f663ba45e5
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
2006-11-09 00:26:22 +01:00
anozdrin/alik@alik.
9421205b49
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
2006-11-08 22:20:58 +03:00
bar@bar.intranet.mysql.r18.ru
41a324ea3a
Merge mysql.com:/usr/home/bar/mysql-5.0.b23451
...
into mysql.com:/usr/home/bar/mysql-5.1.b23451
2006-11-08 22:14:36 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
bd2529d0a1
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
...
into mysql.com:/usr/home/bar/mysql-4.1.b23451v2
2006-11-08 22:03:08 +04:00
cmiller@zippy.cornsilk.net
d9845ccfd2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-08 10:19:02 -05:00
cmiller@zippy.cornsilk.net
c6b028404d
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-08 10:18:16 -05:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
37c78abf24
bug#19402 SQL close to the size of the max_allowed_packet fails on slave
...
fixing a flow of the test
2006-11-08 17:17:28 +02:00
cmiller@zippy.cornsilk.net
f05faf34af
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963
2006-11-08 10:12:06 -05:00
cmiller@zippy.cornsilk.net
6260e12b99
Bug#10963: LEFT/RIGHT/SUBSTR/.. string functions returns wrong result \
...
on large length
Problem: Most (all) of the numeric inputs were being coerced into
int (32 bit) sized variables. Works OK for sane inputs; any input
larger than 2^32 (or 2^31 for signed vars) exihibited predictable
wrapping behavior (up to about 10^18) and then started having really
strange behaviour past that point (since the conversion to 64 bit int
from the DECIMAL type can do weird things on out of range numbers).
Solution: 1) Add many tests. 2) Convert input from (u)long type to
(u)longlong. 3) Do (sometimes multiple) sanity checks on input,
keeping in mind that sometimes a negative longlong is not a negative
longlong (if the unsigned_flag is set). 4) Emulate existing behavior
w/rt negative and "small" out-of-bounds values.
2006-11-08 10:11:02 -05:00
holyfoot/hf@deer.(none)
938ba3e11e
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-11-08 19:09:39 +04:00
mats@romeo.(none)
a932160a85
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
2006-11-08 14:07:13 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
ac3ce653b4
Merge mysql.com:/usr/home/bar/mysql-4.1.b23451v2
...
into mysql.com:/usr/home/bar/mysql-5.0.b23451
2006-11-08 17:03:37 +04:00
mats@romeo.(none)
ddd27b4093
Fixes to make rpl_ndb_dd_advance pass.
2006-11-08 13:55:33 +01:00
msvensson@neptunus.(none)
1717e280e0
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-11-08 11:40:33 +01:00
msvensson@neptunus.(none)
a1d764f8ba
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-08 11:32:07 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7425499e8e
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/4.1/bug19402-max_allowed
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-4.1-rpl
2006-11-08 09:57:20 +02:00
ted@ted.mysql.internal
fbedcdc09d
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
2006-11-08 06:16:12 +03:00
petr/cps@outpost.site
fb650b8aad
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
2006-11-08 00:07:23 +03:00
lars/lthalmann@dl145h.mysql.com
3776e9622b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-11-07 19:26:31 +01:00
gkodinov/kgeorge@macbook.gmz
299a0fe65d
Merge macbook.gmz:/Users/kgeorge/mysql/work/B11032-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B11032-5.0-opt
2006-11-07 18:44:37 +02:00
msvensson@neptunus.(none)
6bc6064ec4
Update result file after having changed error message
2006-11-07 17:42:15 +01:00
gkodinov/kgeorge@macbook.gmz
cf1ca923fc
Bug #11032 : getObject() returns a String for a sub-query of type datetime
...
- When returning metadata for scalar subqueries the actual type of the
column was calculated based on the value type, which limits the actual
type of a scalar subselect to the set of (currently) 3 basic types :
integer, double precision or string. This is the reason that columns
of types other then the basic ones (e.g. date/time) are reported as
being of the corresponding basic type.
Fixed by storing/returning information for the column type in addition
to the result type.
2006-11-07 18:16:17 +02:00
anozdrin/alik@alik.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03:00
lars/lthalmann@mysql.com/dl145h.mysql.com
aea1e14ef8
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-11-07 12:02:53 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
db8aa4ab6c
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-11-07 12:00:55 +01:00
gkodinov@dl145s.mysql.com
ccf17e71b0
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-07 11:53:48 +01:00
anozdrin/alik@alik.
7cf65fd309
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
2006-11-07 13:45:56 +03:00
msvensson@neptunus.(none)
2aeb4df7e3
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 10:48:46 +01:00
msvensson@neptunus.(none)
3ff26e9b27
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 10:48:14 +01:00
msvensson@neptunus.(none)
a52b9ffaae
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-07 10:46:49 +01:00
msvensson@neptunus.(none)
06ca418c35
Merge neptunus.(none):/home/msvensson/mysql/my50-rt-im_d_fix
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-07 10:44:44 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
599b731660
Bug#23451 GROUP_CONCAT truncates a multibyte utf8 character
...
Problem: GROUP_CONCAT on a multi-byte column can truncate
in the middle of a multibyte character when applying
group_concat_max_len limit. It produces an invalid
multi-byte character in the result string.
The second, easier version - reusing old "warning_for_row" flag,
instead of introducing of "result_is_full" - which was
added in the previous commit.
2006-11-07 12:45:48 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
28abd4dd0d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug19736/my50-bug19736
2006-11-07 11:49:09 +04:00
cmiller@zippy.cornsilk.net
144a98fc39
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-06 23:03:31 -05:00
cmiller@zippy.cornsilk.net
df27c5fa6b
Merge fix.
2006-11-06 23:02:40 -05:00
petr/cps@outpost.site
1b44fe6196
Fix Bug #22494 Instance Manager: Inconsistent error message wording
...
Use better wording
2006-11-07 05:21:33 +03:00
cmiller@zippy.cornsilk.net
a759280347
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
2006-11-06 17:46:50 -05:00
cmiller@zippy.cornsilk.net
40170fbf58
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
2006-11-06 17:45:47 -05:00
cmiller@zippy.cornsilk.net
87a5134b7c
Bug#23411: ... MOD-ing zero returns strange result
...
The Item_func_mod objects never had maybe_null set, so users had no reason
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.
2006-11-06 17:13:19 -05:00
holyfoot/hf@mysql.com/deer.(none)
7ddb8b68fa
bug #19491 (5.0-related additional fixes)
2006-11-06 22:33:18 +04:00
holyfoot/hf@mysql.com/deer.(none)
d3eb807083
merging
2006-11-06 19:12:19 +04:00
holyfoot/hf@mysql.com/deer.(none)
aa7a27d28b
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/8663/my50-8663
2006-11-06 15:04:58 +04:00
holyfoot/hf@deer.(none)
711e8d1b4b
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/8663/my51-8663
2006-11-06 15:00:10 +04:00
holyfoot/hf@mysql.com/deer.(none)
fca6f71435
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/8663/my50-8663
2006-11-06 14:57:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
0d10dbe332
Merge abotchkov@production.mysql.com:mysql-5.0-opt
...
into mysql.com:/home/hf/work/21790/my50-21790
2006-11-06 11:16:13 +04:00
holyfoot/hf@mysql.com/deer.(none)
50d199848b
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/19491/my50-19491
2006-11-06 11:10:08 +04:00
holyfoot/hf@deer.(none)
7e1c6b480d
Merge mysql.com:/home/hf/work/8663/my50-8663
...
into mysql.com:/home/hf/work/8663/my51-8663
2006-11-06 11:01:35 +04:00
petr/cps@outpost.site
b28b07f09f
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-06 00:19:55 +03:00