WL#5016: Fix header file include guards

Adding header include file guards to files that are missing such.
16 years ago · d47710c8dc
83 changed files with 377 additions and 6 deletions
--- a/client/my_readline.h
+++ b/client/my_readline.h
@ -1,3 +1,6 @@
+#ifndef CLIENT_MY_READLINE_INCLUDED
+#define CLIENT_MY_READLINE_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -31,3 +34,5 @@ extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);
 extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
 extern char *batch_readline(LINE_BUFFER *buffer, bool *truncated);
 extern void batch_readline_end(LINE_BUFFER *buffer);
+
+#endif /* CLIENT_MY_READLINE_INCLUDED */
--- a/client/sql_string.h
+++ b/client/sql_string.h
@ -1,3 +1,6 @@
+#ifndef CLIENT_SQL_STRING_INCLUDED
+#define CLIENT_SQL_STRING_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -353,3 +356,5 @@ public:
    return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
  }
 };
+
+#endif /* CLIENT_SQL_STRING_INCLUDED */
--- a/include/atomic/gcc_builtins.h
+++ b/include/atomic/gcc_builtins.h
@ -1,3 +1,6 @@
+#ifndef ATOMIC_GCC_BUILTINS_INCLUDED
+#define ATOMIC_GCC_BUILTINS_INCLUDED
+
 /* Copyright (C) 2008 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -31,3 +34,5 @@
 #define make_atomic_store_body(S)                   \
  (void) __sync_lock_test_and_set(a, v);
 #endif
+
+#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */
--- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h
@ -1,3 +1,6 @@
+#ifndef ATOMIC_NOLOCK_INCLUDED
+#define ATOMIC_NOLOCK_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -42,3 +45,4 @@ typedef struct { } my_atomic_rwlock_t;

 #endif

+#endif /* ATOMIC_NOLOCK_INCLUDED */
--- a/include/atomic/rwlock.h
+++ b/include/atomic/rwlock.h
@ -1,3 +1,6 @@
+#ifndef ATOMIC_RWLOCK_INCLUDED
+#define ATOMIC_RWLOCK_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -46,3 +49,4 @@ typedef struct {pthread_rwlock_t rw;} my_atomic_rwlock_t;
 #define make_atomic_load_body(S)    ret= *a;
 #define make_atomic_store_body(S)   *a= v;

+#endif /* ATOMIC_RWLOCK_INCLUDED */
--- a/include/atomic/x86-gcc.h
+++ b/include/atomic/x86-gcc.h
@ -1,3 +1,6 @@
+#ifndef ATOMIC_X86_GCC_INCLUDED
+#define ATOMIC_X86_GCC_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -56,3 +59,4 @@
  asm volatile ("; xchg %0, %1;" : "+m" (*a) : "r" (v))
 #endif

+#endif /* ATOMIC_X86_GCC_INCLUDED */
--- a/include/config-win.h
+++ b/include/config-win.h
@ -1,3 +1,6 @@
+#ifndef CONFIG_WIN_INCLUDED
+#define CONFIG_WIN_INCLUDED
+
 /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.

   This program is free software; you can redistribute it and/or modify
@ -410,3 +413,5 @@ inline ulonglong double2ulonglong(double d)

 #define HAVE_UCA_COLLATIONS 1
 #define HAVE_BOOL 1
+
+#endif /* CONFIG_WIN_INCLUDED */
--- a/include/errmsg.h
+++ b/include/errmsg.h
@ -1,3 +1,6 @@
+#ifndef ERRMSG_INCLUDED
+#define ERRMSG_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -100,3 +103,4 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_ERROR_LAST  /*Copy last error nr:*/  2057
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */

+#endif /* ERRMSG_INCLUDED */
--- a/include/help_end.h
+++ b/include/help_end.h
@ -1,3 +1,6 @@
+#ifndef HELP_END_INCLUDED
+#define HELP_END_INCLUDED
+
 /* Copyright (C) 2004-2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -20,3 +23,4 @@
 #undef fputc
 #undef putchar
 #endif
+#endif /* HELP_END_INCLUDED */
--- a/include/help_start.h
+++ b/include/help_start.h
@ -1,3 +1,6 @@
+#ifndef HELP_START_INCLUDED
+#define HELP_START_INCLUDED
+
 /* Copyright (C) 2004-2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -22,3 +25,4 @@
 #define fputc(s,f)   consoleprintf("%c", s)
 #define putchar(s)   consoleprintf("%c", s)
 #endif
+#endif /* HELP_START_INCLUDED */
--- a/include/my_aes.h
+++ b/include/my_aes.h
@ -1,3 +1,6 @@
+#ifndef MY_AES_INCLUDED
+#define MY_AES_INCLUDED
+
 /* Copyright (C) 2002 MySQL AB

 This program is free software; you can redistribute it and/or modify
@ -63,3 +66,5 @@ int my_aes_decrypt(const char *source, int source_length, char *dest,
 int my_aes_get_size(int source_length);

 C_MODE_END
+
+#endif /* MY_AES_INCLUDED */
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@ -1,3 +1,6 @@
+#ifndef MY_ATOMIC_INCLUDED
+#define MY_ATOMIC_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -140,3 +143,4 @@ extern int my_atomic_initialize();

 #endif

