summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler/handler0alter.cc
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2018-12-29 20:44:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-29 22:57:05 +0200
commit802ce9672ff630bbef08235e0e39bf599075f985 (patch)
tree44e645c1bf25a79c4f70f1f433442ef9a3996c1d /storage/xtradb/handler/handler0alter.cc
parentb74eb5a5feb41164f7e5cab986cf203537c2128a (diff)
downloadmariadb-git-802ce9672ff630bbef08235e0e39bf599075f985.tar.gz
MDEV-18041 Database corruption after renaming a prefix-indexed column
This is a regression after MDEV-13671. The bug is related to key part prefix lengths wich are stored in SYS_FIELDS. Storage format is not obvious and was handled incorrectly which led to data dictionary corruption. SYS_FIELDS.POS actually contains prefix length too in case if any key part has prefix length. innobase_rename_column_try(): fixed prefixes handling Tests for prefixed indexes added too. Closes #1063
Diffstat (limited to 'storage/xtradb/handler/handler0alter.cc')
-rw-r--r--storage/xtradb/handler/handler0alter.cc32
1 files changed, 18 insertions, 14 deletions
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
index 9508adbbd12..bdec9a076ac 100644
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -4547,36 +4547,40 @@ err_exit:
index != NULL;
index = dict_table_get_next_index(index)) {
+ bool has_prefixes = false;
+ for (size_t i = 0; i < dict_index_get_n_fields(index); i++) {
+ if (dict_index_get_nth_field(index, i)->prefix_len) {
+ has_prefixes = true;
+ break;
+ }
+ }
+
for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
- if (my_strcasecmp(
- system_charset_info,
- dict_index_get_nth_field(index, i)->name,
- from)) {
+ const dict_field_t* field
+ = dict_index_get_nth_field(index, i);
+ if (my_strcasecmp(system_charset_info, field->name,
+ from)) {
continue;
}
info = pars_info_create();
+ int pos = i;
+ if (has_prefixes) {
+ pos = (pos << 16) + field->prefix_len;
+ }
+
pars_info_add_ull_literal(info, "indexid", index->id);
- pars_info_add_int4_literal(info, "nth", i);
+ pars_info_add_int4_literal(info, "nth", pos);
pars_info_add_str_literal(info, "new", to);
error = que_eval_sql(
info,
"PROCEDURE RENAME_SYS_FIELDS_PROC () IS\n"
"BEGIN\n"
-
"UPDATE SYS_FIELDS SET COL_NAME=:new\n"
"WHERE INDEX_ID=:indexid\n"
"AND POS=:nth;\n"
-
- /* Try again, in case there is a prefix_len
- encoded in SYS_FIELDS.POS */
-
- "UPDATE SYS_FIELDS SET COL_NAME=:new\n"
- "WHERE INDEX_ID=:indexid\n"
- "AND POS>=65536*:nth AND POS<65536*(:nth+1);\n"
-
"END;\n",
FALSE, trx);