diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-05 11:41:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-05 11:41:03 +0300 |
| commit | 02d9b048a2ab549a3227a81e15ff2f8c45562a65 (patch) | |
| tree | 63501637d9f13946439b069611f0db6e806744c4 /storage/innobase/handler | |
| parent | 5da6944ea3a592efefd1adc33b1280ad1de66688 (diff) | |
| parent | d5a2bc6a0f24f2a9ec73a0d18bb7e6fba3496bed (diff) | |
| download | mariadb-git-02d9b048a2ab549a3227a81e15ff2f8c45562a65.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/handler')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9e6d1a35536..828773fe761 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -13008,10 +13008,8 @@ inline int ha_innobase::delete_table(const char* name, enum_sql_command sqlcom) err = row_drop_database_for_mysql(norm_name, trx, &num_partitions); norm_name[len] = 0; - if (num_partitions == 0 - && !row_is_mysql_tmp_table_name(norm_name)) { - table_name_t tbl_name; - tbl_name.m_name = norm_name; + table_name_t tbl_name(norm_name); + if (num_partitions == 0 && !tbl_name.is_temporary()) { ib::error() << "Table " << tbl_name << " does not exist in the InnoDB" " internal data dictionary though MariaDB is" @@ -14444,7 +14442,7 @@ ha_innobase::optimize( push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, uint(err), "InnoDB: Cannot defragment table %s: returned error code %d\n", - m_prebuilt->table->name, err); + m_prebuilt->table->name.m_name, err); if(err == ER_SP_ALREADY_EXISTS) { try_alter = false; diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 6b99d91532e..ad8d065de90 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -9426,13 +9426,11 @@ innobase_update_foreign_cache( fk_tables.front(), true, DICT_ERR_IGNORE_NONE); if (table == NULL) { - table_name_t table_name; - table_name.m_name = const_cast<char*>( - fk_tables.front()); - err = DB_TABLE_NOT_FOUND; ib::error() - << "Failed to load table '" << table_name + << "Failed to load table '" + << table_name_t(const_cast<char*> + (fk_tables.front())) << "' which has a foreign key constraint with" << " table '" << user_table->name << "'."; break; |