mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f252f9248a
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c BitKeeper/etc/ignore: added libmysqld/ha_ndbcluster_cond.cc --- added debian/defs.mk debian/control client/completion_hash.cc: Remove not needed casts client/my_readline.h: Remove some old types client/mysql.cc: Simplify types client/mysql_upgrade.c: Remove some old types Update call to dirname_part client/mysqladmin.cc: Remove some old types client/mysqlbinlog.cc: Remove some old types Change some buffers to be uchar to avoid casts client/mysqlcheck.c: Remove some old types client/mysqldump.c: Remove some old types Remove some not needed casts Change some string lengths to size_t client/mysqlimport.c: Remove some old types client/mysqlshow.c: Remove some old types client/mysqlslap.c: Remove some old types Remove some not needed casts client/mysqltest.c: Removed some old types Removed some not needed casts Updated hash-get-key function arguments Updated parameters to dirname_part() client/readline.cc: Removed some old types Removed some not needed casts Changed some string lengths to use size_t client/sql_string.cc: Removed some old types dbug/dbug.c: Removed some old types Changed some string lengths to use size_t Changed some prototypes to avoid casts extra/comp_err.c: Removed some old types extra/innochecksum.c: Removed some old types extra/my_print_defaults.c: Removed some old types extra/mysql_waitpid.c: Removed some old types extra/perror.c: Removed some old types extra/replace.c: Removed some old types Updated parameters to dirname_part() extra/resolve_stack_dump.c: Removed some old types extra/resolveip.c: Removed some old types include/config-win.h: Removed some old types include/decimal.h: Changed binary strings to be uchar* instead of char* include/ft_global.h: Removed some old types include/hash.h: Removed some old types include/heap.h: Removed some old types Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable include/keycache.h: Removed some old types include/m_ctype.h: Removed some old types Changed some string lengths to use size_t Changed character length functions to return uint unsigned char -> uchar include/m_string.h: Removed some old types Changed some string lengths to use size_t include/my_alloc.h: Changed some string lengths to use size_t include/my_base.h: Removed some old types include/my_dbug.h: Removed some old types Changed some string lengths to use size_t Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage include/my_getopt.h: Removed some old types include/my_global.h: Removed old types: my_size_t -> size_t byte -> uchar gptr -> uchar * include/my_list.h: Removed some old types include/my_nosys.h: Removed some old types include/my_pthread.h: Removed some old types include/my_sys.h: Removed some old types Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read() Changed some string lengths to use size_t my_malloc() / my_free() now uses void * Updated parameters to dirname_part() & my_uncompress() include/my_tree.h: Removed some old types include/my_trie.h: Removed some old types include/my_user.h: Changed some string lengths to use size_t include/my_vle.h: Removed some old types include/my_xml.h: Removed some old types Changed some string lengths to use size_t include/myisam.h: Removed some old types include/myisammrg.h: Removed some old types include/mysql.h: Removed some old types Changed byte streams to use uchar* instead of char* include/mysql_com.h: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts include/queues.h: Removed some old types include/sql_common.h: Removed some old types include/sslopt-longopts.h: Removed some old types include/violite.h: Removed some old types Changed some string lengths to use size_t libmysql/client_settings.h: Removed some old types libmysql/libmysql.c: Removed some old types libmysql/manager.c: Removed some old types libmysqld/emb_qcache.cc: Removed some old types libmysqld/emb_qcache.h: Removed some old types libmysqld/lib_sql.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts true -> TRUE, false -> FALSE mysys/array.c: Removed some old types mysys/charset.c: Changed some string lengths to use size_t mysys/checksum.c: Include zlib to get definition for crc32 Removed some old types mysys/default.c: Removed some old types Changed some string lengths to use size_t mysys/default_modify.c: Changed some string lengths to use size_t Removed some not needed casts mysys/hash.c: Removed some old types Changed some string lengths to use size_t Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function. hash_element now takes 'ulong' as the index type (cleanup) mysys/list.c: Removed some old types mysys/mf_cache.c: Changed some string lengths to use size_t mysys/mf_dirname.c: Removed some old types Changed some string lengths to use size_t Added argument to dirname_part() to avoid calculation of length for 'to' mysys/mf_fn_ext.c: Removed some old types Updated parameters to dirname_part() mysys/mf_format.c: Removed some old types Changed some string lengths to use size_t mysys/mf_getdate.c: Removed some old types mysys/mf_iocache.c: Removed some old types Changed some string lengths to use size_t Changed calculation of 'max_length' to be done the same way in all functions mysys/mf_iocache2.c: Removed some old types Changed some string lengths to use size_t Clean up comments Removed not needed indentation mysys/mf_keycache.c: Removed some old types mysys/mf_keycaches.c: Removed some old types mysys/mf_loadpath.c: Removed some old types mysys/mf_pack.c: Removed some old types Changed some string lengths to use size_t Removed some not needed casts Removed very old VMS code Updated parameters to dirname_part() Use result of dirnam_part() to remove call to strcat() mysys/mf_path.c: Removed some old types mysys/mf_radix.c: Removed some old types mysys/mf_same.c: Removed some old types mysys/mf_sort.c: Removed some old types mysys/mf_soundex.c: Removed some old types mysys/mf_strip.c: Removed some old types mysys/mf_tempdir.c: Removed some old types mysys/mf_unixpath.c: Removed some old types mysys/mf_wfile.c: Removed some old types mysys/mulalloc.c: Removed some old types mysys/my_alloc.c: Removed some old types Changed some string lengths to use size_t Use void* as type for allocated memory area Removed some not needed casts Changed argument 'Size' to 'length' according coding guidelines mysys/my_chsize.c: Changed some buffers to be uchar* to avoid casts mysys/my_compress.c: More comments Removed some old types Changed string lengths to use size_t Changed arguments to my_uncompress() to make them easier to understand Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) Changed type of 'pack_data' argument to packfrm() to avoid casts. mysys/my_conio.c: Changed some string lengths to use size_t mysys/my_create.c: Removed some old types mysys/my_div.c: Removed some old types mysys/my_error.c: Removed some old types mysys/my_fopen.c: Removed some old types mysys/my_fstream.c: Removed some old types Changed some string lengths to use size_t writen -> written mysys/my_getopt.c: Removed some old types mysys/my_getwd.c: Removed some old types More comments mysys/my_init.c: Removed some old types mysys/my_largepage.c: Removed some old types Changed some string lengths to use size_t mysys/my_lib.c: Removed some old types mysys/my_lockmem.c: Removed some old types mysys/my_malloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/my_memmem.c: Indentation cleanup mysys/my_once.c: Removed some old types Changed malloc(), free() and related functions to use void * mysys/my_open.c: Removed some old types mysys/my_pread.c: Removed some old types Changed all functions to use size_t Added comment for how my_pread() / my_pwrite() are supposed to work. Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. (If we ever would really need this, it should be enabled only with a flag argument) mysys/my_quick.c: Removed some old types Changed all functions to use size_t mysys/my_read.c: Removed some old types Changed all functions to use size_t mysys/my_realloc.c: Removed some old types Use void* as type for allocated memory area Changed all functions to use size_t mysys/my_static.c: Removed some old types mysys/my_static.h: Removed some old types mysys/my_vle.c: Removed some old types mysys/my_wincond.c: Removed some old types mysys/my_windac.c: Removed some old types mysys/my_write.c: Removed some old types Changed all functions to use size_t mysys/ptr_cmp.c: Removed some old types Changed all functions to use size_t mysys/queues.c: Removed some old types mysys/safemalloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/string.c: Removed some old types Changed all functions to use size_t mysys/testhash.c: Removed some old types mysys/thr_alarm.c: Removed some old types mysys/thr_lock.c: Removed some old types mysys/tree.c: Removed some old types mysys/trie.c: Removed some old types mysys/typelib.c: Removed some old types plugin/daemon_example/daemon_example.cc: Removed some old types regex/reginit.c: Removed some old types server-tools/instance-manager/buffer.cc: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/buffer.h: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/commands.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_map.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_options.cc: Changed buffer to be of type uchar* Replaced alloc_root + strcpy() with strdup_root() server-tools/instance-manager/mysql_connection.cc: Changed buffer to be of type uchar* server-tools/instance-manager/options.cc: Removed some old types server-tools/instance-manager/parse.cc: Changed some string lengths to use size_t server-tools/instance-manager/parse.h: Removed some old types Changed some string lengths to use size_t server-tools/instance-manager/protocol.cc: Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t server-tools/instance-manager/protocol.h: Changed some string lengths to use size_t server-tools/instance-manager/user_map.cc: Removed some old types Changed some string lengths to use size_t sql/derror.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/discover.cc: Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts sql/event_data_objects.cc: Removed some old types Added missing casts for alloc() and sprintf() sql/event_db_repository.cc: Changed some buffers to be uchar* to avoid casts Added missing casts for sprintf() sql/event_queue.cc: Removed some old types sql/field.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/field.h: Removed some old types Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). Changed some string lengths to use size_t Removed some not needed casts Changed val_xxx(xxx, new_ptr) to take const pointers sql/field_conv.cc: Removed some old types Added casts required because memory area pointers are now uchar* sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/gen_lex_hash.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/gstream.h: Added required cast sql/ha_ndbcluster.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Added required casts Removed some not needed casts sql/ha_ndbcluster.h: Removed some old types sql/ha_ndbcluster_binlog.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake() Changed some string lengths to use size_t Added missing casts for alloc() and sprintf() sql/ha_ndbcluster_binlog.h: Removed some old types sql/ha_ndbcluster_cond.cc: Removed some old types Removed some not needed casts sql/ha_ndbcluster_cond.h: Removed some old types sql/ha_partition.cc: Removed some old types Changed prototype for change_partition() to avoid casts sql/ha_partition.h: Removed some old types sql/handler.cc: Removed some old types Changed some string lengths to use size_t sql/handler.h: Removed some old types Changed some string lengths to use size_t Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts sql/hash_filo.h: Removed some old types Changed all functions to use size_t sql/hostname.cc: Removed some old types sql/item.cc: Removed some old types Changed some string lengths to use size_t Use strmake() instead of memdup() to create a null terminated string. Updated calls to new Field() sql/item.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.cc: Removed some old types Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.h: Removed some old types sql/item_create.cc: Removed some old types sql/item_func.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added test for failing alloc() in init_result_field() Remove old confusing comment Fixed compiler warning sql/item_func.h: Removed some old types sql/item_row.cc: Removed some old types sql/item_row.h: Removed some old types sql/item_strfunc.cc: Include zlib (needed becasue we call crc32) Removed some old types sql/item_strfunc.h: Removed some old types Changed some types to match new function prototypes sql/item_subselect.cc: Removed some old types sql/item_subselect.h: Removed some old types sql/item_sum.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/item_sum.h: Removed some old types sql/item_timefunc.cc: Removed some old types Changed some string lengths to use size_t sql/item_timefunc.h: Removed some old types sql/item_xmlfunc.cc: Changed some string lengths to use size_t sql/item_xmlfunc.h: Removed some old types sql/key.cc: Removed some old types Removed some not needed casts sql/lock.cc: Removed some old types Added some cast to my_multi_malloc() arguments for safety sql/log.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Changed usage of pwrite() to not assume it holds the cursor position for the file Made usage of my_read() safer sql/log_event.cc: Removed some old types Added checking of return value of malloc() in pack_info() Changed some buffers to be uchar* to avoid casts Removed some 'const' to avoid casts Added missing casts for alloc() and sprintf() Added required casts Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety sql/log_event.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/log_event_old.cc: Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/log_event_old.h: Changed some buffers to be uchar* to avoid casts sql/mf_iocache.cc: Removed some old types sql/my_decimal.cc: Changed memory area to use uchar* sql/my_decimal.h: Changed memory area to use uchar* sql/mysql_priv.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some string lengths to use size_t Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow Changed some buffers to be uchar* to avoid casts sql/mysqld.cc: Removed some old types sql/net_serv.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Ensure that vio_read()/vio_write() return values are stored in a size_t variable Removed some not needed casts sql/opt_range.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/opt_range.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/opt_sum.cc: Removed some old types Removed some not needed casts sql/parse_file.cc: Removed some old types Changed some string lengths to use size_t Changed alloc_root + memcpy + set end 0 -> strmake_root() sql/parse_file.h: Removed some old types sql/partition_info.cc: Removed some old types Added missing casts for alloc() Changed some buffers to be uchar* to avoid casts sql/partition_info.h: Changed some buffers to be uchar* to avoid casts sql/protocol.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/protocol.h: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/records.cc: Removed some old types sql/repl_failsafe.cc: Removed some old types Changed some string lengths to use size_t Added required casts sql/rpl_filter.cc: Removed some old types Updated hash-get-key function arguments Changed some string lengths to use size_t sql/rpl_filter.h: Changed some string lengths to use size_t sql/rpl_injector.h: Removed some old types sql/rpl_record.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts sql/rpl_record.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/rpl_record_old.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/rpl_record_old.h: Removed some old types Changed some buffers to be uchar* to avoid cast sql/rpl_rli.cc: Removed some old types sql/rpl_tblmap.cc: Removed some old types sql/rpl_tblmap.h: Removed some old types sql/rpl_utility.cc: Removed some old types sql/rpl_utility.h: Removed some old types Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length sql/set_var.cc: Removed some old types Updated parameters to dirname_part() sql/set_var.h: Removed some old types sql/slave.cc: Removed some old types Changed some string lengths to use size_t sql/slave.h: Removed some old types sql/sp.cc: Removed some old types Added missing casts for printf() sql/sp.h: Removed some old types Updated hash-get-key function arguments sql/sp_cache.cc: Removed some old types Added missing casts for printf() Updated hash-get-key function arguments sql/sp_head.cc: Removed some old types Added missing casts for alloc() and printf() Added required casts Updated hash-get-key function arguments sql/sp_head.h: Removed some old types sql/sp_pcontext.cc: Removed some old types sql/sp_pcontext.h: Removed some old types sql/sql_acl.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added required casts sql/sql_analyse.cc: Changed some buffers to be uchar* to avoid casts sql/sql_analyse.h: Changed some buffers to be uchar* to avoid casts sql/sql_array.h: Removed some old types sql/sql_base.cc: Removed some old types Updated hash-get-key function arguments sql/sql_binlog.cc: Removed some old types Added missing casts for printf() sql/sql_cache.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts Changed some string lengths to use size_t sql/sql_cache.h: Removed some old types Removed reference to not existing function cache_key() Updated hash-get-key function arguments sql/sql_class.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() Updated hash-get-key function arguments Moved THD::max_row_length() to table.cc (as it's not depending on THD) Removed some not needed casts sql/sql_class.h: Removed some old types Changed malloc(), free() and related functions to use void * Removed some not needed casts Changed some string lengths to use size_t Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD sql/sql_connect.cc: Removed some old types Added required casts sql/sql_db.cc: Removed some old types Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety Added missing casts for alloc() sql/sql_delete.cc: Removed some old types sql/sql_handler.cc: Removed some old types Updated hash-get-key function arguments Added some cast to my_multi_malloc() arguments for safety sql/sql_help.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_insert.cc: Removed some old types Added missing casts for alloc() and printf() sql/sql_lex.cc: Removed some old types sql/sql_lex.h: Removed some old types Removed some not needed casts sql/sql_list.h: Removed some old types Removed some not needed casts sql/sql_load.cc: Removed some old types Removed compiler warning sql/sql_manager.cc: Removed some old types sql/sql_map.cc: Removed some old types sql/sql_map.h: Removed some old types sql/sql_olap.cc: Removed some old types sql/sql_parse.cc: Removed some old types Trivial move of code lines to make things more readable Changed some string lengths to use size_t Added missing casts for alloc() sql/sql_partition.cc: Removed some old types Removed compiler warnings about not used functions Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_partition.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_plugin.cc: Removed some old types Added missing casts for alloc() Updated hash-get-key function arguments sql/sql_prepare.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Added missing casts for alloc() and printf() sql-common/client.c: Removed some old types Changed some memory areas to use uchar* sql-common/my_user.c: Changed some string lengths to use size_t sql-common/pack.c: Changed some buffers to be uchar* to avoid casts sql/sql_repl.cc: Added required casts Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/sql_select.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some old types sql/sql_select.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_servers.cc: Removed some old types Updated hash-get-key function arguments sql/sql_show.cc: Removed some old types Added missing casts for alloc() Removed some not needed casts sql/sql_string.cc: Removed some old types Added required casts sql/sql_table.cc: Removed some old types Removed compiler warning about not used variable Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_test.cc: Removed some old types sql/sql_trigger.cc: Removed some old types Added missing casts for alloc() sql/sql_udf.cc: Removed some old types Updated hash-get-key function arguments sql/sql_union.cc: Removed some old types sql/sql_update.cc: Removed some old types Removed some not needed casts sql/sql_view.cc: Removed some old types sql/sql_yacc.yy: Removed some old types Changed some string lengths to use size_t Added missing casts for alloc() sql/stacktrace.c: Removed some old types sql/stacktrace.h: Removed some old types sql/structs.h: Removed some old types sql/table.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Removed setting of LEX_STRING() arguments in declaration Added required casts More function comments Moved max_row_length() here from sql_class.cc/sql_class.h sql/table.h: Removed some old types Changed some string lengths to use size_t sql/thr_malloc.cc: Use void* as type for allocated memory area Changed all functions to use size_t sql/tzfile.h: Changed some buffers to be uchar* to avoid casts sql/tztime.cc: Changed some buffers to be uchar* to avoid casts Updated hash-get-key function arguments Added missing casts for alloc() Removed some not needed casts sql/uniques.cc: Removed some old types Removed some not needed casts sql/unireg.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added missing casts for alloc() storage/archive/archive_reader.c: Removed some old types storage/archive/azio.c: Removed some old types Removed some not needed casts storage/archive/ha_archive.cc: Removed some old types Changed type for 'frmblob' in archive_discover() to match handler Updated hash-get-key function arguments Removed some not needed casts storage/archive/ha_archive.h: Removed some old types storage/blackhole/ha_blackhole.cc: Removed some old types storage/blackhole/ha_blackhole.h: Removed some old types storage/csv/ha_tina.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts storage/csv/ha_tina.h: Removed some old types Removed some not needed casts storage/csv/transparent_file.cc: Removed some old types Changed type of 'bytes_read' to be able to detect read errors Fixed indentation storage/csv/transparent_file.h: Removed some old types storage/example/ha_example.cc: Removed some old types Updated hash-get-key function arguments storage/example/ha_example.h: Removed some old types storage/federated/ha_federated.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts storage/federated/ha_federated.h: Removed some old types storage/heap/_check.c: Changed some buffers to be uchar* to avoid casts storage/heap/_rectest.c: Removed some old types storage/heap/ha_heap.cc: Removed some old types storage/heap/ha_heap.h: Removed some old types storage/heap/heapdef.h: Removed some old types storage/heap/hp_block.c: Removed some old types Changed some string lengths to use size_t storage/heap/hp_clear.c: Removed some old types storage/heap/hp_close.c: Removed some old types storage/heap/hp_create.c: Removed some old types storage/heap/hp_delete.c: Removed some old types storage/heap/hp_hash.c: Removed some old types storage/heap/hp_info.c: Removed some old types storage/heap/hp_open.c: Removed some old types storage/heap/hp_rfirst.c: Removed some old types storage/heap/hp_rkey.c: Removed some old types storage/heap/hp_rlast.c: Removed some old types storage/heap/hp_rnext.c: Removed some old types storage/heap/hp_rprev.c: Removed some old types storage/heap/hp_rrnd.c: Removed some old types storage/heap/hp_rsame.c: Removed some old types storage/heap/hp_scan.c: Removed some old types storage/heap/hp_test1.c: Removed some old types storage/heap/hp_test2.c: Removed some old types storage/heap/hp_update.c: Removed some old types storage/heap/hp_write.c: Removed some old types Changed some string lengths to use size_t storage/innobase/handler/ha_innodb.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() and printf() Removed some not needed casts storage/innobase/handler/ha_innodb.h: Removed some old types storage/myisam/ft_boolean_search.c: Removed some old types storage/myisam/ft_nlq_search.c: Removed some old types storage/myisam/ft_parser.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ft_static.c: Removed some old types storage/myisam/ft_stopwords.c: Removed some old types storage/myisam/ft_update.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ftdefs.h: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/fulltext.h: Removed some old types storage/myisam/ha_myisam.cc: Removed some old types storage/myisam/ha_myisam.h: Removed some old types storage/myisam/mi_cache.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_check.c: Removed some old types storage/myisam/mi_checksum.c: Removed some old types storage/myisam/mi_close.c: Removed some old types storage/myisam/mi_create.c: Removed some old types storage/myisam/mi_delete.c: Removed some old types storage/myisam/mi_delete_all.c: Removed some old types storage/myisam/mi_dynrec.c: Removed some old types storage/myisam/mi_extra.c: Removed some old types storage/myisam/mi_key.c: Removed some old types storage/myisam/mi_locking.c: Removed some old types storage/myisam/mi_log.c: Removed some old types storage/myisam/mi_open.c: Removed some old types Removed some not needed casts Check argument of my_write()/my_pwrite() in functions returning int Added casting of string lengths to size_t storage/myisam/mi_packrec.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_page.c: Removed some old types storage/myisam/mi_preload.c: Removed some old types storage/myisam/mi_range.c: Removed some old types storage/myisam/mi_rfirst.c: Removed some old types storage/myisam/mi_rkey.c: Removed some old types storage/myisam/mi_rlast.c: Removed some old types storage/myisam/mi_rnext.c: Removed some old types storage/myisam/mi_rnext_same.c: Removed some old types storage/myisam/mi_rprev.c: Removed some old types storage/myisam/mi_rrnd.c: Removed some old types storage/myisam/mi_rsame.c: Removed some old types storage/myisam/mi_rsamepos.c: Removed some old types storage/myisam/mi_scan.c: Removed some old types storage/myisam/mi_search.c: Removed some old types storage/myisam/mi_static.c: Removed some old types storage/myisam/mi_statrec.c: Removed some old types storage/myisam/mi_test1.c: Removed some old types storage/myisam/mi_test2.c: Removed some old types storage/myisam/mi_test3.c: Removed some old types storage/myisam/mi_unique.c: Removed some old types storage/myisam/mi_update.c: Removed some old types storage/myisam/mi_write.c: Removed some old types storage/myisam/myisam_ftdump.c: Removed some old types storage/myisam/myisamchk.c: Removed some old types storage/myisam/myisamdef.h: Removed some old types storage/myisam/myisamlog.c: Removed some old types Indentation fix storage/myisam/myisampack.c: Removed some old types storage/myisam/rt_index.c: Removed some old types storage/myisam/rt_split.c: Removed some old types storage/myisam/sort.c: Removed some old types storage/myisam/sp_defs.h: Removed some old types storage/myisam/sp_key.c: Removed some old types storage/myisammrg/ha_myisammrg.cc: Removed some old types storage/myisammrg/ha_myisammrg.h: Removed some old types storage/myisammrg/myrg_close.c: Removed some old types storage/myisammrg/myrg_def.h: Removed some old types storage/myisammrg/myrg_delete.c: Removed some old types storage/myisammrg/myrg_open.c: Removed some old types Updated parameters to dirname_part() storage/myisammrg/myrg_queue.c: Removed some old types storage/myisammrg/myrg_rfirst.c: Removed some old types storage/myisammrg/myrg_rkey.c: Removed some old types storage/myisammrg/myrg_rlast.c: Removed some old types storage/myisammrg/myrg_rnext.c: Removed some old types storage/myisammrg/myrg_rnext_same.c: Removed some old types storage/myisammrg/myrg_rprev.c: Removed some old types storage/myisammrg/myrg_rrnd.c: Removed some old types storage/myisammrg/myrg_rsame.c: Removed some old types storage/myisammrg/myrg_update.c: Removed some old types storage/myisammrg/myrg_write.c: Removed some old types storage/ndb/include/util/ndb_opts.h: Removed some old types storage/ndb/src/cw/cpcd/main.cpp: Removed some old types storage/ndb/src/kernel/vm/Configuration.cpp: Removed some old types storage/ndb/src/mgmclient/main.cpp: Removed some old types storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Removed some old types Removed old disabled code storage/ndb/src/mgmsrv/main.cpp: Removed some old types storage/ndb/src/ndbapi/NdbBlob.cpp: Removed some old types storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Added required casts storage/ndb/src/ndbapi/NdbScanOperation.cpp: Added required casts storage/ndb/tools/delete_all.cpp: Removed some old types storage/ndb/tools/desc.cpp: Removed some old types storage/ndb/tools/drop_index.cpp: Removed some old types storage/ndb/tools/drop_tab.cpp: Removed some old types storage/ndb/tools/listTables.cpp: Removed some old types storage/ndb/tools/ndb_config.cpp: Removed some old types storage/ndb/tools/restore/consumer_restore.cpp: Changed some buffers to be uchar* to avoid casts with new defintion of packfrm() storage/ndb/tools/restore/restore_main.cpp: Removed some old types storage/ndb/tools/select_all.cpp: Removed some old types storage/ndb/tools/select_count.cpp: Removed some old types storage/ndb/tools/waiter.cpp: Removed some old types strings/bchange.c: Changed function to use uchar * and size_t strings/bcmp.c: Changed function to use uchar * and size_t strings/bmove512.c: Changed function to use uchar * and size_t strings/bmove_upp.c: Changed function to use uchar * and size_t strings/ctype-big5.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-bin.c: Changed functions to use size_t strings/ctype-cp932.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-czech.c: Fixed indentation Changed functions to use size_t strings/ctype-euc_kr.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-eucjpms.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-gb2312.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-gbk.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-latin1.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-mb.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-simple.c: Changed functions to use size_t Simpler loops for caseup/casedown unsigned int -> uint unsigned char -> uchar strings/ctype-sjis.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-tis620.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-uca.c: Changed functions to use size_t unsigned char -> uchar strings/ctype-ucs2.c: Moved inclusion of stdarg.h to other includes usigned char -> uchar Changed functions to use size_t Changed character length functions to return uint strings/ctype-ujis.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-utf8.c: Changed functions to use size_t unsigned char -> uchar Indentation fixes strings/ctype-win1250ch.c: Indentation fixes Changed functions to use size_t strings/ctype.c: Changed functions to use size_t strings/decimal.c: Changed type for memory argument to uchar * strings/do_ctype.c: Indentation fixes strings/my_strtoll10.c: unsigned char -> uchar strings/my_vsnprintf.c: Changed functions to use size_t strings/r_strinstr.c: Removed some old types Changed functions to use size_t strings/str_test.c: Removed some old types strings/strappend.c: Changed functions to use size_t strings/strcont.c: Removed some old types strings/strfill.c: Removed some old types strings/strinstr.c: Changed functions to use size_t strings/strlen.c: Changed functions to use size_t strings/strmake.c: Changed functions to use size_t strings/strnlen.c: Changed functions to use size_t strings/strnmov.c: Changed functions to use size_t strings/strto.c: unsigned char -> uchar strings/strtod.c: Changed functions to use size_t strings/strxnmov.c: Changed functions to use size_t strings/xml.c: Changed functions to use size_t Indentation fixes tests/mysql_client_test.c: Removed some old types tests/thread_test.c: Removed some old types vio/test-ssl.c: Removed some old types vio/test-sslclient.c: Removed some old types vio/test-sslserver.c: Removed some old types vio/vio.c: Removed some old types vio/vio_priv.h: Removed some old types Changed vio_read()/vio_write() to work with size_t vio/viosocket.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viossl.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viosslfactories.c: Removed some old types vio/viotest-ssl.c: Removed some old types win/README: More explanations
786 lines
20 KiB
C
786 lines
20 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
#include "client_priv.h"
|
|
#include <sslopt-vars.h>
|
|
#include "../scripts/mysql_fix_privilege_tables_sql.c"
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#ifndef WEXITSTATUS
|
|
# ifdef __WIN__
|
|
# define WEXITSTATUS(stat_val) (stat_val)
|
|
# else
|
|
# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
|
|
# endif
|
|
#endif
|
|
|
|
static char mysql_path[FN_REFLEN];
|
|
static char mysqlcheck_path[FN_REFLEN];
|
|
|
|
static my_bool opt_force, opt_verbose;
|
|
static char *opt_user= (char*)"root";
|
|
|
|
static DYNAMIC_STRING ds_args;
|
|
|
|
static char *opt_password= 0;
|
|
static my_bool tty_password= 0;
|
|
|
|
#ifndef DBUG_OFF
|
|
static char *default_dbug_option= (char*) "d:t:O,/tmp/mysql_upgrade.trace";
|
|
#endif
|
|
|
|
static char **defaults_argv;
|
|
|
|
static my_bool not_used; /* Can't use GET_BOOL without a value pointer */
|
|
|
|
#include <help_start.h>
|
|
|
|
static struct my_option my_long_options[]=
|
|
{
|
|
{"help", '?', "Display this help message and exit.", 0, 0, 0, GET_NO_ARG,
|
|
NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"basedir", 'b', "Not used by mysql_upgrade. Only for backward compatibilty",
|
|
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"datadir", 'd',
|
|
"Not used by mysql_upgrade. Only for backward compatibilty",
|
|
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
#ifdef DBUG_OFF
|
|
{"debug", '#', "This is a non-debug version. Catch this and exit",
|
|
0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#else
|
|
{"debug", '#', "Output debug log", (uchar* *) & default_dbug_option,
|
|
(uchar* *) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
{"default-character-set", OPT_DEFAULT_CHARSET,
|
|
"Set the default character set.", 0,
|
|
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"character-sets-dir", OPT_CHARSETS_DIR,
|
|
"Directory where character sets are.", 0,
|
|
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"compress", OPT_COMPRESS, "Use compression in server/client protocol.",
|
|
(uchar**)¬_used, (uchar**)¬_used, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"force", 'f', "Force execution of mysqlcheck even if mysql_upgrade "
|
|
"has already been executed for the current version of MySQL.",
|
|
(uchar**)&opt_force, (uchar**)&opt_force, 0,
|
|
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"host",'h', "Connect to host.", 0,
|
|
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"password", 'p',
|
|
"Password to use when connecting to server. If password is not given"
|
|
" it's solicited on the tty.", (uchar**) &opt_password,(uchar**) &opt_password,
|
|
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#ifdef __WIN__
|
|
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0,
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
{"port", 'P', "Port number to use for connection.", 0,
|
|
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"protocol", OPT_MYSQL_PROTOCOL,
|
|
"The protocol of connection (tcp,socket,pipe,memory).",
|
|
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
#ifdef HAVE_SMEM
|
|
{"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
|
|
"Base name of shared memory.", 0,
|
|
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
{"socket", 'S', "Socket file to use for connection.",
|
|
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"user", 'u', "User for login if not current user.", (uchar**) &opt_user,
|
|
(uchar**) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
|
#include <sslopt-longopts.h>
|
|
{"verbose", 'v', "Display more output about the process",
|
|
(uchar**) &opt_verbose, (uchar**) &opt_verbose, 0,
|
|
GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
|
|
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
#include <help_end.h>
|
|
|
|
|
|
static void free_used_memory(void)
|
|
{
|
|
/* Free memory allocated by 'load_defaults' */
|
|
free_defaults(defaults_argv);
|
|
|
|
dynstr_free(&ds_args);
|
|
}
|
|
|
|
|
|
static void die(const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
DBUG_ENTER("die");
|
|
|
|
/* Print the error message */
|
|
va_start(args, fmt);
|
|
if (fmt)
|
|
{
|
|
fprintf(stderr, "FATAL ERROR: ");
|
|
vfprintf(stderr, fmt, args);
|
|
fprintf(stderr, "\n");
|
|
fflush(stderr);
|
|
}
|
|
va_end(args);
|
|
|
|
free_used_memory();
|
|
my_end(MY_CHECK_ERROR);
|
|
exit(1);
|
|
}
|
|
|
|
|
|
static void verbose(const char *fmt, ...)
|
|
{
|
|
va_list args;
|
|
|
|
if (!opt_verbose)
|
|
return;
|
|
|
|
/* Print the verbose message */
|
|
va_start(args, fmt);
|
|
if (fmt)
|
|
{
|
|
vfprintf(stdout, fmt, args);
|
|
fprintf(stdout, "\n");
|
|
fflush(stdout);
|
|
}
|
|
va_end(args);
|
|
}
|
|
|
|
|
|
/*
|
|
Add one option - passed to mysql_upgrade on command line
|
|
or by defaults file(my.cnf) - to a dynamic string, in
|
|
this way we pass the same arguments on to mysql and mysql_check
|
|
*/
|
|
|
|
static void add_one_option(DYNAMIC_STRING* ds,
|
|
const struct my_option *opt,
|
|
const char* argument)
|
|
|
|
{
|
|
const char* eq= NullS;
|
|
const char* arg= NullS;
|
|
if (opt->arg_type != NO_ARG)
|
|
{
|
|
eq= "=";
|
|
switch (opt->var_type & GET_TYPE_MASK) {
|
|
case GET_STR:
|
|
arg= argument;
|
|
break;
|
|
default:
|
|
die("internal error at %s: %d",__FILE__, __LINE__);
|
|
}
|
|
}
|
|
dynstr_append_os_quoted(ds, "--", opt->name, eq, arg, NullS);
|
|
dynstr_append(&ds_args, " ");
|
|
}
|
|
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt,
|
|
char *argument)
|
|
{
|
|
my_bool add_option= TRUE;
|
|
|
|
switch (optid) {
|
|
|
|
case '?':
|
|
printf("MySQL utility for upgrading database to MySQL version %s\n",
|
|
MYSQL_SERVER_VERSION);
|
|
my_print_help(my_long_options);
|
|
exit(0);
|
|
break;
|
|
|
|
case '#':
|
|
DBUG_PUSH(argument ? argument : default_dbug_option);
|
|
add_option= FALSE;
|
|
break;
|
|
|
|
case 'p':
|
|
tty_password= 1;
|
|
add_option= FALSE;
|
|
if (argument)
|
|
{
|
|
/* Add password to ds_args before overwriting the arg with x's */
|
|
add_one_option(&ds_args, opt, argument);
|
|
while (*argument)
|
|
*argument++= 'x'; /* Destroy argument */
|
|
tty_password= 0;
|
|
}
|
|
break;
|
|
|
|
case 'b': /* --basedir */
|
|
case 'v': /* --verbose */
|
|
case 'd': /* --datadir */
|
|
case 'f': /* --force */
|
|
add_option= FALSE;
|
|
break;
|
|
}
|
|
|
|
if (add_option)
|
|
{
|
|
/*
|
|
This is an option that is accpted by mysql_upgrade just so
|
|
it can be passed on to "mysql" and "mysqlcheck"
|
|
Save it in the ds_args string
|
|
*/
|
|
add_one_option(&ds_args, opt, argument);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int run_command(char* cmd,
|
|
DYNAMIC_STRING *ds_res)
|
|
{
|
|
char buf[512]= {0};
|
|
FILE *res_file;
|
|
int error;
|
|
|
|
if (!(res_file= popen(cmd, "r")))
|
|
die("popen(\"%s\", \"r\") failed", cmd);
|
|
|
|
while (fgets(buf, sizeof(buf), res_file))
|
|
{
|
|
DBUG_PRINT("info", ("buf: %s", buf));
|
|
if(ds_res)
|
|
{
|
|
/* Save the output of this command in the supplied string */
|
|
dynstr_append(ds_res, buf);
|
|
}
|
|
else
|
|
{
|
|
/* Print it directly on screen */
|
|
fprintf(stdout, "%s", buf);
|
|
}
|
|
}
|
|
|
|
error= pclose(res_file);
|
|
return WEXITSTATUS(error);
|
|
}
|
|
|
|
|
|
static int run_tool(char *tool_path, DYNAMIC_STRING *ds_res, ...)
|
|
{
|
|
int ret;
|
|
const char* arg;
|
|
va_list args;
|
|
DYNAMIC_STRING ds_cmdline;
|
|
|
|
DBUG_ENTER("run_tool");
|
|
DBUG_PRINT("enter", ("tool_path: %s", tool_path));
|
|
|
|
if (init_dynamic_string(&ds_cmdline, IF_WIN("\"", ""), FN_REFLEN, FN_REFLEN))
|
|
die("Out of memory");
|
|
|
|
dynstr_append_os_quoted(&ds_cmdline, tool_path, NullS);
|
|
dynstr_append(&ds_cmdline, " ");
|
|
|
|
va_start(args, ds_res);
|
|
|
|
while ((arg= va_arg(args, char *)))
|
|
{
|
|
/* Options should be os quoted */
|
|
if (strncmp(arg, "--", 2) == 0)
|
|
dynstr_append_os_quoted(&ds_cmdline, arg, NullS);
|
|
else
|
|
dynstr_append(&ds_cmdline, arg);
|
|
dynstr_append(&ds_cmdline, " ");
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
#ifdef __WIN__
|
|
dynstr_append(&ds_cmdline, "\"");
|
|
#endif
|
|
|
|
DBUG_PRINT("info", ("Running: %s", ds_cmdline.str));
|
|
ret= run_command(ds_cmdline.str, ds_res);
|
|
DBUG_PRINT("exit", ("ret: %d", ret));
|
|
dynstr_free(&ds_cmdline);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*
|
|
Try to get the full path to this exceutable
|
|
|
|
Return 0 if path found
|
|
|
|
*/
|
|
|
|
static my_bool get_full_path_to_executable(char* path)
|
|
{
|
|
my_bool ret;
|
|
DBUG_ENTER("get_full_path_to_executable");
|
|
#ifdef __WIN__
|
|
ret= (GetModuleFileName(NULL, path, FN_REFLEN) == 0);
|
|
#else
|
|
/* my_readlink returns 0 if a symlink was read */
|
|
ret= (my_readlink(path, "/proc/self/exe", MYF(0)) != 0);
|
|
/* Might also want to try with /proc/$$/exe if the above fails */
|
|
#endif
|
|
DBUG_PRINT("exit", ("path: %s", path));
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*
|
|
Look for the tool in the same directory as mysql_upgrade.
|
|
|
|
When running in a not yet installed build the the program
|
|
will exist but it need to be invoked via it's libtool wrapper.
|
|
Check if the found tool can executed and if not look in the
|
|
directory one step higher up where the libtool wrapper normally
|
|
is found
|
|
*/
|
|
|
|
static void find_tool(char *tool_path, const char *tool_name)
|
|
{
|
|
char path[FN_REFLEN];
|
|
DYNAMIC_STRING ds_tmp;
|
|
DBUG_ENTER("find_tool");
|
|
DBUG_PRINT("enter", ("progname: %s", my_progname));
|
|
|
|
if (init_dynamic_string(&ds_tmp, "", 32, 32))
|
|
die("Out of memory");
|
|
|
|
/* Initialize path with the full path to this program */
|
|
if (get_full_path_to_executable(path))
|
|
{
|
|
/*
|
|
Easy way to get full executable path failed, try
|
|
other methods
|
|
*/
|
|
if (my_progname[0] == FN_LIBCHAR)
|
|
{
|
|
/* 1. my_progname contains full path */
|
|
strmake(path, my_progname, FN_REFLEN);
|
|
}
|
|
else if (my_progname[0] == '.')
|
|
{
|
|
/* 2. my_progname contains relative path, prepend wd */
|
|
char buf[FN_REFLEN];
|
|
my_getwd(buf, FN_REFLEN, MYF(0));
|
|
my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
|
|
}
|
|
else
|
|
{
|
|
/* 3. Just go for it and hope tool is in path */
|
|
path[0]= 0;
|
|
}
|
|
}
|
|
do
|
|
{
|
|
size_t path_len;
|
|
DBUG_PRINT("enter", ("path: %s", path));
|
|
|
|
/* Chop off last char(since it might be a /) */
|
|
path[max((strlen(path)-1), 0)]= 0;
|
|
|
|
/* Chop off last dir part */
|
|
dirname_part(path, path, &path_len);
|
|
|
|
/* Format name of the tool to search for */
|
|
fn_format(tool_path, tool_name,
|
|
path, "", MYF(MY_REPLACE_DIR));
|
|
|
|
verbose("Looking for '%s' in: %s", tool_name, tool_path);
|
|
|
|
/* Make sure the tool exists */
|
|
if (my_access(tool_path, F_OK) != 0)
|
|
die("Can't find '%s'", tool_path);
|
|
|
|
/*
|
|
Make sure it can be executed, otherwise try again
|
|
in higher level directory
|
|
*/
|
|
}
|
|
while(run_tool(tool_path,
|
|
&ds_tmp, /* Get output from command, discard*/
|
|
"--help",
|
|
"2>&1",
|
|
IF_WIN("> NUL", "> /dev/null"),
|
|
NULL));
|
|
|
|
dynstr_free(&ds_tmp);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Run query using "mysql"
|
|
*/
|
|
|
|
static int run_query(const char *query, DYNAMIC_STRING *ds_res,
|
|
my_bool force)
|
|
{
|
|
int ret;
|
|
File fd;
|
|
char query_file_path[FN_REFLEN];
|
|
DBUG_ENTER("run_query");
|
|
DBUG_PRINT("enter", ("query: %s", query));
|
|
if ((fd= create_temp_file(query_file_path, NULL,
|
|
"sql", O_CREAT | O_SHARE | O_RDWR,
|
|
MYF(MY_WME))) < 0)
|
|
die("Failed to create temporary file for defaults");
|
|
|
|
if (my_write(fd, query, strlen(query),
|
|
MYF(MY_FNABP | MY_WME)))
|
|
die("Failed to write to '%s'", query_file_path);
|
|
|
|
ret= run_tool(mysql_path,
|
|
ds_res,
|
|
ds_args.str,
|
|
"--database=mysql",
|
|
"--batch", /* Turns off pager etc. */
|
|
force ? "--force": "--skip-force",
|
|
ds_res ? "--silent": "",
|
|
"<",
|
|
query_file_path,
|
|
"2>&1",
|
|
NULL);
|
|
|
|
my_close(fd, MYF(0));
|
|
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*
|
|
Extract the value returned from result of "show variable like ..."
|
|
*/
|
|
|
|
static int extract_variable_from_show(DYNAMIC_STRING* ds, char* value)
|
|
{
|
|
char *value_start, *value_end;
|
|
/*
|
|
The query returns "datadir\t<datadir>\n", skip past
|
|
the tab
|
|
*/
|
|
if ((value_start= strchr(ds->str, '\t')) == NULL)
|
|
return 1; /* Unexpected result */
|
|
value_start++;
|
|
|
|
/* Don't copy the ending newline */
|
|
if ((value_end= strchr(value_start, '\n')) == NULL)
|
|
return 1; /* Unexpected result */
|
|
|
|
strncpy(value, value_start, min(FN_REFLEN, value_end-value_start));
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int get_upgrade_info_file_name(char* name)
|
|
{
|
|
DYNAMIC_STRING ds_datadir;
|
|
DBUG_ENTER("get_upgrade_info_file_name");
|
|
|
|
if (init_dynamic_string(&ds_datadir, NULL, 32, 32))
|
|
die("Out of memory");
|
|
|
|
if (run_query("show variables like 'datadir'",
|
|
&ds_datadir, FALSE) ||
|
|
extract_variable_from_show(&ds_datadir, name))
|
|
{
|
|
dynstr_free(&ds_datadir);
|
|
DBUG_RETURN(1); /* Query failed */
|
|
}
|
|
|
|
dynstr_free(&ds_datadir);
|
|
|
|
fn_format(name, "mysql_upgrade_info", name, "", MYF(0));
|
|
DBUG_PRINT("exit", ("name: %s", name));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Read the content of mysql_upgrade_info file and
|
|
compare the version number form file against
|
|
version number wich mysql_upgrade was compiled for
|
|
|
|
NOTE
|
|
This is an optimization to avoid running mysql_upgrade
|
|
when it's already been performed for the particular
|
|
version of MySQL.
|
|
|
|
In case the MySQL server can't return the upgrade info
|
|
file it's always better to report that the upgrade hasn't
|
|
been performed.
|
|
|
|
*/
|
|
|
|
static int upgrade_already_done(void)
|
|
{
|
|
FILE *in;
|
|
char upgrade_info_file[FN_REFLEN]= {0};
|
|
char buf[sizeof(MYSQL_SERVER_VERSION)+1];
|
|
|
|
if (get_upgrade_info_file_name(upgrade_info_file))
|
|
return 0; /* Could not get filename => not sure */
|
|
|
|
if (!(in= my_fopen(upgrade_info_file, O_RDONLY, MYF(0))))
|
|
return 0; /* Could not open file => not sure */
|
|
|
|
/*
|
|
Read from file, don't care if it fails since it
|
|
will be detected by the strncmp
|
|
*/
|
|
bzero(buf, sizeof(buf));
|
|
fgets(buf, sizeof(buf), in);
|
|
|
|
my_fclose(in, MYF(0));
|
|
|
|
return (strncmp(buf, MYSQL_SERVER_VERSION,
|
|
sizeof(MYSQL_SERVER_VERSION)-1)==0);
|
|
}
|
|
|
|
|
|
/*
|
|
Write mysql_upgrade_info file in servers data dir indicating that
|
|
upgrade has been done for this version
|
|
|
|
NOTE
|
|
This might very well fail but since it's just an optimization
|
|
to run mysql_upgrade only when necessary the error can be
|
|
ignored.
|
|
|
|
*/
|
|
|
|
static void create_mysql_upgrade_info_file(void)
|
|
{
|
|
FILE *out;
|
|
char upgrade_info_file[FN_REFLEN]= {0};
|
|
|
|
if (get_upgrade_info_file_name(upgrade_info_file))
|
|
return; /* Could not get filename => skip */
|
|
|
|
if (!(out= my_fopen(upgrade_info_file, O_TRUNC | O_WRONLY, MYF(0))))
|
|
{
|
|
fprintf(stderr,
|
|
"Could not create the upgrade info file '%s' in "
|
|
"the MySQL Servers datadir, errno: %d\n",
|
|
upgrade_info_file, errno);
|
|
return;
|
|
}
|
|
|
|
/* Write new version to file */
|
|
fputs(MYSQL_SERVER_VERSION, out);
|
|
my_fclose(out, MYF(0));
|
|
|
|
/*
|
|
Check if the upgrad_info_file was properly created/updated
|
|
It's not a fatal error -> just print a message if it fails
|
|
*/
|
|
if (!upgrade_already_done())
|
|
fprintf(stderr,
|
|
"Could not write to the upgrade info file '%s' in "
|
|
"the MySQL Servers datadir, errno: %d\n",
|
|
upgrade_info_file, errno);
|
|
return;
|
|
}
|
|
|
|
|
|
/*
|
|
Check and upgrade(if neccessary) all tables
|
|
in the server using "mysqlcheck --check-upgrade .."
|
|
*/
|
|
|
|
static int run_mysqlcheck_upgrade(void)
|
|
{
|
|
verbose("Running 'mysqlcheck'...");
|
|
return run_tool(mysqlcheck_path,
|
|
NULL, /* Send output from mysqlcheck directly to screen */
|
|
ds_args.str,
|
|
"--check-upgrade",
|
|
"--all-databases",
|
|
"--auto-repair",
|
|
NULL);
|
|
}
|
|
|
|
|
|
static const char *expected_errors[]=
|
|
{
|
|
"ERROR 1060", /* Duplicate column name */
|
|
"ERROR 1061", /* Duplicate key name */
|
|
"ERROR 1054", /* Unknown column */
|
|
0
|
|
};
|
|
|
|
|
|
static my_bool is_expected_error(const char* line)
|
|
{
|
|
const char** error= expected_errors;
|
|
while (*error)
|
|
{
|
|
/*
|
|
Check if lines starting with ERROR
|
|
are in the list of expected errors
|
|
*/
|
|
if (strncmp(line, "ERROR", 5) != 0 ||
|
|
strncmp(line, *error, strlen(*error)) == 0)
|
|
return 1; /* Found expected error */
|
|
error++;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char* get_line(char* line)
|
|
{
|
|
while (*line && *line != '\n')
|
|
line++;
|
|
if (*line)
|
|
line++;
|
|
return line;
|
|
}
|
|
|
|
|
|
/* Print the current line to stderr */
|
|
static void print_line(char* line)
|
|
{
|
|
while (*line && *line != '\n')
|
|
{
|
|
fputc(*line, stderr);
|
|
line++;
|
|
}
|
|
fputc('\n', stderr);
|
|
}
|
|
|
|
|
|
/*
|
|
Update all system tables in MySQL Server to current
|
|
version using "mysql" to execute all the SQL commands
|
|
compiled into the mysql_fix_privilege_tables array
|
|
*/
|
|
|
|
static int run_sql_fix_privilege_tables(void)
|
|
{
|
|
int found_real_errors= 0;
|
|
DYNAMIC_STRING ds_result;
|
|
DBUG_ENTER("run_sql_fix_privilege_tables");
|
|
|
|
if (init_dynamic_string(&ds_result, "", 512, 512))
|
|
die("Out of memory");
|
|
|
|
verbose("Running 'mysql_fix_privilege_tables'...");
|
|
run_query(mysql_fix_privilege_tables,
|
|
&ds_result, /* Collect result */
|
|
TRUE);
|
|
|
|
{
|
|
/*
|
|
Scan each line of the result for real errors
|
|
and ignore the expected one(s) like "Duplicate column name",
|
|
"Unknown column" and "Duplicate key name" since they just
|
|
indicate the system tables are already up to date
|
|
*/
|
|
char *line= ds_result.str;
|
|
do
|
|
{
|
|
if (!is_expected_error(line))
|
|
{
|
|
/* Something unexpected failed, dump error line to screen */
|
|
found_real_errors++;
|
|
print_line(line);
|
|
}
|
|
} while ((line= get_line(line)) && *line);
|
|
}
|
|
|
|
dynstr_free(&ds_result);
|
|
return found_real_errors;
|
|
}
|
|
|
|
|
|
static const char *load_default_groups[]=
|
|
{
|
|
"client", /* Read settings how to connect to server */
|
|
"mysql_upgrade", /* Read special settings for mysql_upgrade*/
|
|
0
|
|
};
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
MY_INIT(argv[0]);
|
|
#ifdef __NETWARE__
|
|
setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
|
|
#endif
|
|
|
|
if (init_dynamic_string(&ds_args, "", 512, 256))
|
|
die("Out of memory");
|
|
|
|
load_defaults("my", load_default_groups, &argc, &argv);
|
|
defaults_argv= argv; /* Must be freed by 'free_defaults' */
|
|
|
|
if (handle_options(&argc, &argv, my_long_options, get_one_option))
|
|
die(NULL);
|
|
|
|
if (tty_password)
|
|
{
|
|
opt_password= get_tty_password(NullS);
|
|
/* add password to defaults file */
|
|
dynstr_append_os_quoted(&ds_args, "--password=", opt_password, NullS);
|
|
dynstr_append(&ds_args, " ");
|
|
}
|
|
/* add user to defaults file */
|
|
dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
|
|
dynstr_append(&ds_args, " ");
|
|
|
|
/* Find mysql */
|
|
find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"));
|
|
|
|
/* Find mysqlcheck */
|
|
find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"));
|
|
|
|
/*
|
|
Read the mysql_upgrade_info file to check if mysql_upgrade
|
|
already has been run for this installation of MySQL
|
|
*/
|
|
if (!opt_force && upgrade_already_done())
|
|
{
|
|
printf("This installation of MySQL is already upgraded to %s, "
|
|
"use --force if you still need to run mysql_upgrade\n",
|
|
MYSQL_SERVER_VERSION);
|
|
die(NULL);
|
|
}
|
|
|
|
/*
|
|
Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
|
|
*/
|
|
if (run_mysqlcheck_upgrade() ||
|
|
run_sql_fix_privilege_tables())
|
|
{
|
|
/*
|
|
The upgrade failed to complete in some way or another,
|
|
significant error message should have been printed to the screen
|
|
*/
|
|
die("Upgrade failed" );
|
|
}
|
|
verbose("OK");
|
|
|
|
/* Create a file indicating upgrade has been performed */
|
|
create_mysql_upgrade_info_file();
|
|
|
|
free_used_memory();
|
|
my_end(MY_CHECK_ERROR);
|
|
exit(0);
|
|
}
|
|
|