Created by Hartmut Holzgraefe on 2013-03-13 and last modified on 2013-03-13
Get this branch:
bzr branch lp:~hartmut-php/maria/mdev-4271
Only Hartmut Holzgraefe can upload to this branch. If you are Hartmut Holzgraefe please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Hartmut Holzgraefe

Recent revisions

3504. By Hartmut Holzgraefe on 2013-03-13

STRAIGHT_JOIN couldn't be combined with NATURAL or USING(),
INNER JOIN not with NATURAL (MDEV-4271, MySQL Bug #35268)

Separate rules existed for "natural" (non-outer) joins and
for STRAIGHT_JOIN, with the only difference code wise being
that with STRAIGHT_JOIN the "straight" property of the right
side table was set before calling the appropriate add_...()

The "natural_join" parser rule has now been extended to also
accept STRAIGHT_JOIN, and the rule result value is set to
1 for straight joins, 0 otherwise, so acting as a "straight"
flag that can directly be assigned to the "straight" property
of the right side table.

The rule parsing NATURAL JOIN was hard coded to accept just
this keyword combination, without support for either
STRAIGHT_JOIN or the optional INNER.

The "natural_join" rule has now been split up in an inner
"inner_join" rule that matches the JOIN, INNER JOIN and
STRAIGHT_JOIN cases while "natural_join" also matches

The NATURAL rule has been changed to accept "inner_join"
instead of just JOIN, so now NATURAL STRAIGHT_JOIN and
NATURAL INNER JOIN also work as expected.

As a side effect the removal of the duplciated rules
for STRAIGHT_JOIN handling has reduced the shift/reduce
conflict count by one.

3503. By Vladislav Vaintroub on 2013-02-19

MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions

3502. By Michael Widenius on 2013-02-15

Automatic merge

3501. By Oleksandr "Sanja" Byelkin on 2013-02-04


3500. By Sergey Petrunia on 2013-02-04

Skip cassandra_qcache.test if there is no Cassandra cluster running.

3499. By Sergey Petrunia on 2013-02-04

Merge fix for MDEV-3997.

3498. By Oleksandr "Sanja" Byelkin on 2013-02-04


3497. By Sergei Golubchik on 2013-02-02

remove "invisible sysvars" oxymoron

3496. By Sergei Golubchik on 2013-01-31

fix for a valgrind builds.
my_alloca() cannot have MY_THREAD_SPECIFIC, because can be used
outside of the THD context.

3495. By Sergei Golubchik on 2013-01-31

avoid mtr errors for --plugin-add=EXAMPLE=$HA_EXAMPLE_SO
when no ha_example.so is built

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.