Alexander Barkov 988a9daa94 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext ...

Conflicts:
	mysql-test/r/func_json.result
	mysql-test/r/win.result
	mysql-test/t/func_json.test
	mysql-test/t/win.test
	sql/share/errmsg-utf8.txt
	storage/rocksdb/ha_rocksdb.cc
	storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result

2017-08-07 21:35:34 +04:00

47 KiB

Raw Blame History

View Raw