Update the reference file for mysql API/ABI for 5.0

include/mysql_h_abi.ic:
  Update the reference file for mysql API/ABI

1 files changed, 266 insertions, 214 deletions

diff --git a/include/mysql_h_abi.ic b/include/mysql_h_abi.ic
index 80d13199a8d..a0369b79b49 100644
--- a/include/mysql_h_abi.ic
+++ b/include/mysql_h_abi.ic
@@ -1,5 +1,6 @@
 struct __pthread_internal_slist;
 struct __pthread_mutex_s;
+struct character_set;
 struct rand_struct;
 struct st_list;
 struct st_mem_root;
@@ -23,6 +24,7 @@ struct st_used_mem;
 struct timespec;
 struct timeval;
 enum Item_result;
+enum enum_cursor_type;
 enum enum_field_types;
 enum enum_mysql_set_option;
 enum enum_mysql_stmt_state;
@@ -36,7 +38,7 @@ enum mysql_rpl_type;
 enum mysql_status;
 # 59 "/usr/include/bits/types.h"
 typedef long long int __quad_t;
-# 135 "mysql.h"
+# 134 "mysql.h"
 typedef struct st_mysql_rows MYSQL_ROWS;
 # 55 "/usr/include/sys/select.h"
 typedef long int __fd_mask;
@@ -46,31 +48,33 @@ typedef __quad_t __off64_t;
 typedef unsigned long long int __u_quad_t;
 # 24 "my_list.h"
 typedef struct st_list LIST;
-# 236 "mysql.h"
+# 251 "mysql.h"
 typedef struct st_mysql MYSQL;
-# 575 "mysql.h"
+# 653 "mysql.h"
 typedef struct st_mysql_bind MYSQL_BIND;
-# 97 "mysql.h"
+# 93 "mysql.h"
 typedef struct st_mysql_field MYSQL_FIELD;
-# 121 "mysql.h"
+# 117 "mysql.h"
 typedef unsigned int MYSQL_FIELD_OFFSET;
-# 327 "mysql.h"
+# 340 "mysql.h"
 typedef struct st_mysql_manager MYSQL_MANAGER;
-# 341 "mysql.h"
+# 354 "mysql.h"
 typedef struct st_mysql_parameters MYSQL_PARAMETERS;
-# 296 "mysql.h"
+# 309 "mysql.h"
 typedef struct st_mysql_res MYSQL_RES;
-# 120 "mysql.h"
+# 116 "mysql.h"
 typedef char * * MYSQL_ROW;
-# 141 "mysql.h"
+# 140 "mysql.h"
 typedef MYSQL_ROWS * MYSQL_ROW_OFFSET;
-# 600 "mysql.h"
+# 681 "mysql.h"
 typedef struct st_mysql_stmt MYSQL_STMT;
-# 151 "mysql_com.h"
+# 236 "mysql.h"
+typedef struct character_set MY_CHARSET_INFO;
+# 180 "mysql_com.h"
 typedef struct st_net NET;
 # 21 "typelib.h"
 typedef struct st_typelib TYPELIB;
-# 141 "mysql_com.h"
+# 170 "mysql_com.h"
 typedef struct st_vio Vio;
 # 172 "/usr/include/bits/types.h"
 typedef long int __blkcnt_t;
@@ -137,27 +141,29 @@ typedef struct __attribute__((aligned(__alignof__(long int))))
   {
     __fd_mask __fds_bits[(1024 / (8 * sizeof(__fd_mask)))];
   } fd_set;
-# 61 "mysql.h"
+# 57 "mysql.h"
 typedef char * gptr;
 # 29 "my_list.h"
 typedef int (* list_walk_action)(void *, void *);
-# 52 "mysql.h"
+# 48 "mysql.h"
 typedef char my_bool;
-# 67 "mysql.h"
+# 63 "mysql.h"
 typedef int my_socket;
-# 129 "mysql.h"
+# 125 "mysql.h"
 typedef unsigned long long int my_ulonglong;
+# 144 "mysql.h"
+typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
 # 35 "my_alloc.h"
 typedef struct st_mem_root MEM_ROOT;
 # 145 "mysql.h"
 typedef struct st_mysql_data MYSQL_DATA;
-# 652 "mysql.h"
+# 750 "mysql.h"
 typedef struct st_mysql_methods MYSQL_METHODS;
 # 48 "mysql_time.h"
 typedef struct st_mysql_time MYSQL_TIME;
-# 315 "mysql_com.h"
+# 371 "mysql_com.h"
 typedef struct st_udf_args UDF_ARGS;
-# 326 "mysql_com.h"
+# 384 "mysql_com.h"
 typedef struct st_udf_init UDF_INIT;
 # 27 "my_alloc.h"
 typedef struct st_used_mem USED_MEM;
@@ -392,7 +398,19 @@ struct __attribute__((aligned(__alignof__(int)))) __pthread_mutex_s
     int __kind;
     unsigned int __nusers;
   };
-# 302 "mysql_com.h"
+# 236 "mysql.h"
+struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(void *)))) character_set
+  {
+    unsigned int number;
+    unsigned int state;
+    char const * csname;
+    char const * name;
+    char const * comment;
+    char const * dir;
+    unsigned int mbminlen;
+    unsigned int mbmaxlen;
+  };
+# 357 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof__(double)))) rand_struct
   {
     unsigned long int seed1;
@@ -419,7 +437,7 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     unsigned int first_block_usage;
     void (* error_handler)(void);
   };
-# 236 "mysql.h"
+# 251 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long long int)))) st_mysql
   {
     NET net;
@@ -462,26 +480,27 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     struct st_mysql_methods const * methods;
     void * thd;
     my_bool * unbuffered_fetch_owner;
-    struct st_mysql_stmt * current_stmt;
   };
-# 575 "mysql.h"
+# 653 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_bind
   {
     unsigned long int * length;
     my_bool * is_null;
     void * buffer;
+    my_bool * error;
     enum enum_field_types buffer_type;
     unsigned long int buffer_length;
-    unsigned char * inter_buffer;
+    unsigned char * row_ptr;
     unsigned long int offset;
-    unsigned long int internal_length;
+    unsigned long int length_value;
     unsigned int param_number;
     unsigned int pack_length;
+    my_bool error_value;
     my_bool is_unsigned;
     my_bool long_data_used;
-    my_bool internal_is_null;
+    my_bool is_null_value;
     void (* store_param_func)(NET * net, struct st_mysql_bind * param);
-    void (* fetch_result)(struct st_mysql_bind *, unsigned char * * row);
+    void (* fetch_result)(struct st_mysql_bind *, MYSQL_FIELD *, unsigned char * * row);
     void (* skip_result)(struct st_mysql_bind *, MYSQL_FIELD *, unsigned char * * row);
   };
 # 145 "mysql.h"
@@ -491,9 +510,9 @@ struct __attribute__((aligned(__alignof__(unsigned long long int)), aligned(__al
     unsigned int fields;
     MYSQL_ROWS * data;
     MEM_ROOT alloc;
-    MYSQL_ROWS * * prev_ptr;
+    struct embedded_query_result * embedded_info;
   };
-# 97 "mysql.h"
+# 93 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_field
   {
     char * name;
@@ -517,7 +536,7 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     unsigned int charsetnr;
     enum enum_field_types type;
   };
-# 327 "mysql.h"
+# 340 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_manager
   {
     NET net;
@@ -535,7 +554,7 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     int net_buf_size;
     char last_error[256];
   };
-# 652 "mysql.h"
+# 750 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)))) st_mysql_methods
   {
     my_bool (* read_query_result)(MYSQL * mysql);
@@ -553,8 +572,9 @@ struct __attribute__((aligned(__alignof__(void *)))) st_mysql_methods
     char const * (* read_statistics)(MYSQL * mysql);
     my_bool (* next_result)(MYSQL * mysql);
     int (* read_change_user_result)(MYSQL * mysql, char * buff, char const * passwd);
+    int (* read_rows_from_cursor)(MYSQL_STMT * stmt);
   };
-# 166 "mysql.h"
+# 167 "mysql.h"
 struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof__(void *)))) st_mysql_options
   {
     unsigned int connect_timeout;
@@ -590,19 +610,20 @@ struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof
     enum mysql_option methods_to_use;
     char * client_ip;
     my_bool secure_auth;
+    my_bool report_data_truncation;
     int (* local_infile_init)(void * *, char const *, void *);
     int (* local_infile_read)(void *, char *, unsigned int);
     void (* local_infile_end)(void);
     int (* local_infile_error)(void *, char *, unsigned int);
     void * local_infile_userdata;
   };
-# 341 "mysql.h"
+# 354 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)))) st_mysql_parameters
   {
     unsigned long int * p_max_allowed_packet;
     unsigned long int * p_net_buffer_length;
   };
-# 296 "mysql.h"
+# 309 "mysql.h"
 struct __attribute__((aligned(__alignof__(unsigned long long int)), aligned(__alignof__(void *)))) st_mysql_res
   {
     my_ulonglong row_count;
@@ -620,14 +641,14 @@ struct __attribute__((aligned(__alignof__(unsigned long long int)), aligned(__al
     my_bool unbuffered_fetch_cancelled;
     struct st_mysql_methods const * methods;
   };
-# 135 "mysql.h"
+# 134 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_rows
   {
     struct st_mysql_rows * next;
     MYSQL_ROW data;
     unsigned long int length;
   };
-# 600 "mysql.h"
+# 681 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long long int)))) st_mysql_stmt
   {
     MEM_ROOT mem_root;
@@ -642,6 +663,9 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     my_ulonglong insert_id;
     int (* read_row_func)(struct st_mysql_stmt * stmt, unsigned char * * row);
     unsigned long int stmt_id;
+    unsigned long int flags;
+    unsigned long int prefetch_rows;
+    unsigned int server_status;
     unsigned int last_errno;
     unsigned int param_count;
     unsigned int field_count;
@@ -650,7 +674,7 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     char sqlstate[(5 + 1)];
     my_bool send_types_to_server;
     my_bool bind_param_done;
-    my_bool bind_result_done;
+    unsigned char bind_result_done;
     my_bool unbuffered_fetch_cancelled;
     my_bool update_max_length;
   };
@@ -667,7 +691,7 @@ struct __attribute__((aligned(__alignof__(unsigned long int)))) st_mysql_time
     my_bool neg;
     enum enum_mysql_timestamp_type time_type;
   };
-# 151 "mysql_com.h"
+# 180 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_net
   {
     Vio * vio;
@@ -693,6 +717,8 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     unsigned char reading_or_writing;
     char save_char;
     my_bool no_send_ok;
+    my_bool no_send_eof;
+    my_bool no_send_error;
     char last_error[512];
     char sqlstate[(5 + 1)];
     unsigned int last_errno;
@@ -709,7 +735,7 @@ struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(vo
     char const * * type_names;
     unsigned int * type_lengths;
   };
-# 315 "mysql_com.h"
+# 371 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(void *)))) st_udf_args
   {
     unsigned int arg_count;
@@ -717,8 +743,10 @@ struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(vo
     char * * args;
     unsigned long int * lengths;
     char * maybe_null;
+    char * * attributes;
+    unsigned long int * attribute_lengths;
   };
-# 326 "mysql_com.h"
+# 384 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof__(void *)))) st_udf_init
   {
     my_bool maybe_null;
@@ -746,15 +774,24 @@ struct __attribute__((aligned(__alignof__(long int)))) timeval
     __time_t tv_sec;
     __suseconds_t tv_usec;
   };
-# 313 "mysql_com.h"
+# 368 "mysql_com.h"
 enum Item_result
   {
     STRING_RESULT = 0,
     REAL_RESULT = 1,
     INT_RESULT = 2,
     ROW_RESULT = 3,
+    DECIMAL_RESULT = 4,
+  };
+# 314 "mysql_com.h"
+enum enum_cursor_type
+  {
+    CURSOR_TYPE_NO_CURSOR = 0,
+    CURSOR_TYPE_READ_ONLY = 1,
+    CURSOR_TYPE_FOR_UPDATE = 2,
+    CURSOR_TYPE_SCROLLABLE = 4,
   };
-# 186 "mysql_com.h"
+# 227 "mysql_com.h"
 enum enum_field_types
   {
     MYSQL_TYPE_DECIMAL = 0,
@@ -772,6 +809,9 @@ enum enum_field_types
     MYSQL_TYPE_DATETIME = 12,
     MYSQL_TYPE_YEAR = 13,
     MYSQL_TYPE_NEWDATE = 14,
+    MYSQL_TYPE_VARCHAR = 15,
+    MYSQL_TYPE_BIT = 16,
+    MYSQL_TYPE_NEWDECIMAL = 246,
     MYSQL_TYPE_ENUM = 247,
     MYSQL_TYPE_SET = 248,
     MYSQL_TYPE_TINY_BLOB = 249,
@@ -782,13 +822,13 @@ enum enum_field_types
     MYSQL_TYPE_STRING = 254,
     MYSQL_TYPE_GEOMETRY = 255,
   };
-# 269 "mysql_com.h"
+# 324 "mysql_com.h"
 enum enum_mysql_set_option
   {
     MYSQL_OPTION_MULTI_STATEMENTS_ON = 0,
     MYSQL_OPTION_MULTI_STATEMENTS_OFF = 1,
   };
-# 567 "mysql.h"
+# 583 "mysql.h"
 enum enum_mysql_stmt_state
   {
     MYSQL_STMT_INIT_DONE = 1,
@@ -805,7 +845,7 @@ enum enum_mysql_timestamp_type
     MYSQL_TIMESTAMP_DATETIME = 1,
     MYSQL_TIMESTAMP_TIME = 2,
   };
-# 39 "mysql_com.h"
+# 52 "mysql_com.h"
 enum enum_server_command
   {
     COM_SLEEP = 0,
@@ -830,20 +870,23 @@ enum enum_server_command
     COM_TABLE_DUMP = 19,
     COM_CONNECT_OUT = 20,
     COM_REGISTER_SLAVE = 21,
-    COM_PREPARE = 22,
-    COM_EXECUTE = 23,
-    COM_LONG_DATA = 24,
-    COM_CLOSE_STMT = 25,
-    COM_RESET_STMT = 26,
+    COM_STMT_PREPARE = 22,
+    COM_STMT_EXECUTE = 23,
+    COM_STMT_SEND_LONG_DATA = 24,
+    COM_STMT_CLOSE = 25,
+    COM_STMT_RESET = 26,
     COM_SET_OPTION = 27,
-    COM_END = 28,
+    COM_STMT_FETCH = 28,
+    COM_END = 29,
   };
-# 639 "mysql.h"
+# 727 "mysql.h"
 enum enum_stmt_attr_type
   {
     STMT_ATTR_UPDATE_MAX_LENGTH = 0,
+    STMT_ATTR_CURSOR_TYPE = 1,
+    STMT_ATTR_PREFETCH_ROWS = 2,
   };
-# 244 "mysql_com.h"
+# 289 "mysql_com.h"
 enum mysql_enum_shutdown_level
   {
     SHUTDOWN_DEFAULT = 0,
@@ -854,7 +897,7 @@ enum mysql_enum_shutdown_level
     SHUTDOWN_WAIT_CRITICAL_BUFFERS = (((unsigned char)((1 << 3)) << 1) + 1),
     KILL_CONNECTION = 255,
   };
-# 155 "mysql.h"
+# 154 "mysql.h"
 enum mysql_option
   {
     MYSQL_OPT_CONNECT_TIMEOUT = 0,
@@ -876,8 +919,11 @@ enum mysql_option
     MYSQL_OPT_GUESS_CONNECTION = 16,
     MYSQL_SET_CLIENT_IP = 17,
     MYSQL_SECURE_AUTH = 18,
+    MYSQL_REPORT_DATA_TRUNCATION = 19,
+    MYSQL_OPT_RECONNECT = 20,
+    MYSQL_OPT_SSL_VERIFY_SERVER_CERT = 21,
   };
-# 218 "mysql.h"
+# 221 "mysql.h"
 enum mysql_protocol_type
   {
     MYSQL_PROTOCOL_DEFAULT = 0,
@@ -886,33 +932,33 @@ enum mysql_protocol_type
     MYSQL_PROTOCOL_PIPE = 3,
     MYSQL_PROTOCOL_MEMORY = 4,
   };
-# 228 "mysql.h"
+# 231 "mysql.h"
 enum mysql_rpl_type
   {
     MYSQL_RPL_MASTER = 0,
     MYSQL_RPL_SLAVE = 1,
     MYSQL_RPL_ADMIN = 2,
   };
-# 213 "mysql.h"
+# 216 "mysql.h"
 enum mysql_status
   {
     MYSQL_STATUS_READY = 0,
     MYSQL_STATUS_GET_RESULT = 1,
     MYSQL_STATUS_USE_RESULT = 2,
   };
-# 365 "mysql_com.h"
+# 423 "mysql_com.h"
 extern my_bool check_scramble(char const * reply, char const * message, unsigned char const * hash_stage2);
-# 358 "mysql_com.h"
+# 416 "mysql_com.h"
 extern my_bool check_scramble_323(char const *, char const * message, unsigned long int * salt);
-# 353 "mysql_com.h"
+# 411 "mysql_com.h"
 extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st);
 # 28 "typelib.h"
 extern int find_type(char * x, TYPELIB * typelib, unsigned int);
-# 367 "mysql_com.h"
+# 425 "mysql_com.h"
 extern void get_salt_from_password(unsigned char * res, char const * password);
-# 360 "mysql_com.h"
+# 418 "mysql_com.h"
 extern void get_salt_from_password_323(unsigned long int * res, char const * password);
-# 372 "mysql_com.h"
+# 431 "mysql_com.h"
 extern char * get_tty_password(char * opt_message);
 # 30 "typelib.h"
 extern char const * get_type(TYPELIB * typelib, unsigned int);
@@ -922,7 +968,7 @@ extern unsigned int gnu_dev_major(unsigned long long int);
 extern unsigned long long int gnu_dev_makedev(unsigned int, unsigned int);
 # 47 "/usr/include/sys/sysmacros.h"
 extern unsigned int gnu_dev_minor(unsigned long long int);
-# 355 "mysql_com.h"
+# 413 "mysql_com.h"
 extern void hash_password(unsigned long int * to, char const * password, unsigned int);
 # 31 "my_list.h"
 extern LIST * list_add(LIST * root, LIST * element);
@@ -938,305 +984,311 @@ extern unsigned int list_length(LIST *);
 extern LIST * list_reverse(LIST * root);
 # 37 "my_list.h"
 extern int list_walk(LIST *, list_walk_action, gptr);
-# 378 "mysql_com.h"
+# 440 "mysql_com.h"
 extern int load_defaults(char const * conf_file, char const * * groups, int * argc, char * * * argv);
-# 368 "mysql_com.h"
+# 426 "mysql_com.h"
 extern void make_password_from_salt(char * to, unsigned char const * hash_stage2);
-# 361 "mysql_com.h"
+# 419 "mysql_com.h"
 extern void make_password_from_salt_323(char * to, unsigned long int const * salt);
-# 363 "mysql_com.h"
+# 421 "mysql_com.h"
 extern void make_scrambled_password(char * to, char const * password);
-# 356 "mysql_com.h"
+# 414 "mysql_com.h"
 extern void make_scrambled_password_323(char * to, char const * password);
 # 29 "typelib.h"
 extern void make_type(char * to, unsigned int, TYPELIB * typelib);
-# 299 "mysql_com.h"
+# 437 "mysql_com.h"
+extern int modify_defaults_file(char const * file_location, char const * option, char const * option_value, char const * section_name, int);
+# 354 "mysql_com.h"
 extern int my_connect(my_socket, struct sockaddr const * name, unsigned int, unsigned int);
-# 377 "mysql_com.h"
+# 436 "mysql_com.h"
 extern my_bool my_init(void);
-# 281 "mysql_com.h"
+# 336 "mysql_com.h"
 extern my_bool my_net_init(NET * net, Vio * vio);
-# 282 "mysql_com.h"
+# 337 "mysql_com.h"
 extern void my_net_local_init(NET * net);
-# 292 "mysql_com.h"
+# 347 "mysql_com.h"
 extern unsigned long int my_net_read(NET * net);
-# 287 "mysql_com.h"
+# 342 "mysql_com.h"
 extern my_bool my_net_write(NET * net, char const * packet, unsigned long int);
-# 352 "mysql_com.h"
+# 410 "mysql_com.h"
 extern double my_rnd(struct rand_struct *);
-# 381 "mysql_com.h"
+# 443 "mysql_com.h"
 extern void my_thread_end(void);
-# 380 "mysql_com.h"
+# 442 "mysql_com.h"
 extern my_bool my_thread_init(void);
-# 543 "mysql.h"
+# 559 "mysql.h"
 extern void myodbc_remove_escape(MYSQL * mysql, char * name);
-# 485 "mysql.h"
+# 501 "mysql.h"
 extern int mysql_add_slave(MYSQL * mysql, char const * host, unsigned int, char const * user, char const * passwd);
-# 397 "mysql.h"
+# 410 "mysql.h"
 extern my_ulonglong mysql_affected_rows(MYSQL * mysql);
-# 724 "mysql.h"
+# 823 "mysql.h"
 extern my_bool mysql_autocommit(MYSQL * mysql, my_bool);
-# 412 "mysql.h"
+# 426 "mysql.h"
 extern my_bool mysql_change_user(MYSQL * mysql, char const * user, char const * passwd, char const * db);
-# 405 "mysql.h"
+# 418 "mysql.h"
 extern char const * mysql_character_set_name(MYSQL * mysql);
-# 727 "mysql.h"
+# 826 "mysql.h"
 extern void mysql_close(MYSQL * sock);
-# 722 "mysql.h"
+# 821 "mysql.h"
 extern my_bool mysql_commit(MYSQL * mysql);
-# 514 "mysql.h"
+# 530 "mysql.h"
 extern void mysql_data_seek(MYSQL_RES * result, my_ulonglong);
-# 532 "mysql.h"
+# 548 "mysql.h"
 extern void mysql_debug(char const * debug);
-# 471 "mysql.h"
+# 487 "mysql.h"
 extern void mysql_disable_reads_from_master(MYSQL * mysql);
-# 465 "mysql.h"
+# 481 "mysql.h"
 extern void mysql_disable_rpl_parse(MYSQL * mysql);
-# 493 "mysql.h"
+# 509 "mysql.h"
 extern int mysql_dump_debug_info(MYSQL * mysql);
-# 545 "mysql.h"
+# 561 "mysql.h"
 extern my_bool mysql_embedded(void);
-# 470 "mysql.h"
+# 486 "mysql.h"
 extern void mysql_enable_reads_from_master(MYSQL * mysql);
-# 464 "mysql.h"
+# 480 "mysql.h"
 extern void mysql_enable_rpl_parse(MYSQL * mysql);
-# 389 "mysql.h"
+# 402 "mysql.h"
 extern my_bool mysql_eof(MYSQL_RES * res);
-# 399 "mysql.h"
+# 412 "mysql.h"
 extern unsigned int mysql_errno(MYSQL * mysql);
-# 373 "mysql_com.h"
+# 432 "mysql_com.h"
 extern char const * mysql_errno_to_sqlstate(unsigned int);
-# 400 "mysql.h"
+# 413 "mysql.h"
 extern char const * mysql_error(MYSQL * mysql);
-# 525 "mysql.h"
+# 541 "mysql.h"
 extern unsigned long int mysql_escape_string(char * to, char const * from, unsigned long int);
-# 522 "mysql.h"
+# 538 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_field(MYSQL_RES * result);
-# 390 "mysql.h"
+# 403 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_field_direct(MYSQL_RES * res, unsigned int);
-# 392 "mysql.h"
+# 405 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_fields(MYSQL_RES * res);
-# 521 "mysql.h"
+# 537 "mysql.h"
 extern unsigned long int * mysql_fetch_lengths(MYSQL_RES * result);
-# 520 "mysql.h"
+# 536 "mysql.h"
 extern MYSQL_ROW mysql_fetch_row(MYSQL_RES * result);
-# 396 "mysql.h"
+# 409 "mysql.h"
 extern unsigned int mysql_field_count(MYSQL * mysql);
-# 518 "mysql.h"
+# 534 "mysql.h"
 extern MYSQL_FIELD_OFFSET mysql_field_seek(MYSQL_RES * result, MYSQL_FIELD_OFFSET);
-# 394 "mysql.h"
+# 407 "mysql.h"
 extern MYSQL_FIELD_OFFSET mysql_field_tell(MYSQL_RES * res);
-# 513 "mysql.h"
+# 529 "mysql.h"
 extern void mysql_free_result(MYSQL_RES * result);
-# 503 "mysql.h"
+# 454 "mysql.h"
+extern void mysql_get_character_set_info(MYSQL * mysql, MY_CHARSET_INFO * charset);
+# 519 "mysql.h"
 extern char const * mysql_get_client_info(void);
-# 504 "mysql.h"
+# 520 "mysql.h"
 extern unsigned long int mysql_get_client_version(void);
-# 505 "mysql.h"
+# 521 "mysql.h"
 extern char const * mysql_get_host_info(MYSQL * mysql);
-# 371 "mysql.h"
+# 384 "mysql.h"
 extern MYSQL_PARAMETERS * mysql_get_parameters(void);
-# 507 "mysql.h"
+# 523 "mysql.h"
 extern unsigned int mysql_get_proto_info(MYSQL * mysql);
-# 502 "mysql.h"
+# 518 "mysql.h"
 extern char const * mysql_get_server_info(MYSQL * mysql);
-# 506 "mysql.h"
+# 522 "mysql.h"
 extern unsigned long int mysql_get_server_version(MYSQL * mysql);
-# 527 "mysql.h"
+# 425 "mysql.h"
+extern char const * mysql_get_ssl_cipher(MYSQL * mysql);
+# 543 "mysql.h"
 extern unsigned long int mysql_hex_string(char * to, char const * from, unsigned long int);
-# 403 "mysql.h"
+# 416 "mysql.h"
 extern char const * mysql_info(MYSQL * mysql);
-# 408 "mysql.h"
+# 421 "mysql.h"
 extern MYSQL * mysql_init(MYSQL * mysql);
-# 398 "mysql.h"
+# 411 "mysql.h"
 extern my_ulonglong mysql_insert_id(MYSQL * mysql);
-# 496 "mysql.h"
+# 512 "mysql.h"
 extern int mysql_kill(MYSQL * mysql, unsigned long int);
-# 508 "mysql.h"
+# 524 "mysql.h"
 extern MYSQL_RES * mysql_list_dbs(MYSQL * mysql, char const * wild);
-# 523 "mysql.h"
+# 539 "mysql.h"
 extern MYSQL_RES * mysql_list_fields(MYSQL * mysql, char const * table, char const * wild);
-# 510 "mysql.h"
+# 526 "mysql.h"
 extern MYSQL_RES * mysql_list_processes(MYSQL * mysql);
-# 509 "mysql.h"
+# 525 "mysql.h"
 extern MYSQL_RES * mysql_list_tables(MYSQL * mysql, char const * wild);
-# 552 "mysql.h"
+# 568 "mysql.h"
 extern void mysql_manager_close(MYSQL_MANAGER * con);
-# 553 "mysql.h"
+# 569 "mysql.h"
 extern int mysql_manager_command(MYSQL_MANAGER * con, char const * cmd, int);
-# 547 "mysql.h"
+# 563 "mysql.h"
 extern MYSQL_MANAGER * mysql_manager_connect(MYSQL_MANAGER * con, char const * host, char const * user, char const * passwd, unsigned int);
-# 555 "mysql.h"
+# 571 "mysql.h"
 extern int mysql_manager_fetch_line(MYSQL_MANAGER * con, char * res_buf, int);
-# 546 "mysql.h"
+# 562 "mysql.h"
 extern MYSQL_MANAGER * mysql_manager_init(MYSQL_MANAGER * con);
-# 431 "mysql.h"
+# 445 "mysql.h"
 extern my_bool mysql_master_query(MYSQL * mysql, char const * q, unsigned long int);
-# 433 "mysql.h"
+# 447 "mysql.h"
 extern my_bool mysql_master_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 725 "mysql.h"
+# 824 "mysql.h"
 extern my_bool mysql_more_results(MYSQL * mysql);
-# 726 "mysql.h"
+# 825 "mysql.h"
 extern int mysql_next_result(MYSQL * mysql);
-# 388 "mysql.h"
+# 401 "mysql.h"
 extern unsigned int mysql_num_fields(MYSQL_RES * res);
-# 387 "mysql.h"
+# 400 "mysql.h"
 extern my_ulonglong mysql_num_rows(MYSQL_RES * res);
-# 533 "mysql.h"
+# 549 "mysql.h"
 extern char * mysql_odbc_escape_string(MYSQL * mysql, char * to, unsigned long int, char const * from, unsigned long int, void * param, char * (* extend_buffer)(void *, char * to, unsigned long int * length));
-# 511 "mysql.h"
+# 527 "mysql.h"
 extern int mysql_options(MYSQL * mysql, enum mysql_option, char const * arg);
-# 500 "mysql.h"
+# 516 "mysql.h"
 extern int mysql_ping(MYSQL * mysql);
-# 79 "mysql.h"
+# 75 "mysql.h"
 extern unsigned int mysql_port;
-# 422 "mysql.h"
+# 436 "mysql.h"
 extern int mysql_query(MYSQL * mysql, char const * q);
-# 558 "mysql.h"
+# 574 "mysql.h"
 extern my_bool mysql_read_query_result(MYSQL * mysql);
-# 473 "mysql.h"
+# 489 "mysql.h"
 extern my_bool mysql_reads_from_master_enabled(MYSQL * mysql);
-# 414 "mysql.h"
+# 428 "mysql.h"
 extern MYSQL * mysql_real_connect(MYSQL * mysql, char const * host, char const * user, char const * passwd, char const * db, unsigned int, char const * unix_socket, unsigned long int);
-# 529 "mysql.h"
+# 545 "mysql.h"
 extern unsigned long int mysql_real_escape_string(MYSQL * mysql, char * to, char const * from, unsigned long int);
-# 425 "mysql.h"
+# 439 "mysql.h"
 extern int mysql_real_query(MYSQL * mysql, char const * q, unsigned long int);
-# 494 "mysql.h"
+# 510 "mysql.h"
 extern int mysql_refresh(MYSQL * mysql, unsigned int);
-# 723 "mysql.h"
+# 822 "mysql.h"
 extern my_bool mysql_rollback(MYSQL * mysql);
-# 516 "mysql.h"
+# 532 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_row_seek(MYSQL_RES * result, MYSQL_ROW_OFFSET);
-# 393 "mysql.h"
+# 406 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_row_tell(MYSQL_RES * res);
-# 467 "mysql.h"
+# 483 "mysql.h"
 extern int mysql_rpl_parse_enabled(MYSQL * mysql);
-# 478 "mysql.h"
+# 494 "mysql.h"
 extern my_bool mysql_rpl_probe(MYSQL * mysql);
-# 475 "mysql.h"
+# 491 "mysql.h"
 extern enum mysql_rpl_type mysql_rpl_query_type(char const * q, int);
-# 421 "mysql.h"
+# 435 "mysql.h"
 extern int mysql_select_db(MYSQL * mysql, char const * db);
-# 423 "mysql.h"
+# 437 "mysql.h"
 extern int mysql_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 358 "mysql.h"
+# 371 "mysql.h"
 extern void mysql_server_end(void);
-# 357 "mysql.h"
+# 370 "mysql.h"
 extern int mysql_server_init(int, char * * argv, char * * groups);
-# 406 "mysql.h"
+# 419 "mysql.h"
 extern int mysql_set_character_set(MYSQL * mysql, char const * csname);
-# 456 "mysql.h"
+# 472 "mysql.h"
 extern void mysql_set_local_infile_default(MYSQL * mysql);
-# 445 "mysql.h"
+# 461 "mysql.h"
 extern void mysql_set_local_infile_handler(MYSQL * mysql, int (* local_infile_init)(void * *, char const *, void *), int (* local_infile_read)(void *, char *, unsigned int), void (* local_infile_end)(void), int (* local_infile_error)(void *, char *, unsigned int), void *);
-# 481 "mysql.h"
-extern int mysql_set_master(MYSQL * mysql, char const * host, unsigned int, char const * user, char const * passwd);
 # 497 "mysql.h"
+extern int mysql_set_master(MYSQL * mysql, char const * host, unsigned int, char const * user, char const * passwd);
+# 513 "mysql.h"
 extern int mysql_set_server_option(MYSQL * mysql, enum enum_mysql_set_option);
-# 490 "mysql.h"
+# 506 "mysql.h"
 extern int mysql_shutdown(MYSQL * mysql, enum mysql_enum_shutdown_level);
-# 436 "mysql.h"
+# 450 "mysql.h"
 extern my_bool mysql_slave_query(MYSQL * mysql, char const * q, unsigned long int);
-# 438 "mysql.h"
+# 452 "mysql.h"
 extern my_bool mysql_slave_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 401 "mysql.h"
+# 414 "mysql.h"
 extern char const * mysql_sqlstate(MYSQL * mysql);
-# 409 "mysql.h"
+# 422 "mysql.h"
 extern my_bool mysql_ssl_set(MYSQL * mysql, char const * key, char const * cert, char const * ca, char const * capath, char const * cipher);
-# 501 "mysql.h"
+# 517 "mysql.h"
 extern char const * mysql_stat(MYSQL * mysql);
-# 718 "mysql.h"
+# 817 "mysql.h"
 extern my_ulonglong mysql_stmt_affected_rows(MYSQL_STMT * stmt);
-# 696 "mysql.h"
+# 795 "mysql.h"
 extern my_bool mysql_stmt_attr_get(MYSQL_STMT * stmt, enum enum_stmt_attr_type, void * attr);
-# 693 "mysql.h"
+# 792 "mysql.h"
 extern my_bool mysql_stmt_attr_set(MYSQL_STMT * stmt, enum enum_stmt_attr_type, void const * attr);
-# 699 "mysql.h"
+# 798 "mysql.h"
 extern my_bool mysql_stmt_bind_param(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-# 700 "mysql.h"
+# 799 "mysql.h"
 extern my_bool mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-# 701 "mysql.h"
+# 800 "mysql.h"
 extern my_bool mysql_stmt_close(MYSQL_STMT * stmt);
-# 716 "mysql.h"
+# 815 "mysql.h"
 extern void mysql_stmt_data_seek(MYSQL_STMT * stmt, my_ulonglong);
-# 710 "mysql.h"
+# 809 "mysql.h"
 extern unsigned int mysql_stmt_errno(MYSQL_STMT * stmt);
-# 711 "mysql.h"
+# 810 "mysql.h"
 extern char const * mysql_stmt_error(MYSQL_STMT * stmt);
-# 686 "mysql.h"
+# 785 "mysql.h"
 extern int mysql_stmt_execute(MYSQL_STMT * stmt);
-# 687 "mysql.h"
+# 786 "mysql.h"
 extern int mysql_stmt_fetch(MYSQL_STMT * stmt);
-# 688 "mysql.h"
+# 787 "mysql.h"
 extern int mysql_stmt_fetch_column(MYSQL_STMT * stmt, MYSQL_BIND * bind, unsigned int, unsigned long int);
-# 720 "mysql.h"
+# 819 "mysql.h"
 extern unsigned int mysql_stmt_field_count(MYSQL_STMT * stmt);
-# 703 "mysql.h"
+# 802 "mysql.h"
 extern my_bool mysql_stmt_free_result(MYSQL_STMT * stmt);
-# 683 "mysql.h"
+# 782 "mysql.h"
 extern MYSQL_STMT * mysql_stmt_init(MYSQL * mysql);
-# 719 "mysql.h"
+# 818 "mysql.h"
 extern my_ulonglong mysql_stmt_insert_id(MYSQL_STMT * stmt);
-# 717 "mysql.h"
+# 816 "mysql.h"
 extern my_ulonglong mysql_stmt_num_rows(MYSQL_STMT * stmt);
-# 692 "mysql.h"
+# 791 "mysql.h"
 extern unsigned long int mysql_stmt_param_count(MYSQL_STMT * stmt);
-# 709 "mysql.h"
+# 808 "mysql.h"
 extern MYSQL_RES * mysql_stmt_param_metadata(MYSQL_STMT * stmt);
-# 684 "mysql.h"
+# 783 "mysql.h"
 extern int mysql_stmt_prepare(MYSQL_STMT * stmt, char const * query, unsigned long int);
-# 702 "mysql.h"
+# 801 "mysql.h"
 extern my_bool mysql_stmt_reset(MYSQL_STMT * stmt);
-# 708 "mysql.h"
+# 807 "mysql.h"
 extern MYSQL_RES * mysql_stmt_result_metadata(MYSQL_STMT * stmt);
-# 713 "mysql.h"
+# 812 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_stmt_row_seek(MYSQL_STMT * stmt, MYSQL_ROW_OFFSET);
-# 715 "mysql.h"
+# 814 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_stmt_row_tell(MYSQL_STMT * stmt);
-# 704 "mysql.h"
+# 803 "mysql.h"
 extern my_bool mysql_stmt_send_long_data(MYSQL_STMT * stmt, unsigned int, char const * data, unsigned long int);
-# 712 "mysql.h"
+# 811 "mysql.h"
 extern char const * mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-# 691 "mysql.h"
+# 790 "mysql.h"
 extern int mysql_stmt_store_result(MYSQL_STMT * stmt);
-# 427 "mysql.h"
+# 441 "mysql.h"
 extern MYSQL_RES * mysql_store_result(MYSQL * mysql);
-# 380 "mysql.h"
+# 393 "mysql.h"
 extern void mysql_thread_end(void);
-# 404 "mysql.h"
+# 417 "mysql.h"
 extern unsigned long int mysql_thread_id(MYSQL * mysql);
-# 379 "mysql.h"
+# 392 "mysql.h"
 extern my_bool mysql_thread_init(void);
-# 544 "mysql.h"
+# 560 "mysql.h"
 extern unsigned int mysql_thread_safe(void);
-# 80 "mysql.h"
+# 76 "mysql.h"
 extern char * mysql_unix_port;
-# 428 "mysql.h"
+# 442 "mysql.h"
 extern MYSQL_RES * mysql_use_result(MYSQL * mysql);
-# 402 "mysql.h"
+# 415 "mysql.h"
 extern unsigned int mysql_warning_count(MYSQL * mysql);
-# 284 "mysql_com.h"
+# 339 "mysql_com.h"
 extern void net_clear(NET * net);
-# 283 "mysql_com.h"
+# 338 "mysql_com.h"
 extern void net_end(NET * net);
-# 286 "mysql_com.h"
+# 341 "mysql_com.h"
 extern my_bool net_flush(NET * net);
-# 291 "mysql_com.h"
+# 346 "mysql_com.h"
 extern int net_real_write(NET * net, char const * packet, unsigned long int);
-# 285 "mysql_com.h"
+# 340 "mysql_com.h"
 extern my_bool net_realloc(NET * net, unsigned long int);
-# 755 "mysql.h"
-extern unsigned long int net_safe_read(MYSQL * mysql);
-# 288 "mysql_com.h"
+# 343 "mysql_com.h"
 extern my_bool net_write_command(NET * net, unsigned char, char const * header, unsigned long int, char const * packet, unsigned long int);
+# 427 "mysql_com.h"
+extern char * octet2hex(char * to, char const * str, unsigned int);
 # 121 "/usr/include/sys/select.h"
 extern int pselect(int, fd_set * restrict __readfds, fd_set * restrict __writefds, fd_set * restrict __exceptfds, struct timespec const * restrict __timeout, __sigset_t const * restrict __sigmask);
-# 350 "mysql_com.h"
+# 408 "mysql_com.h"
 extern void randominit(struct rand_struct *, unsigned long int, unsigned long int);
-# 364 "mysql_com.h"
+# 422 "mysql_com.h"
 extern void scramble(char * to, char const * message, char const * password);
-# 357 "mysql_com.h"
+# 415 "mysql_com.h"
 extern void scramble_323(char * to, char const * message, char const * password);
 # 109 "/usr/include/sys/select.h"
 extern int select(int, fd_set * restrict __readfds, fd_set * restrict __writefds, fd_set * restrict __exceptfds, struct timeval * restrict __timeout);