summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorsvoj@mysql.com/april.(none) <>2006-09-20 01:40:59 +0500
committersvoj@mysql.com/april.(none) <>2006-09-20 01:40:59 +0500
commitc0ebc0fb2ab02470c9e715386e3dd32db8c33114 (patch)
treedd33b5bc922fdbbd7b0aba0317f1fa251a8787e2 /sql/share
parent43097593e36c32bc5eac2befb0a9133194feb882 (diff)
downloadmariadb-git-c0ebc0fb2ab02470c9e715386e3dd32db8c33114.tar.gz
BUG#10974 - No error message if merge table based on union of innodb, memory
Fixed confusing error message from the storage engine when it fails to open underlying table. The error message is issued when a table is _opened_ (not when it is created).
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/english/errmsg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 300f3c6edfd..a8b06a07218 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -184,7 +184,7 @@ character-set=latin1
"INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES",
"Incorrect column name '%-.100s'",
"The used storage engine can't index column '%-.64s'",
-"All tables in the MERGE table are not identically defined",
+"Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists",
"Can't write, because of unique constraint, to table '%-.64s'",
"BLOB/TEXT column '%-.64s' used in key specification without a key length",
"All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead",