Monty e9a2082634 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext ... Conflicts: mysql-test/r/cte_nonrecursive.result mysql-test/suite/galera/r/galera_bf_abort.result mysql-test/suite/galera/r/galera_bf_abort_get_lock.result mysql-test/suite/galera/r/galera_bf_abort_sleep.result mysql-test/suite/galera/r/galera_enum.result mysql-test/suite/galera/r/galera_fk_conflict.result mysql-test/suite/galera/r/galera_insert_multi.result mysql-test/suite/galera/r/galera_many_indexes.result mysql-test/suite/galera/r/galera_mdl_race.result mysql-test/suite/galera/r/galera_nopk_bit.result mysql-test/suite/galera/r/galera_nopk_blob.result mysql-test/suite/galera/r/galera_nopk_large_varchar.result mysql-test/suite/galera/r/galera_nopk_unicode.result mysql-test/suite/galera/r/galera_pk_bigint_signed.result mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result mysql-test/suite/galera/r/galera_serializable.result mysql-test/suite/galera/r/galera_toi_drop_database.result mysql-test/suite/galera/r/galera_toi_lock_exclusive.result mysql-test/suite/galera/r/galera_toi_truncate.result mysql-test/suite/galera/r/galera_unicode_pk.result mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result mysql-test/suite/galera/r/galera_wsrep_log_conficts.result sql/field.cc sql/rpl_gtid.cc sql/share/errmsg-utf8.txt sql/sql_acl.cc sql/sql_parse.cc sql/sql_partition_admin.cc sql/sql_prepare.cc sql/sql_repl.cc sql/sql_table.cc sql/sql_yacc.yy		2018-01-05 16:52:40 +02:00
..
trx0i_s.cc	InnoDB: Remove ut_snprintf() and the use of my_snprintf(); use snprintf()	2017-11-13 02:11:48 +02:00
trx0purge.cc	MDEV-14422 Assertion failure in trx_purge_run() on shutdown	2017-12-13 14:17:26 +02:00
trx0rec.cc	Merge 10.2 into bb-10.2-ext	2018-01-03 15:48:47 +02:00
trx0roll.cc	Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext	2018-01-05 16:52:40 +02:00
trx0rseg.cc	Merge 10.1 into 10.2	2017-06-08 12:45:08 +03:00
trx0sys.cc	Merge remote-tracking branch 'origin/10.1' into 10.2	2017-12-22 12:23:39 +02:00
trx0trx.cc	Follow-up fix to MDEV-13201 Assertion srv_undo_sources || ... failed on shutdown during DDL operation	2017-12-06 18:52:28 +02:00
trx0undo.cc	Merge 10.1 into 10.2	2017-12-14 08:40:01 +02:00