Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source

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

...

This commit is contained in:

Alexander Barkov

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

parent 0f1cadd9a5 30c36b2c15

commit 988a9daa94

250 changed files with 14356 additions and 2704 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1201

storage/rocksdb/rdb_datadic.cc

File diff suppressed because it is too large Load Diff