lp:~pomyks/maria/10.0-per-query-variables

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:maria

Maria-captains: Pending requested 2013-11-06

Diff: 2265 lines (+2080/-16)

13 files modified

mysql-test/suite/percona/percona_rpl_set_statement_variable_test.inc (+31/-0)
mysql-test/suite/percona/percona_rpl_stm_per_query_variables_settings.result (+140/-0)
mysql-test/suite/percona/percona_rpl_stm_per_query_variables_settings.test (+57/-0)
mysql-test/suite/percona/percona_statement_set.result (+862/-0)
mysql-test/suite/percona/percona_statement_set.test (+830/-0)
sql/lex.h (+1/-0)
sql/set_var.h (+3/-0)
sql/sql_lex.cc (+1/-0)
sql/sql_lex.h (+2/-0)
sql/sql_parse.cc (+46/-0)
sql/sql_plugin.cc (+42/-0)
sql/sql_plugin.h (+8/-0)
sql/sql_yacc.yy (+57/-16)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3880. By Patryk Pomykalski on 2013-11-03

Port of per query variables feature from Percona Server.
Allows changing variables for duration of the query.

3879. By Sergei Golubchik on 2013-11-02

make mtr_check to monitor mysql.plugin table too.
fix tests to clean up properly

3878. By Sergei Golubchik on 2013-11-02

syntax error in the cmake file

3877. By Sergei Golubchik on 2013-11-02

10.0-base merge

3876. By Sergei Golubchik on 2013-11-01

update tokudb test results

3875. By Alexander Barkov on 2013-11-01

Recoding mysql-test/suite/innodb/r/innodb_ctype_ldml.result
according to one of the recent changes.

3874. By Sergei Golubchik on 2013-10-31

MDEV-4024 Found Index PRIMARY whose column info does not match that of MySQL

For compatibility purposes let InnoDB use DATA_INT for MYSQL_TYPE_ENUM and MYSQL_TYPE_SET.
Silence the warning for these types and let the index translation table to be built anyway.

Test case by Jeremy Cole.

3873. By Alexander Barkov on 2013-10-31

A few minor Unicode collation customization improvements were made,
which makes it possible to add more world language collations
with very complex collation rules (e.g. Myanmar):
- Weight string for a single character in a user defined collation
  was erroneously limited to 7 weights (instead of 8 weights).
  Added an extra element in the user-defined weight arrays,
  to fit 8 non-zero weights.
- Weight string limit for contractions was made two times longer (16 weights),
  which allows longer contractions without affecting the performance
  of filesort.
- A user-defined collation now refuses to initialize and reports an error
  in case if a weight string gets longer than 8 weights for a single character,
  or longer than 16 weights for a contraction. Previously weight strings
  for such characters (and contractions) were cut, so a collation
  could silently start with wrong rules.
- Fixed a bug in handling rules like "&a << b" in combination with
  shift-after-method="expand". The primary weight for "b" was not
  correctly calculated, which erroneously made "b" primary greater than "a"
  instead of primary equal to "a".

3872. By Sergey Vojtovich on 2013-10-30

Merge Spider updates. Fixes
MDEV-4736 - Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on
            UPDATE which violates constraint on a remote table

3871. By Oleksandr "Sanja" Byelkin on 2013-10-29

merge 10.0-base -> 10.0