+#endif /* MY_ATOMIC_INCLUDED */
--- a/include/my_bit.h
+++ b/include/my_bit.h
@ -1,3 +1,6 @@
+#ifndef MY_BIT_INCLUDED
+#define MY_BIT_INCLUDED
+
 /*
  Some useful bit functions
 */
@ -107,3 +110,5 @@ extern uint my_count_bits(ulonglong v);
 extern uint my_count_bits_ushort(ushort v);
 #endif /* HAVE_INLINE */
 C_MODE_END
+
+#endif /* MY_BIT_INCLUDED */
--- a/include/my_libwrap.h
+++ b/include/my_libwrap.h
@ -1,3 +1,6 @@
+#ifndef MY_LIBWRAP_INCLUDED
+#define MY_LIBWRAP_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -25,3 +28,4 @@ extern int my_hosts_access(struct request_info *req);
 extern char *my_eval_client(struct request_info *req);

 #endif /* HAVE_LIBWRAP */
+#endif /* MY_LIBWRAP_INCLUDED */
--- a/include/my_md5.h
+++ b/include/my_md5.h
@ -1,3 +1,6 @@
+#ifndef MY_MD5_INCLUDED
+#define MY_MD5_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -52,3 +55,5 @@ do { \
  my_MD5Update (&ctx, buf, len); \
  my_MD5Final (digest, &ctx); \
 } while (0)
+
+#endif /* MY_MD__INCLUDED */
--- a/include/my_no_pthread.h
+++ b/include/my_no_pthread.h
@ -1,3 +1,6 @@
+#ifndef MY_NO_PTHREAD_INCLUDED
+#define MY_NO_PTHREAD_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -14,9 +17,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


-#if !defined(_my_no_pthread_h) && !defined(THREAD)
-#define _my_no_pthread_h
-
+#ifndef THREAD

 /*
  This block is to access some thread-related type definitions
@ -48,3 +49,4 @@
 #define rwlock_destroy(A)

 #endif
+#endif /* MY_NO_PTHREAD_INCLUDED */
--- a/include/my_uctype.h
+++ b/include/my_uctype.h
@ -1,3 +1,6 @@
+#ifndef MY_UCTYPE_INCLUDED
+#define MY_UCTYPE_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -1477,3 +1480,4 @@ MY_UNI_CTYPE my_uni_ctype[256]={
 };


+#endif /* MY_UCTYPE_INCLUDED */
--- a/include/myisampack.h
+++ b/include/myisampack.h
@ -1,3 +1,6 @@
+#ifndef MYISAMPACK_INCLUDED
+#define MYISAMPACK_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -236,3 +239,4 @@
                                     mi_int4store(((T) + 4), A); }}
 #define mi_sizekorr(T)      mi_uint4korr((uchar*) (T) + 4)
 #endif
+#endif /* MYISAMPACK_INCLUDED */
--- a/include/mysql_embed.h
+++ b/include/mysql_embed.h
@ -1,3 +1,6 @@
+#ifndef MYSQL_EMBED_INCLUDED
+#define MYSQL_EMBED_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -28,3 +31,4 @@
 #define DONT_USE_RAID

 #endif /* EMBEDDED_LIBRARY */
