Commit 4ad8ef06 authored by Mats Kindahl's avatar Mats Kindahl

WL#5016: Fix header file include guards

            
Adding header include file guards to files that are missing such.
parent 8f35f7c9
#ifndef CLIENT_MY_READLINE_INCLUDED
#define CLIENT_MY_READLINE_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -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 LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
extern char *batch_readline(LINE_BUFFER *buffer, bool *truncated); extern char *batch_readline(LINE_BUFFER *buffer, bool *truncated);
extern void batch_readline_end(LINE_BUFFER *buffer); extern void batch_readline_end(LINE_BUFFER *buffer);
#endif /* CLIENT_MY_READLINE_INCLUDED */
#ifndef CLIENT_SQL_STRING_INCLUDED
#define CLIENT_SQL_STRING_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -353,3 +356,5 @@ class String ...@@ -353,3 +356,5 @@ class String
return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length); return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
} }
}; };
#endif /* CLIENT_SQL_STRING_INCLUDED */
#ifndef ATOMIC_GCC_BUILTINS_INCLUDED
#define ATOMIC_GCC_BUILTINS_INCLUDED
/* Copyright (C) 2008 MySQL AB /* Copyright (C) 2008 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -31,3 +34,5 @@ ...@@ -31,3 +34,5 @@
#define make_atomic_store_body(S) \ #define make_atomic_store_body(S) \
(void) __sync_lock_test_and_set(a, v); (void) __sync_lock_test_and_set(a, v);
#endif #endif
#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */
#ifndef ATOMIC_NOLOCK_INCLUDED
#define ATOMIC_NOLOCK_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -42,3 +45,4 @@ typedef struct { } my_atomic_rwlock_t; ...@@ -42,3 +45,4 @@ typedef struct { } my_atomic_rwlock_t;
#endif #endif
#endif /* ATOMIC_NOLOCK_INCLUDED */
#ifndef ATOMIC_RWLOCK_INCLUDED
#define ATOMIC_RWLOCK_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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; ...@@ -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_load_body(S) ret= *a;
#define make_atomic_store_body(S) *a= v; #define make_atomic_store_body(S) *a= v;
#endif /* ATOMIC_RWLOCK_INCLUDED */
#ifndef ATOMIC_X86_GCC_INCLUDED
#define ATOMIC_X86_GCC_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -56,3 +59,4 @@ ...@@ -56,3 +59,4 @@
asm volatile ("; xchg %0, %1;" : "+m" (*a) : "r" (v)) asm volatile ("; xchg %0, %1;" : "+m" (*a) : "r" (v))
#endif #endif
#endif /* ATOMIC_X86_GCC_INCLUDED */
#ifndef CONFIG_WIN_INCLUDED
#define CONFIG_WIN_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -410,3 +413,5 @@ inline ulonglong double2ulonglong(double d) ...@@ -410,3 +413,5 @@ inline ulonglong double2ulonglong(double d)
#define HAVE_UCA_COLLATIONS 1 #define HAVE_UCA_COLLATIONS 1
#define HAVE_BOOL 1 #define HAVE_BOOL 1
#endif /* CONFIG_WIN_INCLUDED */
#ifndef ERRMSG_INCLUDED
#define ERRMSG_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -100,3 +103,4 @@ extern const char *client_errors[]; /* Error messages */ ...@@ -100,3 +103,4 @@ extern const char *client_errors[]; /* Error messages */
#define CR_ERROR_LAST /*Copy last error nr:*/ 2057 #define CR_ERROR_LAST /*Copy last error nr:*/ 2057
/* Add error numbers before CR_ERROR_LAST and change it accordingly. */ /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
#endif /* ERRMSG_INCLUDED */
#ifndef HELP_END_INCLUDED
#define HELP_END_INCLUDED
/* Copyright (C) 2004-2005 MySQL AB /* Copyright (C) 2004-2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -20,3 +23,4 @@ ...@@ -20,3 +23,4 @@
#undef fputc #undef fputc
#undef putchar #undef putchar
#endif #endif
#endif /* HELP_END_INCLUDED */
#ifndef HELP_START_INCLUDED
#define HELP_START_INCLUDED
/* Copyright (C) 2004-2005 MySQL AB /* Copyright (C) 2004-2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -22,3 +25,4 @@ ...@@ -22,3 +25,4 @@
#define fputc(s,f) consoleprintf("%c", s) #define fputc(s,f) consoleprintf("%c", s)
#define putchar(s) consoleprintf("%c", s) #define putchar(s) consoleprintf("%c", s)
#endif #endif
#endif /* HELP_START_INCLUDED */
#ifndef MY_AES_INCLUDED
#define MY_AES_INCLUDED
/* Copyright (C) 2002 MySQL AB /* Copyright (C) 2002 MySQL AB
This program is free software; you can redistribute it and/or modify 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, ...@@ -63,3 +66,5 @@ int my_aes_decrypt(const char *source, int source_length, char *dest,
int my_aes_get_size(int source_length); int my_aes_get_size(int source_length);
C_MODE_END C_MODE_END
#endif /* MY_AES_INCLUDED */
#ifndef MY_ATOMIC_INCLUDED
#define MY_ATOMIC_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -140,3 +143,4 @@ extern int my_atomic_initialize(); ...@@ -140,3 +143,4 @@ extern int my_atomic_initialize();
#endif #endif
#endif /* MY_ATOMIC_INCLUDED */
#ifndef MY_BIT_INCLUDED
#define MY_BIT_INCLUDED
/* /*
Some useful bit functions Some useful bit functions
*/ */
...@@ -107,3 +110,5 @@ extern uint my_count_bits(ulonglong v); ...@@ -107,3 +110,5 @@ extern uint my_count_bits(ulonglong v);
extern uint my_count_bits_ushort(ushort v); extern uint my_count_bits_ushort(ushort v);
#endif /* HAVE_INLINE */ #endif /* HAVE_INLINE */
C_MODE_END C_MODE_END
#endif /* MY_BIT_INCLUDED */
#ifndef MY_LIBWRAP_INCLUDED
#define MY_LIBWRAP_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -25,3 +28,4 @@ extern int my_hosts_access(struct request_info *req);
extern char *my_eval_client(struct request_info *req); extern char *my_eval_client(struct request_info *req);
#endif /* HAVE_LIBWRAP */ #endif /* HAVE_LIBWRAP */
#endif /* MY_LIBWRAP_INCLUDED */
#ifndef MY_MD5_INCLUDED
#define MY_MD5_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -52,3 +55,5 @@ do { \ ...@@ -52,3 +55,5 @@ do { \
my_MD5Update (&ctx, buf, len); \ my_MD5Update (&ctx, buf, len); \
my_MD5Final (digest, &ctx); \ my_MD5Final (digest, &ctx); \
} while (0) } while (0)
#endif /* MY_MD__INCLUDED */
#ifndef MY_NO_PTHREAD_INCLUDED
#define MY_NO_PTHREAD_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -14,9 +17,7 @@ ...@@ -14,9 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#if !defined(_my_no_pthread_h) && !defined(THREAD) #ifndef THREAD
#define _my_no_pthread_h
/* /*
This block is to access some thread-related type definitions This block is to access some thread-related type definitions
...@@ -48,3 +49,4 @@ ...@@ -48,3 +49,4 @@
#define rwlock_destroy(A) #define rwlock_destroy(A)
#endif #endif
#endif /* MY_NO_PTHREAD_INCLUDED */
#ifndef MY_UCTYPE_INCLUDED
#define MY_UCTYPE_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1477,3 +1480,4 @@ MY_UNI_CTYPE my_uni_ctype[256]={ ...@@ -1477,3 +1480,4 @@ MY_UNI_CTYPE my_uni_ctype[256]={
}; };
#endif /* MY_UCTYPE_INCLUDED */
#ifndef MYISAMPACK_INCLUDED
#define MYISAMPACK_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -236,3 +239,4 @@ ...@@ -236,3 +239,4 @@
mi_int4store(((T) + 4), A); }} mi_int4store(((T) + 4), A); }}
#define mi_sizekorr(T) mi_uint4korr((uchar*) (T) + 4) #define mi_sizekorr(T) mi_uint4korr((uchar*) (T) + 4)
#endif #endif
#endif /* MYISAMPACK_INCLUDED */
#ifndef MYSQL_EMBED_INCLUDED
#define MYSQL_EMBED_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -28,3 +31,4 @@ ...@@ -28,3 +31,4 @@
#define DONT_USE_RAID #define DONT_USE_RAID
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
#endif /* MYSQL_EMBED_INCLUDED */
#ifndef RIJNDAEL_INCLUDED
#define RIJNDAEL_INCLUDED
/* Copyright (C) 2002 MySQL AB /* Copyright (C) 2002 MySQL AB
This program is free software; you can redistribute it and/or modify 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, ...@@ -39,3 +42,5 @@ void rijndaelEncrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
const uint8 pt[16], uint8 ct[16]); const uint8 pt[16], uint8 ct[16]);
void rijndaelDecrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr, void rijndaelDecrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
const uint8 ct[16], uint8 pt[16]); const uint8 ct[16], uint8 pt[16]);
#endif /* RIJNDAEL_INCLUDED */
#ifndef SHA1_INCLUDED
#define SHA1_INCLUDED
/* Copyright (C) 2002, 2006 MySQL AB /* Copyright (C) 2002, 2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -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]); int mysql_sha1_result(SHA1_CONTEXT* , uint8 Message_Digest[SHA1_HASH_SIZE]);
C_MODE_END C_MODE_END
#endif /* SHA__INCLUDED */
#ifndef SQL_COMMON_INCLUDED
#define SQL_COMMON_INCLUDED
/* Copyright (C) 2003-2004, 2006 MySQL AB /* Copyright (C) 2003-2004, 2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -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) #define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
#endif /* SQL_COMMON_INCLUDED */
#ifndef SSLOPT_CASE_INCLUDED
#define SSLOPT_CASE_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -26,3 +29,4 @@ ...@@ -26,3 +29,4 @@
opt_use_ssl= 1; opt_use_ssl= 1;
break; break;
#endif #endif
#endif /* SSLOPT_CASE_INCLUDED */
#ifndef SSLOPT_LONGOPTS_INCLUDED
#define SSLOPT_LONGOPTS_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -43,3 +46,4 @@ ...@@ -43,3 +46,4 @@
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
#endif /* SSLOPT_LONGOPTS_INCLUDED */
#ifndef SSLOPT_VARS_INCLUDED
#define SSLOPT_VARS_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -29,3 +32,4 @@ SSL_STATIC char *opt_ssl_key = 0; ...@@ -29,3 +32,4 @@ SSL_STATIC char *opt_ssl_key = 0;
SSL_STATIC my_bool opt_ssl_verify_server_cert= 0; SSL_STATIC my_bool opt_ssl_verify_server_cert= 0;
#endif #endif
#endif #endif
#endif /* SSLOPT_VARS_INCLUDED */
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 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 uint mysql_port;
extern char * mysql_unix_port; extern char * mysql_unix_port;
......
#ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
#define MYSYS_MY_HANDLER_ERRORS_INCLUDED
/* /*
Errors a handler can give you Errors a handler can give you
...@@ -66,3 +68,4 @@ static const char *handler_error_messages[]= ...@@ -66,3 +68,4 @@ static const char *handler_error_messages[]=
"Too many active concurrent transactions" "Too many active concurrent transactions"
}; };
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */
#ifndef MYSYS_MY_STATIC_INCLUDED
#define MYSYS_MY_STATIC_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -72,3 +75,5 @@ extern ulonglong query_performance_frequency, query_performance_offset; ...@@ -72,3 +75,5 @@ extern ulonglong query_performance_frequency, query_performance_offset;
extern sigset_t my_signals; /* signals blocked by mf_brkhant */ extern sigset_t my_signals; /* signals blocked by mf_brkhant */
#endif #endif
C_MODE_END C_MODE_END
#endif /* MYSYS_MY_STATIC_INCLUDED */
#ifndef AUTHORS_INCLUDED
#define AUTHORS_INCLUDED
/* Copyright (C) 2005-2006 MySQL AB /* Copyright (C) 2005-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -150,3 +153,5 @@ struct show_table_authors_st show_table_authors[]= { ...@@ -150,3 +153,5 @@ struct show_table_authors_st show_table_authors[]= {
"SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" }, "SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" },
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
#endif /* AUTHORS_INCLUDED */
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ 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> #include <thr_alarm.h>
#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \
......
#ifndef CONTRIBUTORS_INCLUDED
#define CONTRIBUTORS_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -37,3 +40,5 @@ struct show_table_contributors_st show_table_contributors[]= { ...@@ -37,3 +40,5 @@ struct show_table_contributors_st show_table_contributors[]= {
{"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"}, {"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"},
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
#endif /* CONTRIBUTORS_INCLUDED */
#ifndef FIELD_INCLUDED
#define FIELD_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify 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); ...@@ -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_no_default(x) (x & FIELDFLAG_NO_DEFAULT)
#define f_bit_as_char(x) ((x) & FIELDFLAG_TREAT_BIT_AS_CHAR) #define f_bit_as_char(x) ((x) & FIELDFLAG_TREAT_BIT_AS_CHAR)
#define f_is_hex_escape(x) ((x) & FIELDFLAG_HEX_ESCAPE) #define f_is_hex_escape(x) ((x) & FIELDFLAG_HEX_ESCAPE)
#endif /* FIELD_INCLUDED */
#ifndef GSTREAM_INCLUDED
#define GSTREAM_INCLUDED
/* Copyright (C) 2000-2004 MySQL AB /* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -73,3 +76,5 @@ class Gis_read_stream ...@@ -73,3 +76,5 @@ class Gis_read_stream
char *m_err_msg; char *m_err_msg;
CHARSET_INFO *m_charset; CHARSET_INFO *m_charset;
}; };
#endif /* GSTREAM_INCLUDED */
#ifndef HA_NDBCLUSTER_INCLUDED
#define HA_NDBCLUSTER_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify 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; ...@@ -581,3 +584,5 @@ static const int ndbcluster_hton_name_length=sizeof(ndbcluster_hton_name)-1;
extern int ndbcluster_terminating; extern int ndbcluster_terminating;
extern int ndb_util_thread_running; extern int ndb_util_thread_running;
extern pthread_cond_t COND_ndb_util_ready; extern pthread_cond_t COND_ndb_util_ready;
#endif /* HA_NDBCLUSTER_INCLUDED */
#ifndef HA_NDBCLUSTER_BINLOG_INCLUDED
#define HA_NDBCLUSTER_BINLOG_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify 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) ...@@ -225,3 +228,5 @@ set_thd_ndb(THD *thd, Thd_ndb *thd_ndb)
{ thd_set_ha_data(thd, ndbcluster_hton, thd_ndb); } { thd_set_ha_data(thd, ndbcluster_hton, thd_ndb); }
Ndb* check_ndb_in_thd(THD* thd); Ndb* check_ndb_in_thd(THD* thd);
#endif /* HA_NDBCLUSTER_BINLOG_INCLUDED */
#ifndef HA_NDBCLUSTER_COND_INCLUDED
#define HA_NDBCLUSTER_COND_INCLUDED
/* Copyright (C) 2000-2007 MySQL AB /* Copyright (C) 2000-2007 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -486,3 +489,5 @@ class ha_ndbcluster_cond ...@@ -486,3 +489,5 @@ class ha_ndbcluster_cond
Ndb_cond_stack *m_cond_stack; Ndb_cond_stack *m_cond_stack;
}; };
#endif /* HA_NDBCLUSTER_COND_INCLUDED */
#ifndef HA_NDBCLUSTER_TABLES_INCLUDED
#define HA_NDBCLUSTER_TABLES_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -21,3 +24,5 @@ ...@@ -21,3 +24,5 @@
#define OLD_NDB_APPLY_TABLE "apply_status" #define OLD_NDB_APPLY_TABLE "apply_status"
#define NDB_SCHEMA_TABLE "ndb_schema" #define NDB_SCHEMA_TABLE "ndb_schema"
#define OLD_NDB_SCHEMA_TABLE "schema" #define OLD_NDB_SCHEMA_TABLE "schema"
#endif /* HA_NDBCLUSTER_TABLES_INCLUDED */
#ifndef HA_PARTITION_INCLUDED
#define HA_PARTITION_INCLUDED
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1090,3 +1093,5 @@ class ha_partition :public handler ...@@ -1090,3 +1093,5 @@ class ha_partition :public handler
virtual void append_create_info(String *packet) virtual void append_create_info(String *packet)
*/ */
}; };
#endif /* HA_PARTITION_INCLUDED */
#ifndef HANDLER_INCLUDED
#define HANDLER_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -2064,3 +2067,4 @@ int ha_binlog_end(THD *thd); ...@@ -2064,3 +2067,4 @@ int ha_binlog_end(THD *thd);
#define ha_binlog_wait(a) do {} while (0) #define ha_binlog_wait(a) do {} while (0)
#define ha_binlog_end(a) do {} while (0) #define ha_binlog_end(a) do {} while (0)
#endif #endif
#endif /* HANDLER_INCLUDED */
#ifndef ITEM_INCLUDED
#define ITEM_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify 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); ...@@ -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 Item_result item_cmp_type(Item_result a,Item_result b);
extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item); extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item);
extern int stored_field_cmp_to_item(Field *field, Item *item); extern int stored_field_cmp_to_item(Field *field, Item *item);
#endif /* ITEM_INCLUDED */
#ifndef ITEM_CMPFUNC_INCLUDED
#define ITEM_CMPFUNC_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1721,3 +1724,5 @@ inline Item *and_conds(Item *a, Item *b) ...@@ -1721,3 +1724,5 @@ inline Item *and_conds(Item *a, Item *b)
} }
Item *and_expressions(Item *a, Item *b, Item **org_item); Item *and_expressions(Item *a, Item *b, Item **org_item);
#endif /* ITEM_CMPFUNC_INCLUDED */
#ifndef ITEM_FUNC_INCLUDED
#define ITEM_FUNC_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1718,3 +1721,4 @@ class Item_func_uuid_short :public Item_int_func ...@@ -1718,3 +1721,4 @@ class Item_func_uuid_short :public Item_int_func
bool check_partition_func_processor(uchar *int_arg) {return FALSE;} bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
}; };
#endif /* ITEM_FUNC_INCLUDED */
#ifndef ITEM_GEOFUNC_INCLUDED
#define ITEM_GEOFUNC_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -386,3 +389,4 @@ class Item_func_srid: public Item_int_func ...@@ -386,3 +389,4 @@ class Item_func_srid: public Item_int_func
#endif #endif
#endif /* ITEM_GEOFUNC_INCLUDED */
#ifndef ITEM_ROW_INCLUDED
#define ITEM_ROW_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -77,3 +80,5 @@ class Item_row: public Item ...@@ -77,3 +80,5 @@ class Item_row: public Item
bool null_inside() { return with_null; }; bool null_inside() { return with_null; };
void bring_value(); void bring_value();
}; };
#endif /* ITEM_ROW_INCLUDED */
#ifndef ITEM_STRFUNC_INCLUDED
#define ITEM_STRFUNC_INCLUDED
/* Copyright (C) 2000-2003 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -842,3 +845,4 @@ class Item_func_uuid: public Item_str_func ...@@ -842,3 +845,4 @@ class Item_func_uuid: public Item_str_func
String *val_str(String *); String *val_str(String *);
}; };
#endif /* ITEM_STRFUNC_INCLUDED */
#ifndef ITEM_SUBSELECT_INCLUDED
#define ITEM_SUBSELECT_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -579,4 +582,4 @@ inline bool Item_subselect::is_uncacheable() const ...@@ -579,4 +582,4 @@ inline bool Item_subselect::is_uncacheable() const
return engine->uncacheable(); return engine->uncacheable();
} }
#endif /* ITEM_SUBSELECT_INCLUDED */
#ifndef ITEM_SUM_INCLUDED
#define ITEM_SUM_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1279,3 +1282,5 @@ class Item_func_group_concat : public Item_sum ...@@ -1279,3 +1282,5 @@ class Item_func_group_concat : public Item_sum
virtual bool change_context_processor(uchar *cntx) virtual bool change_context_processor(uchar *cntx)
{ context= (Name_resolution_context *)cntx; return FALSE; } { context= (Name_resolution_context *)cntx; return FALSE; }
}; };
#endif /* ITEM_SUM_INCLUDED */
#ifndef ITEM_TIMEFUNC_INCLUDED
#define ITEM_TIMEFUNC_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -1026,3 +1029,5 @@ class Item_func_last_day :public Item_date ...@@ -1026,3 +1029,5 @@ class Item_func_last_day :public Item_date
const char *func_name() const { return "last_day"; } const char *func_name() const { return "last_day"; }
bool get_date(MYSQL_TIME *res, uint fuzzy_date); bool get_date(MYSQL_TIME *res, uint fuzzy_date);
}; };
#endif /* ITEM_TIMEFUNC_INCLUDED */
#ifndef ITEM_XMLFUNC_INCLUDED
#define ITEM_XMLFUNC_INCLUDED
/* Copyright (C) 2000-2005 MySQL AB /* Copyright (C) 2000-2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -61,3 +64,4 @@ class Item_func_xml_update: public Item_xml_str_func ...@@ -61,3 +64,4 @@ class Item_func_xml_update: public Item_xml_str_func
String *val_str(String *); String *val_str(String *);
}; };
#endif /* ITEM_XMLFUNC_INCLUDED */
#ifndef LEX_INCLUDED
#define LEX_INCLUDED
/* Copyright (C) 2000-2002 MySQL AB /* Copyright (C) 2000-2002 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -634,3 +637,5 @@ static SYMBOL sql_functions[] = { ...@@ -634,3 +637,5 @@ static SYMBOL sql_functions[] = {
{ "VAR_POP", SYM(VARIANCE_SYM)}, { "VAR_POP", SYM(VARIANCE_SYM)},
{ "VAR_SAMP", SYM(VAR_SAMP_SYM)}, { "VAR_SAMP", SYM(VAR_SAMP_SYM)},
}; };
#endif /* LEX_INCLUDED */
#ifndef MESSAGE_INCLUDED
#define MESSAGE_INCLUDED
/* /*
To change or add messages mysqld writes to the Windows error log, run To change or add messages mysqld writes to the Windows error log, run
mc.exe message.mc mc.exe message.mc
...@@ -6,6 +9,8 @@ ...@@ -6,6 +9,8 @@
mc.exe can be installed with Windows SDK, some Visual Studio distributions mc.exe can be installed with Windows SDK, some Visual Studio distributions
do not include it. do not include it.
*/ */
// //
// Values are 32 bit values layed out as follows: // Values are 32 bit values layed out as follows:
// //
...@@ -53,3 +58,5 @@ ...@@ -53,3 +58,5 @@
// //
#define MSG_DEFAULT 0xC0000064L #define MSG_DEFAULT 0xC0000064L
#endif /* MESSAGE_INCLUDED */
#ifndef MYSQLD_SUFFIX_INCLUDED
#define MYSQLD_SUFFIX_INCLUDED
/* Copyright (C) 2000-2004 MySQL AB /* Copyright (C) 2000-2004 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -27,3 +30,4 @@ ...@@ -27,3 +30,4 @@
#else #else
#define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF #define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF
#endif #endif
#endif /* MYSQLD_SUFFIX_INCLUDED */
#ifndef NT_SERVC_INCLUDED
#define NT_SERVC_INCLUDED
/** /**
@file @file
...@@ -98,3 +101,5 @@ class NTService ...@@ -98,3 +101,5 @@ class NTService
}; };
/* ------------------------- the end -------------------------------------- */ /* ------------------------- the end -------------------------------------- */
#endif /* NT_SERVC_INCLUDED */
#ifndef PARTITION_ELEMENT_INCLUDED
#define PARTITION_ELEMENT_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -97,3 +100,5 @@ class partition_element :public Sql_alloc { ...@@ -97,3 +100,5 @@ class partition_element :public Sql_alloc {
} }
~partition_element() {} ~partition_element() {}
}; };
#endif /* PARTITION_ELEMENT_INCLUDED */
#ifndef PARTITION_INFO_INCLUDED
#define PARTITION_INFO_INCLUDED
/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify 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, ...@@ -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->ret_null_part= part_iter->ret_null_part_orig= FALSE;
part_iter->get_next= get_next_partition_id_range; part_iter->get_next= get_next_partition_id_range;
} }
#endif /* PARTITION_INFO_INCLUDED */
#ifndef PROCEDURE_INCLUDED
#define PROCEDURE_INCLUDED
/* Copyright (C) 2000-2005 MySQL AB /* Copyright (C) 2000-2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -149,3 +152,5 @@ class Procedure { ...@@ -149,3 +152,5 @@ class Procedure {
Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result, Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result,
List<Item> &field_list,int *error); List<Item> &field_list,int *error);
#endif /* PROCEDURE_INCLUDED */
#ifndef PROTOCOL_INCLUDED
#define PROTOCOL_INCLUDED
/* Copyright (C) 2002-2006 MySQL AB /* Copyright (C) 2002-2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -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,int32 from);
uchar *net_store_data(uchar *to,longlong from); uchar *net_store_data(uchar *to,longlong from);
#endif /* PROTOCOL_INCLUDED */
#ifndef REPL_FAILSAFE_INCLUDED
#define REPL_FAILSAFE_INCLUDED
/* Copyright (C) 2001-2005 MySQL AB & Sasha /* Copyright (C) 2001-2005 MySQL AB & Sasha
This program is free software; you can redistribute it and/or modify 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); ...@@ -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); void unregister_slave(THD* thd, bool only_mine, bool need_mutex);
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#endif /* REPL_FAILSAFE_INCLUDED */
#ifndef SCHEDULER_INCLUDED
#define SCHEDULER_INCLUDED
/* Copyright (C) 2007 MySQL AB /* Copyright (C) 2007 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -58,3 +61,5 @@ enum pool_command_op ...@@ -58,3 +61,5 @@ enum pool_command_op
class thd_scheduler class thd_scheduler
{}; {};
#endif /* SCHEDULER_INCLUDED */
#ifndef SET_VAR_INCLUDED
#define SET_VAR_INCLUDED
/* Copyright (C) 2002-2006 MySQL AB /* Copyright (C) 2002-2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -1449,3 +1452,5 @@ void free_key_cache(const char *name, KEY_CACHE *key_cache);
bool process_key_caches(process_key_cache_t func); bool process_key_caches(process_key_cache_t func);
void delete_elements(I_List<NAMED_LIST> *list, void delete_elements(I_List<NAMED_LIST> *list,
void (*free_element)(const char*, uchar*)); void (*free_element)(const char*, uchar*));
#endif /* SET_VAR_INCLUDED */
#ifndef SQL_ACL_INCLUDED
#define SQL_ACL_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -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(A,B,C,D,E,F) 0
#define check_grant_db(A,B) 0 #define check_grant_db(A,B) 0
#endif #endif
#endif /* SQL_ACL_INCLUDED */
#ifndef SQL_ANALYSE_INCLUDED
#define SQL_ANALYSE_INCLUDED
/* Copyright (C) 2000-2003, 2005 MySQL AB /* Copyright (C) 2000-2003, 2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -355,3 +358,5 @@ class analyse: public Procedure ...@@ -355,3 +358,5 @@ class analyse: public Procedure
select_result *result, select_result *result,
List<Item> &field_list); List<Item> &field_list);
}; };
#endif /* SQL_ANALYSE_INCLUDED */
#ifndef SQL_ARRAY_INCLUDED
#define SQL_ARRAY_INCLUDED
/* Copyright (C) 2003 MySQL AB /* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -66,3 +69,4 @@ template <class Elem> class Dynamic_array ...@@ -66,3 +69,4 @@ template <class Elem> class Dynamic_array
} }
}; };
#endif /* SQL_ARRAY_INCLUDED */
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef SQL_CLASS_INCLUDED
#define SQL_CLASS_INCLUDED
/* Classes in mysql */ /* Classes in mysql */
#ifdef USE_PRAGMA_INTERFACE #ifdef USE_PRAGMA_INTERFACE
...@@ -3003,3 +3006,4 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var, ...@@ -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); void mark_transaction_to_rollback(THD *thd, bool all);
#endif /* MYSQL_SERVER */ #endif /* MYSQL_SERVER */
#endif /* SQL_CLASS_INCLUDED */
#ifndef SQL_CRYPT_INCLUDED
#define SQL_CRYPT_INCLUDED
/* Copyright (C) 2000-2001, 2005 MySQL AB /* Copyright (C) 2000-2001, 2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -35,3 +38,5 @@ class SQL_CRYPT :public Sql_alloc ...@@ -35,3 +38,5 @@ class SQL_CRYPT :public Sql_alloc
void encode(char *str, uint length); void encode(char *str, uint length);
void decode(char *str, uint length); void decode(char *str, uint length);
}; };
#endif /* SQL_CRYPT_INCLUDED */
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
@defgroup Semantic_Analysis Semantic Analysis @defgroup Semantic_Analysis Semantic Analysis
*/ */
#ifndef SQL_LEX_INCLUDED
#define SQL_LEX_INCLUDED
/* YACC and LEX Definitions */ /* YACC and LEX Definitions */
/* These may not be declared yet */ /* These may not be declared yet */
...@@ -1979,3 +1982,4 @@ extern bool is_lex_native_function(const LEX_STRING *name); ...@@ -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); int my_missing_function_error(const LEX_STRING &token, const char *name);
#endif /* MYSQL_SERVER */ #endif /* MYSQL_SERVER */
#endif /* SQL_LEX_INCLUDED */
#ifndef SQL_MAP_INCLUDED
#define SQL_MAP_INCLUDED
/* Copyright (C) 2000-2001, 2005 MySQL AB /* Copyright (C) 2000-2001, 2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -60,3 +63,5 @@ class mapped_file ...@@ -60,3 +63,5 @@ class mapped_file
return file->map; return file->map;
} }
}; };
#endif /* SQL_MAP_INCLUDED */
#ifndef SQL_PARTITION_INCLUDED
#define SQL_PARTITION_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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, ...@@ -209,3 +212,4 @@ typedef int (*get_partitions_in_range_iter)(partition_info *part_info,
#include "partition_info.h" #include "partition_info.h"
#endif /* SQL_PARTITION_INCLUDED */
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef SQL_REPL_INCLUDED
#define SQL_REPL_INCLUDED
#include "rpl_filter.h" #include "rpl_filter.h"
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
...@@ -65,3 +68,4 @@ int init_replication_sys_vars(); ...@@ -65,3 +68,4 @@ int init_replication_sys_vars();
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
#endif /* SQL_REPL_INCLUDED */
#ifndef SQL_SELECT_INCLUDED
#define SQL_SELECT_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -736,3 +739,4 @@ inline bool optimizer_flag(THD *thd, uint flag) ...@@ -736,3 +739,4 @@ inline bool optimizer_flag(THD *thd, uint flag)
return (thd->variables.optimizer_switch & flag); return (thd->variables.optimizer_switch & flag);
} }
#endif /* SQL_SELECT_INCLUDED */
#ifndef SQL_SERVERS_INCLUDED
#define SQL_SERVERS_INCLUDED
/* Copyright (C) 2006 MySQL AB /* Copyright (C) 2006 MySQL AB
This program is free software; you can redistribute it and/or modify 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); ...@@ -41,3 +44,5 @@ int alter_server(THD *thd, LEX_SERVER_OPTIONS *server_options);
/* lookup functions */ /* lookup functions */
FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name, FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name,
FOREIGN_SERVER *server_buffer); FOREIGN_SERVER *server_buffer);
#endif /* SQL_SERVERS_INCLUDED */
#ifndef SQL_SORT_INCLUDED
#define SQL_SORT_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify 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, ...@@ -87,3 +90,5 @@ int merge_buffers(SORTPARAM *param,IO_CACHE *from_file,
BUFFPEK *lastbuff,BUFFPEK *Fb, BUFFPEK *lastbuff,BUFFPEK *Fb,
BUFFPEK *Tb,int flag); BUFFPEK *Tb,int flag);
void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length); void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length);
#endif /* SQL_SORT_INCLUDED */
#ifndef SQL_STRING_INCLUDED
#define SQL_STRING_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify 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, ...@@ -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; return str+ cs->cset->scan(cs, str, end, MY_SEQ_SPACES) == end;
} }
#endif /* SQL_STRING_INCLUDED */
#ifndef SQL_TRIGGER_INCLUDED
#define SQL_TRIGGER_INCLUDED
/* Copyright (C) 2004-2005 MySQL AB /* Copyright (C) 2004-2005 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -174,3 +177,4 @@ bool load_table_name_for_trigger(THD *thd, ...@@ -174,3 +177,4 @@ bool load_table_name_for_trigger(THD *thd,
const LEX_STRING *trn_path, const LEX_STRING *trn_path,
LEX_STRING *tbl_name); LEX_STRING *tbl_name);
#endif /* SQL_TRIGGER_INCLUDED */
#ifndef SQL_UDF_INCLUDED
#define SQL_UDF_INCLUDED
/* Copyright (C) 2000-2001, 2003-2006 MySQL AB /* Copyright (C) 2000-2001, 2003-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -140,3 +143,4 @@ void free_udf(udf_func *udf); ...@@ -140,3 +143,4 @@ void free_udf(udf_func *udf);
int mysql_create_function(THD *thd,udf_func *udf); int mysql_create_function(THD *thd,udf_func *udf);
int mysql_drop_function(THD *thd,const LEX_STRING *name); int mysql_drop_function(THD *thd,const LEX_STRING *name);
#endif #endif
#endif /* SQL_UDF_INCLUDED */
#ifndef SQL_VIEW_INCLUDED
#define SQL_VIEW_INCLUDED
/* -*- C++ -*- */ /* -*- C++ -*- */
/* Copyright (C) 2004 MySQL AB /* Copyright (C) 2004 MySQL AB
...@@ -42,3 +45,4 @@ bool mysql_rename_view(THD *thd, const char *new_db, const char *new_name, ...@@ -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) #define VIEW_ANY_ACL (SELECT_ACL | UPDATE_ACL | INSERT_ACL | DELETE_ACL)
#endif /* SQL_VIEW_INCLUDED */
#ifndef STRUCTS_INCLUDED
#define STRUCTS_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -380,3 +383,5 @@ class Discrete_intervals_list { ...@@ -380,3 +383,5 @@ class Discrete_intervals_list {
Discrete_interval* get_tail() const { return tail; }; Discrete_interval* get_tail() const { return tail; };
Discrete_interval* get_current() const { return current; }; Discrete_interval* get_current() const { return current; };
}; };
#endif /* STRUCTS_INCLUDED */
#ifndef TABLE_INCLUDED
#define TABLE_INCLUDED
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
This program is free software; you can redistribute it and/or modify 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, ...@@ -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); size_t max_row_length(TABLE *table, const uchar *data);
#endif /* TABLE_INCLUDED */
#ifndef TZFILE_INCLUDED
#define TZFILE_INCLUDED
/* Copyright (C) 2004 MySQL AB /* Copyright (C) 2004 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -134,3 +137,5 @@ struct tzhead { ...@@ -134,3 +137,5 @@ struct tzhead {
*/ */
#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
#endif
#ifndef TZTIME_INCLUDED
#define TZTIME_INCLUDED
/* Copyright (C) 2004 MySQL AB /* Copyright (C) 2004 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -79,3 +82,4 @@ static const int MY_TZ_TABLES_COUNT= 4; ...@@ -79,3 +82,4 @@ static const int MY_TZ_TABLES_COUNT= 4;
#endif /* !defined(TESTTIME) && !defined(TZINFO2SQL) */ #endif /* !defined(TESTTIME) && !defined(TZINFO2SQL) */
#endif /* TZTIME_INCLUDED */
#ifndef UNIREG_INCLUDED
#define UNIREG_INCLUDED
/* Copyright (C) 2000-2006 MySQL AB /* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -16,8 +19,6 @@ ...@@ -16,8 +19,6 @@
/* Extra functions used by unireg library */ /* Extra functions used by unireg library */
#ifndef _unireg_h
#ifndef NO_ALARM_LOOP #ifndef NO_ALARM_LOOP
#define NO_ALARM_LOOP /* lib5 and popen can't use alarm */ #define NO_ALARM_LOOP /* lib5 and popen can't use alarm */
#endif #endif
......
#ifndef STRINGS_NOT_USED_INCLUDED
#define STRINGS_NOT_USED_INCLUDED
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -35,3 +38,4 @@ ...@@ -35,3 +38,4 @@
#define _AlphabetSize 256 #define _AlphabetSize 256
#endif /* NullS */ #endif /* NullS */
#endif /* STRINGS_NOT_USED_INCLUDED */
#ifndef VIO_PRIV_INCLUDED
#define VIO_PRIV_INCLUDED
/* Copyright (C) 2003 MySQL AB /* Copyright (C) 2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
...@@ -38,3 +41,4 @@ void vio_ssl_delete(Vio *vio); ...@@ -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); int vio_ssl_blocking(Vio *vio, my_bool set_blocking_mode, my_bool *old_mode);
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
#endif /* VIO_PRIV_INCLUDED */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment