summaryrefslogtreecommitdiff
path: root/storage/innobase/row
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2022-01-21 16:51:03 +0300
committerEugene Kosov <claprix@yandex.ru>2022-01-21 20:25:56 +0300
commitfaaecc8fcfa922df3b9c33ec96f4998ffee4b0a6 (patch)
treed40cf5daadb7bb2587ba6ff69c06dc01d8b16a96 /storage/innobase/row
parent991d5dce323c4e22357f614afc1b9dfed4000567 (diff)
downloadmariadb-git-faaecc8fcfa922df3b9c33ec96f4998ffee4b0a6.tar.gz
MDEV-27273 Confusing column count in IMPORT TABLESPACE error messagebb-10.2-MDEV-27273-import-column-check
It's misleading to compare and write to user number of columns and fields. Thus, it would be better to remove that check and let use see a subsequent error message about missing or mispaced column. row_import::match_schema(): remove misleading check
Diffstat (limited to 'storage/innobase/row')
-rw-r--r--storage/innobase/row/row0import.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index b7f73bc8e19..37a12b13bd1 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -1321,14 +1321,6 @@ uncompressed:
m_table->flags, m_flags, msg);
return(DB_ERROR);
- } else if (m_table->n_cols != m_n_cols) {
- ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_TABLE_SCHEMA_MISMATCH,
- "Number of columns don't match, table has %u "
- "columns but the tablespace meta-data file has "
- ULINTPF " columns",
- m_table->n_cols, m_n_cols);
-
- return(DB_ERROR);
} else if (UT_LIST_GET_LEN(m_table->indexes) != m_n_indexes) {
/* If the number of indexes don't match then it is better