summaryrefslogtreecommitdiff
path: root/sql/my_decimal.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-11-08 17:37:19 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 16:09:34 +0100
commit227510e039b4ec6bff3096a4b9b39847551dab1a (patch)
tree2c40cbba45ca53e688d3f5cd388dbcd032c82984 /sql/my_decimal.h
parentd1522af72dad1965b8a8a37415545014ba743f49 (diff)
downloadmariadb-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/my_decimal.h')
-rw-r--r--sql/my_decimal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index fa85b41d70c..a2cce862f1a 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -486,7 +486,7 @@ int my_decimal_intg(const my_decimal *a)
}
-void my_decimal_trim(ulong *precision, uint *scale);
+void my_decimal_trim(ulonglong *precision, uint *scale);
#endif /*my_decimal_h*/