istruewing@stella.local
44fbe74e1e
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-03-26 10:27:00 +01:00
mkindahl@dl145h.mysql.com
759d2f6658
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:49:26 +01:00
bar@bar.myoffice.izhnet.ru
d5011e8561
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
2008-02-20 14:38:52 +04:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d2ad8286a0
backport valgrind cleanups from 6.0-engines
2008-02-19 13:46:54 -08:00
bar@mysql.com/bar.myoffice.izhnet.ru
efa7ee3573
Bug#27877 incorrect german order in utf8_general_ci
...
Problem: incorrect sort order for "U+00DF SHARP S".
Fix: changing sort order for U+00DF to be equal to 's',
like the manual says.
2008-02-11 16:28:33 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
3a438cf57a
Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column
...
Problem: some collation handlers called incorrect version
of my_like_range_xxx(), which led to wrong min_str and max_str,
so like range optimizer threw away good records.
Fix: changing the wrong handlers to call proper version of
my_like_range_xxx().
2008-02-04 11:10:40 +04:00
mhansson/martin@linux-st28.site
f8fb6e930a
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143-pushee
2008-01-17 18:36:04 +01:00
mhansson/martin@linux-st28.site
2067dfe474
Merge linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143
2008-01-17 18:22:55 +01:00
mhansson/martin@linux-st28.site
7207d3ce21
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee
2008-01-17 18:15:53 +01:00
mhansson/martin@linux-st28.site
effe27e350
Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result
...
The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.
2008-01-14 16:16:36 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
491b664fad
Bug#31752: check strmake() bounds
...
build fixes
2007-12-17 10:43:19 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
94d7b8273f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-12-17 09:48:30 +01:00
tnurnberg@white.intern.koehntopp.de
f7aa719268
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:45:36 +01:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
istruewing@stella.local
03d99c5956
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-12-11 21:37:33 +01:00
istruewing@stella.local
ba2d58ae5e
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-12-11 17:09:43 +01:00
tsmith@ramayana.hindu.god
8fc0bfb6b6
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 12:33:36 -07:00
tsmith@ramayana.hindu.god
10cab933b2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
tnurnberg@white.intern.koehntopp.de
9598ea4f45
Merge mysql.com:/misc/mysql/31177/50-31177
...
into mysql.com:/misc/mysql/31177/51-31177
2007-12-01 15:53:56 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
31d4e58ad4
Bug#31177: Server variables can't be set to their current values
...
Default values of variables were not subject to upper/lower bounds
and step, while setting variables was. Bounds and step are also
applied to defaults now; defaults are corrected quietly, values
given by the user are corrected, and a correction-warning is thrown
as needed. Lastly, very large values could wrap around, starting
from 0 again. They are bounded at the maximum value for the
respective data-type now if no lower maximum is specified in the
variable's definition.
2007-11-30 06:32:04 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
e02d039abe
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32726/b32726.5.0
2007-11-29 15:12:09 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ec0ce5ea03
Merge mysql.com:/home/ram/work/b32726/b32726.5.0
...
into mysql.com:/home/ram/work/b32726/b32726.5.1
2007-11-29 14:35:15 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
75095711f4
Fix for bug #32726 : crash with cast in order by clause and cp932 charset
...
- fix for #31070 (missed during merging) applied for cp932 charset.
- tests/results adjusted.
2007-11-28 10:55:13 +04:00
tnurnberg@white.intern.koehntopp.de
72cd363665
Merge mysql.com:/misc/mysql/31752_/50-31752_
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-11-26 09:19:30 +01:00
tnurnberg@white.intern.koehntopp.de
f91cf9c7cf
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-11-26 09:00:41 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
1a95ed1df2
Bug#31752: check strmake() bounds
...
strmake() calls are easy to get wrong. Add checks in extra
debug mode to identify possible exploits.
Remove some dead code.
Remove some off-by-one errors identified with new checks.
2007-11-26 08:20:40 +01:00
mkindahl@dl145h.mysql.com
0c7f3bdeba
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-21 21:15:33 +01:00
mkindahl@dl145h.mysql.com
3cf2733086
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2007-11-21 21:11:57 +01:00
kent@kent-amd64.(none)
1979c915f9
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
2007-11-12 13:50:37 +01:00
kent@kent-amd64.(none)
af7d3963b2
Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
...
into mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
2007-11-12 13:13:43 +01:00
knielsen@loke.(none)
9cdff98022
Merge loke.(none):/home/knielsen/devel/mysql-5.0-maint
...
into loke.(none):/home/knielsen/devel/mysql-5.1-new-maint
2007-10-31 10:40:40 +01:00
knielsen@loke.(none)
5dc5fc8292
BUG#31799: Scrambled number output due to integer overflow
...
An integer overflow in number->string conversion caused completely
wrong output of the number LONGLONG_MIN with gcc 4.2.1.
Fixed by eliminating the overflow, using only operations that are
well-defined in ANSI C.
2007-10-31 10:34:26 +01:00
bar@bar.myoffice.izhnet.ru
628b462881
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
2007-10-30 12:21:44 +04:00
bar@bar.myoffice.izhnet.ru
70488d7dfe
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
2007-10-30 12:03:34 +04:00
bar@bar.myoffice.izhnet.ru
811e64de62
Merge mysql.com:/home/bar/mysql-work/mysql-5.0
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
2007-10-24 10:49:46 +05:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
kaa@polly.(none)
e10f699931
Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-23 13:39:31 +04:00
kaa@polly.(none)
0aa8710037
Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-23 13:31:24 +04:00
kaa@polly.(none)
5fe9f0f7dd
Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878
...
into polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
2007-10-23 13:19:54 +04:00
gshchepa/uchum@gleb.loc
88aa7b0a6e
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-15 14:18:26 +05:00
kaa@polly.(none)
e0691da0c1
Fix for bug #30453 : String not cast to int correctly.
...
Problem:
my_strntoull10rnd_8bit() handled incorrectly cases when the input
string contains a decimal point and is long enough to overrun the
'unsigned long long' type. The position of the decimal point was not
taken into account which resulted in miscalculated numbers and
truncation to appropriate SQL data type limits.
Solution:
Fix my_strntoull10rnd_8bit() to take the position of a decimal point
into account in such cases.
2007-10-15 10:34:34 +04:00
gshchepa/uchum@gleb.loc
b8b199af45
Fixed bug #31019 : the MOD() function and the % operator crash the server
...
when a divisor is less than 1 and its fractional part is very long.
For example:
1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789;
Stack buffer overflow has been fixed in the do_div_mod function.
2007-10-08 03:48:59 +05: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@ramil.myoffice.izhnet.ru
fa252fec68
Merge mysql.com:/home/ram/work/b31070/b31070.4.1
...
into mysql.com:/home/ram/work/b31070/b31070.5.0
2007-10-04 10:54:51 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bc9b4834e1
Fix for bug #31069 : crash in 'sounds like'
...
and for bug #31070 : crash during conversion of charsets
Problem: passing a 0 byte length string to some my_mb_wc_XXX()
functions leads to server crash due to improper argument check.
Fix: properly check arguments passed to my_mb_wc_XXX() functions.
2007-10-04 10:20:00 +05:00
bar@bar.myoffice.izhnet.ru
3745968ddc
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b30315
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-03 12:18:17 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
aacebc7ce8
Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
...
Problem: some valid euc-kr characters were rejected because
condition checking multi-byte tail didn't allow
multi-byte characters having the second byte in the ranges
[0x41..0x5A] and [0x61..0x7A].
Fix: allow these byte ranges for mb tails
2007-10-01 15:35:42 +05:00
kent@kent-amd64.(none)
a9366e4878
Merge mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
...
into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
2007-09-28 22:38:21 +02:00