Last commit made on 2017-08-28
Get this branch:
git clone -b bb-10.0-mdev_13437-andrei

Branch merges

Branch information


Recent commits

052e8e3... by andrelkin <email address hidden> on 2017-08-28

MDEV-13437 InnoDB: Failing assertion: !srv_read_only_mode in

The assert was caused due to incorrect handling of --tc-heuristic-recover=ROLLBACK
and --innodb-read-only=1 option combination. Innodb attempted
rollback of a prepared transaction having no right to do so because of
the latter option.

Fixed with making Innodb to respect the read-only flag by
innobase_{commit,rollback}_by_xid (Marko's contribution).
LOCK_log mutex lock/unlock had to be added to cover MDEV-1438 "child" issue.
The measure is confirmed by mysql sources as well.

For testing of the conflicting option combination, mysql-test-run is
made to export a new $MYSQLD_LAST_CMD. It holds the very last value
generated by mtr.mysqld_start(). Even though the options have been
also always stored in $mysqld->{'started_opts'} there were no access
to them beyond the automatic server restart by mtr through the expect
file interface.

Effectively therefore $MYSQLD_LAST_CMD represents a more general interface to
$mysqld->{'started_opts'} which can be used in wider scopes including
server launch with incompatible options.

Notice another existing method to restart the server with incompatible
options relying on $MYSQLD_CMD is is aware of $mysqld->{'started_opts'} (the actual
options that the server is launched by mtr). In order to use this
method they would have to be provided manually.

Note, at merging to 10.2 an added search++ macro should be renamed
"back" to normal. It's being backparted to 10.0 "temporarily".

ce6c0e5... by Jan Lindström on 2017-07-27

MDEV-8960: Can't refer the same column twice in one ALTER TABLE

Problem was that if column was created in alter table when
it was refered again it was not tried to find from list
of current columns.

  There is two cases
    (1) If alter table adds a new column and then later alter
        changes the field definition, there was no check from
 list of new columns, instead an incorrect error was given.
    (2) If alter table adds a new column and then later alter
        changes the default, there was no check from list of
 new columns, instead an incorrect error was given.

7581fb2... by Sergei Golubchik on 2017-08-14

compilation fix for SLES 11 SP4

also fix innodb

fc556a8... by Sergei Golubchik on 2017-08-10

compilation fix for SLES 11 SP4

cb9648a... by Marko Mäkelä on 2017-08-09

Revert an InnoDB Memcached plugin fix that was merged from MySQL 5.6.37

Revert the following change, because Memcached is not present
in MariaDB Server. We had better avoid adding dead code.

commit d9bc5e03d788b958ce8c76e157239953db60adb2
Author: Aakanksha Verma <email address hidden>
Date: Thu May 18 14:31:01 2017 +0530


ef2e51c... by Daniel Bartholomew <email address hidden> on 2017-08-07

bump the VERSION

a346a56... by Vicențiu Ciorbaru on 2017-08-04

Merge branch 'bb-10.0-vicentiu' into 10.0

Includes Percona XtraDB and TokuDB 5.6.36-82.1

d2a1908... by Vicențiu Ciorbaru on 2017-08-04

Disable rpl_tokudb_row_img_* tests

We need to pull rpl config files from MySQL before these tests can be

d85d6c9... by Elena Stepanova on 2017-08-03

Remove extra trailing spaces from the result file

e1aded1... by Elena Stepanova on 2017-08-03

Additions to 10.0.32 unstable test list after TokuDB merge