summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
commit22fe8e10e297c40bc88104fb6a13e5183238850e (patch)
tree76a0977cebe3775f61ae3281cc608601eb883243 /sql/item_func.h
parenta4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff)
parentcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff)
downloadmariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index fdbbff89e60..628878bcaed 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1,3 +1,6 @@
+#ifndef ITEM_FUNC_INCLUDED
+#define ITEM_FUNC_INCLUDED
+
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -1718,3 +1721,4 @@ public:
bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
};
+#endif /* ITEM_FUNC_INCLUDED */