tomas@poseidon.mysql.com
18d227b1b0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-14 10:18:02 +07:00
mskold/marty@mysql.com/linux.site
113a84bd33
Enabled engine_condition_pushdown (on) as default
2007-02-09 21:04:43 +01:00
tsmith@siva.hindu.god
498756195a
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-02-08 16:02:58 -07:00
mskold/marty@mysql.com/linux.site
931a48904d
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added original test case
2007-02-07 09:49:16 +01:00
mskold/marty@linux.site
6aee9eedf7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-06 23:42:24 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
msvensson@pilot.mysql.com
7006b2033e
Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 20:23:28 +01:00
msvensson@neptunus.(none)
5f5b0e9b39
Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import
...
into neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
2007-02-06 17:34:06 +01:00
msvensson@pilot.mysql.com
324b136f4f
Update result file for 5.1
2007-02-06 17:23:21 +01:00
msvensson@pilot.mysql.com
c481446873
Fix merge error
2007-02-06 17:22:56 +01:00
msvensson@neptunus.(none)
38fa3ed693
Bug#25988 openssl_1 Test Case Fails
...
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
an extension that allow's the email adress of the cert holder.
- Imported patch for yaSSL "add email to DN output"
2007-02-06 16:28:36 +01:00
msvensson@pilot.mysql.com
6ba81ba5eb
Merge 192.168.0.10:mysql/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 15:50:24 +01:00
msvensson@neptunus.(none)
e4001b3b5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
f6d3ac52dd
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 14:32:08 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a4bbd5bf76
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
2007-02-06 14:28:46 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f103fde258
Merge mysql.com:/usr/home/ram/work/bug23938/my41-bug23938
...
into mysql.com:/usr/home/ram/work/bug23938/my50-bug23938
2007-02-06 13:57:20 +04:00
tomas@poseidon.mysql.com
3fc4f75ec7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 15:00:19 +07:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
tomas@poseidon.mysql.com
3c265e5944
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-05 12:19:24 +07:00
istruewing@chilla.local
bdf18a85f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:43:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
tomas@poseidon.mysql.com
36a674b2eb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-02 21:04:02 +07:00
joerg@trift2.
ad7b10ca19
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into trift2.:/MySQL/M51/push-5.1
2007-02-02 13:57:19 +01:00
gluh@mysql.com/eagle.(none)
29e1d5f9ce
after merge fix
2007-02-02 14:26:53 +04:00
gluh@eagle.(none)
7849d31923
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-02 10:25:45 +04:00
gluh@mysql.com/eagle.(none)
d1185aaeaf
Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
...
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
istruewing@chilla.local
54bf789a6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 15:15:40 +01:00
gkodinov/kgeorge@rakia.gmz
d9ae9ce58d
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 13:26:25 +02:00
gkodinov/kgeorge@rakia.gmz
95154f86b5
trigger.result:
...
merge of the 5.0-opt tree
2007-02-01 13:25:50 +02:00
gkodinov/kgeorge@rakia.gmz
f697acb0ca
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 11:07:17 +02:00
gkodinov/kgeorge@rakia.gmz
1096dbd5fa
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
2007-02-01 10:59:14 +02:00
gkodinov/kgeorge@rakia.gmz
0d40608fff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
2007-02-01 10:50:41 +02:00
igor@olga.mysql.com
710136217b
Fixed bug #25407 .
...
The bug could cause choosing a sub-optimal execution plan for
a single-table query if a unique index with many null keys were
defined for the table.
It happened because the code of the check_quick_keys function
made an assumption that any key may occur in an unique index
only once. Yet this is not true for keys with nulls that may
have multiple occurrences in the index.
2007-01-31 19:31:36 -08:00
mskold/marty@linux.site
201705a4b4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-01-31 22:58:03 +01:00
mskold/marty@linux.site
4cc8da4d39
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-31 22:43:24 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
svoj@june.mysql.com
b6f39522de
Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
2007-01-31 18:57:54 +04:00
gkodinov/kgeorge@rakia.gmz
aeaf6d3c7c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25575-5.0-opt
2007-01-31 16:12:47 +02:00
gkodinov/kgeorge@macbook.gmz
16d2d68257
BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
...
Two problems here:
Problem 1:
While constructing the join columns list the optimizer does as follows:
1. Sets the join_using_fields/natural_join members of the right JOIN
operand.
2. Makes a "table reference" (TABLE_LIST) to parent the two tables.
3. Assigns the join_using_fields/is_natural_join of the wrapper table
using join_using_fields/natural_join of the rightmost table
4. Sets join_using_fields to NULL for the right JOIN operand.
5. Passes the parent table up to the same procedure on the upper
level.
Step 1 overrides the the join_using_fields that are set for a nested
join wrapping table in step 4.
Fixed by making a designated variable SELECT_LEX::prev_join_using to
pass the data from step 1 to step 4 without destroying the wrapping
table data.
Problem 2:
The optimizer checks for ambiguous columns while transforming
NATURAL JOIN/JOIN USING to JOIN ON. While doing that there was no
distinction between columns that are used in the generated join
condition (where ambiguity can be checked) and the other columns
(where ambiguity can be checked only when resolving references
coming from outside the JOIN construct itself).
Fixed by allowing the non-USING columns to be present in multiple
copies in both sides of the join and moving the ambiguity check
to the place where unqualified references to the join columns are
resolved (find_field_in_natural_join()).
2007-01-31 16:04:38 +02:00
svoj@mysql.com/june.mysql.com
a28b2ca1eb
Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
2007-01-31 17:09:58 +04:00
svoj@mysql.com/june.mysql.com
a69107598e
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
2007-01-31 16:17:27 +04:00
svoj@mysql.com/june.mysql.com
a51aae601d
WL#3567 - MERGE engine: a check for underlying table conformance
...
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.
If any of underlying tables have different column/key definition
refuse to open merge table.
2007-01-31 16:15:20 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8da5745858
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.0
2007-01-31 14:31:11 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
ee56d2be9f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 14:28:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30f904eb2d
Merge mysql.com:/home/ram/work/b19690/b19690.5.0
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 12:53:36 +04:00
gkodinov/kgeorge@macbook.gmz
2ba683f2ee
Bug #25551 : inconsistent behaviour in grouping NULL, depending on index type
...
The optimizer takes away columns from GROUP BY/DISTINCT if they constitute
all the parts of an unique index.
However if some of the columns can contain NULLs this cannot be done
(because an UNIQUE index can have multiple rows with NULL values).
Fixed by not using UNIQUE indexes with nullable columns to remove
grouping columns from GROUP BY/DISTINCT.
2007-01-31 10:18:26 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f0f83a36bc
Merge mysql.com:/home/ram/work/b19690/b19690.4.1
...
into mysql.com:/home/ram/work/b19690/b19690.5.0
2007-01-31 10:07:56 +04:00