summaryrefslogtreecommitdiff
path: root/sql/item.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
commitac7ba1bcaac891b046ad028e035487da44448eeb (patch)
tree76a0977cebe3775f61ae3281cc608601eb883243 /sql/item.h
parentf89b2496ffdf96d1d4b32099d38ce0565ac1d93a (diff)
parent273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff)
downloadmariadb-git-ac7ba1bcaac891b046ad028e035487da44448eeb.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index b3234ae0120..bb7ef73a5e2 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1,3 +1,6 @@
+#ifndef ITEM_INCLUDED
+#define ITEM_INCLUDED
+
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -3152,3 +3155,5 @@ extern Cached_item *new_Cached_item(THD *thd, Item *item);
extern Item_result item_cmp_type(Item_result a,Item_result b);
extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item);
extern int stored_field_cmp_to_item(Field *field, Item *item);
+
+#endif /* ITEM_INCLUDED */