mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
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
..
archive Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00
blackhole Added "const" to new data for handler::update_row() 2017-04-18 12:23:53 +03:00
cassandra Changing field::field_name and Item::name to LEX_CSTRING 2017-04-23 22:35:46 +03:00
connect Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-19 14:45:54 +04:00
csv Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
example Changing field::field_name and Item::name to LEX_CSTRING 2017-04-23 22:35:46 +03:00
federated Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
federatedx Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
heap Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
innobase Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-08-07 21:35:34 +04:00
maria Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00
mroonga Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00
myisam Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-07 12:43:10 +04:00
myisammrg Postfix for MDEV-12619 - test results adjusted 2017-07-18 13:51:12 +03:00
oqgraph Changing field::field_name and Item::name to LEX_CSTRING 2017-04-23 22:35:46 +03:00
perfschema Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
rocksdb Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-08-07 21:35:34 +04:00
sequence Changing field::field_name and Item::name to LEX_CSTRING 2017-04-23 22:35:46 +03:00
sphinx Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-06-15 15:27:11 +04:00
spider Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00
test_sql_discovery store/show vcols as item->print() 2016-12-12 20:35:41 +01:00
tokudb Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00
xtradb Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-07-12 22:54:49 +04:00