mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.0 into 10.1

Browse source 
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:

recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).

Report progress also via systemd using sd_notifyf().
This commit is contained in:
Marko Mäkelä 2017-03-08 19:44:22 +02:00
commit ad0c218a44
338 changed files with 11297 additions and 5856 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storage/xtradb/dict/dict0dict.cc
View file

@ -6214,7 +6214,6 @@ dict_set_corrupted(
row_mysql_lock_data_dictionary(trx);
}
ut_ad(index);
ut_ad(mutex_own(&dict_sys->mutex));
ut_ad(!dict_table_is_comp(dict_sys->sys_tables));
ut_ad(!dict_table_is_comp(dict_sys->sys_indexes));