database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-11-14 14:49:20 +02:00
parent c454b8964c 89ae01fd00
commit ae90f8431b
49 changed files with 1040 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/row/row0mysql.cc
View File

@@ -2557,8 +2557,7 @@ row_create_index_for_mysql(
} else {
dict_build_index_def(table, index, trx);
err = dict_index_add_to_cache(
index, FIL_NULL, trx_is_strict(trx));
err = dict_index_add_to_cache(index, FIL_NULL);
ut_ad((index == NULL) == (err != DB_SUCCESS));
if (UNIV_LIKELY(err == DB_SUCCESS)) {
ut_ad(!index->is_instant());