+#endif /* MYSQL_EMBED_INCLUDED */
--- a/include/rijndael.h
+++ b/include/rijndael.h
@ -1,3 +1,6 @@
+#ifndef RIJNDAEL_INCLUDED
+#define RIJNDAEL_INCLUDED
+
 /* Copyright (C) 2002 MySQL AB

 This program is free software; you can redistribute it and/or modify
@ -39,3 +42,5 @@ void rijndaelEncrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
 		     const uint8 pt[16], uint8 ct[16]);
 void rijndaelDecrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
 		     const uint8 ct[16], uint8 pt[16]);
+
+#endif /* RIJNDAEL_INCLUDED */
--- a/include/sha1.h
+++ b/include/sha1.h
@ -1,3 +1,6 @@
+#ifndef SHA1_INCLUDED
+#define SHA1_INCLUDED
+
 /* Copyright (C) 2002, 2006 MySQL AB

 This program is free software; you can redistribute it and/or modify
@ -64,3 +67,5 @@ int mysql_sha1_input(SHA1_CONTEXT*, const uint8 *, unsigned int);
 int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]);

 C_MODE_END
+
+#endif /* SHA__INCLUDED */
--- a/include/sql_common.h
+++ b/include/sql_common.h
@ -1,3 +1,6 @@
+#ifndef SQL_COMMON_INCLUDED
+#define SQL_COMMON_INCLUDED
+
 /* Copyright (C) 2003-2004, 2006 MySQL AB
   
   This program is free software; you can redistribute it and/or modify
@ -48,3 +51,4 @@ void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);

 #define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)

+#endif /* SQL_COMMON_INCLUDED */
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.h
@ -1,3 +1,6 @@
+#ifndef SSLOPT_CASE_INCLUDED
+#define SSLOPT_CASE_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -26,3 +29,4 @@
      opt_use_ssl= 1;
      break;
 #endif
+#endif /* SSLOPT_CASE_INCLUDED */
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.h
@ -1,3 +1,6 @@
+#ifndef SSLOPT_LONGOPTS_INCLUDED
+#define SSLOPT_LONGOPTS_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -43,3 +46,4 @@
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
 #endif /* HAVE_OPENSSL */
+#endif /* SSLOPT_LONGOPTS_INCLUDED */
--- a/include/sslopt-vars.h
+++ b/include/sslopt-vars.h
@ -1,3 +1,6 @@
+#ifndef SSLOPT_VARS_INCLUDED
+#define SSLOPT_VARS_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -29,3 +32,4 @@ SSL_STATIC char *opt_ssl_key    = 0;
 SSL_STATIC my_bool opt_ssl_verify_server_cert= 0;
 #endif
 #endif
+#endif /* SSLOPT_VARS_INCLUDED */
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@ -13,6 +13,12 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

+#ifndef CLIENT_SETTINGS_INCLUDED
+#define CLIENT_SETTINGS_INCLUDED
+#else
+#error You have already included an client_settings.h and it should not be included twice
+#endif /* CLIENT_SETTINGS_INCLUDED */
+
 extern uint		mysql_port;
 extern char *	mysql_unix_port;

--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@ -1,3 +1,5 @@
+#ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
+#define MYSYS_MY_HANDLER_ERRORS_INCLUDED

 /*
  Errors a handler can give you
@ -66,3 +68,4 @@ static const char *handler_error_messages[]=
  "Too many active concurrent transactions"
 };

+#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@ -1,3 +1,6 @@
+#ifndef MYSYS_MY_STATIC_INCLUDED
+#define MYSYS_MY_STATIC_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -72,3 +75,5 @@ extern ulonglong query_performance_frequency, query_performance_offset;
 extern sigset_t my_signals;		/* signals blocked by mf_brkhant */
 #endif
 C_MODE_END
+
+#endif /* MYSYS_MY_STATIC_INCLUDED */
--- a/sql/authors.h
+++ b/sql/authors.h
@ -1,3 +1,6 @@
+#ifndef AUTHORS_INCLUDED
+#define AUTHORS_INCLUDED
+
 /* Copyright (C) 2005-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -150,3 +153,5 @@ struct show_table_authors_st show_table_authors[]= {
    "SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" },
  {NULL, NULL, NULL}
 };
+
+#endif /* AUTHORS_INCLUDED */
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@ -14,6 +14,12 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


+#ifndef CLIENT_SETTINGS_INCLUDED
+#define CLIENT_SETTINGS_INCLUDED
+#else
+#error You have already included an client_settings.h and it should not be included twice
+#endif /* CLIENT_SETTINGS_INCLUDED */
+
 #include <thr_alarm.h>

 #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG |	  \
--- a/sql/contributors.h
+++ b/sql/contributors.h
@ -1,3 +1,6 @@
+#ifndef CONTRIBUTORS_INCLUDED
+#define CONTRIBUTORS_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -37,3 +40,5 @@ struct show_table_contributors_st show_table_contributors[]= {
  {"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"},
  {NULL, NULL, NULL}
 };
+
+#endif /* CONTRIBUTORS_INCLUDED */
--- 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
@ -2180,3 +2183,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 */
--- a/sql/gstream.h
+++ b/sql/gstream.h
@ -1,3 +1,6 @@
+#ifndef GSTREAM_INCLUDED
+#define GSTREAM_INCLUDED
+
 /* Copyright (C) 2000-2004 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -73,3 +76,5 @@ protected:
  char *m_err_msg;
  CHARSET_INFO *m_charset;
 };
+
+#endif /* GSTREAM_INCLUDED */
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_INCLUDED
+#define HA_NDBCLUSTER_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -581,3 +584,5 @@ static const int ndbcluster_hton_name_length=sizeof(ndbcluster_hton_name)-1;
 extern int ndbcluster_terminating;
 extern int ndb_util_thread_running;
 extern pthread_cond_t COND_ndb_util_ready;
+
+#endif /* HA_NDBCLUSTER_INCLUDED */
--- a/sql/ha_ndbcluster_binlog.h
+++ b/sql/ha_ndbcluster_binlog.h
@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_BINLOG_INCLUDED
+#define HA_NDBCLUSTER_BINLOG_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

  This program is free software; you can redistribute it and/or modify
@ -225,3 +228,5 @@ set_thd_ndb(THD *thd, Thd_ndb *thd_ndb)
 { thd_set_ha_data(thd, ndbcluster_hton, thd_ndb); }

 Ndb* check_ndb_in_thd(THD* thd);
+
+#endif /* HA_NDBCLUSTER_BINLOG_INCLUDED */
--- a/sql/ha_ndbcluster_cond.h
+++ b/sql/ha_ndbcluster_cond.h
@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_COND_INCLUDED
+#define HA_NDBCLUSTER_COND_INCLUDED
+
 /* Copyright (C) 2000-2007 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -486,3 +489,5 @@ private:

  Ndb_cond_stack *m_cond_stack;
 };
+
+#endif /* HA_NDBCLUSTER_COND_INCLUDED */
--- a/sql/ha_ndbcluster_tables.h
+++ b/sql/ha_ndbcluster_tables.h
@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_TABLES_INCLUDED
+#define HA_NDBCLUSTER_TABLES_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

  This program is free software; you can redistribute it and/or modify
@ -21,3 +24,5 @@
 #define OLD_NDB_APPLY_TABLE "apply_status"
 #define NDB_SCHEMA_TABLE "ndb_schema"
 #define OLD_NDB_SCHEMA_TABLE "schema"
+
+#endif /* HA_NDBCLUSTER_TABLES_INCLUDED */
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@ -1,3 +1,6 @@
+#ifndef HA_PARTITION_INCLUDED
+#define HA_PARTITION_INCLUDED
+
 /* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.

  This program is free software; you can redistribute it and/or modify
@ -1090,3 +1093,5 @@ public:
    virtual void append_create_info(String *packet)
  */
 };
+
+#endif /* HA_PARTITION_INCLUDED */
--- a/sql/handler.h
+++ b/sql/handler.h
@ -1,3 +1,6 @@
+#ifndef HANDLER_INCLUDED
+#define HANDLER_INCLUDED
+
 /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.

   This program is free software; you can redistribute it and/or modify
@ -2064,3 +2067,4 @@ int ha_binlog_end(THD *thd);
 #define ha_binlog_wait(a) do {} while (0)
 #define ha_binlog_end(a)  do {} while (0)
 #endif
+#endif /* HANDLER_INCLUDED */
--- 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
@ -3126,3 +3129,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 */
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@ -1,3 +1,6 @@
+#ifndef ITEM_CMPFUNC_INCLUDED
+#define ITEM_CMPFUNC_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -1721,3 +1724,5 @@ inline Item *and_conds(Item *a, Item *b)
 }

 Item *and_expressions(Item *a, Item *b, Item **org_item);
+
+#endif /* ITEM_CMPFUNC_INCLUDED */
--- 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 */
--- a/sql/item_geofunc.h
+++ b/sql/item_geofunc.h
@ -1,3 +1,6 @@
+#ifndef ITEM_GEOFUNC_INCLUDED
+#define ITEM_GEOFUNC_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -386,3 +389,4 @@ public:

 #endif

+#endif /* ITEM_GEOFUNC_INCLUDED */
--- a/sql/item_row.h
+++ b/sql/item_row.h
@ -1,3 +1,6 @@
+#ifndef ITEM_ROW_INCLUDED
+#define ITEM_ROW_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -77,3 +80,5 @@ public:
  bool null_inside() { return with_null; };
  void bring_value();
 };
