List:Commits« Previous MessageNext Message »
From:konstantin Date:December 13 2007 5:17pm
Subject:bk commit into 6.0 tree (kostja:1.2760) BUG#12713
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-13 20:17:28+03:00, kostja@bodhi.(none) +5 -0
  Fix a compilation failure introduced by the merge of the first patch
  for Bug#12713.
  
  Update the ABI compatibility file to reflect recent (compatible) changes.

  include/mysql_com.h@stripped, 2007-12-13 20:17:25+03:00, kostja@bodhi.(none) +1 -1
    Rename an unused member to avoid a name conflict.

  include/mysql_h.ic@stripped, 2007-12-13 20:17:25+03:00, kostja@bodhi.(none) +176 -244
    Update the ABI check file to reflect the rename.
    Unfortunately the ABI was not updated for the fix for Bug#,
    so the change displays extra lines for this change.

  sql/scheduler.cc@stripped, 2007-12-13 20:17:25+03:00, kostja@bodhi.(none) +0 -1
    Remove no_send_error, which no longer exists.

  sql/sql_select.cc@stripped, 2007-12-13 20:17:25+03:00, kostja@bodhi.(none) +0 -4
    Remove references to variables which no longer exist.

  sql/sql_union.cc@stripped, 2007-12-13 20:17:25+03:00, kostja@bodhi.(none) +1 -3
    Remove references to variables which no longer exist.

