joerg@trift2.
86674bc412
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-14 15:26:38 +01:00
mattiasj@mattiasj-laptop.(none)
7491e15f21
Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 22:47:48 +01:00
mattiasj@mattiasj-laptop.(none)
f4c100135b
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-main
...
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 21:42:27 +01:00
svoj@june.mysql.com
9799d6c479
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 21:54:04 +04:00
svoj@mysql.com/june.mysql.com
ed8f506d29
symlink.test, symlink.result:
...
Use proper variable for test.
2007-11-12 21:52:30 +04: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
kent@mysql.com/kent-amd64.(none)
3bb7cac84b
bigint.test, bigint.result:
...
Test case for Bug#30069
2007-11-12 12:52:03 +01:00
svoj@june.mysql.com
5e44309422
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 15:16:00 +04:00
svoj@mysql.com/june.mysql.com
40a78cd390
After merge fix.
2007-11-12 15:15:16 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab
Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
2007-11-12 15:02:42 +04:00
joerg@trift2.
df8e60ae01
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-11-08 10:33:57 +01:00
svoj@mysql.com/june.mysql.com
d06e2f9223
BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
...
RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
the file to which the symlink points.
This is security issue, because it is possible to create a table with
some name in some non-system database and set DATA/INDEX DIRECTORY
to mysql system database. Renaming this table to one of mysql system
tables (e.g. user, host) would overwrite the system table.
Return an error when the file to which the symlink points exist.
2007-11-06 18:09:33 +04:00
istruewing@stella.local
0c9c041fde
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-06 13:56:15 +01:00
istruewing@stella.local
30b409bd6f
Bug#4692 - DISABLE/ENABLE KEYS waste a space
...
Disabling and enabling indexes on a non-empty table grows the
index file.
Disabling indexes just sets a flag per non-unique index and does not
free the index blocks of the affected indexes. Re-enabling indexes
creates new indexes with new blocks. The old blocks remain unused
in the index file.
Fixed by dropping and re-creating all indexes if non-empty disabled
indexes exist when enabling indexes. Dropping all indexes resets
the internal end-of-file marker to the end of the index file header.
It also clears the root block pointers of every index and clears the
deleted blocks chains. This way all blocks are declared as free.
2007-11-06 13:41:32 +01:00
malff@lambda.hsd1.co.comcast.net.
00f1af47e4
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-05 09:50:09 -07:00
istruewing@stella.local
2481d2c1e3
Bug#32108 - subselect.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:44:38 +01:00
istruewing@stella.local
aac68041ef
Bug#32107 - ctype_uca.test produces warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-05 14:37:00 +01:00
tomas@whalegate.ndb.mysql.com
e981c427d8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:33:25 +01:00
tomas@whalegate.ndb.mysql.com
ca0cbdd8ee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-11-02 23:31:23 +01:00
istruewing@stella.local
6e7c0f8a65
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 15:10:13 +01:00
istruewing@stella.local
377f187066
Merge stella.local:/home2/mydev/mysql-4.1-ateam
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-11-02 14:48:36 +01:00
istruewing@stella.local
7819ec9f0e
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-02 10:14:26 +01:00
istruewing@stella.local
8d4b8423f7
Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
...
Preliminarily disabled test case
2007-11-02 10:11:26 +01:00
svoj@june.mysql.com
0ea269caac
Merge mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.0-engines
2007-11-02 12:58:20 +04:00
mleich@four.local.lan
080b3f51ee
Merge four.local.lan:/WORK2/merge/mysql-5.0-31408
...
into four.local.lan:/WORK/mysql-5.0-build/src-clean
2007-11-01 21:00:31 +01:00
istruewing@stella.local
fc888bc932
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-01 15:07:00 +01:00
istruewing@stella.local
1b165ef41f
Post-merge fix
2007-11-01 15:04:23 +01:00
istruewing@stella.local
382f62b10b
Bug#31909 - New gis.test creates warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-01 15:03:09 +01:00
malff@lambda.hsd1.co.comcast.net.
5bcb976bc2
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-01 06:35:22 -06:00
mleich@four.local.lan
770a6de90c
Fix for
...
Bug#29290 type_datetime.test failure in 5.1
2007-10-31 17:40:29 +01:00
istruewing@stella.local
cd49a77add
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-31 12:31:36 +01:00
istruewing@stella.local
f380491231
Merge stella.local:/home2/mydev/mysql-4.1-amain
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-10-31 00:50:03 +01:00
df@pippilotta.erinye.com
220add0366
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-10-30 15:37:48 +01:00
df@pippilotta.erinye.com
e5b809333c
bug#30630
2007-10-30 15:22:52 +01:00
svoj@mysql.com/june.mysql.com
cbd3dfbbcb
BUG#11392 - fulltext search bug
...
Fulltext boolean mode phrase search may crash server on platforms
where size of pointer is not equal to size of unsigned integer
(in other words some 64-bit platforms).
The problem was integer overflow.
Affects 4.1 only.
2007-10-30 14:46:43 +04:00
malff@lambda.weblab
6d15d42eca
Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
...
into lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-29 07:53:15 -06:00
joerg@trift2.
408727615c
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-10-29 11:55:48 +01:00
antony@pcg5ppc.xiphis.org
f9fc31f967
protect bug31473 from regressing into 5.0
2007-10-25 17:23:12 -07: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
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
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
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
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
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
d066e2173c
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 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
52b35112cf
Bug #28687 : Search fails on '0000-00-00' date after sql_mode change
...
When doing indexed search the server constructs a key image for
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can
be turned on by the SQL mode because there already may be values in
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
2007-10-22 19:32:18 +03:00