+
+#endif /* ITEM_ROW_INCLUDED */
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@ -1,3 +1,6 @@
+#ifndef ITEM_STRFUNC_INCLUDED
+#define ITEM_STRFUNC_INCLUDED
+
 /* Copyright (C) 2000-2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -842,3 +845,4 @@ public:
  String *val_str(String *);
 };

+#endif /* ITEM_STRFUNC_INCLUDED */
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@ -1,3 +1,6 @@
+#ifndef ITEM_SUBSELECT_INCLUDED
+#define ITEM_SUBSELECT_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -579,4 +582,4 @@ inline bool Item_subselect::is_uncacheable() const
  return engine->uncacheable();
 }

-
+#endif /* ITEM_SUBSELECT_INCLUDED */
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@ -1,3 +1,6 @@
+#ifndef ITEM_SUM_INCLUDED
+#define ITEM_SUM_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -1279,3 +1282,5 @@ public:
  virtual bool change_context_processor(uchar *cntx)
    { context= (Name_resolution_context *)cntx; return FALSE; }
 };
+
+#endif /* ITEM_SUM_INCLUDED */
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@ -1,3 +1,6 @@
+#ifndef ITEM_TIMEFUNC_INCLUDED
+#define ITEM_TIMEFUNC_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -1026,3 +1029,5 @@ public:
  const char *func_name() const { return "last_day"; }
  bool get_date(MYSQL_TIME *res, uint fuzzy_date);
 };
+
+#endif /* ITEM_TIMEFUNC_INCLUDED */
--- a/sql/item_xmlfunc.h
+++ b/sql/item_xmlfunc.h
@ -1,3 +1,6 @@
+#ifndef ITEM_XMLFUNC_INCLUDED
+#define ITEM_XMLFUNC_INCLUDED
+
 /* Copyright (C) 2000-2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -61,3 +64,4 @@ public:
  String *val_str(String *);
 };

+#endif /* ITEM_XMLFUNC_INCLUDED */
--- a/sql/lex.h
+++ b/sql/lex.h
@ -1,3 +1,6 @@
+#ifndef LEX_INCLUDED
+#define LEX_INCLUDED
+
 /* Copyright (C) 2000-2002 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -634,3 +637,5 @@ static SYMBOL sql_functions[] = {
  { "VAR_POP",		SYM(VARIANCE_SYM)},
  { "VAR_SAMP",		SYM(VAR_SAMP_SYM)},
 };
+
+#endif /* LEX_INCLUDED */
--- a/sql/message.h
+++ b/sql/message.h
@ -1,3 +1,6 @@
+#ifndef MESSAGE_INCLUDED
+#define MESSAGE_INCLUDED
+
 /*
  To change or add messages mysqld writes to the Windows error log, run
   mc.exe message.mc
@ -6,6 +9,8 @@
  mc.exe can be installed with Windows SDK, some Visual Studio distributions 
  do not include it.
 */
+
+
 //
 //  Values are 32 bit values layed out as follows:
 //
@ -53,3 +58,5 @@
 //
 #define MSG_DEFAULT                      0xC0000064L

+#endif /* MESSAGE_INCLUDED */
+
--- a/sql/mysqld_suffix.h
+++ b/sql/mysqld_suffix.h
@ -1,3 +1,6 @@
+#ifndef MYSQLD_SUFFIX_INCLUDED
+#define MYSQLD_SUFFIX_INCLUDED
+
 /* Copyright (C) 2000-2004 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -27,3 +30,4 @@
 #else
 #define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF
 #endif
+#endif /* MYSQLD_SUFFIX_INCLUDED */
--- a/sql/nt_servc.h
+++ b/sql/nt_servc.h
@ -1,3 +1,6 @@
+#ifndef NT_SERVC_INCLUDED
+#define NT_SERVC_INCLUDED
+
 /**
  @file

@ -98,3 +101,5 @@ class NTService

 };
 /* ------------------------- the end -------------------------------------- */
+
+#endif /* NT_SERVC_INCLUDED */
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@ -1,3 +1,6 @@
+#ifndef PARTITION_ELEMENT_INCLUDED
+#define PARTITION_ELEMENT_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -97,3 +100,5 @@ public:
  }
  ~partition_element() {}
 };
