diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-11-08 17:37:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-04 16:09:34 +0100 |
| commit | 227510e039b4ec6bff3096a4b9b39847551dab1a (patch) | |
| tree | 2c40cbba45ca53e688d3f5cd388dbcd032c82984 /sql/share | |
| parent | d1522af72dad1965b8a8a37415545014ba743f49 (diff) | |
| download | mariadb-git-227510e039b4ec6bff3096a4b9b39847551dab1a.tar.gz | |
parser cleanup: don't store field properties in LEX, use Create_field directly
length/dec/charset are still in LEX, because they're also used
for CAST and dynamic columns.
also
1. fix "MDEV-7041 COLLATION(CAST('a' AS CHAR BINARY)) returns a wrong result"
2. allow BINARY modifier in stored function RETURN clause
3. allow "COLLATION without CHARSET" in SP/SF (parameters, RETURN, DECLARE)
4. print correct variable name in error messages for stored routine parameters
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 2bc7bb1c7a7..653f053ba38 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5472,8 +5472,8 @@ ER_TOO_BIG_SCALE 42000 S1009 eng "Too big scale %u specified for '%-.192s'. Maximum is %lu." ger "Zu großer Skalierungsfaktor %u für '%-.192s' angegeben. Maximum ist %lu" ER_TOO_BIG_PRECISION 42000 S1009 - eng "Too big precision %u specified for '%-.192s'. Maximum is %lu." - ger "Zu große Genauigkeit %u für '%-.192s' angegeben. Maximum ist %lu" + eng "Too big precision %llu specified for '%-.192s'. Maximum is %u." + ger "Zu große Genauigkeit %llu für '%-.192s' angegeben. Maximum ist %u" ER_M_BIGGER_THAN_D 42000 S1009 eng "For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.192s')." ger "Für FLOAT(M,D), DOUBLE(M,D) oder DECIMAL(M,D) muss M >= D sein (Feld '%-.192s')" |