summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-04-01 15:04:50 +0300
committermonty@mysql.com <>2005-04-01 15:04:50 +0300
commit201ee3eb78da55c72c627c6aa09a51899e31c4a7 (patch)
tree7920c948db7d0f2174fb24ba26cd648144fa4850 /sql/item_sum.cc
parente9205dc0f0f6e5dcc184a9e71fb85e9eec51a8a8 (diff)
downloadmariadb-git-201ee3eb78da55c72c627c6aa09a51899e31c4a7.tar.gz
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912) ALTER TABLE now fails in STRICT mode if it generates warnings. Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 3dbc3833f9e..66b64128dab 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2966,8 +2966,7 @@ bool Item_func_group_concat::setup(THD *thd)
DBUG_RETURN(TRUE);
if (item->const_item())
{
- (void) item->val_int();
- if (item->null_value)
+ if (item->is_null())
{
always_null= 1;
DBUG_RETURN(FALSE);