andrey@example.com
85da10fa2a
post-merge fix
2006-11-15 20:42:13 +01:00
cmiller@zippy.cornsilk.net
cba50775f7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-15 12:29:24 -05:00
cmiller@zippy.cornsilk.net
19b3bf2963
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my51-bug19955
2006-11-15 12:24:21 -05:00
cmiller@zippy.cornsilk.net
5d4c57b900
Bug#19955: unsigned bigint used as signed with MOD function
...
Problem: When we have a really large number (between 2^63 and 2^64)
as the left side of the mod operator, it gets improperly corerced
into a signed value.
Solution: Added check to see if the "negative" number is really
positive, and if so, cast it.
2006-11-15 12:23:07 -05:00
tnurnberg@salvation.intern.azundris.com
53b97915c6
manual merge for 16456
2006-11-15 16:08:47 +01:00
msvensson@neptunus.(none)
46a599d868
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-15 13:23:42 +01:00
msvensson@neptunus.(none)
c9b4603f90
Update result file for mysql_upgrade as we have more tables that is checked in 5.1
...
Fix merge errors
2006-11-15 13:22:38 +01:00
msvensson@neptunus.(none)
9f22fecf72
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-15 10:31:23 +01:00
msvensson@neptunus.(none)
15c3ed7517
Cleanup after test cases
2006-11-15 10:23:27 +01:00
andrey@example.com
53b0176fbe
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug23760/my51
2006-11-14 20:38:19 +01:00
msvensson@neptunus.(none)
a0f00ce965
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-14 19:47:36 +01:00
msvensson@neptunus.(none)
c674b88bfc
Update test cases after run with --check-testcases
2006-11-14 19:45:52 +01:00
andrey@example.com
d57ceecb77
Merge example.com:/work/bug23760/my50
...
into example.com:/work/bug23760/my51
2006-11-14 19:10:29 +01:00
andrey@example.com
9299fd6715
Fix for bug#23760 ROW_COUNT() and store procedure not owrking together
...
The problem was that THD::row_count_func was zeroed too. It was zeroed
as a fix for bug 4905 "Stored procedure doesn't clear for "Rows affected"
However, the proper solution is not to zero, because THD::row_count_func has
been set to -1 already in mysql_execute_command(), a later fix, which obsoletes
the incorrect fix of #4095
2006-11-14 18:40:11 +01:00
kaa@polly.local
67ca3dde0b
Merge polly.local:/tmp/maint/bug22129/my51-bug22129
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-11-14 16:40:35 +03:00
kaa@polly.local
fb30aeaa81
Merge polly.local:/tmp/maint/bug22129/my50-bug22129
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-11-14 16:38:11 +03:00
msvensson@neptunus.(none)
48ad8c53ce
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-14 09:18:46 +01:00
msvensson@neptunus.(none)
39d1a2425b
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 21:21:38 +01:00
cmiller@zippy.cornsilk.net
fbfeccfe91
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-13 13:19:49 -05:00
cmiller@zippy.cornsilk.net
ff26bf49c8
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-13 13:19:13 -05:00
cmiller@zippy.cornsilk.net
6d97850c3b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
2006-11-13 13:17:02 -05:00
cmiller@zippy.cornsilk.net
8471897fbc
Bug#18761: constant expression as UDF parameters not passed in as constant
...
The code that set up data to be passed to user-defined functions was very
old and analyzed the "Type" of the data that was passed into the UDF, when
it really should analyze the "return_type", which is hard-coded for simple
Items and works correctly for complex ones like functions.
---
Added test at Sergei's behest.
2006-11-13 13:13:44 -05:00
msvensson@neptunus.(none)
430b493806
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 18:02:09 +01:00
msvensson@neptunus.(none)
91518b335e
Expect the file "have_mysql_upgrade.result" to contain the
...
result from "require mysql_upgrade"
2006-11-13 16:55:05 +01:00
msvensson@neptunus.(none)
bf8a9e544c
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 16:39:44 +01:00
msvensson@neptunus.(none)
00a34629ef
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-13 13:41:13 +01:00
msvensson@neptunus.(none)
5110d91ec3
Make it possible for .test suites to run "mysql_upgrade"
...
Add new test file mysql_upgrade.test
2006-11-13 13:39:49 +01:00
cmiller@zippy.cornsilk.net
501c11cfc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-10 14:51:01 -05:00
cmiller@zippy.cornsilk.net
03bf5e399c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-10 14:49:43 -05:00
cmiller@zippy.cornsilk.net
7197da9cc2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-10 14:48:37 -05:00
cmiller@zippy.cornsilk.net
70802780a5
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
2006-11-10 14:48:07 -05:00
cmiller@zippy.cornsilk.net
92e0b31978
Bug#20691: DATETIME col (NOT NULL, NO DEFAULT) may insert garbage when \
...
specifying DEFAULT
This was not specific to datetime. When there is no default value
for a column, and the user inserted DEFAULT, we would write
uninitialized memory to the table.
Now, insist on writing a default value, a zero-ish value, the same
one that comes from inserting NULL into a not-NULL field.
(This is, at best, really strange behavior that comes from allowing
sloppy usage, and serves as a good reason always to run one's server
in a strict SQL mode.)
2006-11-09 18:33:58 -05: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
kaa@polly.local
07ea804696
Merge polly.local:/tmp/maint/bug22129/my50-bug22129
...
into polly.local:/tmp/maint/bug22129/my51-bug22129
2006-11-08 20:49:10 +03:00
kaa@polly.local
4d8b006d69
Merge polly.local:/tmp/maint/bug22129/my41-bug22129
...
into polly.local:/tmp/maint/bug22129/my50-bug22129
2006-11-08 20:35:51 +03:00
kaa@polly.local
06c321d068
Removed the underflow check (bug #22129 )
2006-11-08 19:07:21 +03: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
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
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
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
msvensson@neptunus.(none)
6bc6064ec4
Update result file after having changed error message
2006-11-07 17:42:15 +01: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
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