Merge branch '10.0' into 10.0-galera

This commit is contained in:
Nirbhay Choubey 2016-04-29 16:50:58 -04:00
commit 8a1efa1bdd
367 changed files with 4212 additions and 1393 deletions

View file

@ -1107,7 +1107,7 @@ dict_init(void)
&dict_operation_lock, SYNC_DICT_OPERATION);
if (!srv_read_only_mode) {
dict_foreign_err_file = os_file_create_tmpfile();
dict_foreign_err_file = os_file_create_tmpfile(NULL);
ut_a(dict_foreign_err_file);
mutex_create(dict_foreign_err_mutex_key,