+
+#endif /* PARTITION_ELEMENT_INCLUDED */
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@ -1,3 +1,6 @@
+#ifndef PARTITION_INFO_INCLUDED
+#define PARTITION_INFO_INCLUDED
+
 /* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.

   This program is free software; you can redistribute it and/or modify
@ -314,3 +317,5 @@ void init_all_partitions_iterator(partition_info *part_info,
  part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
  part_iter->get_next= get_next_partition_id_range;
 }
+
+#endif /* PARTITION_INFO_INCLUDED */
--- a/sql/procedure.h
+++ b/sql/procedure.h
@ -1,3 +1,6 @@
+#ifndef PROCEDURE_INCLUDED
+#define PROCEDURE_INCLUDED
+
 /* Copyright (C) 2000-2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -149,3 +152,5 @@ public:

 Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result,
 			   List<Item> &field_list,int *error);
+
+#endif /* PROCEDURE_INCLUDED */
--- a/sql/protocol.h
+++ b/sql/protocol.h
@ -1,3 +1,6 @@
+#ifndef PROTOCOL_INCLUDED
+#define PROTOCOL_INCLUDED
+
 /* Copyright (C) 2002-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -180,3 +183,4 @@ uchar *net_store_data(uchar *to,const uchar *from, size_t length);
 uchar *net_store_data(uchar *to,int32 from);
 uchar *net_store_data(uchar *to,longlong from);

+#endif /* PROTOCOL_INCLUDED */
--- a/sql/repl_failsafe.h
+++ b/sql/repl_failsafe.h
@ -1,3 +1,6 @@
+#ifndef REPL_FAILSAFE_INCLUDED
+#define REPL_FAILSAFE_INCLUDED
+
 /* Copyright (C) 2001-2005 MySQL AB & Sasha

   This program is free software; you can redistribute it and/or modify
@ -49,3 +52,4 @@ int register_slave(THD* thd, uchar* packet, uint packet_length);
 void unregister_slave(THD* thd, bool only_mine, bool need_mutex);

 #endif /* HAVE_REPLICATION */
+#endif /* REPL_FAILSAFE_INCLUDED */
--- a/sql/scheduler.h
+++ b/sql/scheduler.h
@ -1,3 +1,6 @@
+#ifndef SCHEDULER_INCLUDED
+#define SCHEDULER_INCLUDED
+
 /* Copyright (C) 2007 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -58,3 +61,5 @@ enum pool_command_op

 class thd_scheduler
 {};
+
+#endif /* SCHEDULER_INCLUDED */
--- a/sql/set_var.h
+++ b/sql/set_var.h
@ -1,3 +1,6 @@
+#ifndef SET_VAR_INCLUDED
+#define SET_VAR_INCLUDED
+
 /* Copyright (C) 2002-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -1449,3 +1452,5 @@ void free_key_cache(const char *name, KEY_CACHE *key_cache);
 bool process_key_caches(process_key_cache_t func);
 void delete_elements(I_List<NAMED_LIST> *list,
 		     void (*free_element)(const char*, uchar*));
+
+#endif /* SET_VAR_INCLUDED */
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@ -1,3 +1,6 @@
+#ifndef SQL_ACL_INCLUDED
+#define SQL_ACL_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -273,3 +276,4 @@ bool is_acl_user(const char *host, const char *user);
 #define check_grant(A,B,C,D,E,F) 0
 #define check_grant_db(A,B) 0
 #endif
+#endif /* SQL_ACL_INCLUDED */
--- a/sql/sql_analyse.h
+++ b/sql/sql_analyse.h
@ -1,3 +1,6 @@
+#ifndef SQL_ANALYSE_INCLUDED
+#define SQL_ANALYSE_INCLUDED
+
 /* Copyright (C) 2000-2003, 2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -355,3 +358,5 @@ public:
 				      select_result *result,
 				      List<Item> &field_list);
 };
+
+#endif /* SQL_ANALYSE_INCLUDED */
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@ -1,3 +1,6 @@
+#ifndef SQL_ARRAY_INCLUDED
+#define SQL_ARRAY_INCLUDED
+
 /* Copyright (C) 2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -66,3 +69,4 @@ public:
  }
 };

+#endif /* SQL_ARRAY_INCLUDED */
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@ -14,6 +14,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */


+#ifndef SQL_CLASS_INCLUDED
+#define SQL_CLASS_INCLUDED
+
 /* Classes in mysql */

 #ifdef USE_PRAGMA_INTERFACE
@ -3003,3 +3006,4 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
 void mark_transaction_to_rollback(THD *thd, bool all);

 #endif /* MYSQL_SERVER */
