#At file:///home/bzr/mkindahl/w4877-azalea/ based on revid:alik@stripped
2796 Mats Kindahl 2009-06-22
WL#5016: Fix header file include guards
Adding header include file guards to files that are missing such.
@ libmysql/client_settings.h
There shall not be several inclusions of client_settings.h,
so we will throw an error if it is included multiple times.
@ sql/client_settings.h
There shall not be several inclusions of client_settings.h,
so we will throw an error if it is included multiple times.
modified:
client/backup_stream.h
client/my_readline.h
client/sql_string.h
include/atomic/gcc_builtins.h
include/atomic/nolock.h
include/atomic/rwlock.h
include/atomic/x86-gcc.h
include/config-win.h
include/errmsg.h
include/help_end.h
include/help_start.h
include/my_aes.h
include/my_atomic.h
include/my_bit.h
include/my_libwrap.h
include/my_md5.h
include/my_no_pthread.h
include/my_uctype.h
include/myisampack.h
include/mysql/service_my_snprintf.h
include/mysql/service_thd_alloc.h
include/mysql/services.h
include/mysql_embed.h
include/rijndael.h
include/service_versions.h
include/sha1.h
include/sql_common.h
include/sslopt-case.h
include/sslopt-longopts.h
include/sslopt-vars.h
libmysql/client_settings.h
mysys/my_handler_errors.h
mysys/my_safehash.h
mysys/my_static.h
sql/authors.h
sql/backup/backup_engine.h
sql/backup/backup_info.h
sql/bml.h
sql/client_settings.h
sql/contributors.h
sql/debug_sync.h
sql/field.h
sql/gstream.h
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.h
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_connection.h
sql/ha_ndbcluster_lock_ext.h
sql/ha_ndbcluster_tables.h
sql/ha_partition.h
sql/handler.h
sql/item.h
sql/item_cmpfunc.h
sql/item_func.h
sql/item_geofunc.h
sql/item_row.h
sql/item_strfunc.h
sql/item_subselect.h
sql/item_sum.h
sql/item_timefunc.h
sql/item_xmlfunc.h
sql/lex.h
sql/message.h
sql/mysqld_suffix.h
sql/nt_servc.h
sql/partition_element.h
sql/partition_info.h
sql/procedure.h
sql/protocol.h
sql/repl_failsafe.h
sql/scheduler.h
sql/set_var.h
sql/sql_acl.h
sql/sql_analyse.h
sql/sql_array.h
sql/sql_audit.h
sql/sql_class.h
sql/sql_crypt.h
sql/sql_lex.h
sql/sql_map.h
sql/sql_partition.h
sql/sql_plugin_services.h
sql/sql_repl.h
sql/sql_select.h
sql/sql_servers.h
sql/sql_sort.h
sql/sql_string.h
sql/sql_trigger.h
sql/sql_udf.h
sql/sql_view.h
sql/structs.h
sql/table.h
sql/transaction.h
sql/tzfile.h
sql/tztime.h
sql/unireg.h
strings/strings-not-used.h
vio/vio_priv.h
=== modified file 'client/backup_stream.h'
--- a/client/backup_stream.h 2009-02-26 16:56:47 +0000
+++ b/client/backup_stream.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef CLIENT_BACKUP_STREAM_INCLUDED
+#define CLIENT_BACKUP_STREAM_INCLUDED
+
/* Copyright (C) 2008 Sun Microsystems Inc.
This program is free software; you can redistribute it and/or modify
@@ -293,3 +296,4 @@ char *backup_blob_string(struct st_blob
/* The above shall also be usable by C++. */
C_MODE_END
+#endif /* CLIENT_BACKUP_STREAM_INCLUDED */
=== modified file 'client/my_readline.h'
--- a/client/my_readline.h 2009-03-18 08:27:49 +0000
+++ b/client/my_readline.h 2009-06-22 09:36:50 +0000
@@ -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(
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 */
=== modified file 'client/sql_string.h'
--- a/client/sql_string.h 2008-03-05 14:27:35 +0000
+++ b/client/sql_string.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -349,3 +352,5 @@ public:
return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
}
};
+
+#endif /* CLIENT_SQL_STRING_INCLUDED */
=== modified file 'include/atomic/gcc_builtins.h'
--- a/include/atomic/gcc_builtins.h 2008-05-29 15:44:11 +0000
+++ b/include/atomic/gcc_builtins.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -36,3 +39,5 @@
#define make_atomic_store_body(S) \
(void) __sync_lock_test_and_set(a, v);
#endif
+
+#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */
=== modified file 'include/atomic/nolock.h'
--- a/include/atomic/nolock.h 2008-07-09 07:12:43 +0000
+++ b/include/atomic/nolock.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -46,3 +49,4 @@ typedef char my_atomic_rwlock_t __attrib
#endif
+#endif /* ATOMIC_NOLOCK_INCLUDED */
=== modified file 'include/atomic/rwlock.h'
--- a/include/atomic/rwlock.h 2008-05-29 15:44:11 +0000
+++ b/include/atomic/rwlock.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -55,3 +58,4 @@ typedef struct {pthread_mutex_t rw;} my_
#define make_atomic_load_body(S) ret= *a;
#define make_atomic_store_body(S) *a= v;
+#endif /* ATOMIC_RWLOCK_INCLUDED */
=== modified file 'include/atomic/x86-gcc.h'
--- a/include/atomic/x86-gcc.h 2008-05-29 15:44:11 +0000
+++ b/include/atomic/x86-gcc.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -67,3 +70,4 @@
/* TODO test on intel whether the below helps. on AMD it makes no difference */
//#define LF_BACKOFF ({asm volatile ("rep; nop"); 1; })
+#endif /* ATOMIC_X86_GCC_INCLUDED */
=== modified file 'include/config-win.h'
--- a/include/config-win.h 2009-06-02 08:33:12 +0000
+++ b/include/config-win.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -442,3 +445,5 @@ inline ulonglong double2ulonglong(double
#define HAVE_CHARSET_utf32 1
#define HAVE_UCA_COLLATIONS 1
#define HAVE_BOOL 1
+
+#endif /* CONFIG_WIN_INCLUDED */
=== modified file 'include/errmsg.h'
--- a/include/errmsg.h 2008-10-17 12:39:34 +0000
+++ b/include/errmsg.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -101,3 +104,4 @@ extern const char *client_errors[]; /* E
#define CR_ERROR_LAST /*Copy last error nr:*/ 2058
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */
+#endif /* ERRMSG_INCLUDED */
=== modified file 'include/help_end.h'
--- a/include/help_end.h 2006-12-31 00:02:27 +0000
+++ b/include/help_end.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/help_start.h'
--- a/include/help_start.h 2006-12-31 00:02:27 +0000
+++ b/include/help_start.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/my_aes.h'
--- a/include/my_aes.h 2006-12-31 00:02:27 +0000
+++ b/include/my_aes.h 2009-06-22 09:36:50 +0000
@@ -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, i
int my_aes_get_size(int source_length);
C_MODE_END
+
+#endif /* MY_AES_INCLUDED */
=== modified file 'include/my_atomic.h'
--- a/include/my_atomic.h 2008-07-22 14:16:22 +0000
+++ b/include/my_atomic.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -252,3 +255,4 @@ extern int my_atomic_initialize();
#endif
+#endif /* MY_ATOMIC_INCLUDED */
=== modified file 'include/my_bit.h'
--- a/include/my_bit.h 2008-10-20 09:16:47 +0000
+++ b/include/my_bit.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/my_libwrap.h'
--- a/include/my_libwrap.h 2006-12-23 19:17:15 +0000
+++ b/include/my_libwrap.h 2009-06-22 09:36:50 +0000
@@ -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 reques
extern char *my_eval_client(struct request_info *req);
#endif /* HAVE_LIBWRAP */
+#endif /* MY_LIBWRAP_INCLUDED */
=== modified file 'include/my_md5.h'
--- a/include/my_md5.h 2009-03-09 18:57:03 +0000
+++ b/include/my_md5.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/my_no_pthread.h'
--- a/include/my_no_pthread.h 2006-12-23 19:20:40 +0000
+++ b/include/my_no_pthread.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/my_uctype.h'
--- a/include/my_uctype.h 2006-12-31 01:29:11 +0000
+++ b/include/my_uctype.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/myisampack.h'
--- a/include/myisampack.h 2008-04-03 13:40:25 +0000
+++ b/include/myisampack.h 2009-06-22 09:36:50 +0000
@@ -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((const uchar*) (T) + 4)
#endif
+#endif /* MYISAMPACK_INCLUDED */
=== modified file 'include/mysql/service_my_snprintf.h'
--- a/include/mysql/service_my_snprintf.h 2009-05-04 17:14:38 +0000
+++ b/include/mysql/service_my_snprintf.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SERVICE_MY_SNPRINTF_INCLUDED
+#define SERVICE_MY_SNPRINTF_INCLUDED
+
/* Copyright (C) 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -77,3 +80,4 @@ size_t my_vsnprintf(char *to, size_t n,
#endif
+#endif /* SERVICE_MY_SNPRINTF_INCLUDED */
=== modified file 'include/mysql/service_thd_alloc.h'
--- a/include/mysql/service_thd_alloc.h 2009-05-04 17:14:38 +0000
+++ b/include/mysql/service_thd_alloc.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SERVICE_THD_ALLOC_INCLUDED
+#define SERVICE_THD_ALLOC_INCLUDED
+
/* Copyright (C) 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -114,3 +117,4 @@ MYSQL_LEX_STRING *thd_make_lex_string(MY
#endif
+#endif /* SERVICE_THD_ALLOC_INCLUDED */
=== modified file 'include/mysql/services.h'
--- a/include/mysql/services.h 2009-04-30 16:22:40 +0000
+++ b/include/mysql/services.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef MYSQL_SERVICES_INCLUDED
+#define MYSQL_SERVICES_INCLUDED
+
/* Copyright (C) 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -13,9 +16,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifndef MYSQL_SERVICES_INCLUDED
-#define MYSQL_SERVICES_INCLUDED
-
#ifdef __cplusplus
extern "C" {
#endif
=== modified file 'include/mysql_embed.h'
--- a/include/mysql_embed.h 2007-12-13 12:55:04 +0000
+++ b/include/mysql_embed.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -27,3 +30,4 @@
#define DONT_USE_RAID
#endif /* EMBEDDED_LIBRARY */
+#endif /* MYSQL_EMBED_INCLUDED */
=== modified file 'include/rijndael.h'
--- a/include/rijndael.h 2006-12-31 00:02:27 +0000
+++ b/include/rijndael.h 2009-06-22 09:36:50 +0000
@@ -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
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 */
=== modified file 'include/service_versions.h'
--- a/include/service_versions.h 2009-05-06 18:17:49 +0000
+++ b/include/service_versions.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SERVICE_VERSIONS_INCLUDED
+#define SERVICE_VERSIONS_INCLUDED
+
/* Copyright (C) 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -22,3 +25,4 @@
#define VERSION_my_snprintf 0x0100
#define VERSION_thd_alloc 0x0100
+#endif /* SERVICE_VERSIONS_INCLUDED */
=== modified file 'include/sha1.h'
--- a/include/sha1.h 2006-12-31 00:02:27 +0000
+++ b/include/sha1.h 2009-06-22 09:36:50 +0000
@@ -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*, cons
int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]);
C_MODE_END
+
+#endif /* SHA__INCLUDED */
=== modified file 'include/sql_common.h'
--- a/include/sql_common.h 2008-02-27 09:00:59 +0000
+++ b/include/sql_common.h 2009-06-22 09:36:50 +0000
@@ -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 e
#define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
+#endif /* SQL_COMMON_INCLUDED */
=== modified file 'include/sslopt-case.h'
--- a/include/sslopt-case.h 2007-12-07 14:35:28 +0000
+++ b/include/sslopt-case.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/sslopt-longopts.h'
--- a/include/sslopt-longopts.h 2007-12-07 14:35:28 +0000
+++ b/include/sslopt-longopts.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'include/sslopt-vars.h'
--- a/include/sslopt-vars.h 2007-12-07 14:35:28 +0000
+++ b/include/sslopt-vars.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'libmysql/client_settings.h'
--- a/libmysql/client_settings.h 2008-08-07 17:52:43 +0000
+++ b/libmysql/client_settings.h 2009-06-22 09:36:50 +0000
@@ -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;
=== modified file 'mysys/my_handler_errors.h'
--- a/mysys/my_handler_errors.h 2008-07-22 14:16:22 +0000
+++ b/mysys/my_handler_errors.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,5 @@
+#ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
+#define MYSYS_MY_HANDLER_ERRORS_INCLUDED
/*
Errors a handler can give you
@@ -135,3 +137,4 @@ static const char *handler_error_message
"Row is not visible by the current transaction"
};
+#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */
=== modified file 'mysys/my_safehash.h'
--- a/mysys/my_safehash.h 2009-04-23 21:17:43 +0000
+++ b/mysys/my_safehash.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef MYSYS_MY_SAFEHASH_INCLUDED
+#define MYSYS_MY_SAFEHASH_INCLUDED
+
/* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -55,3 +58,5 @@ uchar *safe_hash_search(SAFE_HASH *hash,
my_bool safe_hash_set(SAFE_HASH *hash, const uchar *key, uint length,
uchar *data);
void safe_hash_change(SAFE_HASH *hash, uchar *old_data, uchar *new_data);
+
+#endif /* MYSYS_MY_SAFEHASH_INCLUDED */
=== modified file 'mysys/my_static.h'
--- a/mysys/my_static.h 2008-10-20 09:16:47 +0000
+++ b/mysys/my_static.h 2009-06-22 09:36:50 +0000
@@ -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_frequ
extern sigset_t my_signals; /* signals blocked by mf_brkhant */
#endif
C_MODE_END
+
+#endif /* MYSYS_MY_STATIC_INCLUDED */
=== modified file 'sql/authors.h'
--- a/sql/authors.h 2007-08-30 11:55:03 +0000
+++ b/sql/authors.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -153,3 +156,5 @@ struct show_table_authors_st show_table_
"SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" },
{NULL, NULL, NULL}
};
+
+#endif /* AUTHORS_INCLUDED */
=== modified file 'sql/backup/backup_engine.h'
--- a/sql/backup/backup_engine.h 2009-03-25 13:21:35 +0000
+++ b/sql/backup/backup_engine.h 2009-06-22 09:36:50 +0000
@@ -1,10 +1,10 @@
+#ifndef BACKUP_BACKUP_ENGINE_INCLUDED
+#define BACKUP_BACKUP_ENGINE_INCLUDED
+
#ifndef MYSQL_PRIV_H
#error backup_engine.h must be included after mysql_priv.h
#endif
-#ifndef _BACKUP_ENGINE_API_H
-#define _BACKUP_ENGINE_API_H
-
/**
@file backup_engine.h
@brief Backup engine and backup/restore driver API
=== modified file 'sql/backup/backup_info.h'
--- a/sql/backup/backup_info.h 2008-12-18 21:46:36 +0000
+++ b/sql/backup/backup_info.h 2009-06-22 09:36:50 +0000
@@ -1,4 +1,5 @@
-#ifndef BACKUP_INFO_H_
+#ifndef BACKUP_BACKUP_INFO_INCLUDED
+#define BACKUP_BACKUP_INFO_INCLUDED
#include <backup/image_info.h>
#include <backup/stream_services.h>
@@ -186,6 +187,4 @@ bool Backup_info::is_valid()
return m_state != ERROR;
}
-#define BACKUP_INFO_H_
-
-#endif /*BACKUP_INFO_H_*/
+#endif /* BACKUP_INFO_INCLUDED */
=== modified file 'sql/bml.h'
--- a/sql/bml.h 2009-02-13 13:25:43 +0000
+++ b/sql/bml.h 2009-06-22 09:36:50 +0000
@@ -1,8 +1,12 @@
+#ifndef BML_INCLUDED
+#define BML_INCLUDED
+
/**
@file
Header file for Backup Metadata Lock.
*/
+
#include "mysql_priv.h"
/**
@@ -119,3 +123,5 @@ class BML_class
int BML_registered; ///< Number of statements registered with BML.
static BML_class *m_instance; ///< instance var for singleton
};
+
+#endif /* BML_INCLUDED */
=== modified file 'sql/client_settings.h'
--- a/sql/client_settings.h 2006-12-31 00:02:27 +0000
+++ b/sql/client_settings.h 2009-06-22 09:36:50 +0000
@@ -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 | \
@@ -32,4 +38,3 @@
#undef _CUSTOMCONFIG_
#define mysql_server_init(a,b,c) 0
-
=== modified file 'sql/contributors.h'
--- a/sql/contributors.h 2006-12-31 01:29:11 +0000
+++ b/sql/contributors.h 2009-06-22 09:36:50 +0000
@@ -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_t
{"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"},
{NULL, NULL, NULL}
};
+
+#endif /* CONTRIBUTORS_INCLUDED */
=== modified file 'sql/debug_sync.h'
--- a/sql/debug_sync.h 2009-02-26 11:19:29 +0000
+++ b/sql/debug_sync.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef DEBUG_SYNC_INCLUDED
+#define DEBUG_SYNC_INCLUDED
+
/* Copyright (C) 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -58,3 +61,4 @@ extern void debug_sync(THD *thd, const c
#endif /* defined(ENABLED_DEBUG_SYNC) */
#endif /* DEBUG_SYNC_H */
+#endif /* DEBUG_SYNC_INCLUDED */
=== modified file 'sql/field.h'
--- a/sql/field.h 2009-02-13 16:30:54 +0000
+++ b/sql/field.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -2248,3 +2251,5 @@ int set_field_to_null_with_conversions(F
#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 */
=== modified file 'sql/gstream.h'
--- a/sql/gstream.h 2007-05-10 09:59:39 +0000
+++ b/sql/gstream.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h 2008-12-13 11:02:16 +0000
+++ b/sql/ha_ndbcluster.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -752,3 +755,5 @@ static const int ndbcluster_hton_name_le
extern int ndbcluster_terminating;
extern int ndb_util_thread_running;
extern pthread_cond_t COND_ndb_util_ready;
+
+#endif /* HA_NDBCLUSTER_INCLUDED */
=== modified file 'sql/ha_ndbcluster_binlog.h'
--- a/sql/ha_ndbcluster_binlog.h 2008-12-09 18:59:54 +0000
+++ b/sql/ha_ndbcluster_binlog.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -297,3 +300,5 @@ private:
THD *m_thd;
int m_lock;
};
+
+#endif /* HA_NDBCLUSTER_BINLOG_INCLUDED */
=== modified file 'sql/ha_ndbcluster_cond.h'
--- a/sql/ha_ndbcluster_cond.h 2008-03-26 23:22:46 +0000
+++ b/sql/ha_ndbcluster_cond.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -622,3 +625,5 @@ private:
Ndb_cond_stack *m_cond_stack;
};
+
+#endif /* HA_NDBCLUSTER_COND_INCLUDED */
=== modified file 'sql/ha_ndbcluster_connection.h'
--- a/sql/ha_ndbcluster_connection.h 2008-10-02 15:52:29 +0000
+++ b/sql/ha_ndbcluster_connection.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_CONNECTION_INCLUDED
+#define HA_NDBCLUSTER_CONNECTION_INCLUDED
+
/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -13,6 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
int ndbcluster_connect(int (*connect_callback)(void));
int ndbcluster_disconnect();
@@ -29,3 +33,5 @@ inline void do_retry_sleep(unsigned mill
{
my_sleep(1000*(milli_sleep + 5*(rand()%(milli_sleep/5))));
}
+
+#endif /* HA_NDBCLUSTER_CONNECTION_INCLUDED */
=== modified file 'sql/ha_ndbcluster_lock_ext.h'
--- a/sql/ha_ndbcluster_lock_ext.h 2008-10-09 09:10:50 +0000
+++ b/sql/ha_ndbcluster_lock_ext.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef HA_NDBCLUSTER_LOCK_EXT_INCLUDED
+#define HA_NDBCLUSTER_LOCK_EXT_INCLUDED
+
/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -111,3 +114,5 @@ ndbcluster_global_schema_unlock_ext(Ndb
ndb->closeTransaction(trans);
return 0;
}
+
+#endif /* HA_NDBCLUSTER_LOCK_EXT_INCLUDED */
=== modified file 'sql/ha_ndbcluster_tables.h'
--- a/sql/ha_ndbcluster_tables.h 2007-03-20 16:07:53 +0000
+++ b/sql/ha_ndbcluster_tables.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/ha_partition.h'
--- a/sql/ha_partition.h 2009-02-19 13:06:05 +0000
+++ b/sql/ha_partition.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1089,3 +1092,5 @@ public:
virtual void append_create_info(String *packet)
*/
};
+
+#endif /* HA_PARTITION_INCLUDED */
=== modified file 'sql/handler.h'
--- a/sql/handler.h 2009-05-14 21:49:53 +0000
+++ b/sql/handler.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -2652,3 +2655,4 @@ public:
int lock(int no_queue= 0) { return 0; }
};
#endif
+#endif /* HANDLER_INCLUDED */
=== modified file 'sql/item.h'
--- a/sql/item.h 2009-05-14 21:49:53 +0000
+++ b/sql/item.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -3073,3 +3076,5 @@ extern Cached_item *new_Cached_item(THD
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 bool field_is_equal_to_item(Field *field,Item *item);
+
+#endif /* ITEM_INCLUDED */
=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h 2009-01-26 16:03:39 +0000
+++ b/sql/item_cmpfunc.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1739,3 +1742,5 @@ inline Item *and_conds(Item *a, Item *b)
}
Item *and_expressions(Item *a, Item *b, Item **org_item);
+
+#endif /* ITEM_CMPFUNC_INCLUDED */
=== modified file 'sql/item_func.h'
--- a/sql/item_func.h 2009-04-14 21:07:28 +0000
+++ b/sql/item_func.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1712,3 +1715,4 @@ public:
bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
};
+#endif /* ITEM_FUNC_INCLUDED */
=== modified file 'sql/item_geofunc.h'
--- a/sql/item_geofunc.h 2008-02-22 10:30:33 +0000
+++ b/sql/item_geofunc.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/item_row.h'
--- a/sql/item_row.h 2008-02-22 11:11:25 +0000
+++ b/sql/item_row.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -78,3 +81,5 @@ public:
bool null_inside() { return with_null; };
void bring_value();
};
+
+#endif /* ITEM_ROW_INCLUDED */
=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h 2009-04-17 20:14:25 +0000
+++ b/sql/item_strfunc.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -876,3 +879,4 @@ public:
String *val_str(String *);
};
+#endif /* ITEM_STRFUNC_INCLUDED */
=== modified file 'sql/item_subselect.h'
--- a/sql/item_subselect.h 2008-11-10 18:36:50 +0000
+++ b/sql/item_subselect.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -712,3 +715,5 @@ public:
}
virtual enum_engine_type engine_type() { return HASH_SJ_ENGINE; }
};
+
+#endif /* ITEM_SUBSELECT_INCLUDED */
=== modified file 'sql/item_sum.h'
--- a/sql/item_sum.h 2009-05-14 21:49:53 +0000
+++ b/sql/item_sum.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1277,3 +1280,5 @@ public:
virtual bool change_context_processor(uchar *cntx)
{ context= (Name_resolution_context *)cntx; return FALSE; }
};
+
+#endif /* ITEM_SUM_INCLUDED */
=== modified file 'sql/item_timefunc.h'
--- a/sql/item_timefunc.h 2009-02-07 16:00:57 +0000
+++ b/sql/item_timefunc.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/item_xmlfunc.h'
--- a/sql/item_xmlfunc.h 2007-11-21 12:00:09 +0000
+++ b/sql/item_xmlfunc.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/lex.h'
--- a/sql/lex.h 2009-03-09 14:00:03 +0000
+++ b/sql/lex.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -668,3 +671,5 @@ static SYMBOL sql_functions[] = {
{ "VAR_POP", SYM(VARIANCE_SYM)},
{ "VAR_SAMP", SYM(VAR_SAMP_SYM)},
};
+
+#endif /* LEX_INCLUDED */
=== modified file 'sql/message.h'
--- a/sql/message.h 2008-10-23 13:28:53 +0000
+++ b/sql/message.h 2009-06-22 09:36:50 +0000
@@ -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 */
+
=== modified file 'sql/mysqld_suffix.h'
--- a/sql/mysqld_suffix.h 2007-10-16 20:11:50 +0000
+++ b/sql/mysqld_suffix.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/nt_servc.h'
--- a/sql/nt_servc.h 2008-11-22 00:10:38 +0000
+++ b/sql/nt_servc.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/partition_element.h'
--- a/sql/partition_element.h 2007-04-13 17:23:02 +0000
+++ b/sql/partition_element.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/partition_info.h'
--- a/sql/partition_info.h 2008-12-17 18:40:14 +0000
+++ b/sql/partition_info.h 2009-06-22 09:36:50 +0000
@@ -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(partit
part_iter->part_nums.end= part_info->no_parts;
part_iter->get_next= get_next_partition_id_range;
}
+
+#endif /* PARTITION_INFO_INCLUDED */
=== modified file 'sql/procedure.h'
--- a/sql/procedure.h 2008-08-07 17:52:43 +0000
+++ b/sql/procedure.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/protocol.h'
--- a/sql/protocol.h 2009-01-17 02:29:30 +0000
+++ b/sql/protocol.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -205,3 +208,4 @@ uchar *net_store_data(uchar *to,longlong
///////////////////////////////////////////////////////////////////////////
+#endif /* PROTOCOL_INCLUDED */
=== modified file 'sql/repl_failsafe.h'
--- a/sql/repl_failsafe.h 2007-08-16 06:52:50 +0000
+++ b/sql/repl_failsafe.h 2009-06-22 09:36:50 +0000
@@ -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* pack
void unregister_slave(THD* thd, bool only_mine, bool need_mutex);
#endif /* HAVE_REPLICATION */
+#endif /* REPL_FAILSAFE_INCLUDED */
=== modified file 'sql/scheduler.h'
--- a/sql/scheduler.h 2009-05-28 07:41:48 +0000
+++ b/sql/scheduler.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/set_var.h'
--- a/sql/set_var.h 2009-04-30 09:24:45 +0000
+++ b/sql/set_var.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1551,3 +1554,5 @@ void free_key_cache(const char *name, KE
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 */
=== modified file 'sql/sql_acl.h'
--- a/sql/sql_acl.h 2009-04-02 08:50:24 +0000
+++ b/sql/sql_acl.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -283,3 +286,4 @@ bool has_any_table_level_privileges(THD
#define check_grant(A,B,C,D,E,F) 0
#define check_grant_db(A,B) 0
#endif
+#endif /* SQL_ACL_INCLUDED */
=== modified file 'sql/sql_analyse.h'
--- a/sql/sql_analyse.h 2008-03-21 15:48:28 +0000
+++ b/sql/sql_analyse.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/sql_array.h'
--- a/sql/sql_array.h 2008-03-04 17:09:56 +0000
+++ b/sql/sql_array.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -148,3 +151,4 @@ public:
}
};
+#endif /* SQL_ARRAY_INCLUDED */
=== modified file 'sql/sql_audit.h'
--- a/sql/sql_audit.h 2009-04-07 20:19:26 +0000
+++ b/sql/sql_audit.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SQL_AUDIT_INCLUDED
+#define SQL_AUDIT_INCLUDED
+
/* Copyright (C) 2007 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -125,3 +128,4 @@ void mysql_audit_general(THD *thd, uint
}
+#endif /* SQL_AUDIT_INCLUDED */
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h 2009-05-14 08:56:34 +0000
+++ b/sql/sql_class.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SQL_CLASS_INCLUDED
+#define SQL_CLASS_INCLUDED
+
/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -3256,3 +3259,4 @@ void add_diff_to_status(STATUS_VAR *to_v
void mark_transaction_to_rollback(THD *thd, bool all);
#endif /* MYSQL_SERVER */
+#endif /* SQL_CLASS_INCLUDED */
=== modified file 'sql/sql_crypt.h'
--- a/sql/sql_crypt.h 2009-04-23 08:42:37 +0000
+++ b/sql/sql_crypt.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h 2009-04-10 14:33:30 +0000
+++ b/sql/sql_lex.h 2009-06-22 09:36:50 +0000
@@ -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 */
@@ -2114,3 +2117,4 @@ extern bool is_lex_native_function(const
*/
#endif /* MYSQL_SERVER */
+#endif /* SQL_LEX_INCLUDED */
=== modified file 'sql/sql_map.h'
--- a/sql/sql_map.h 2007-05-10 09:59:39 +0000
+++ b/sql/sql_map.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/sql_partition.h'
--- a/sql/sql_partition.h 2007-11-20 10:21:00 +0000
+++ b/sql/sql_partition.h 2009-06-22 09:36:50 +0000
@@ -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_it
#include "partition_info.h"
+#endif /* SQL_PARTITION_INCLUDED */
=== modified file 'sql/sql_plugin_services.h'
--- a/sql/sql_plugin_services.h 2009-04-30 16:22:40 +0000
+++ b/sql/sql_plugin_services.h 2009-06-22 09:36:50 +0000
@@ -1,3 +1,6 @@
+#ifndef SQL_PLUGIN_SERVICES_INCLUDED
+#define SQL_PLUGIN_SERVICES_INCLUDED
+
/* Copyright (C) 2009 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify
@@ -14,6 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* support for Services */
+
#include <service_versions.h>
struct st_service_ref {
@@ -42,3 +46,4 @@ static struct st_service_ref list_of_ser
{ "thd_alloc_service", VERSION_thd_alloc, &thd_alloc_handler }
};
+#endif /* SQL_PLUGIN_SERVICES_INCLUDED */
=== modified file 'sql/sql_repl.h'
--- a/sql/sql_repl.h 2008-12-16 20:54:07 +0000
+++ b/sql/sql_repl.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -67,3 +70,4 @@ int init_replication_sys_vars();
#endif /* HAVE_REPLICATION */
+#endif /* SQL_REPL_INCLUDED */
=== modified file 'sql/sql_select.h'
--- a/sql/sql_select.h 2009-05-07 20:48:24 +0000
+++ b/sql/sql_select.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1950,3 +1953,4 @@ inline bool optimizer_flag(THD *thd, uin
return (thd->variables.optimizer_switch & flag);
}
+#endif /* SQL_SELECT_INCLUDED */
=== modified file 'sql/sql_servers.h'
--- a/sql/sql_servers.h 2007-03-28 14:57:08 +0000
+++ b/sql/sql_servers.h 2009-06-22 09:36:50 +0000
@@ -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_OP
/* lookup functions */
FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name,
FOREIGN_SERVER *server_buffer);
+
+#endif /* SQL_SERVERS_INCLUDED */
=== modified file 'sql/sql_sort.h'
--- a/sql/sql_sort.h 2007-09-27 14:05:07 +0000
+++ b/sql/sql_sort.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -81,3 +84,5 @@ int merge_buffers(SORTPARAM *param,IO_CA
BUFFPEK *lastbuff,BUFFPEK *Fb,
BUFFPEK *Tb,int flag);
void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length);
+
+#endif /* SQL_SORT_INCLUDED */
=== modified file 'sql/sql_string.h'
--- a/sql/sql_string.h 2009-01-26 16:03:39 +0000
+++ b/sql/sql_string.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -387,3 +390,4 @@ bool operator!=(const String &s1, const
return !(s1 == s2);
}
+#endif /* SQL_STRING_INCLUDED */
=== modified file 'sql/sql_trigger.h'
--- a/sql/sql_trigger.h 2009-01-14 14:50:51 +0000
+++ b/sql/sql_trigger.h 2009-06-22 09:36:50 +0000
@@ -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 *th
const LEX_STRING *trn_path,
LEX_STRING *tbl_name);
+#endif /* SQL_TRIGGER_INCLUDED */
=== modified file 'sql/sql_udf.h'
--- a/sql/sql_udf.h 2009-05-14 21:49:53 +0000
+++ b/sql/sql_udf.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/sql_view.h'
--- a/sql/sql_view.h 2009-04-13 13:09:10 +0000
+++ b/sql/sql_view.h 2009-06-22 09:36:50 +0000
@@ -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 c
#define VIEW_ANY_ACL (SELECT_ACL | UPDATE_ACL | INSERT_ACL | DELETE_ACL)
+#endif /* SQL_VIEW_INCLUDED */
=== modified file 'sql/structs.h'
--- a/sql/structs.h 2009-02-02 12:28:30 +0000
+++ b/sql/structs.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -358,3 +361,5 @@ public:
Discrete_interval* get_tail() const { return tail; };
Discrete_interval* get_current() const { return current; };
};
+
+#endif /* STRUCTS_INCLUDED */
=== modified file 'sql/table.h'
--- a/sql/table.h 2009-03-18 12:49:07 +0000
+++ b/sql/table.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -1769,3 +1772,4 @@ size_t max_row_length(TABLE *table, cons
void alloc_mdl_requests(TABLE_LIST *table_list, MEM_ROOT *root);
+#endif /* TABLE_INCLUDED */
=== modified file 'sql/transaction.h'
--- a/sql/transaction.h 2008-08-12 22:30:55 +0000
+++ b/sql/transaction.h 2009-06-22 09:36:50 +0000
@@ -13,13 +13,13 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#ifndef TRANSACTION_H
+#define TRANSACTION_H
+
#ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class implementation */
#endif
-#ifndef TRANSACTION_H
-#define TRANSACTION_H
-
#include <my_global.h>
#include <m_string.h>
=== modified file 'sql/tzfile.h'
--- a/sql/tzfile.h 2007-05-10 09:59:39 +0000
+++ b/sql/tzfile.h 2009-06-22 09:36:50 +0000
@@ -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
=== modified file 'sql/tztime.h'
--- a/sql/tztime.h 2009-01-15 18:11:25 +0000
+++ b/sql/tztime.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'sql/unireg.h'
--- a/sql/unireg.h 2009-02-02 15:58:48 +0000
+++ b/sql/unireg.h 2009-06-22 09:36:50 +0000
@@ -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
=== modified file 'strings/strings-not-used.h'
--- a/strings/strings-not-used.h 2006-12-23 19:17:15 +0000
+++ b/strings/strings-not-used.h 2009-06-22 09:36:50 +0000
@@ -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 */
=== modified file 'vio/vio_priv.h'
--- a/vio/vio_priv.h 2008-04-02 17:52:11 +0000
+++ b/vio/vio_priv.h 2009-06-22 09:36:50 +0000
@@ -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
@@ -44,3 +47,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 */
Attachment: [text/bzr-bundle] bzr/mats@sun.com-20090622093650-h5ie053s664rrpea.bundle
| Thread |
|---|
| • bzr commit into mysql-5.4 branch (mats:2796) WL#5016 | Mats Kindahl | 22 Jun |
