diff options
| author | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 14:20:15 +0700 |
|---|---|---|
| committer | Dmitry Shulga <Dmitry.Shulga@oracle.com> | 2011-06-10 14:20:15 +0700 |
| commit | 2d715ba6042cc8e1ad5114c25070aa8d18095246 (patch) | |
| tree | 1baeecb0b58bae9ae8a41c5f81245e2b8037b411 /sql/share | |
| parent | 155df6c6574bbc23f8458ea958b838c02cd263d7 (diff) | |
| parent | 1fea8c1b9070018be12f9c748fec781322944d7c (diff) | |
| download | mariadb-git-2d715ba6042cc8e1ad5114c25070aa8d18095246.tar.gz | |
Manual-merge of patch for bug#11753738 from mysql-5.1 tree.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 09620f2d260..b8f46f090ab 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6408,3 +6408,10 @@ WARN_OPTION_BELOW_LIMIT ER_INDEX_COLUMN_TOO_LONG eng "Index column size too large. The maximum column size is %lu bytes." + +ER_ERROR_IN_TRIGGER_BODY + eng "Trigger '%-.64s' has an error in its body: '%-.256s'" + +ER_ERROR_IN_UNKNOWN_TRIGGER_BODY + eng "Unknown trigger has an error in its body: '%-.256s'" + |