+#endif /* SQL_CLASS_INCLUDED */
--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@ -1,3 +1,6 @@
+#ifndef SQL_CRYPT_INCLUDED
+#define SQL_CRYPT_INCLUDED
+
 /* Copyright (C) 2000-2001, 2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -35,3 +38,5 @@ class SQL_CRYPT :public Sql_alloc
  void encode(char *str, uint length);
  void decode(char *str, uint length);
 };
+
+#endif /* SQL_CRYPT_INCLUDED */
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@ -17,6 +17,9 @@
  @defgroup Semantic_Analysis Semantic Analysis
 */

+#ifndef SQL_LEX_INCLUDED
+#define SQL_LEX_INCLUDED
+
 /* YACC and LEX Definitions */

 /* These may not be declared yet */
@ -1979,3 +1982,4 @@ extern bool is_lex_native_function(const LEX_STRING *name);
 int my_missing_function_error(const LEX_STRING &token, const char *name);

 #endif /* MYSQL_SERVER */
+#endif /* SQL_LEX_INCLUDED */
--- a/sql/sql_map.h
+++ b/sql/sql_map.h
@ -1,3 +1,6 @@
+#ifndef SQL_MAP_INCLUDED
+#define SQL_MAP_INCLUDED
+
 /* Copyright (C) 2000-2001, 2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -60,3 +63,5 @@ public:
    return file->map;
  }
 };
+
+#endif /* SQL_MAP_INCLUDED */
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@ -1,3 +1,6 @@
+#ifndef SQL_PARTITION_INCLUDED
+#define SQL_PARTITION_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

  This program is free software; you can redistribute it and/or modify
@ -209,3 +212,4 @@ typedef int (*get_partitions_in_range_iter)(partition_info *part_info,

 #include "partition_info.h"

+#endif /* SQL_PARTITION_INCLUDED */
--- a/sql/sql_repl.h
+++ b/sql/sql_repl.h
@ -13,6 +13,9 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

+#ifndef SQL_REPL_INCLUDED
+#define SQL_REPL_INCLUDED
+
 #include "rpl_filter.h"

 #ifdef HAVE_REPLICATION
@ -65,3 +68,4 @@ int init_replication_sys_vars();

 #endif /* HAVE_REPLICATION */

+#endif /* SQL_REPL_INCLUDED */
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@ -1,3 +1,6 @@
+#ifndef SQL_SELECT_INCLUDED
+#define SQL_SELECT_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -736,3 +739,4 @@ inline bool optimizer_flag(THD *thd, uint flag)
  return (thd->variables.optimizer_switch & flag);
 }

+#endif /* SQL_SELECT_INCLUDED */
--- a/sql/sql_servers.h
+++ b/sql/sql_servers.h
@ -1,3 +1,6 @@
+#ifndef SQL_SERVERS_INCLUDED
+#define SQL_SERVERS_INCLUDED
+
 /* Copyright (C) 2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -41,3 +44,5 @@ int alter_server(THD *thd, LEX_SERVER_OPTIONS *server_options);
 /* lookup functions */
 FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name,
                                   FOREIGN_SERVER *server_buffer);
+
+#endif /* SQL_SERVERS_INCLUDED */
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@ -1,3 +1,6 @@
+#ifndef SQL_SORT_INCLUDED
+#define SQL_SORT_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -87,3 +90,5 @@ int merge_buffers(SORTPARAM *param,IO_CACHE *from_file,
 		  BUFFPEK *lastbuff,BUFFPEK *Fb,
 		  BUFFPEK *Tb,int flag);
 void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length);
+
+#endif /* SQL_SORT_INCLUDED */
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@ -1,3 +1,6 @@
+#ifndef SQL_STRING_INCLUDED
+#define SQL_STRING_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -389,3 +392,5 @@ static inline bool check_if_only_end_space(CHARSET_INFO *cs, char *str,
 {
  return str+ cs->cset->scan(cs, str, end, MY_SEQ_SPACES) == end;
 }
