summaryrefslogtreecommitdiff
path: root/mysys/typelib.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-07 14:00:16 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-07 14:00:16 +0200
commit4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500 (patch)
treefbc0352dd0f6bf00d934e96e6b3af99a1cfe0b2c /mysys/typelib.c
parentef5241ae05b0f1bdf3668b4f0876bf0b4fe309a0 (diff)
downloadmariadb-git-4ec6fe10e56de0cf9b4dbc649b8552ae39c2c500.tar.gz
remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
Diffstat (limited to 'mysys/typelib.c')
-rw-r--r--mysys/typelib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 402d108e51c..a332adf6af5 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -1,4 +1,5 @@
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -218,7 +219,7 @@ my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
x++;
if ((find= find_type(i, lib, FIND_TYPE_COMMA_TERM) - 1) < 0)
DBUG_RETURN(0);
- result|= (ULL(1) << find);
+ result|= (1ULL << find);
}
*err= 0;
DBUG_RETURN(result);