diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 11:22:40 +0300 |
commit | 860e754349646fb8ec8e9231a7fc09a5d4b7c247 (patch) | |
tree | d66c4b8a3c96e8e0d6e6ad9dfb12cdca750eb754 /storage/innobase/fts | |
parent | 71e1ddda220c2d452351fc6bf240cb0bad6ccf4a (diff) | |
parent | 365cd08345ab759308cfcac663a2a5880c0c33cb (diff) | |
download | mariadb-git-860e754349646fb8ec8e9231a7fc09a5d4b7c247.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/fts')
-rw-r--r-- | storage/innobase/fts/fts0fts.cc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index 515abf94060..050c8eb7d23 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -1750,15 +1750,14 @@ fts_create_one_common_table( error = row_create_index_for_mysql(index, trx, NULL, FIL_ENCRYPTION_DEFAULT, FIL_DEFAULT_ENCRYPTION_KEY); + if (error == DB_SUCCESS) { + return new_table; + } } - if (error != DB_SUCCESS) { - dict_mem_table_free(new_table); - new_table = NULL; - ib::warn() << "Failed to create FTS common table " - << fts_table_name; - } - return(new_table); + ib::warn() << "Failed to create FTS common table " << fts_table_name; + trx->error_state = error; + return NULL; } /** Creates the common auxiliary tables needed for supporting an FTS index @@ -1813,7 +1812,8 @@ fts_create_common_tables( dict_table_t* common_table = fts_create_one_common_table( trx, table, full_name[i], fts_table.suffix, heap); - if (common_table == NULL) { + if (!common_table) { + trx->error_state = DB_SUCCESS; error = DB_ERROR; goto func_exit; } @@ -1928,16 +1928,15 @@ fts_create_one_index_table( error = row_create_index_for_mysql(index, trx, NULL, FIL_ENCRYPTION_DEFAULT, FIL_DEFAULT_ENCRYPTION_KEY); - } - if (error != DB_SUCCESS) { - dict_mem_table_free(new_table); - new_table = NULL; - ib::warn() << "Failed to create FTS index table " - << table_name; + if (error == DB_SUCCESS) { + return new_table; + } } - return(new_table); + ib::warn() << "Failed to create FTS index table " << table_name; + trx->error_state = error; + return NULL; } /** Creates the column specific ancillary tables needed for supporting an |