*Merge.

--HG--
branch : trunk

1 files changed, 186 insertions, 186 deletions

diff --git a/dep/include/mysql/mysql.h b/dep/include/mysql/mysql.h
index 18b82b8a943..1f106429f0d 100644
--- a/dep/include/mysql/mysql.h
+++ b/dep/include/mysql/mysql.h
@@ -39,14 +39,14 @@
 #undef __WIN__
 #endif
 
-#ifdef	__cplusplus
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
-#ifndef _global_h				/* If not standard header */
+#ifndef _global_h               /* If not standard header */
 #include <sys/types.h>
 #ifdef __LCC__
-#include <winsock.h>				/* For windows */
+#include <winsock.h>                /* For windows */
 #endif
 typedef char my_bool;
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
@@ -78,24 +78,24 @@ typedef int my_socket;
 extern unsigned int mysql_port;
 extern char *mysql_unix_port;
 
-#define CLIENT_NET_READ_TIMEOUT		365*24*3600	/* Timeout on read */
-#define CLIENT_NET_WRITE_TIMEOUT	365*24*3600	/* Timeout on write */
+#define CLIENT_NET_READ_TIMEOUT     365*24*3600 /* Timeout on read */
+#define CLIENT_NET_WRITE_TIMEOUT    365*24*3600 /* Timeout on write */
 
 #ifdef __NETWARE__
 // GCC have alternative #pragma pack(8) syntax and old gcc version not support pack(push,8), also any gcc version not support it at some paltform
 #if defined( __GNUC__ )
-#pragma pack(8) 
-#else 
-#pragma pack(push,8) 
-#endif 
+#pragma pack(8)
+#else
+#pragma pack(push,8)
+#endif
 
 #endif
 
-#define IS_PRI_KEY(n)	((n) & PRI_KEY_FLAG)
-#define IS_NOT_NULL(n)	((n) & NOT_NULL_FLAG)
-#define IS_BLOB(n)	((n) & BLOB_FLAG)
-#define IS_NUM(t)	((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
-#define IS_NUM_FIELD(f)	 ((f)->flags & NUM_FLAG)
+#define IS_PRI_KEY(n)   ((n) & PRI_KEY_FLAG)
+#define IS_NOT_NULL(n)  ((n) & NOT_NULL_FLAG)
+#define IS_BLOB(n)  ((n) & BLOB_FLAG)
+#define IS_NUM(t)   ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
+#define IS_NUM_FIELD(f)  ((f)->flags & NUM_FLAG)
 #define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)
 #define IS_LONGDATA(t) ((t) >= MYSQL_TYPE_TINY_BLOB && (t) <= MYSQL_TYPE_STRING)
 
@@ -106,7 +106,7 @@ typedef struct st_mysql_field {
   char *table;                /* Table of column if column was a field */
   char *org_table;            /* Org table name, if table was an alias */
   char *db;                   /* Database for table */
-  char *catalog;	      /* Catalog for table */
+  char *catalog;          /* Catalog for table */
   char *def;                  /* Default value (set by mysql_list_fields) */
   unsigned long length;       /* Width of column (create length) */
   unsigned long max_length;   /* Max width for selected set */
@@ -123,7 +123,7 @@ typedef struct st_mysql_field {
   enum enum_field_types type; /* Type of field. See mysql_com.h for types */
 } MYSQL_FIELD;
 
-typedef char **MYSQL_ROW;		/* return data as array of strings */
+typedef char **MYSQL_ROW;       /* return data as array of strings */
 typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
 
 #ifndef _global_h
@@ -142,12 +142,12 @@ typedef unsigned long long my_ulonglong;
 #define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED
 
 typedef struct st_mysql_rows {
-  struct st_mysql_rows *next;		/* list of rows */
+  struct st_mysql_rows *next;       /* list of rows */
   MYSQL_ROW data;
   unsigned long length;
 } MYSQL_ROWS;
 
-typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;	/* offset to current row */
+typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;   /* offset to current row */
 
 #include "my_alloc.h"
 
@@ -161,7 +161,7 @@ typedef struct st_mysql_data {
   struct embedded_query_result *embedded_info;
 } MYSQL_DATA;
 
-enum mysql_option 
+enum mysql_option
 {
   MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
   MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
@@ -181,14 +181,14 @@ struct st_mysql_options {
   char *host,*user,*password,*unix_socket,*db;
   struct st_dynamic_array *init_commands;
   char *my_cnf_file,*my_cnf_group, *charset_dir, *charset_name;
-  char *ssl_key;				/* PEM key file */
-  char *ssl_cert;				/* PEM cert file */
-  char *ssl_ca;					/* PEM CA file */
-  char *ssl_capath;				/* PEM directory of CA-s? */
-  char *ssl_cipher;				/* cipher to use */
+  char *ssl_key;                /* PEM key file */
+  char *ssl_cert;               /* PEM cert file */
+  char *ssl_ca;                 /* PEM CA file */
+  char *ssl_capath;             /* PEM directory of CA-s? */
+  char *ssl_cipher;             /* cipher to use */
   char *shared_memory_base_name;
   unsigned long max_allowed_packet;
-  my_bool use_ssl;				/* if to use SSL or not */
+  my_bool use_ssl;              /* if to use SSL or not */
   my_bool compress,named_pipe;
  /*
    On connect, find out the replication role of the server, and
@@ -223,12 +223,12 @@ struct st_mysql_options {
   void *local_infile_userdata;
 };
 
-enum mysql_status 
+enum mysql_status
 {
   MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,MYSQL_STATUS_USE_RESULT
 };
 
-enum mysql_protocol_type 
+enum mysql_protocol_type
 {
   MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET,
   MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
@@ -238,7 +238,7 @@ enum mysql_protocol_type
   the master, the ones that go to a slave, and the adminstrative
   type which must happen on the pivot connectioin
 */
-enum mysql_rpl_type 
+enum mysql_rpl_type
 {
   MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE, MYSQL_RPL_ADMIN
 };
@@ -260,32 +260,32 @@ struct st_mysql_stmt;
 
 typedef struct st_mysql
 {
-  NET		net;			/* Communication parameters */
-  gptr		connector_fd;		/* ConnectorFd for SSL */
-  char		*host,*user,*passwd,*unix_socket,*server_version,*host_info,*info;
+  NET       net;            /* Communication parameters */
+  gptr      connector_fd;       /* ConnectorFd for SSL */
+  char      *host,*user,*passwd,*unix_socket,*server_version,*host_info,*info;
   char          *db;
   struct charset_info_st *charset;
-  MYSQL_FIELD	*fields;
-  MEM_ROOT	field_alloc;
+  MYSQL_FIELD   *fields;
+  MEM_ROOT  field_alloc;
   my_ulonglong affected_rows;
-  my_ulonglong insert_id;		/* id if insert on table with NEXTNR */
-  my_ulonglong extra_info;		/* Not used */
-  unsigned long thread_id;		/* Id for connection in server */
+  my_ulonglong insert_id;       /* id if insert on table with NEXTNR */
+  my_ulonglong extra_info;      /* Not used */
+  unsigned long thread_id;      /* Id for connection in server */
   unsigned long packet_length;
-  unsigned int	port;
+  unsigned int  port;
   unsigned long client_flag,server_capabilities;
-  unsigned int	protocol_version;
-  unsigned int	field_count;
-  unsigned int 	server_status;
+  unsigned int  protocol_version;
+  unsigned int  field_count;
+  unsigned int  server_status;
   unsigned int  server_language;
-  unsigned int	warning_count;
+  unsigned int  warning_count;
   struct st_mysql_options options;
   enum mysql_status status;
-  my_bool	free_me;		/* If free in mysql_close */
-  my_bool	reconnect;		/* set to 1 if automatic reconnect */
+  my_bool   free_me;        /* If free in mysql_close */
+  my_bool   reconnect;      /* set to 1 if automatic reconnect */
 
   /* session-wide random string */
-  char	        scramble[SCRAMBLE_LENGTH+1];
+  char          scramble[SCRAMBLE_LENGTH+1];
 
  /*
    Set if this is the original connection, not a master or a slave we have
@@ -306,7 +306,7 @@ typedef struct st_mysql
   const struct st_mysql_methods *methods;
   void *thd;
   /*
-    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag 
+    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag
     from mysql_stmt_close if close had to cancel result set of this object.
   */
   my_bool *unbuffered_fetch_owner;
@@ -318,22 +318,22 @@ typedef struct st_mysql
 
 typedef struct st_mysql_res {
   my_ulonglong row_count;
-  MYSQL_FIELD	*fields;
-  MYSQL_DATA	*data;
-  MYSQL_ROWS	*data_cursor;
-  unsigned long *lengths;		/* column lengths of current row */
-  MYSQL		*handle;		/* for unbuffered reads */
-  MEM_ROOT	field_alloc;
-  unsigned int	field_count, current_field;
-  MYSQL_ROW	row;			/* If unbuffered read */
-  MYSQL_ROW	current_row;		/* buffer to current row */
-  my_bool	eof;			/* Used by mysql_fetch_row */
+  MYSQL_FIELD   *fields;
+  MYSQL_DATA    *data;
+  MYSQL_ROWS    *data_cursor;
+  unsigned long *lengths;       /* column lengths of current row */
+  MYSQL     *handle;        /* for unbuffered reads */
+  MEM_ROOT  field_alloc;
+  unsigned int  field_count, current_field;
+  MYSQL_ROW row;            /* If unbuffered read */
+  MYSQL_ROW current_row;        /* buffer to current row */
+  my_bool   eof;            /* Used by mysql_fetch_row */
   /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
+  my_bool       unbuffered_fetch_cancelled;
   const struct st_mysql_methods *methods;
 } MYSQL_RES;
 
-#define MAX_MYSQL_MANAGER_ERR 256  
+#define MAX_MYSQL_MANAGER_ERR 256
 #define MAX_MYSQL_MANAGER_MSG 256
 
 #define MANAGER_OK           200
@@ -411,7 +411,7 @@ my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res);
 unsigned int STDCALL mysql_num_fields(MYSQL_RES *res);
 my_bool STDCALL mysql_eof(MYSQL_RES *res);
 MYSQL_FIELD *STDCALL mysql_fetch_field_direct(MYSQL_RES *res,
-					      unsigned int fieldnr);
+                          unsigned int fieldnr);
 MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res);
 MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res);
 MYSQL_FIELD_OFFSET STDCALL mysql_field_tell(MYSQL_RES *res);
@@ -428,39 +428,39 @@ unsigned long STDCALL mysql_thread_id(MYSQL *mysql);
 const char * STDCALL mysql_character_set_name(MYSQL *mysql);
 int          STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname);
 
-MYSQL *		STDCALL mysql_init(MYSQL *mysql);
-my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
-				      const char *cert, const char *ca,
-				      const char *capath, const char *cipher);
+MYSQL *     STDCALL mysql_init(MYSQL *mysql);
+my_bool     STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
+                      const char *cert, const char *ca,
+                      const char *capath, const char *cipher);
 const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
-my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
-					  const char *passwd, const char *db);
-MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
-					   const char *user,
-					   const char *passwd,
-					   const char *db,
-					   unsigned int port,
-					   const char *unix_socket,
-					   unsigned long clientflag);
-int		STDCALL mysql_select_db(MYSQL *mysql, const char *db);
-int		STDCALL mysql_query(MYSQL *mysql, const char *q);
-int		STDCALL mysql_send_query(MYSQL *mysql, const char *q,
-					 unsigned long length);
-int		STDCALL mysql_real_query(MYSQL *mysql, const char *q,
-					unsigned long length);
+my_bool     STDCALL mysql_change_user(MYSQL *mysql, const char *user,
+                      const char *passwd, const char *db);
+MYSQL *     STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
+                       const char *user,
+                       const char *passwd,
+                       const char *db,
+                       unsigned int port,
+                       const char *unix_socket,
+                       unsigned long clientflag);
+int     STDCALL mysql_select_db(MYSQL *mysql, const char *db);
+int     STDCALL mysql_query(MYSQL *mysql, const char *q);
+int     STDCALL mysql_send_query(MYSQL *mysql, const char *q,
+                     unsigned long length);
+int     STDCALL mysql_real_query(MYSQL *mysql, const char *q,
+                    unsigned long length);
 MYSQL_RES *     STDCALL mysql_store_result(MYSQL *mysql);
 MYSQL_RES *     STDCALL mysql_use_result(MYSQL *mysql);
 
 /* perform query on master */
-my_bool		STDCALL mysql_master_query(MYSQL *mysql, const char *q,
-					   unsigned long length);
-my_bool		STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
-						unsigned long length);
-/* perform query on slave */  
-my_bool		STDCALL mysql_slave_query(MYSQL *mysql, const char *q,
-					  unsigned long length);
-my_bool		STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
-					       unsigned long length);
+my_bool     STDCALL mysql_master_query(MYSQL *mysql, const char *q,
+                       unsigned long length);
+my_bool     STDCALL mysql_master_send_query(MYSQL *mysql, const char *q,
+                        unsigned long length);
+/* perform query on slave */
+my_bool     STDCALL mysql_slave_query(MYSQL *mysql, const char *q,
+                      unsigned long length);
+my_bool     STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q,
+                           unsigned long length);
 void        STDCALL mysql_get_character_set_info(MYSQL *mysql,
                            MY_CHARSET_INFO *charset);
 
@@ -473,10 +473,10 @@ mysql_set_local_infile_handler(MYSQL *mysql,
                                int (*local_infile_init)(void **, const char *,
                             void *),
                                int (*local_infile_read)(void *, char *,
-							unsigned int),
+                            unsigned int),
                                void (*local_infile_end)(void *),
                                int (*local_infile_error)(void *, char*,
-							 unsigned int),
+                             unsigned int),
                                void *);
 
 void
@@ -489,93 +489,93 @@ mysql_set_local_infile_default(MYSQL *mysql);
 */
 void            STDCALL mysql_enable_rpl_parse(MYSQL* mysql);
 void            STDCALL mysql_disable_rpl_parse(MYSQL* mysql);
-/* get the value of the parse flag */  
+/* get the value of the parse flag */
 int             STDCALL mysql_rpl_parse_enabled(MYSQL* mysql);
 
 /*  enable/disable reads from master */
 void            STDCALL mysql_enable_reads_from_master(MYSQL* mysql);
 void            STDCALL mysql_disable_reads_from_master(MYSQL* mysql);
-/* get the value of the master read flag */  
-my_bool		STDCALL mysql_reads_from_master_enabled(MYSQL* mysql);
+/* get the value of the master read flag */
+my_bool     STDCALL mysql_reads_from_master_enabled(MYSQL* mysql);
 
-enum mysql_rpl_type     STDCALL mysql_rpl_query_type(const char* q, int len);  
+enum mysql_rpl_type     STDCALL mysql_rpl_query_type(const char* q, int len);
 
-/* discover the master and its slaves */  
-my_bool		STDCALL mysql_rpl_probe(MYSQL* mysql);
+/* discover the master and its slaves */
+my_bool     STDCALL mysql_rpl_probe(MYSQL* mysql);
 
 /* set the master, close/free the old one, if it is not a pivot */
 int             STDCALL mysql_set_master(MYSQL* mysql, const char* host,
-					 unsigned int port,
-					 const char* user,
-					 const char* passwd);
+                     unsigned int port,
+                     const char* user,
+                     const char* passwd);
 int             STDCALL mysql_add_slave(MYSQL* mysql, const char* host,
-					unsigned int port,
-					const char* user,
-					const char* passwd);
+                    unsigned int port,
+                    const char* user,
+                    const char* passwd);
 
-int		STDCALL mysql_shutdown(MYSQL *mysql,
+int     STDCALL mysql_shutdown(MYSQL *mysql,
                                        enum mysql_enum_shutdown_level
                                        shutdown_level);
-int		STDCALL mysql_dump_debug_info(MYSQL *mysql);
-int		STDCALL mysql_refresh(MYSQL *mysql,
-				     unsigned int refresh_options);
-int		STDCALL mysql_kill(MYSQL *mysql,unsigned long pid);
-int		STDCALL mysql_set_server_option(MYSQL *mysql,
-						enum enum_mysql_set_option
-						option);
-int		STDCALL mysql_ping(MYSQL *mysql);
-const char *	STDCALL mysql_stat(MYSQL *mysql);
-const char *	STDCALL mysql_get_server_info(MYSQL *mysql);
-const char *	STDCALL mysql_get_client_info(void);
-unsigned long	STDCALL mysql_get_client_version(void);
-const char *	STDCALL mysql_get_host_info(MYSQL *mysql);
-unsigned long	STDCALL mysql_get_server_version(MYSQL *mysql);
-unsigned int	STDCALL mysql_get_proto_info(MYSQL *mysql);
-MYSQL_RES *	STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_tables(MYSQL *mysql,const char *wild);
-MYSQL_RES *	STDCALL mysql_list_processes(MYSQL *mysql);
-int		STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
-				      const char *arg);
-void		STDCALL mysql_free_result(MYSQL_RES *result);
-void		STDCALL mysql_data_seek(MYSQL_RES *result,
-					my_ulonglong offset);
+int     STDCALL mysql_dump_debug_info(MYSQL *mysql);
+int     STDCALL mysql_refresh(MYSQL *mysql,
+                     unsigned int refresh_options);
+int     STDCALL mysql_kill(MYSQL *mysql,unsigned long pid);
+int     STDCALL mysql_set_server_option(MYSQL *mysql,
+                        enum enum_mysql_set_option
+                        option);
+int     STDCALL mysql_ping(MYSQL *mysql);
+const char *    STDCALL mysql_stat(MYSQL *mysql);
+const char *    STDCALL mysql_get_server_info(MYSQL *mysql);
+const char *    STDCALL mysql_get_client_info(void);
+unsigned long   STDCALL mysql_get_client_version(void);
+const char *    STDCALL mysql_get_host_info(MYSQL *mysql);
+unsigned long   STDCALL mysql_get_server_version(MYSQL *mysql);
+unsigned int    STDCALL mysql_get_proto_info(MYSQL *mysql);
+MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);
+MYSQL_RES * STDCALL mysql_list_tables(MYSQL *mysql,const char *wild);
+MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql);
+int     STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
+                      const char *arg);
+void        STDCALL mysql_free_result(MYSQL_RES *result);
+void        STDCALL mysql_data_seek(MYSQL_RES *result,
+                    my_ulonglong offset);
 MYSQL_ROW_OFFSET STDCALL mysql_row_seek(MYSQL_RES *result,
-						MYSQL_ROW_OFFSET offset);
+                        MYSQL_ROW_OFFSET offset);
 MYSQL_FIELD_OFFSET STDCALL mysql_field_seek(MYSQL_RES *result,
-					   MYSQL_FIELD_OFFSET offset);
-MYSQL_ROW	STDCALL mysql_fetch_row(MYSQL_RES *result);
+                       MYSQL_FIELD_OFFSET offset);
+MYSQL_ROW   STDCALL mysql_fetch_row(MYSQL_RES *result);
 unsigned long * STDCALL mysql_fetch_lengths(MYSQL_RES *result);
-MYSQL_FIELD *	STDCALL mysql_fetch_field(MYSQL_RES *result);
+MYSQL_FIELD *   STDCALL mysql_fetch_field(MYSQL_RES *result);
 MYSQL_RES *     STDCALL mysql_list_fields(MYSQL *mysql, const char *table,
-					  const char *wild);
-unsigned long	STDCALL mysql_escape_string(char *to,const char *from,
-					    unsigned long from_length);
-unsigned long	STDCALL mysql_hex_string(char *to,const char *from,
+                      const char *wild);
+unsigned long   STDCALL mysql_escape_string(char *to,const char *from,
+                        unsigned long from_length);
+unsigned long   STDCALL mysql_hex_string(char *to,const char *from,
                                          unsigned long from_length);
 unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,
-					       char *to,const char *from,
-					       unsigned long length);
-void		STDCALL mysql_debug(const char *debug);
-void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
-unsigned int	STDCALL mysql_thread_safe(void);
-my_bool		STDCALL mysql_embedded(void);
-MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);  
+                           char *to,const char *from,
+                           unsigned long length);
+void        STDCALL mysql_debug(const char *debug);
+void        STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
+unsigned int    STDCALL mysql_thread_safe(void);
+my_bool     STDCALL mysql_embedded(void);
+MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);
 MYSQL_MANAGER*  STDCALL mysql_manager_connect(MYSQL_MANAGER* con,
-					      const char* host,
-					      const char* user,
-					      const char* passwd,
-					      unsigned int port);
+                          const char* host,
+                          const char* user,
+                          const char* passwd,
+                          unsigned int port);
 void            STDCALL mysql_manager_close(MYSQL_MANAGER* con);
 int             STDCALL mysql_manager_command(MYSQL_MANAGER* con,
-						const char* cmd, int cmd_len);
+                        const char* cmd, int cmd_len);
 int             STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
-						  char* res_buf,
-						 int res_buf_size);
+                          char* res_buf,
+                         int res_buf_size);
 my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
 
 
 /*
-  The following definitions are added for the enhanced 
+  The following definitions are added for the enhanced
   client-server protocol
 */
 
@@ -652,28 +652,28 @@ enum enum_mysql_stmt_state
 
 typedef struct st_mysql_bind
 {
-  unsigned long	*length;          /* output length pointer */
-  my_bool       *is_null;	  /* Pointer to null indicator */
-  void		*buffer;	  /* buffer to get/put data */
+  unsigned long *length;          /* output length pointer */
+  my_bool       *is_null;     /* Pointer to null indicator */
+  void      *buffer;      /* buffer to get/put data */
   /* set this if you want to track data truncations happened during fetch */
   my_bool       *error;
-  enum enum_field_types buffer_type;	/* buffer type */
+  enum enum_field_types buffer_type;    /* buffer type */
   /* output buffer length, must be set when fetching str/binary */
   unsigned long buffer_length;
   unsigned char *row_ptr;         /* for the current data position */
   unsigned long offset;           /* offset position for char/binary fetch */
-  unsigned long	length_value;     /* Used if length is 0 */
-  unsigned int	param_number;	  /* For null count and error messages */
-  unsigned int  pack_length;	  /* Internal length for packed data */
+  unsigned long length_value;     /* Used if length is 0 */
+  unsigned int  param_number;     /* For null count and error messages */
+  unsigned int  pack_length;      /* Internal length for packed data */
   my_bool       error_value;      /* used if error is 0 */
   my_bool       is_unsigned;      /* set if integer type is unsigned */
-  my_bool	long_data_used;	  /* If used with mysql_send_long_data */
-  my_bool	is_null_value;    /* Used if is_null is 0 */
+  my_bool   long_data_used;   /* If used with mysql_send_long_data */
+  my_bool   is_null_value;    /* Used if is_null is 0 */
   void (*store_param_func)(NET *net, struct st_mysql_bind *param);
   void (*fetch_result)(struct st_mysql_bind *, MYSQL_FIELD *,
                        unsigned char **row);
   void (*skip_result)(struct st_mysql_bind *, MYSQL_FIELD *,
-		      unsigned char **row);
+              unsigned char **row);
 } MYSQL_BIND;
 
 
@@ -695,9 +695,9 @@ typedef struct st_mysql_stmt
     mysql_stmt_fetch() calls this function to fetch one row (it's different
     for buffered, unbuffered and cursor fetch).
   */
-  int            (*read_row_func)(struct st_mysql_stmt *stmt, 
+  int            (*read_row_func)(struct st_mysql_stmt *stmt,
                                   unsigned char **row);
-  unsigned long	 stmt_id;	       /* Id for prepared statement */
+  unsigned long  stmt_id;          /* Id for prepared statement */
   unsigned long  flags;                /* i.e. type of cursor to open */
   unsigned long  prefetch_rows;        /* number of rows per one COM_FETCH */
   /*
@@ -705,30 +705,30 @@ typedef struct st_mysql_stmt
     server-side cursor status for this statement.
   */
   unsigned int   server_status;
-  unsigned int	 last_errno;	       /* error code */
+  unsigned int   last_errno;           /* error code */
   unsigned int   param_count;          /* input parameter count */
   unsigned int   field_count;          /* number of columns in result set */
   enum enum_mysql_stmt_state state;    /* statement state */
-  char		 last_error[MYSQL_ERRMSG_SIZE]; /* error message */
-  char		 sqlstate[SQLSTATE_LENGTH+1];
+  char       last_error[MYSQL_ERRMSG_SIZE]; /* error message */
+  char       sqlstate[SQLSTATE_LENGTH+1];
   /* Types of input parameters should be sent to server */
   my_bool        send_types_to_server;
   my_bool        bind_param_done;      /* input buffers were supplied */
   unsigned char  bind_result_done;     /* output buffers were supplied */
   /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;  
+  my_bool       unbuffered_fetch_cancelled;
   /*
-    Is set to true if we need to calculate field->max_length for 
+    Is set to true if we need to calculate field->max_length for
     metadata fields when doing mysql_stmt_store_result.
   */
-  my_bool       update_max_length;     
+  my_bool       update_max_length;
 } MYSQL_STMT;
 
 enum enum_stmt_attr_type
 {
   /*
     When doing mysql_stmt_store_result calculate max_length attribute
-    of statement metadata. This is to be consistent with the old API, 
+    of statement metadata. This is to be consistent with the old API,
     where this was done automatically.
     In the new API we do that only by request because it slows down
     mysql_stmt_store_result sufficiently.
@@ -751,18 +751,18 @@ typedef struct st_mysql_methods
 {
   my_bool (*read_query_result)(MYSQL *mysql);
   my_bool (*advanced_command)(MYSQL *mysql,
-			      enum enum_server_command command,
-			      const char *header,
-			      unsigned long header_length,
-			      const char *arg,
-			      unsigned long arg_length,
-			      my_bool skip_check,
+                  enum enum_server_command command,
+                  const char *header,
+                  unsigned long header_length,
+                  const char *arg,
+                  unsigned long arg_length,
+                  my_bool skip_check,
                               MYSQL_STMT *stmt);
   MYSQL_DATA *(*read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
-			   unsigned int fields);
+               unsigned int fields);
   MYSQL_RES * (*use_result)(MYSQL *mysql);
-  void (*fetch_lengths)(unsigned long *to, 
-			MYSQL_ROW column, unsigned int field_count);
+  void (*fetch_lengths)(unsigned long *to,
+            MYSQL_ROW column, unsigned int field_count);
   void (*flush_use_result)(MYSQL *mysql);
 #if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
   MYSQL_FIELD * (*list_fields)(MYSQL *mysql);
@@ -784,7 +784,7 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query,
                                unsigned long length);
 int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
 int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg, 
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg,
                                     unsigned int column,
                                     unsigned long offset);
 int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
@@ -800,16 +800,16 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
 my_bool STDCALL mysql_stmt_close(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_reset(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt);
-my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, 
+my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt,
                                           unsigned int param_number,
-                                          const char *data, 
+                                          const char *data,
                                           unsigned long length);
 MYSQL_RES *STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt);
 MYSQL_RES *STDCALL mysql_stmt_param_metadata(MYSQL_STMT *stmt);
 unsigned int STDCALL mysql_stmt_errno(MYSQL_STMT * stmt);
 const char *STDCALL mysql_stmt_error(MYSQL_STMT * stmt);
 const char *STDCALL mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt, 
+MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt,
                                              MYSQL_ROW_OFFSET offset);
 MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_tell(MYSQL_STMT *stmt);
 void STDCALL mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong offset);
@@ -833,11 +833,11 @@ void STDCALL mysql_close(MYSQL *sock);
 #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
 
 #ifdef USE_OLD_FUNCTIONS
-MYSQL *		STDCALL mysql_connect(MYSQL *mysql, const char *host,
-				      const char *user, const char *passwd);
-int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
-int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
-#define	 mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
+MYSQL *     STDCALL mysql_connect(MYSQL *mysql, const char *host,
+                      const char *user, const char *passwd);
+int     STDCALL mysql_create_db(MYSQL *mysql, const char *DB);
+int     STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
+#define  mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
 #endif
 #define HAVE_MYSQL_REAL_CONNECT
 
@@ -860,11 +860,11 @@ int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);
 #pragma pack()
 #else
 #pragma pack(pop)
-#endif 
+#endif
 
 #endif
 
-#ifdef	__cplusplus
+#ifdef  __cplusplus
 }
 #endif