mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql/share
History
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
..
charsets MDEV-9711 NO PAD collations 2016-09-06 12:50:02 +04:00
CMakeLists.txt Support for server error messages in Hindi. 2017-08-03 15:40:23 +04:00
errmsg-utf8.txt Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-08-07 21:35:34 +04:00