Created by Sergei Golubchik on 2010-05-30 and last modified on 2014-04-22
Get this branch:
bzr branch lp:maria/5.1
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

3221. By Elena Stepanova on 2014-04-22

Change in the result file merged from 5.1 did not take into account
MariaDB-specific result replacement

3220. By Elena Stepanova on 2014-04-21

MDEV-750 LP:800035 - intermittent rpl_deadlock_innodb failures

A typo in include file caused the timeout counter to be 10x less than
expected. It was fixed in 5.5.20+ along with a bigger change, now also
fixing in 5.1-5.3.

3219. By Sergei Golubchik on 2014-03-15

mysql-5.1.73 merge

3218. By Oleksandr "Sanja" Byelkin on 2014-03-12

MDEV-5717: Server crash with insert statement containing DEFAULT into view

Item_default_value::arg can be NULL so walk() should take it into consideration.

3217. By Sergei Golubchik on 2014-02-13

fix embedded tests
(mainly by backporting 5.5. changes)

3216. By Sergei Golubchik on 2014-02-12

MDEV-5655 Server crashes on NAME_CONST containing AND/OR expressions

fix the NAME_CONST check to only allow literals, negated literals, and literals with
the explicit collation.

3215. By Sergei Golubchik on 2014-01-28

fixed a client-side overflow in mysql cli

3214. By Oleksandr "Sanja" Byelkin on 2014-01-23

MDEV-5356: Server crashes in Item_equal::contains on 2nd execution of a PS
THD::thd->activate_stmt_arena_if_needed() should be used to temporary activating statement arena instead of direct usage of THD::set_n_backup_active_arena() because possible such scenario:
  1) func1 saves current arena and activates copy1 of statement arena
  2) func2 saves copy1 of statement arena setup by func1 and activates copy2
  3) some changes made for copy 2
  4) func2 stores changed copy2 back to statenet arena and activates copy1
  5) func1 store unchanged copy1 back to statemnt arena (rewrite changed copy 2 so changes become lost) and activates arena which was before.

3213. By Sergei Golubchik on 2014-01-20

fix a warning

3212. By Sergei Golubchik on 2014-01-20

MDEV-5543 MyISAM repair unsafe usage of TMD files

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.