summaryrefslogtreecommitdiff
path: root/sql/log_event.h
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 /sql/log_event.h
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 'sql/log_event.h')
-rw-r--r--sql/log_event.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 24a08ae107c..be63304b529 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1,4 +1,5 @@
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+ 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
@@ -551,7 +552,7 @@ struct sql_ex_info
/* Shouldn't be defined before */
#define EXPECTED_OPTIONS \
- ((ULL(1) << 14) | (ULL(1) << 26) | (ULL(1) << 27) | (ULL(1) << 19))
+ ((1ULL << 14) | (1ULL << 26) | (1ULL << 27) | (1ULL << 19))
#if OPTIONS_WRITTEN_TO_BIN_LOG != EXPECTED_OPTIONS
#error OPTIONS_WRITTEN_TO_BIN_LOG must NOT change their values!