mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +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
1614 lines
47 KiB
C++
1614 lines
47 KiB
C++
/* Copyright (C) 2000-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 "rpl_mi.h"
|
|
#include "sql_repl.h"
|
|
#include "log_event.h"
|
|
#include "rpl_filter.h"
|
|
#include <my_dir.h>
|
|
|
|
int max_binlog_dump_events = 0; // unlimited
|
|
my_bool opt_sporadic_binlog_dump_fail = 0;
|
|
#ifndef DBUG_OFF
|
|
static int binlog_dump_count = 0;
|
|
#endif
|
|
|
|
/*
|
|
fake_rotate_event() builds a fake (=which does not exist physically in any
|
|
binlog) Rotate event, which contains the name of the binlog we are going to
|
|
send to the slave (because the slave may not know it if it just asked for
|
|
MASTER_LOG_FILE='', MASTER_LOG_POS=4).
|
|
< 4.0.14, fake_rotate_event() was called only if the requested pos was 4.
|
|
After this version we always call it, so that a 3.23.58 slave can rely on
|
|
it to detect if the master is 4.0 (and stop) (the _fake_ Rotate event has
|
|
zeros in the good positions which, by chance, make it possible for the 3.23
|
|
slave to detect that this event is unexpected) (this is luck which happens
|
|
because the master and slave disagree on the size of the header of
|
|
Log_event).
|
|
|
|
Relying on the event length of the Rotate event instead of these
|
|
well-placed zeros was not possible as Rotate events have a variable-length
|
|
part.
|
|
*/
|
|
|
|
static int fake_rotate_event(NET* net, String* packet, char* log_file_name,
|
|
ulonglong position, const char** errmsg)
|
|
{
|
|
DBUG_ENTER("fake_rotate_event");
|
|
char header[LOG_EVENT_HEADER_LEN], buf[ROTATE_HEADER_LEN+100];
|
|
/*
|
|
'when' (the timestamp) is set to 0 so that slave could distinguish between
|
|
real and fake Rotate events (if necessary)
|
|
*/
|
|
memset(header, 0, 4);
|
|
header[EVENT_TYPE_OFFSET] = ROTATE_EVENT;
|
|
|
|
char* p = log_file_name+dirname_length(log_file_name);
|
|
uint ident_len = (uint) strlen(p);
|
|
ulong event_len = ident_len + LOG_EVENT_HEADER_LEN + ROTATE_HEADER_LEN;
|
|
int4store(header + SERVER_ID_OFFSET, server_id);
|
|
int4store(header + EVENT_LEN_OFFSET, event_len);
|
|
int2store(header + FLAGS_OFFSET, 0);
|
|
|
|
// TODO: check what problems this may cause and fix them
|
|
int4store(header + LOG_POS_OFFSET, 0);
|
|
|
|
packet->append(header, sizeof(header));
|
|
int8store(buf+R_POS_OFFSET,position);
|
|
packet->append(buf, ROTATE_HEADER_LEN);
|
|
packet->append(p,ident_len);
|
|
if (my_net_write(net, (uchar*) packet->ptr(), packet->length()))
|
|
{
|
|
*errmsg = "failed on my_net_write()";
|
|
DBUG_RETURN(-1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
static int send_file(THD *thd)
|
|
{
|
|
NET* net = &thd->net;
|
|
int fd = -1, error = 1;
|
|
size_t bytes;
|
|
char fname[FN_REFLEN+1];
|
|
const char *errmsg = 0;
|
|
int old_timeout;
|
|
unsigned long packet_len;
|
|
uchar buf[IO_SIZE]; // It's safe to alloc this
|
|
DBUG_ENTER("send_file");
|
|
|
|
/*
|
|
The client might be slow loading the data, give him wait_timeout to do
|
|
the job
|
|
*/
|
|
old_timeout= net->read_timeout;
|
|
net_set_read_timeout(net, thd->variables.net_wait_timeout);
|
|
|
|
/*
|
|
We need net_flush here because the client will not know it needs to send
|
|
us the file name until it has processed the load event entry
|
|
*/
|
|
if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error)
|
|
{
|
|
errmsg = "while reading file name";
|
|
goto err;
|
|
}
|
|
|
|
// terminate with \0 for fn_format
|
|
*((char*)net->read_pos + packet_len) = 0;
|
|
fn_format(fname, (char*) net->read_pos + 1, "", "", 4);
|
|
// this is needed to make replicate-ignore-db
|
|
if (!strcmp(fname,"/dev/null"))
|
|
goto end;
|
|
|
|
if ((fd = my_open(fname, O_RDONLY, MYF(0))) < 0)
|
|
{
|
|
errmsg = "on open of file";
|
|
goto err;
|
|
}
|
|
|
|
while ((long) (bytes= my_read(fd, buf, IO_SIZE, MYF(0))) > 0)
|
|
{
|
|
if (my_net_write(net, buf, bytes))
|
|
{
|
|
errmsg = "while writing data to client";
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
end:
|
|
if (my_net_write(net, (uchar*) "", 0) || net_flush(net) ||
|
|
(my_net_read(net) == packet_error))
|
|
{
|
|
errmsg = "while negotiating file transfer close";
|
|
goto err;
|
|
}
|
|
error = 0;
|
|
|
|
err:
|
|
net_set_read_timeout(net, old_timeout);
|
|
if (fd >= 0)
|
|
(void) my_close(fd, MYF(0));
|
|
if (errmsg)
|
|
{
|
|
sql_print_error("Failed in send_file() %s", errmsg);
|
|
DBUG_PRINT("error", (errmsg));
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Adjust the position pointer in the binary log file for all running slaves
|
|
|
|
SYNOPSIS
|
|
adjust_linfo_offsets()
|
|
purge_offset Number of bytes removed from start of log index file
|
|
|
|
NOTES
|
|
- This is called when doing a PURGE when we delete lines from the
|
|
index log file
|
|
|
|
REQUIREMENTS
|
|
- Before calling this function, we have to ensure that no threads are
|
|
using any binary log file before purge_offset.a
|
|
|
|
TODO
|
|
- Inform the slave threads that they should sync the position
|
|
in the binary log file with flush_relay_log_info.
|
|
Now they sync is done for next read.
|
|
*/
|
|
|
|
void adjust_linfo_offsets(my_off_t purge_offset)
|
|
{
|
|
THD *tmp;
|
|
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
I_List_iterator<THD> it(threads);
|
|
|
|
while ((tmp=it++))
|
|
{
|
|
LOG_INFO* linfo;
|
|
if ((linfo = tmp->current_linfo))
|
|
{
|
|
pthread_mutex_lock(&linfo->lock);
|
|
/*
|
|
Index file offset can be less that purge offset only if
|
|
we just started reading the index file. In that case
|
|
we have nothing to adjust
|
|
*/
|
|
if (linfo->index_file_offset < purge_offset)
|
|
linfo->fatal = (linfo->index_file_offset != 0);
|
|
else
|
|
linfo->index_file_offset -= purge_offset;
|
|
pthread_mutex_unlock(&linfo->lock);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
}
|
|
|
|
|
|
bool log_in_use(const char* log_name)
|
|
{
|
|
int log_name_len = strlen(log_name) + 1;
|
|
THD *tmp;
|
|
bool result = 0;
|
|
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
I_List_iterator<THD> it(threads);
|
|
|
|
while ((tmp=it++))
|
|
{
|
|
LOG_INFO* linfo;
|
|
if ((linfo = tmp->current_linfo))
|
|
{
|
|
pthread_mutex_lock(&linfo->lock);
|
|
result = !bcmp((uchar*) log_name, (uchar*) linfo->log_file_name,
|
|
log_name_len);
|
|
pthread_mutex_unlock(&linfo->lock);
|
|
if (result)
|
|
break;
|
|
}
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
return result;
|
|
}
|
|
|
|
bool purge_error_message(THD* thd, int res)
|
|
{
|
|
uint errmsg= 0;
|
|
|
|
switch (res) {
|
|
case 0: break;
|
|
case LOG_INFO_EOF: errmsg= ER_UNKNOWN_TARGET_BINLOG; break;
|
|
case LOG_INFO_IO: errmsg= ER_IO_ERR_LOG_INDEX_READ; break;
|
|
case LOG_INFO_INVALID:errmsg= ER_BINLOG_PURGE_PROHIBITED; break;
|
|
case LOG_INFO_SEEK: errmsg= ER_FSEEK_FAIL; break;
|
|
case LOG_INFO_MEM: errmsg= ER_OUT_OF_RESOURCES; break;
|
|
case LOG_INFO_FATAL: errmsg= ER_BINLOG_PURGE_FATAL_ERR; break;
|
|
case LOG_INFO_IN_USE: errmsg= ER_LOG_IN_USE; break;
|
|
case LOG_INFO_EMFILE: errmsg= ER_BINLOG_PURGE_EMFILE; break;
|
|
default: errmsg= ER_LOG_PURGE_UNKNOWN_ERR; break;
|
|
}
|
|
|
|
if (errmsg)
|
|
{
|
|
my_message(errmsg, ER(errmsg), MYF(0));
|
|
return TRUE;
|
|
}
|
|
send_ok(thd);
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
bool purge_master_logs(THD* thd, const char* to_log)
|
|
{
|
|
char search_file_name[FN_REFLEN];
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
send_ok(thd);
|
|
return FALSE;
|
|
}
|
|
|
|
mysql_bin_log.make_log_name(search_file_name, to_log);
|
|
return purge_error_message(thd,
|
|
mysql_bin_log.purge_logs(search_file_name, 0, 1,
|
|
1, NULL));
|
|
}
|
|
|
|
|
|
bool purge_master_logs_before_date(THD* thd, time_t purge_time)
|
|
{
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
send_ok(thd);
|
|
return 0;
|
|
}
|
|
return purge_error_message(thd,
|
|
mysql_bin_log.purge_logs_before_date(purge_time));
|
|
}
|
|
|
|
int test_for_non_eof_log_read_errors(int error, const char **errmsg)
|
|
{
|
|
if (error == LOG_READ_EOF)
|
|
return 0;
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
switch (error) {
|
|
case LOG_READ_BOGUS:
|
|
*errmsg = "bogus data in log event";
|
|
break;
|
|
case LOG_READ_TOO_LARGE:
|
|
*errmsg = "log event entry exceeded max_allowed_packet; \
|
|
Increase max_allowed_packet on master";
|
|
break;
|
|
case LOG_READ_IO:
|
|
*errmsg = "I/O error reading log event";
|
|
break;
|
|
case LOG_READ_MEM:
|
|
*errmsg = "memory allocation failed reading log event";
|
|
break;
|
|
case LOG_READ_TRUNC:
|
|
*errmsg = "binlog truncated in the middle of event";
|
|
break;
|
|
default:
|
|
*errmsg = "unknown error reading log event on the master";
|
|
break;
|
|
}
|
|
return error;
|
|
}
|
|
|
|
|
|
/*
|
|
TODO: Clean up loop to only have one call to send_file()
|
|
*/
|
|
|
|
void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
|
|
ushort flags)
|
|
{
|
|
LOG_INFO linfo;
|
|
char *log_file_name = linfo.log_file_name;
|
|
char search_file_name[FN_REFLEN], *name;
|
|
IO_CACHE log;
|
|
File file = -1;
|
|
String* packet = &thd->packet;
|
|
int error;
|
|
const char *errmsg = "Unknown error";
|
|
NET* net = &thd->net;
|
|
pthread_mutex_t *log_lock;
|
|
bool binlog_can_be_corrupted= FALSE;
|
|
#ifndef DBUG_OFF
|
|
int left_events = max_binlog_dump_events;
|
|
#endif
|
|
DBUG_ENTER("mysql_binlog_send");
|
|
DBUG_PRINT("enter",("log_ident: '%s' pos: %ld", log_ident, (long) pos));
|
|
|
|
bzero((char*) &log,sizeof(log));
|
|
|
|
#ifndef DBUG_OFF
|
|
if (opt_sporadic_binlog_dump_fail && (binlog_dump_count++ % 2))
|
|
{
|
|
errmsg = "Master failed COM_BINLOG_DUMP to test if slave can recover";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
#endif
|
|
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
errmsg = "Binary log is not open";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
if (!server_id_supplied)
|
|
{
|
|
errmsg = "Misconfigured master - server id was not set";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
|
|
name=search_file_name;
|
|
if (log_ident[0])
|
|
mysql_bin_log.make_log_name(search_file_name, log_ident);
|
|
else
|
|
name=0; // Find first log
|
|
|
|
linfo.index_file_offset = 0;
|
|
thd->current_linfo = &linfo;
|
|
|
|
if (mysql_bin_log.find_log_pos(&linfo, name, 1))
|
|
{
|
|
errmsg = "Could not find first log file name in binary log index file";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
|
|
if ((file=open_binlog(&log, log_file_name, &errmsg)) < 0)
|
|
{
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
if (pos < BIN_LOG_HEADER_SIZE || pos > my_b_filelength(&log))
|
|
{
|
|
errmsg= "Client requested master to start replication from \
|
|
impossible position";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
We need to start a packet with something other than 255
|
|
to distinguish it from error
|
|
*/
|
|
packet->set("\0", 1, &my_charset_bin); /* This is the start of a new packet */
|
|
|
|
/*
|
|
Tell the client about the log name with a fake Rotate event;
|
|
this is needed even if we also send a Format_description_log_event
|
|
just after, because that event does not contain the binlog's name.
|
|
Note that as this Rotate event is sent before
|
|
Format_description_log_event, the slave cannot have any info to
|
|
understand this event's format, so the header len of
|
|
Rotate_log_event is FROZEN (so in 5.0 it will have a header shorter
|
|
than other events except FORMAT_DESCRIPTION_EVENT).
|
|
Before 4.0.14 we called fake_rotate_event below only if (pos ==
|
|
BIN_LOG_HEADER_SIZE), because if this is false then the slave
|
|
already knows the binlog's name.
|
|
Since, we always call fake_rotate_event; if the slave already knew
|
|
the log's name (ex: CHANGE MASTER TO MASTER_LOG_FILE=...) this is
|
|
useless but does not harm much. It is nice for 3.23 (>=.58) slaves
|
|
which test Rotate events to see if the master is 4.0 (then they
|
|
choose to stop because they can't replicate 4.0); by always calling
|
|
fake_rotate_event we are sure that 3.23.58 and newer will detect the
|
|
problem as soon as replication starts (BUG#198).
|
|
Always calling fake_rotate_event makes sending of normal
|
|
(=from-binlog) Rotate events a priori unneeded, but it is not so
|
|
simple: the 2 Rotate events are not equivalent, the normal one is
|
|
before the Stop event, the fake one is after. If we don't send the
|
|
normal one, then the Stop event will be interpreted (by existing 4.0
|
|
slaves) as "the master stopped", which is wrong. So for safety,
|
|
given that we want minimum modification of 4.0, we send the normal
|
|
and fake Rotates.
|
|
*/
|
|
if (fake_rotate_event(net, packet, log_file_name, pos, &errmsg))
|
|
{
|
|
/*
|
|
This error code is not perfect, as fake_rotate_event() does not
|
|
read anything from the binlog; if it fails it's because of an
|
|
error in my_net_write(), fortunately it will say so in errmsg.
|
|
*/
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
packet->set("\0", 1, &my_charset_bin);
|
|
/*
|
|
Adding MAX_LOG_EVENT_HEADER_LEN, since a binlog event can become
|
|
this larger than the corresponding packet (query) sent
|
|
from client to master.
|
|
*/
|
|
thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER;
|
|
|
|
/*
|
|
We can set log_lock now, it does not move (it's a member of
|
|
mysql_bin_log, and it's already inited, and it will be destroyed
|
|
only at shutdown).
|
|
*/
|
|
log_lock = mysql_bin_log.get_log_lock();
|
|
if (pos > BIN_LOG_HEADER_SIZE)
|
|
{
|
|
/*
|
|
Try to find a Format_description_log_event at the beginning of
|
|
the binlog
|
|
*/
|
|
if (!(error = Log_event::read_log_event(&log, packet, log_lock)))
|
|
{
|
|
/*
|
|
The packet has offsets equal to the normal offsets in a binlog
|
|
event +1 (the first character is \0).
|
|
*/
|
|
DBUG_PRINT("info",
|
|
("Looked for a Format_description_log_event, found event type %d",
|
|
(*packet)[EVENT_TYPE_OFFSET+1]));
|
|
if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
|
|
{
|
|
binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &
|
|
LOG_EVENT_BINLOG_IN_USE_F);
|
|
(*packet)[FLAGS_OFFSET+1] &= ~LOG_EVENT_BINLOG_IN_USE_F;
|
|
/*
|
|
mark that this event with "log_pos=0", so the slave
|
|
should not increment master's binlog position
|
|
(rli->group_master_log_pos)
|
|
*/
|
|
int4store((char*) packet->ptr()+LOG_POS_OFFSET+1, 0);
|
|
/*
|
|
if reconnect master sends FD event with `created' as 0
|
|
to avoid destroying temp tables.
|
|
*/
|
|
int4store((char*) packet->ptr()+LOG_EVENT_MINIMAL_HEADER_LEN+
|
|
ST_CREATED_OFFSET+1, (ulong) 0);
|
|
/* send it */
|
|
if (my_net_write(net, (uchar*) packet->ptr(), packet->length()))
|
|
{
|
|
errmsg = "Failed on my_net_write()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
No need to save this event. We are only doing simple reads
|
|
(no real parsing of the events) so we don't need it. And so
|
|
we don't need the artificial Format_description_log_event of
|
|
3.23&4.x.
|
|
*/
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (test_for_non_eof_log_read_errors(error, &errmsg))
|
|
goto err;
|
|
/*
|
|
It's EOF, nothing to do, go on reading next events, the
|
|
Format_description_log_event will be found naturally if it is written.
|
|
*/
|
|
}
|
|
/* reset the packet as we wrote to it in any case */
|
|
packet->set("\0", 1, &my_charset_bin);
|
|
} /* end of if (pos > BIN_LOG_HEADER_SIZE); */
|
|
else
|
|
{
|
|
/* The Format_description_log_event event will be found naturally. */
|
|
}
|
|
|
|
/* seek to the requested position, to start the requested dump */
|
|
my_b_seek(&log, pos); // Seek will done on next read
|
|
|
|
while (!net->error && net->vio != 0 && !thd->killed)
|
|
{
|
|
while (!(error = Log_event::read_log_event(&log, packet, log_lock)))
|
|
{
|
|
#ifndef DBUG_OFF
|
|
if (max_binlog_dump_events && !left_events--)
|
|
{
|
|
net_flush(net);
|
|
errmsg = "Debugging binlog dump abort";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
#endif
|
|
|
|
if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
|
|
{
|
|
binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &
|
|
LOG_EVENT_BINLOG_IN_USE_F);
|
|
(*packet)[FLAGS_OFFSET+1] &= ~LOG_EVENT_BINLOG_IN_USE_F;
|
|
}
|
|
else if ((*packet)[EVENT_TYPE_OFFSET+1] == STOP_EVENT)
|
|
binlog_can_be_corrupted= FALSE;
|
|
|
|
if (my_net_write(net, (uchar*) packet->ptr(), packet->length()))
|
|
{
|
|
errmsg = "Failed on my_net_write()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
DBUG_PRINT("info", ("log event code %d",
|
|
(*packet)[LOG_EVENT_OFFSET+1] ));
|
|
if ((*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT)
|
|
{
|
|
if (send_file(thd))
|
|
{
|
|
errmsg = "failed in send_file()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
}
|
|
packet->set("\0", 1, &my_charset_bin);
|
|
}
|
|
|
|
/*
|
|
here we were reading binlog that was not closed properly (as a result
|
|
of a crash ?). treat any corruption as EOF
|
|
*/
|
|
if (binlog_can_be_corrupted && error != LOG_READ_MEM)
|
|
error=LOG_READ_EOF;
|
|
/*
|
|
TODO: now that we are logging the offset, check to make sure
|
|
the recorded offset and the actual match.
|
|
Guilhem 2003-06: this is not true if this master is a slave
|
|
<4.0.15 running with --log-slave-updates, because then log_pos may
|
|
be the offset in the-master-of-this-master's binlog.
|
|
*/
|
|
if (test_for_non_eof_log_read_errors(error, &errmsg))
|
|
goto err;
|
|
|
|
if (!(flags & BINLOG_DUMP_NON_BLOCK) &&
|
|
mysql_bin_log.is_active(log_file_name))
|
|
{
|
|
/*
|
|
Block until there is more data in the log
|
|
*/
|
|
if (net_flush(net))
|
|
{
|
|
errmsg = "failed on net_flush()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
We may have missed the update broadcast from the log
|
|
that has just happened, let's try to catch it if it did.
|
|
If we did not miss anything, we just wait for other threads
|
|
to signal us.
|
|
*/
|
|
{
|
|
log.error=0;
|
|
bool read_packet = 0, fatal_error = 0;
|
|
|
|
#ifndef DBUG_OFF
|
|
if (max_binlog_dump_events && !left_events--)
|
|
{
|
|
errmsg = "Debugging binlog dump abort";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
No one will update the log while we are reading
|
|
now, but we'll be quick and just read one record
|
|
|
|
TODO:
|
|
Add an counter that is incremented for each time we update the
|
|
binary log. We can avoid the following read if the counter
|
|
has not been updated since last read.
|
|
*/
|
|
|
|
pthread_mutex_lock(log_lock);
|
|
switch (Log_event::read_log_event(&log, packet, (pthread_mutex_t*)0)) {
|
|
case 0:
|
|
/* we read successfully, so we'll need to send it to the slave */
|
|
pthread_mutex_unlock(log_lock);
|
|
read_packet = 1;
|
|
break;
|
|
|
|
case LOG_READ_EOF:
|
|
DBUG_PRINT("wait",("waiting for data in binary log"));
|
|
if (thd->server_id==0) // for mysqlbinlog (mysqlbinlog.server_id==0)
|
|
{
|
|
pthread_mutex_unlock(log_lock);
|
|
goto end;
|
|
}
|
|
if (!thd->killed)
|
|
{
|
|
/* Note that the following call unlocks lock_log */
|
|
mysql_bin_log.wait_for_update(thd, 0);
|
|
}
|
|
else
|
|
pthread_mutex_unlock(log_lock);
|
|
DBUG_PRINT("wait",("binary log received update"));
|
|
break;
|
|
|
|
default:
|
|
pthread_mutex_unlock(log_lock);
|
|
fatal_error = 1;
|
|
break;
|
|
}
|
|
|
|
if (read_packet)
|
|
{
|
|
thd->proc_info = "Sending binlog event to slave";
|
|
if (my_net_write(net, (uchar*) packet->ptr(), packet->length()) )
|
|
{
|
|
errmsg = "Failed on my_net_write()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
if ((*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT)
|
|
{
|
|
if (send_file(thd))
|
|
{
|
|
errmsg = "failed in send_file()";
|
|
my_errno= ER_UNKNOWN_ERROR;
|
|
goto err;
|
|
}
|
|
}
|
|
packet->set("\0", 1, &my_charset_bin);
|
|
/*
|
|
No need to net_flush because we will get to flush later when
|
|
we hit EOF pretty quick
|
|
*/
|
|
}
|
|
|
|
if (fatal_error)
|
|
{
|
|
errmsg = "error reading log entry";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
log.error=0;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
bool loop_breaker = 0;
|
|
/* need this to break out of the for loop from switch */
|
|
|
|
thd->proc_info = "Finished reading one binlog; switching to next binlog";
|
|
switch (mysql_bin_log.find_next_log(&linfo, 1)) {
|
|
case LOG_INFO_EOF:
|
|
loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK);
|
|
break;
|
|
case 0:
|
|
break;
|
|
default:
|
|
errmsg = "could not find next log";
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
|
|
if (loop_breaker)
|
|
break;
|
|
|
|
end_io_cache(&log);
|
|
(void) my_close(file, MYF(MY_WME));
|
|
|
|
/*
|
|
Call fake_rotate_event() in case the previous log (the one which
|
|
we have just finished reading) did not contain a Rotate event
|
|
(for example (I don't know any other example) the previous log
|
|
was the last one before the master was shutdown & restarted).
|
|
This way we tell the slave about the new log's name and
|
|
position. If the binlog is 5.0, the next event we are going to
|
|
read and send is Format_description_log_event.
|
|
*/
|
|
if ((file=open_binlog(&log, log_file_name, &errmsg)) < 0 ||
|
|
fake_rotate_event(net, packet, log_file_name, BIN_LOG_HEADER_SIZE,
|
|
&errmsg))
|
|
{
|
|
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
|
|
goto err;
|
|
}
|
|
|
|
packet->length(0);
|
|
packet->append('\0');
|
|
}
|
|
}
|
|
|
|
end:
|
|
end_io_cache(&log);
|
|
(void)my_close(file, MYF(MY_WME));
|
|
|
|
send_eof(thd);
|
|
thd->proc_info = "Waiting to finalize termination";
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thd->current_linfo = 0;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
DBUG_VOID_RETURN;
|
|
|
|
err:
|
|
thd->proc_info = "Waiting to finalize termination";
|
|
end_io_cache(&log);
|
|
/*
|
|
Exclude iteration through thread list
|
|
this is needed for purge_logs() - it will iterate through
|
|
thread list and update thd->current_linfo->index_file_offset
|
|
this mutex will make sure that it never tried to update our linfo
|
|
after we return from this stack frame
|
|
*/
|
|
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));
|
|
|
|
my_message(my_errno, errmsg, MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
int start_slave(THD* thd , MASTER_INFO* mi, bool net_report)
|
|
{
|
|
int slave_errno= 0;
|
|
int thread_mask;
|
|
DBUG_ENTER("start_slave");
|
|
|
|
if (check_access(thd, SUPER_ACL, any_db,0,0,0,0))
|
|
DBUG_RETURN(1);
|
|
lock_slave_threads(mi); // this allows us to cleanly read slave_running
|
|
// Get a mask of _stopped_ threads
|
|
init_thread_mask(&thread_mask,mi,1 /* inverse */);
|
|
/*
|
|
Below we will start all stopped threads. But if the user wants to
|
|
start only one thread, do as if the other thread was running (as we
|
|
don't wan't to touch the other thread), so set the bit to 0 for the
|
|
other thread
|
|
*/
|
|
if (thd->lex->slave_thd_opt)
|
|
thread_mask&= thd->lex->slave_thd_opt;
|
|
if (thread_mask) //some threads are stopped, start them
|
|
{
|
|
if (init_master_info(mi,master_info_file,relay_log_info_file, 0,
|
|
thread_mask))
|
|
slave_errno=ER_MASTER_INFO;
|
|
else if (server_id_supplied && *mi->host)
|
|
{
|
|
/*
|
|
If we will start SQL thread we will care about UNTIL options If
|
|
not and they are specified we will ignore them and warn user
|
|
about this fact.
|
|
*/
|
|
if (thread_mask & SLAVE_SQL)
|
|
{
|
|
pthread_mutex_lock(&mi->rli.data_lock);
|
|
|
|
if (thd->lex->mi.pos)
|
|
{
|
|
mi->rli.until_condition= RELAY_LOG_INFO::UNTIL_MASTER_POS;
|
|
mi->rli.until_log_pos= thd->lex->mi.pos;
|
|
/*
|
|
We don't check thd->lex->mi.log_file_name for NULL here
|
|
since it is checked in sql_yacc.yy
|
|
*/
|
|
strmake(mi->rli.until_log_name, thd->lex->mi.log_file_name,
|
|
sizeof(mi->rli.until_log_name)-1);
|
|
}
|
|
else if (thd->lex->mi.relay_log_pos)
|
|
{
|
|
mi->rli.until_condition= RELAY_LOG_INFO::UNTIL_RELAY_POS;
|
|
mi->rli.until_log_pos= thd->lex->mi.relay_log_pos;
|
|
strmake(mi->rli.until_log_name, thd->lex->mi.relay_log_name,
|
|
sizeof(mi->rli.until_log_name)-1);
|
|
}
|
|
else
|
|
mi->rli.clear_until_condition();
|
|
|
|
if (mi->rli.until_condition != RELAY_LOG_INFO::UNTIL_NONE)
|
|
{
|
|
/* Preparing members for effective until condition checking */
|
|
const char *p= fn_ext(mi->rli.until_log_name);
|
|
char *p_end;
|
|
if (*p)
|
|
{
|
|
//p points to '.'
|
|
mi->rli.until_log_name_extension= strtoul(++p,&p_end, 10);
|
|
/*
|
|
p_end points to the first invalid character. If it equals
|
|
to p, no digits were found, error. If it contains '\0' it
|
|
means conversion went ok.
|
|
*/
|
|
if (p_end==p || *p_end)
|
|
slave_errno=ER_BAD_SLAVE_UNTIL_COND;
|
|
}
|
|
else
|
|
slave_errno=ER_BAD_SLAVE_UNTIL_COND;
|
|
|
|
/* mark the cached result of the UNTIL comparison as "undefined" */
|
|
mi->rli.until_log_names_cmp_result=
|
|
RELAY_LOG_INFO::UNTIL_LOG_NAMES_CMP_UNKNOWN;
|
|
|
|
/* Issuing warning then started without --skip-slave-start */
|
|
if (!opt_skip_slave_start)
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_MISSING_SKIP_SLAVE,
|
|
ER(ER_MISSING_SKIP_SLAVE));
|
|
}
|
|
|
|
pthread_mutex_unlock(&mi->rli.data_lock);
|
|
}
|
|
else if (thd->lex->mi.pos || thd->lex->mi.relay_log_pos)
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNTIL_COND_IGNORED,
|
|
ER(ER_UNTIL_COND_IGNORED));
|
|
|
|
if (!slave_errno)
|
|
slave_errno = start_slave_threads(0 /*no mutex */,
|
|
1 /* wait for start */,
|
|
mi,
|
|
master_info_file,relay_log_info_file,
|
|
thread_mask);
|
|
}
|
|
else
|
|
slave_errno = ER_BAD_SLAVE;
|
|
}
|
|
else
|
|
{
|
|
/* no error if all threads are already started, only a warning */
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_RUNNING,
|
|
ER(ER_SLAVE_WAS_RUNNING));
|
|
}
|
|
|
|
unlock_slave_threads(mi);
|
|
|
|
if (slave_errno)
|
|
{
|
|
if (net_report)
|
|
my_message(slave_errno, ER(slave_errno), MYF(0));
|
|
DBUG_RETURN(1);
|
|
}
|
|
else if (net_report)
|
|
send_ok(thd);
|
|
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )
|
|
{
|
|
DBUG_ENTER("stop_slave");
|
|
|
|
int slave_errno;
|
|
if (!thd)
|
|
thd = current_thd;
|
|
|
|
if (check_access(thd, SUPER_ACL, any_db,0,0,0,0))
|
|
DBUG_RETURN(1);
|
|
thd->proc_info = "Killing slave";
|
|
int thread_mask;
|
|
lock_slave_threads(mi);
|
|
// Get a mask of _running_ threads
|
|
init_thread_mask(&thread_mask,mi,0 /* not inverse*/);
|
|
/*
|
|
Below we will stop all running threads.
|
|
But if the user wants to stop only one thread, do as if the other thread
|
|
was stopped (as we don't wan't to touch the other thread), so set the
|
|
bit to 0 for the other thread
|
|
*/
|
|
if (thd->lex->slave_thd_opt)
|
|
thread_mask &= thd->lex->slave_thd_opt;
|
|
|
|
if (thread_mask)
|
|
{
|
|
slave_errno= terminate_slave_threads(mi,thread_mask,
|
|
1 /*skip lock */);
|
|
}
|
|
else
|
|
{
|
|
//no error if both threads are already stopped, only a warning
|
|
slave_errno= 0;
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_SLAVE_WAS_NOT_RUNNING,
|
|
ER(ER_SLAVE_WAS_NOT_RUNNING));
|
|
}
|
|
unlock_slave_threads(mi);
|
|
thd->proc_info = 0;
|
|
|
|
if (slave_errno)
|
|
{
|
|
if (net_report)
|
|
my_message(slave_errno, ER(slave_errno), MYF(0));
|
|
DBUG_RETURN(1);
|
|
}
|
|
else if (net_report)
|
|
send_ok(thd);
|
|
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Remove all relay logs and start replication from the start
|
|
|
|
SYNOPSIS
|
|
reset_slave()
|
|
thd Thread handler
|
|
mi Master info for the slave
|
|
|
|
RETURN
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
|
|
int reset_slave(THD *thd, MASTER_INFO* mi)
|
|
{
|
|
MY_STAT stat_area;
|
|
char fname[FN_REFLEN];
|
|
int thread_mask= 0, error= 0;
|
|
uint sql_errno=0;
|
|
const char* errmsg=0;
|
|
DBUG_ENTER("reset_slave");
|
|
|
|
lock_slave_threads(mi);
|
|
init_thread_mask(&thread_mask,mi,0 /* not inverse */);
|
|
if (thread_mask) // We refuse if any slave thread is running
|
|
{
|
|
sql_errno= ER_SLAVE_MUST_STOP;
|
|
error=1;
|
|
goto err;
|
|
}
|
|
|
|
ha_reset_slave(thd);
|
|
|
|
// delete relay logs, clear relay log coordinates
|
|
if ((error= purge_relay_logs(&mi->rli, thd,
|
|
1 /* just reset */,
|
|
&errmsg)))
|
|
goto err;
|
|
|
|
/*
|
|
Clear master's log coordinates and reset host/user/etc to the values
|
|
specified in mysqld's options (only for good display of SHOW SLAVE STATUS;
|
|
next init_master_info() (in start_slave() for example) would have set them
|
|
the same way; but here this is for the case where the user does SHOW SLAVE
|
|
STATUS; before doing START SLAVE;
|
|
*/
|
|
init_master_info_with_options(mi);
|
|
/*
|
|
Reset errors (the idea is that we forget about the
|
|
old master).
|
|
*/
|
|
mi->rli.clear_slave_error();
|
|
mi->rli.clear_until_condition();
|
|
|
|
// close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0
|
|
end_master_info(mi);
|
|
// and delete these two files
|
|
fn_format(fname, master_info_file, mysql_data_home, "", 4+32);
|
|
if (my_stat(fname, &stat_area, MYF(0)) && my_delete(fname, MYF(MY_WME)))
|
|
{
|
|
error=1;
|
|
goto err;
|
|
}
|
|
// delete relay_log_info_file
|
|
fn_format(fname, relay_log_info_file, mysql_data_home, "", 4+32);
|
|
if (my_stat(fname, &stat_area, MYF(0)) && my_delete(fname, MYF(MY_WME)))
|
|
{
|
|
error=1;
|
|
goto err;
|
|
}
|
|
|
|
err:
|
|
unlock_slave_threads(mi);
|
|
if (error)
|
|
my_error(sql_errno, MYF(0), errmsg);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/*
|
|
|
|
Kill all Binlog_dump threads which previously talked to the same slave
|
|
("same" means with the same server id). Indeed, if the slave stops, if the
|
|
Binlog_dump thread is waiting (pthread_cond_wait) for binlog update, then it
|
|
will keep existing until a query is written to the binlog. If the master is
|
|
idle, then this could last long, and if the slave reconnects, we could have 2
|
|
Binlog_dump threads in SHOW PROCESSLIST, until a query is written to the
|
|
binlog. To avoid this, when the slave reconnects and sends COM_BINLOG_DUMP,
|
|
the master kills any existing thread with the slave's server id (if this id is
|
|
not zero; it will be true for real slaves, but false for mysqlbinlog when it
|
|
sends COM_BINLOG_DUMP to get a remote binlog dump).
|
|
|
|
SYNOPSIS
|
|
kill_zombie_dump_threads()
|
|
slave_server_id the slave's server id
|
|
|
|
*/
|
|
|
|
|
|
void kill_zombie_dump_threads(uint32 slave_server_id)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
I_List_iterator<THD> it(threads);
|
|
THD *tmp;
|
|
|
|
while ((tmp=it++))
|
|
{
|
|
if (tmp->command == COM_BINLOG_DUMP &&
|
|
tmp->server_id == slave_server_id)
|
|
{
|
|
pthread_mutex_lock(&tmp->LOCK_delete); // Lock from delete
|
|
break;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
if (tmp)
|
|
{
|
|
/*
|
|
Here we do not call kill_one_thread() as
|
|
it will be slow because it will iterate through the list
|
|
again. We just to do kill the thread ourselves.
|
|
*/
|
|
tmp->awake(THD::KILL_QUERY);
|
|
pthread_mutex_unlock(&tmp->LOCK_delete);
|
|
}
|
|
}
|
|
|
|
|
|
bool change_master(THD* thd, MASTER_INFO* mi)
|
|
{
|
|
int thread_mask;
|
|
const char* errmsg= 0;
|
|
bool need_relay_log_purge= 1;
|
|
DBUG_ENTER("change_master");
|
|
|
|
lock_slave_threads(mi);
|
|
init_thread_mask(&thread_mask,mi,0 /*not inverse*/);
|
|
if (thread_mask) // We refuse if any slave thread is running
|
|
{
|
|
my_message(ER_SLAVE_MUST_STOP, ER(ER_SLAVE_MUST_STOP), MYF(0));
|
|
unlock_slave_threads(mi);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
thd->proc_info = "Changing master";
|
|
LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
|
|
// TODO: see if needs re-write
|
|
if (init_master_info(mi, master_info_file, relay_log_info_file, 0,
|
|
thread_mask))
|
|
{
|
|
my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
|
|
unlock_slave_threads(mi);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
/*
|
|
Data lock not needed since we have already stopped the running threads,
|
|
and we have the hold on the run locks which will keep all threads that
|
|
could possibly modify the data structures from running
|
|
*/
|
|
|
|
/*
|
|
If the user specified host or port without binlog or position,
|
|
reset binlog's name to FIRST and position to 4.
|
|
*/
|
|
|
|
if ((lex_mi->host || lex_mi->port) && !lex_mi->log_file_name && !lex_mi->pos)
|
|
{
|
|
mi->master_log_name[0] = 0;
|
|
mi->master_log_pos= BIN_LOG_HEADER_SIZE;
|
|
}
|
|
|
|
if (lex_mi->log_file_name)
|
|
strmake(mi->master_log_name, lex_mi->log_file_name,
|
|
sizeof(mi->master_log_name)-1);
|
|
if (lex_mi->pos)
|
|
{
|
|
mi->master_log_pos= lex_mi->pos;
|
|
}
|
|
DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos));
|
|
|
|
if (lex_mi->host)
|
|
strmake(mi->host, lex_mi->host, sizeof(mi->host)-1);
|
|
if (lex_mi->user)
|
|
strmake(mi->user, lex_mi->user, sizeof(mi->user)-1);
|
|
if (lex_mi->password)
|
|
strmake(mi->password, lex_mi->password, sizeof(mi->password)-1);
|
|
if (lex_mi->port)
|
|
mi->port = lex_mi->port;
|
|
if (lex_mi->connect_retry)
|
|
mi->connect_retry = lex_mi->connect_retry;
|
|
|
|
if (lex_mi->ssl != LEX_MASTER_INFO::SSL_UNCHANGED)
|
|
mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::SSL_ENABLE);
|
|
|
|
if (lex_mi->ssl_verify_server_cert != LEX_MASTER_INFO::SSL_UNCHANGED)
|
|
mi->ssl_verify_server_cert=
|
|
(lex_mi->ssl_verify_server_cert == LEX_MASTER_INFO::SSL_ENABLE);
|
|
|
|
if (lex_mi->ssl_ca)
|
|
strmake(mi->ssl_ca, lex_mi->ssl_ca, sizeof(mi->ssl_ca)-1);
|
|
if (lex_mi->ssl_capath)
|
|
strmake(mi->ssl_capath, lex_mi->ssl_capath, sizeof(mi->ssl_capath)-1);
|
|
if (lex_mi->ssl_cert)
|
|
strmake(mi->ssl_cert, lex_mi->ssl_cert, sizeof(mi->ssl_cert)-1);
|
|
if (lex_mi->ssl_cipher)
|
|
strmake(mi->ssl_cipher, lex_mi->ssl_cipher, sizeof(mi->ssl_cipher)-1);
|
|
if (lex_mi->ssl_key)
|
|
strmake(mi->ssl_key, lex_mi->ssl_key, sizeof(mi->ssl_key)-1);
|
|
#ifndef HAVE_OPENSSL
|
|
if (lex_mi->ssl || lex_mi->ssl_ca || lex_mi->ssl_capath ||
|
|
lex_mi->ssl_cert || lex_mi->ssl_cipher || lex_mi->ssl_key ||
|
|
lex_mi->ssl_verify_server_cert )
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_SLAVE_IGNORED_SSL_PARAMS, ER(ER_SLAVE_IGNORED_SSL_PARAMS));
|
|
#endif
|
|
|
|
if (lex_mi->relay_log_name)
|
|
{
|
|
need_relay_log_purge= 0;
|
|
strmake(mi->rli.group_relay_log_name,lex_mi->relay_log_name,
|
|
sizeof(mi->rli.group_relay_log_name)-1);
|
|
strmake(mi->rli.event_relay_log_name,lex_mi->relay_log_name,
|
|
sizeof(mi->rli.event_relay_log_name)-1);
|
|
}
|
|
|
|
if (lex_mi->relay_log_pos)
|
|
{
|
|
need_relay_log_purge= 0;
|
|
mi->rli.group_relay_log_pos= mi->rli.event_relay_log_pos= lex_mi->relay_log_pos;
|
|
}
|
|
|
|
/*
|
|
If user did specify neither host nor port nor any log name nor any log
|
|
pos, i.e. he specified only user/password/master_connect_retry, he probably
|
|
wants replication to resume from where it had left, i.e. from the
|
|
coordinates of the **SQL** thread (imagine the case where the I/O is ahead
|
|
of the SQL; restarting from the coordinates of the I/O would lose some
|
|
events which is probably unwanted when you are just doing minor changes
|
|
like changing master_connect_retry).
|
|
A side-effect is that if only the I/O thread was started, this thread may
|
|
restart from ''/4 after the CHANGE MASTER. That's a minor problem (it is a
|
|
much more unlikely situation than the one we are fixing here).
|
|
Note: coordinates of the SQL thread must be read here, before the
|
|
'if (need_relay_log_purge)' block which resets them.
|
|
*/
|
|
if (!lex_mi->host && !lex_mi->port &&
|
|
!lex_mi->log_file_name && !lex_mi->pos &&
|
|
need_relay_log_purge)
|
|
{
|
|
/*
|
|
Sometimes mi->rli.master_log_pos == 0 (it happens when the SQL thread is
|
|
not initialized), so we use a max().
|
|
What happens to mi->rli.master_log_pos during the initialization stages
|
|
of replication is not 100% clear, so we guard against problems using
|
|
max().
|
|
*/
|
|
mi->master_log_pos = max(BIN_LOG_HEADER_SIZE,
|
|
mi->rli.group_master_log_pos);
|
|
strmake(mi->master_log_name, mi->rli.group_master_log_name,
|
|
sizeof(mi->master_log_name)-1);
|
|
}
|
|
/*
|
|
Relay log's IO_CACHE may not be inited, if rli->inited==0 (server was never
|
|
a slave before).
|
|
*/
|
|
if (flush_master_info(mi, 0))
|
|
{
|
|
my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush master info file");
|
|
unlock_slave_threads(mi);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
if (need_relay_log_purge)
|
|
{
|
|
relay_log_purge= 1;
|
|
thd->proc_info="Purging old relay logs";
|
|
if (purge_relay_logs(&mi->rli, thd,
|
|
0 /* not only reset, but also reinit */,
|
|
&errmsg))
|
|
{
|
|
my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg);
|
|
unlock_slave_threads(mi);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
const char* msg;
|
|
relay_log_purge= 0;
|
|
/* Relay log is already initialized */
|
|
if (init_relay_log_pos(&mi->rli,
|
|
mi->rli.group_relay_log_name,
|
|
mi->rli.group_relay_log_pos,
|
|
0 /*no data lock*/,
|
|
&msg, 0))
|
|
{
|
|
my_error(ER_RELAY_LOG_INIT, MYF(0), msg);
|
|
unlock_slave_threads(mi);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
mi->rli.group_master_log_pos = mi->master_log_pos;
|
|
DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos));
|
|
|
|
/*
|
|
Coordinates in rli were spoilt by the 'if (need_relay_log_purge)' block,
|
|
so restore them to good values. If we left them to ''/0, that would work;
|
|
but that would fail in the case of 2 successive CHANGE MASTER (without a
|
|
START SLAVE in between): because first one would set the coords in mi to
|
|
the good values of those in rli, the set those in rli to ''/0, then
|
|
second CHANGE MASTER would set the coords in mi to those of rli, i.e. to
|
|
''/0: we have lost all copies of the original good coordinates.
|
|
That's why we always save good coords in rli.
|
|
*/
|
|
mi->rli.group_master_log_pos= mi->master_log_pos;
|
|
strmake(mi->rli.group_master_log_name,mi->master_log_name,
|
|
sizeof(mi->rli.group_master_log_name)-1);
|
|
|
|
if (!mi->rli.group_master_log_name[0]) // uninitialized case
|
|
mi->rli.group_master_log_pos=0;
|
|
|
|
pthread_mutex_lock(&mi->rli.data_lock);
|
|
mi->rli.abort_pos_wait++; /* for MASTER_POS_WAIT() to abort */
|
|
/* Clear the errors, for a clean start */
|
|
mi->rli.clear_slave_error();
|
|
mi->rli.clear_until_condition();
|
|
/*
|
|
If we don't write new coordinates to disk now, then old will remain in
|
|
relay-log.info until START SLAVE is issued; but if mysqld is shutdown
|
|
before START SLAVE, then old will remain in relay-log.info, and will be the
|
|
in-memory value at restart (thus causing errors, as the old relay log does
|
|
not exist anymore).
|
|
*/
|
|
flush_relay_log_info(&mi->rli);
|
|
pthread_cond_broadcast(&mi->data_cond);
|
|
pthread_mutex_unlock(&mi->rli.data_lock);
|
|
|
|
unlock_slave_threads(mi);
|
|
thd->proc_info = 0;
|
|
send_ok(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
int reset_master(THD* thd)
|
|
{
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
my_message(ER_FLUSH_MASTER_BINLOG_CLOSED,
|
|
ER(ER_FLUSH_MASTER_BINLOG_CLOSED), MYF(ME_BELL+ME_WAITTANG));
|
|
return 1;
|
|
}
|
|
return mysql_bin_log.reset_logs(thd);
|
|
}
|
|
|
|
int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1,
|
|
const char* log_file_name2, ulonglong log_pos2)
|
|
{
|
|
int res;
|
|
uint log_file_name1_len= strlen(log_file_name1);
|
|
uint log_file_name2_len= strlen(log_file_name2);
|
|
|
|
// We assume that both log names match up to '.'
|
|
if (log_file_name1_len == log_file_name2_len)
|
|
{
|
|
if ((res= strcmp(log_file_name1, log_file_name2)))
|
|
return res;
|
|
return (log_pos1 < log_pos2) ? -1 : (log_pos1 == log_pos2) ? 0 : 1;
|
|
}
|
|
return ((log_file_name1_len < log_file_name2_len) ? -1 : 1);
|
|
}
|
|
|
|
|
|
bool mysql_show_binlog_events(THD* thd)
|
|
{
|
|
Protocol *protocol= thd->protocol;
|
|
List<Item> field_list;
|
|
const char *errmsg = 0;
|
|
bool ret = TRUE;
|
|
IO_CACHE log;
|
|
File file = -1;
|
|
DBUG_ENTER("mysql_show_binlog_events");
|
|
|
|
Log_event::init_show_field_list(&field_list);
|
|
if (protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
Format_description_log_event *description_event= new
|
|
Format_description_log_event(3); /* MySQL 4.0 by default */
|
|
|
|
/*
|
|
Wait for handlers to insert any pending information
|
|
into the binlog. For e.g. ndb which updates the binlog asynchronously
|
|
this is needed so that the uses sees all its own commands in the binlog
|
|
*/
|
|
ha_binlog_wait(thd);
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
LEX_MASTER_INFO *lex_mi= &thd->lex->mi;
|
|
SELECT_LEX_UNIT *unit= &thd->lex->unit;
|
|
ha_rows event_count, limit_start, limit_end;
|
|
my_off_t pos = max(BIN_LOG_HEADER_SIZE, lex_mi->pos); // user-friendly
|
|
char search_file_name[FN_REFLEN], *name;
|
|
const char *log_file_name = lex_mi->log_file_name;
|
|
pthread_mutex_t *log_lock = mysql_bin_log.get_log_lock();
|
|
LOG_INFO linfo;
|
|
Log_event* ev;
|
|
|
|
unit->set_limit(thd->lex->current_select);
|
|
limit_start= unit->offset_limit_cnt;
|
|
limit_end= unit->select_limit_cnt;
|
|
|
|
name= search_file_name;
|
|
if (log_file_name)
|
|
mysql_bin_log.make_log_name(search_file_name, log_file_name);
|
|
else
|
|
name=0; // Find first log
|
|
|
|
linfo.index_file_offset = 0;
|
|
thd->current_linfo = &linfo;
|
|
|
|
if (mysql_bin_log.find_log_pos(&linfo, name, 1))
|
|
{
|
|
errmsg = "Could not find target log";
|
|
goto err;
|
|
}
|
|
|
|
if ((file=open_binlog(&log, linfo.log_file_name, &errmsg)) < 0)
|
|
goto err;
|
|
|
|
pthread_mutex_lock(log_lock);
|
|
|
|
/*
|
|
open_binlog() sought to position 4.
|
|
Read the first event in case it's a Format_description_log_event, to
|
|
know the format. If there's no such event, we are 3.23 or 4.x. This
|
|
code, like before, can't read 3.23 binlogs.
|
|
This code will fail on a mixed relay log (one which has Format_desc then
|
|
Rotate then Format_desc).
|
|
*/
|
|
|
|
ev = Log_event::read_log_event(&log,(pthread_mutex_t*)0,description_event);
|
|
if (ev)
|
|
{
|
|
if (ev->get_type_code() == FORMAT_DESCRIPTION_EVENT)
|
|
{
|
|
delete description_event;
|
|
description_event= (Format_description_log_event*) ev;
|
|
}
|
|
else
|
|
delete ev;
|
|
}
|
|
|
|
my_b_seek(&log, pos);
|
|
|
|
if (!description_event->is_valid())
|
|
{
|
|
errmsg="Invalid Format_description event; could be out of memory";
|
|
goto err;
|
|
}
|
|
|
|
for (event_count = 0;
|
|
(ev = Log_event::read_log_event(&log,(pthread_mutex_t*) 0,
|
|
description_event)); )
|
|
{
|
|
if (event_count >= limit_start &&
|
|
ev->net_send(protocol, linfo.log_file_name, pos))
|
|
{
|
|
errmsg = "Net error";
|
|
delete ev;
|
|
pthread_mutex_unlock(log_lock);
|
|
goto err;
|
|
}
|
|
|
|
pos = my_b_tell(&log);
|
|
delete ev;
|
|
|
|
if (++event_count >= limit_end)
|
|
break;
|
|
}
|
|
|
|
if (event_count < limit_end && log.error)
|
|
{
|
|
errmsg = "Wrong offset or I/O error";
|
|
pthread_mutex_unlock(log_lock);
|
|
goto err;
|
|
}
|
|
|
|
pthread_mutex_unlock(log_lock);
|
|
}
|
|
|
|
ret= FALSE;
|
|
|
|
err:
|
|
delete description_event;
|
|
if (file >= 0)
|
|
{
|
|
end_io_cache(&log);
|
|
(void) my_close(file, MYF(MY_WME));
|
|
}
|
|
|
|
if (errmsg)
|
|
{
|
|
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
|
|
"SHOW BINLOG EVENTS", errmsg);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
send_eof(thd);
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thd->current_linfo = 0;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
bool show_binlog_info(THD* thd)
|
|
{
|
|
Protocol *protocol= thd->protocol;
|
|
DBUG_ENTER("show_binlog_info");
|
|
List<Item> field_list;
|
|
field_list.push_back(new Item_empty_string("File", FN_REFLEN));
|
|
field_list.push_back(new Item_return_int("Position",20,
|
|
MYSQL_TYPE_LONGLONG));
|
|
field_list.push_back(new Item_empty_string("Binlog_Do_DB",255));
|
|
field_list.push_back(new Item_empty_string("Binlog_Ignore_DB",255));
|
|
|
|
if (protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
protocol->prepare_for_resend();
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
LOG_INFO li;
|
|
mysql_bin_log.get_current_log(&li);
|
|
int dir_len = dirname_length(li.log_file_name);
|
|
protocol->store(li.log_file_name + dir_len, &my_charset_bin);
|
|
protocol->store((ulonglong) li.pos);
|
|
protocol->store(binlog_filter->get_do_db());
|
|
protocol->store(binlog_filter->get_ignore_db());
|
|
if (protocol->write())
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
send_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
Send a list of all binary logs to client
|
|
|
|
SYNOPSIS
|
|
show_binlogs()
|
|
thd Thread specific variable
|
|
|
|
RETURN VALUES
|
|
FALSE OK
|
|
TRUE error
|
|
*/
|
|
|
|
bool show_binlogs(THD* thd)
|
|
{
|
|
IO_CACHE *index_file;
|
|
LOG_INFO cur;
|
|
File file;
|
|
char fname[FN_REFLEN];
|
|
List<Item> field_list;
|
|
uint length;
|
|
int cur_dir_len;
|
|
Protocol *protocol= thd->protocol;
|
|
DBUG_ENTER("show_binlogs");
|
|
|
|
if (!mysql_bin_log.is_open())
|
|
{
|
|
my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0));
|
|
return 1;
|
|
}
|
|
|
|
field_list.push_back(new Item_empty_string("Log_name", 255));
|
|
field_list.push_back(new Item_return_int("File_size", 20,
|
|
MYSQL_TYPE_LONGLONG));
|
|
if (protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
pthread_mutex_lock(mysql_bin_log.get_log_lock());
|
|
mysql_bin_log.lock_index();
|
|
index_file=mysql_bin_log.get_index_file();
|
|
|
|
mysql_bin_log.raw_get_current_log(&cur); // dont take mutex
|
|
pthread_mutex_unlock(mysql_bin_log.get_log_lock()); // lockdep, OK
|
|
|
|
cur_dir_len= dirname_length(cur.log_file_name);
|
|
|
|
reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 0);
|
|
|
|
/* The file ends with EOF or empty line */
|
|
while ((length=my_b_gets(index_file, fname, sizeof(fname))) > 1)
|
|
{
|
|
int dir_len;
|
|
ulonglong file_length= 0; // Length if open fails
|
|
fname[--length] = '\0'; // remove the newline
|
|
|
|
protocol->prepare_for_resend();
|
|
dir_len= dirname_length(fname);
|
|
length-= dir_len;
|
|
protocol->store(fname + dir_len, length, &my_charset_bin);
|
|
|
|
if (!(strncmp(fname+dir_len, cur.log_file_name+cur_dir_len, length)))
|
|
file_length= cur.pos; /* The active log, use the active position */
|
|
else
|
|
{
|
|
/* this is an old log, open it and find the size */
|
|
if ((file= my_open(fname, O_RDONLY | O_SHARE | O_BINARY,
|
|
MYF(0))) >= 0)
|
|
{
|
|
file_length= (ulonglong) my_seek(file, 0L, MY_SEEK_END, MYF(0));
|
|
my_close(file, MYF(0));
|
|
}
|
|
}
|
|
protocol->store(file_length);
|
|
if (protocol->write())
|
|
goto err;
|
|
}
|
|
mysql_bin_log.unlock_index();
|
|
send_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
|
|
err:
|
|
mysql_bin_log.unlock_index();
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
|
|
int log_loaded_block(IO_CACHE* file)
|
|
{
|
|
LOAD_FILE_INFO *lf_info;
|
|
uint block_len ;
|
|
|
|
/* file->request_pos contains position where we started last read */
|
|
char* buffer = (char*) file->request_pos;
|
|
if (!(block_len = (char*) file->read_end - (char*) buffer))
|
|
return 0;
|
|
lf_info = (LOAD_FILE_INFO*) file->arg;
|
|
if (lf_info->thd->current_stmt_binlog_row_based)
|
|
return 0;
|
|
if (lf_info->last_pos_in_file != HA_POS_ERROR &&
|
|
lf_info->last_pos_in_file >= file->pos_in_file)
|
|
return 0;
|
|
lf_info->last_pos_in_file = file->pos_in_file;
|
|
if (lf_info->wrote_create_file)
|
|
{
|
|
Append_block_log_event a(lf_info->thd, lf_info->thd->db, buffer,
|
|
block_len, lf_info->log_delayed);
|
|
mysql_bin_log.write(&a);
|
|
}
|
|
else
|
|
{
|
|
Begin_load_query_log_event b(lf_info->thd, lf_info->thd->db,
|
|
buffer, block_len,
|
|
lf_info->log_delayed);
|
|
mysql_bin_log.write(&b);
|
|
lf_info->wrote_create_file = 1;
|
|
DBUG_SYNC_POINT("debug_lock.created_file_event",10);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#endif /* HAVE_REPLICATION */
|
|
|
|
|