summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-07-08 19:38:26 +0200
committerSergei Golubchik <sergii@pisem.net>2014-07-08 19:38:26 +0200
commitca2ba2291af7e93893febed414e2ae98a5abd543 (patch)
treea081b1b1e70dff70cf5855c841f03e8637b46d5e /sql/share
parent65f85264a4c5319ee161545f60de99468b2382e5 (diff)
downloadmariadb-git-ca2ba2291af7e93893febed414e2ae98a5abd543.tar.gz
MDEV-6224 Incorrect information in file when *.frm is > 256K
Reject huge frms at CREATE TABLE, not when it - successfully written - is being opened. Also raise the frm size limit from 256K to 512K
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 259c0c5e1ed..76cf33c231f 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7109,3 +7109,5 @@ ER_IT_IS_A_VIEW 42S02
eng "'%-.192s' is a view"
ER_SLAVE_SKIP_NOT_IN_GTID
eng "When using GTID, @@sql_slave_skip_counter can not be used. Instead, setting @@gtid_slave_pos explicitly can be used to skip to after a given GTID position."
+ER_TABLE_DEFINITION_TOO_BIG
+ eng "The definition for table %`s is too big"