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
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
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
gkodinov/kgeorge@magare.gmz
f2ce1445e1
group_by.result:
...
WL3527: disable wrong optimization.
sql_select.cc:
WL#3527: disable wrong optimization.
2007-03-12 13:20:46 +02:00
gkodinov/kgeorge@magare.gmz
a474f33494
WL3527: post-merge updates
...
sql_yacc.yy:
WL3527: updated the diff to use correct parser words
table.cc:
WL3527: exteneded the fix for bug #20604 to fit the new variables
sql_select.cc:
WL3527: renamed used_keys to covering_keys
2007-03-11 14:31:43 +02:00
gkodinov/kgeorge@magare.gmz
a4e6077c8a
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-11 11:45:13 +02:00
gkodinov/kgeorge@magare.gmz
316b9e3153
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-11 10:17:09 +02:00
gkodinov/kgeorge@magare.gmz
dcbeedca18
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.0-opt-merge-5.1-opt
2007-03-11 10:12:34 +02:00
evgen@moonbone.local
11d37efa5e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-03-11 00:26:45 +03:00
evgen@moonbone.local
f3e56b5adb
Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-10 19:57:18 +03:00
evgen@moonbone.local
6f6b9ae3ad
Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
...
When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.
Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.
2007-03-10 19:55:34 +03:00
evgen@moonbone.local
e7a309197b
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-10 19:53:59 +03:00
igor@olga.mysql.com
ec4593f59a
Fixed bug #26830 : a crash for the query with a subselect containing ROLLUP.
...
Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.
2007-03-10 02:47:47 -08:00
evgen@moonbone.local
04f5c46d5d
Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
...
away.
Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.
2007-03-10 00:29:02 +03:00
gkodinov/kgeorge@magare.gmz
c03a483c51
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-09 17:54:13 +02:00
gkodinov/kgeorge@magare.gmz
4d7e5c2018
Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
...
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
2007-03-09 16:38:02 +02:00
gkodinov/kgeorge@magare.gmz
f05dff00b0
Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
...
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
2007-03-09 16:34:23 +02:00
gkodinov/kgeorge@magare.gmz
7acdb67643
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
2007-03-09 16:30:44 +02:00
gkodinov/kgeorge@macbook.gmz
6bea442d26
WL#3527: Extend IGNORE INDEX so places where index is ignored can
...
be specified
5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
of IGNORE INDEX for backward compatibility with the 5.1 fix.
2007-03-09 15:20:06 +02:00
holyfoot/hf@hfmain.(none)
eca8b1a62d
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:51:32 +04:00
gkodinov/kgeorge@magare.gmz
9625f2e902
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
2007-03-09 14:48:19 +02:00
holyfoot/hf@hfmain.(none)
71e6d69647
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:37:36 +04:00
gkodinov/kgeorge@magare.gmz
86cba48b8f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
2007-03-09 13:05:41 +02:00
gkodinov/kgeorge@magare.gmz
740a5fd7fe
Bug #26281 :
...
Fixed boundry checks in the INSERT() function:
were one off.
2007-03-09 12:47:12 +02:00
igor@olga.mysql.com
e10d74cff9
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-03-09 02:45:17 -08:00
igor@olga.mysql.com
6f4da47843
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
2007-03-09 01:50:17 -08:00
holyfoot/hf@hfmain.(none)
bcc5499bab
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 13:50:06 +04:00
igor@olga.mysql.com
96cfd5ab91
Fixed bug #26661 : crash when order by clause in a union
...
construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.
2007-03-09 01:45:32 -08:00
holyfoot/hf@mysql.com/hfmain.(none)
2b1179ad07
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-09 13:44:43 +04:00
holyfoot/hf@hfmain.(none)
a9a6347a11
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 13:40:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
60e0dceae8
Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-09 13:39:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4ab2b8d782
aftermerge fix
2007-03-09 13:38:40 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4752db40e8
aftermerge fix
2007-03-09 13:37:06 +04:00
holyfoot/hf@hfmain.(none)
cae7bc8c96
Merge mysql.com:/home/hf/work/mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 12:47:59 +04:00
tsmith@quadxeon.mysql.com
965ca42544
rpl_ssl.result, rpl_ssl.test:
...
Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
2007-03-08 19:57:35 +01:00
holyfoot/hf@hfmain.(none)
cdcf3ec097
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 22:04:17 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
11dd0fa326
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-08 21:42:41 +04:00
tsmith@bk-internal.mysql.com
8539d9a7bd
The most recent push into mysql-5.1 from mysql-5.2 was a mistake.
...
This just reverses those changes. I'm really sorry about that.
configure.in, version.c:
Reverse last push (from mysql-5.2 into mysql-5.1)
2007-03-08 18:38:17 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
618ccf376f
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mrg/mysql-4.1-opt
2007-03-08 21:14:31 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
48d3e2c1bb
merging
2007-03-08 20:57:12 +04:00
tsmith@bk-internal.mysql.com
bb273143fc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
2007-03-08 17:55:20 +01:00
evgen@moonbone.local
35e5925673
sql_select.cc:
...
Postfix for bug#22331.
2007-03-08 19:38:21 +03:00
msvensson@pilot.blaudden
4374a47090
Update result for 5.1
2007-03-08 16:47:18 +01:00
holyfoot/hf@hfmain.(none)
75be7cd1ae
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 19:08:28 +04:00
msvensson@pilot.blaudden
193c3178bc
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-08 15:10:24 +01:00
msvensson@pilot.blaudden
dd16b217c7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 14:56:08 +01:00
msvensson@pilot.blaudden
433d3e6cf7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 14:55:39 +01:00