Created by Sergey Petrunia and last modified
Get this branch:
bzr branch lp:~maria-captains/maria/5.5-show-explain
Members of Maria-captains can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

3545. By Sergey Petrunia

SHOW EXPLAIN: merge with mariadb 5.5-main

3544. By Michael Widenius

Fixed issues found by buildbot & valgrind:
- Wrong thd uses in Item_subselect, could lead to crash
- Inititalize uninitialized variable in new autoincrement handling code

3543. By Michael Widenius

Fixed installation issues on debian:
- Don't abort if plugin table exists
- Use longer timeout for start/stop of mysqld

3542. By Oleksandr "Sanja" Byelkin

makes mi_test_all.sh & ma_test_all.sh working (MDEV-285)

3541. By Vladislav Vaintroub

MDEV-546 : error when compiling client library - incorrect client_settings.h

Remove sql directory from the include path to workaround the problem. This removes the ambiguity , since then only one client_settings.h will be in the include paths

3540. By Michael Widenius

Updated mytop to version 1.91
Fixed that 'Handler:' output gives correct result with MariaDB (not including temporary tables)

3539. By Kristian Nielsen

Fix test failure on --embedded-server

3538. By Michael Widenius

This fix+comments was originally made by Alexey Kopytov

LP bug #1035225 / MySQL bug #66301: INSERT ... ON DUPLICATE KEY UPDATE +
innodb_autoinc_lock_mode=1 is broken

The problem was that when certain INSERT ... ON DUPLICATE KEY UPDATE
were executed concurrently on a table containing an AUTO_INCREMENT
column as a primary key, InnoDB would correctly reserve non-overlapping
AUTO_INCREMENT intervals for each statement, but when the server
encountered the first duplicate key error on the secondary key in one of
the statements and performed an UPDATE, it also updated the internal
AUTO_INCREMENT value to the one from the existing row that caused a
duplicate key error, even though the AUTO_INCREMENT value was not
specified explicitly in the UPDATE clause. It would then proceed with
using AUTO_INCREMENT values the range reserved previously by another
statement, causing duplicate key errors on the AUTO_INCREMENT column.

Fixed by changing write_record() to ensure that in case of a duplicate
key error the internal AUTO_INCREMENT counter is only updated when the
AUTO_INCREMENT value was explicitly updated by the UPDATE
clause. Otherwise it is restored to what it was before the duplicate key
error, as that value is unused and can be reused for subsequent
successfully inserted rows.

3537. By Michael Widenius

Automatic merge

3536. By Michael Widenius

Fixed test for ps-protocol

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.