mariadb/mysql-test/suite/sys_vars
Alexey Botchkov 1a9e13d622 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
	sql/item_cmpfunc.cc
	storage/innobase/buf/buf0flu.cc
	storage/innobase/include/ut0stage.h
	storage/innobase/row/row0upd.cc
2017-08-11 10:58:23 +04:00
..
inc bugfix: compile InnoDB w/o P_S 2016-12-12 20:27:23 +01:00
r Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-08-11 10:58:23 +04:00
t Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-04 15:31:25 +04:00
disabled.def MDEV-11454 post-merge fix: 2017-02-24 22:12:01 +02:00