Created by Hartmut Holzgraefe on 2012-09-21 and last modified on 2012-09-21
Get this branch:
bzr branch lp:~hartmut-php/maria/mdev-543
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

3540. By Hartmut Holzgraefe on 2012-09-21

Allow blanks in mysql_install_db --basedir and --datadir arguments (MDEV-543)

3539. By Kristian Nielsen on 2012-09-21

Fix test failure on --embedded-server

3538. By Michael Widenius on 2012-09-18

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 on 2012-09-18

Automatic merge

3536. By Michael Widenius on 2012-09-18

Fixed test for ps-protocol

3535. By Timour Katchaounov on 2012-09-18

Merged the fix for bug lp:1009187, mdev-373

3534. By Michael Widenius on 2012-09-17

Fixed issues in test suite when running with --ps-protocol

3533. By Michael Widenius on 2012-09-10

Fixed random test failure

3532. By Michael Widenius on 2012-09-10

Fixed Bug#1002564: Wrong result for a lookup query from a heap table

3531. By Michael Widenius on 2012-09-10

Fixed compiler warning on Mac

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.