Created by Timour Katchaounov on 2012-12-21 and last modified on 2012-12-21
Get this branch:
bzr branch lp:~maria-captains/maria/10.0-mdev537
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

3491. By Timour Katchaounov on 2012-12-21

MDEV-537 Make multi-column non-top level subqueries to be executed via index (index/unique subquery)
         instead of single_select_engine

This task changes the IN-EXISTS rewrite for multi-column subqueries "(a, b) IN (select b, c ...)"
to work in the same way as for single-column subqueries "a IN (select b ...) with respect to the
injection of NULL-rejecting predicates.

More specifically, the method Item_in_subselect::create_row_in_to_exists_cond() adds
Item_is_not_null_test and Item_func_trig_cond only if the left IN operand can be NULL.
Not having these predicates when not necessary, makes it possible to rewrite the subquery
into a "unique_subquery" or "index_subquery" when there is a suitable index on the only
subquery table.

3490. By Kristian Nielsen on 2012-12-18

Merge a couple more fixes from 10.0-base to 10.0

3489. By Kristian Nielsen on 2012-12-18

After-merge fixes for merge 10.0-base -> 10.0.

3488. By Kristian Nielsen on 2012-12-18

Merge MariaDB 10.0-base to MariaDB 10.0

3487. By Sergei Golubchik on 2012-12-16

small code cleanup taken from MySQL 5.6

3486. By Sergei Golubchik on 2012-12-16

MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
backport improved bootstrap error handling from 5.6

  revno: 3768.1.1
  committer: Christopher Powers <email address hidden>
  timestamp: Wed 2012-05-02 22:16:40 -0500
    Improved bootstrap error handling:
    - Detect and report file i/o errors
    - Report query size errors with nearest query text

3485. By Sergei Golubchik on 2012-12-15

MDEV-3834 Crossgrade from MySQL 5.6.7 to MariaDB 10.0 fails due to non-existing mysql.host table
Treat the host table as optional, don't abort when it's missing

3484. By Sergei Golubchik on 2012-12-15

MDEV-3837 Assertion `table->read_set == &table->def_read_set' failed on updating a performance_schema table
This was failing not only for P_S, but for any engine that had
HA_PRIMARY_KEY_REQUIRED_FOR_DELETE flag set (in the tree - only P_S and federated).
Because of this flag, read_set and write_set were (possibly) changed
on update. But later the code modified these bitmaps and restored them to the default
state, losing HA_PRIMARY_KEY_REQUIRED_FOR_DELETE related changes.

3483. By Sergei Golubchik on 2012-12-15

MDEV-3860 backport --plugin-load-add (and related mysql-test changes)

  revno: 3383
  revision-id: <email address hidden>
  committer: Georgi Kodinov <email address hidden>
  timestamp: Thu 2011-08-18 11:31:08 +0300


  Implemented support for a new command line option :
  This option takes the same type of arguments that --plugin-load does
  and complements --plugin-load (that continues to operate as before) by
  appending its argument to the list specified by --plugin-load.
  So --plugin-load can be considered a composite option consisting of
  resetting the plugin load list and then calling --plugin-load-add to process
  the argument.
  Note that the order in which you specify --plugin-load and --plugin-load-add
  is important : "--plugin-load=x --plugin-load-add=y" will be equivalent to
  "--plugin-load=x,y" whereas "--plugin-load-add=y --plugin-load=x" will be
  equivalent to "plugin-load=x".

  Incompatible change : the --help --verbose command will no longer print the
  --plugin-load variable's values (as it doesn't have one). Otherwise both --plugin-load
  and --plugin-load-add are mentioned in it.

3482. By Oleksandr "Sanja" Byelkin on 2012-12-12

New results of --big test (MDEV-3862 fix).

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.