summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2008-12-04 02:36:55 +0200
committerMichael Widenius <monty@mysql.com>2008-12-04 02:36:55 +0200
commitd83f6470243057fdd542bed0410dcabe09766713 (patch)
tree982a6bdd41bd78853cdbbbd0f307330272374c36 /sql/item_create.cc
parentfb68158856f8d74372c8fa0c14553cd18dc9811b (diff)
downloadmariadb-git-d83f6470243057fdd542bed0410dcabe09766713.tar.gz
Fixed warnings and errors discovered by pushbuild2
mysys/my_init.c: Fixed link error when compiling without thread support sql/item_create.cc: Fixed compiler warning sql/mysqld.cc: Fixed compile error on windows sql/protocol.cc: Fixed compiler warning sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning storage/myisam/mi_open.c: Fixed compiler warning storage/myisammrg/ha_myisammrg.cc: Fixed compiler warning (shadow variable)
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 349c47816ad..4a440c00da5 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -5118,7 +5118,7 @@ create_func_cast(THD *thd, Item *a, Cast_target cast_type,
CHARSET_INFO *real_cs= (cs ? cs : thd->variables.collation_connection);
if (c_len == NULL)
{
- len= LL(-1);
+ len= (ulong) -1L;
}
else
{