holyfoot/hf@hfmain.(none)
6767673750
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-15 16:22:32 +04:00
kent@kent-amd64.(none)
e94d8cc141
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 18:34:15 +01:00
kent@mysql.com/kent-amd64.(none)
eda2d801ef
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-14 18:32:06 +01:00
kent@mysql.com/kent-amd64.(none)
760a73102f
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-14 18:28:52 +01:00
kent@mysql.com/kent-amd64.(none)
7c4385c4ad
EXCEPTIONS-CLIENT:
...
Updated to version 0.6 of the text
2007-03-14 18:28:16 +01:00
gkodinov/kgeorge@magare.gmz
fe06c72d3f
merge 5.0->5.1
2007-03-14 18:18:30 +02:00
gkodinov/kgeorge@magare.gmz
5e2e4161d9
Bug #26794 : fixed valgrind warning
2007-03-14 17:07:48 +02:00
gkodinov/kgeorge@magare.gmz
a0499f3001
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26794-merge-5.1-opt
2007-03-14 17:05:43 +02:00
gkodinov/kgeorge@magare.gmz
2fd1bd92a3
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26794-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26794-merge-5.1-opt
2007-03-14 17:04:45 +02:00
gkodinov/kgeorge@magare.gmz
2525db66fa
Bug #26794 : fixed valgrind warning
2007-03-14 15:58:14 +02:00
kent@kent-amd64.(none)
ac91a4a89f
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 14:37:50 +01:00
kent@kent-amd64.(none)
52ef6aa5ed
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-14 14:32:30 +01:00
kent@mysql.com/kent-amd64.(none)
201e58d14e
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-14 14:31:44 +01:00
kent@mysql.com/kent-amd64.(none)
aea42a5444
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-14 14:30:54 +01:00
kent@mysql.com/kent-amd64.(none)
e51c32f0b7
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-14 14:30:12 +01:00
kent@mysql.com/kent-amd64.(none)
6b72b54716
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-14 14:29:23 +01:00
kent@mysql.com/kent-amd64.(none)
be226152ab
configure.in:
...
Added test for sched_yield() possibly in -lposix4 on Solaris
2007-03-14 14:27:46 +01:00
mhansson@dl145s.mysql.com
19f479d61f
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/users/mhansson/mysql/autopush/5.1o-bug24778
2007-03-14 12:44:58 +01:00
gkodinov/kgeorge@magare.gmz
31b636c041
WL#3527 : inspected a 5.1 covarage report
2007-03-14 13:32:12 +02:00
mhansson/martin@linux-st28.site
e61cce4d6b
Bug #24778 : Innodb: No result when using ORDER BY
...
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not
ok to call test_if_skip_sort_order since this function will
alter the execution plan. By contract it is not ok to call
test_if_skip_sort_order in this context.
This bug appears only in the case when the optimizer has chosen
an index for accessing a particular table but finds a covering
index that enables it to skip ORDER BY. This happens in
test_if_skip_sort_order.
2007-03-14 12:15:14 +01:00
gkodinov/kgeorge@magare.gmz
03df3bf6db
Bug #26794 : 5.1 part
...
It was syntactically correct to define
spatial keys over parts of columns (e.g.
ALTER TABLE t1 ADD x GEOMETRY NOT NULL,
ADD SPATIAL KEY (x(32))).
This may lead to undefined results and/or
interpretation.
Fixed by not allowing partial column
specification in a SPATIAL index definition.
2007-03-14 12:20:34 +02:00
gkodinov/kgeorge@magare.gmz
30a16b45d7
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26794-5.0-opt
2007-03-14 11:55:40 +02:00
gkodinov/kgeorge@magare.gmz
8c1f70aef6
Bug #26794 :
...
Different set of conditions is used to verify
the validity of index definitions over a GEOMETRY
column in ALTER TABLE and CREATE TABLE.
The difference was on how sub-keys notion validity
is checked.
Fixed by extending the CREATE TABLE condition to
support the cases allowed in ALTER TABLE.
Made the SHOW CREATE TABLE not to display spatial
indexes using the sub-key notion.
2007-03-14 11:54:20 +02:00
svoj@april.(none)
94f0977b86
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-14 04:48:43 +04:00
svoj@mysql.com/april.(none)
d7311aab77
Removed tabs.
2007-03-14 02:30:05 +04:00
gkodinov/kgeorge@magare.gmz
96629f2c99
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26672-5.0-opt
2007-03-13 18:46:46 +02:00
svoj@april.(none)
31329c83c0
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-13 19:05:35 +04:00
svoj@mysql.com/april.(none)
de21b9b8ef
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
2007-03-13 18:11:47 +04:00
svoj@mysql.com/april.(none)
cb132bea8f
BUG#26881 - Large MERGE tables report incorrect specification when no
...
differences in tables
Certain merge tables were wrongly reported as having incorrect definition:
- Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
be internally casted (in certain cases) to a different type on a
storage engine layer. (affects 4.1 and up)
- If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
sync. (affects 4.1 only)
This is fixed by relaxing a check for underlying conformance and setting
field type to FIELD_TYPE_STRING in case varchar is shorter than 4
when a table is created.
2007-03-13 18:02:06 +04:00
svoj@april.(none)
00de447127
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-13 17:11:41 +04:00
svoj@april.(none)
dfc078fc50
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
2007-03-13 17:08:11 +04:00
svoj@mysql.com/april.(none)
14deaa3f61
Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
2007-03-13 17:00:48 +04:00
svoj@mysql.com/april.(none)
11384fece2
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
2007-03-13 16:58:52 +04:00
svoj@mysql.com/april.(none)
576db4f44c
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
2007-03-13 16:57:16 +04:00
kent@mysql.com/kent-amd64.(none)
25e91313c9
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 21:32:59 +01:00
kent@kent-amd64.(none)
abde3576d6
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 21:29:48 +01:00
kent@mysql.com/kent-amd64.(none)
d6476788fe
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 21:29:05 +01:00
kent@mysql.com/kent-amd64.(none)
512202a88f
configure.in:
...
Restored accidently removed line to check for zlib
2007-03-12 21:27:07 +01:00
gkodinov/kgeorge@magare.gmz
3542315de6
Merge magare.gmz:/home/kgeorge/mysql/work/B26794-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B26794-5.1-opt
2007-03-12 17:08:42 +02:00
joerg@trift2.
860bebcf2c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into trift2.:/MySQL/M50/push-5.0
2007-03-12 16:00:35 +01:00
gkodinov/kgeorge@magare.gmz
36d2a231e3
Bug #26794 :
...
Different set of conditions is used to verify
the validity of index definitions over a GEOMETRY
column in ALTER TABLE and CREATE TABLE.
The difference was on how sub-keys notion validity
is checked.
Fixed by extending the CREATE TABLE condition to
support the cases allowed in ALTER TABLE.
Made the SHOW CREATE TABLE not to display spatial
indexes using the sub-key notion.
2007-03-12 16:57:00 +02:00
kent@kent-amd64.(none)
757774431d
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 14:56:22 +01:00
kent@mysql.com/kent-amd64.(none)
ab230132ca
CMakeLists.txt:
...
Removed references to my_winsem.c
2007-03-12 14:55:45 +01:00
kent@kent-amd64.(none)
7a0765c0af
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 14:53:52 +01:00
kent@mysql.com/kent-amd64.(none)
43cc303b26
Makefile.am, CMakeLists.txt:
...
Removed references to my_winsem.c
2007-03-12 14:52:37 +01:00
joerg@trift2.
b5265a3660
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-03-12 14:52:30 +01:00
kent@kent-amd64.(none)
43e3a9b56a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:37:51 +01:00
kent@kent-amd64.(none)
9d396c6996
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
e10e81d154
mysys_ia64.dsp, mysys.vcproj:
...
Removed references to unused files
2007-03-12 13:18:48 +01:00