mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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
1278 lines
36 KiB
C++
1278 lines
36 KiB
C++
/* Copyright (C) 2000-2003 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 */
|
|
|
|
|
|
/*
|
|
The servers are saved in the system table "servers"
|
|
|
|
Currently, when the user performs an ALTER SERVER or a DROP SERVER
|
|
operation, it will cause all open tables which refer to the named
|
|
server connection to be flushed. This may cause some undesirable
|
|
behaviour with regard to currently running transactions. It is
|
|
expected that the DBA knows what s/he is doing when s/he performs
|
|
the ALTER SERVER or DROP SERVER operation.
|
|
|
|
TODO:
|
|
It is desirable for us to implement a callback mechanism instead where
|
|
callbacks can be registered for specific server protocols. The callback
|
|
will be fired when such a server name has been created/altered/dropped
|
|
or when statistics are to be gathered such as how many actual connections.
|
|
Storage engines etc will be able to make use of the callback so that
|
|
currently running transactions etc will not be disrupted.
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "hash_filo.h"
|
|
#include <m_ctype.h>
|
|
#include <stdarg.h>
|
|
#include "sp_head.h"
|
|
#include "sp.h"
|
|
|
|
/*
|
|
We only use 1 mutex to guard the data structures - THR_LOCK_servers.
|
|
Read locked when only reading data and write-locked for all other access.
|
|
*/
|
|
|
|
static HASH servers_cache;
|
|
static MEM_ROOT mem;
|
|
static rw_lock_t THR_LOCK_servers;
|
|
|
|
static bool get_server_from_table_to_cache(TABLE *table);
|
|
|
|
/* insert functions */
|
|
static int insert_server(THD *thd, FOREIGN_SERVER *server_options);
|
|
static int insert_server_record(TABLE *table, FOREIGN_SERVER *server);
|
|
static int insert_server_record_into_cache(FOREIGN_SERVER *server);
|
|
static void prepare_server_struct_for_insert(LEX_SERVER_OPTIONS *server_options,
|
|
FOREIGN_SERVER *server);
|
|
/* drop functions */
|
|
static int delete_server_record(TABLE *table,
|
|
char *server_name,
|
|
int server_name_length);
|
|
static int delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options);
|
|
|
|
/* update functions */
|
|
static void prepare_server_struct_for_update(LEX_SERVER_OPTIONS *server_options,
|
|
FOREIGN_SERVER *existing,
|
|
FOREIGN_SERVER *altered);
|
|
static int update_server(THD *thd, FOREIGN_SERVER *existing,
|
|
FOREIGN_SERVER *altered);
|
|
static int update_server_record(TABLE *table, FOREIGN_SERVER *server);
|
|
static int update_server_record_in_cache(FOREIGN_SERVER *existing,
|
|
FOREIGN_SERVER *altered);
|
|
/* utility functions */
|
|
static void merge_server_struct(FOREIGN_SERVER *from, FOREIGN_SERVER *to);
|
|
|
|
|
|
|
|
static uchar *servers_cache_get_key(FOREIGN_SERVER *server, size_t *length,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("servers_cache_get_key");
|
|
DBUG_PRINT("info", ("server_name_length %d server_name %s",
|
|
server->server_name_length,
|
|
server->server_name));
|
|
|
|
*length= (uint) server->server_name_length;
|
|
DBUG_RETURN((uchar*) server->server_name);
|
|
}
|
|
|
|
|
|
/*
|
|
Initialize structures responsible for servers used in federated
|
|
server scheme information for them from the server
|
|
table in the 'mysql' database.
|
|
|
|
SYNOPSIS
|
|
servers_init()
|
|
dont_read_server_table TRUE if we want to skip loading data from
|
|
server table and disable privilege checking.
|
|
|
|
NOTES
|
|
This function is mostly responsible for preparatory steps, main work
|
|
on initialization and grants loading is done in servers_reload().
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 Could not initialize servers
|
|
*/
|
|
|
|
bool servers_init(bool dont_read_servers_table)
|
|
{
|
|
THD *thd;
|
|
bool return_val= FALSE;
|
|
DBUG_ENTER("servers_init");
|
|
|
|
/* init the mutex */
|
|
if (my_rwlock_init(&THR_LOCK_servers, NULL))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
/* initialise our servers cache */
|
|
if (hash_init(&servers_cache, system_charset_info, 32, 0, 0,
|
|
(hash_get_key) servers_cache_get_key, 0, 0))
|
|
{
|
|
return_val= TRUE; /* we failed, out of memory? */
|
|
goto end;
|
|
}
|
|
|
|
/* Initialize the mem root for data */
|
|
init_alloc_root(&mem, ACL_ALLOC_BLOCK_SIZE, 0);
|
|
|
|
if (dont_read_servers_table)
|
|
goto end;
|
|
|
|
/*
|
|
To be able to run this from boot, we allocate a temporary THD
|
|
*/
|
|
if (!(thd=new THD))
|
|
DBUG_RETURN(TRUE);
|
|
thd->thread_stack= (char*) &thd;
|
|
thd->store_globals();
|
|
/*
|
|
It is safe to call servers_reload() since servers_* arrays and hashes which
|
|
will be freed there are global static objects and thus are initialized
|
|
by zeros at startup.
|
|
*/
|
|
return_val= servers_reload(thd);
|
|
delete thd;
|
|
/* Remember that we don't have a THD */
|
|
my_pthread_setspecific_ptr(THR_THD, 0);
|
|
|
|
end:
|
|
DBUG_RETURN(return_val);
|
|
}
|
|
|
|
/*
|
|
Initialize server structures
|
|
|
|
SYNOPSIS
|
|
servers_load()
|
|
thd Current thread
|
|
tables List containing open "mysql.servers"
|
|
|
|
RETURN VALUES
|
|
FALSE Success
|
|
TRUE Error
|
|
*/
|
|
|
|
static bool servers_load(THD *thd, TABLE_LIST *tables)
|
|
{
|
|
TABLE *table;
|
|
READ_RECORD read_record_info;
|
|
bool return_val= TRUE;
|
|
DBUG_ENTER("servers_load");
|
|
|
|
/* first, send all cached rows to sleep with the fishes, oblivion!
|
|
I expect this crappy comment replaced */
|
|
free_root(&mem, MYF(MY_MARK_BLOCKS_FREE));
|
|
my_hash_reset(&servers_cache);
|
|
|
|
init_read_record(&read_record_info,thd,table=tables[0].table,NULL,1,0);
|
|
while (!(read_record_info.read_record(&read_record_info)))
|
|
{
|
|
/* return_val is already TRUE, so no need to set */
|
|
if ((get_server_from_table_to_cache(table)))
|
|
goto end;
|
|
}
|
|
|
|
return_val= FALSE;
|
|
|
|
end:
|
|
end_read_record(&read_record_info);
|
|
DBUG_RETURN(return_val);
|
|
}
|
|
|
|
|
|
/*
|
|
Forget current servers cache and read new servers
|
|
from the conneciton table.
|
|
|
|
SYNOPSIS
|
|
servers_reload()
|
|
thd Current thread
|
|
|
|
NOTE
|
|
All tables of calling thread which were open and locked by LOCK TABLES
|
|
statement will be unlocked and closed.
|
|
This function is also used for initialization of structures responsible
|
|
for user/db-level privilege checking.
|
|
|
|
RETURN VALUE
|
|
FALSE Success
|
|
TRUE Failure
|
|
*/
|
|
|
|
bool servers_reload(THD *thd)
|
|
{
|
|
TABLE_LIST tables[1];
|
|
bool return_val= TRUE;
|
|
DBUG_ENTER("servers_reload");
|
|
|
|
if (thd->locked_tables)
|
|
{ // Can't have locked tables here
|
|
thd->lock=thd->locked_tables;
|
|
thd->locked_tables=0;
|
|
close_thread_tables(thd);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("locking servers_cache"));
|
|
rw_wrlock(&THR_LOCK_servers);
|
|
|
|
bzero((char*) tables, sizeof(tables));
|
|
tables[0].alias= tables[0].table_name= (char*) "servers";
|
|
tables[0].db= (char*) "mysql";
|
|
tables[0].lock_type= TL_READ;
|
|
|
|
if (simple_open_n_lock_tables(thd, tables))
|
|
{
|
|
sql_print_error("Can't open and lock privilege tables: %s",
|
|
thd->net.last_error);
|
|
goto end;
|
|
}
|
|
|
|
if ((return_val= servers_load(thd, tables)))
|
|
{ // Error. Revert to old list
|
|
/* blast, for now, we have no servers, discuss later way to preserve */
|
|
|
|
DBUG_PRINT("error",("Reverting to old privileges"));
|
|
servers_free();
|
|
}
|
|
|
|
end:
|
|
close_thread_tables(thd);
|
|
DBUG_PRINT("info", ("unlocking servers_cache"));
|
|
rw_unlock(&THR_LOCK_servers);
|
|
DBUG_RETURN(return_val);
|
|
}
|
|
|
|
|
|
/*
|
|
Initialize structures responsible for servers used in federated
|
|
server scheme information for them from the server
|
|
table in the 'mysql' database.
|
|
|
|
SYNOPSIS
|
|
get_server_from_table_to_cache()
|
|
TABLE *table open table pointer
|
|
|
|
|
|
NOTES
|
|
This function takes a TABLE pointer (pointing to an opened
|
|
table). With this open table, a FOREIGN_SERVER struct pointer
|
|
is allocated into root memory, then each member of the FOREIGN_SERVER
|
|
struct is populated. A char pointer takes the return value of get_field
|
|
for each column we're interested in obtaining, and if that pointer
|
|
isn't 0x0, the FOREIGN_SERVER member is set to that value, otherwise,
|
|
is set to the value of an empty string, since get_field would set it to
|
|
0x0 if the column's value is empty, even if the default value for that
|
|
column is NOT NULL.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 could not insert server struct into global servers cache
|
|
*/
|
|
|
|
static bool
|
|
get_server_from_table_to_cache(TABLE *table)
|
|
{
|
|
/* alloc a server struct */
|
|
char *ptr;
|
|
char *blank= (char*)"";
|
|
FOREIGN_SERVER *server= (FOREIGN_SERVER *)alloc_root(&mem,
|
|
sizeof(FOREIGN_SERVER));
|
|
DBUG_ENTER("get_server_from_table_to_cache");
|
|
table->use_all_columns();
|
|
|
|
/* get each field into the server struct ptr */
|
|
server->server_name= get_field(&mem, table->field[0]);
|
|
server->server_name_length= strlen(server->server_name);
|
|
ptr= get_field(&mem, table->field[1]);
|
|
server->host= ptr ? ptr : blank;
|
|
ptr= get_field(&mem, table->field[2]);
|
|
server->db= ptr ? ptr : blank;
|
|
ptr= get_field(&mem, table->field[3]);
|
|
server->username= ptr ? ptr : blank;
|
|
ptr= get_field(&mem, table->field[4]);
|
|
server->password= ptr ? ptr : blank;
|
|
ptr= get_field(&mem, table->field[5]);
|
|
server->sport= ptr ? ptr : blank;
|
|
|
|
server->port= server->sport ? atoi(server->sport) : 0;
|
|
|
|
ptr= get_field(&mem, table->field[6]);
|
|
server->socket= ptr && strlen(ptr) ? ptr : NULL;
|
|
ptr= get_field(&mem, table->field[7]);
|
|
server->scheme= ptr ? ptr : blank;
|
|
ptr= get_field(&mem, table->field[8]);
|
|
server->owner= ptr ? ptr : blank;
|
|
DBUG_PRINT("info", ("server->server_name %s", server->server_name));
|
|
DBUG_PRINT("info", ("server->host %s", server->host));
|
|
DBUG_PRINT("info", ("server->db %s", server->db));
|
|
DBUG_PRINT("info", ("server->username %s", server->username));
|
|
DBUG_PRINT("info", ("server->password %s", server->password));
|
|
DBUG_PRINT("info", ("server->socket %s", server->socket));
|
|
if (my_hash_insert(&servers_cache, (uchar*) server))
|
|
{
|
|
DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
|
|
server->server_name, (long unsigned int) server));
|
|
// error handling needed here
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSIS
|
|
insert_server()
|
|
THD *thd - thread pointer
|
|
FOREIGN_SERVER *server - pointer to prepared FOREIGN_SERVER struct
|
|
|
|
NOTES
|
|
This function takes a server object that is has all members properly
|
|
prepared, ready to be inserted both into the mysql.servers table and
|
|
the servers cache.
|
|
|
|
THR_LOCK_servers must be write locked.
|
|
|
|
RETURN VALUES
|
|
0 - no error
|
|
other - error code
|
|
*/
|
|
|
|
static int
|
|
insert_server(THD *thd, FOREIGN_SERVER *server)
|
|
{
|
|
int error= -1;
|
|
TABLE_LIST tables;
|
|
TABLE *table;
|
|
|
|
DBUG_ENTER("insert_server");
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
tables.db= (char*) "mysql";
|
|
tables.alias= tables.table_name= (char*) "servers";
|
|
|
|
/* need to open before acquiring THR_LOCK_plugin or it will deadlock */
|
|
if (! (table= open_ltable(thd, &tables, TL_WRITE)))
|
|
goto end;
|
|
|
|
/* insert the server into the table */
|
|
if ((error= insert_server_record(table, server)))
|
|
goto end;
|
|
|
|
/* insert the server into the cache */
|
|
if ((error= insert_server_record_into_cache(server)))
|
|
goto end;
|
|
|
|
end:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSIS
|
|
int insert_server_record_into_cache()
|
|
FOREIGN_SERVER *server
|
|
|
|
NOTES
|
|
This function takes a FOREIGN_SERVER pointer to an allocated (root mem)
|
|
and inserts it into the global servers cache
|
|
|
|
THR_LOCK_servers must be write locked.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
>0 - error code
|
|
|
|
*/
|
|
|
|
static int
|
|
insert_server_record_into_cache(FOREIGN_SERVER *server)
|
|
{
|
|
int error=0;
|
|
DBUG_ENTER("insert_server_record_into_cache");
|
|
/*
|
|
We succeded in insertion of the server to the table, now insert
|
|
the server to the cache
|
|
*/
|
|
DBUG_PRINT("info", ("inserting server %s at %lx, length %d",
|
|
server->server_name, (long unsigned int) server,
|
|
server->server_name_length));
|
|
if (my_hash_insert(&servers_cache, (uchar*) server))
|
|
{
|
|
DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
|
|
server->server_name, (long unsigned int) server));
|
|
// error handling needed here
|
|
error= 1;
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSIS
|
|
store_server_fields()
|
|
TABLE *table
|
|
FOREIGN_SERVER *server
|
|
|
|
NOTES
|
|
This function takes an opened table object, and a pointer to an
|
|
allocated FOREIGN_SERVER struct, and then stores each member of
|
|
the FOREIGN_SERVER to the appropriate fields in the table, in
|
|
advance of insertion into the mysql.servers table
|
|
|
|
RETURN VALUE
|
|
VOID
|
|
|
|
*/
|
|
|
|
static void
|
|
store_server_fields(TABLE *table, FOREIGN_SERVER *server)
|
|
{
|
|
|
|
table->use_all_columns();
|
|
/*
|
|
"server" has already been prepped by prepare_server_struct_for_<>
|
|
so, all we need to do is check if the value is set (> -1 for port)
|
|
|
|
If this happens to be an update, only the server members that
|
|
have changed will be set. If an insert, then all will be set,
|
|
even if with empty strings
|
|
*/
|
|
if (server->host)
|
|
table->field[1]->store(server->host,
|
|
(uint) strlen(server->host), system_charset_info);
|
|
if (server->db)
|
|
table->field[2]->store(server->db,
|
|
(uint) strlen(server->db), system_charset_info);
|
|
if (server->username)
|
|
table->field[3]->store(server->username,
|
|
(uint) strlen(server->username), system_charset_info);
|
|
if (server->password)
|
|
table->field[4]->store(server->password,
|
|
(uint) strlen(server->password), system_charset_info);
|
|
if (server->port > -1)
|
|
table->field[5]->store(server->port);
|
|
|
|
if (server->socket)
|
|
table->field[6]->store(server->socket,
|
|
(uint) strlen(server->socket), system_charset_info);
|
|
if (server->scheme)
|
|
table->field[7]->store(server->scheme,
|
|
(uint) strlen(server->scheme), system_charset_info);
|
|
if (server->owner)
|
|
table->field[8]->store(server->owner,
|
|
(uint) strlen(server->owner), system_charset_info);
|
|
}
|
|
|
|
/*
|
|
SYNOPSIS
|
|
insert_server_record()
|
|
TABLE *table
|
|
FOREIGN_SERVER *server
|
|
|
|
NOTES
|
|
This function takes the arguments of an open table object and a pointer
|
|
to an allocated FOREIGN_SERVER struct. It stores the server_name into
|
|
the first field of the table (the primary key, server_name column). With
|
|
this, index_read_idx is called, if the record is found, an error is set
|
|
to ER_FOREIGN_SERVER_EXISTS (the server with that server name exists in the
|
|
table), if not, then store_server_fields stores all fields of the
|
|
FOREIGN_SERVER to the table, then ha_write_row is inserted. If an error
|
|
is encountered in either index_read_idx or ha_write_row, then that error
|
|
is returned
|
|
|
|
RETURN VALUE
|
|
0 - no errors
|
|
>0 - error code
|
|
|
|
*/
|
|
|
|
static
|
|
int insert_server_record(TABLE *table, FOREIGN_SERVER *server)
|
|
{
|
|
int error;
|
|
DBUG_ENTER("insert_server_record");
|
|
table->use_all_columns();
|
|
|
|
empty_record(table);
|
|
|
|
/* set the field that's the PK to the value we're looking for */
|
|
table->field[0]->store(server->server_name,
|
|
server->server_name_length,
|
|
system_charset_info);
|
|
|
|
/* read index until record is that specified in server_name */
|
|
if ((error= table->file->index_read_idx(table->record[0], 0,
|
|
(uchar *)table->field[0]->ptr, HA_WHOLE_KEY,
|
|
HA_READ_KEY_EXACT)))
|
|
{
|
|
/* if not found, err */
|
|
if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
|
|
{
|
|
table->file->print_error(error, MYF(0));
|
|
error= 1;
|
|
}
|
|
/* store each field to be inserted */
|
|
store_server_fields(table, server);
|
|
|
|
DBUG_PRINT("info",("record for server '%s' not found!",
|
|
server->server_name));
|
|
/* write/insert the new server */
|
|
if ((error=table->file->ha_write_row(table->record[0])))
|
|
{
|
|
table->file->print_error(error, MYF(0));
|
|
}
|
|
else
|
|
error= 0;
|
|
}
|
|
else
|
|
error= ER_FOREIGN_SERVER_EXISTS;
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/*
|
|
SYNOPSIS
|
|
drop_server()
|
|
THD *thd
|
|
LEX_SERVER_OPTIONS *server_options
|
|
|
|
NOTES
|
|
This function takes as its arguments a THD object pointer and a pointer
|
|
to a LEX_SERVER_OPTIONS struct from the parser. The member 'server_name'
|
|
of this LEX_SERVER_OPTIONS struct contains the value of the server to be
|
|
deleted. The mysql.servers table is opened via open_ltable, a table object
|
|
returned, the servers cache mutex locked, then delete_server_record is
|
|
called with this table object and LEX_SERVER_OPTIONS server_name and
|
|
server_name_length passed, containing the name of the server to be
|
|
dropped/deleted, then delete_server_record_in_cache is called to delete
|
|
the server from the servers cache.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
> 0 - error code
|
|
*/
|
|
|
|
int drop_server(THD *thd, LEX_SERVER_OPTIONS *server_options)
|
|
{
|
|
int error;
|
|
TABLE_LIST tables;
|
|
TABLE *table;
|
|
LEX_STRING name= { server_options->server_name,
|
|
server_options->server_name_length };
|
|
|
|
DBUG_ENTER("drop_server");
|
|
DBUG_PRINT("info", ("server name server->server_name %s",
|
|
server_options->server_name));
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
tables.db= (char*) "mysql";
|
|
tables.alias= tables.table_name= (char*) "servers";
|
|
|
|
rw_wrlock(&THR_LOCK_servers);
|
|
|
|
/* hit the memory hit first */
|
|
if ((error= delete_server_record_in_cache(server_options)))
|
|
goto end;
|
|
|
|
if (! (table= open_ltable(thd, &tables, TL_WRITE)))
|
|
{
|
|
error= my_errno;
|
|
goto end;
|
|
}
|
|
|
|
error= delete_server_record(table, name.str, name.length);
|
|
|
|
/* close the servers table before we call closed_cached_connection_tables */
|
|
close_thread_tables(thd);
|
|
|
|
if (close_cached_connection_tables(thd, TRUE, &name))
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
ER_UNKNOWN_ERROR, "Server connection in use");
|
|
}
|
|
|
|
end:
|
|
rw_unlock(&THR_LOCK_servers);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
delete_server_record_in_cache()
|
|
LEX_SERVER_OPTIONS *server_options
|
|
|
|
NOTES
|
|
This function's argument is a LEX_SERVER_OPTIONS struct pointer. This
|
|
function uses the "server_name" and "server_name_length" members of the
|
|
lex->server_options to search for the server in the servers_cache. Upon
|
|
returned the server (pointer to a FOREIGN_SERVER struct), it then deletes
|
|
that server from the servers_cache hash.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
static int
|
|
delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options)
|
|
{
|
|
int error= ER_FOREIGN_SERVER_DOESNT_EXIST;
|
|
FOREIGN_SERVER *server;
|
|
DBUG_ENTER("delete_server_record_in_cache");
|
|
|
|
DBUG_PRINT("info",("trying to obtain server name %s length %d",
|
|
server_options->server_name,
|
|
server_options->server_name_length));
|
|
|
|
|
|
if (!(server= (FOREIGN_SERVER *) hash_search(&servers_cache,
|
|
(uchar*) server_options->server_name,
|
|
server_options->server_name_length)))
|
|
{
|
|
DBUG_PRINT("info", ("server_name %s length %d not found!",
|
|
server_options->server_name,
|
|
server_options->server_name_length));
|
|
goto end;
|
|
}
|
|
/*
|
|
We succeded in deletion of the server to the table, now delete
|
|
the server from the cache
|
|
*/
|
|
DBUG_PRINT("info",("deleting server %s length %d",
|
|
server->server_name,
|
|
server->server_name_length));
|
|
|
|
VOID(hash_delete(&servers_cache, (uchar*) server));
|
|
|
|
error= 0;
|
|
|
|
end:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
update_server()
|
|
THD *thd
|
|
FOREIGN_SERVER *existing
|
|
FOREIGN_SERVER *altered
|
|
|
|
NOTES
|
|
This function takes as arguments a THD object pointer, and two pointers,
|
|
one pointing to the existing FOREIGN_SERVER struct "existing" (which is
|
|
the current record as it is) and another pointer pointing to the
|
|
FOREIGN_SERVER struct with the members containing the modified/altered
|
|
values that need to be updated in both the mysql.servers table and the
|
|
servers_cache. It opens a table, passes the table and the altered
|
|
FOREIGN_SERVER pointer, which will be used to update the mysql.servers
|
|
table for the particular server via the call to update_server_record,
|
|
and in the servers_cache via update_server_record_in_cache.
|
|
|
|
THR_LOCK_servers must be write locked.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
>0 - error code
|
|
|
|
*/
|
|
|
|
int update_server(THD *thd, FOREIGN_SERVER *existing, FOREIGN_SERVER *altered)
|
|
{
|
|
int error;
|
|
TABLE *table;
|
|
TABLE_LIST tables;
|
|
DBUG_ENTER("update_server");
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
tables.db= (char*)"mysql";
|
|
tables.alias= tables.table_name= (char*)"servers";
|
|
|
|
if (!(table= open_ltable(thd, &tables, TL_WRITE)))
|
|
{
|
|
error= my_errno;
|
|
goto end;
|
|
}
|
|
|
|
if ((error= update_server_record(table, altered)))
|
|
goto end;
|
|
|
|
error= update_server_record_in_cache(existing, altered);
|
|
|
|
/*
|
|
Perform a reload so we don't have a 'hole' in our mem_root
|
|
*/
|
|
servers_load(thd, &tables);
|
|
|
|
end:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
update_server_record_in_cache()
|
|
FOREIGN_SERVER *existing
|
|
FOREIGN_SERVER *altered
|
|
|
|
NOTES
|
|
This function takes as an argument the FOREIGN_SERVER structi pointer
|
|
for the existing server and the FOREIGN_SERVER struct populated with only
|
|
the members which have been updated. It then "merges" the "altered" struct
|
|
members to the existing server, the existing server then represents an
|
|
updated server. Then, the existing record is deleted from the servers_cache
|
|
HASH, then the updated record inserted, in essence replacing the old
|
|
record.
|
|
|
|
THR_LOCK_servers must be write locked.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
1 - error
|
|
|
|
*/
|
|
|
|
int update_server_record_in_cache(FOREIGN_SERVER *existing,
|
|
FOREIGN_SERVER *altered)
|
|
{
|
|
int error= 0;
|
|
DBUG_ENTER("update_server_record_in_cache");
|
|
|
|
/*
|
|
update the members that haven't been change in the altered server struct
|
|
with the values of the existing server struct
|
|
*/
|
|
merge_server_struct(existing, altered);
|
|
|
|
/*
|
|
delete the existing server struct from the server cache
|
|
*/
|
|
VOID(hash_delete(&servers_cache, (uchar*)existing));
|
|
|
|
/*
|
|
Insert the altered server struct into the server cache
|
|
*/
|
|
if (my_hash_insert(&servers_cache, (uchar*)altered))
|
|
{
|
|
DBUG_PRINT("info", ("had a problem inserting server %s at %lx",
|
|
altered->server_name, (long unsigned int) altered));
|
|
error= ER_OUT_OF_RESOURCES;
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
merge_server_struct()
|
|
FOREIGN_SERVER *from
|
|
FOREIGN_SERVER *to
|
|
|
|
NOTES
|
|
This function takes as its arguments two pointers each to an allocated
|
|
FOREIGN_SERVER struct. The first FOREIGN_SERVER struct represents the struct
|
|
that we will obtain values from (hence the name "from"), the second
|
|
FOREIGN_SERVER struct represents which FOREIGN_SERVER struct we will be
|
|
"copying" any members that have a value to (hence the name "to")
|
|
|
|
RETURN VALUE
|
|
VOID
|
|
|
|
*/
|
|
|
|
void merge_server_struct(FOREIGN_SERVER *from, FOREIGN_SERVER *to)
|
|
{
|
|
DBUG_ENTER("merge_server_struct");
|
|
if (!to->host)
|
|
to->host= strdup_root(&mem, from->host);
|
|
if (!to->db)
|
|
to->db= strdup_root(&mem, from->db);
|
|
if (!to->username)
|
|
to->username= strdup_root(&mem, from->username);
|
|
if (!to->password)
|
|
to->password= strdup_root(&mem, from->password);
|
|
if (to->port == -1)
|
|
to->port= from->port;
|
|
if (!to->socket && from->socket)
|
|
to->socket= strdup_root(&mem, from->socket);
|
|
if (!to->scheme && from->scheme)
|
|
to->scheme= strdup_root(&mem, from->scheme);
|
|
if (!to->owner)
|
|
to->owner= strdup_root(&mem, from->owner);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
update_server_record()
|
|
TABLE *table
|
|
FOREIGN_SERVER *server
|
|
|
|
NOTES
|
|
This function takes as its arguments an open TABLE pointer, and a pointer
|
|
to an allocated FOREIGN_SERVER structure representing an updated record
|
|
which needs to be inserted. The primary key, server_name is stored to field
|
|
0, then index_read_idx is called to read the index to that record, the
|
|
record then being ready to be updated, if found. If not found an error is
|
|
set and error message printed. If the record is found, store_record is
|
|
called, then store_server_fields stores each field from the the members of
|
|
the updated FOREIGN_SERVER struct.
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
|
|
static int
|
|
update_server_record(TABLE *table, FOREIGN_SERVER *server)
|
|
{
|
|
int error=0;
|
|
DBUG_ENTER("update_server_record");
|
|
table->use_all_columns();
|
|
/* set the field that's the PK to the value we're looking for */
|
|
table->field[0]->store(server->server_name,
|
|
server->server_name_length,
|
|
system_charset_info);
|
|
|
|
if ((error= table->file->index_read_idx(table->record[0], 0,
|
|
(uchar *)table->field[0]->ptr, ~(longlong)0,
|
|
HA_READ_KEY_EXACT)))
|
|
{
|
|
if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
|
|
table->file->print_error(error, MYF(0));
|
|
DBUG_PRINT("info",("server not found!"));
|
|
error= ER_FOREIGN_SERVER_DOESNT_EXIST;
|
|
}
|
|
else
|
|
{
|
|
/* ok, so we can update since the record exists in the table */
|
|
store_record(table,record[1]);
|
|
store_server_fields(table, server);
|
|
if ((error=table->file->ha_update_row(table->record[1],table->record[0])))
|
|
{
|
|
DBUG_PRINT("info",("problems with ha_update_row %d", error));
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
end:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
delete_server_record()
|
|
TABLE *table
|
|
char *server_name
|
|
int server_name_length
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
static int
|
|
delete_server_record(TABLE *table,
|
|
char *server_name, int server_name_length)
|
|
{
|
|
int error;
|
|
DBUG_ENTER("delete_server_record");
|
|
table->use_all_columns();
|
|
|
|
/* set the field that's the PK to the value we're looking for */
|
|
table->field[0]->store(server_name, server_name_length, system_charset_info);
|
|
|
|
if ((error= table->file->index_read_idx(table->record[0], 0,
|
|
(uchar *)table->field[0]->ptr, HA_WHOLE_KEY,
|
|
HA_READ_KEY_EXACT)))
|
|
{
|
|
if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
|
|
table->file->print_error(error, MYF(0));
|
|
DBUG_PRINT("info",("server not found!"));
|
|
error= ER_FOREIGN_SERVER_DOESNT_EXIST;
|
|
}
|
|
else
|
|
{
|
|
if ((error= table->file->ha_delete_row(table->record[0])))
|
|
table->file->print_error(error, MYF(0));
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
create_server()
|
|
THD *thd
|
|
LEX_SERVER_OPTIONS *server_options
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
int create_server(THD *thd, LEX_SERVER_OPTIONS *server_options)
|
|
{
|
|
int error= ER_FOREIGN_SERVER_EXISTS;
|
|
FOREIGN_SERVER *server;
|
|
|
|
DBUG_ENTER("create_server");
|
|
DBUG_PRINT("info", ("server_options->server_name %s",
|
|
server_options->server_name));
|
|
|
|
rw_wrlock(&THR_LOCK_servers);
|
|
|
|
/* hit the memory first */
|
|
if (hash_search(&servers_cache, (uchar*) server_options->server_name,
|
|
server_options->server_name_length))
|
|
goto end;
|
|
|
|
server= (FOREIGN_SERVER *)alloc_root(&mem,
|
|
sizeof(FOREIGN_SERVER));
|
|
|
|
prepare_server_struct_for_insert(server_options, server);
|
|
|
|
error= insert_server(thd, server);
|
|
|
|
DBUG_PRINT("info", ("error returned %d", error));
|
|
|
|
end:
|
|
rw_unlock(&THR_LOCK_servers);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
alter_server()
|
|
THD *thd
|
|
LEX_SERVER_OPTIONS *server_options
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
int alter_server(THD *thd, LEX_SERVER_OPTIONS *server_options)
|
|
{
|
|
int error= ER_FOREIGN_SERVER_DOESNT_EXIST;
|
|
FOREIGN_SERVER *altered, *existing;
|
|
LEX_STRING name= { server_options->server_name,
|
|
server_options->server_name_length };
|
|
DBUG_ENTER("alter_server");
|
|
DBUG_PRINT("info", ("server_options->server_name %s",
|
|
server_options->server_name));
|
|
|
|
rw_wrlock(&THR_LOCK_servers);
|
|
|
|
if (!(existing= (FOREIGN_SERVER *) hash_search(&servers_cache,
|
|
(uchar*) name.str,
|
|
name.length)))
|
|
goto end;
|
|
|
|
altered= (FOREIGN_SERVER *)alloc_root(&mem,
|
|
sizeof(FOREIGN_SERVER));
|
|
|
|
prepare_server_struct_for_update(server_options, existing, altered);
|
|
|
|
error= update_server(thd, existing, altered);
|
|
|
|
/* close the servers table before we call closed_cached_connection_tables */
|
|
close_thread_tables(thd);
|
|
|
|
if (close_cached_connection_tables(thd, FALSE, &name))
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
ER_UNKNOWN_ERROR, "Server connection in use");
|
|
}
|
|
|
|
end:
|
|
DBUG_PRINT("info", ("error returned %d", error));
|
|
rw_unlock(&THR_LOCK_servers);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
prepare_server_struct_for_insert()
|
|
LEX_SERVER_OPTIONS *server_options
|
|
FOREIGN_SERVER *server
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
none
|
|
|
|
*/
|
|
|
|
static void
|
|
prepare_server_struct_for_insert(LEX_SERVER_OPTIONS *server_options,
|
|
FOREIGN_SERVER *server)
|
|
{
|
|
char *unset_ptr= (char*)"";
|
|
DBUG_ENTER("prepare_server_struct");
|
|
|
|
/* these two MUST be set */
|
|
server->server_name= strdup_root(&mem, server_options->server_name);
|
|
server->server_name_length= server_options->server_name_length;
|
|
|
|
server->host= server_options->host ?
|
|
strdup_root(&mem, server_options->host) : unset_ptr;
|
|
|
|
server->db= server_options->db ?
|
|
strdup_root(&mem, server_options->db) : unset_ptr;
|
|
|
|
server->username= server_options->username ?
|
|
strdup_root(&mem, server_options->username) : unset_ptr;
|
|
|
|
server->password= server_options->password ?
|
|
strdup_root(&mem, server_options->password) : unset_ptr;
|
|
|
|
/* set to 0 if not specified */
|
|
server->port= server_options->port > -1 ?
|
|
server_options->port : 0;
|
|
|
|
server->socket= server_options->socket ?
|
|
strdup_root(&mem, server_options->socket) : unset_ptr;
|
|
|
|
server->scheme= server_options->scheme ?
|
|
strdup_root(&mem, server_options->scheme) : unset_ptr;
|
|
|
|
server->owner= server_options->owner ?
|
|
strdup_root(&mem, server_options->owner) : unset_ptr;
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
prepare_server_struct_for_update()
|
|
LEX_SERVER_OPTIONS *server_options
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
0 - no error
|
|
|
|
*/
|
|
|
|
static void
|
|
prepare_server_struct_for_update(LEX_SERVER_OPTIONS *server_options,
|
|
FOREIGN_SERVER *existing,
|
|
FOREIGN_SERVER *altered)
|
|
{
|
|
DBUG_ENTER("prepare_server_struct_for_update");
|
|
|
|
altered->server_name= strdup_root(&mem, server_options->server_name);
|
|
altered->server_name_length= server_options->server_name_length;
|
|
DBUG_PRINT("info", ("existing name %s altered name %s",
|
|
existing->server_name, altered->server_name));
|
|
|
|
/*
|
|
The logic here is this: is this value set AND is it different
|
|
than the existing value?
|
|
*/
|
|
altered->host=
|
|
(server_options->host && (strcmp(server_options->host, existing->host))) ?
|
|
strdup_root(&mem, server_options->host) : 0;
|
|
|
|
altered->db=
|
|
(server_options->db && (strcmp(server_options->db, existing->db))) ?
|
|
strdup_root(&mem, server_options->db) : 0;
|
|
|
|
altered->username=
|
|
(server_options->username &&
|
|
(strcmp(server_options->username, existing->username))) ?
|
|
strdup_root(&mem, server_options->username) : 0;
|
|
|
|
altered->password=
|
|
(server_options->password &&
|
|
(strcmp(server_options->password, existing->password))) ?
|
|
strdup_root(&mem, server_options->password) : 0;
|
|
|
|
/*
|
|
port is initialised to -1, so if unset, it will be -1
|
|
*/
|
|
altered->port= (server_options->port > -1 &&
|
|
server_options->port != existing->port) ?
|
|
server_options->port : -1;
|
|
|
|
altered->socket=
|
|
(server_options->socket &&
|
|
(strcmp(server_options->socket, existing->socket))) ?
|
|
strdup_root(&mem, server_options->socket) : 0;
|
|
|
|
altered->scheme=
|
|
(server_options->scheme &&
|
|
(strcmp(server_options->scheme, existing->scheme))) ?
|
|
strdup_root(&mem, server_options->scheme) : 0;
|
|
|
|
altered->owner=
|
|
(server_options->owner &&
|
|
(strcmp(server_options->owner, existing->owner))) ?
|
|
strdup_root(&mem, server_options->owner) : 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
servers_free()
|
|
bool end
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
void
|
|
|
|
*/
|
|
|
|
void servers_free(bool end)
|
|
{
|
|
DBUG_ENTER("servers_free");
|
|
if (!hash_inited(&servers_cache))
|
|
DBUG_VOID_RETURN;
|
|
if (!end)
|
|
{
|
|
free_root(&mem, MYF(MY_MARK_BLOCKS_FREE));
|
|
my_hash_reset(&servers_cache);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
rwlock_destroy(&THR_LOCK_servers);
|
|
free_root(&mem,MYF(0));
|
|
hash_free(&servers_cache);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSIS
|
|
|
|
clone_server(MEM_ROOT *mem_root, FOREIGN_SERVER *orig, FOREIGN_SERVER *buff)
|
|
|
|
Create a clone of FOREIGN_SERVER. If the supplied mem_root is of
|
|
thd->mem_root then the copy is automatically disposed at end of statement.
|
|
|
|
NOTES
|
|
|
|
ARGS
|
|
MEM_ROOT pointer (strings are copied into this mem root)
|
|
FOREIGN_SERVER pointer (made a copy of)
|
|
FOREIGN_SERVER buffer (if not-NULL, this pointer is returned)
|
|
|
|
RETURN VALUE
|
|
FOREIGN_SEVER pointer (copy of one supplied FOREIGN_SERVER)
|
|
*/
|
|
|
|
static FOREIGN_SERVER *clone_server(MEM_ROOT *mem, const FOREIGN_SERVER *server,
|
|
FOREIGN_SERVER *buffer)
|
|
{
|
|
DBUG_ENTER("sql_server.cc:clone_server");
|
|
|
|
if (!buffer)
|
|
buffer= (FOREIGN_SERVER *) alloc_root(mem, sizeof(FOREIGN_SERVER));
|
|
|
|
buffer->server_name= strmake_root(mem, server->server_name,
|
|
server->server_name_length);
|
|
buffer->port= server->port;
|
|
buffer->server_name_length= server->server_name_length;
|
|
|
|
/* TODO: We need to examine which of these can really be NULL */
|
|
buffer->db= server->db ? strdup_root(mem, server->db) : NULL;
|
|
buffer->scheme= server->scheme ? strdup_root(mem, server->scheme) : NULL;
|
|
buffer->username= server->username? strdup_root(mem, server->username): NULL;
|
|
buffer->password= server->password? strdup_root(mem, server->password): NULL;
|
|
buffer->socket= server->socket ? strdup_root(mem, server->socket) : NULL;
|
|
buffer->owner= server->owner ? strdup_root(mem, server->owner) : NULL;
|
|
buffer->host= server->host ? strdup_root(mem, server->host) : NULL;
|
|
|
|
DBUG_RETURN(buffer);
|
|
}
|
|
|
|
|
|
/*
|
|
|
|
SYNOPSIS
|
|
get_server_by_name()
|
|
const char *server_name
|
|
|
|
NOTES
|
|
|
|
RETURN VALUE
|
|
FOREIGN_SERVER *
|
|
|
|
*/
|
|
|
|
FOREIGN_SERVER *get_server_by_name(MEM_ROOT *mem, const char *server_name,
|
|
FOREIGN_SERVER *buff)
|
|
{
|
|
uint server_name_length;
|
|
FOREIGN_SERVER *server;
|
|
DBUG_ENTER("get_server_by_name");
|
|
DBUG_PRINT("info", ("server_name %s", server_name));
|
|
|
|
server_name_length= strlen(server_name);
|
|
|
|
if (! server_name || !strlen(server_name))
|
|
{
|
|
DBUG_PRINT("info", ("server_name not defined!"));
|
|
DBUG_RETURN((FOREIGN_SERVER *)NULL);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("locking servers_cache"));
|
|
rw_rdlock(&THR_LOCK_servers);
|
|
if (!(server= (FOREIGN_SERVER *) hash_search(&servers_cache,
|
|
(uchar*) server_name,
|
|
server_name_length)))
|
|
{
|
|
DBUG_PRINT("info", ("server_name %s length %d not found!",
|
|
server_name, server_name_length));
|
|
server= (FOREIGN_SERVER *) NULL;
|
|
}
|
|
/* otherwise, make copy of server */
|
|
else
|
|
server= clone_server(mem, server, buff);
|
|
|
|
DBUG_PRINT("info", ("unlocking servers_cache"));
|
|
rw_unlock(&THR_LOCK_servers);
|
|
DBUG_RETURN(server);
|
|
|
|
}
|