maria:bb-10.1-elenst-mdev9909

Last commit made on 2016-04-19
Get this branch:
git clone -b bb-10.1-elenst-mdev9909 https://git.launchpad.net/maria

Branch merges

Branch information

Name:
bb-10.1-elenst-mdev9909
Repository:
lp:maria

Recent commits

7f300d2... by Elena Stepanova <email address hidden> on 2016-04-19

Next part of experimental change for MDEV-9909

Do not allow file_key_management and example_key_management
to be loaded together, we already know it does not work (MDEV-9948)

0a38955... by Elena Stepanova <email address hidden> on 2016-04-19

MDEV-9953 Debian packages install broken 'maria' test suite which cannot be run

Do not create maria/t and maria/r directores

7ffe9d1... by Elena Stepanova <email address hidden> on 2016-04-18

Another part of experimental change for MDEV-9909

Add file-key-management-filename option to allow static builds to work with the plugin

3ad2b84... by Elena Stepanova <email address hidden> on 2016-04-17

Experimental temporary change for MDEV-9909 analysis

It should never be pushed to the main tree

1cf852d... by Kristian Nielsen on 2016-04-07

MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1

In some cases, MariaDB 10.0 could write a master.info file that was read
incorrectly by 10.1 and could cause server to fail to start after an upgrade.

(If writing a new master.info file that is shorter than the old, extra
junk may remain at the end of the file. This is handled properly in
10.1 with an END_MARKER line, but this line is not written by
10.0. The fix here is to make 10.1 robust at reading the master.info
files written by 10.0).

Fix several things around reading master.info and read_mi_key_from_file():

 - read_mi_key_from_file() did not distinguish between a line with and
   without an eqals '=' sign.

 - If a line was empty, read_mi_key_from_file() would incorrectly return
   the key from the previous call.

 - An extra using_gtid=X line left-over by MariaDB 10.0 might incorrectly
   be read and overwrite the correct value.

 - Fix incorrect usage of strncmp() which should be strcmp().

 - Add test cases.

3f61251... by Monty <email address hidden> on 2016-04-07

Fixed results

293cb04... by Monty <email address hidden> on 2016-04-07

MDEV-9621 INSERT DELAYED fails on insert for tables with many columns
This fix also fixes a connection hang when trying to do INSERT DELAYED to a crashed table.

Added crash_mysqld.inc to allow easy crash+restart of mysqld

4b6a351... by Vladislav Vaintroub on 2016-04-06

Use _ReadWriteBarrier() rather than MemoryBarrier() for preventing compile optimization

fd7a8d1... by Vladislav Vaintroub on 2016-04-06

Fix compile error in UT_COMPILER_BARRIER on Visual Studio compiler.

9794cf2... by Jan Lindström on 2016-04-06

Merge pull request #168 from grooverdan/10.1-MDEV-8684-UT_RELAX_CPU_isnt_relaxing

MDEV-8684 ut relax cpu isnt relaxing