mirror of
https://github.com/MariaDB/server.git
synced 2025-05-10 02:01:19 +03:00
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
753 lines
18 KiB
C++
753 lines
18 KiB
C++
/* Copyright (C) 2004 MySQL AB
|
|
|
|
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 */
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "instance_options.h"
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include "buffer.h"
|
|
#include "instance.h"
|
|
#include "log.h"
|
|
#include "options.h"
|
|
#include "parse_output.h"
|
|
#include "priv.h"
|
|
|
|
|
|
/* Create "mysqld ..." command in the buffer */
|
|
|
|
static inline bool create_mysqld_command(Buffer *buf,
|
|
const LEX_STRING *mysqld_path,
|
|
const LEX_STRING *option)
|
|
{
|
|
int position= 0;
|
|
|
|
if (buf->get_size()) /* malloc succeeded */
|
|
{
|
|
#ifdef __WIN__
|
|
buf->append(position++, "\"", 1);
|
|
#endif
|
|
buf->append(position, mysqld_path->str, mysqld_path->length);
|
|
position+= mysqld_path->length;
|
|
#ifdef __WIN__
|
|
buf->append(position++, "\"", 1);
|
|
#endif
|
|
/* here the '\0' character is copied from the option string */
|
|
buf->append(position, option->str, option->length + 1);
|
|
|
|
return buf->is_error() ? TRUE : FALSE;
|
|
}
|
|
return TRUE;
|
|
}
|
|
|
|
static inline bool is_path_separator(char ch)
|
|
{
|
|
#if defined(__WIN__) || defined(__NETWARE__)
|
|
/* On windows and netware more delimiters are possible */
|
|
return ch == FN_LIBCHAR || ch == FN_DEVCHAR || ch == '/';
|
|
#else
|
|
return ch == FN_LIBCHAR; /* Unixes */
|
|
#endif
|
|
}
|
|
|
|
|
|
static char *find_last_path_separator(char *path, uint length)
|
|
{
|
|
while (length)
|
|
{
|
|
if (is_path_separator(path[length]))
|
|
return path + length;
|
|
length--;
|
|
}
|
|
return NULL; /* No path separator found */
|
|
}
|
|
|
|
|
|
|
|
bool Instance_options::is_option_im_specific(const char *option_name)
|
|
{
|
|
static const char *IM_SPECIFIC_OPTIONS[] =
|
|
{
|
|
"nonguarded",
|
|
"mysqld-path",
|
|
"shutdown-delay",
|
|
NULL
|
|
};
|
|
|
|
for (int i= 0; IM_SPECIFIC_OPTIONS[i]; ++i)
|
|
{
|
|
if (!strcmp(option_name, IM_SPECIFIC_OPTIONS[i]))
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
Instance_options::Instance_options()
|
|
:mysqld_version(NULL), mysqld_socket(NULL), mysqld_datadir(NULL),
|
|
mysqld_pid_file(NULL),
|
|
nonguarded(NULL),
|
|
mysqld_port(NULL),
|
|
mysqld_port_val(0),
|
|
shutdown_delay(NULL),
|
|
shutdown_delay_val(0),
|
|
filled_default_options(0)
|
|
{
|
|
mysqld_path.str= NULL;
|
|
mysqld_path.length= 0;
|
|
|
|
mysqld_real_path.str= NULL;
|
|
mysqld_real_path.length= 0;
|
|
|
|
memset(logs, 0, sizeof(logs));
|
|
}
|
|
|
|
|
|
/*
|
|
Get compiled-in value of default_option
|
|
|
|
SYNOPSIS
|
|
get_default_option()
|
|
result buffer to put found value
|
|
result_len buffer size
|
|
option_name the name of the option, prefixed with "--"
|
|
|
|
DESCRIPTION
|
|
|
|
Get compile-in value of requested option from server
|
|
|
|
RETURN
|
|
0 - ok
|
|
1 - error occured
|
|
*/
|
|
|
|
|
|
int Instance_options::get_default_option(char *result, size_t result_len,
|
|
const char *option_name)
|
|
{
|
|
int rc= 1;
|
|
LEX_STRING verbose_option=
|
|
{ C_STRING_WITH_LEN(" --no-defaults --verbose --help") };
|
|
|
|
/* reserve space for the path + option + final '\0' */
|
|
Buffer cmd(mysqld_path.length + verbose_option.length + 1);
|
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &verbose_option))
|
|
goto err;
|
|
|
|
/* +2 eats first "--" from the option string (E.g. "--datadir") */
|
|
rc= parse_output_and_get_value((char*) cmd.buffer, option_name + 2,
|
|
result, result_len, GET_VALUE);
|
|
err:
|
|
return rc;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill mysqld_version option (used at initialization stage)
|
|
|
|
SYNOPSIS
|
|
fill_instance_version()
|
|
|
|
DESCRIPTION
|
|
|
|
Get mysqld version string from "mysqld --version" output.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - error occured
|
|
*/
|
|
|
|
bool Instance_options::fill_instance_version()
|
|
{
|
|
char result[MAX_VERSION_LENGTH];
|
|
LEX_STRING version_option=
|
|
{ C_STRING_WITH_LEN(" --no-defaults --version") };
|
|
Buffer cmd(mysqld_path.length + version_option.length + 1);
|
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &version_option))
|
|
{
|
|
log_error("Failed to get version of '%s': out of memory.",
|
|
(const char *) mysqld_path.str);
|
|
return TRUE;
|
|
}
|
|
|
|
bzero(result, MAX_VERSION_LENGTH);
|
|
|
|
if (parse_output_and_get_value((char*) cmd.buffer, "Ver", result,
|
|
MAX_VERSION_LENGTH, GET_LINE))
|
|
{
|
|
log_error("Failed to get version of '%s': unexpected output.",
|
|
(const char *) mysqld_path.str);
|
|
return TRUE;
|
|
}
|
|
|
|
DBUG_ASSERT(*result != '\0');
|
|
|
|
{
|
|
char *start;
|
|
/* chop the newline from the end of the version string */
|
|
result[strlen(result) - NEWLINE_LEN]= '\0';
|
|
/* trim leading whitespaces */
|
|
start= result;
|
|
while (my_isspace(default_charset_info, *start))
|
|
++start;
|
|
|
|
mysqld_version= strdup_root(&alloc, start);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill mysqld_real_path
|
|
|
|
SYNOPSIS
|
|
fill_mysqld_real_path()
|
|
|
|
DESCRIPTION
|
|
|
|
Get the real path to mysqld from "mysqld --help" output.
|
|
Will print the realpath of mysqld between "Usage: " and "[OPTIONS]"
|
|
|
|
This is needed if the mysqld_path variable is pointing at a
|
|
script(for example libtool) or a symlink.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - error occured
|
|
*/
|
|
|
|
bool Instance_options::fill_mysqld_real_path()
|
|
{
|
|
char result[FN_REFLEN];
|
|
LEX_STRING help_option=
|
|
{ C_STRING_WITH_LEN(" --no-defaults --help") };
|
|
Buffer cmd(mysqld_path.length + help_option.length);
|
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &help_option))
|
|
{
|
|
log_error("Failed to get real path of '%s': out of memory.",
|
|
(const char *) mysqld_path.str);
|
|
return TRUE;
|
|
}
|
|
|
|
bzero(result, FN_REFLEN);
|
|
|
|
if (parse_output_and_get_value((char*) cmd.buffer, "Usage: ",
|
|
result, FN_REFLEN,
|
|
GET_LINE))
|
|
{
|
|
log_error("Failed to get real path of '%s': unexpected output.",
|
|
(const char *) mysqld_path.str);
|
|
return TRUE;
|
|
}
|
|
|
|
DBUG_ASSERT(*result != '\0');
|
|
|
|
{
|
|
char* options_str;
|
|
/* chop the path of at [OPTIONS] */
|
|
if ((options_str= strstr(result, "[OPTIONS]")))
|
|
*options_str= '\0';
|
|
mysqld_real_path.str= strdup_root(&alloc, result);
|
|
mysqld_real_path.length= strlen(mysqld_real_path.str);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill various log options
|
|
|
|
SYNOPSIS
|
|
fill_log_options()
|
|
|
|
DESCRIPTION
|
|
|
|
Compute paths to enabled log files. If the path is not specified in the
|
|
instance explicitly (I.e. log=/home/user/mysql.log), we try to guess the
|
|
file name and placement.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - error occured
|
|
*/
|
|
|
|
bool Instance_options::fill_log_options()
|
|
{
|
|
Buffer buff;
|
|
enum { MAX_LOG_OPTION_LENGTH= 256 };
|
|
char datadir[MAX_LOG_OPTION_LENGTH];
|
|
char hostname[MAX_LOG_OPTION_LENGTH];
|
|
uint hostname_length;
|
|
struct log_files_st
|
|
{
|
|
const char *name;
|
|
uint length;
|
|
char **value;
|
|
const char *default_suffix;
|
|
} logs_st[]=
|
|
{
|
|
{"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"},
|
|
{"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"},
|
|
{"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"},
|
|
{NULL, 0, NULL, NULL}
|
|
};
|
|
struct log_files_st *log_files;
|
|
|
|
/* compute hostname and datadir for the instance */
|
|
if (mysqld_datadir == NULL)
|
|
{
|
|
if (get_default_option(datadir, MAX_LOG_OPTION_LENGTH, "--datadir"))
|
|
return TRUE;
|
|
}
|
|
else
|
|
{
|
|
/* below is safe, as --datadir always has a value */
|
|
strmake(datadir, mysqld_datadir, MAX_LOG_OPTION_LENGTH - 1);
|
|
}
|
|
|
|
if (gethostname(hostname,sizeof(hostname)-1) < 0)
|
|
strmov(hostname, "mysql");
|
|
|
|
hostname[MAX_LOG_OPTION_LENGTH - 1]= 0; /* Safety */
|
|
hostname_length= strlen(hostname);
|
|
|
|
|
|
for (log_files= logs_st; log_files->name; log_files++)
|
|
{
|
|
for (int i=0; (argv[i] != 0); i++)
|
|
{
|
|
if (!strncmp(argv[i], log_files->name, log_files->length))
|
|
{
|
|
/*
|
|
This is really log_files->name option if and only if it is followed
|
|
by '=', '\0' or space character. This way we can distinguish such
|
|
options as '--log' and '--log-bin'. This is checked in the following
|
|
two statements.
|
|
*/
|
|
if (argv[i][log_files->length] == '\0' ||
|
|
my_isspace(default_charset_info, argv[i][log_files->length]))
|
|
{
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
fn_format(full_name, hostname, datadir, "",
|
|
MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
|
|
if ((MAX_LOG_OPTION_LENGTH - strlen(full_name)) <=
|
|
strlen(log_files->default_suffix))
|
|
return TRUE;
|
|
|
|
strmov(full_name + strlen(full_name), log_files->default_suffix);
|
|
|
|
/*
|
|
If there were specified two identical logfiles options,
|
|
we would loose some memory in MEM_ROOT here. However
|
|
this situation is not typical.
|
|
*/
|
|
*(log_files->value)= strdup_root(&alloc, full_name);
|
|
}
|
|
|
|
if (argv[i][log_files->length] == '=')
|
|
{
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
fn_format(full_name, argv[i] +log_files->length + 1,
|
|
datadir, "", MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
if (!(*(log_files->value)= strdup_root(&alloc, full_name)))
|
|
return TRUE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Get the full pid file name with path
|
|
|
|
SYNOPSIS
|
|
get_pid_filaname()
|
|
result buffer to sotre the pidfile value
|
|
|
|
IMPLEMENTATION
|
|
Get the data directory, then get the pid filename
|
|
(which is always set for an instance), then load the
|
|
full path with my_load_path(). It takes into account
|
|
whether it is already an absolute path or it should be
|
|
prefixed with the datadir and so on.
|
|
|
|
RETURN
|
|
0 - ok
|
|
1 - error occured
|
|
*/
|
|
|
|
int Instance_options::get_pid_filename(char *result)
|
|
{
|
|
char datadir[MAX_PATH_LEN];
|
|
|
|
if (mysqld_datadir == NULL)
|
|
{
|
|
/* we might get an error here if we have wrong path to the mysqld binary */
|
|
if (get_default_option(datadir, sizeof(datadir), "--datadir"))
|
|
return 1;
|
|
}
|
|
else
|
|
strxnmov(datadir, MAX_PATH_LEN - 1, mysqld_datadir, "/", NullS);
|
|
|
|
/* get the full path to the pidfile */
|
|
my_load_path(result, mysqld_pid_file, datadir);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Instance_options::unlink_pidfile()
|
|
{
|
|
return unlink(pid_file_with_path);
|
|
}
|
|
|
|
|
|
pid_t Instance_options::load_pid()
|
|
{
|
|
FILE *pid_file_stream;
|
|
|
|
/* get the pid */
|
|
if ((pid_file_stream= my_fopen(pid_file_with_path,
|
|
O_RDONLY | O_BINARY, MYF(0))) != NULL)
|
|
{
|
|
pid_t pid;
|
|
|
|
if (fscanf(pid_file_stream, "%i", &pid) != 1)
|
|
pid= -1;
|
|
my_fclose(pid_file_stream, MYF(0));
|
|
return pid;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Instance_options::complete_initialization()
|
|
{
|
|
int arg_idx;
|
|
const char *tmp;
|
|
char *end;
|
|
char bin_name_firstchar;
|
|
|
|
if (!mysqld_path.str)
|
|
{
|
|
/*
|
|
Need to copy the path to allocated memory, as convert_dirname() might
|
|
need to change it
|
|
*/
|
|
mysqld_path.str= strdup_root(&alloc, Options::Main::default_mysqld_path);
|
|
if (!mysqld_path.str)
|
|
return TRUE;
|
|
}
|
|
|
|
mysqld_path.length= strlen(mysqld_path.str);
|
|
|
|
/*
|
|
If we found path with no slashes (end == NULL), we should not call
|
|
convert_dirname() at all. As we have got relative path to the binary.
|
|
That is, user supposes that mysqld resides in the same dir as
|
|
mysqlmanager.
|
|
*/
|
|
if ((end= find_last_path_separator(mysqld_path.str, mysqld_path.length)))
|
|
{
|
|
bin_name_firstchar= end[1];
|
|
|
|
/*
|
|
Below we will conver the path to mysqld in the case, it was given
|
|
in a format of another OS (e.g. uses '/' instead of '\' etc).
|
|
Here we strip the path to get rid of the binary name ("mysqld"),
|
|
we do it by removing first letter of the binary name (e.g. 'm'
|
|
in "mysqld"). Later we put it back.
|
|
*/
|
|
end[1]= 0;
|
|
|
|
/* convert dirname to the format of current OS */
|
|
convert_dirname((char*)mysqld_path.str, mysqld_path.str, NullS);
|
|
|
|
/* put back the first character of the binary name*/
|
|
end[1]= bin_name_firstchar;
|
|
}
|
|
|
|
if (mysqld_port)
|
|
mysqld_port_val= atoi(mysqld_port);
|
|
|
|
if (shutdown_delay)
|
|
shutdown_delay_val= atoi(shutdown_delay);
|
|
|
|
if (!(tmp= strdup_root(&alloc, "--no-defaults")))
|
|
return TRUE;
|
|
|
|
if (!mysqld_pid_file)
|
|
{
|
|
char pidfilename[MAX_PATH_LEN];
|
|
char hostname[MAX_PATH_LEN];
|
|
|
|
/*
|
|
If we created only one istance [mysqld], because no config. files were
|
|
found, we would like to model mysqld pid file values.
|
|
*/
|
|
|
|
if (!gethostname(hostname, sizeof(hostname) - 1))
|
|
{
|
|
if (Instance::is_mysqld_compatible_name(&instance_name))
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, hostname, ".pid", NullS);
|
|
else
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, instance_name.str, "-",
|
|
hostname, ".pid", NullS);
|
|
}
|
|
else
|
|
{
|
|
if (Instance::is_mysqld_compatible_name(&instance_name))
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "mysql", ".pid", NullS);
|
|
else
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, instance_name.str, ".pid",
|
|
NullS);
|
|
}
|
|
|
|
Named_value option((char *) "pid-file", pidfilename);
|
|
|
|
set_option(&option);
|
|
}
|
|
|
|
if (get_pid_filename(pid_file_with_path))
|
|
return TRUE;
|
|
|
|
/* we need to reserve space for the final zero + possible default options */
|
|
if (!(argv= (char**)
|
|
alloc_root(&alloc, (get_num_options() + 1
|
|
+ MAX_NUMBER_OF_DEFAULT_OPTIONS) * sizeof(char*))))
|
|
return TRUE;
|
|
filled_default_options= 0;
|
|
|
|
/* the path must be first in the argv */
|
|
if (add_to_argv(mysqld_path.str))
|
|
return TRUE;
|
|
|
|
if (add_to_argv(tmp))
|
|
return TRUE;
|
|
|
|
arg_idx= filled_default_options;
|
|
for (int opt_idx= 0; opt_idx < get_num_options(); ++opt_idx)
|
|
{
|
|
char option_str[MAX_OPTION_STR_LEN];
|
|
Named_value option= get_option(opt_idx);
|
|
|
|
if (is_option_im_specific(option.get_name()))
|
|
continue;
|
|
|
|
char *ptr= strxnmov(option_str, MAX_OPTION_LEN + 3, "--", option.get_name(),
|
|
NullS);
|
|
|
|
if (option.get_value()[0])
|
|
strxnmov(ptr, MAX_OPTION_LEN + 2, "=", option.get_value(), NullS);
|
|
|
|
argv[arg_idx++]= strdup_root(&alloc, option_str);
|
|
}
|
|
|
|
argv[arg_idx]= 0;
|
|
|
|
if (fill_log_options() || fill_mysqld_real_path() || fill_instance_version())
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
bool Instance_options::set_option(Named_value *option)
|
|
{
|
|
bool err_status;
|
|
int idx= find_option(option->get_name());
|
|
char *option_name_str;
|
|
char *option_value_str;
|
|
|
|
if (!(option_name_str= Named_value::alloc_str(option->get_name())))
|
|
return TRUE;
|
|
|
|
if (!(option_value_str= Named_value::alloc_str(option->get_value())))
|
|
{
|
|
Named_value::free_str(&option_name_str);
|
|
return TRUE;
|
|
}
|
|
|
|
Named_value option_copy(option_name_str, option_value_str);
|
|
|
|
if (idx < 0)
|
|
err_status= options.add_element(&option_copy);
|
|
else
|
|
err_status= options.replace_element(idx, &option_copy);
|
|
|
|
if (!err_status)
|
|
update_var(option_copy.get_name(), option_copy.get_value());
|
|
else
|
|
option_copy.free();
|
|
|
|
return err_status;
|
|
}
|
|
|
|
|
|
void Instance_options::unset_option(const char *option_name)
|
|
{
|
|
int idx= find_option(option_name);
|
|
|
|
if (idx < 0)
|
|
return; /* the option has not been set. */
|
|
|
|
options.remove_element(idx);
|
|
|
|
update_var(option_name, NULL);
|
|
}
|
|
|
|
|
|
void Instance_options::update_var(const char *option_name,
|
|
const char *option_value)
|
|
{
|
|
struct options_st
|
|
{
|
|
const char *name;
|
|
uint name_len;
|
|
const char **var;
|
|
} options_def[]=
|
|
{
|
|
{"socket", 6, &mysqld_socket},
|
|
{"port", 4, &mysqld_port},
|
|
{"datadir", 7, &mysqld_datadir},
|
|
{"pid-file", 8, &mysqld_pid_file},
|
|
{"nonguarded", 10, &nonguarded},
|
|
{"mysqld-path", 11, (const char **) &mysqld_path.str},
|
|
{"shutdown-delay", 14, &shutdown_delay},
|
|
{NULL, 0, NULL}
|
|
};
|
|
|
|
for (options_st *opt= options_def; opt->name; ++opt)
|
|
{
|
|
if (!strncmp(opt->name, option_name, opt->name_len))
|
|
{
|
|
*(opt->var)= option_value;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
int Instance_options::find_option(const char *option_name)
|
|
{
|
|
for (int i= 0; i < get_num_options(); i++)
|
|
{
|
|
if (!strcmp(get_option(i).get_name(), option_name))
|
|
return i;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
int Instance_options::add_to_argv(const char* option)
|
|
{
|
|
DBUG_ASSERT(filled_default_options < MAX_NUMBER_OF_DEFAULT_OPTIONS);
|
|
|
|
if (option)
|
|
argv[filled_default_options++]= (char*) option;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* function for debug purposes */
|
|
void Instance_options::print_argv()
|
|
{
|
|
int i;
|
|
|
|
printf("printing out an instance %s argv:\n",
|
|
(const char *) instance_name.str);
|
|
|
|
for (i=0; argv[i] != NULL; i++)
|
|
printf("argv: %s\n", argv[i]);
|
|
}
|
|
|
|
|
|
/*
|
|
We execute this function to initialize some options.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - memory allocation error
|
|
*/
|
|
|
|
bool Instance_options::init(const LEX_STRING *instance_name_arg)
|
|
{
|
|
instance_name.length= instance_name_arg->length;
|
|
|
|
init_alloc_root(&alloc, MEM_ROOT_BLOCK_SIZE, 0);
|
|
|
|
if (options.init())
|
|
return TRUE;
|
|
|
|
if (!(instance_name.str= strmake_root(&alloc, instance_name_arg->str,
|
|
instance_name_arg->length)))
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
Instance_options::~Instance_options()
|
|
{
|
|
free_root(&alloc, MYF(0));
|
|
}
|
|
|
|
|
|
uint Instance_options::get_shutdown_delay() const
|
|
{
|
|
static const uint DEFAULT_SHUTDOWN_DELAY= 35;
|
|
|
|
/*
|
|
NOTE: it is important to check shutdown_delay here, but use
|
|
shutdown_delay_val. The idea is that if the option is unset,
|
|
shutdown_delay will be NULL, but shutdown_delay_val will not be reset.
|
|
*/
|
|
|
|
return shutdown_delay ? shutdown_delay_val : DEFAULT_SHUTDOWN_DELAY;
|
|
}
|
|
|
|
int Instance_options::get_mysqld_port() const
|
|
{
|
|
/*
|
|
NOTE: it is important to check mysqld_port here, but use mysqld_port_val.
|
|
The idea is that if the option is unset, mysqld_port will be NULL, but
|
|
mysqld_port_val will not be reset.
|
|
*/
|
|
|
|
return mysqld_port ? mysqld_port_val : 0;
|
|
}
|
|
|