summaryrefslogtreecommitdiff
path: root/sql/field.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/field.h
parenta4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff)
parentcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff)
downloadmariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h
index ee8f4c2e636..255be8c824a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1,3 +1,6 @@
+#ifndef FIELD_INCLUDED
+#define FIELD_INCLUDED
+
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -2189,3 +2192,5 @@ int set_field_to_null_with_conversions(Field *field, bool no_conversions);
#define f_no_default(x) (x & FIELDFLAG_NO_DEFAULT)
#define f_bit_as_char(x) ((x) & FIELDFLAG_TREAT_BIT_AS_CHAR)
#define f_is_hex_escape(x) ((x) & FIELDFLAG_HEX_ESCAPE)
+
+#endif /* FIELD_INCLUDED */