From 17980e35fafdf0b05c89c11ecafbea96e1cfc5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 19 Aug 2021 12:05:02 +0300 Subject: [PATCH] MDEV-26439 Typo in Foreign Key error message foreign_push_index_error(): Fix a typo of 'match' that was introduced in commit 5130f5206c150ba1e8a723aae63884ff64408012 (MDEV-20480). Thanks to Oli Sennhauser for reporting this. --- mysql-test/suite/innodb/r/innodb-fk-warnings.result | 2 +- storage/innobase/handler/ha_innodb.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-fk-warnings.result b/mysql-test/suite/innodb/r/innodb-fk-warnings.result index 99b16dc1e9c..c85dcf22c06 100644 --- a/mysql-test/suite/innodb/r/innodb-fk-warnings.result +++ b/mysql-test/suite/innodb/r/innodb-fk-warnings.result @@ -129,7 +129,7 @@ create table t2(a char(20), key(a), foreign key(a) references t1(f1)) engine=inn ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") show warnings; Level Code Message -Warning 150 Create table `test`.`t2` with foreign key (a) constraint failed. Field type or character set for column 'a' does not mach referenced column 'f1'. +Warning 150 Create table `test`.`t2` with foreign key (a) constraint failed. Field type or character set for column 'a' does not match referenced column 'f1'. Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") Warning 1215 Cannot add foreign key constraint for `t2` drop table t1; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index d61624a5e37..a91f233e62f 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -11939,7 +11939,7 @@ foreign_push_index_error(trx_t* trx, const char* operation, trx, DB_CANNOT_ADD_CONSTRAINT, create_name, "%s table %s with foreign key %s constraint" " failed. Field type or character set for column '%s' " - "does not mach referenced column '%s'.", + "does not match referenced column '%s'.", operation, create_name, fk_text, columns[err_col], col_name); return;