mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f252f9248a
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c BitKeeper/etc/ignore: added libmysqld/ha_ndbcluster_cond.cc --- added debian/defs.mk debian/control client/completion_hash.cc: Remove not needed casts client/my_readline.h: Remove some old types client/mysql.cc: Simplify types client/mysql_upgrade.c: Remove some old types Update call to dirname_part client/mysqladmin.cc: Remove some old types client/mysqlbinlog.cc: Remove some old types Change some buffers to be uchar to avoid casts client/mysqlcheck.c: Remove some old types client/mysqldump.c: Remove some old types Remove some not needed casts Change some string lengths to size_t client/mysqlimport.c: Remove some old types client/mysqlshow.c: Remove some old types client/mysqlslap.c: Remove some old types Remove some not needed casts client/mysqltest.c: Removed some old types Removed some not needed casts Updated hash-get-key function arguments Updated parameters to dirname_part() client/readline.cc: Removed some old types Removed some not needed casts Changed some string lengths to use size_t client/sql_string.cc: Removed some old types dbug/dbug.c: Removed some old types Changed some string lengths to use size_t Changed some prototypes to avoid casts extra/comp_err.c: Removed some old types extra/innochecksum.c: Removed some old types extra/my_print_defaults.c: Removed some old types extra/mysql_waitpid.c: Removed some old types extra/perror.c: Removed some old types extra/replace.c: Removed some old types Updated parameters to dirname_part() extra/resolve_stack_dump.c: Removed some old types extra/resolveip.c: Removed some old types include/config-win.h: Removed some old types include/decimal.h: Changed binary strings to be uchar* instead of char* include/ft_global.h: Removed some old types include/hash.h: Removed some old types include/heap.h: Removed some old types Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable include/keycache.h: Removed some old types include/m_ctype.h: Removed some old types Changed some string lengths to use size_t Changed character length functions to return uint unsigned char -> uchar include/m_string.h: Removed some old types Changed some string lengths to use size_t include/my_alloc.h: Changed some string lengths to use size_t include/my_base.h: Removed some old types include/my_dbug.h: Removed some old types Changed some string lengths to use size_t Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage include/my_getopt.h: Removed some old types include/my_global.h: Removed old types: my_size_t -> size_t byte -> uchar gptr -> uchar * include/my_list.h: Removed some old types include/my_nosys.h: Removed some old types include/my_pthread.h: Removed some old types include/my_sys.h: Removed some old types Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read() Changed some string lengths to use size_t my_malloc() / my_free() now uses void * Updated parameters to dirname_part() & my_uncompress() include/my_tree.h: Removed some old types include/my_trie.h: Removed some old types include/my_user.h: Changed some string lengths to use size_t include/my_vle.h: Removed some old types include/my_xml.h: Removed some old types Changed some string lengths to use size_t include/myisam.h: Removed some old types include/myisammrg.h: Removed some old types include/mysql.h: Removed some old types Changed byte streams to use uchar* instead of char* include/mysql_com.h: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts include/queues.h: Removed some old types include/sql_common.h: Removed some old types include/sslopt-longopts.h: Removed some old types include/violite.h: Removed some old types Changed some string lengths to use size_t libmysql/client_settings.h: Removed some old types libmysql/libmysql.c: Removed some old types libmysql/manager.c: Removed some old types libmysqld/emb_qcache.cc: Removed some old types libmysqld/emb_qcache.h: Removed some old types libmysqld/lib_sql.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts true -> TRUE, false -> FALSE mysys/array.c: Removed some old types mysys/charset.c: Changed some string lengths to use size_t mysys/checksum.c: Include zlib to get definition for crc32 Removed some old types mysys/default.c: Removed some old types Changed some string lengths to use size_t mysys/default_modify.c: Changed some string lengths to use size_t Removed some not needed casts mysys/hash.c: Removed some old types Changed some string lengths to use size_t Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function. hash_element now takes 'ulong' as the index type (cleanup) mysys/list.c: Removed some old types mysys/mf_cache.c: Changed some string lengths to use size_t mysys/mf_dirname.c: Removed some old types Changed some string lengths to use size_t Added argument to dirname_part() to avoid calculation of length for 'to' mysys/mf_fn_ext.c: Removed some old types Updated parameters to dirname_part() mysys/mf_format.c: Removed some old types Changed some string lengths to use size_t mysys/mf_getdate.c: Removed some old types mysys/mf_iocache.c: Removed some old types Changed some string lengths to use size_t Changed calculation of 'max_length' to be done the same way in all functions mysys/mf_iocache2.c: Removed some old types Changed some string lengths to use size_t Clean up comments Removed not needed indentation mysys/mf_keycache.c: Removed some old types mysys/mf_keycaches.c: Removed some old types mysys/mf_loadpath.c: Removed some old types mysys/mf_pack.c: Removed some old types Changed some string lengths to use size_t Removed some not needed casts Removed very old VMS code Updated parameters to dirname_part() Use result of dirnam_part() to remove call to strcat() mysys/mf_path.c: Removed some old types mysys/mf_radix.c: Removed some old types mysys/mf_same.c: Removed some old types mysys/mf_sort.c: Removed some old types mysys/mf_soundex.c: Removed some old types mysys/mf_strip.c: Removed some old types mysys/mf_tempdir.c: Removed some old types mysys/mf_unixpath.c: Removed some old types mysys/mf_wfile.c: Removed some old types mysys/mulalloc.c: Removed some old types mysys/my_alloc.c: Removed some old types Changed some string lengths to use size_t Use void* as type for allocated memory area Removed some not needed casts Changed argument 'Size' to 'length' according coding guidelines mysys/my_chsize.c: Changed some buffers to be uchar* to avoid casts mysys/my_compress.c: More comments Removed some old types Changed string lengths to use size_t Changed arguments to my_uncompress() to make them easier to understand Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) Changed type of 'pack_data' argument to packfrm() to avoid casts. mysys/my_conio.c: Changed some string lengths to use size_t mysys/my_create.c: Removed some old types mysys/my_div.c: Removed some old types mysys/my_error.c: Removed some old types mysys/my_fopen.c: Removed some old types mysys/my_fstream.c: Removed some old types Changed some string lengths to use size_t writen -> written mysys/my_getopt.c: Removed some old types mysys/my_getwd.c: Removed some old types More comments mysys/my_init.c: Removed some old types mysys/my_largepage.c: Removed some old types Changed some string lengths to use size_t mysys/my_lib.c: Removed some old types mysys/my_lockmem.c: Removed some old types mysys/my_malloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/my_memmem.c: Indentation cleanup mysys/my_once.c: Removed some old types Changed malloc(), free() and related functions to use void * mysys/my_open.c: Removed some old types mysys/my_pread.c: Removed some old types Changed all functions to use size_t Added comment for how my_pread() / my_pwrite() are supposed to work. Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. (If we ever would really need this, it should be enabled only with a flag argument) mysys/my_quick.c: Removed some old types Changed all functions to use size_t mysys/my_read.c: Removed some old types Changed all functions to use size_t mysys/my_realloc.c: Removed some old types Use void* as type for allocated memory area Changed all functions to use size_t mysys/my_static.c: Removed some old types mysys/my_static.h: Removed some old types mysys/my_vle.c: Removed some old types mysys/my_wincond.c: Removed some old types mysys/my_windac.c: Removed some old types mysys/my_write.c: Removed some old types Changed all functions to use size_t mysys/ptr_cmp.c: Removed some old types Changed all functions to use size_t mysys/queues.c: Removed some old types mysys/safemalloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/string.c: Removed some old types Changed all functions to use size_t mysys/testhash.c: Removed some old types mysys/thr_alarm.c: Removed some old types mysys/thr_lock.c: Removed some old types mysys/tree.c: Removed some old types mysys/trie.c: Removed some old types mysys/typelib.c: Removed some old types plugin/daemon_example/daemon_example.cc: Removed some old types regex/reginit.c: Removed some old types server-tools/instance-manager/buffer.cc: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/buffer.h: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/commands.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_map.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_options.cc: Changed buffer to be of type uchar* Replaced alloc_root + strcpy() with strdup_root() server-tools/instance-manager/mysql_connection.cc: Changed buffer to be of type uchar* server-tools/instance-manager/options.cc: Removed some old types server-tools/instance-manager/parse.cc: Changed some string lengths to use size_t server-tools/instance-manager/parse.h: Removed some old types Changed some string lengths to use size_t server-tools/instance-manager/protocol.cc: Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t server-tools/instance-manager/protocol.h: Changed some string lengths to use size_t server-tools/instance-manager/user_map.cc: Removed some old types Changed some string lengths to use size_t sql/derror.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/discover.cc: Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts sql/event_data_objects.cc: Removed some old types Added missing casts for alloc() and sprintf() sql/event_db_repository.cc: Changed some buffers to be uchar* to avoid casts Added missing casts for sprintf() sql/event_queue.cc: Removed some old types sql/field.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/field.h: Removed some old types Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). Changed some string lengths to use size_t Removed some not needed casts Changed val_xxx(xxx, new_ptr) to take const pointers sql/field_conv.cc: Removed some old types Added casts required because memory area pointers are now uchar* sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/gen_lex_hash.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/gstream.h: Added required cast sql/ha_ndbcluster.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Added required casts Removed some not needed casts sql/ha_ndbcluster.h: Removed some old types sql/ha_ndbcluster_binlog.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake() Changed some string lengths to use size_t Added missing casts for alloc() and sprintf() sql/ha_ndbcluster_binlog.h: Removed some old types sql/ha_ndbcluster_cond.cc: Removed some old types Removed some not needed casts sql/ha_ndbcluster_cond.h: Removed some old types sql/ha_partition.cc: Removed some old types Changed prototype for change_partition() to avoid casts sql/ha_partition.h: Removed some old types sql/handler.cc: Removed some old types Changed some string lengths to use size_t sql/handler.h: Removed some old types Changed some string lengths to use size_t Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts sql/hash_filo.h: Removed some old types Changed all functions to use size_t sql/hostname.cc: Removed some old types sql/item.cc: Removed some old types Changed some string lengths to use size_t Use strmake() instead of memdup() to create a null terminated string. Updated calls to new Field() sql/item.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.cc: Removed some old types Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.h: Removed some old types sql/item_create.cc: Removed some old types sql/item_func.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added test for failing alloc() in init_result_field() Remove old confusing comment Fixed compiler warning sql/item_func.h: Removed some old types sql/item_row.cc: Removed some old types sql/item_row.h: Removed some old types sql/item_strfunc.cc: Include zlib (needed becasue we call crc32) Removed some old types sql/item_strfunc.h: Removed some old types Changed some types to match new function prototypes sql/item_subselect.cc: Removed some old types sql/item_subselect.h: Removed some old types sql/item_sum.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/item_sum.h: Removed some old types sql/item_timefunc.cc: Removed some old types Changed some string lengths to use size_t sql/item_timefunc.h: Removed some old types sql/item_xmlfunc.cc: Changed some string lengths to use size_t sql/item_xmlfunc.h: Removed some old types sql/key.cc: Removed some old types Removed some not needed casts sql/lock.cc: Removed some old types Added some cast to my_multi_malloc() arguments for safety sql/log.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Changed usage of pwrite() to not assume it holds the cursor position for the file Made usage of my_read() safer sql/log_event.cc: Removed some old types Added checking of return value of malloc() in pack_info() Changed some buffers to be uchar* to avoid casts Removed some 'const' to avoid casts Added missing casts for alloc() and sprintf() Added required casts Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety sql/log_event.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/log_event_old.cc: Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/log_event_old.h: Changed some buffers to be uchar* to avoid casts sql/mf_iocache.cc: Removed some old types sql/my_decimal.cc: Changed memory area to use uchar* sql/my_decimal.h: Changed memory area to use uchar* sql/mysql_priv.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some string lengths to use size_t Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow Changed some buffers to be uchar* to avoid casts sql/mysqld.cc: Removed some old types sql/net_serv.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Ensure that vio_read()/vio_write() return values are stored in a size_t variable Removed some not needed casts sql/opt_range.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/opt_range.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/opt_sum.cc: Removed some old types Removed some not needed casts sql/parse_file.cc: Removed some old types Changed some string lengths to use size_t Changed alloc_root + memcpy + set end 0 -> strmake_root() sql/parse_file.h: Removed some old types sql/partition_info.cc: Removed some old types Added missing casts for alloc() Changed some buffers to be uchar* to avoid casts sql/partition_info.h: Changed some buffers to be uchar* to avoid casts sql/protocol.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/protocol.h: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/records.cc: Removed some old types sql/repl_failsafe.cc: Removed some old types Changed some string lengths to use size_t Added required casts sql/rpl_filter.cc: Removed some old types Updated hash-get-key function arguments Changed some string lengths to use size_t sql/rpl_filter.h: Changed some string lengths to use size_t sql/rpl_injector.h: Removed some old types sql/rpl_record.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts sql/rpl_record.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/rpl_record_old.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/rpl_record_old.h: Removed some old types Changed some buffers to be uchar* to avoid cast sql/rpl_rli.cc: Removed some old types sql/rpl_tblmap.cc: Removed some old types sql/rpl_tblmap.h: Removed some old types sql/rpl_utility.cc: Removed some old types sql/rpl_utility.h: Removed some old types Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length sql/set_var.cc: Removed some old types Updated parameters to dirname_part() sql/set_var.h: Removed some old types sql/slave.cc: Removed some old types Changed some string lengths to use size_t sql/slave.h: Removed some old types sql/sp.cc: Removed some old types Added missing casts for printf() sql/sp.h: Removed some old types Updated hash-get-key function arguments sql/sp_cache.cc: Removed some old types Added missing casts for printf() Updated hash-get-key function arguments sql/sp_head.cc: Removed some old types Added missing casts for alloc() and printf() Added required casts Updated hash-get-key function arguments sql/sp_head.h: Removed some old types sql/sp_pcontext.cc: Removed some old types sql/sp_pcontext.h: Removed some old types sql/sql_acl.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added required casts sql/sql_analyse.cc: Changed some buffers to be uchar* to avoid casts sql/sql_analyse.h: Changed some buffers to be uchar* to avoid casts sql/sql_array.h: Removed some old types sql/sql_base.cc: Removed some old types Updated hash-get-key function arguments sql/sql_binlog.cc: Removed some old types Added missing casts for printf() sql/sql_cache.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts Changed some string lengths to use size_t sql/sql_cache.h: Removed some old types Removed reference to not existing function cache_key() Updated hash-get-key function arguments sql/sql_class.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() Updated hash-get-key function arguments Moved THD::max_row_length() to table.cc (as it's not depending on THD) Removed some not needed casts sql/sql_class.h: Removed some old types Changed malloc(), free() and related functions to use void * Removed some not needed casts Changed some string lengths to use size_t Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD sql/sql_connect.cc: Removed some old types Added required casts sql/sql_db.cc: Removed some old types Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety Added missing casts for alloc() sql/sql_delete.cc: Removed some old types sql/sql_handler.cc: Removed some old types Updated hash-get-key function arguments Added some cast to my_multi_malloc() arguments for safety sql/sql_help.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_insert.cc: Removed some old types Added missing casts for alloc() and printf() sql/sql_lex.cc: Removed some old types sql/sql_lex.h: Removed some old types Removed some not needed casts sql/sql_list.h: Removed some old types Removed some not needed casts sql/sql_load.cc: Removed some old types Removed compiler warning sql/sql_manager.cc: Removed some old types sql/sql_map.cc: Removed some old types sql/sql_map.h: Removed some old types sql/sql_olap.cc: Removed some old types sql/sql_parse.cc: Removed some old types Trivial move of code lines to make things more readable Changed some string lengths to use size_t Added missing casts for alloc() sql/sql_partition.cc: Removed some old types Removed compiler warnings about not used functions Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_partition.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_plugin.cc: Removed some old types Added missing casts for alloc() Updated hash-get-key function arguments sql/sql_prepare.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Added missing casts for alloc() and printf() sql-common/client.c: Removed some old types Changed some memory areas to use uchar* sql-common/my_user.c: Changed some string lengths to use size_t sql-common/pack.c: Changed some buffers to be uchar* to avoid casts sql/sql_repl.cc: Added required casts Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/sql_select.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some old types sql/sql_select.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_servers.cc: Removed some old types Updated hash-get-key function arguments sql/sql_show.cc: Removed some old types Added missing casts for alloc() Removed some not needed casts sql/sql_string.cc: Removed some old types Added required casts sql/sql_table.cc: Removed some old types Removed compiler warning about not used variable Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_test.cc: Removed some old types sql/sql_trigger.cc: Removed some old types Added missing casts for alloc() sql/sql_udf.cc: Removed some old types Updated hash-get-key function arguments sql/sql_union.cc: Removed some old types sql/sql_update.cc: Removed some old types Removed some not needed casts sql/sql_view.cc: Removed some old types sql/sql_yacc.yy: Removed some old types Changed some string lengths to use size_t Added missing casts for alloc() sql/stacktrace.c: Removed some old types sql/stacktrace.h: Removed some old types sql/structs.h: Removed some old types sql/table.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Removed setting of LEX_STRING() arguments in declaration Added required casts More function comments Moved max_row_length() here from sql_class.cc/sql_class.h sql/table.h: Removed some old types Changed some string lengths to use size_t sql/thr_malloc.cc: Use void* as type for allocated memory area Changed all functions to use size_t sql/tzfile.h: Changed some buffers to be uchar* to avoid casts sql/tztime.cc: Changed some buffers to be uchar* to avoid casts Updated hash-get-key function arguments Added missing casts for alloc() Removed some not needed casts sql/uniques.cc: Removed some old types Removed some not needed casts sql/unireg.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added missing casts for alloc() storage/archive/archive_reader.c: Removed some old types storage/archive/azio.c: Removed some old types Removed some not needed casts storage/archive/ha_archive.cc: Removed some old types Changed type for 'frmblob' in archive_discover() to match handler Updated hash-get-key function arguments Removed some not needed casts storage/archive/ha_archive.h: Removed some old types storage/blackhole/ha_blackhole.cc: Removed some old types storage/blackhole/ha_blackhole.h: Removed some old types storage/csv/ha_tina.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts storage/csv/ha_tina.h: Removed some old types Removed some not needed casts storage/csv/transparent_file.cc: Removed some old types Changed type of 'bytes_read' to be able to detect read errors Fixed indentation storage/csv/transparent_file.h: Removed some old types storage/example/ha_example.cc: Removed some old types Updated hash-get-key function arguments storage/example/ha_example.h: Removed some old types storage/federated/ha_federated.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts storage/federated/ha_federated.h: Removed some old types storage/heap/_check.c: Changed some buffers to be uchar* to avoid casts storage/heap/_rectest.c: Removed some old types storage/heap/ha_heap.cc: Removed some old types storage/heap/ha_heap.h: Removed some old types storage/heap/heapdef.h: Removed some old types storage/heap/hp_block.c: Removed some old types Changed some string lengths to use size_t storage/heap/hp_clear.c: Removed some old types storage/heap/hp_close.c: Removed some old types storage/heap/hp_create.c: Removed some old types storage/heap/hp_delete.c: Removed some old types storage/heap/hp_hash.c: Removed some old types storage/heap/hp_info.c: Removed some old types storage/heap/hp_open.c: Removed some old types storage/heap/hp_rfirst.c: Removed some old types storage/heap/hp_rkey.c: Removed some old types storage/heap/hp_rlast.c: Removed some old types storage/heap/hp_rnext.c: Removed some old types storage/heap/hp_rprev.c: Removed some old types storage/heap/hp_rrnd.c: Removed some old types storage/heap/hp_rsame.c: Removed some old types storage/heap/hp_scan.c: Removed some old types storage/heap/hp_test1.c: Removed some old types storage/heap/hp_test2.c: Removed some old types storage/heap/hp_update.c: Removed some old types storage/heap/hp_write.c: Removed some old types Changed some string lengths to use size_t storage/innobase/handler/ha_innodb.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() and printf() Removed some not needed casts storage/innobase/handler/ha_innodb.h: Removed some old types storage/myisam/ft_boolean_search.c: Removed some old types storage/myisam/ft_nlq_search.c: Removed some old types storage/myisam/ft_parser.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ft_static.c: Removed some old types storage/myisam/ft_stopwords.c: Removed some old types storage/myisam/ft_update.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ftdefs.h: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/fulltext.h: Removed some old types storage/myisam/ha_myisam.cc: Removed some old types storage/myisam/ha_myisam.h: Removed some old types storage/myisam/mi_cache.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_check.c: Removed some old types storage/myisam/mi_checksum.c: Removed some old types storage/myisam/mi_close.c: Removed some old types storage/myisam/mi_create.c: Removed some old types storage/myisam/mi_delete.c: Removed some old types storage/myisam/mi_delete_all.c: Removed some old types storage/myisam/mi_dynrec.c: Removed some old types storage/myisam/mi_extra.c: Removed some old types storage/myisam/mi_key.c: Removed some old types storage/myisam/mi_locking.c: Removed some old types storage/myisam/mi_log.c: Removed some old types storage/myisam/mi_open.c: Removed some old types Removed some not needed casts Check argument of my_write()/my_pwrite() in functions returning int Added casting of string lengths to size_t storage/myisam/mi_packrec.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_page.c: Removed some old types storage/myisam/mi_preload.c: Removed some old types storage/myisam/mi_range.c: Removed some old types storage/myisam/mi_rfirst.c: Removed some old types storage/myisam/mi_rkey.c: Removed some old types storage/myisam/mi_rlast.c: Removed some old types storage/myisam/mi_rnext.c: Removed some old types storage/myisam/mi_rnext_same.c: Removed some old types storage/myisam/mi_rprev.c: Removed some old types storage/myisam/mi_rrnd.c: Removed some old types storage/myisam/mi_rsame.c: Removed some old types storage/myisam/mi_rsamepos.c: Removed some old types storage/myisam/mi_scan.c: Removed some old types storage/myisam/mi_search.c: Removed some old types storage/myisam/mi_static.c: Removed some old types storage/myisam/mi_statrec.c: Removed some old types storage/myisam/mi_test1.c: Removed some old types storage/myisam/mi_test2.c: Removed some old types storage/myisam/mi_test3.c: Removed some old types storage/myisam/mi_unique.c: Removed some old types storage/myisam/mi_update.c: Removed some old types storage/myisam/mi_write.c: Removed some old types storage/myisam/myisam_ftdump.c: Removed some old types storage/myisam/myisamchk.c: Removed some old types storage/myisam/myisamdef.h: Removed some old types storage/myisam/myisamlog.c: Removed some old types Indentation fix storage/myisam/myisampack.c: Removed some old types storage/myisam/rt_index.c: Removed some old types storage/myisam/rt_split.c: Removed some old types storage/myisam/sort.c: Removed some old types storage/myisam/sp_defs.h: Removed some old types storage/myisam/sp_key.c: Removed some old types storage/myisammrg/ha_myisammrg.cc: Removed some old types storage/myisammrg/ha_myisammrg.h: Removed some old types storage/myisammrg/myrg_close.c: Removed some old types storage/myisammrg/myrg_def.h: Removed some old types storage/myisammrg/myrg_delete.c: Removed some old types storage/myisammrg/myrg_open.c: Removed some old types Updated parameters to dirname_part() storage/myisammrg/myrg_queue.c: Removed some old types storage/myisammrg/myrg_rfirst.c: Removed some old types storage/myisammrg/myrg_rkey.c: Removed some old types storage/myisammrg/myrg_rlast.c: Removed some old types storage/myisammrg/myrg_rnext.c: Removed some old types storage/myisammrg/myrg_rnext_same.c: Removed some old types storage/myisammrg/myrg_rprev.c: Removed some old types storage/myisammrg/myrg_rrnd.c: Removed some old types storage/myisammrg/myrg_rsame.c: Removed some old types storage/myisammrg/myrg_update.c: Removed some old types storage/myisammrg/myrg_write.c: Removed some old types storage/ndb/include/util/ndb_opts.h: Removed some old types storage/ndb/src/cw/cpcd/main.cpp: Removed some old types storage/ndb/src/kernel/vm/Configuration.cpp: Removed some old types storage/ndb/src/mgmclient/main.cpp: Removed some old types storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Removed some old types Removed old disabled code storage/ndb/src/mgmsrv/main.cpp: Removed some old types storage/ndb/src/ndbapi/NdbBlob.cpp: Removed some old types storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Added required casts storage/ndb/src/ndbapi/NdbScanOperation.cpp: Added required casts storage/ndb/tools/delete_all.cpp: Removed some old types storage/ndb/tools/desc.cpp: Removed some old types storage/ndb/tools/drop_index.cpp: Removed some old types storage/ndb/tools/drop_tab.cpp: Removed some old types storage/ndb/tools/listTables.cpp: Removed some old types storage/ndb/tools/ndb_config.cpp: Removed some old types storage/ndb/tools/restore/consumer_restore.cpp: Changed some buffers to be uchar* to avoid casts with new defintion of packfrm() storage/ndb/tools/restore/restore_main.cpp: Removed some old types storage/ndb/tools/select_all.cpp: Removed some old types storage/ndb/tools/select_count.cpp: Removed some old types storage/ndb/tools/waiter.cpp: Removed some old types strings/bchange.c: Changed function to use uchar * and size_t strings/bcmp.c: Changed function to use uchar * and size_t strings/bmove512.c: Changed function to use uchar * and size_t strings/bmove_upp.c: Changed function to use uchar * and size_t strings/ctype-big5.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-bin.c: Changed functions to use size_t strings/ctype-cp932.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-czech.c: Fixed indentation Changed functions to use size_t strings/ctype-euc_kr.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-eucjpms.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-gb2312.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-gbk.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-latin1.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-mb.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-simple.c: Changed functions to use size_t Simpler loops for caseup/casedown unsigned int -> uint unsigned char -> uchar strings/ctype-sjis.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-tis620.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-uca.c: Changed functions to use size_t unsigned char -> uchar strings/ctype-ucs2.c: Moved inclusion of stdarg.h to other includes usigned char -> uchar Changed functions to use size_t Changed character length functions to return uint strings/ctype-ujis.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-utf8.c: Changed functions to use size_t unsigned char -> uchar Indentation fixes strings/ctype-win1250ch.c: Indentation fixes Changed functions to use size_t strings/ctype.c: Changed functions to use size_t strings/decimal.c: Changed type for memory argument to uchar * strings/do_ctype.c: Indentation fixes strings/my_strtoll10.c: unsigned char -> uchar strings/my_vsnprintf.c: Changed functions to use size_t strings/r_strinstr.c: Removed some old types Changed functions to use size_t strings/str_test.c: Removed some old types strings/strappend.c: Changed functions to use size_t strings/strcont.c: Removed some old types strings/strfill.c: Removed some old types strings/strinstr.c: Changed functions to use size_t strings/strlen.c: Changed functions to use size_t strings/strmake.c: Changed functions to use size_t strings/strnlen.c: Changed functions to use size_t strings/strnmov.c: Changed functions to use size_t strings/strto.c: unsigned char -> uchar strings/strtod.c: Changed functions to use size_t strings/strxnmov.c: Changed functions to use size_t strings/xml.c: Changed functions to use size_t Indentation fixes tests/mysql_client_test.c: Removed some old types tests/thread_test.c: Removed some old types vio/test-ssl.c: Removed some old types vio/test-sslclient.c: Removed some old types vio/test-sslserver.c: Removed some old types vio/vio.c: Removed some old types vio/vio_priv.h: Removed some old types Changed vio_read()/vio_write() to work with size_t vio/viosocket.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viossl.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viosslfactories.c: Removed some old types vio/viotest-ssl.c: Removed some old types win/README: More explanations
999 lines
27 KiB
C++
999 lines
27 KiB
C++
/* Copyright (C) 2001-2006 MySQL AB & Sasha
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
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 "repl_failsafe.h"
|
|
#include "sql_repl.h"
|
|
#include "slave.h"
|
|
#include "rpl_mi.h"
|
|
#include "rpl_filter.h"
|
|
#include "log_event.h"
|
|
#include <mysql.h>
|
|
|
|
#define SLAVE_LIST_CHUNK 128
|
|
#define SLAVE_ERRMSG_SIZE (FN_REFLEN+64)
|
|
|
|
|
|
RPL_STATUS rpl_status=RPL_NULL;
|
|
pthread_mutex_t LOCK_rpl_status;
|
|
pthread_cond_t COND_rpl_status;
|
|
HASH slave_list;
|
|
|
|
const char *rpl_role_type[] = {"MASTER","SLAVE",NullS};
|
|
TYPELIB rpl_role_typelib = {array_elements(rpl_role_type)-1,"",
|
|
rpl_role_type, NULL};
|
|
|
|
const char* rpl_status_type[]=
|
|
{
|
|
"AUTH_MASTER","ACTIVE_SLAVE","IDLE_SLAVE", "LOST_SOLDIER","TROOP_SOLDIER",
|
|
"RECOVERY_CAPTAIN","NULL",NullS
|
|
};
|
|
TYPELIB rpl_status_typelib= {array_elements(rpl_status_type)-1,"",
|
|
rpl_status_type, NULL};
|
|
|
|
|
|
static Slave_log_event* find_slave_event(IO_CACHE* log,
|
|
const char* log_file_name,
|
|
char* errmsg);
|
|
|
|
/*
|
|
All of the functions defined in this file which are not used (the ones to
|
|
handle failsafe) are not used; their code has not been updated for more than
|
|
one year now so should be considered as BADLY BROKEN. Do not enable it.
|
|
The used functions (to handle LOAD DATA FROM MASTER, plus some small
|
|
functions like register_slave()) are working.
|
|
*/
|
|
|
|
#if NOT_USED
|
|
static int init_failsafe_rpl_thread(THD* thd)
|
|
{
|
|
DBUG_ENTER("init_failsafe_rpl_thread");
|
|
thd->system_thread = SYSTEM_THREAD_DELAYED_INSERT;
|
|
/*
|
|
thd->bootstrap is to report errors barely to stderr; if this code is
|
|
enable again one day, one should check if bootstrap is still needed (maybe
|
|
this thread has no other error reporting method).
|
|
*/
|
|
thd->bootstrap = 1;
|
|
thd->security_ctx->skip_grants();
|
|
my_net_init(&thd->net, 0);
|
|
thd->net.read_timeout = slave_net_timeout;
|
|
thd->max_client_packet_length=thd->net.max_packet;
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thd->thread_id= thd->variables.pseudo_thread_id= thread_id++;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
|
|
if (init_thr_lock() || thd->store_globals())
|
|
{
|
|
/* purecov: begin inspected */
|
|
close_connection(thd, ER_OUT_OF_RESOURCES, 1); // is this needed?
|
|
statistic_increment(aborted_connects,&LOCK_status);
|
|
one_thread_per_connection_end(thd,0);
|
|
DBUG_RETURN(-1);
|
|
/* purecov: end */
|
|
}
|
|
|
|
thd->mem_root->free= thd->mem_root->used= 0;
|
|
if (thd->variables.max_join_size == HA_POS_ERROR)
|
|
thd->options|= OPTION_BIG_SELECTS;
|
|
|
|
thd->proc_info="Thread initialized";
|
|
thd->version=refresh_version;
|
|
thd->set_time();
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif
|
|
|
|
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status)
|
|
{
|
|
pthread_mutex_lock(&LOCK_rpl_status);
|
|
if (rpl_status == from_status || rpl_status == RPL_ANY)
|
|
rpl_status = to_status;
|
|
pthread_cond_signal(&COND_rpl_status);
|
|
pthread_mutex_unlock(&LOCK_rpl_status);
|
|
}
|
|
|
|
|
|
#define get_object(p, obj) \
|
|
{\
|
|
uint len = (uint)*p++; \
|
|
if (p + len > p_end || len >= sizeof(obj)) \
|
|
goto err; \
|
|
strmake(obj,(char*) p,len); \
|
|
p+= len; \
|
|
}\
|
|
|
|
|
|
static inline int cmp_master_pos(Slave_log_event* sev, LEX_MASTER_INFO* mi)
|
|
{
|
|
return cmp_master_pos(sev->master_log, sev->master_pos, mi->log_file_name,
|
|
mi->pos);
|
|
}
|
|
|
|
|
|
void unregister_slave(THD* thd, bool only_mine, bool need_mutex)
|
|
{
|
|
if (thd->server_id)
|
|
{
|
|
if (need_mutex)
|
|
pthread_mutex_lock(&LOCK_slave_list);
|
|
|
|
SLAVE_INFO* old_si;
|
|
if ((old_si = (SLAVE_INFO*)hash_search(&slave_list,
|
|
(uchar*)&thd->server_id, 4)) &&
|
|
(!only_mine || old_si->thd == thd))
|
|
hash_delete(&slave_list, (uchar*)old_si);
|
|
|
|
if (need_mutex)
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Register slave in 'slave_list' hash table
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 Error. Error message sent to client
|
|
*/
|
|
|
|
int register_slave(THD* thd, uchar* packet, uint packet_length)
|
|
{
|
|
int res;
|
|
SLAVE_INFO *si;
|
|
uchar *p= packet, *p_end= packet + packet_length;
|
|
|
|
if (check_access(thd, REPL_SLAVE_ACL, any_db,0,0,0,0))
|
|
return 1;
|
|
if (!(si = (SLAVE_INFO*)my_malloc(sizeof(SLAVE_INFO), MYF(MY_WME))))
|
|
goto err2;
|
|
|
|
thd->server_id= si->server_id= uint4korr(p);
|
|
p+= 4;
|
|
get_object(p,si->host);
|
|
get_object(p,si->user);
|
|
get_object(p,si->password);
|
|
if (p+10 > p_end)
|
|
goto err;
|
|
si->port= uint2korr(p);
|
|
p += 2;
|
|
si->rpl_recovery_rank= uint4korr(p);
|
|
p += 4;
|
|
if (!(si->master_id= uint4korr(p)))
|
|
si->master_id= server_id;
|
|
si->thd= thd;
|
|
|
|
pthread_mutex_lock(&LOCK_slave_list);
|
|
unregister_slave(thd,0,0);
|
|
res= my_hash_insert(&slave_list, (uchar*) si);
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
return res;
|
|
|
|
err:
|
|
my_free(si, MYF(MY_WME));
|
|
my_message(ER_UNKNOWN_ERROR, "Wrong parameters to function register_slave",
|
|
MYF(0));
|
|
err2:
|
|
return 1;
|
|
}
|
|
|
|
extern "C" uint32
|
|
*slave_list_key(SLAVE_INFO* si, size_t *len,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
*len = 4;
|
|
return &si->server_id;
|
|
}
|
|
|
|
extern "C" void slave_info_free(void *s)
|
|
{
|
|
my_free(s, MYF(MY_WME));
|
|
}
|
|
|
|
void init_slave_list()
|
|
{
|
|
hash_init(&slave_list, system_charset_info, SLAVE_LIST_CHUNK, 0, 0,
|
|
(hash_get_key) slave_list_key, (hash_free_key) slave_info_free, 0);
|
|
pthread_mutex_init(&LOCK_slave_list, MY_MUTEX_INIT_FAST);
|
|
}
|
|
|
|
void end_slave_list()
|
|
{
|
|
/* No protection by a mutex needed as we are only called at shutdown */
|
|
if (hash_inited(&slave_list))
|
|
{
|
|
hash_free(&slave_list);
|
|
pthread_mutex_destroy(&LOCK_slave_list);
|
|
}
|
|
}
|
|
|
|
static int find_target_pos(LEX_MASTER_INFO *mi, IO_CACHE *log, char *errmsg)
|
|
{
|
|
my_off_t log_pos = (my_off_t) mi->pos;
|
|
uint32 target_server_id = mi->server_id;
|
|
|
|
for (;;)
|
|
{
|
|
Log_event* ev;
|
|
if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*) 0, 0)))
|
|
{
|
|
if (log->error > 0)
|
|
strmov(errmsg, "Binary log truncated in the middle of event");
|
|
else if (log->error < 0)
|
|
strmov(errmsg, "I/O error reading binary log");
|
|
else
|
|
strmov(errmsg, "Could not find target event in the binary log");
|
|
return 1;
|
|
}
|
|
|
|
if (ev->log_pos >= log_pos && ev->server_id == target_server_id)
|
|
{
|
|
delete ev;
|
|
mi->pos = my_b_tell(log);
|
|
return 0;
|
|
}
|
|
delete ev;
|
|
}
|
|
/* Impossible */
|
|
}
|
|
|
|
/*
|
|
Before 4.0.15 we had a member of THD called log_pos, it was meant for
|
|
failsafe replication code in repl_failsafe.cc which is disabled until
|
|
it is reworked. Event's log_pos used to be preserved through
|
|
log-slave-updates to make code in repl_failsafe.cc work (this
|
|
function, SHOW NEW MASTER); but on the other side it caused unexpected
|
|
values in Exec_Master_Log_Pos in A->B->C replication setup,
|
|
synchronization problems in master_pos_wait(), ... So we
|
|
(Dmitri & Guilhem) removed it.
|
|
|
|
So for now this function is broken.
|
|
*/
|
|
|
|
int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg)
|
|
{
|
|
LOG_INFO linfo;
|
|
char last_log_name[FN_REFLEN];
|
|
IO_CACHE log;
|
|
File file = -1, last_file = -1;
|
|
pthread_mutex_t *log_lock;
|
|
const char* errmsg_p;
|
|
Slave_log_event* sev = 0;
|
|
my_off_t last_pos = 0;
|
|
int error = 1;
|
|
int cmp_res;
|
|
LINT_INIT(cmp_res);
|
|
DBUG_ENTER("translate_master");
|
|
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
strmov(errmsg,"Binary log is not open");
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (!server_id_supplied)
|
|
{
|
|
strmov(errmsg, "Misconfigured master - server id was not set");
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (mysql_bin_log.find_log_pos(&linfo, NullS, 1))
|
|
{
|
|
strmov(errmsg,"Could not find first log");
|
|
DBUG_RETURN(1);
|
|
}
|
|
thd->current_linfo = &linfo;
|
|
|
|
bzero((char*) &log,sizeof(log));
|
|
log_lock = mysql_bin_log.get_log_lock();
|
|
pthread_mutex_lock(log_lock);
|
|
|
|
for (;;)
|
|
{
|
|
if ((file=open_binlog(&log, linfo.log_file_name, &errmsg_p)) < 0)
|
|
{
|
|
strmov(errmsg, errmsg_p);
|
|
goto err;
|
|
}
|
|
|
|
if (!(sev = find_slave_event(&log, linfo.log_file_name, errmsg)))
|
|
goto err;
|
|
|
|
cmp_res = cmp_master_pos(sev, mi);
|
|
delete sev;
|
|
|
|
if (!cmp_res)
|
|
{
|
|
/* Copy basename */
|
|
fn_format(mi->log_file_name, linfo.log_file_name, "","",1);
|
|
mi->pos = my_b_tell(&log);
|
|
goto mi_inited;
|
|
}
|
|
else if (cmp_res > 0)
|
|
{
|
|
if (!last_pos)
|
|
{
|
|
strmov(errmsg,
|
|
"Slave event in first log points past the target position");
|
|
goto err;
|
|
}
|
|
end_io_cache(&log);
|
|
(void) my_close(file, MYF(MY_WME));
|
|
if (init_io_cache(&log, (file = last_file), IO_SIZE, READ_CACHE, 0, 0,
|
|
MYF(MY_WME)))
|
|
{
|
|
errmsg[0] = 0;
|
|
goto err;
|
|
}
|
|
break;
|
|
}
|
|
|
|
strmov(last_log_name, linfo.log_file_name);
|
|
last_pos = my_b_tell(&log);
|
|
|
|
switch (mysql_bin_log.find_next_log(&linfo, 1)) {
|
|
case LOG_INFO_EOF:
|
|
if (last_file >= 0)
|
|
(void)my_close(last_file, MYF(MY_WME));
|
|
last_file = -1;
|
|
goto found_log;
|
|
case 0:
|
|
break;
|
|
default:
|
|
strmov(errmsg, "Error reading log index");
|
|
goto err;
|
|
}
|
|
|
|
end_io_cache(&log);
|
|
if (last_file >= 0)
|
|
(void) my_close(last_file, MYF(MY_WME));
|
|
last_file = file;
|
|
}
|
|
|
|
found_log:
|
|
my_b_seek(&log, last_pos);
|
|
if (find_target_pos(mi,&log,errmsg))
|
|
goto err;
|
|
fn_format(mi->log_file_name, last_log_name, "","",1); /* Copy basename */
|
|
|
|
mi_inited:
|
|
error = 0;
|
|
err:
|
|
pthread_mutex_unlock(log_lock);
|
|
end_io_cache(&log);
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thd->current_linfo = 0;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
if (file >= 0)
|
|
(void) my_close(file, MYF(MY_WME));
|
|
if (last_file >= 0 && last_file != file)
|
|
(void) my_close(last_file, MYF(MY_WME));
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Caller must delete result when done
|
|
*/
|
|
|
|
static Slave_log_event* find_slave_event(IO_CACHE* log,
|
|
const char* log_file_name,
|
|
char* errmsg)
|
|
{
|
|
Log_event* ev;
|
|
int i;
|
|
bool slave_event_found = 0;
|
|
LINT_INIT(ev);
|
|
|
|
for (i = 0; i < 2; i++)
|
|
{
|
|
if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*)0, 0)))
|
|
{
|
|
my_snprintf(errmsg, SLAVE_ERRMSG_SIZE,
|
|
"Error reading event in log '%s'",
|
|
(char*)log_file_name);
|
|
return 0;
|
|
}
|
|
if (ev->get_type_code() == SLAVE_EVENT)
|
|
{
|
|
slave_event_found = 1;
|
|
break;
|
|
}
|
|
delete ev;
|
|
}
|
|
if (!slave_event_found)
|
|
{
|
|
my_snprintf(errmsg, SLAVE_ERRMSG_SIZE,
|
|
"Could not find slave event in log '%s'",
|
|
(char*)log_file_name);
|
|
return 0;
|
|
}
|
|
|
|
return (Slave_log_event*)ev;
|
|
}
|
|
|
|
/*
|
|
This function is broken now. See comment for translate_master().
|
|
*/
|
|
|
|
bool show_new_master(THD* thd)
|
|
{
|
|
Protocol *protocol= thd->protocol;
|
|
DBUG_ENTER("show_new_master");
|
|
List<Item> field_list;
|
|
char errmsg[SLAVE_ERRMSG_SIZE];
|
|
LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
|
|
|
|
errmsg[0]=0; // Safety
|
|
if (translate_master(thd, lex_mi, errmsg))
|
|
{
|
|
if (errmsg[0])
|
|
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
|
|
"SHOW NEW MASTER", errmsg);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
else
|
|
{
|
|
field_list.push_back(new Item_empty_string("Log_name", 20));
|
|
field_list.push_back(new Item_return_int("Log_pos", 10,
|
|
MYSQL_TYPE_LONGLONG));
|
|
if (protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
protocol->prepare_for_resend();
|
|
protocol->store(lex_mi->log_file_name, &my_charset_bin);
|
|
protocol->store((ulonglong) lex_mi->pos);
|
|
if (protocol->write())
|
|
DBUG_RETURN(TRUE);
|
|
send_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
}
|
|
|
|
/*
|
|
Asks the master for the list of its other connected slaves.
|
|
This is for failsafe replication:
|
|
in order for failsafe replication to work, the servers involved in
|
|
replication must know of each other. We accomplish this by having each
|
|
slave report to the master how to reach it, and on connection, each
|
|
slave receives information about where the other slaves are.
|
|
|
|
SYNOPSIS
|
|
update_slave_list()
|
|
mysql pre-existing connection to the master
|
|
mi master info
|
|
|
|
NOTES
|
|
mi is used only to give detailed error messages which include the
|
|
hostname/port of the master, the username used by the slave to connect to
|
|
the master.
|
|
If the user used by the slave to connect to the master does not have the
|
|
REPLICATION SLAVE privilege, it will pop in this function because
|
|
SHOW SLAVE HOSTS will fail on the master.
|
|
|
|
RETURN VALUES
|
|
1 error
|
|
0 success
|
|
*/
|
|
|
|
int update_slave_list(MYSQL* mysql, MASTER_INFO* mi)
|
|
{
|
|
MYSQL_RES* res=0;
|
|
MYSQL_ROW row;
|
|
const char* error=0;
|
|
bool have_auth_info;
|
|
int port_ind;
|
|
DBUG_ENTER("update_slave_list");
|
|
|
|
if (mysql_real_query(mysql, STRING_WITH_LEN("SHOW SLAVE HOSTS")) ||
|
|
!(res = mysql_store_result(mysql)))
|
|
{
|
|
error= mysql_error(mysql);
|
|
goto err;
|
|
}
|
|
|
|
switch (mysql_num_fields(res)) {
|
|
case 5:
|
|
have_auth_info = 0;
|
|
port_ind=2;
|
|
break;
|
|
case 7:
|
|
have_auth_info = 1;
|
|
port_ind=4;
|
|
break;
|
|
default:
|
|
error= "the master returned an invalid number of fields for SHOW SLAVE \
|
|
HOSTS";
|
|
goto err;
|
|
}
|
|
|
|
pthread_mutex_lock(&LOCK_slave_list);
|
|
|
|
while ((row= mysql_fetch_row(res)))
|
|
{
|
|
uint32 log_server_id;
|
|
SLAVE_INFO* si, *old_si;
|
|
log_server_id = atoi(row[0]);
|
|
if ((old_si= (SLAVE_INFO*)hash_search(&slave_list,
|
|
(uchar*)&log_server_id,4)))
|
|
si = old_si;
|
|
else
|
|
{
|
|
if (!(si = (SLAVE_INFO*)my_malloc(sizeof(SLAVE_INFO), MYF(MY_WME))))
|
|
{
|
|
error= "the slave is out of memory";
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
goto err;
|
|
}
|
|
si->server_id = log_server_id;
|
|
my_hash_insert(&slave_list, (uchar*)si);
|
|
}
|
|
strmake(si->host, row[1], sizeof(si->host)-1);
|
|
si->port = atoi(row[port_ind]);
|
|
si->rpl_recovery_rank = atoi(row[port_ind+1]);
|
|
si->master_id = atoi(row[port_ind+2]);
|
|
if (have_auth_info)
|
|
{
|
|
strmake(si->user, row[2], sizeof(si->user)-1);
|
|
strmake(si->password, row[3], sizeof(si->password)-1);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
|
|
err:
|
|
if (res)
|
|
mysql_free_result(res);
|
|
if (error)
|
|
{
|
|
sql_print_error("While trying to obtain the list of slaves from the master "
|
|
"'%s:%d', user '%s' got the following error: '%s'",
|
|
mi->host, mi->port, mi->user, error);
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
#if NOT_USED
|
|
int find_recovery_captain(THD* thd, MYSQL* mysql)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#if NOT_USED
|
|
pthread_handler_t handle_failsafe_rpl(void *arg)
|
|
{
|
|
DBUG_ENTER("handle_failsafe_rpl");
|
|
THD *thd = new THD;
|
|
thd->thread_stack = (char*)&thd;
|
|
MYSQL* recovery_captain = 0;
|
|
const char* msg;
|
|
|
|
pthread_detach_this_thread();
|
|
if (init_failsafe_rpl_thread(thd) || !(recovery_captain=mysql_init(0)))
|
|
{
|
|
sql_print_error("Could not initialize failsafe replication thread");
|
|
goto err;
|
|
}
|
|
pthread_mutex_lock(&LOCK_rpl_status);
|
|
msg= thd->enter_cond(&COND_rpl_status,
|
|
&LOCK_rpl_status, "Waiting for request");
|
|
while (!thd->killed && !abort_loop)
|
|
{
|
|
bool break_req_chain = 0;
|
|
pthread_cond_wait(&COND_rpl_status, &LOCK_rpl_status);
|
|
thd->proc_info="Processing request";
|
|
while (!break_req_chain)
|
|
{
|
|
switch (rpl_status) {
|
|
case RPL_LOST_SOLDIER:
|
|
if (find_recovery_captain(thd, recovery_captain))
|
|
rpl_status=RPL_TROOP_SOLDIER;
|
|
else
|
|
rpl_status=RPL_RECOVERY_CAPTAIN;
|
|
break_req_chain=1; /* for now until other states are implemented */
|
|
break;
|
|
default:
|
|
break_req_chain=1;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
thd->exit_cond(msg);
|
|
err:
|
|
if (recovery_captain)
|
|
mysql_close(recovery_captain);
|
|
delete thd;
|
|
my_thread_end();
|
|
pthread_exit(0);
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif
|
|
|
|
bool show_slave_hosts(THD* thd)
|
|
{
|
|
List<Item> field_list;
|
|
Protocol *protocol= thd->protocol;
|
|
DBUG_ENTER("show_slave_hosts");
|
|
|
|
field_list.push_back(new Item_return_int("Server_id", 10,
|
|
MYSQL_TYPE_LONG));
|
|
field_list.push_back(new Item_empty_string("Host", 20));
|
|
if (opt_show_slave_auth_info)
|
|
{
|
|
field_list.push_back(new Item_empty_string("User",20));
|
|
field_list.push_back(new Item_empty_string("Password",20));
|
|
}
|
|
field_list.push_back(new Item_return_int("Port", 7, MYSQL_TYPE_LONG));
|
|
field_list.push_back(new Item_return_int("Rpl_recovery_rank", 7,
|
|
MYSQL_TYPE_LONG));
|
|
field_list.push_back(new Item_return_int("Master_id", 10,
|
|
MYSQL_TYPE_LONG));
|
|
|
|
if (protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
pthread_mutex_lock(&LOCK_slave_list);
|
|
|
|
for (uint i = 0; i < slave_list.records; ++i)
|
|
{
|
|
SLAVE_INFO* si = (SLAVE_INFO*) hash_element(&slave_list, i);
|
|
protocol->prepare_for_resend();
|
|
protocol->store((uint32) si->server_id);
|
|
protocol->store(si->host, &my_charset_bin);
|
|
if (opt_show_slave_auth_info)
|
|
{
|
|
protocol->store(si->user, &my_charset_bin);
|
|
protocol->store(si->password, &my_charset_bin);
|
|
}
|
|
protocol->store((uint32) si->port);
|
|
protocol->store((uint32) si->rpl_recovery_rank);
|
|
protocol->store((uint32) si->master_id);
|
|
if (protocol->write())
|
|
{
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_slave_list);
|
|
send_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi)
|
|
{
|
|
DBUG_ENTER("connect_to_master");
|
|
|
|
if (!mi->host || !*mi->host) /* empty host */
|
|
{
|
|
strmov(mysql->net.last_error, "Master is not configured");
|
|
DBUG_RETURN(1);
|
|
}
|
|
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
|
|
mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
if (mi->ssl)
|
|
{
|
|
mysql_ssl_set(mysql,
|
|
mi->ssl_key[0]?mi->ssl_key:0,
|
|
mi->ssl_cert[0]?mi->ssl_cert:0,
|
|
mi->ssl_ca[0]?mi->ssl_ca:0,
|
|
mi->ssl_capath[0]?mi->ssl_capath:0,
|
|
mi->ssl_cipher[0]?mi->ssl_cipher:0);
|
|
mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
|
|
&mi->ssl_verify_server_cert);
|
|
}
|
|
#endif
|
|
|
|
mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
|
|
mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
|
|
if (!mysql_real_connect(mysql, mi->host, mi->user, mi->password, 0,
|
|
mi->port, 0, 0))
|
|
DBUG_RETURN(1);
|
|
mysql->reconnect= 1;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
static inline void cleanup_mysql_results(MYSQL_RES* db_res,
|
|
MYSQL_RES** cur, MYSQL_RES** start)
|
|
{
|
|
for (; cur >= start; --cur)
|
|
{
|
|
if (*cur)
|
|
mysql_free_result(*cur);
|
|
}
|
|
mysql_free_result(db_res);
|
|
}
|
|
|
|
|
|
static int fetch_db_tables(THD *thd, MYSQL *mysql, const char *db,
|
|
MYSQL_RES *table_res, MASTER_INFO *mi)
|
|
{
|
|
MYSQL_ROW row;
|
|
for (row = mysql_fetch_row(table_res); row;
|
|
row = mysql_fetch_row(table_res))
|
|
{
|
|
TABLE_LIST table;
|
|
const char* table_name= row[0];
|
|
int error;
|
|
if (rpl_filter->is_on())
|
|
{
|
|
bzero((char*) &table, sizeof(table)); //just for safe
|
|
table.db= (char*) db;
|
|
table.table_name= (char*) table_name;
|
|
table.updating= 1;
|
|
|
|
if (!rpl_filter->tables_ok(thd->db, &table))
|
|
continue;
|
|
}
|
|
/* download master's table and overwrite slave's table */
|
|
if ((error= fetch_master_table(thd, db, table_name, mi, mysql, 1)))
|
|
return error;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Load all MyISAM tables from master to this slave.
|
|
|
|
REQUIREMENTS
|
|
- No active transaction (flush_relay_log_info would not work in this case)
|
|
*/
|
|
|
|
bool load_master_data(THD* thd)
|
|
{
|
|
MYSQL mysql;
|
|
MYSQL_RES* master_status_res = 0;
|
|
int error = 0;
|
|
const char* errmsg=0;
|
|
int restart_thread_mask;
|
|
HA_CREATE_INFO create_info;
|
|
|
|
mysql_init(&mysql);
|
|
|
|
/*
|
|
We do not want anyone messing with the slave at all for the entire
|
|
duration of the data load.
|
|
*/
|
|
pthread_mutex_lock(&LOCK_active_mi);
|
|
lock_slave_threads(active_mi);
|
|
init_thread_mask(&restart_thread_mask,active_mi,0 /*not inverse*/);
|
|
if (restart_thread_mask &&
|
|
(error=terminate_slave_threads(active_mi,restart_thread_mask,
|
|
1 /*skip lock*/)))
|
|
{
|
|
my_message(error, ER(error), MYF(0));
|
|
unlock_slave_threads(active_mi);
|
|
pthread_mutex_unlock(&LOCK_active_mi);
|
|
return TRUE;
|
|
}
|
|
|
|
if (connect_to_master(thd, &mysql, active_mi))
|
|
{
|
|
my_error(error= ER_CONNECT_TO_MASTER, MYF(0), mysql_error(&mysql));
|
|
goto err;
|
|
}
|
|
|
|
// now that we are connected, get all database and tables in each
|
|
{
|
|
MYSQL_RES *db_res, **table_res, **table_res_end, **cur_table_res;
|
|
uint num_dbs;
|
|
|
|
if (mysql_real_query(&mysql, STRING_WITH_LEN("SHOW DATABASES")) ||
|
|
!(db_res = mysql_store_result(&mysql)))
|
|
{
|
|
my_error(error= ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql));
|
|
goto err;
|
|
}
|
|
|
|
if (!(num_dbs = (uint) mysql_num_rows(db_res)))
|
|
goto err;
|
|
/*
|
|
In theory, the master could have no databases at all
|
|
and run with skip-grant
|
|
*/
|
|
|
|
if (!(table_res = (MYSQL_RES**)thd->alloc(num_dbs * sizeof(MYSQL_RES*))))
|
|
{
|
|
my_message(error = ER_OUTOFMEMORY, ER(ER_OUTOFMEMORY), MYF(0));
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
This is a temporary solution until we have online backup
|
|
capabilities - to be replaced once online backup is working
|
|
we wait to issue FLUSH TABLES WITH READ LOCK for as long as we
|
|
can to minimize the lock time.
|
|
*/
|
|
if (mysql_real_query(&mysql,
|
|
STRING_WITH_LEN("FLUSH TABLES WITH READ LOCK")) ||
|
|
mysql_real_query(&mysql, STRING_WITH_LEN("SHOW MASTER STATUS")) ||
|
|
!(master_status_res = mysql_store_result(&mysql)))
|
|
{
|
|
my_error(error= ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql));
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
Go through every table in every database, and if the replication
|
|
rules allow replicating it, get it
|
|
*/
|
|
|
|
table_res_end = table_res + num_dbs;
|
|
|
|
for (cur_table_res = table_res; cur_table_res < table_res_end;
|
|
cur_table_res++)
|
|
{
|
|
// since we know how many rows we have, this can never be NULL
|
|
MYSQL_ROW row = mysql_fetch_row(db_res);
|
|
char* db = row[0];
|
|
|
|
/*
|
|
Do not replicate databases excluded by rules. We also test
|
|
replicate_wild_*_table rules (replicate_wild_ignore_table='db1.%' will
|
|
be considered as "ignore the 'db1' database as a whole, as it already
|
|
works for CREATE DATABASE and DROP DATABASE).
|
|
Also skip 'mysql' database - in most cases the user will
|
|
mess up and not exclude mysql database with the rules when
|
|
he actually means to - in this case, he is up for a surprise if
|
|
his priv tables get dropped and downloaded from master
|
|
TODO - add special option, not enabled
|
|
by default, to allow inclusion of mysql database into load
|
|
data from master
|
|
*/
|
|
|
|
if (!rpl_filter->db_ok(db) ||
|
|
!rpl_filter->db_ok_with_wild_table(db) ||
|
|
!strcmp(db,"mysql") ||
|
|
is_schema_db(db))
|
|
{
|
|
*cur_table_res = 0;
|
|
continue;
|
|
}
|
|
|
|
bzero((char*) &create_info, sizeof(create_info));
|
|
create_info.options= HA_LEX_CREATE_IF_NOT_EXISTS;
|
|
|
|
if (mysql_create_db(thd, db, &create_info, 1))
|
|
{
|
|
cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
|
|
goto err;
|
|
}
|
|
|
|
if (mysql_select_db(&mysql, db) ||
|
|
mysql_real_query(&mysql, STRING_WITH_LEN("SHOW TABLES")) ||
|
|
!(*cur_table_res = mysql_store_result(&mysql)))
|
|
{
|
|
my_error(error= ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql));
|
|
cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
|
|
goto err;
|
|
}
|
|
|
|
if ((error = fetch_db_tables(thd,&mysql,db,*cur_table_res,active_mi)))
|
|
{
|
|
// we do not report the error - fetch_db_tables handles it
|
|
cleanup_mysql_results(db_res, cur_table_res, table_res);
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
|
|
|
|
// adjust replication coordinates from the master
|
|
if (master_status_res)
|
|
{
|
|
MYSQL_ROW row = mysql_fetch_row(master_status_res);
|
|
|
|
/*
|
|
We need this check because the master may not be running with
|
|
log-bin, but it will still allow us to do all the steps
|
|
of LOAD DATA FROM MASTER - no reason to forbid it, really,
|
|
although it does not make much sense for the user to do it
|
|
*/
|
|
if (row && row[0] && row[1])
|
|
{
|
|
/*
|
|
If the slave's master info is not inited, we init it, then we write
|
|
the new coordinates to it. Must call init_master_info() *before*
|
|
setting active_mi, because init_master_info() sets active_mi with
|
|
defaults.
|
|
*/
|
|
int error_2;
|
|
|
|
if (init_master_info(active_mi, master_info_file, relay_log_info_file,
|
|
0, (SLAVE_IO | SLAVE_SQL)))
|
|
my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
|
|
strmake(active_mi->master_log_name, row[0],
|
|
sizeof(active_mi->master_log_name));
|
|
active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error_2);
|
|
/* at least in recent versions, the condition below should be false */
|
|
if (active_mi->master_log_pos < BIN_LOG_HEADER_SIZE)
|
|
active_mi->master_log_pos = BIN_LOG_HEADER_SIZE;
|
|
/*
|
|
Relay log's IO_CACHE may not be inited (even if we are sure that some
|
|
host was specified; there could have been a problem when replication
|
|
started, which led to relay log's IO_CACHE to not be inited.
|
|
*/
|
|
if (flush_master_info(active_mi, 0))
|
|
sql_print_error("Failed to flush master info file");
|
|
}
|
|
mysql_free_result(master_status_res);
|
|
}
|
|
|
|
if (mysql_real_query(&mysql, STRING_WITH_LEN("UNLOCK TABLES")))
|
|
{
|
|
my_error(error= ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql));
|
|
goto err;
|
|
}
|
|
}
|
|
thd->proc_info="purging old relay logs";
|
|
if (purge_relay_logs(&active_mi->rli,thd,
|
|
0 /* not only reset, but also reinit */,
|
|
&errmsg))
|
|
{
|
|
my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg);
|
|
unlock_slave_threads(active_mi);
|
|
pthread_mutex_unlock(&LOCK_active_mi);
|
|
return TRUE;
|
|
}
|
|
pthread_mutex_lock(&active_mi->rli.data_lock);
|
|
active_mi->rli.group_master_log_pos = active_mi->master_log_pos;
|
|
strmake(active_mi->rli.group_master_log_name,active_mi->master_log_name,
|
|
sizeof(active_mi->rli.group_master_log_name)-1);
|
|
/*
|
|
Cancel the previous START SLAVE UNTIL, as the fact to download
|
|
a new copy logically makes UNTIL irrelevant.
|
|
*/
|
|
active_mi->rli.clear_until_condition();
|
|
|
|
/*
|
|
No need to update rli.event* coordinates, they will be when the slave
|
|
threads start ; only rli.group* coordinates are necessary here.
|
|
*/
|
|
flush_relay_log_info(&active_mi->rli);
|
|
pthread_cond_broadcast(&active_mi->rli.data_cond);
|
|
pthread_mutex_unlock(&active_mi->rli.data_lock);
|
|
thd->proc_info = "starting slave";
|
|
if (restart_thread_mask)
|
|
{
|
|
error=start_slave_threads(0 /* mutex not needed */,
|
|
1 /* wait for start */,
|
|
active_mi,master_info_file,relay_log_info_file,
|
|
restart_thread_mask);
|
|
}
|
|
|
|
err:
|
|
unlock_slave_threads(active_mi);
|
|
pthread_mutex_unlock(&LOCK_active_mi);
|
|
thd->proc_info = 0;
|
|
|
|
mysql_close(&mysql); // safe to call since we always do mysql_init()
|
|
if (!error)
|
|
send_ok(thd);
|
|
|
|
return error;
|
|
}
|
|
|
|
#endif /* HAVE_REPLICATION */
|
|
|