knielsen@loke.(none)[knielsen]
e16f03cd64
BUG#31810: Potential infinite loop with autoincrement failures in ndb
...
Fix extra semicolon causing if-statement to be disabled.
2007-10-25 08:40:42 +02:00
knielsen@loke.(none)[knielsen]
a7f7875578
BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc
...
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.
2007-10-25 07:57:18 +02:00
malff@lambda.hsd1.co.comcast.net.
2bc41b7e1e
Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
...
The root cause of this defect is that a call to my_error() is using a
'LEX_STRING' parameter instead of a 'char*'
This patch fixes the failing calls to my_error(), as well as similar calls
found during investigation.
This is a compiling bug (see the instrumentation in the bug report), no test cases provided.
2007-10-24 19:01:08 -06:00
mskold/marty@linux.site
d850b107b7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-24 22:27:28 +02:00
mskold/marty@linux.site
588b05d599
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-24 14:10:36 +02:00
mskold/marty@linux.site
4785c57334
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-10-24 14:07:33 +02:00
svoj@june.mysql.com
9f1d9beffa
Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
2007-10-24 16:39:13 +05:00
svoj@mysql.com/june.mysql.com
0253d7875d
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
2007-10-24 16:10:09 +05:00
svoj@mysql.com/june.mysql.com
5d1ccce58a
BUG#31159 - fulltext search on ucs2 column crashes server
...
ucs2 doesn't provide required by fulltext ctype array. Crash
happens because fulltext attempts to use unitialized ctype
array.
Fixed by converting ucs2 fields to compatible utf8 analogue.
2007-10-24 16:09:30 +05:00
gluh@mysql.com/eagle.(none)
97e0180b2b
result fix
2007-10-24 12:49:58 +05:00
anozdrin/alik@station.
9586784366
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-10-24 11:43:16 +04:00
mattiasj@mattiasj-laptop.(none)
e21b150a59
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-engines
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878
2007-10-23 22:13:00 +02:00
mattiasj@mattiasj-laptop.(none)
2d71933f51
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30695
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878
2007-10-23 22:07:45 +02:00
mattiasj@mattiasj-laptop.(none)
f733ea5a06
Bug #30695 : An apostrophe ' in the comment of the ADD PARTITION
...
causes the Server to crash.
Accessing partitioned table with an apostrophe in partition options
like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash.
Partition options were saved in .frm file without escaping.
When accessing such table it is not possible to properly restore
partition information.
Crashed because there was no check for partition info parser failure.
Fixed by escaping quoted text in the partition info when writing it to
the frm-file and added a check that it was able to parse the partition
info before using it
NOTE: If the comment is written by an earlier version of the server,
the corrupted frm-file is not fixed, but left corrupted, you have to
manually drop the table and recreate it.
2007-10-23 22:04:09 +02:00
gluh@mysql.com/eagle.(none)
b2aeda7699
result fix
2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 20:11:39 +05:00
gluh@eagle.(none)
53b1c3a299
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 20:09:36 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18
after merge fix
2007-10-23 19:28:47 +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
anozdrin/alik@station.
b2264ff810
Patch for BUG#30736: Row Size Too Large Error Creating a Table and
...
Inserting Data.
The problem was that under some circumstances Field class was not
properly initialized before calling create_length_to_internal_length()
function, which led to assert failure.
The fix is to do the proper initialization.
The user-visible problem was that under some circumstances
CREATE TABLE ... SELECT statement crashed the server or led
to wrong error message (wrong results).
2007-10-23 18:03:51 +04: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
gluh@eagle.(none)
331ee71261
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 18:47:18 +05:00
holyfoot/hf@hfmain.(none)
d0f53297f6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 17:24:57 +05:00
kaa@polly.(none)
173108956a
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:24:56 +04:00
holyfoot/hf@hfmain.(none)
f71a1441ee
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 17:09:32 +05:00
kaa@polly.(none)
6f1aef60ed
Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:09:31 +04:00
kaa@polly.(none)
6832d2cc1b
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:07:03 +04:00
davi@moksha.local/moksha.com.br
dac55f09f0
Bug#31669 Buffer overflow in mysql_change_user()
...
The problem is that when copying the supplied username and
database, no bounds checking is performed on the fixed-length
buffer. A sufficiently large (> 512) user string can easily
cause stack corruption. Since this API can be used from PHP
and other programs, this is a serious problem.
The solution is to increase the buffer size to the accepted
size in similar functions and perform bounds checking when
copying the username and database.
2007-10-23 09:05:39 -03:00
gkodinov/kgeorge@magare.gmz
9934eec243
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 15:04:40 +03:00
kaa@polly.(none)
23c65a3b01
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
2007-10-23 15:52:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
d029dd89c1
type conversions fixed to get rid of warnings
2007-10-23 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
05f918e999
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:52 +05:00
holyfoot/hf@hfmain.(none)
9b61281c01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:51 +05:00
gkodinov/kgeorge@magare.gmz
58bce232a8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34
merge 5.0-opt -> 5.1-opt for bug 30825
2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
bc80b86379
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 14:23:18 +03:00
holyfoot/hf@hfmain.(none)
c3033ace1f
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:21:51 +05:00
gkodinov/kgeorge@magare.gmz
7c344185bd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
2007-10-23 14:21:50 +03:00
holyfoot/hf@hfmain.(none)
14c43b980e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 15:35:52 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
36092b373a
type conversion fixed to get rid of warnings
2007-10-23 15:34:10 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 13:10:35 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7c8d8b5a74
merging
2007-10-23 14:31:59 +05:00
holyfoot/hf@hfmain.(none)
7fe41df000
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 14:31:24 +05:00
holyfoot/hf@hfmain.(none)
0353ecb29f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 14:30:22 +05:00
holyfoot/hf@hfmain.(none)
2a7ae86a35
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 14:29:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
9f323e1a3a
type conversions fixed to avoid warnings on Windows
2007-10-23 14:27:11 +05:00
jonas@perch.ndb.mysql.com
ac1dc64ebb
ndb - bug#26450
...
partial backport from 6.2 + add fix of bug
2007-10-23 11:24:34 +02:00
gluh@mysql.com/eagle.(none)
29ea825e57
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-10-23 14:06:56 +05:00
gkodinov/kgeorge@magare.gmz
3553f6eac2
Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
2007-10-23 11:44:14 +03:00