diff options
Diffstat (limited to 'sql')
47 files changed, 869 insertions, 468 deletions
diff --git a/sql/convert.cc b/sql/convert.cc index 155cb57f9fe..29abdde7ddc 100644 --- a/sql/convert.cc +++ b/sql/convert.cc @@ -457,9 +457,6 @@ bool CONVERT::store(String *packet,const char *from,uint length) return 1; char *to=(char*) net_store_length((char*) packet->ptr()+packet_length, (ulonglong)length); - - for (const char *end=from+length ; from != end ; from++) - *to++= to_map[(uchar) *from]; - packet->length((uint) (to-packet->ptr())); + packet->length((uint) (store_dest(to, from, length)-packet->ptr())); return 0; } diff --git a/sql/field.cc b/sql/field.cc index 1aa01b1e2c5..00bb409e82e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4578,8 +4578,13 @@ void Field_geom::get_key_image(char *buff,uint length,CHARSET_INFO *cs, imagetyp void Field_geom::set_key_image(char *buff,uint length,CHARSET_INFO *cs) { + Field_blob::set_key_image(buff, length, cs); } +void Field_geom::sql_type(String &res) const +{ + res.set("geometry", 8, default_charset_info); +} int Field_blob::key_cmp(const byte *key_ptr, uint max_key_length) { @@ -5207,7 +5212,8 @@ uint32 calc_pack_length(enum_field_types type,uint32 length) case FIELD_TYPE_LONGLONG: return 8; /* Don't crash if no longlong */ case FIELD_TYPE_NULL : return 0; case FIELD_TYPE_TINY_BLOB: return 1+portable_sizeof_char_ptr; - case FIELD_TYPE_BLOB: return 2+portable_sizeof_char_ptr; + case FIELD_TYPE_BLOB: + case FIELD_TYPE_GEOMETRY: return 2+portable_sizeof_char_ptr; case FIELD_TYPE_MEDIUM_BLOB: return 3+portable_sizeof_char_ptr; case FIELD_TYPE_LONG_BLOB: return 4+portable_sizeof_char_ptr; case FIELD_TYPE_SET: @@ -5256,15 +5262,14 @@ Field *make_field(char *ptr, uint32 field_length, f_packtype(pack_flag), field_length); - if (f_is_blob(pack_flag)) - return new Field_blob(ptr,null_pos,null_bit, - unireg_check, field_name, table, - pack_length, field_charset); if (f_is_geom(pack_flag)) return new Field_geom(ptr,null_pos,null_bit, unireg_check, field_name, table, pack_length); - + if (f_is_blob(pack_flag)) + return new Field_blob(ptr,null_pos,null_bit, + unireg_check, field_name, table, + pack_length, field_charset); if (interval) { if (f_is_enum(pack_flag)) diff --git a/sql/field.h b/sql/field.h index af479c81b40..97900938e9d 100644 --- a/sql/field.h +++ b/sql/field.h @@ -948,6 +948,8 @@ public: :Field_blob(len_arg, maybe_null_arg, field_name_arg, table_arg, my_charset_bin) {} enum ha_base_keytype key_type() const { return HA_KEYTYPE_VARBINARY; } + enum_field_types type() const { return FIELD_TYPE_GEOMETRY;} + void sql_type(String &str) const; void get_key_image(char *buff,uint length, CHARSET_INFO *cs,imagetype type); void set_key_image(char *buff,uint length, CHARSET_INFO *cs); diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 067c066713f..cdb5a8c1219 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -2096,6 +2096,7 @@ static void print_msg(THD *thd, const char *table_name, const char *op_name, msgbuf[sizeof(msgbuf) - 1] = 0; // healthy paranoia DBUG_PRINT(msg_type,("message: %s",msgbuf)); + protocol->set_nfields(4); protocol->prepare_for_resend(); protocol->store(table_name); protocol->store(op_name); diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 6125a616f78..c639431c0fa 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -893,6 +893,7 @@ innobase_commit_low( /*================*/ trx_t* trx) /* in: transaction handle */ { +#ifdef HAVE_REPLICATION if (current_thd->slave_thread) { /* Update the replication position info inside InnoDB */ #ifdef NEED_TO_BE_FIXED @@ -906,6 +907,7 @@ innobase_commit_low( active_mi->rli.event_len + active_mi->rli.pending)); } +#endif /* HAVE_REPLICATION */ trx_commit_for_mysql(trx); } @@ -2510,11 +2512,6 @@ ha_innobase::change_active_index( the flag ROW_MYSQL_WHOLE_ROW below, but that caused unnecessary copying. Starting from MySQL-4.1 we use a more efficient flag here. */ - /* - TODO: In 4.0 the below user_thd was changed to NULL. - Heikki, please delete this comment after you have read this and may - acted upon it. - */ build_template(prebuilt, user_thd, table, ROW_MYSQL_REC_FIELDS); DBUG_RETURN(0); diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 84dec41ea07..754d7dc8641 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -60,11 +60,14 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type, DBUG_PRINT(msg_type,("message: %s",msgbuf)); +#ifndef EMBEDDED_LIBRARY if (thd->net.vio == 0) { sql_print_error(msgbuf); return; } +#endif + if (param->testflag & (T_CREATE_MISSING_KEYS | T_SAFE_REPAIR | T_AUTO_REPAIR)) { @@ -136,6 +139,7 @@ const char *ha_myisam::index_type(uint key_number) "BTREE"); } +#ifdef HAVE_REPLICATION int ha_myisam::net_read_dump(NET* net) { int data_fd = file->dfile; @@ -160,7 +164,6 @@ int ha_myisam::net_read_dump(NET* net) goto err; } } - err: return error; } @@ -217,6 +220,7 @@ err: my_free((gptr) buf, MYF(0)); return error; } +#endif /* HAVE_REPLICATION */ /* Name is here without an extension */ @@ -1053,8 +1057,9 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, for (i=0; i < table_arg->keys ; i++, pos++) { keydef[i].flag= (pos->flags & (HA_NOSAME | HA_FULLTEXT | HA_SPATIAL)); - keydef[i].key_alg=pos->algorithm == HA_KEY_ALG_UNDEF ? - HA_KEY_ALG_BTREE : pos->algorithm; + keydef[i].key_alg= pos->algorithm == HA_KEY_ALG_UNDEF ? + (pos->flags & HA_SPATIAL ? HA_KEY_ALG_RTREE : HA_KEY_ALG_BTREE) : + pos->algorithm; keydef[i].seg=keyseg; keydef[i].keysegs=pos->key_parts; for (j=0 ; j < pos->key_parts ; j++) @@ -1108,7 +1113,7 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, keydef[i].flag|=HA_AUTO_KEY; found_auto_increment=1; } - if (field->type() == FIELD_TYPE_BLOB) + if ((field->type() == FIELD_TYPE_BLOB) || (field->type() == FIELD_TYPE_GEOMETRY)) { keydef[i].seg[j].flag|=HA_BLOB_PART; /* save number of bytes used to pack length */ diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h index 215608f8f0a..5dc294b3b9f 100644 --- a/sql/ha_myisam.h +++ b/sql/ha_myisam.h @@ -127,6 +127,8 @@ class ha_myisam: public handler int optimize(THD* thd, HA_CHECK_OPT* check_opt); int restore(THD* thd, HA_CHECK_OPT* check_opt); int backup(THD* thd, HA_CHECK_OPT* check_opt); +#ifdef HAVE_REPLICATION int dump(THD* thd, int fd); int net_read_dump(NET* net); +#endif }; diff --git a/sql/item.cc b/sql/item.cc index a4f7008aa4e..6ae9b92295f 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -567,7 +567,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) cause error ER_NON_UNIQ_ERROR in find_field_in_tables. */ SELECT_LEX *last= 0; - +#ifdef EMBEDDED_LIBRARY + thd->net.last_errno= 0; +#endif Item **refer= (Item **)not_found_item; // Prevent using outer fields in subselects, that is not supported now SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select; @@ -605,7 +607,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) (char *)field_name); if (!r) return 1; - if (r->check_cols(1) || r->fix_fields(thd, tables, ref)) + if (r->fix_fields(thd, tables, ref) || r->check_cols(1)) return 1; r->depended_from= last; cursel->mark_as_dependent(last); @@ -629,7 +631,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) if (!rf) return 1; (rf)->outer_resolving= outer_resolving; - return rf->check_cols(1) || rf->fix_fields(thd, tables, ref); + return rf->fix_fields(thd, tables, ref) || rf->check_cols(1); } } } diff --git a/sql/item.h b/sql/item.h index 03e9a542eea..09882b26724 100644 --- a/sql/item.h +++ b/sql/item.h @@ -182,6 +182,7 @@ public: String *val_str(String *str); int save_in_field(Field *field, bool no_conversions); int save_safe_in_field(Field *field); + bool send(Protocol *protocol, String *str); enum Item_result result_type () const { return STRING_RESULT; } enum_field_types field_type() const { return MYSQL_TYPE_NULL; } bool fix_fields(THD *thd, struct st_table_list *list, Item **item) @@ -190,7 +191,6 @@ public: max_length=0; return res; } - bool send(Protocol *protocol, String *str); bool basic_const_item() const { return 1; } Item *new_item() { return new Item_null(name); } bool is_null() { return 1; } diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 829caeede1d..1c579708503 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -912,10 +912,10 @@ double Item_func_case::val() bool Item_func_case::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { - if (first_expr && (first_expr->check_cols(1) || - first_expr->fix_fields(thd, tables, &first_expr)) || - else_expr && (else_expr->check_cols(1) || - else_expr->fix_fields(thd, tables, &else_expr))) + if (first_expr && (first_expr->fix_fields(thd, tables, &first_expr) || + first_expr->check_cols(1)) || + else_expr && (else_expr->fix_fields(thd, tables, &else_expr) || + else_expr->check_cols(1))) return 1; if (Item_func::fix_fields(thd, tables, ref)) return 1; @@ -1472,7 +1472,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) } if (abort_on_null) item->top_level_item(); - if (item->check_cols(1) || item->fix_fields(thd, tables, li.ref())) + if (item->fix_fields(thd, tables, li.ref()) || item->check_cols(1)) return 1; /* purecov: inspected */ used_tables_cache|=item->used_tables(); with_sum_func= with_sum_func || item->with_sum_func; @@ -1784,10 +1784,8 @@ bool Item_func_like::fix_fields(THD *thd, TABLE_LIST *tlist, Item ** ref) bool Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { - if (args[0]->check_cols(1) || - args[1]->check_cols(1) || - args[0]->fix_fields(thd, tables, args) || - args[1]->fix_fields(thd,tables, args + 1)) + if (args[0]->fix_fields(thd, tables, args) || args[0]->check_cols(1) || + args[1]->fix_fields(thd,tables, args + 1) || args[1]->check_cols(1)) return 1; /* purecov: inspected */ with_sum_func=args[0]->with_sum_func || args[1]->with_sum_func; max_length= 1; diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index bd7d1bfaf7a..8641ab410b3 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -275,8 +275,7 @@ public: longlong val_int(); bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void fix_length_and_dec(); diff --git a/sql/item_func.cc b/sql/item_func.cc index 6ba6ba13744..477b759be61 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -109,8 +109,8 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) */ for (arg=args, arg_end=args+arg_count; arg != arg_end ; arg++) { - if ((*arg)->check_cols(allowed_arg_cols) || - (*arg)->fix_fields(thd, tables, arg)) + if ((*arg)->fix_fields(thd, tables, arg) || + (*arg)->check_cols(allowed_arg_cols)) return 1; /* purecov: inspected */ if ((*arg)->maybe_null) maybe_null=1; @@ -1322,7 +1322,7 @@ udf_handler::fix_fields(THD *thd, TABLE_LIST *tables, Item_result_field *func, arg != arg_end ; arg++,i++) { - if ((*arg)->check_cols(1) || (*arg)->fix_fields(thd, tables, arg)) + if ((*arg)->fix_fields(thd, tables, arg) || (*arg)->check_cols(1)) return 1; if ((*arg)->binary()) func->set_charset(my_charset_bin); @@ -1665,6 +1665,7 @@ longlong Item_master_pos_wait::val_int() return 0; } ulong pos = (ulong)args[1]->val_int(); +#ifdef HAVE_REPLICATION LOCK_ACTIVE_MI; if ((event_count = active_mi->rli.wait_for_pos(thd, log_name, pos)) == -1) { @@ -1672,6 +1673,7 @@ longlong Item_master_pos_wait::val_int() event_count=0; } UNLOCK_ACTIVE_MI; +#endif return event_count; } @@ -2330,7 +2332,7 @@ bool Item_func_match::fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) while ((item=li++)) { - if (item->check_cols(1) || item->fix_fields(thd, tlist, li.ref())) + if (item->fix_fields(thd, tlist, li.ref()) || item->check_cols(1)) return 1; if (item->type() == Item::REF_ITEM) li.replace(item= *((Item_ref *)item)->ref); diff --git a/sql/item_func.h b/sql/item_func.h index a015f6e69ce..ec361cce4c5 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -608,8 +608,7 @@ public: longlong val_int(); bool fix_fields(THD *thd,struct st_table_list *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void update_used_tables() diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index df2352db231..66f0510cc3d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2133,7 +2133,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I if (thd && check_stack_overrun(thd,buff)) return 0; // Fatal error if flag is set! - if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args)) + if (args[0]->fix_fields(thd, tables, args) || args[0]->check_cols(1)) return 1; maybe_null=args[0]->maybe_null; const_item_cache=args[0]->const_item(); @@ -2166,7 +2166,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables, if (thd && check_stack_overrun(thd,buff)) return 0; // Fatal error if flag is set! - if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args)) + if (args[0]->fix_fields(thd, tables, args) || args[0]->check_cols(1)) return 1; maybe_null=args[0]->maybe_null; set_charset(set_collation); diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c56c59bcaef..339a49a3580 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -101,8 +101,8 @@ public: void update_used_tables(); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (separator->check_cols(1) || - separator->fix_fields(thd, tlist, &separator) || + return (separator->fix_fields(thd, tlist, &separator) || + separator->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } const char *func_name() const { return "concat_ws"; } @@ -382,8 +382,8 @@ public: String *val_str(String *str); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || + item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void fix_length_and_dec(); @@ -415,8 +415,8 @@ public: String *val_str(String *str); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || + item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void fix_length_and_dec(); diff --git a/sql/item_sum.cc b/sql/item_sum.cc index cc90cd8fcd8..273c5a3c1c3 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -119,7 +119,7 @@ Item_sum_num::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) maybe_null=0; for (uint i=0 ; i < arg_count ; i++) { - if (args[i]->check_cols(1) || args[i]->fix_fields(thd, tables, args + i)) + if (args[i]->fix_fields(thd, tables, args + i) || args[i]->check_cols(1)) return 1; if (decimals < args[i]->decimals) decimals=args[i]->decimals; @@ -145,7 +145,7 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) return 1; } thd->allow_sum_func=0; // No included group funcs - if (item->check_cols(1) || item->fix_fields(thd, tables, args)) + if (item->fix_fields(thd, tables, args) || item->check_cols(1)) return 1; hybrid_type=item->result_type(); if (hybrid_type == INT_RESULT) diff --git a/sql/log.cc b/sql/log.cc index 033896a2674..b0e904969e7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -201,7 +201,9 @@ bool MYSQL_LOG::open(const char *log_name, enum_log_type log_type_arg, case LOG_NORMAL: { char *end; -#ifdef __NT__ +#ifdef EMBEDDED_LIBRARY + sprintf(buff, "%s, Version: %s, embedded library\n", my_progname, server_version); +#elif __NT__ sprintf(buff, "%s, Version: %s, started with:\nTCP Port: %d, Named Pipe: %s\n", my_progname, server_version, mysql_port, mysql_unix_port); #else sprintf(buff, "%s, Version: %s, started with:\nTcp port: %d Unix socket: %s\n", my_progname,server_version,mysql_port,mysql_unix_port); @@ -611,6 +613,8 @@ err: LOG_INFO_IO Got IO error while reading file */ +#ifdef HAVE_REPLICATION + int MYSQL_LOG::purge_first_log(struct st_relay_log_info* rli) { int error; @@ -745,6 +749,8 @@ err: DBUG_RETURN(error); } +#endif /* HAVE_REPLICATION */ + /* Create a new log file name @@ -1054,6 +1060,7 @@ bool MYSQL_LOG::write(Log_event* event_info) #else IO_CACHE *file = &log_file; #endif +#ifdef HAVE_REPLICATION if ((thd && !(thd->options & OPTION_BIN_LOG) && (thd->master_access & SUPER_ACL)) || (local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db))) @@ -1062,6 +1069,7 @@ bool MYSQL_LOG::write(Log_event* event_info) DBUG_PRINT("error",("!db_ok")); DBUG_RETURN(0); } +#endif /* HAVE_REPLICATION */ error=1; /* @@ -1444,6 +1452,7 @@ void MYSQL_LOG::close(bool exiting) DBUG_PRINT("enter",("exiting: %d", (int) exiting)); if (is_open()) { +#ifdef HAVE_REPLICATION if (log_type == LOG_BIN && !no_auto_events && exiting) { Stop_log_event s; @@ -1451,6 +1460,7 @@ void MYSQL_LOG::close(bool exiting) s.write(&log_file); signal_update(); } +#endif /* HAVE_REPLICATION */ end_io_cache(&log_file); if (my_close(log_file.file,MYF(0)) < 0 && ! write_error) { @@ -1574,3 +1584,6 @@ void sql_perror(const char *message) perror(message); #endif } + + + diff --git a/sql/log_event.cc b/sql/log_event.cc index 248bac04df2..509e62ba03b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -80,12 +80,12 @@ static void pretty_print_str(FILE* file, char* str, int len) ignored_error_code() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) inline int ignored_error_code(int err_code) { return use_slave_mask && bitmap_is_set(&slave_error_mask, err_code); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -124,7 +124,7 @@ static char* pretty_print_str(char* packet, char* str, int len) slave_load_file_stem() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) static inline char* slave_load_file_stem(char*buf, uint file_id, int event_server_id) { @@ -136,7 +136,7 @@ static inline char* slave_load_file_stem(char*buf, uint file_id, *buf++ = '-'; return int10_to_str(file_id, buf, 10); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -150,7 +150,7 @@ static inline char* slave_load_file_stem(char*buf, uint file_id, Easily fixable by adding server_id as a prefix to the log files. ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) static void cleanup_load_tmpdir() { MY_DIR *dirp; @@ -168,7 +168,7 @@ static void cleanup_load_tmpdir() my_dirend(dirp); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -286,6 +286,7 @@ Log_event::Log_event(const char* buf, bool old_format) #ifndef MYSQL_CLIENT +#ifdef HAVE_REPLICATION /***************************************************************************** @@ -329,23 +330,6 @@ void Log_event::pack_info(Protocol *protocol) protocol->store("",0); } -/***************************************************************************** - - Log_event::init_show_field_list() - - ****************************************************************************/ -void Log_event::init_show_field_list(List<Item>* field_list) -{ - field_list->push_back(new Item_empty_string("Log_name", 20)); - field_list->push_back(new Item_return_int("Pos", 11, - MYSQL_TYPE_LONGLONG)); - field_list->push_back(new Item_empty_string("Event_type", 20)); - field_list->push_back(new Item_return_int("Server_id", 10, - MYSQL_TYPE_LONG)); - field_list->push_back(new Item_return_int("Orig_log_pos", 11, - MYSQL_TYPE_LONGLONG)); - field_list->push_back(new Item_empty_string("Info", 20)); -} /***************************************************************************** @@ -354,6 +338,7 @@ void Log_event::init_show_field_list(List<Item>* field_list) Only called by SHOW BINLOG EVENTS ****************************************************************************/ + int Log_event::net_send(Protocol *protocol, const char* log_name, my_off_t pos) { const char *p= strrchr(log_name, FN_LIBCHAR); @@ -371,6 +356,26 @@ int Log_event::net_send(Protocol *protocol, const char* log_name, my_off_t pos) pack_info(protocol); return protocol->write(); } +#endif /* HAVE_REPLICATION */ + +/***************************************************************************** + + Log_event::init_show_field_list() + + ****************************************************************************/ +void Log_event::init_show_field_list(List<Item>* field_list) +{ + field_list->push_back(new Item_empty_string("Log_name", 20)); + field_list->push_back(new Item_return_int("Pos", 11, + MYSQL_TYPE_LONGLONG)); + field_list->push_back(new Item_empty_string("Event_type", 20)); + field_list->push_back(new Item_return_int("Server_id", 10, + MYSQL_TYPE_LONG)); + field_list->push_back(new Item_return_int("Orig_log_pos", 11, + MYSQL_TYPE_LONGLONG)); + field_list->push_back(new Item_empty_string("Info", 20)); +} + #endif // !MYSQL_CLIENT /***************************************************************************** @@ -578,9 +583,11 @@ Log_event* Log_event::read_log_event(const char* buf, int event_len, case ROTATE_EVENT: ev = new Rotate_log_event(buf, event_len, old_format); break; +#ifdef HAVE_REPLICATION case SLAVE_EVENT: ev = new Slave_log_event(buf, event_len); break; +#endif /* HAVE_REPLICATION */ case CREATE_FILE_EVENT: ev = new Create_file_log_event(buf, event_len, old_format); break; @@ -596,9 +603,11 @@ Log_event* Log_event::read_log_event(const char* buf, int event_len, case START_EVENT: ev = new Start_log_event(buf, old_format); break; +#ifdef HAVE_REPLICATION case STOP_EVENT: ev = new Stop_log_event(buf, old_format); break; +#endif /* HAVE_REPLICATION */ case INTVAR_EVENT: ev = new Intvar_log_event(buf, old_format); break; @@ -685,7 +694,7 @@ void Log_event::set_log_pos(MYSQL_LOG* log) ***************************************************************************** ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) /***************************************************************************** Query_log_event::pack_info() @@ -712,7 +721,7 @@ void Query_log_event::pack_info(Protocol *protocol) protocol->store(buf, pos-buf); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -849,7 +858,7 @@ void Query_log_event::print(FILE* file, bool short_form, char* last_db) Query_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Query_log_event::exec_event(struct st_relay_log_info* rli) { int expected_error,actual_error = 0; @@ -955,7 +964,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) free_root(&thd->mem_root,0); return Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -971,7 +980,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) Start_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Start_log_event::pack_info(Protocol *protocol) { char buf[12 + ST_SERVER_VER_LEN + 14 + 22], *pos; @@ -981,7 +990,7 @@ void Start_log_event::pack_info(Protocol *protocol) pos=int10_to_str(binlog_version, pos, 10); protocol->store(buf, pos-buf); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1050,7 +1059,7 @@ int Start_log_event::write_data(IO_CACHE* file) In this case we should stop the slave. ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Start_log_event::exec_event(struct st_relay_log_info* rli) { /* All temporary tables was deleted on the master */ @@ -1062,7 +1071,7 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli) cleanup_load_tmpdir(); return Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1078,7 +1087,7 @@ int Start_log_event::exec_event(struct st_relay_log_info* rli) Load_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Load_log_event::pack_info(Protocol *protocol) { char *buf, *pos; @@ -1181,7 +1190,7 @@ void Load_log_event::pack_info(Protocol *protocol) protocol->store(buf, pos-buf); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1483,8 +1492,7 @@ void Load_log_event::set_fields(List<Item> &field_list) } #endif // !MYSQL_CLIENT -#ifndef MYSQL_CLIENT - +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) /* Does the data loading job when executing a LOAD DATA on the slave @@ -1624,7 +1632,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, return ( use_rli_only_for_errors ? 0 : Log_event::exec_event(rli) ); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1640,7 +1648,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, Rotate_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Rotate_log_event::pack_info(Protocol *protocol) { char *buf, *b_pos; @@ -1656,7 +1664,7 @@ void Rotate_log_event::pack_info(Protocol *protocol) protocol->store(buf, b_pos-buf); my_free(buf, MYF(MY_ALLOW_ZERO_PTR)); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1749,7 +1757,7 @@ int Rotate_log_event::write_data(IO_CACHE* file) 0 ok ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Rotate_log_event::exec_event(struct st_relay_log_info* rli) { char* log_name = rli->master_log_name; @@ -1765,7 +1773,7 @@ int Rotate_log_event::exec_event(struct st_relay_log_info* rli) flush_relay_log_info(rli); DBUG_RETURN(0); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1781,7 +1789,7 @@ int Rotate_log_event::exec_event(struct st_relay_log_info* rli) Intvar_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Intvar_log_event::pack_info(Protocol *protocol) { char buf[64], *pos; @@ -1790,7 +1798,7 @@ void Intvar_log_event::pack_info(Protocol *protocol) pos= longlong10_to_str(val, pos, -10); protocol->store(buf, pos-buf); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1869,7 +1877,7 @@ void Intvar_log_event::print(FILE* file, bool short_form, char* last_db) Intvar_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION)&& !defined(MYSQL_CLIENT) int Intvar_log_event::exec_event(struct st_relay_log_info* rli) { switch (type) { @@ -1884,7 +1892,7 @@ int Intvar_log_event::exec_event(struct st_relay_log_info* rli) rli->inc_pending(get_event_len()); return 0; } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1900,7 +1908,7 @@ int Intvar_log_event::exec_event(struct st_relay_log_info* rli) Rand_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Rand_log_event::pack_info(Protocol *protocol) { char buf1[256], *pos; @@ -1910,7 +1918,7 @@ void Rand_log_event::pack_info(Protocol *protocol) pos= int10_to_str((long) seed2, pos, 10); protocol->store(buf1, (uint) (pos-buf1)); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1963,7 +1971,7 @@ void Rand_log_event::print(FILE* file, bool short_form, char* last_db) Rand_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Rand_log_event::exec_event(struct st_relay_log_info* rli) { thd->rand.seed1= (ulong) seed1; @@ -1971,7 +1979,7 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli) rli->inc_pending(get_event_len()); return 0; } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -1987,6 +1995,8 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli) Slave_log_event::pack_info() ****************************************************************************/ +#ifdef HAVE_REPLICATION + #ifndef MYSQL_CLIENT void Slave_log_event::pack_info(Protocol *protocol) { @@ -2207,6 +2217,7 @@ int Stop_log_event::exec_event(struct st_relay_log_info* rli) return 0; } #endif // !MYSQL_CLIENT +#endif /* HAVE_REPLICATION */ /***************************************************************************** @@ -2350,7 +2361,7 @@ void Create_file_log_event::print(FILE* file, bool short_form, Create_file_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Create_file_log_event::pack_info(Protocol *protocol) { char buf[NAME_LEN*2 + 30 + 21*2], *pos; @@ -2366,14 +2377,14 @@ void Create_file_log_event::pack_info(Protocol *protocol) pos= int10_to_str((long) block_len, pos, 10); protocol->store(buf, pos-buf); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** Create_file_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Create_file_log_event::exec_event(struct st_relay_log_info* rli) { char fname_buf[FN_REFLEN+10]; @@ -2430,7 +2441,7 @@ err: my_close(fd, MYF(0)); return error ? 1 : Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -2507,7 +2518,7 @@ void Append_block_log_event::print(FILE* file, bool short_form, Append_block_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Append_block_log_event::pack_info(Protocol *protocol) { char buf[256]; @@ -2517,14 +2528,14 @@ void Append_block_log_event::pack_info(Protocol *protocol) block_len)); protocol->store(buf, (int32) length); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** Append_block_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined( HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Append_block_log_event::exec_event(struct st_relay_log_info* rli) { char fname[FN_REFLEN+10]; @@ -2552,7 +2563,7 @@ err: my_close(fd, MYF(0)); return error ? error : Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -2622,7 +2633,7 @@ void Delete_file_log_event::print(FILE* file, bool short_form, Delete_file_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Delete_file_log_event::pack_info(Protocol *protocol) { char buf[64]; @@ -2630,14 +2641,14 @@ void Delete_file_log_event::pack_info(Protocol *protocol) length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id)); protocol->store(buf, (int32) length); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** Delete_file_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) int Delete_file_log_event::exec_event(struct st_relay_log_info* rli) { char fname[FN_REFLEN+10]; @@ -2650,7 +2661,7 @@ int Delete_file_log_event::exec_event(struct st_relay_log_info* rli) mysql_bin_log.write(this); return Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT +#endif /***************************************************************************** @@ -2721,7 +2732,7 @@ void Execute_load_log_event::print(FILE* file, bool short_form, Execute_load_log_event::pack_info() ****************************************************************************/ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) void Execute_load_log_event::pack_info(Protocol *protocol) { char buf[64]; @@ -2729,14 +2740,13 @@ void Execute_load_log_event::pack_info(Protocol *protocol) length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id)); protocol->store(buf, (int32) length); } -#endif // !MYSQL_CLIENT /***************************************************************************** Execute_load_log_event::exec_event() ****************************************************************************/ -#ifndef MYSQL_CLIENT + int Execute_load_log_event::exec_event(struct st_relay_log_info* rli) { char fname[FN_REFLEN+10]; @@ -2799,7 +2809,8 @@ err: } return error ? error : Log_event::exec_event(rli); } -#endif // !MYSQL_CLIENT + +#endif /***************************************************************************** @@ -2891,8 +2902,3 @@ char* sql_ex_info::init(char* buf,char* buf_end,bool use_new_format) } - - - - - diff --git a/sql/log_event.h b/sql/log_event.h index 8046d0abb92..29fdf80b03b 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -269,10 +269,12 @@ public: static int read_log_event(IO_CACHE* file, String* packet, pthread_mutex_t* log_lock); void set_log_pos(MYSQL_LOG* log); - virtual void pack_info(Protocol *protocol); - int net_send(Protocol *protocol, const char* log_name, my_off_t pos); static void init_show_field_list(List<Item>* field_list); +#ifdef HAVE_REPLICATION + int net_send(Protocol *protocol, const char* log_name, my_off_t pos); + virtual void pack_info(Protocol *protocol); virtual int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ virtual const char* get_db() { return thd ? thd->db : 0; @@ -357,8 +359,10 @@ public: Query_log_event(THD* thd_arg, const char* query_arg, ulong query_length, bool using_trans); const char* get_db() { return db; } +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -385,6 +389,7 @@ public: } }; +#ifdef HAVE_REPLICATION /***************************************************************************** @@ -420,6 +425,8 @@ public: int write_data(IO_CACHE* file ); }; +#endif /* HAVE_REPLICATION */ + /***************************************************************************** @@ -463,14 +470,16 @@ public: List<Item>& fields_arg, enum enum_duplicates handle_dup, bool using_trans); void set_fields(List<Item> &fields_arg); - void pack_info(Protocol* protocol); const char* get_db() { return db; } +#ifdef HAVE_REPLICATION + void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli) { return exec_event(thd->slave_net,rli,0); } int exec_event(NET* net, struct st_relay_log_info* rli, bool use_rli_only_for_errors); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -517,8 +526,10 @@ public: created = (uint32) when; memcpy(server_version, ::server_version, ST_SERVER_VER_LEN); } +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -552,8 +563,10 @@ public: Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg) :Log_event(),val(val_arg),type(type_arg) {} +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -584,8 +597,10 @@ class Rand_log_event: public Log_event Rand_log_event(THD* thd_arg, ulonglong seed1_arg, ulonglong seed2_arg) :Log_event(thd_arg,0,0),seed1(seed1_arg),seed2(seed2_arg) {} +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -604,6 +619,8 @@ class Rand_log_event: public Log_event Stop Log Event class ****************************************************************************/ +#ifdef HAVE_REPLICATION + class Stop_log_event: public Log_event { public: @@ -623,6 +640,8 @@ public: bool is_valid() { return 1; } }; +#endif /* HAVE_REPLICATION */ + /***************************************************************************** @@ -646,8 +665,10 @@ public: pos(pos_arg),ident_len(ident_len_arg ? ident_len_arg : (uint) strlen(new_log_ident_arg)), alloced(0) {} +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -693,8 +714,10 @@ public: enum enum_duplicates handle_dup, char* block_arg, uint block_len_arg, bool using_trans); +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); void print(FILE* file, bool short_form, char* last_db, bool enable_local); @@ -744,8 +767,10 @@ public: #ifndef MYSQL_CLIENT Append_block_log_event(THD* thd, char* block_arg, uint block_len_arg, bool using_trans); +#ifdef HAVE_REPLICATION int exec_event(struct st_relay_log_info* rli); void pack_info(Protocol* protocol); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -770,8 +795,10 @@ public: #ifndef MYSQL_CLIENT Delete_file_log_event(THD* thd, bool using_trans); +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif @@ -796,8 +823,10 @@ public: #ifndef MYSQL_CLIENT Execute_load_log_event(THD* thd, bool using_trans); +#ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); int exec_event(struct st_relay_log_info* rli); +#endif /* HAVE_REPLICATION */ #else void print(FILE* file, bool short_form = 0, char* last_db = 0); #endif diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 742f94c9e2b..4b0575c8579 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -32,6 +32,7 @@ #define MAP_TO_USE_RAID #include "mysql_priv.h" +#ifdef HAVE_REPLICATION #ifdef HAVE_AIOWAIT #include <mysys_err.h> #include <errno.h> @@ -80,3 +81,6 @@ int _my_b_net_read(register IO_CACHE *info, byte *Buffer, } } /* extern "C" */ +#endif /* HAVE_REPLICATION */ + + diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 02a0156ce5b..2ee4b551d71 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -23,6 +23,8 @@ */ #include <my_global.h> +#ifdef HAVE_EXTERNAL_CLIENT + /* my_pthread must be included early to be able to fix things */ #if defined(THREAD) #include <my_pthread.h> /* because of signal() */ @@ -1476,3 +1478,5 @@ MYSQL_RES *mc_mysql_store_result(MYSQL *mysql) mysql->fields=0; /* fields is now in result */ DBUG_RETURN(result); /* Data fetched */ } + +#endif /* HAVE_EXTERNAL_CLIENT */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6b3a1a7600c..3b34f111e8d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -492,6 +492,7 @@ static uint set_maximum_open_files(uint max_file_limit); static ulong find_bit_type(const char *x, TYPELIB *bit_lib); static void clean_up(bool print_message); +#ifndef EMBEDDED_LIBRARY /**************************************************************************** ** Code to end mysqld ****************************************************************************/ @@ -667,6 +668,7 @@ static void close_connections(void) DBUG_PRINT("quit",("close_connections thread")); DBUG_VOID_RETURN; } +#endif /*EMBEDDED_LIBRARY*/ static void close_server_sock() { @@ -758,6 +760,7 @@ void kill_mysql(void) DBUG_VOID_RETURN; } +#ifndef EMBEDDED_LIBRARY /* Force server down. kill all connections and threads and exit */ @@ -798,13 +801,16 @@ static void __cdecl kill_server(int sig_ptr) RETURN_FROM_KILL_SERVER; } +#endif /* EMBEDDED_LIBRARY */ #ifdef USE_ONE_SIGNAL_HAND extern "C" pthread_handler_decl(kill_server_thread,arg __attribute__((unused))) { SHUTDOWN_THD; my_thread_init(); // Initialize new thread +#ifndef EMBEDDED_LIBRARY kill_server(0); +#endif /* EMBEDDED_LIBRARY */ my_thread_end(); // Normally never reached return 0; } @@ -875,8 +881,10 @@ void clean_up(bool print_message) DBUG_PRINT("exit",("clean_up")); if (cleanup_done++) return; /* purecov: inspected */ +#ifdef HAVE_REPLICATION if (use_slave_mask) bitmap_free(&slave_error_mask); +#endif acl_free(1); grant_free(); query_cache_destroy(); @@ -898,12 +906,16 @@ void clean_up(bool print_message) free_defaults(defaults_argv); my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR)); free_tmpdir(&mysql_tmpdir_list); +#ifdef HAVE_REPLICATION my_free(slave_load_tmpdir,MYF(MY_ALLOW_ZERO_PTR)); +#endif x_free(opt_bin_logname); x_free(opt_relay_logname); bitmap_free(&temp_pool); free_max_user_conn(); +#ifdef HAVE_REPLICATION end_slave_list(); +#endif #ifdef USE_REGEX regex_end(); #endif @@ -1189,7 +1201,7 @@ void yyerror(const char *s) thd->lex.yylineno); } - +#ifndef EMBEDDED_LIBRARY void close_connection(NET *net,uint errcode,bool lock) { st_vio* vio; @@ -1209,6 +1221,7 @@ void close_connection(NET *net,uint errcode,bool lock) (void) pthread_mutex_unlock(&LOCK_thread_count); DBUG_VOID_RETURN; } +#endif /* Called when a thread is aborted */ /* ARGSUSED */ @@ -1730,7 +1743,7 @@ extern "C" int my_message_sql(uint error, const char *str, void clear_error_message(THD *thd) { - thd->net.last_error[0]= 0; + thd->clear_error(); } @@ -1843,28 +1856,15 @@ bool open_log(MYSQL_LOG *log, const char *hostname, } - -#ifdef __WIN__ -int win_main(int argc, char **argv) -#else -int main(int argc, char **argv) -#endif +static int init_common_variables(const char *conf_file_name, int argc, char **argv, + const char **groups) { - DEBUGGER_OFF; - my_umask=0660; // Default umask for new files my_umask_dir=0700; // Default umask for new directories - MAIN_THD; - /* - Initialize signal_th and shutdown_th to main_th for default value - as we need to initialize them to something safe. They are used - when compiled with safemalloc. - */ - SIGNAL_THD; - SHUTDOWN_THD; - MY_INIT(argv[0]); // init my_sys library & pthreads + umask(((~my_umask) & 0666)); tzset(); // Set tzname + max_system_variables.pseudo_thread_id= (ulong)~0; start_time=time((time_t*) 0); #ifdef OS2 { @@ -1894,31 +1894,62 @@ int main(int argc, char **argv) strmov(glob_hostname,"mysql"); strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5); strmov(fn_ext(pidfile_name),".pid"); // Add proper extension + #ifndef DBUG_OFF strxmov(strend(server_version),MYSQL_SERVER_SUFFIX,"-debug",NullS); #else strmov(strend(server_version),MYSQL_SERVER_SUFFIX); #endif -#ifdef _CUSTOMSTARTUPCONFIG_ - if (_cust_check_startup()) - { - /* _cust_check_startup will report startup failure error */ - exit( 1 ); - } -#endif - load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv); - defaults_argv=argv; + load_defaults(conf_file_name, groups, &argc, &argv); + defaults_argv=argv; set_options(); get_options(argc,argv); - max_system_variables.pseudo_thread_id= (ulong)~0; if (opt_log || opt_update_log || opt_slow_log || opt_bin_log) strcat(server_version,"-log"); DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, server_version, SYSTEM_TYPE,MACHINE_TYPE)); - /* These must be set early */ +#if defined( SET_RLIMIT_NOFILE) || defined( OS2) + /* connections and databases needs lots of files */ + { + uint wanted_files=10+(uint) max(max_connections*5, + max_connections+table_cache_size*2); + set_if_bigger(wanted_files, open_files_limit); + // Note that some system returns 0 if we succeed here: + uint files=set_maximum_open_files(wanted_files); + if (files && files < wanted_files && ! open_files_limit) + { + max_connections= (ulong) min((files-10),max_connections); + table_cache_size= (ulong) max((files-10-max_connections)/2,64); + DBUG_PRINT("warning", + ("Changed limits: max_connections: %ld table_cache: %ld", + max_connections,table_cache_size)); + sql_print_error("Warning: Changed limits: max_connections: %ld table_cache: %ld",max_connections,table_cache_size); + } + } +#endif + unireg_init(opt_specialflag); /* Set up extern variabels */ + init_errmessage(); /* Read error messages from file */ + lex_init(); + item_init(); + set_var_init(); + mysys_uses_curses=0; +#ifdef USE_REGEX + regex_init(); +#endif + if (set_default_charset_by_name(sys_charset.value, MYF(MY_WME))) + return 1; + charsets_list= list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG)); + + if (use_temp_pool && bitmap_init(&temp_pool,1024,1)) + return 2; + return 0; +} + +static int init_thread_environement() +{ (void) pthread_mutex_init(&LOCK_mysql_create_db,MY_MUTEX_INIT_SLOW); (void) pthread_mutex_init(&LOCK_Acl,MY_MUTEX_INIT_SLOW); (void) pthread_mutex_init(&LOCK_open,MY_MUTEX_INIT_FAST); @@ -1935,7 +1966,9 @@ int main(int argc, char **argv) (void) pthread_mutex_init(&LOCK_bytes_received,MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_timezone,MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_user_conn, MY_MUTEX_INIT_FAST); +#ifdef HAVE_REPLICATION (void) pthread_mutex_init(&LOCK_rpl_status, MY_MUTEX_INIT_FAST); +#endif (void) pthread_mutex_init(&LOCK_active_mi, MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST); (void) my_rwlock_init(&LOCK_grant, NULL); @@ -1944,13 +1977,30 @@ int main(int argc, char **argv) (void) pthread_cond_init(&COND_thread_cache,NULL); (void) pthread_cond_init(&COND_flush_thread_cache,NULL); (void) pthread_cond_init(&COND_manager,NULL); +#ifdef HAVE_REPLICATION (void) pthread_cond_init(&COND_rpl_status, NULL); - init_signals(); +#endif + /* Parameter for threads created for connections */ + (void) pthread_attr_init(&connection_attrib); + (void) pthread_attr_setdetachstate(&connection_attrib, + PTHREAD_CREATE_DETACHED); + pthread_attr_setstacksize(&connection_attrib,thread_stack); + pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); - if (set_default_charset_by_name(sys_charset.value, MYF(MY_WME))) - exit(1); - charsets_list= list_charsets(MYF(MY_CS_COMPILED | MY_CS_CONFIG)); + if (pthread_key_create(&THR_THD,NULL) || + pthread_key_create(&THR_MALLOC,NULL)) + { + sql_print_error("Can't create thread-keys"); + return 1; + } + + (void) thr_setconcurrency(concurrency); // 10 by default + + return 0; +} +static void init_ssl() +{ #ifdef HAVE_OPENSSL if (opt_use_ssl) { @@ -1962,70 +2012,13 @@ int main(int argc, char **argv) if (!ssl_acceptor_fd) opt_use_ssl = 0; } + if (des_key_file) + load_des_key_file(des_key_file); #endif /* HAVE_OPENSSL */ +} -#ifdef HAVE_LIBWRAP - libwrapName= my_progname+dirname_length(my_progname); - openlog(libwrapName, LOG_PID, LOG_AUTH); -#endif - - if (!(opt_specialflag & SPECIAL_NO_PRIOR)) - my_pthread_setprio(pthread_self(),CONNECT_PRIOR); - /* Parameter for threads created for connections */ - (void) pthread_attr_init(&connection_attrib); - (void) pthread_attr_setdetachstate(&connection_attrib, - PTHREAD_CREATE_DETACHED); - pthread_attr_setstacksize(&connection_attrib,thread_stack); - - if (!(opt_specialflag & SPECIAL_NO_PRIOR)) - my_pthread_attr_setprio(&connection_attrib,WAIT_PRIOR); - pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); - -#if defined( SET_RLIMIT_NOFILE) || defined( OS2) - /* connections and databases needs lots of files */ - { - uint wanted_files=10+(uint) max(max_connections*5, - max_connections+table_cache_size*2); - set_if_bigger(wanted_files, open_files_limit); - // Note that some system returns 0 if we succeed here: - uint files=set_maximum_open_files(wanted_files); - if (files && files < wanted_files && ! open_files_limit) - { - max_connections= (ulong) min((files-10),max_connections); - table_cache_size= (ulong) max((files-10-max_connections)/2,64); - DBUG_PRINT("warning", - ("Changed limits: max_connections: %ld table_cache: %ld", - max_connections,table_cache_size)); - sql_print_error("Warning: Changed limits: max_connections: %ld table_cache: %ld",max_connections,table_cache_size); - } - } -#endif - unireg_init(opt_specialflag); /* Set up extern variabels */ - init_errmessage(); /* Read error messages from file */ - lex_init(); - item_init(); - set_var_init(); - mysys_uses_curses=0; -#ifdef USE_REGEX - regex_init(); -#endif - select_thread=pthread_self(); - select_thread_in_use=1; - if (use_temp_pool && bitmap_init(&temp_pool,1024,1)) - unireg_abort(1); - - /* - We have enough space for fiddling with the argv, continue - */ - umask(((~my_umask) & 0666)); - if (my_setwd(mysql_real_data_home,MYF(MY_WME))) - { - unireg_abort(1); /* purecov: inspected */ - } - mysql_data_home= mysql_data_home_buff; - mysql_data_home[0]=FN_CURLIB; // all paths are relative from here - mysql_data_home[1]=0; - server_init(); +static int init_server_components() +{ table_cache_init(); hostname_cache_init(); query_cache_result_size_limit(query_cache_limit); @@ -2033,12 +2026,9 @@ int main(int argc, char **argv) randominit(&sql_rand,(ulong) start_time,(ulong) start_time/2); reset_floating_point_exceptions(); init_thr_lock(); +#ifdef HAVE_REPLICATION init_slave_list(); -#ifdef HAVE_OPENSSL - if (des_key_file) - load_des_key_file(des_key_file); -#endif /* HAVE_OPENSSL */ - +#endif /* Setup log files */ if (opt_log) open_log(&mysql_log, glob_hostname, opt_logname, ".log", NullS, @@ -2049,26 +2039,17 @@ int main(int argc, char **argv) NullS, LOG_NEW); using_update_log=1; } - + if (opt_slow_log) open_log(&mysql_slow_log, glob_hostname, opt_slow_logname, "-slow.log", NullS, LOG_NORMAL); -#ifdef __WIN__ -#define MYSQL_ERR_FILE "mysql.err" - if (!opt_console) - { - freopen(MYSQL_ERR_FILE,"a+",stdout); - freopen(MYSQL_ERR_FILE,"a+",stderr); - } -#endif if (ha_init()) { sql_print_error("Can't init databases"); - if (unix_sock != INVALID_SOCKET) - unlink(mysql_unix_port); - exit(1); + return 1; } ha_key_cache(); + #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) if (locked_in_memory && !geteuid()) { @@ -2087,71 +2068,9 @@ int main(int argc, char **argv) (void) mi_log( 1 ); ft_init_stopwords(ft_precompiled_stopwords); -#ifdef __WIN__ - if (!opt_console) - FreeConsole(); // Remove window -#endif - - /* - init signals & alarm - After this we can't quit by a simple unireg_abort - */ - error_handler_hook = my_message_sql; - if (pthread_key_create(&THR_THD,NULL) || - pthread_key_create(&THR_MALLOC,NULL)) - { - sql_print_error("Can't create thread-keys"); - if (unix_sock != INVALID_SOCKET) - unlink(mysql_unix_port); - exit(1); - } - start_signal_handler(); // Creates pidfile - if (acl_init((THD*) 0, opt_noacl)) - { - abort_loop=1; - select_thread_in_use=0; - (void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL); -#ifndef __WIN__ - if (!opt_bootstrap) - (void) my_delete(pidfile_name,MYF(MY_WME)); // Not needed anymore -#endif - if (unix_sock != INVALID_SOCKET) - unlink(mysql_unix_port); - exit(1); - } - if (!opt_noacl) - (void) grant_init((THD*) 0); init_max_user_conn(); init_update_queries(); - DBUG_ASSERT(current_thd == 0); -#ifdef HAVE_DLOPEN - if (!opt_noacl) - udf_init(); -#endif - /* init_slave() must be called after the thread keys are created */ - init_slave(); - - DBUG_ASSERT(current_thd == 0); - if (opt_bin_log && !server_id) - { - server_id= !master_host ? 1 : 2; - switch (server_id) { -#ifdef EXTRA_DEBUG - case 1: - sql_print_error("\ -Warning: You have enabled the binary log, but you haven't set server-id:\n\ -Updates will be logged to the binary log, but connections to slaves will\n\ -not be accepted."); - break; -#endif - case 2: - sql_print_error("\ -Warning: You should set server-id to a non-0 value if master_host is set.\n\ -The server will not act as a slave."); - break; - } - } if (opt_bin_log) { open_log(&mysql_bin_log, glob_hostname, opt_bin_logname, "-bin", @@ -2159,25 +2078,29 @@ The server will not act as a slave."); using_update_log=1; } + return 0; +} - if (opt_bootstrap) - { - int error=bootstrap(stdin); - end_thr_alarm(); // Don't allow alarms - unireg_abort(error ? 1 : 0); - } - if (opt_init_file) +static void create_maintenance_thread() +{ + if ( +#ifdef HAVE_BERKELEY_DB + !berkeley_skip || +#endif + (flush_time && flush_time != ~(ulong) 0L)) { - if (read_init_file(opt_init_file)) - { - end_thr_alarm(); // Don't allow alarms - unireg_abort(1); - } + pthread_t hThread; + if (pthread_create(&hThread,&connection_attrib,handle_manager,0)) + sql_print_error("Warning: Can't create thread to manage maintenance"); } - (void) thr_setconcurrency(concurrency); // 10 by default -#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) //IRENA +} + +static void create_shutdown_thread() +{ + +#ifdef __WIN__ { - hEventShutdown=CreateEvent(0, FALSE, FALSE, shutdown_event_name); + hEventShutdown=CreateEvent(0, FALSE, FALSE, event_name); pthread_t hThread; if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0)) sql_print_error("Warning: Can't create thread to handle shutdown requests"); @@ -2194,38 +2117,24 @@ The server will not act as a slave."); sql_print_error("Warning: Can't create thread to handle shutdown requests"); } #endif +} - if ( -#ifdef HAVE_BERKELEY_DB - !berkeley_skip || -#endif - (flush_time && flush_time != ~(ulong) 0L)) - { - pthread_t hThread; - if (pthread_create(&hThread,&connection_attrib,handle_manager,0)) - sql_print_error("Warning: Can't create thread to manage maintenance"); - } - - printf(ER(ER_READY),my_progname,server_version,""); - fflush(stdout); -#if defined(__NT__) || defined(HAVE_SMEM) #ifdef __NT__ +void create_named_pipe_thread() +{ if (hPipe == INVALID_HANDLE_VALUE && - (!have_tcpip || opt_disable_networking) && - !opt_enable_shared_memory) + (!have_tcpip || opt_disable_networking)) { - sql_print_error("TCP/IP,--shared-memory or --named-pipe should be configured on NT OS"); - unireg_abort(1); + sql_print_error("TCP/IP or --enable-named-pipe should be configured on NT OS"); + unireg_abort(1); } else -#endif { pthread_mutex_lock(&LOCK_thread_count); (void) pthread_cond_init(&COND_handler_count,NULL); { pthread_t hThread; handler_count=0; -#ifdef __NT__ if (hPipe != INVALID_HANDLE_VALUE && opt_enable_named_pipe) { handler_count++; @@ -2236,36 +2145,169 @@ The server will not act as a slave."); handler_count--; } } -#endif -#ifdef HAVE_SMEM - if (opt_enable_shared_memory) - { - handler_count++; - if (pthread_create(&hThread,&connection_attrib, - handle_connections_shared_memory, 0)) - { - sql_print_error("Warning: Can't create thread to handle shared memory"); - handler_count--; - } - } -#endif if (have_tcpip && !opt_disable_networking) { handler_count++; if (pthread_create(&hThread,&connection_attrib, handle_connections_sockets, 0)) { - sql_print_error("Warning: Can't create thread to handle tcp/ip"); + sql_print_error("Warning: Can't create thread to handle named pipes"); handler_count--; } } while (handler_count > 0) - { pthread_cond_wait(&COND_handler_count,&LOCK_thread_count); - } } pthread_mutex_unlock(&LOCK_thread_count); } +} +#endif + +#ifndef EMBEDDED_LIBRARY +#ifdef __WIN__ +int win_main(int argc, char **argv) +#else +int main(int argc, char **argv) +#endif +{ + int init_error; + + DEBUGGER_OFF; + +#ifdef _CUSTOMSTARTUPCONFIG_ + if (_cust_check_startup()) + { + / * _cust_check_startup will report startup failure error * / + exit( 1 ); + } +#endif + + MY_INIT(argv[0]); // init my_sys library & pthreads + + if ((init_error=init_common_variables(MYSQL_CONFIG_NAME, + argc, argv, load_default_groups))) + if (init_error == 2) + unireg_abort(1); + else + exit(1); + + init_signals(); + if (init_thread_environement()) + exit(1); + select_thread=pthread_self(); + select_thread_in_use=1; + if (!(opt_specialflag & SPECIAL_NO_PRIOR)) + my_pthread_setprio(pthread_self(),CONNECT_PRIOR); + + if (!(opt_specialflag & SPECIAL_NO_PRIOR)) + my_pthread_attr_setprio(&connection_attrib,WAIT_PRIOR); + + init_ssl(); + +#ifdef HAVE_LIBWRAP + libwrapName= my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); +#endif + + /* + We have enough space for fiddling with the argv, continue + */ + if (my_setwd(mysql_real_data_home,MYF(MY_WME))) + { + unireg_abort(1); /* purecov: inspected */ + } + mysql_data_home= mysql_data_home_buff; + mysql_data_home[0]=FN_CURLIB; // all paths are relative from here + mysql_data_home[1]=0; + server_init(); + + if (opt_bin_log && !server_id) + { + server_id= !master_host ? 1 : 2; + switch (server_id) { +#ifdef EXTRA_DEBUG + case 1: + sql_print_error("\ +Warning: You have enabled the binary log, but you haven't set server-id:\n\ +Updates will be logged to the binary log, but connections to slaves will\n\ +not be accepted."); + break; +#endif + case 2: + sql_print_error("\ +Warning: You should set server-id to a non-0 value if master_host is set.\n\ +The server will not act as a slave."); + break; + } + } + + if (init_server_components()) + exit(1); + +#ifdef __WIN__ +#define MYSQL_ERR_FILE "mysql.err" + if (!opt_console) + { + freopen(MYSQL_ERR_FILE,"a+",stdout); + freopen(MYSQL_ERR_FILE,"a+",stderr); + } +#endif + +#ifdef __WIN__ + if (!opt_console) + FreeConsole(); // Remove window +#endif + + /* + init signals & alarm + After this we can't quit by a simple unireg_abort + */ + error_handler_hook = my_message_sql; + start_signal_handler(); // Creates pidfile + if (acl_init((THD *)0, opt_noacl)) + { + abort_loop=1; + select_thread_in_use=0; + (void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL); +#ifndef __WIN__ + if (!opt_bootstrap) + (void) my_delete(pidfile_name,MYF(MY_WME)); // Not needed anymore +#endif + exit(1); + } + if (!opt_noacl) + (void) grant_init((THD *)0); + +#ifdef HAVE_DLOPEN + if (!opt_noacl) + udf_init(); +#endif + /* init_slave() must be called after the thread keys are created */ + init_slave(); + + if (opt_bootstrap) + { + int error=bootstrap(stdin); + end_thr_alarm(); // Don't allow alarms + unireg_abort(error ? 1 : 0); + } + if (opt_init_file) + { + if (read_init_file(opt_init_file)) + { + end_thr_alarm(); // Don't allow alarms + unireg_abort(1); + } + } + + create_shutdown_thread(); + create_maintenance_thread(); + + printf(ER(ER_READY),my_progname,server_version,""); + fflush(stdout); + +#ifdef __NT__ + create_named_pipe_thread(); #else handle_connections_sockets(0); #ifdef EXTRA_DEBUG2 @@ -2312,6 +2354,8 @@ The server will not act as a slave."); return(0); /* purecov: deadcode */ } +#endif /* EMBEDDED_LIBRARY */ + /**************************************************************************** Main and thread entry function for Win32 @@ -2450,7 +2494,7 @@ int main(int argc, char **argv) Execute all commands from a file. Used by the mysql_install_db script to create MySQL privilege tables without having to start a full MySQL server. */ - +#ifndef EMBEDDED_LIBRARY static int bootstrap(FILE *file) { THD *thd= new THD; @@ -2487,6 +2531,8 @@ static int bootstrap(FILE *file) DBUG_RETURN(error); } +#endif + static bool read_init_file(char *file_name) { FILE *file; @@ -2494,11 +2540,14 @@ static bool read_init_file(char *file_name) DBUG_PRINT("enter",("name: %s",file_name)); if (!(file=my_fopen(file_name,O_RDONLY,MYF(MY_WME)))) return(1); +#ifndef EMBEDDED_LIBRARY bootstrap(file); /* Ignore errors from this */ +#endif (void) my_fclose(file,MYF(MY_WME)); return 0; } +#ifndef EMBEDDED_LIBRARY static void create_new_thread(THD *thd) { @@ -2580,6 +2629,7 @@ static void create_new_thread(THD *thd) DBUG_PRINT("info",("Thread created")); DBUG_VOID_RETURN; } +#endif #ifdef SIGNALS_DONT_BREAK_READ inline void kill_broken_server() @@ -2597,6 +2647,7 @@ inline void kill_broken_server() #define MAYBE_BROKEN_SYSCALL #endif +#ifndef EMBEDDED_LIBRARY /* Handle new connections and spawn new process to handle them */ extern "C" pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) @@ -3101,6 +3152,7 @@ error: } #endif /* HAVE_SMEM */ +#endif /* EMBEDDED_LIBRARY */ /****************************************************************************** ** handle start options @@ -3466,6 +3518,7 @@ struct my_option my_long_options[] = GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"memlock", OPT_MEMLOCK, "Lock mysqld in memory", (gptr*) &locked_in_memory, (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, +#ifdef HAVE_REPLICATION {"disconnect-slave-event-count", OPT_DISCONNECT_SLAVE_EVENT_COUNT, "Option used by mysql-test for debugging and testing of replication", (gptr*) &disconnect_slave_event_count, @@ -3484,6 +3537,7 @@ struct my_option my_long_options[] = (gptr*) &opt_sporadic_binlog_dump_fail, (gptr*) &opt_sporadic_binlog_dump_fail, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, +#endif /* HAVE_REPLICATION */ {"safemalloc-mem-limit", OPT_SAFEMALLOC_MEM_LIMIT, "Simulate memory shortage when compiled with the --with-debug=full option", 0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -3626,12 +3680,14 @@ struct my_option my_long_options[] = {"relay-log-info-file", OPT_RELAY_LOG_INFO_FILE, "Undocumented", (gptr*) &relay_log_info_file, (gptr*) &relay_log_info_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#ifdef HAVE_REPLICATION {"slave-load-tmpdir", OPT_SLAVE_LOAD_TMPDIR, "Undocumented", (gptr*) &slave_load_tmpdir, (gptr*) &slave_load_tmpdir, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"slave-skip-errors", OPT_SLAVE_SKIP_ERRORS, "Tells the slave thread to continue replication when a query returns an error from the provided list", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#endif {"socket", OPT_SOCKET, "Socket file to use for connection", (gptr*) &mysql_unix_port, (gptr*) &mysql_unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -3968,6 +4024,7 @@ struct my_option my_long_options[] = (gptr*) &global_system_variables.read_buff_size, (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0}, +#ifdef HAVE_REPLICATION {"relay_log_space_limit", OPT_RELAY_LOG_SPACE_LIMIT, "Max space to use for all relay logs", (gptr*) &relay_log_space_limit, @@ -3982,6 +4039,7 @@ struct my_option my_long_options[] = "Number of seconds to wait for more data from a master/slave connection before aborting the read.", (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0, GET_ULONG, REQUIRED_ARG, SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0}, +#endif {"slow_launch_time", OPT_SLOW_LAUNCH_TIME, "If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented.", (gptr*) &slow_launch_time, (gptr*) &slow_launch_time, 0, GET_ULONG, @@ -4326,9 +4384,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), case 'o': protocol_version=PROTOCOL_VERSION-1; break; +#ifdef HAVE_REPLICATION case OPT_SLAVE_SKIP_ERRORS: init_slave_skip_errors(argument); break; +#endif case OPT_SAFEMALLOC_MEM_LIMIT: #if !defined(DBUG_OFF) && defined(SAFEMALLOC) safemalloc_mem_limit = atoi(argument); @@ -4368,6 +4428,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), case (int) OPT_BIN_LOG: opt_bin_log=1; break; +#ifdef HAVE_REPLICATION case (int) OPT_INIT_RPL_ROLE: { int role; @@ -4488,13 +4549,14 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), table_rules_on = 1; break; } - case (int) OPT_SLOW_QUERY_LOG: - opt_slow_log=1; - break; case (int)OPT_RECKLESS_SLAVE: opt_reckless_slave = 1; init_slave_skip_errors("all"); break; +#endif /* HAVE_REPLICATION */ + case (int) OPT_SLOW_QUERY_LOG: + opt_slow_log=1; + break; case (int) OPT_SKIP_NEW: opt_specialflag|= SPECIAL_NO_NEW_FUNC; delay_key_write_options= (uint) DELAY_KEY_WRITE_NONE; @@ -4873,11 +4935,13 @@ static void fix_paths(void) if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir)) exit(1); +#ifdef HAVE_REPLICATION if (!slave_load_tmpdir) { if (!(slave_load_tmpdir = (char*) my_strdup(mysql_tmpdir, MYF(MY_FAE)))) exit(1); } +#endif } diff --git a/sql/net_serv.cc b/sql/net_serv.cc index f284106d752..550fb772fce 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -23,6 +23,7 @@ 3 byte length & 1 byte package-number. */ +#ifndef EMBEDDED_LIBRARY #ifdef __WIN__ #include <winsock.h> #endif @@ -945,3 +946,6 @@ my_net_read(NET *net) #endif /* HAVE_COMPRESS */ return len; } + +#endif /* EMBEDDED_LIBRARY */ + diff --git a/sql/protocol.cc b/sql/protocol.cc index be5202111d0..d0d6a75214b 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -26,6 +26,27 @@ #include "mysql_priv.h" #include <stdarg.h> +#ifndef EMBEDDED_LIBRARY +bool Protocol::net_store_data(const char *from, uint length) +{ + ulong packet_length=packet->length(); + if (packet_length+5+length > packet->alloced_length() && + packet->realloc(packet_length+5+length)) + return 1; + char *to=(char*) net_store_length((char*) packet->ptr()+packet_length, + (ulonglong) length); + memcpy(to,from,length); + packet->length((uint) (to+length-packet->ptr())); + return 0; +} + +inline bool Protocol::convert_str(const char *from, uint length) +{ + convert->store(packet, from, length); +} +#endif + + /* Send a error string to client */ void send_error(THD *thd, uint sql_errno, const char *err) @@ -38,7 +59,9 @@ void send_error(THD *thd, uint sql_errno, const char *err) err ? err : net->last_error[0] ? net->last_error : "NULL")); +#ifndef EMBEDDED_LIBRARY /* TODO query cache in embedded library*/ query_cache_abort(net); +#endif thd->query_error= 1; // needed to catch query errors during replication if (!err) { @@ -55,6 +78,12 @@ void send_error(THD *thd, uint sql_errno, const char *err) } } } + +#ifdef EMBEDDED_LIBRARY + net->last_errno= sql_errno; + strmake(net->last_error, err, sizeof(net->last_error)-1); +#else + if (net->vio == 0) { if (thd->bootstrap) @@ -77,6 +106,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) set_if_smaller(length,MYSQL_ERRMSG_SIZE-1); } VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length)); +#endif /* EMBEDDED_LIBRARY*/ thd->fatal_error=0; // Error message is given thd->net.report_error= 0; DBUG_VOID_RETURN; @@ -87,6 +117,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) This is used by mysqld.cc, which doesn't have a THD */ +#ifndef EMBEDDED_LIBRARY void net_send_error(NET *net, uint sql_errno, const char *err) { char buff[2]; @@ -99,7 +130,7 @@ void net_send_error(NET *net, uint sql_errno, const char *err) net_write_command(net,(uchar) 255, buff, 2, err, length); DBUG_VOID_RETURN; } - +#endif /* Send a warning to the end user @@ -136,14 +167,22 @@ net_printf(THD *thd, uint errcode, ...) { va_list args; uint length,offset; - const char *format,*text_pos; + const char *format; +#ifndef EMBEDDED_LIBRARY + const char *text_pos; +#else + char text_pos[500]; +#endif int head_length= NET_HEADER_SIZE; NET *net= &thd->net; + DBUG_ENTER("net_printf"); DBUG_PRINT("enter",("message: %u",errcode)); thd->query_error= 1; // needed to catch query errors during replication +#ifndef EMBEDDED_LIBRARY query_cache_abort(net); // Safety +#endif va_start(args,errcode); /* The following is needed to make net_printf() work with 0 argument for @@ -159,13 +198,16 @@ net_printf(THD *thd, uint errcode, ...) errcode= ER_UNKNOWN_ERROR; } offset= net->return_errno ? 2 : 0; +#ifndef EMBEDDED_LIBRARY text_pos=(char*) net->buff+head_length+offset+1; +#endif (void) vsprintf(my_const_cast(char*) (text_pos),format,args); length=(uint) strlen((char*) text_pos); if (length >= sizeof(net->last_error)) length=sizeof(net->last_error)-1; /* purecov: inspected */ va_end(args); +#ifndef EMBEDDED_LIBRARY if (net->vio == 0) { if (thd->bootstrap) @@ -186,10 +228,36 @@ net_printf(THD *thd, uint errcode, ...) if (offset) int2store(text_pos-2, errcode); VOID(net_real_write(net,(char*) net->buff,length+head_length+1+offset)); +#else + net->last_errno= errcode; + strmake(net->last_error, text_pos, length); +#endif thd->fatal_error=0; // Error message is given DBUG_VOID_RETURN; } +/* + Function called by my_net_init() to set some check variables +*/ + +#ifndef EMBEDDED_LIBRARY +extern "C" { +void my_net_local_init(NET *net) +{ + net->max_packet= (uint) global_system_variables.net_buffer_length; + net->read_timeout= (uint) global_system_variables.net_read_timeout; + net->write_timeout=(uint) global_system_variables.net_write_timeout; + net->retry_count= (uint) global_system_variables.net_retry_count; + net->max_packet_size= max(global_system_variables.net_buffer_length, + global_system_variables.max_allowed_packet); +} +} + +#else /* EMBEDDED_LIBRARY */ +void my_net_local_init(NET *net __attribute__(unused)) +{ +} +#endif /* EMBEDDED_LIBRARY */ /* Return ok to the client. @@ -216,6 +284,7 @@ net_printf(THD *thd, uint errcode, ...) If net->no_send_ok return without sending packet */ +#ifndef EMBEDDED_LIBRARY void send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message) @@ -301,6 +370,7 @@ send_eof(THD *thd, bool no_flush) } DBUG_VOID_RETURN; } +#endif /* EMBEDDED_LIBRARY */ /**************************************************************************** @@ -355,23 +425,6 @@ char *net_store_length(char *pkg, uint length) } -/* - Used internally for storing strings in packet -*/ - -static bool net_store_data(String *packet, const char *from, uint length) -{ - ulong packet_length=packet->length(); - if (packet_length+5+length > packet->alloced_length() && - packet->realloc(packet_length+5+length)) - return 1; - char *to=(char*) net_store_length((char*) packet->ptr()+packet_length, - (ulonglong) length); - memcpy(to,from,length); - packet->length((uint) (to+length-packet->ptr())); - return 0; -} - /**************************************************************************** Functions used by the protocol functions (like send_ok) to store strings and numbers in the header result packet. @@ -408,19 +461,6 @@ char *net_store_data(char *to,longlong from) Function called by my_net_init() to set some check variables */ -extern "C" { -void my_net_local_init(NET *net) -{ - net->max_packet= (uint) global_system_variables.net_buffer_length; - net->read_timeout= (uint) global_system_variables.net_read_timeout; - net->write_timeout=(uint) global_system_variables.net_write_timeout; - net->retry_count= (uint) global_system_variables.net_retry_count; - net->max_packet_size= max(global_system_variables.net_buffer_length, - global_system_variables.max_allowed_packet); -} -} - - /***************************************************************************** Default Protocol functions *****************************************************************************/ @@ -457,6 +497,7 @@ void Protocol::init(THD *thd_arg) 1 Error (Note that in this case the error is not sent to the client) */ +#ifndef EMBEDDED_LIBRARY bool Protocol::send_fields(List<Item> *list, uint flag) { List_iterator_fast<Item> it(*list); @@ -539,6 +580,14 @@ err: DBUG_RETURN(1); /* purecov: inspected */ } +bool Protocol::send_records_num(List<Item> *list, ulonglong records) +{ + char *pos; + char buff[20]; + pos=net_store_length(buff, (uint) list->elements); + pos=net_store_length(pos, records); + return my_net_write(&thd->net, buff,(uint) (pos-buff)); +} bool Protocol::write() { @@ -547,6 +596,9 @@ bool Protocol::write() } +#endif /* EMBEDDED_LIBRARY */ + + /* Send \0 end terminated string @@ -604,6 +656,7 @@ bool Protocol::store(I_List<i_string>* str_list) ****************************************************************************/ +#ifndef EMBEDDED_LIBRARY void Protocol_simple::prepare_for_resend() { packet->length(0); @@ -621,6 +674,7 @@ bool Protocol_simple::store_null() buff[0]= (char)251; return packet->append(buff, sizeof(buff), PACKET_BUFFET_EXTRA_ALLOC); } +#endif bool Protocol_simple::store(const char *from, uint length) { @@ -632,8 +686,8 @@ bool Protocol_simple::store(const char *from, uint length) field_pos++; #endif if (convert) - return convert->store(packet, from, length); - return net_store_data(packet, from, length); + return convert_str(from, length); + return net_store_data(from, length); } @@ -643,7 +697,7 @@ bool Protocol_simple::store_tiny(longlong from) DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_TINY); #endif char buff[20]; - return net_store_data(packet,(char*) buff, + return net_store_data((char*) buff, (uint) (int10_to_str((int) from,buff, -10)-buff)); } @@ -654,7 +708,7 @@ bool Protocol_simple::store_short(longlong from) field_types[field_pos++] == MYSQL_TYPE_SHORT); #endif char buff[20]; - return net_store_data(packet,(char*) buff, + return net_store_data((char*) buff, (uint) (int10_to_str((int) from,buff, -10)-buff)); } @@ -664,7 +718,7 @@ bool Protocol_simple::store_long(longlong from) DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_LONG); #endif char buff[20]; - return net_store_data(packet,(char*) buff, + return net_store_data((char*) buff, (uint) (int10_to_str((int) from,buff, -10)-buff)); } @@ -676,7 +730,7 @@ bool Protocol_simple::store_longlong(longlong from, bool unsigned_flag) field_types[field_pos++] == MYSQL_TYPE_LONGLONG); #endif char buff[22]; - return net_store_data(packet,(char*) buff, + return net_store_data((char*) buff, (uint) (longlong10_to_str(from,buff, unsigned_flag ? 10 : -10)- buff)); @@ -690,7 +744,7 @@ bool Protocol_simple::store(float from, uint32 decimals, String *buffer) field_types[field_pos++] == MYSQL_TYPE_FLOAT); #endif buffer->set((double) from, decimals, thd->variables.thd_charset); - return net_store_data(packet,(char*) buffer->ptr(), buffer->length()); + return net_store_data((char*) buffer->ptr(), buffer->length()); } bool Protocol_simple::store(double from, uint32 decimals, String *buffer) @@ -700,7 +754,7 @@ bool Protocol_simple::store(double from, uint32 decimals, String *buffer) field_types[field_pos++] == MYSQL_TYPE_DOUBLE); #endif buffer->set(from, decimals, thd->variables.thd_charset); - return net_store_data(packet,(char*) buffer->ptr(), buffer->length()); + return net_store_data((char*) buffer->ptr(), buffer->length()); } @@ -715,8 +769,8 @@ bool Protocol_simple::store(Field *field) String tmp(buff,sizeof(buff),default_charset_info); field->val_str(&tmp,&tmp); if (convert) - return convert->store(packet, tmp.ptr(), tmp.length()); - return net_store_data(packet, tmp.ptr(), tmp.length()); + return convert_str(tmp.ptr(), tmp.length()); + return net_store_data(tmp.ptr(), tmp.length()); } @@ -737,7 +791,7 @@ bool Protocol_simple::store(TIME *tm) (int) tm->hour, (int) tm->minute, (int) tm->second)); - return net_store_data(packet, (char*) buff, length); + return net_store_data((char*) buff, length); } @@ -753,7 +807,7 @@ bool Protocol_simple::store_date(TIME *tm) (int) tm->year, (int) tm->month, (int) tm->day)); - return net_store_data(packet, (char*) buff, length); + return net_store_data((char*) buff, length); } @@ -770,7 +824,7 @@ bool Protocol_simple::store_time(TIME *tm) (long) tm->day*3600L+(long) tm->hour, (int) tm->minute, (int) tm->second)); - return net_store_data(packet, (char*) buff, length); + return net_store_data((char*) buff, length); } @@ -794,7 +848,7 @@ bool Protocol_simple::store_time(TIME *tm) bool Protocol_prep::prepare_for_send(List<Item> *item_list) { - field_count= item_list->elements; + Protocol::prepare_for_send(item_list); bit_fields= (field_count+9)/8; if (packet->alloc(bit_fields+1)) return 1; @@ -821,11 +875,10 @@ bool Protocol_prep::store(const char *from,uint length) #endif field_pos++; if (convert) - return convert->store(packet, from, length); - return net_store_data(packet, from, length); + return convert_str(from, length); + return net_store_data(from, length); } - bool Protocol_prep::store_null() { uint offset= (field_pos+2)/8+1, bit= (1 << ((field_pos+2) & 7)); diff --git a/sql/protocol.h b/sql/protocol.h index b3ab0a2b31d..f57652af670 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -23,7 +23,9 @@ class CONVERT; class i_string; class THD; - +#ifdef EMBEDDED_LIBRARY +typedef struct st_mysql_field MYSQL_FIELD; +#endif class Protocol { protected: @@ -33,7 +35,14 @@ protected: #ifndef DEBUG_OFF enum enum_field_types *field_types; #endif - + uint field_count; + bool net_store_data(const char *from, uint length); + bool convert_str(const char *from, uint length); +#ifdef EMBEDDED_LIBRARY + char **next_field; + MYSQL_FIELD *next_mysql_field; + MEM_ROOT *alloc; +#endif public: CONVERT *convert; @@ -41,6 +50,7 @@ public: Protocol(THD *thd) { init(thd); } void init(THD* thd); bool send_fields(List<Item> *list, uint flag); + bool send_records_num(List<Item> *list, ulonglong records); bool store(I_List<i_string> *str_list); bool store(const char *from); String *storage_packet() { return packet; } @@ -52,8 +62,12 @@ public: { return store_longlong((longlong) from, 0); } inline bool store(ulonglong from) { return store_longlong((longlong) from, 1); } - - virtual bool prepare_for_send(List<Item> *item_list) { return 0;} + + virtual bool prepare_for_send(List<Item> *item_list) + { + field_count=item_list->elements; + return 0; + } virtual void prepare_for_resend()=0; virtual bool store_null()=0; @@ -97,7 +111,7 @@ public: class Protocol_prep :public Protocol { private: - uint field_count, bit_fields; + uint bit_fields; public: Protocol_prep() {} Protocol_prep(THD *thd) :Protocol(thd) {} @@ -117,7 +131,6 @@ public: virtual bool store(Field *field); }; - void send_warning(THD *thd, uint sql_errno, const char *err=0); void net_printf(THD *thd,uint sql_errno, ...); void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L, diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 597bcff58f2..49b061ae6b4 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -17,6 +17,8 @@ // Sasha Pachev <sasha@mysql.com> is currently in charge of this file #include "mysql_priv.h" +#ifdef HAVE_REPLICATION + #include "repl_failsafe.h" #include "sql_repl.h" #include "slave.h" @@ -893,3 +895,6 @@ err: return error; } + +#endif /* HAVE_REPLICATION */ + diff --git a/sql/repl_failsafe.h b/sql/repl_failsafe.h index ef1dc1f8778..72ea0cf2a56 100644 --- a/sql/repl_failsafe.h +++ b/sql/repl_failsafe.h @@ -1,3 +1,4 @@ +#ifdef HAVE_REPLICATION #ifndef REPL_FAILSAFE_H #define REPL_FAILSAFE_H @@ -35,3 +36,4 @@ int register_slave(THD* thd, uchar* packet, uint packet_length); void unregister_slave(THD* thd, bool only_mine, bool need_mutex); #endif +#endif /* HAVE_REPLICATION */ diff --git a/sql/set_var.cc b/sql/set_var.cc index 30067336d5a..cd02010c499 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -47,6 +47,7 @@ #endif #include "mysql_priv.h" +#include <mysql.h> #include "slave.h" #include "sql_acl.h" #include <my_getopt.h> @@ -209,8 +210,10 @@ sys_var_thd_enum sys_query_cache_type("query_cache_type", sys_var_long_ptr sys_server_id("server_id",&server_id); sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol", &opt_slave_compressed_protocol); +#ifdef HAVE_REPLICATION sys_var_long_ptr sys_slave_net_timeout("slave_net_timeout", &slave_net_timeout); +#endif sys_var_long_ptr sys_slow_launch_time("slow_launch_time", &slow_launch_time); sys_var_thd_ulong sys_sort_buffer("sort_buffer_size", @@ -302,7 +305,9 @@ static sys_var_readonly sys_warning_count("warning_count", get_warning_count); /* alias for last_insert_id() to be compatible with Sybase */ +#ifdef HAVE_REPLICATION static sys_var_slave_skip_counter sys_slave_skip_counter("sql_slave_skip_counter"); +#endif static sys_var_rand_seed1 sys_rand_seed1("rand_seed1"); static sys_var_rand_seed2 sys_rand_seed2("rand_seed2"); @@ -385,9 +390,11 @@ sys_var *sys_variables[]= &sys_safe_updates, &sys_select_limit, &sys_server_id, +#ifdef HAVE_REPLICATION &sys_slave_compressed_protocol, &sys_slave_net_timeout, &sys_slave_skip_counter, +#endif &sys_slow_launch_time, &sys_sort_buffer, &sys_sql_big_tables, @@ -482,7 +489,9 @@ struct show_var_st init_vars[]= { {"log", (char*) &opt_log, SHOW_BOOL}, {"log_update", (char*) &opt_update_log, SHOW_BOOL}, {"log_bin", (char*) &opt_bin_log, SHOW_BOOL}, +#ifdef HAVE_REPLICATION {"log_slave_updates", (char*) &opt_log_slave_updates, SHOW_MY_BOOL}, +#endif {"log_slow_queries", (char*) &opt_slow_log, SHOW_BOOL}, {sys_log_warnings.name, (char*) &sys_log_warnings, SHOW_SYS}, {sys_long_query_time.name, (char*) &sys_long_query_time, SHOW_SYS}, @@ -535,7 +544,9 @@ struct show_var_st init_vars[]= { {"shared_memory_base_name", (char*) &shared_memory_base_name, SHOW_CHAR_PTR}, #endif {sys_server_id.name, (char*) &sys_server_id, SHOW_SYS}, +#ifdef HAVE_REPLICATION {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS}, +#endif {"skip_external_locking", (char*) &my_disable_locking, SHOW_MY_BOOL}, {"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL}, {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL}, @@ -635,6 +646,7 @@ static void fix_tx_isolation(THD *thd, enum_var_type type) If we are changing the thread variable, we have to copy it to NET too */ +#ifdef HAVE_REPLICATION static void fix_net_read_timeout(THD *thd, enum_var_type type) { if (type != OPT_GLOBAL) @@ -653,6 +665,17 @@ static void fix_net_retry_count(THD *thd, enum_var_type type) if (type != OPT_GLOBAL) thd->net.retry_count=thd->variables.net_retry_count; } +#else /* HAVE_REPLICATION */ +static void fix_net_read_timeout(THD *thd __attribute__(unused), + enum_var_type type __attribute__(unused)) +{} +static void fix_net_write_timeout(THD *thd __attribute__(unused), + enum_var_type type __attribute__(unused)) +{} +static void fix_net_retry_count(THD *thd __attribute__(unused), + enum_var_type type __attribute__(unused)) +{} +#endif /* HAVE_REPLICATION */ static void fix_query_cache_size(THD *thd, enum_var_type type) @@ -1192,6 +1215,7 @@ byte *sys_var_insert_id::value_ptr(THD *thd, enum_var_type type) } +#ifdef HAVE_REPLICATION bool sys_var_slave_skip_counter::check(THD *thd, set_var *var) { int result= 0; @@ -1227,7 +1251,7 @@ bool sys_var_slave_skip_counter::update(THD *thd, set_var *var) UNLOCK_ACTIVE_MI; return 0; } - +#endif /* HAVE_REPLICATION */ bool sys_var_rand_seed1::update(THD *thd, set_var *var) { @@ -1498,7 +1522,7 @@ int set_var::check(THD *thd) return 0; } - if (value->check_cols(1) || value->fix_fields(thd, 0, &value)) + if (value->fix_fields(thd, 0, &value) || value->check_cols(1)) return -1; if (var->check_update_type(value->result_type())) { diff --git a/sql/set_var.h b/sql/set_var.h index 5d7463d9fa8..3b4ec9d5bfe 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -374,6 +374,7 @@ public: }; +#ifndef EMBEDDED_LIBRARY class sys_var_slave_skip_counter :public sys_var { public: @@ -386,7 +387,7 @@ public: type() or value_ptr() */ }; - +#endif class sys_var_rand_seed1 :public sys_var { diff --git a/sql/slave.cc b/sql/slave.cc index ce1a8e4befd..4572a265294 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -14,8 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "mysql_priv.h" + +#ifdef HAVE_REPLICATION + #include <mysql.h> #include <myisam.h> #include "mini_client.h" @@ -3194,3 +3196,5 @@ err: template class I_List_iterator<i_string>; template class I_List_iterator<i_string_pair>; #endif + +#endif /* HAVE_REPLICATION */ diff --git a/sql/slave.h b/sql/slave.h index 91eedd60c7c..8122975a809 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -1,3 +1,5 @@ +#ifdef HAVE_REPLICATION + #ifndef SLAVE_H #define SLAVE_H @@ -463,3 +465,7 @@ extern I_List<i_string_pair> replicate_rewrite_db; extern I_List<THD> threads; #endif +#else +#define SLAVE_IO 1 +#define SLAVE_SQL 2 +#endif /* HAVE_REPLICATION */ diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index cedb34b48bb..645d0439961 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2721,8 +2721,12 @@ ulong get_table_grant(THD *thd, TABLE_LIST *table) GRANT_TABLE *grant_table; rw_rdlock(&LOCK_grant); +#ifdef EMBEDDED_LIBRARY + grant_table= NULL; +#else grant_table = table_hash_search(thd->host,thd->ip,db,user, table->real_name,0); +#endif table->grant.grant_table=grant_table; // Remember for column test table->grant.version=grant_version; if (grant_table) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e4af362c3e3..847617d6462 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -195,7 +195,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) DBUG_RETURN(open_list); } - /***************************************************************************** * Functions to free open table cache ****************************************************************************/ @@ -1928,8 +1927,7 @@ int setup_fields(THD *thd, TABLE_LIST *tables, List<Item> &fields, } else { - if (item->check_cols(1) || - item->fix_fields(thd, tables, it.ref())) + if (item->fix_fields(thd, tables, it.ref()) || item->check_cols(1)) DBUG_RETURN(-1); /* purecov: inspected */ item= *(it.ref()); //Item can be chenged in fix fields if (item->with_sum_func && item->type() != Item::SUM_FUNC_ITEM && @@ -2089,7 +2087,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) if (*conds) { thd->where="where clause"; - if ((*conds)->check_cols(1) || (*conds)->fix_fields(thd, tables, conds)) + if ((*conds)->fix_fields(thd, tables, conds) || (*conds)->check_cols(1)) DBUG_RETURN(1); } @@ -2100,8 +2098,8 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) { /* Make a join an a expression */ thd->where="on clause"; - if (table->on_expr->check_cols(1) || - table->on_expr->fix_fields(thd, tables, &table->on_expr)) + if (table->on_expr->fix_fields(thd, tables, &table->on_expr) || + table->on_expr->check_cols(1)) DBUG_RETURN(1); thd->cond_count++; diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index b1ea9815f42..df06bcfd5c0 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -754,7 +754,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) if ((local_tables = is_cacheable(thd, thd->query_length, thd->query, &thd->lex, tables_used))) { - NET *net = &thd->net; + NET *net= &thd->net; byte flags = (thd->client_capabilities & CLIENT_LONG_FLAG ? 0x80 : 0); STRUCT_LOCK(&structure_guard_mutex); @@ -1015,11 +1015,13 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) ALIGN_SIZE(sizeof(Query_cache_result)))); Query_cache_result *result = result_block->result(); +#ifndef EMBEDDED_LIBRARY /* TODO query cache in embedded library*/ if (net_real_write(&thd->net, result->data(), result_block->used - result_block->headers_len() - ALIGN_SIZE(sizeof(Query_cache_result)))) break; // Client aborted +#endif result_block = result_block->next; } while (result_block != first_result_block); diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d352fc95fdd..0b6da3d9bcd 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -107,8 +107,10 @@ THD::THD():user_time(0), fatal_error(0), mysys_var=0; #ifndef DBUG_OFF dbug_sentry=THD_SENTRY_MAGIC; -#endif +#endif +#ifndef EMBEDDED_LIBRARY net.vio=0; +#endif net.last_error[0]=0; // If error on boot ull=0; system_thread=cleanup_done=0; @@ -266,11 +268,13 @@ THD::~THD() pthread_mutex_unlock(&LOCK_delete); /* Close connection */ +#ifndef EMBEDDED_LIBRARY if (net.vio) { vio_delete(net.vio); net_end(&net); } +#endif if (!cleanup_done) cleanup(); #ifdef USING_TRANSACTIONS @@ -510,7 +514,6 @@ bool select_send::send_fields(List<Item> &list,uint flag) return thd->protocol->send_fields(&list,flag); } - /* Send data to client. Returns 0 if ok */ bool select_send::send_data(List<Item> &items) @@ -966,11 +969,12 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u) my_error(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, MYF(0)); return 1; } + unit=u; while ((item=li++)) { ls= gl++; Item_func_set_user_var *xx = new Item_func_set_user_var(*ls,item); - xx->fix_fields(current_thd,(TABLE_LIST*) current_thd->lex.select_lex.table_list.first,&item); + xx->fix_fields(thd,(TABLE_LIST*) thd->lex.select_lex.table_list.first,&item); xx->fix_length_and_dec(); vars.push_back(xx); } @@ -982,6 +986,11 @@ bool select_dumpvar::send_data(List<Item> &items) Item_func_set_user_var *xx; DBUG_ENTER("send_data"); + if (unit->offset_limit_cnt) + { // Using limit offset,count + unit->offset_limit_cnt--; + DBUG_RETURN(0); + } if (row_count++) { my_error(ER_TOO_MANY_ROWS, MYF(0)); diff --git a/sql/sql_class.h b/sql/sql_class.h index e682bf5741a..216720da801 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -177,6 +177,12 @@ public: { convert_array(from_map, (uchar*) a,length); } + char *store_dest(char *to, const char *from, uint length) + { + for (const char *end=from+length ; from != end ; from++) + *to++= to_map[(uchar) *from]; + return to; + } bool store(String *, const char *,uint); inline uint number() { return numb; } }; @@ -338,6 +344,10 @@ class select_result; #define THD_SENTRY_MAGIC 0xfeedd1ff #define THD_SENTRY_GONE 0xdeadbeef +#ifdef EMBEDDED_LIBRARY +typedef struct st_mysql; +#endif + #define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC) struct system_variables @@ -389,9 +399,11 @@ struct system_variables For each client connection we create a separate thread with THD serving as a thread/connection descriptor */ - class THD :public ilink { public: +#ifdef EMBEDDED_LIBRARY + struct st_mysql *mysql; +#endif NET net; // client connection descriptor LEX lex; // parse tree descriptor MEM_ROOT mem_root; // 1 command-life memory pool @@ -542,6 +554,7 @@ public: THD(); ~THD(); + void init(void); void change_user(void); void cleanup(void); @@ -637,12 +650,17 @@ public: void add_changed_table(const char *key, long key_length); CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length); int send_explain_fields(select_result *result); +#ifndef EMBEDDED_LIBRARY inline void clear_error() { net.last_error[0]= 0; net.last_errno= 0; net.report_error= 0; } +#else + void clear_error(); +#endif + void add_possible_loop(Item *); }; diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 0a2e2947add..f4c3979a34a 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -25,7 +25,7 @@ #include "sql_select.h" #include "sql_acl.h" -static const char *any_db="*any*"; // Special symbol for check_access +extern const char *any_db; // Special symbol for check_access /* Resolve derived tables in all queries diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index e2d484b1c2b..ea5c07048ab 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -105,7 +105,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, } tables->table=table; - if (cond && (cond->check_cols(1) || cond->fix_fields(thd, tables, &cond))) + if (cond && (cond->fix_fields(thd, tables, &cond) || cond->check_cols(1))) return -1; /* InnoDB needs to know that this table handle is used in the HANDLER */ diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8fca6300992..71d8a3e181b 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -77,6 +77,8 @@ static int read_sep_field(THD *thd,COPY_INFO &info,TABLE *table, String &enclosed); +#ifndef EMBEDDED_LIBRARY + int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, List<Item> &fields, enum enum_duplicates handle_duplicates, bool read_file_from_client,thr_lock_type lock_type) @@ -156,12 +158,14 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (read_file_from_client && handle_duplicates == DUP_ERROR) handle_duplicates=DUP_IGNORE; +#ifndef EMBEDDED_LIBRARY if (read_file_from_client) { (void)net_request_file(&thd->net,ex->file_name); file = -1; } else +#endif { read_file_from_client=0; #ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS @@ -346,6 +350,7 @@ err: DBUG_RETURN(error); } +#endif /* EMBEDDED_LIBRARY */ /**************************************************************************** ** Read of rows of fixed size + optional garage + optonal newline @@ -604,9 +609,11 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, String &field_term, cache.read_function = _my_b_net_read; need_end_io_cache = 1; +#ifndef EMBEDDED_LIBRARY if (!opt_old_rpl_compat && mysql_bin_log.is_open()) cache.pre_read = cache.pre_close = (IO_CACHE_CALLBACK) log_loaded_block; +#endif } } } diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e53d60799c9..d5deabf606b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -494,6 +494,7 @@ static void reset_mqh(THD *thd, LEX_USER *lu, bool get_them= 0) Returns 0 on ok, -1 < if error is given > 0 on error. */ +#ifndef EMBEDDED_LIBRARY static int check_connections(THD *thd) { @@ -654,7 +655,7 @@ check_connections(THD *thd) thd->variables.net_wait_timeout= thd->variables.net_interactive_timeout; if ((thd->client_capabilities & CLIENT_TRANSACTIONS) && opt_using_transactions) - thd->net.return_status= &thd->server_status; + net->return_status= &thd->server_status; net->read_timeout=(uint) thd->variables.net_read_timeout; /* Simple connect only for old clients. New clients always use secure auth */ @@ -712,7 +713,6 @@ check_connections(THD *thd) return 0; } - pthread_handler_decl(handle_one_connection,arg) { THD *thd=(THD*) arg; @@ -903,6 +903,8 @@ end: DBUG_RETURN(0); // Never reached } +#endif /* EMBEDDED_LIBRARY */ + /* This works because items are allocated with sql_alloc() */ void free_items(Item *item) @@ -957,8 +959,9 @@ err: } - /* Execute one command from socket (query or simple command) */ +#ifndef EMBEDDED_LIBRARY + /* Execute one command from socket (query or simple command) */ bool do_command(THD *thd) { char *packet; @@ -1004,6 +1007,7 @@ bool do_command(THD *thd) DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length)); } +#endif /* EMBEDDED_LIBRARY */ bool dispatch_command(enum enum_server_command command, THD *thd, char* packet, uint packet_length) @@ -1033,12 +1037,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd, if (!mysql_change_db(thd,packet)) mysql_log.write(thd,command,"%s",thd->db); break; +#ifndef EMBEDDED_LIBRARY case COM_REGISTER_SLAVE: { if (!register_slave(thd, (uchar*)packet, packet_length)) send_ok(thd); break; } +#endif case COM_TABLE_DUMP: { statistic_increment(com_other, &LOCK_status); @@ -1055,6 +1061,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, send_error(thd); // dump to NET break; } +#ifndef EMBEDDED_LIBRARY case COM_CHANGE_USER: { thd->change_user(); @@ -1170,7 +1177,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->priv_user=save_priv_user; break; } - +#endif /* EMBEDDED_LIBRARY */ case COM_EXECUTE: { mysql_stmt_execute(thd, packet); @@ -1198,6 +1205,29 @@ bool dispatch_command(enum enum_server_command command, THD *thd, mysql_log.write(thd,command,"%s",thd->query); DBUG_PRINT("query",("%-.4096s",thd->query)); mysql_parse(thd,thd->query, thd->query_length); + + while (!thd->fatal_error && thd->lex.found_colon) + { + /* + Multiple queries exits, execute them individually + */ + if (thd->lock || thd->open_tables || thd->derived_tables) + close_thread_tables(thd); + + uint length= thd->query_length-(uint)(thd->lex.found_colon-thd->query); + + /* Remove garbage at start of query */ + char *packet= thd->lex.found_colon; + while (my_isspace(system_charset_info,packet[0]) && length > 0) + { + packet++; + length--; + } + thd->query= packet; + thd->query_length= length; + mysql_parse(thd, packet, length); + } + if (!(specialflag & SPECIAL_NO_PRIOR)) my_pthread_setprio(pthread_self(),WAIT_PRIOR); DBUG_PRINT("info",("query ready")); @@ -1285,6 +1315,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, mysql_rm_db(thd,db,0,0); break; } +#ifndef EMBEDDED_LIBRARY case COM_BINLOG_DUMP: { statistic_increment(com_other,&LOCK_status); @@ -1309,6 +1340,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, net->error = 0; break; } +#endif case COM_REFRESH: { statistic_increment(com_stat[SQLCOM_FLUSH],&LOCK_status); @@ -1320,6 +1352,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, reload_acl_and_cache(thd, options, (TABLE_LIST*) 0) ; break; } +#ifndef EMBEDDED_LIBRARY case COM_SHUTDOWN: statistic_increment(com_other,&LOCK_status); if (check_global_access(thd,SHUTDOWN_ACL)) @@ -1340,7 +1373,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, kill_mysql(); error=TRUE; break; - +#endif +#ifndef EMBEDDED_LIBRARY case COM_STATISTICS: { mysql_log.write(thd,command,NullS); @@ -1362,6 +1396,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, VOID(net_flush(net)); break; } +#endif case COM_PING: statistic_increment(com_other,&LOCK_status); send_ok(thd); // Tell client we are alive @@ -1425,14 +1460,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query); } } - if (command == COM_QUERY && thd->lex.found_colon) - { - /* - Multiple queries exits, execute them individually - */ - uint length= thd->query_length-(uint)(thd->lex.found_colon-thd->query)+1; - dispatch_command(command, thd, thd->lex.found_colon, length); - } thd->proc_info="cleaning up"; VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list thd->proc_info=0; @@ -1463,7 +1490,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, bool alloc_query(THD *thd, char *packet, ulong packet_length) { packet_length--; // Remove end null - /* Remove garage at start and end of query */ + /* Remove garbage at start and end of query */ while (my_isspace(system_charset_info,packet[0]) && packet_length > 0) { packet++; @@ -1519,6 +1546,7 @@ mysql_execute_command(THD *thd) */ thd->old_total_warn_count= thd->total_warn_count; +#ifndef EMBEDDED_LIBRARY if (thd->slave_thread) { /* @@ -1540,7 +1568,7 @@ mysql_execute_command(THD *thd) } #endif } - +#endif /* EMBEDDED_LIBRARY */ /* TODO: make derived tables processing 'inside' SELECT processing. TODO: solve problem with depended derived tables in subselects @@ -1568,9 +1596,13 @@ mysql_execute_command(THD *thd) } } if ((&lex->select_lex != lex->all_selects_list && - lex->unit.create_total_list(thd, lex, &tables)) || + lex->unit.create_total_list(thd, lex, &tables)) +#ifndef EMBEDDED_LIBRARY + || (table_rules_on && tables && thd->slave_thread && - !tables_ok(thd,tables))) + !tables_ok(thd,tables)) +#endif + ) DBUG_VOID_RETURN; statistic_increment(com_stat[lex->sql_command],&LOCK_status); @@ -1660,6 +1692,7 @@ mysql_execute_command(THD *thd) res= mysqld_help(thd,lex->help_arg); break; +#ifndef EMBEDDED_LIBRARY case SQLCOM_PURGE: { if (check_global_access(thd, SUPER_ACL)) @@ -1667,6 +1700,8 @@ mysql_execute_command(THD *thd) res = purge_master_logs(thd, lex->to_log); break; } +#endif + case SQLCOM_SHOW_WARNS: { res= mysqld_show_warnings(thd, (ulong) @@ -1694,6 +1729,8 @@ mysql_execute_command(THD *thd) #endif break; } + +#ifndef EMBEDDED_LIBRARY case SQLCOM_SHOW_SLAVE_HOSTS: { if (check_global_access(thd, REPL_SLAVE_ACL)) @@ -1708,6 +1745,8 @@ mysql_execute_command(THD *thd) res = show_binlog_events(thd); break; } +#endif + case SQLCOM_BACKUP_TABLE: { if (check_db_used(thd,tables) || @@ -1727,6 +1766,8 @@ mysql_execute_command(THD *thd) res = mysql_restore_table(thd, tables); break; } + +#ifndef EMBEDDED_LIBRARY case SQLCOM_CHANGE_MASTER: { if (check_global_access(thd, SUPER_ACL)) @@ -1761,6 +1802,7 @@ mysql_execute_command(THD *thd) else res = load_master_data(thd); break; +#endif /* EMBEDDED_LIBRARY */ #ifdef HAVE_INNOBASE_DB case SQLCOM_SHOW_INNODB_STATUS: @@ -1772,6 +1814,7 @@ mysql_execute_command(THD *thd) } #endif +#ifndef EMBEDDED_LIBRARY case SQLCOM_LOAD_MASTER_TABLE: { if (!tables->db) @@ -1803,6 +1846,8 @@ mysql_execute_command(THD *thd) UNLOCK_ACTIVE_MI; break; } +#endif /* EMBEDDED_LIBRARY */ + case SQLCOM_CREATE_TABLE: { ulong want_priv= ((lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) ? @@ -1907,6 +1952,7 @@ mysql_execute_command(THD *thd) res = mysql_create_index(thd, tables, lex->key_list); break; +#ifndef EMBEDDED_LIBRARY case SQLCOM_SLAVE_START: { LOCK_ACTIVE_MI; @@ -1939,6 +1985,8 @@ mysql_execute_command(THD *thd) UNLOCK_ACTIVE_MI; break; } +#endif + case SQLCOM_ALTER_TABLE: #if defined(DONT_ALLOW_SHOW_COMMANDS) send_error(thd,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ @@ -2029,6 +2077,7 @@ mysql_execute_command(THD *thd) res= -1; break; } +#ifndef EMBEDDED_LIBRARY case SQLCOM_SHOW_BINLOGS: #ifdef DONT_ALLOW_SHOW_COMMANDS send_error(thd,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ @@ -2041,6 +2090,7 @@ mysql_execute_command(THD *thd) break; } #endif +#endif /* EMBEDDED_LIBRARY */ case SQLCOM_SHOW_CREATE: #ifdef DONT_ALLOW_SHOW_COMMANDS send_error(thd,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ @@ -2503,6 +2553,7 @@ mysql_execute_command(THD *thd) case SQLCOM_CHANGE_DB: mysql_change_db(thd,select_lex->db); break; +#ifndef EMBEDDED_LIBRARY case SQLCOM_LOAD: { uint privilege= (lex->duplicates == DUP_REPLACE ? @@ -2529,6 +2580,7 @@ mysql_execute_command(THD *thd) lex->duplicates, (bool) lex->local_file, lex->lock_option); break; } +#endif /* EMBEDDED_LIBRARY */ case SQLCOM_SET_OPTION: if (tables && ((res= check_table_access(thd, SELECT_ACL, tables)) || (res= open_and_lock_tables(thd,tables)))) @@ -3216,7 +3268,9 @@ mysql_parse(THD *thd, char *inBuf, uint length) else { mysql_execute_command(thd); +#ifndef EMBEDDED_LIBRARY /* TODO query cache in embedded library*/ query_cache_end_of_result(&thd->net); +#endif } } } @@ -3224,7 +3278,9 @@ mysql_parse(THD *thd, char *inBuf, uint length) { DBUG_PRINT("info",("Command aborted. Fatal_error: %d", thd->fatal_error)); +#ifndef EMBEDDED_LIBRARY /* TODO query cache in embedded library*/ query_cache_abort(&thd->net); +#endif } thd->proc_info="freeing items"; free_items(thd->free_list); /* Free strings used by items */ @@ -3341,7 +3397,6 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, allowed_type_modifier= AUTO_INCREMENT_FLAG; break; case FIELD_TYPE_NULL: - case FIELD_TYPE_GEOMETRY: break; case FIELD_TYPE_DECIMAL: if (!length) @@ -3365,6 +3420,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, case FIELD_TYPE_TINY_BLOB: case FIELD_TYPE_LONG_BLOB: case FIELD_TYPE_MEDIUM_BLOB: + case FIELD_TYPE_GEOMETRY: if (new_field->length) { /* The user has given a length to the blob column */ @@ -3518,7 +3574,8 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, if (new_field->length >= MAX_FIELD_WIDTH || (!new_field->length && !(new_field->flags & BLOB_FLAG) && - type != FIELD_TYPE_STRING && type != FIELD_TYPE_VAR_STRING)) + type != FIELD_TYPE_STRING && + type != FIELD_TYPE_VAR_STRING && type != FIELD_TYPE_GEOMETRY)) { net_printf(thd,ER_TOO_BIG_FIELDLENGTH,field_name, MAX_FIELD_WIDTH-1); /* purecov: inspected */ @@ -3833,9 +3890,11 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables) refresh_status(); if (options & REFRESH_THREADS) flush_thread_cache(); +#ifndef EMBEDDED_LIBRARY if (options & REFRESH_MASTER) if (reset_master(thd)) result=1; +#endif #ifdef OPENSSL if (options & REFRESH_DES_KEY_FILE) { @@ -3843,6 +3902,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables) result=load_des_key_file(des_key_file); } #endif +#ifndef EMBEDDED_LIBRARY if (options & REFRESH_SLAVE) { LOCK_ACTIVE_MI; @@ -3859,6 +3919,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables) } UNLOCK_ACTIVE_MI; } +#endif if (options & REFRESH_USER_RESOURCES) reset_mqh(thd,(LEX_USER *) NULL); diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 75b4fcb1896..e8ba7e91c7b 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -30,7 +30,11 @@ Prepare: - Without executing the query, return back to client the total number of parameters along with result-set metadata information (if any) in the following format: - [STMT_ID:4][Columns:2][Param_count:2][Columns meta info][Params meta info] + [STMT_ID:4] + [Column_count:2] + [Param_count:2] + [Columns meta info] (if Column_count > 0) + [Params meta info] (if Param_count > 0 ) (TODO : 4.1.1) Prepare-execute: @@ -140,7 +144,13 @@ static bool send_prep_stmt(PREP_STMT *stmt, uint columns) int4store(buff, stmt->stmt_id); int2store(buff+4, columns); int2store(buff+6, stmt->param_count); +#ifndef EMBEDDED_LIBRARY + /* This should be fixed to work with prepared statements + */ return (my_net_write(net, buff, sizeof(buff)) || net_flush(net)); +#else + return true; +#endif } /* @@ -299,7 +309,11 @@ static bool setup_params_data(PREP_STMT *stmt) Item_param *param; DBUG_ENTER("setup_params_data"); +#ifndef EMBEDDED_LIBRARY uchar *pos=(uchar*) thd->net.read_pos+1+MYSQL_STMT_HEADER; //skip header +#else + uchar *pos= 0; //just to compile TODO code for embedded case +#endif uchar *read_pos= pos+(stmt->param_count+7) / 8; //skip null bits if (*read_pos++) //types supplied / first execute diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 99fcedfc023..522ec9f6aeb 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -17,6 +17,8 @@ // Sasha Pachev <sasha@mysql.com> is currently in charge of this file #include "mysql_priv.h" +#ifdef HAVE_REPLICATION + #include "sql_repl.h" #include "sql_acl.h" #include "log_event.h" @@ -1167,3 +1169,7 @@ int log_loaded_block(IO_CACHE* file) } return 0; } + +#endif /* HAVE_REPLICATION */ + + diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 15435382b08..f1fda45fe4b 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -1,3 +1,4 @@ +#ifdef HAVE_REPLICATION #include "slave.h" typedef struct st_slave_info @@ -53,3 +54,6 @@ typedef struct st_load_file_info } LOAD_FILE_INFO; int log_loaded_block(IO_CACHE* file); + +#endif /* HAVE_REPLICATION */ + diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d21c89bc512..f758fef4fc9 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -270,8 +270,8 @@ JOIN::prepare(TABLE_LIST *tables_init, thd->where="having clause"; thd->allow_sum_func=1; select_lex->having_fix_field= 1; - bool having_fix_rc= (having->check_cols(1) || - having->fix_fields(thd, tables_list, &having)); + bool having_fix_rc= (having->fix_fields(thd, tables_list, &having) || + having->check_cols(1)); select_lex->having_fix_field= 0; if (having_fix_rc || thd->net.report_error) DBUG_RETURN(-1); /* purecov: inspected */ @@ -713,6 +713,13 @@ JOIN::exec() int tmp_error; DBUG_ENTER("JOIN::exec"); + + if (procedure) + { + if (procedure->change_columns(fields_list) || + result->prepare(fields_list, unit)) + DBUG_VOID_RETURN; + } if (!tables_list) { // Only test of functions @@ -767,8 +774,6 @@ JOIN::exec() test_if_skip_sort_order(&join_tab[const_tables], order, select_limit, 0)))) order=0; - if (procedure) - (void)result->prepare(fields_list, unit); select_describe(this, need_tmp, order != 0 && !skip_sort_order, select_distinct); @@ -988,9 +993,6 @@ JOIN::exec() } if (procedure) { - if (procedure->change_columns(fields_list) || - result->prepare(fields_list, unit)) - DBUG_VOID_RETURN; count_field_types(&tmp_table_param, all_fields, 0); } if (group || tmp_table_param.sum_func_count || @@ -3666,7 +3668,9 @@ remove_eq_conds(COND *cond,Item::cond_result *cond_value) (thd->options & OPTION_AUTO_IS_NULL) && thd->insert_id()) { +#ifndef EMBEDDED_LIBRARY query_cache_abort(&thd->net); +#endif COND *new_cond; if ((new_cond= new Item_func_eq(args[0], new Item_int("last_insert_id()", @@ -5604,6 +5608,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), { Item *item= *group->item; item->save_org_in_field(group->field); +#ifdef EMBEDDED_LIBRARY + join->thd->net.last_errno= 0; +#endif /* Store in the used key if the field was 0 */ if (item->maybe_null) group->buff[-1]=item->null_value ? 1 : 0; @@ -6930,7 +6937,7 @@ find_order_in_list(THD *thd,TABLE_LIST *tables,ORDER *order,List<Item> &fields, } order->in_field_list=0; Item *it= *order->item; - if (it->check_cols(1) || it->fix_fields(thd, tables, order->item) || + if (it->fix_fields(thd, tables, order->item) || it->check_cols(1) || thd->fatal_error) return 1; // Wrong field all_fields.push_front(*order->item); // Add new field to field list diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3ec45c8eca9..e77947e70f6 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -53,7 +53,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; ** A database is a directory in the mysql_data_home directory ****************************************************************************/ - int mysqld_show_dbs(THD *thd,const char *wild) { @@ -688,14 +687,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, field_list.push_back(new Item_empty_string("Comment",255)); } // Send first number of fields and records - { - char *pos; - pos=net_store_length(tmp, (uint) field_list.elements); - pos=net_store_length(pos,(ulonglong) file->records); - (void) my_net_write(&thd->net,tmp,(uint) (pos-tmp)); - } - - if (protocol->send_fields(&field_list,0)) + if (protocol->send_records_num(&field_list, (ulonglong)file->records) || + protocol->send_fields(&field_list,0)) DBUG_RETURN(1); restore_record(table,2); // Get empty record @@ -755,8 +748,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, if (verbose) { /* Add grant options & comments */ - col_access= get_column_grant(thd,table_list,field) & COL_ACLS; end=tmp; + col_access= get_column_grant(thd,table_list,field) & COL_ACLS; for (uint bitnr=0; col_access ; col_access>>=1,bitnr++) { if (col_access & 1) @@ -1284,7 +1277,6 @@ public: template class I_List<thread_info>; #endif - void mysqld_list_processes(THD *thd,const char *user, bool verbose) { Item *field; @@ -1317,8 +1309,13 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) while ((tmp=it++)) { struct st_my_thread_var *mysys_var; +#ifndef EMBEDDED_LIBRARY if ((tmp->net.vio || tmp->system_thread) && (!user || (tmp->user && !strcmp(tmp->user,user)))) +#else + if (tmp->system_thread && + (!user || (tmp->user && !strcmp(tmp->user,user)))) +#endif { thread_info *thd_info=new thread_info; @@ -1336,6 +1333,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) if ((mysys_var= tmp->mysys_var)) pthread_mutex_lock(&mysys_var->mutex); thd_info->proc_info= (char*) (tmp->killed ? "Killed" : 0); +#ifndef EMBEDDED_LIBRARY thd_info->state_info= (char*) (tmp->locked ? "Locked" : tmp->net.reading_or_writing ? (tmp->net.reading_or_writing == 2 ? @@ -1346,6 +1344,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) tmp->mysys_var && tmp->mysys_var->current_cond ? "Waiting on cond" : NullS); +#else + thd_info->state_info= (char*)"Writing to net"; +#endif if (mysys_var) pthread_mutex_unlock(&mysys_var->mutex); @@ -1398,7 +1399,6 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) DBUG_VOID_RETURN; } - /***************************************************************************** Status functions *****************************************************************************/ @@ -1524,10 +1524,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, case SHOW_QUESTION: end= int10_to_str((long) thd->query_id, buff, 10); break; +#ifndef EMBEDDED_LIBRARY case SHOW_RPL_STATUS: end= strmov(buff, rpl_status_type[(int)rpl_status]); break; -#ifndef EMBEDDED_LIBRARY case SHOW_SLAVE_RUNNING: { LOCK_ACTIVE_MI; @@ -1536,7 +1536,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, UNLOCK_ACTIVE_MI; break; } -#endif +#endif /* EMBEDDED_LIBRARY */ case SHOW_OPENTABLES: end= int10_to_str((long) cached_tables(), buff, 10); break; @@ -1715,6 +1715,8 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, case SHOW_UNDEF: // Show never happen case SHOW_SYS: break; // Return empty string + default: + break; } if (protocol->store(pos, (uint32) (end - pos)) || protocol->write()) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index f6b3305761e..3f443c34287 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -440,6 +440,16 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, sql_field->unireg_check=Field::BLOB_FIELD; blob_columns++; break; + case FIELD_TYPE_GEOMETRY: + sql_field->pack_flag=FIELDFLAG_GEOM | + pack_length_to_packflag(sql_field->pack_length - + portable_sizeof_char_ptr); + if (sql_field->charset->state & MY_CS_BINSORT) + sql_field->pack_flag|=FIELDFLAG_BINARY; + sql_field->length=8; // Unireg field length + sql_field->unireg_check=Field::BLOB_FIELD; + blob_columns++; + break; case FIELD_TYPE_VAR_STRING: case FIELD_TYPE_STRING: sql_field->pack_flag=0; @@ -1221,6 +1231,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, thd->open_options|= extra_open_options; table->table = open_ltable(thd, table, lock_type); +#ifdef EMBEDDED_LIBRARY + thd->net.last_errno= 0; // these errors shouldn't get client +#endif thd->open_options&= ~extra_open_options; if (prepare_func) @@ -1286,6 +1299,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, } int result_code = (table->table->file->*operator_func)(thd, check_opt); +#ifdef EMBEDDED_LIBRARY + thd->net.last_errno= 0; // these errors shouldn't get client +#endif protocol->prepare_for_resend(); protocol->store(table_name); protocol->store(operator_name); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index fb594f28b2d..d603748c443 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2573,6 +2573,12 @@ select_derived: { LEX *lex= Lex; lex->derived_tables= 1; + if (((int)lex->sql_command >= (int)SQLCOM_HA_OPEN && + lex->sql_command <= (int)SQLCOM_HA_READ) || lex->sql_command == (int)SQLCOM_KILL) + { + send_error(lex->thd, ER_SYNTAX_ERROR); + YYABORT; + } if (lex->current_select->linkage == GLOBAL_OPTIONS_TYPE || mysql_new_select(lex, 1)) YYABORT; @@ -3572,7 +3578,7 @@ kill: KILL_SYM expr { LEX *lex=Lex; - if ($2->check_cols(1) || $2->fix_fields(lex->thd, 0, &$2)) + if ($2->fix_fields(lex->thd, 0, &$2) || $2->check_cols(1)) { send_error(lex->thd, ER_SET_CONSTANTS_ONLY); YYABORT; @@ -4640,6 +4646,12 @@ in_subselect_init: subselect_start: '(' SELECT_SYM { + LEX *lex=Lex; + if (((int)lex->sql_command >= (int)SQLCOM_HA_OPEN && + lex->sql_command <= (int)SQLCOM_HA_READ) || lex->sql_command == (int)SQLCOM_KILL) { + send_error(lex->thd, ER_SYNTAX_ERROR); + YYABORT; + } if (mysql_new_select(Lex, 1)) YYABORT; }; |