+
+#endif /* SQL_STRING_INCLUDED */
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@ -1,3 +1,6 @@
+#ifndef SQL_TRIGGER_INCLUDED
+#define SQL_TRIGGER_INCLUDED
+
 /* Copyright (C) 2004-2005 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -174,3 +177,4 @@ bool load_table_name_for_trigger(THD *thd,
                                 const LEX_STRING *trn_path,
                                 LEX_STRING *tbl_name);

+#endif /* SQL_TRIGGER_INCLUDED */
--- a/sql/sql_udf.h
+++ b/sql/sql_udf.h
@ -1,3 +1,6 @@
+#ifndef SQL_UDF_INCLUDED
+#define SQL_UDF_INCLUDED
+
 /* Copyright (C) 2000-2001, 2003-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -140,3 +143,4 @@ void free_udf(udf_func *udf);
 int mysql_create_function(THD *thd,udf_func *udf);
 int mysql_drop_function(THD *thd,const LEX_STRING *name);
 #endif
+#endif /* SQL_UDF_INCLUDED */
--- a/sql/sql_view.h
+++ b/sql/sql_view.h
@ -1,3 +1,6 @@
+#ifndef SQL_VIEW_INCLUDED
+#define SQL_VIEW_INCLUDED
+
 /* -*- C++ -*- */
 /* Copyright (C) 2004 MySQL AB

@ -42,3 +45,4 @@ bool mysql_rename_view(THD *thd, const char *new_db, const char *new_name,

 #define VIEW_ANY_ACL (SELECT_ACL | UPDATE_ACL | INSERT_ACL | DELETE_ACL)

+#endif /* SQL_VIEW_INCLUDED */
--- a/sql/structs.h
+++ b/sql/structs.h
@ -1,3 +1,6 @@
+#ifndef STRUCTS_INCLUDED
+#define STRUCTS_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -380,3 +383,5 @@ public:
  Discrete_interval* get_tail() const { return tail; };
  Discrete_interval* get_current() const { return current; };
 };
+
+#endif /* STRUCTS_INCLUDED */
--- a/sql/table.h
+++ b/sql/table.h
@ -1,3 +1,6 @@
+#ifndef TABLE_INCLUDED
+#define TABLE_INCLUDED
+
 /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.

   This program is free software; you can redistribute it and/or modify
@ -1729,3 +1732,4 @@ static inline void dbug_tmp_restore_column_maps(MY_BITMAP *read_set,

 size_t max_row_length(TABLE *table, const uchar *data);

+#endif /* TABLE_INCLUDED */
--- a/sql/tzfile.h
+++ b/sql/tzfile.h
@ -1,3 +1,6 @@
+#ifndef TZFILE_INCLUDED
+#define TZFILE_INCLUDED
+
 /* Copyright (C) 2004 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -134,3 +137,5 @@ struct tzhead {
 */

 #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+
+#endif
--- a/sql/tztime.h
+++ b/sql/tztime.h
@ -1,3 +1,6 @@
+#ifndef TZTIME_INCLUDED
+#define TZTIME_INCLUDED
+
 /* Copyright (C) 2004 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -79,3 +82,4 @@ static const int MY_TZ_TABLES_COUNT= 4;


 #endif /* !defined(TESTTIME) && !defined(TZINFO2SQL) */
+#endif /* TZTIME_INCLUDED */
--- a/sql/unireg.h
+++ b/sql/unireg.h
@ -1,3 +1,6 @@
+#ifndef UNIREG_INCLUDED
+#define UNIREG_INCLUDED
+
 /* Copyright (C) 2000-2006 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -16,8 +19,6 @@

 /*  Extra functions used by unireg library */

-#ifndef _unireg_h
-
 #ifndef NO_ALARM_LOOP
 #define NO_ALARM_LOOP		/* lib5 and popen can't use alarm */
 #endif
--- a/strings/strings-not-used.h
+++ b/strings/strings-not-used.h
@ -1,3 +1,6 @@
+#ifndef STRINGS_NOT_USED_INCLUDED
+#define STRINGS_NOT_USED_INCLUDED
+
 /* Copyright (C) 2000 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -35,3 +38,4 @@
 #define _AlphabetSize	256

 #endif	/* NullS */
+#endif /* STRINGS_NOT_USED_INCLUDED */
--- a/vio/vio_priv.h
+++ b/vio/vio_priv.h
@ -1,3 +1,6 @@
+#ifndef VIO_PRIV_INCLUDED
+#define VIO_PRIV_INCLUDED
+
 /* Copyright (C) 2003 MySQL AB

   This program is free software; you can redistribute it and/or modify
@ -38,3 +41,4 @@ void vio_ssl_delete(Vio *vio);
 int vio_ssl_blocking(Vio *vio, my_bool set_blocking_mode, my_bool *old_mode);

 #endif /* HAVE_OPENSSL */
+#endif /* VIO_PRIV_INCLUDED */