Last commit made on 2019-02-15
Get this branch:
git clone -b bb-10.4-mdev16188

Branch merges

Branch information


Recent commits

28f18aa... by Sergei Golubchik on 2019-02-15

Merge branch '10.4' into bb-10.4-mdev16188

a44f2c3... by Igor Babaev on 2019-02-15

Merge branch '10.4' into bb-10.4-mdev16188

62c0ac2... by Alexander Barkov on 2019-02-14

A cleanup for MDEV-13916 Enforce check constraint on JSON type

1. Renaming Type_handler_json to Type_handler_json_longtext
   There will be other JSON handlers soon, e.g. Type_handler_json_varchar.

2. Making the code more symmetric for data types:

- Adding a new virtual method
- Moving JSON-specific code from sql_yacc.yy to

3. Adding new files and sql_type_json.h
   and moving Type_handler+JSON related code into these files.

568dd52... by Vladislav Vaintroub on 2019-02-15

MDEV-18592 Warning if temp-file (with "#sql-" prefix) is missing during prepare

e1af460... by Marko Mäkelä on 2019-02-15

MDEV-18579 Assertion !ctx->online || num_fts_index == 0

instant_alter_column_possible(): Add the other MDEV-17459 work-around
condition. The existence of fulltext indexes only prevents instant
DROP COLUMN or changing the order of columns. Other forms of instant
ALTER TABLE are no problem.

Before commit 4e7ee166a9c76eb3546356aabfd2dbc759671cd0 that merged
the MDEV-18295 fix from 10.3, the work-around of MDEV-17459 in
instant_alter_column_possible() was categorically refusing any
ALGORITHM=INSTANT if any FULLTEXT INDEX was present. After that commit,
a related condition was only present in prepare_inplace_alter_table_dict()
but not in the other callers of instant_alter_column_possible().

2b92184... by Marko Mäkelä on 2019-02-15

Merge 10.3 into 10.4

dcaabf0... by Jan Lindström on 2019-02-15

MDEV-18109: Galera 4: run galera_sr test suite

Fix some of the galera_sr suite test failures.
Remove tests that are not going to be run because required
feature is not supported.

 modified: mysql-test/suite/galera_sr/disabled.def
 deleted: mysql-test/suite/galera_sr/r/GCF-574.result
 modified: mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result
 modified: mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result
 modified: mysql-test/suite/galera_sr/r/galera_sr_load_data.result
 deleted: mysql-test/suite/galera_sr/r/galera_sr_sbr.result
 modified: mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result
 deleted: mysql-test/suite/galera_sr/r/mysql-wsrep-features#29.result
 deleted: mysql-test/suite/galera_sr/t/GCF-574.test
 modified: mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test
 modified: mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.cnf
 modified: mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test
 modified: mysql-test/suite/galera_sr/t/galera_sr_load_data.test
 deleted: mysql-test/suite/galera_sr/t/galera_sr_sbr.test
 modified: mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test
 deleted: mysql-test/suite/galera_sr/t/mysql-wsrep-features#29.test

294b8c4... by Igor Babaev on 2019-02-15

Merge branch '10.4' into bb-10.4-mdev16188

e17fc72... by Marko Mäkelä on 2019-02-15

MDEV-15564: Fix bool/ibool type mismatch

dtype_is_string_type(), dtype_is_binary_string_type(),
dtype_is_non_binary_string_type(): Define as inline functions that
return bool, not ibool.

10c05d4... by Marko Mäkelä on 2019-02-15

MDEV-15564: Fix the non-debug build