diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
| commit | ac7ba1bcaac891b046ad028e035487da44448eeb (patch) | |
| tree | 76a0977cebe3775f61ae3281cc608601eb883243 /sql/field.h | |
| parent | f89b2496ffdf96d1d4b32099d38ce0565ac1d93a (diff) | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| download | mariadb-git-ac7ba1bcaac891b046ad028e035487da44448eeb.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 5 |
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 */ |