diff -Nrup a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h	2007-12-12 18:40:30 +03:00
+++ b/include/mysql_com.h	2007-12-13 20:17:25 +03:00
@@ -230,7 +230,7 @@ typedef struct st_net {
   unsigned int client_last_errno;
   unsigned char error; 
   my_bool unused2; /* Please remove with the next incompatible ABI change. */
-  my_bool unused1; /* Please remove with the next incompatible ABI change */
+  my_bool unused3; /* Please remove with the next incompatible ABI change. */
   /** Client library error message buffer. Actually belongs to struct MYSQL. */
   char client_last_error[MYSQL_ERRMSG_SIZE];
   /** Client library sqlstate buffer. Set along with the error message. */
diff -Nrup a/include/mysql_h.ic b/include/mysql_h.ic
--- a/include/mysql_h.ic	2007-12-12 18:40:30 +03:00
+++ b/include/mysql_h.ic	2007-12-13 20:17:25 +03:00
@@ -12,7 +12,6 @@ struct st_mysql_ftparser_boolean_info;
 struct st_mysql_ftparser_param;
 struct st_mysql_information_schema;
 struct st_mysql_lex_string;
-struct st_mysql_manager;
 struct st_mysql_methods;
 struct st_mysql_options;
 struct st_mysql_parameters;
@@ -44,7 +43,6 @@ enum enum_stmt_attr_type;
 enum mysql_enum_shutdown_level;
 enum mysql_option;
 enum mysql_protocol_type;
-enum mysql_rpl_type;
 enum mysql_status;
 # 139 "mysql.h"
 typedef struct st_mysql_rows MYSQL_ROWS;
@@ -52,9 +50,9 @@ typedef struct st_mysql_rows MYSQL_ROWS;
 typedef struct st_list LIST;
 # 34 "my_alloc.h"
 typedef struct st_mem_root MEM_ROOT;
-# 258 "mysql.h"
+# 235 "mysql.h"
 typedef struct st_mysql MYSQL;
-# 654 "mysql.h"
+# 542 "mysql.h"
 typedef struct st_mysql_bind MYSQL_BIND;
 # 95 "mysql.h"
 typedef struct st_mysql_field MYSQL_FIELD;
@@ -62,27 +60,25 @@ typedef struct st_mysql_field MYSQL_FIEL
 typedef unsigned int MYSQL_FIELD_OFFSET;
 # 35 "mysql/plugin.h"
 typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
-# 348 "mysql.h"
-typedef struct st_mysql_manager MYSQL_MANAGER;
-# 363 "mysql.h"
+# 304 "mysql.h"
 typedef struct st_mysql_parameters MYSQL_PARAMETERS;
-# 316 "mysql.h"
+# 280 "mysql.h"
 typedef struct st_mysql_res MYSQL_RES;
 # 119 "mysql.h"
 typedef char * * MYSQL_ROW;
 # 145 "mysql.h"
 typedef MYSQL_ROWS * MYSQL_ROW_OFFSET;
-# 683 "mysql.h"
+# 571 "mysql.h"
 typedef struct st_mysql_stmt MYSQL_STMT;
 # 52 "mysql/plugin.h"
 typedef struct st_mysql_xid MYSQL_XID;
-# 243 "mysql.h"
+# 220 "mysql.h"
 typedef struct character_set MY_CHARSET_INFO;
-# 188 "mysql_com.h"
+# 198 "mysql_com.h"
 typedef struct st_net NET;
 # 22 "typelib.h"
 typedef struct st_typelib TYPELIB;
-# 178 "mysql_com.h"
+# 188 "mysql_com.h"
 typedef struct st_vio Vio;
 # 28 "my_list.h"
 typedef int (* list_walk_action)(void *, void *);
@@ -92,7 +88,7 @@ typedef char my_bool;
 typedef int my_socket;
 # 128 "mysql.h"
 typedef unsigned long long int my_ulonglong;
-# 214 "/usr/lib/gcc/i486-linux-gnu/4.1.3/include/stddef.h"
+# 214 "/usr/lib/gcc/i486-linux-gnu/4.1.2/include/stddef.h"
 typedef unsigned int size_t;
 # 149 "mysql.h"
 typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
@@ -102,13 +98,13 @@ typedef struct st_mysql_data MYSQL_DATA;
 typedef struct st_mysql_ftparser_boolean_info MYSQL_FTPARSER_BOOLEAN_INFO;
 # 557 "mysql/plugin.h"
 typedef struct st_mysql_ftparser_param MYSQL_FTPARSER_PARAM;
-# 753 "mysql.h"
+# 641 "mysql.h"
 typedef struct st_mysql_methods MYSQL_METHODS;
 # 47 "mysql_time.h"
 typedef struct st_mysql_time MYSQL_TIME;
-# 384 "mysql_com.h"
+# 389 "mysql_com.h"
 typedef struct st_udf_args UDF_ARGS;
-# 398 "mysql_com.h"
+# 403 "mysql_com.h"
 typedef struct st_udf_init UDF_INIT;
 # 26 "my_alloc.h"
 typedef struct st_used_mem USED_MEM;
@@ -118,7 +114,7 @@ typedef int (* mysql_show_var_func)(void
 typedef int (* mysql_var_check_func)(void * thd, struct st_mysql_sys_var * var, void * save, struct st_mysql_value * value);
 # 188 "mysql/plugin.h"
 typedef void (* mysql_var_update_func)(void * thd, struct st_mysql_sys_var * var, void * var_ptr, void * save);
-# 243 "mysql.h"
+# 220 "mysql.h"
 struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(void *)))) character_set
   {
     unsigned int number;
@@ -130,7 +126,7 @@ struct __attribute__((aligned(__alignof_
     unsigned int mbminlen;
     unsigned int mbmaxlen;
   };
-# 370 "mysql_com.h"
+# 375 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof__(double)))) rand_struct
   {
     unsigned long int seed1;
@@ -157,7 +153,7 @@ struct __attribute__((aligned(__alignof_
     unsigned int first_block_usage;
     void (* error_handler)(void);
   };
-# 258 "mysql.h"
+# 235 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long long int)))) st_mysql
   {
     NET net;
@@ -191,11 +187,11 @@ struct __attribute__((aligned(__alignof_
     my_bool free_me;
     my_bool reconnect;
     char scramble[(20 + 1)];
-    my_bool rpl_pivot;
-    struct st_mysql * master;
-    struct st_mysql * next_slave;
-    struct st_mysql * last_used_slave;
-    struct st_mysql * last_used_con;
+    my_bool unused1;
+    void * unused2;
+    void * unused3;
+    void * unused4;
+    void * unused5;
     LIST * stmts;
     struct st_mysql_methods const * methods;
     void * thd;
@@ -203,7 +199,7 @@ struct __attribute__((aligned(__alignof_
     char * info_buffer;
     void * extension;
   };
-# 654 "mysql.h"
+# 542 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_bind
   {
     unsigned long int * length;
@@ -309,26 +305,7 @@ struct __attribute__((aligned(__alignof_
     char * str;
     unsigned int length;
   };
-# 348 "mysql.h"
-struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_mysql_manager
-  {
-    NET net;
-    char * host;
-    char * user;
-    char * passwd;
-    char * net_buf;
-    char * net_buf_pos;
-    char * net_data_end;
-    unsigned int port;
-    int cmd_status;
-    int last_errno;
-    int net_buf_size;
-    my_bool free_me;
-    my_bool eof;
-    char last_error[256];
-    void * extension;
-  };
-# 753 "mysql.h"
+# 641 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)))) st_mysql_methods
   {
     my_bool (* read_query_result)(MYSQL * mysql);
@@ -377,10 +354,10 @@ struct __attribute__((aligned(__alignof_
     my_bool use_ssl;
     my_bool compress;
     my_bool named_pipe;
-    my_bool rpl_probe;
-    my_bool rpl_parse;
-    my_bool no_master_reads;
-    my_bool separate_thread;
+    my_bool unused1;
+    my_bool unused2;
+    my_bool unused3;
+    my_bool unused4;
     enum mysql_option methods_to_use;
     char * client_ip;
     my_bool secure_auth;
@@ -392,7 +369,7 @@ struct __attribute__((aligned(__alignof_
     void * local_infile_userdata;
     void * extension;
   };
-# 363 "mysql.h"
+# 304 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)))) st_mysql_parameters
   {
     unsigned long int * p_max_allowed_packet;
@@ -415,7 +392,7 @@ struct __attribute__((aligned(__alignof_
     struct st_mysql_sys_var * * system_vars;
     void * __reserved1;
   };
-# 316 "mysql.h"
+# 280 "mysql.h"
 struct __attribute__((aligned(__alignof__(unsigned long long int)), aligned(__alignof__(void *)))) st_mysql_res
   {
     my_ulonglong row_count;
@@ -448,7 +425,7 @@ struct __attribute__((aligned(__alignof_
     char * value;
     enum enum_mysql_show_type type;
   };
-# 683 "mysql.h"
+# 571 "mysql.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long long int)))) st_mysql_stmt
   {
     MEM_ROOT mem_root;
@@ -513,7 +490,7 @@ struct __attribute__((aligned(__alignof_
     long int bqual_length;
     char data[128];
   };
-# 188 "mysql_com.h"
+# 198 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned long int)))) st_net
   {
     Vio * vio;
@@ -545,7 +522,7 @@ struct __attribute__((aligned(__alignof_
     unsigned int client_last_errno;
     unsigned char error;
     my_bool unused2;
-    my_bool unused1;
+    my_bool unused3;
     char client_last_error[512];
     char sqlstate[(5 + 1)];
     void * extension;
@@ -558,7 +535,7 @@ struct __attribute__((aligned(__alignof_
     char const * * type_names;
     unsigned int * type_lengths;
   };
-# 384 "mysql_com.h"
+# 389 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned int)), aligned(__alignof__(void *)))) st_udf_args
   {
     unsigned int arg_count;
@@ -570,7 +547,7 @@ struct __attribute__((aligned(__alignof_
     unsigned long int * attribute_lengths;
     void * extension;
   };
-# 398 "mysql_com.h"
+# 403 "mysql_com.h"
 struct __attribute__((aligned(__alignof__(unsigned long int)), aligned(__alignof__(void *)))) st_udf_init
   {
     my_bool maybe_null;
@@ -587,7 +564,7 @@ struct __attribute__((aligned(__alignof_
     unsigned int left;
     unsigned int size;
   };
-# 381 "mysql_com.h"
+# 386 "mysql_com.h"
 enum Item_result
   {
     STRING_RESULT = 0,
@@ -596,7 +573,7 @@ enum Item_result
     ROW_RESULT = 3,
     DECIMAL_RESULT = 4,
   };
-# 322 "mysql_com.h"
+# 331 "mysql_com.h"
 enum enum_cursor_type
   {
     CURSOR_TYPE_NO_CURSOR = 0,
@@ -604,7 +581,7 @@ enum enum_cursor_type
     CURSOR_TYPE_FOR_UPDATE = 2,
     CURSOR_TYPE_SCROLLABLE = 4,
   };
-# 235 "mysql_com.h"
+# 244 "mysql_com.h"
 enum enum_field_types
   {
     MYSQL_TYPE_DECIMAL = 0,
@@ -651,7 +628,7 @@ enum enum_ftparser_mode
     MYSQL_FTPARSER_WITH_STOPWORDS = 1,
     MYSQL_FTPARSER_FULL_BOOLEAN_INFO = 2,
   };
-# 332 "mysql_com.h"
+# 341 "mysql_com.h"
 enum enum_mysql_set_option
   {
     MYSQL_OPTION_MULTI_STATEMENTS_ON = 0,
@@ -671,7 +648,7 @@ enum enum_mysql_show_type
     SHOW_FUNC = 8,
     SHOW_DOUBLE = 9,
   };
-# 584 "mysql.h"
+# 472 "mysql.h"
 enum enum_mysql_stmt_state
   {
     MYSQL_STMT_INIT_DONE = 1,
@@ -688,7 +665,7 @@ enum enum_mysql_timestamp_type
     MYSQL_TIMESTAMP_DATETIME = 1,
     MYSQL_TIMESTAMP_TIME = 2,
   };
-# 55 "mysql_com.h"
+# 63 "mysql_com.h"
 enum enum_server_command
   {
     COM_SLEEP = 0,
@@ -723,14 +700,14 @@ enum enum_server_command
     COM_DAEMON = 29,
     COM_END = 30,
   };
-# 730 "mysql.h"
+# 618 "mysql.h"
 enum enum_stmt_attr_type
   {
     STMT_ATTR_UPDATE_MAX_LENGTH = 0,
     STMT_ATTR_CURSOR_TYPE = 1,
     STMT_ATTR_PREFETCH_ROWS = 2,
   };
-# 297 "mysql_com.h"
+# 306 "mysql_com.h"
 enum mysql_enum_shutdown_level
   {
     SHUTDOWN_DEFAULT = 0,
@@ -767,7 +744,7 @@ enum mysql_option
     MYSQL_OPT_RECONNECT = 20,
     MYSQL_OPT_SSL_VERIFY_SERVER_CERT = 21,
   };
-# 228 "mysql.h"
+# 214 "mysql.h"
 enum mysql_protocol_type
   {
     MYSQL_PROTOCOL_DEFAULT = 0,
@@ -776,27 +753,20 @@ enum mysql_protocol_type
     MYSQL_PROTOCOL_PIPE = 3,
     MYSQL_PROTOCOL_MEMORY = 4,
   };
-# 238 "mysql.h"
-enum mysql_rpl_type
-  {
-    MYSQL_RPL_MASTER = 0,
-    MYSQL_RPL_SLAVE = 1,
-    MYSQL_RPL_ADMIN = 2,
-  };
-# 223 "mysql.h"
+# 209 "mysql.h"
 enum mysql_status
   {
     MYSQL_STATUS_READY = 0,
     MYSQL_STATUS_GET_RESULT = 1,
     MYSQL_STATUS_USE_RESULT = 2,
   };
-# 439 "mysql_com.h"
+# 444 "mysql_com.h"
 extern my_bool check_scramble(char const * reply, char const * message, unsigned char const * hash_stage2);
-# 432 "mysql_com.h"
+# 437 "mysql_com.h"
 extern my_bool check_scramble_323(char const *, char const * message, unsigned long int * salt);
 # 35 "typelib.h"
 extern TYPELIB * copy_typelib(MEM_ROOT * root, TYPELIB * from);
-# 427 "mysql_com.h"
+# 432 "mysql_com.h"
 extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st);
 # 32 "typelib.h"
 extern int find_type(char * x, TYPELIB const * typelib, unsigned int);
@@ -804,15 +774,15 @@ extern int find_type(char * x, TYPELIB c
 extern int find_type_or_exit(char const * x, TYPELIB * typelib, char const * option);
 # 29 "typelib.h"
 extern my_ulonglong find_typeset(char * x, TYPELIB * typelib, int * error_position);
-# 441 "mysql_com.h"
+# 446 "mysql_com.h"
 extern void get_salt_from_password(unsigned char * res, char const * password);
-# 434 "mysql_com.h"
+# 439 "mysql_com.h"
 extern void get_salt_from_password_323(unsigned long int * res, char const * password);
-# 447 "mysql_com.h"
+# 452 "mysql_com.h"
 extern char * get_tty_password(char const * opt_message);
 # 34 "typelib.h"
 extern char const * get_type(TYPELIB * typelib, unsigned int);
-# 429 "mysql_com.h"
+# 434 "mysql_com.h"
 extern void hash_password(unsigned long int * to, char const * password, unsigned int);
 # 30 "my_list.h"
 extern LIST * list_add(LIST * root, LIST * element);
@@ -828,305 +798,267 @@ extern unsigned int list_length(LIST *);
 extern LIST * list_reverse(LIST * root);
 # 36 "my_list.h"
 extern int list_walk(LIST *, list_walk_action, unsigned char * argument);
-# 442 "mysql_com.h"
+# 447 "mysql_com.h"
 extern void make_password_from_salt(char * to, unsigned char const * hash_stage2);
-# 435 "mysql_com.h"
+# 440 "mysql_com.h"
 extern void make_password_from_salt_323(char * to, unsigned long int const * salt);
-# 437 "mysql_com.h"
+# 442 "mysql_com.h"
 extern void make_scrambled_password(char * to, char const * password);
-# 430 "mysql_com.h"
+# 435 "mysql_com.h"
 extern void make_scrambled_password_323(char * to, char const * password);
 # 33 "typelib.h"
 extern void make_type(char * to, unsigned int, TYPELIB * typelib);
-# 367 "mysql_com.h"
+# 372 "mysql_com.h"
 extern int my_connect(my_socket, struct sockaddr const * name, unsigned int, unsigned int);
-# 344 "mysql_com.h"
+# 353 "mysql_com.h"
 extern my_bool my_net_init(NET * net, Vio * vio);
-# 345 "mysql_com.h"
+# 354 "mysql_com.h"
 extern void my_net_local_init(NET * net);
-# 355 "mysql_com.h"
+# 364 "mysql_com.h"
 extern unsigned long int my_net_read(NET * net);
-# 350 "mysql_com.h"
+# 359 "mysql_com.h"
 extern my_bool my_net_write(NET * net, unsigned char const * packet, size_t);
-# 426 "mysql_com.h"
+# 431 "mysql_com.h"
 extern double my_rnd(struct rand_struct *);
-# 453 "mysql_com.h"
+# 458 "mysql_com.h"
 extern void my_thread_end(void);
-# 452 "mysql_com.h"
+# 457 "mysql_com.h"
 extern my_bool my_thread_init(void);
-# 560 "mysql.h"
+# 460 "mysql.h"
 extern void myodbc_remove_escape(MYSQL * mysql, char * name);
-# 512 "mysql.h"
-extern int mysql_add_slave(MYSQL * mysql, char const * host, unsigned int, char const * user, char const * passwd);
-# 421 "mysql.h"
+# 362 "mysql.h"
 extern my_ulonglong mysql_affected_rows(MYSQL * mysql);
-# 826 "mysql.h"
+# 714 "mysql.h"
 extern my_bool mysql_autocommit(MYSQL * mysql, my_bool);
-# 437 "mysql.h"
+# 378 "mysql.h"
 extern my_bool mysql_change_user(MYSQL * mysql, char const * user, char const * passwd, char const * db);
-# 429 "mysql.h"
+# 370 "mysql.h"
 extern char const * mysql_character_set_name(MYSQL * mysql);
-# 829 "mysql.h"
+# 717 "mysql.h"
 extern void mysql_close(MYSQL * sock);
-# 824 "mysql.h"
+# 712 "mysql.h"
 extern my_bool mysql_commit(MYSQL * mysql);
-# 541 "mysql.h"
+# 441 "mysql.h"
 extern void mysql_data_seek(MYSQL_RES * result, my_ulonglong);
-# 559 "mysql.h"
+# 459 "mysql.h"
 extern void mysql_debug(char const * debug);
-# 498 "mysql.h"
-extern void mysql_disable_reads_from_master(MYSQL * mysql);
-# 492 "mysql.h"
-extern void mysql_disable_rpl_parse(MYSQL * mysql);
-# 520 "mysql.h"
+# 420 "mysql.h"
 extern int mysql_dump_debug_info(MYSQL * mysql);
-# 562 "mysql.h"
+# 462 "mysql.h"
 extern my_bool mysql_embedded(void);
-# 497 "mysql.h"
-extern void mysql_enable_reads_from_master(MYSQL * mysql);
-# 491 "mysql.h"
-extern void mysql_enable_rpl_parse(MYSQL * mysql);
-# 413 "mysql.h"
+# 354 "mysql.h"
 extern my_bool mysql_eof(MYSQL_RES * res);
-# 423 "mysql.h"
+# 364 "mysql.h"
 extern unsigned int mysql_errno(MYSQL * mysql);
-# 448 "mysql_com.h"
+# 453 "mysql_com.h"
 extern char const * mysql_errno_to_sqlstate(unsigned int);
-# 424 "mysql.h"
+# 365 "mysql.h"
 extern char const * mysql_error(MYSQL * mysql);
-# 552 "mysql.h"
+# 452 "mysql.h"
 extern unsigned long int mysql_escape_string(char * to, char const * from, unsigned long int);
-# 549 "mysql.h"
+# 449 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_field(MYSQL_RES * result);
-# 414 "mysql.h"
+# 355 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_field_direct(MYSQL_RES * res, unsigned int);
-# 416 "mysql.h"
+# 357 "mysql.h"
 extern MYSQL_FIELD * mysql_fetch_fields(MYSQL_RES * res);
-# 548 "mysql.h"
+# 448 "mysql.h"
 extern unsigned long int * mysql_fetch_lengths(MYSQL_RES * result);
-# 547 "mysql.h"
+# 447 "mysql.h"
 extern MYSQL_ROW mysql_fetch_row(MYSQL_RES * result);
-# 420 "mysql.h"
+# 361 "mysql.h"
 extern unsigned int mysql_field_count(MYSQL * mysql);
-# 545 "mysql.h"
+# 445 "mysql.h"
 extern MYSQL_FIELD_OFFSET mysql_field_seek(MYSQL_RES * result, MYSQL_FIELD_OFFSET);
-# 418 "mysql.h"
+# 359 "mysql.h"
 extern MYSQL_FIELD_OFFSET mysql_field_tell(MYSQL_RES * res);
-# 540 "mysql.h"
+# 440 "mysql.h"
 extern void mysql_free_result(MYSQL_RES * result);
-# 465 "mysql.h"
+# 396 "mysql.h"
 extern void mysql_get_character_set_info(MYSQL * mysql, MY_CHARSET_INFO * charset);
-# 530 "mysql.h"
+# 430 "mysql.h"
 extern char const * mysql_get_client_info(void);
-# 531 "mysql.h"
+# 431 "mysql.h"
 extern unsigned long int mysql_get_client_version(void);
-# 532 "mysql.h"
+# 432 "mysql.h"
 extern char const * mysql_get_host_info(MYSQL * mysql);
-# 395 "mysql.h"
+# 336 "mysql.h"
 extern MYSQL_PARAMETERS * mysql_get_parameters(void);
-# 534 "mysql.h"
+# 434 "mysql.h"
 extern unsigned int mysql_get_proto_info(MYSQL * mysql);
-# 529 "mysql.h"
+# 429 "mysql.h"
 extern char const * mysql_get_server_info(MYSQL * mysql);
-# 533 "mysql.h"
+# 433 "mysql.h"
 extern unsigned long int mysql_get_server_version(MYSQL * mysql);
-# 436 "mysql.h"
+# 377 "mysql.h"
 extern char const * mysql_get_ssl_cipher(MYSQL * mysql);
-# 554 "mysql.h"
+# 454 "mysql.h"
 extern unsigned long int mysql_hex_string(char * to, char const * from, unsigned long int);
-# 427 "mysql.h"
+# 368 "mysql.h"
 extern char const * mysql_info(MYSQL * mysql);
-# 432 "mysql.h"
+# 373 "mysql.h"
 extern MYSQL * mysql_init(MYSQL * mysql);
-# 422 "mysql.h"
+# 363 "mysql.h"
 extern my_ulonglong mysql_insert_id(MYSQL * mysql);
-# 523 "mysql.h"
+# 423 "mysql.h"
 extern int mysql_kill(MYSQL * mysql, unsigned long int);
-# 535 "mysql.h"
+# 435 "mysql.h"
 extern MYSQL_RES * mysql_list_dbs(MYSQL * mysql, char const * wild);
-# 550 "mysql.h"
+# 450 "mysql.h"
 extern MYSQL_RES * mysql_list_fields(MYSQL * mysql, char const * table, char const * wild);
-# 537 "mysql.h"
+# 437 "mysql.h"
 extern MYSQL_RES * mysql_list_processes(MYSQL * mysql);
-# 536 "mysql.h"
+# 436 "mysql.h"
 extern MYSQL_RES * mysql_list_tables(MYSQL * mysql, char const * wild);
-# 569 "mysql.h"
-extern void mysql_manager_close(MYSQL_MANAGER * con);
-# 570 "mysql.h"
-extern int mysql_manager_command(MYSQL_MANAGER * con, char const * cmd, int);
-# 564 "mysql.h"
-extern MYSQL_MANAGER * mysql_manager_connect(MYSQL_MANAGER * con, char const * host, char const * user, char const * passwd, unsigned int);
-# 572 "mysql.h"
-extern int mysql_manager_fetch_line(MYSQL_MANAGER * con, char * res_buf, int);
-# 563 "mysql.h"
-extern MYSQL_MANAGER * mysql_manager_init(MYSQL_MANAGER * con);
-# 456 "mysql.h"
-extern my_bool mysql_master_query(MYSQL * mysql, char const * q, unsigned long int);
-# 458 "mysql.h"
-extern my_bool mysql_master_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 827 "mysql.h"
+# 715 "mysql.h"
 extern my_bool mysql_more_results(MYSQL * mysql);
-# 828 "mysql.h"
+# 716 "mysql.h"
 extern int mysql_next_result(MYSQL * mysql);
-# 412 "mysql.h"
+# 353 "mysql.h"
 extern unsigned int mysql_num_fields(MYSQL_RES * res);
-# 411 "mysql.h"
+# 352 "mysql.h"
 extern my_ulonglong mysql_num_rows(MYSQL_RES * res);
-# 538 "mysql.h"
+# 438 "mysql.h"
 extern int mysql_options(MYSQL * mysql, enum mysql_option, void const * arg);
-# 527 "mysql.h"
+# 427 "mysql.h"
 extern int mysql_ping(MYSQL * mysql);
 # 76 "mysql.h"
 extern unsigned int mysql_port;
-# 447 "mysql.h"
+# 388 "mysql.h"
 extern int mysql_query(MYSQL * mysql, char const * q);
 # 780 "mysql/plugin.h"
 extern void mysql_query_cache_invalidate4(void * thd, char const * key, unsigned int, int);
-# 575 "mysql.h"
+# 463 "mysql.h"
 extern my_bool mysql_read_query_result(MYSQL * mysql);
-# 500 "mysql.h"
-extern my_bool mysql_reads_from_master_enabled(MYSQL * mysql);
-# 439 "mysql.h"
+# 380 "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);
-# 556 "mysql.h"
+# 456 "mysql.h"
 extern unsigned long int mysql_real_escape_string(MYSQL * mysql, char * to, char const * from, unsigned long int);
-# 450 "mysql.h"
+# 391 "mysql.h"
 extern int mysql_real_query(MYSQL * mysql, char const * q, unsigned long int);
-# 521 "mysql.h"
+# 421 "mysql.h"
 extern int mysql_refresh(MYSQL * mysql, unsigned int);
-# 825 "mysql.h"
+# 713 "mysql.h"
 extern my_bool mysql_rollback(MYSQL * mysql);
-# 543 "mysql.h"
+# 443 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_row_seek(MYSQL_RES * result, MYSQL_ROW_OFFSET);
-# 417 "mysql.h"
+# 358 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_row_tell(MYSQL_RES * res);
-# 494 "mysql.h"
-extern int mysql_rpl_parse_enabled(MYSQL * mysql);
-# 505 "mysql.h"
-extern my_bool mysql_rpl_probe(MYSQL * mysql);
-# 502 "mysql.h"
-extern enum mysql_rpl_type mysql_rpl_query_type(char const * q, int);
-# 446 "mysql.h"
+# 387 "mysql.h"
 extern int mysql_select_db(MYSQL * mysql, char const * db);
-# 448 "mysql.h"
+# 389 "mysql.h"
 extern int mysql_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 381 "mysql.h"
+# 322 "mysql.h"
 extern void mysql_server_end(void);
-# 380 "mysql.h"
+# 321 "mysql.h"
 extern int mysql_server_init(int, char * * argv, char * * groups);
-# 430 "mysql.h"
+# 371 "mysql.h"
 extern int mysql_set_character_set(MYSQL * mysql, char const * csname);
-# 483 "mysql.h"
+# 414 "mysql.h"
 extern void mysql_set_local_infile_default(MYSQL * mysql);
-# 472 "mysql.h"
+# 403 "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 *);
-# 508 "mysql.h"
-extern int mysql_set_master(MYSQL * mysql, char const * host, unsigned int, char const * user, char const * passwd);
-# 524 "mysql.h"
+# 424 "mysql.h"
 extern int mysql_set_server_option(MYSQL * mysql, enum enum_mysql_set_option);
-# 517 "mysql.h"
+# 417 "mysql.h"
 extern int mysql_shutdown(MYSQL * mysql, enum mysql_enum_shutdown_level);
-# 461 "mysql.h"
-extern my_bool mysql_slave_query(MYSQL * mysql, char const * q, unsigned long int);
-# 463 "mysql.h"
-extern my_bool mysql_slave_send_query(MYSQL * mysql, char const * q, unsigned long int);
-# 425 "mysql.h"
+# 366 "mysql.h"
 extern char const * mysql_sqlstate(MYSQL * mysql);
-# 433 "mysql.h"
+# 374 "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);
-# 528 "mysql.h"
+# 428 "mysql.h"
 extern char const * mysql_stat(MYSQL * mysql);
-# 820 "mysql.h"
+# 708 "mysql.h"
 extern my_ulonglong mysql_stmt_affected_rows(MYSQL_STMT * stmt);
-# 798 "mysql.h"
+# 686 "mysql.h"
 extern my_bool mysql_stmt_attr_get(MYSQL_STMT * stmt, enum enum_stmt_attr_type, void * attr);
-# 795 "mysql.h"
+# 683 "mysql.h"
 extern my_bool mysql_stmt_attr_set(MYSQL_STMT * stmt, enum enum_stmt_attr_type, void const * attr);
-# 801 "mysql.h"
+# 689 "mysql.h"
 extern my_bool mysql_stmt_bind_param(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-# 802 "mysql.h"
+# 690 "mysql.h"
 extern my_bool mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
-# 803 "mysql.h"
+# 691 "mysql.h"
 extern my_bool mysql_stmt_close(MYSQL_STMT * stmt);
-# 818 "mysql.h"
+# 706 "mysql.h"
 extern void mysql_stmt_data_seek(MYSQL_STMT * stmt, my_ulonglong);
-# 812 "mysql.h"
+# 700 "mysql.h"
 extern unsigned int mysql_stmt_errno(MYSQL_STMT * stmt);
-# 813 "mysql.h"
+# 701 "mysql.h"
 extern char const * mysql_stmt_error(MYSQL_STMT * stmt);
-# 788 "mysql.h"
+# 676 "mysql.h"
 extern int mysql_stmt_execute(MYSQL_STMT * stmt);
-# 789 "mysql.h"
+# 677 "mysql.h"
 extern int mysql_stmt_fetch(MYSQL_STMT * stmt);
-# 790 "mysql.h"
+# 678 "mysql.h"
 extern int mysql_stmt_fetch_column(MYSQL_STMT * stmt, MYSQL_BIND * bind_arg, unsigned int, unsigned long int);
-# 822 "mysql.h"
+# 710 "mysql.h"
 extern unsigned int mysql_stmt_field_count(MYSQL_STMT * stmt);
-# 805 "mysql.h"
+# 693 "mysql.h"
 extern my_bool mysql_stmt_free_result(MYSQL_STMT * stmt);
-# 785 "mysql.h"
+# 673 "mysql.h"
 extern MYSQL_STMT * mysql_stmt_init(MYSQL * mysql);
-# 821 "mysql.h"
+# 709 "mysql.h"
 extern my_ulonglong mysql_stmt_insert_id(MYSQL_STMT * stmt);
-# 819 "mysql.h"
+# 707 "mysql.h"
 extern my_ulonglong mysql_stmt_num_rows(MYSQL_STMT * stmt);
-# 794 "mysql.h"
+# 682 "mysql.h"
 extern unsigned long int mysql_stmt_param_count(MYSQL_STMT * stmt);
-# 811 "mysql.h"
+# 699 "mysql.h"
 extern MYSQL_RES * mysql_stmt_param_metadata(MYSQL_STMT * stmt);
-# 786 "mysql.h"
+# 674 "mysql.h"
 extern int mysql_stmt_prepare(MYSQL_STMT * stmt, char const * query, unsigned long int);
-# 804 "mysql.h"
+# 692 "mysql.h"
 extern my_bool mysql_stmt_reset(MYSQL_STMT * stmt);
-# 810 "mysql.h"
+# 698 "mysql.h"
 extern MYSQL_RES * mysql_stmt_result_metadata(MYSQL_STMT * stmt);
-# 815 "mysql.h"
+# 703 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_stmt_row_seek(MYSQL_STMT * stmt, MYSQL_ROW_OFFSET);
-# 817 "mysql.h"
+# 705 "mysql.h"
 extern MYSQL_ROW_OFFSET mysql_stmt_row_tell(MYSQL_STMT * stmt);
-# 806 "mysql.h"
+# 694 "mysql.h"
 extern my_bool mysql_stmt_send_long_data(MYSQL_STMT * stmt, unsigned int, char const * data, unsigned long int);
-# 814 "mysql.h"
+# 702 "mysql.h"
 extern char const * mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-# 793 "mysql.h"
+# 681 "mysql.h"
 extern int mysql_stmt_store_result(MYSQL_STMT * stmt);
-# 452 "mysql.h"
+# 393 "mysql.h"
 extern MYSQL_RES * mysql_store_result(MYSQL * mysql);
-# 404 "mysql.h"
+# 345 "mysql.h"
 extern void mysql_thread_end(void);
-# 428 "mysql.h"
+# 369 "mysql.h"
 extern unsigned long int mysql_thread_id(MYSQL * mysql);
-# 403 "mysql.h"
+# 344 "mysql.h"
 extern my_bool mysql_thread_init(void);
-# 561 "mysql.h"
+# 461 "mysql.h"
 extern unsigned int mysql_thread_safe(void);
 # 699 "mysql/plugin.h"
 extern int mysql_tmpfile(char const * prefix);
 # 77 "mysql.h"
 extern char * mysql_unix_port;
-# 453 "mysql.h"
+# 394 "mysql.h"
 extern MYSQL_RES * mysql_use_result(MYSQL * mysql);
-# 426 "mysql.h"
+# 367 "mysql.h"
 extern unsigned int mysql_warning_count(MYSQL * mysql);
-# 347 "mysql_com.h"
+# 356 "mysql_com.h"
 extern void net_clear(NET * net, my_bool);
-# 346 "mysql_com.h"
+# 355 "mysql_com.h"
 extern void net_end(NET * net);
-# 349 "mysql_com.h"
+# 358 "mysql_com.h"
 extern my_bool net_flush(NET * net);
-# 354 "mysql_com.h"
+# 363 "mysql_com.h"
 extern int net_real_write(NET * net, unsigned char const * packet, size_t);
-# 348 "mysql_com.h"
+# 357 "mysql_com.h"
 extern my_bool net_realloc(NET * net, size_t);
-# 351 "mysql_com.h"
+# 360 "mysql_com.h"
 extern my_bool net_write_command(NET * net, unsigned char, unsigned char const * header, size_t, unsigned char const * packet, size_t);
-# 443 "mysql_com.h"
+# 448 "mysql_com.h"
 extern char * octet2hex(char * to, char const * str, unsigned int);
-# 424 "mysql_com.h"
+# 429 "mysql_com.h"
 extern void randominit(struct rand_struct *, unsigned long int, unsigned long int);
-# 438 "mysql_com.h"
+# 443 "mysql_com.h"
 extern void scramble(char * to, char const * message, char const * password);
-# 431 "mysql_com.h"
+# 436 "mysql_com.h"
 extern void scramble_323(char * to, char const * message, char const * password);
 # 37 "typelib.h"
 extern TYPELIB sql_protocol_typelib;
diff -Nrup a/sql/scheduler.cc b/sql/scheduler.cc
--- a/sql/scheduler.cc	2007-11-16 00:06:16 +03:00
+++ b/sql/scheduler.cc	2007-12-13 20:17:25 +03:00
@@ -607,7 +607,6 @@ pthread_handler_t libevent_thread_proc(v
     do
     {
       /* Process a query */
-      thd->net.no_send_error= 0;
       if (do_command(thd))
       {
         libevent_connection_close(thd);
diff -Nrup a/sql/sql_select.cc b/sql/sql_select.cc
--- a/sql/sql_select.cc	2007-12-12 18:40:38 +03:00
+++ b/sql/sql_select.cc	2007-12-13 20:17:25 +03:00
@@ -2878,7 +2878,6 @@ mysql_select(THD *thd, Item ***rref_poin
   if (join->flatten_subqueries())
   {
     err= 1;
-    thd->net.report_error= 1;
     goto err;
   }
   /* dump_TABLE_LIST_struct(select_lex, select_lex->leaf_tables); */
@@ -3995,10 +3994,7 @@ make_join_statistics(JOIN *join, TABLE_L
   }
 
   if (pull_out_semijoin_tables(join))
-  {
-    join->thd->net.report_error= 1;
     DBUG_RETURN(TRUE);
-  }
 
   /* Calc how many (possible) matched records in each table */
 
diff -Nrup a/sql/sql_union.cc b/sql/sql_union.cc
--- a/sql/sql_union.cc	2007-10-30 22:43:21 +03:00
+++ b/sql/sql_union.cc	2007-12-13 20:17:25 +03:00
@@ -501,10 +501,8 @@ bool st_select_lex_unit::exec()
 
         /* dump_TABLE_LIST_struct(select_lex, select_lex->leaf_tables); */
         if (sl->join->flatten_subqueries())
-        {
-          thd->net.report_error= 1;
           DBUG_RETURN(TRUE);
-        }
+
         /* dump_TABLE_LIST_struct(select_lex, select_lex->leaf_tables); */
 	saved_error= sl->join->optimize();
       }
Thread
bk commit into 6.0 tree (kostja:1.2760) BUG#12713konstantin13 Dec