Commit d13fbc62 authored by Marko Mäkelä's avatar Marko Mäkelä

Remove code related to InnoDB native partitioning in MySQL 5.7

row_rename_partitions_for_mysql(): Remove. This should only be relevant
in an upgrade into MySQL 5.7, which has InnoDB native partitioning.
parent d57b2430
...@@ -13762,26 +13762,6 @@ innobase_rename_table( ...@@ -13762,26 +13762,6 @@ innobase_rename_table(
error = row_rename_table_for_mysql(norm_from, norm_to, trx, TRUE); error = row_rename_table_for_mysql(norm_from, norm_to, trx, TRUE);
if (error == DB_TABLE_NOT_FOUND) {
/* May be partitioned table, which consists of partitions
named table_name#P#partition_name[#SP#subpartition_name].
We are doing a DDL operation. */
++trx->will_lock;
trx_set_dict_operation(trx, TRX_DICT_OP_INDEX);
trx_start_if_not_started(trx, true);
error = row_rename_partitions_for_mysql(norm_from, norm_to,
trx);
if (error == DB_TABLE_NOT_FOUND) {
ib::error() << "Table " << ut_get_name(trx, norm_from)
<< " does not exist in the InnoDB internal"
" data dictionary though MariaDB is trying to"
" rename the table. Have you copied the .frm"
" file of the table to the MariaDB database"
" directory from another database? "
<< TROUBLESHOOTING_MSG;
}
}
if (error != DB_SUCCESS) { if (error != DB_SUCCESS) {
if (error == DB_TABLE_NOT_FOUND if (error == DB_TABLE_NOT_FOUND
&& innobase_get_lower_case_table_names() == 1) { && innobase_get_lower_case_table_names() == 1) {
......
...@@ -494,18 +494,6 @@ row_rename_table_for_mysql( ...@@ -494,18 +494,6 @@ row_rename_table_for_mysql(
bool commit) /*!< in: whether to commit trx */ bool commit) /*!< in: whether to commit trx */
MY_ATTRIBUTE((nonnull, warn_unused_result)); MY_ATTRIBUTE((nonnull, warn_unused_result));
/** Renames a partitioned table for MySQL.
@param[in] old_name Old table name.
@param[in] new_name New table name.
@param[in,out] trx Transaction.
@return error code or DB_SUCCESS */
dberr_t
row_rename_partitions_for_mysql(
const char* old_name,
const char* new_name,
trx_t* trx)
MY_ATTRIBUTE((nonnull, warn_unused_result));
/*********************************************************************//** /*********************************************************************//**
Scans an index for either COOUNT(*) or CHECK TABLE. Scans an index for either COOUNT(*) or CHECK TABLE.
If CHECK TABLE; Checks that the index contains entries in an ascending order, If CHECK TABLE; Checks that the index contains entries in an ascending order,
......
...@@ -4837,59 +4837,6 @@ row_rename_table_for_mysql( ...@@ -4837,59 +4837,6 @@ row_rename_table_for_mysql(
return(err); return(err);
} }
/** Renames a partitioned table for MySQL.
@param[in] old_name Old table name.
@param[in] new_name New table name.
@param[in,out] trx Transaction.
@return error code or DB_SUCCESS */
dberr_t
row_rename_partitions_for_mysql(
const char* old_name,
const char* new_name,
trx_t* trx)
{
char from_name[FN_REFLEN];
char to_name[FN_REFLEN];
ulint from_len = strlen(old_name);
ulint to_len = strlen(new_name);
char* table_name;
dberr_t error = DB_TABLE_NOT_FOUND;
ut_a(from_len < (FN_REFLEN - 4));
ut_a(to_len < (FN_REFLEN - 4));
memcpy(from_name, old_name, from_len);
from_name[from_len] = '#';
from_name[from_len + 1] = 0;
while ((table_name = dict_get_first_table_name_in_db(from_name))) {
ut_a(memcmp(table_name, from_name, from_len) == 0);
/* Must match #[Pp]#<partition_name> */
if (strlen(table_name) <= (from_len + 3)
|| table_name[from_len] != '#'
|| table_name[from_len + 2] != '#'
|| (table_name[from_len + 1] != 'P'
&& table_name[from_len + 1] != 'p')) {
ut_ad(0);
ut_free(table_name);
continue;
}
memcpy(to_name, new_name, to_len);
memcpy(to_name + to_len, table_name + from_len,
strlen(table_name) - from_len + 1);
error = row_rename_table_for_mysql(table_name, to_name,
trx, false);
if (error != DB_SUCCESS) {
/* Rollback and return. */
trx_rollback_for_mysql(trx);
ut_free(table_name);
return(error);
}
ut_free(table_name);
}
trx_commit_for_mysql(trx);
return(error);
}
/*********************************************************************//** /*********************************************************************//**
Scans an index for either COUNT(*) or CHECK TABLE. Scans an index for either COUNT(*) or CHECK TABLE.
If CHECK TABLE; Checks that the index contains entries in an ascending order, If CHECK TABLE; Checks that the index contains entries in an ascending order,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment