mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
1843 lines
51 KiB
C++
1843 lines
51 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 */
|
|
|
|
|
|
/* create and drop of databases */
|
|
|
|
#include "mysql_priv.h"
|
|
#include <mysys_err.h>
|
|
#include "sp.h"
|
|
#include "events.h"
|
|
#include <my_dir.h>
|
|
#include <m_ctype.h>
|
|
#include "log.h"
|
|
#ifdef __WIN__
|
|
#include <direct.h>
|
|
#endif
|
|
|
|
#define MAX_DROP_TABLE_Q_LEN 1024
|
|
|
|
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
|
|
static TYPELIB deletable_extentions=
|
|
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
|
|
|
|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
|
|
const char *db, const char *path, uint level,
|
|
TABLE_LIST **dropped_tables);
|
|
|
|
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
|
|
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error);
|
|
|
|
|
|
/* Database lock hash */
|
|
HASH lock_db_cache;
|
|
pthread_mutex_t LOCK_lock_db;
|
|
int creating_database= 0; // how many database locks are made
|
|
|
|
|
|
/* Structure for database lock */
|
|
typedef struct my_dblock_st
|
|
{
|
|
char *name; /* Database name */
|
|
uint name_length; /* Database length name */
|
|
} my_dblock_t;
|
|
|
|
|
|
/*
|
|
lock_db key.
|
|
*/
|
|
|
|
static uchar* lock_db_get_key(my_dblock_t *ptr, size_t *length,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
*length= ptr->name_length;
|
|
return (uchar*) ptr->name;
|
|
}
|
|
|
|
|
|
/*
|
|
Free lock_db hash element.
|
|
*/
|
|
|
|
static void lock_db_free_element(void *ptr)
|
|
{
|
|
my_free(ptr, MYF(0));
|
|
}
|
|
|
|
|
|
/*
|
|
Put a database lock entry into the hash.
|
|
|
|
DESCRIPTION
|
|
Insert a database lock entry into hash.
|
|
LOCK_db_lock must be previously locked.
|
|
|
|
RETURN VALUES
|
|
0 on success.
|
|
1 on error.
|
|
*/
|
|
|
|
static my_bool lock_db_insert(const char *dbname, uint length)
|
|
{
|
|
my_dblock_t *opt;
|
|
my_bool error= 0;
|
|
DBUG_ENTER("lock_db_insert");
|
|
|
|
safe_mutex_assert_owner(&LOCK_lock_db);
|
|
|
|
if (!(opt= (my_dblock_t*) hash_search(&lock_db_cache,
|
|
(uchar*) dbname, length)))
|
|
{
|
|
/* Db is not in the hash, insert it */
|
|
char *tmp_name;
|
|
if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
|
|
&opt, (uint) sizeof(*opt), &tmp_name, (uint) length+1,
|
|
NullS))
|
|
{
|
|
error= 1;
|
|
goto end;
|
|
}
|
|
|
|
opt->name= tmp_name;
|
|
strmov(opt->name, dbname);
|
|
opt->name_length= length;
|
|
|
|
if ((error= my_hash_insert(&lock_db_cache, (uchar*) opt)))
|
|
my_free(opt, MYF(0));
|
|
}
|
|
|
|
end:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Delete a database lock entry from hash.
|
|
*/
|
|
|
|
void lock_db_delete(const char *name, uint length)
|
|
{
|
|
my_dblock_t *opt;
|
|
safe_mutex_assert_owner(&LOCK_lock_db);
|
|
if ((opt= (my_dblock_t *)hash_search(&lock_db_cache,
|
|
(const uchar*) name, length)))
|
|
hash_delete(&lock_db_cache, (uchar*) opt);
|
|
}
|
|
|
|
|
|
/* Database options hash */
|
|
static HASH dboptions;
|
|
static my_bool dboptions_init= 0;
|
|
static rw_lock_t LOCK_dboptions;
|
|
|
|
/* Structure for database options */
|
|
typedef struct my_dbopt_st
|
|
{
|
|
char *name; /* Database name */
|
|
uint name_length; /* Database length name */
|
|
CHARSET_INFO *charset; /* Database default character set */
|
|
} my_dbopt_t;
|
|
|
|
|
|
/*
|
|
Function we use in the creation of our hash to get key.
|
|
*/
|
|
|
|
static uchar* dboptions_get_key(my_dbopt_t *opt, size_t *length,
|
|
my_bool not_used __attribute__((unused)))
|
|
{
|
|
*length= opt->name_length;
|
|
return (uchar*) opt->name;
|
|
}
|
|
|
|
|
|
/*
|
|
Helper function to write a query to binlog used by mysql_rm_db()
|
|
*/
|
|
|
|
static inline void write_to_binlog(THD *thd, char *query, uint q_len,
|
|
char *db, uint db_len)
|
|
{
|
|
Query_log_event qinfo(thd, query, q_len, 0, 0);
|
|
qinfo.error_code= 0;
|
|
qinfo.db= db;
|
|
qinfo.db_len= db_len;
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
|
|
|
|
/*
|
|
Function to free dboptions hash element
|
|
*/
|
|
|
|
static void free_dbopt(void *dbopt)
|
|
{
|
|
my_free((uchar*) dbopt, MYF(0));
|
|
}
|
|
|
|
|
|
/*
|
|
Initialize database option hash and locked database hash.
|
|
|
|
SYNOPSIS
|
|
my_database_names()
|
|
|
|
NOTES
|
|
Must be called before any other database function is called.
|
|
|
|
RETURN
|
|
0 ok
|
|
1 Fatal error
|
|
*/
|
|
|
|
bool my_database_names_init(void)
|
|
{
|
|
bool error= 0;
|
|
(void) my_rwlock_init(&LOCK_dboptions, NULL);
|
|
if (!dboptions_init)
|
|
{
|
|
dboptions_init= 1;
|
|
error= hash_init(&dboptions, lower_case_table_names ?
|
|
&my_charset_bin : system_charset_info,
|
|
32, 0, 0, (hash_get_key) dboptions_get_key,
|
|
free_dbopt,0) ||
|
|
hash_init(&lock_db_cache, lower_case_table_names ?
|
|
&my_charset_bin : system_charset_info,
|
|
32, 0, 0, (hash_get_key) lock_db_get_key,
|
|
lock_db_free_element,0);
|
|
|
|
}
|
|
return error;
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
Free database option hash and locked databases hash.
|
|
*/
|
|
|
|
void my_database_names_free(void)
|
|
{
|
|
if (dboptions_init)
|
|
{
|
|
dboptions_init= 0;
|
|
hash_free(&dboptions);
|
|
(void) rwlock_destroy(&LOCK_dboptions);
|
|
hash_free(&lock_db_cache);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Cleanup cached options
|
|
*/
|
|
|
|
void my_dbopt_cleanup(void)
|
|
{
|
|
rw_wrlock(&LOCK_dboptions);
|
|
hash_free(&dboptions);
|
|
hash_init(&dboptions, lower_case_table_names ?
|
|
&my_charset_bin : system_charset_info,
|
|
32, 0, 0, (hash_get_key) dboptions_get_key,
|
|
free_dbopt,0);
|
|
rw_unlock(&LOCK_dboptions);
|
|
}
|
|
|
|
|
|
/*
|
|
Find database options in the hash.
|
|
|
|
DESCRIPTION
|
|
Search a database options in the hash, usings its path.
|
|
Fills "create" on success.
|
|
|
|
RETURN VALUES
|
|
0 on success.
|
|
1 on error.
|
|
*/
|
|
|
|
static my_bool get_dbopt(const char *dbname, HA_CREATE_INFO *create)
|
|
{
|
|
my_dbopt_t *opt;
|
|
uint length;
|
|
my_bool error= 1;
|
|
|
|
length= (uint) strlen(dbname);
|
|
|
|
rw_rdlock(&LOCK_dboptions);
|
|
if ((opt= (my_dbopt_t*) hash_search(&dboptions, (uchar*) dbname, length)))
|
|
{
|
|
create->default_table_charset= opt->charset;
|
|
error= 0;
|
|
}
|
|
rw_unlock(&LOCK_dboptions);
|
|
return error;
|
|
}
|
|
|
|
|
|
/*
|
|
Writes database options into the hash.
|
|
|
|
DESCRIPTION
|
|
Inserts database options into the hash, or updates
|
|
options if they are already in the hash.
|
|
|
|
RETURN VALUES
|
|
0 on success.
|
|
1 on error.
|
|
*/
|
|
|
|
static my_bool put_dbopt(const char *dbname, HA_CREATE_INFO *create)
|
|
{
|
|
my_dbopt_t *opt;
|
|
uint length;
|
|
my_bool error= 0;
|
|
DBUG_ENTER("put_dbopt");
|
|
|
|
length= (uint) strlen(dbname);
|
|
|
|
rw_wrlock(&LOCK_dboptions);
|
|
if (!(opt= (my_dbopt_t*) hash_search(&dboptions, (uchar*) dbname, length)))
|
|
{
|
|
/* Options are not in the hash, insert them */
|
|
char *tmp_name;
|
|
if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
|
|
&opt, (uint) sizeof(*opt), &tmp_name, (uint) length+1,
|
|
NullS))
|
|
{
|
|
error= 1;
|
|
goto end;
|
|
}
|
|
|
|
opt->name= tmp_name;
|
|
strmov(opt->name, dbname);
|
|
opt->name_length= length;
|
|
|
|
if ((error= my_hash_insert(&dboptions, (uchar*) opt)))
|
|
{
|
|
my_free(opt, MYF(0));
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
/* Update / write options in hash */
|
|
opt->charset= create->default_table_charset;
|
|
|
|
end:
|
|
rw_unlock(&LOCK_dboptions);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Deletes database options from the hash.
|
|
*/
|
|
|
|
void del_dbopt(const char *path)
|
|
{
|
|
my_dbopt_t *opt;
|
|
rw_wrlock(&LOCK_dboptions);
|
|
if ((opt= (my_dbopt_t *)hash_search(&dboptions, (const uchar*) path,
|
|
strlen(path))))
|
|
hash_delete(&dboptions, (uchar*) opt);
|
|
rw_unlock(&LOCK_dboptions);
|
|
}
|
|
|
|
|
|
/*
|
|
Create database options file:
|
|
|
|
DESCRIPTION
|
|
Currently database default charset is only stored there.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 Could not create file or write to it. Error sent through my_error()
|
|
*/
|
|
|
|
static bool write_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
|
|
{
|
|
register File file;
|
|
char buf[256]; // Should be enough for one option
|
|
bool error=1;
|
|
|
|
if (!create->default_table_charset)
|
|
create->default_table_charset= thd->variables.collation_server;
|
|
|
|
if (put_dbopt(path, create))
|
|
return 1;
|
|
|
|
if ((file=my_create(path, CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0)
|
|
{
|
|
ulong length;
|
|
length= (ulong) (strxnmov(buf, sizeof(buf)-1, "default-character-set=",
|
|
create->default_table_charset->csname,
|
|
"\ndefault-collation=",
|
|
create->default_table_charset->name,
|
|
"\n", NullS) - buf);
|
|
|
|
/* Error is written by my_write */
|
|
if (!my_write(file,(uchar*) buf, length, MYF(MY_NABP+MY_WME)))
|
|
error=0;
|
|
my_close(file,MYF(0));
|
|
}
|
|
return error;
|
|
}
|
|
|
|
|
|
/*
|
|
Load database options file
|
|
|
|
load_db_opt()
|
|
path Path for option file
|
|
create Where to store the read options
|
|
|
|
DESCRIPTION
|
|
|
|
RETURN VALUES
|
|
0 File found
|
|
1 No database file or could not open it
|
|
|
|
*/
|
|
|
|
bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
|
|
{
|
|
File file;
|
|
char buf[256];
|
|
DBUG_ENTER("load_db_opt");
|
|
bool error=1;
|
|
uint nbytes;
|
|
|
|
bzero((char*) create,sizeof(*create));
|
|
create->default_table_charset= thd->variables.collation_server;
|
|
|
|
/* Check if options for this database are already in the hash */
|
|
if (!get_dbopt(path, create))
|
|
DBUG_RETURN(0);
|
|
|
|
/* Otherwise, load options from the .opt file */
|
|
if ((file=my_open(path, O_RDONLY | O_SHARE, MYF(0))) < 0)
|
|
goto err1;
|
|
|
|
IO_CACHE cache;
|
|
if (init_io_cache(&cache, file, IO_SIZE, READ_CACHE, 0, 0, MYF(0)))
|
|
goto err2;
|
|
|
|
while ((int) (nbytes= my_b_gets(&cache, (char*) buf, sizeof(buf))) > 0)
|
|
{
|
|
char *pos= buf+nbytes-1;
|
|
/* Remove end space and control characters */
|
|
while (pos > buf && !my_isgraph(&my_charset_latin1, pos[-1]))
|
|
pos--;
|
|
*pos=0;
|
|
if ((pos= strchr(buf, '=')))
|
|
{
|
|
if (!strncmp(buf,"default-character-set", (pos-buf)))
|
|
{
|
|
/*
|
|
Try character set name, and if it fails
|
|
try collation name, probably it's an old
|
|
4.1.0 db.opt file, which didn't have
|
|
separate default-character-set and
|
|
default-collation commands.
|
|
*/
|
|
if (!(create->default_table_charset=
|
|
get_charset_by_csname(pos+1, MY_CS_PRIMARY, MYF(0))) &&
|
|
!(create->default_table_charset=
|
|
get_charset_by_name(pos+1, MYF(0))))
|
|
{
|
|
sql_print_error("Error while loading database options: '%s':",path);
|
|
sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);
|
|
create->default_table_charset= default_charset_info;
|
|
}
|
|
}
|
|
else if (!strncmp(buf,"default-collation", (pos-buf)))
|
|
{
|
|
if (!(create->default_table_charset= get_charset_by_name(pos+1,
|
|
MYF(0))))
|
|
{
|
|
sql_print_error("Error while loading database options: '%s':",path);
|
|
sql_print_error(ER(ER_UNKNOWN_COLLATION),pos+1);
|
|
create->default_table_charset= default_charset_info;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/*
|
|
Put the loaded value into the hash.
|
|
Note that another thread could've added the same
|
|
entry to the hash after we called get_dbopt(),
|
|
but it's not an error, as put_dbopt() takes this
|
|
possibility into account.
|
|
*/
|
|
error= put_dbopt(path, create);
|
|
|
|
end_io_cache(&cache);
|
|
err2:
|
|
my_close(file,MYF(0));
|
|
err1:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Retrieve database options by name. Load database options file or fetch from
|
|
cache.
|
|
|
|
SYNOPSIS
|
|
load_db_opt_by_name()
|
|
db_name Database name
|
|
db_create_info Where to store the database options
|
|
|
|
DESCRIPTION
|
|
load_db_opt_by_name() is a shortcut for load_db_opt().
|
|
|
|
NOTE
|
|
Although load_db_opt_by_name() (and load_db_opt()) returns status of
|
|
the operation, it is useless usually and should be ignored. The problem
|
|
is that there are 1) system databases ("mysql") and 2) virtual
|
|
databases ("information_schema"), which do not contain options file.
|
|
So, load_db_opt[_by_name]() returns FALSE for these databases, but this
|
|
is not an error.
|
|
|
|
load_db_opt[_by_name]() clears db_create_info structure in any case, so
|
|
even on failure it contains valid data. So, common use case is just
|
|
call load_db_opt[_by_name]() without checking return value and use
|
|
db_create_info right after that.
|
|
|
|
RETURN VALUES (read NOTE!)
|
|
FALSE Success
|
|
TRUE Failed to retrieve options
|
|
*/
|
|
|
|
bool load_db_opt_by_name(THD *thd, const char *db_name,
|
|
HA_CREATE_INFO *db_create_info)
|
|
{
|
|
char db_opt_path[FN_REFLEN];
|
|
|
|
/*
|
|
Pass an empty file name, and the database options file name as extension
|
|
to avoid table name to file name encoding.
|
|
*/
|
|
(void) build_table_filename(db_opt_path, sizeof(db_opt_path),
|
|
db_name, "", MY_DB_OPT_FILE, 0);
|
|
|
|
return load_db_opt(thd, db_opt_path, db_create_info);
|
|
}
|
|
|
|
|
|
/*
|
|
Create a database
|
|
|
|
SYNOPSIS
|
|
mysql_create_db()
|
|
thd Thread handler
|
|
db Name of database to create
|
|
Function assumes that this is already validated.
|
|
create_info Database create options (like character set)
|
|
silent Used by replication when internally creating a database.
|
|
In this case the entry should not be logged.
|
|
|
|
SIDE-EFFECTS
|
|
1. Report back to client that command succeeded (send_ok)
|
|
2. Report errors to client
|
|
3. Log event to binary log
|
|
(The 'silent' flags turns off 1 and 3.)
|
|
|
|
RETURN VALUES
|
|
FALSE ok
|
|
TRUE Error
|
|
|
|
*/
|
|
|
|
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
|
|
bool silent)
|
|
{
|
|
char path[FN_REFLEN+16];
|
|
char tmp_query[FN_REFLEN+16];
|
|
long result= 1;
|
|
int error= 0;
|
|
MY_STAT stat_info;
|
|
uint create_options= create_info ? create_info->options : 0;
|
|
uint path_len;
|
|
DBUG_ENTER("mysql_create_db");
|
|
|
|
/* do not create 'information_schema' db */
|
|
if (!my_strcasecmp(system_charset_info, db, INFORMATION_SCHEMA_NAME.str))
|
|
{
|
|
my_error(ER_DB_CREATE_EXISTS, MYF(0), db);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
/*
|
|
Do not create database if another thread is holding read lock.
|
|
Wait for global read lock before acquiring LOCK_mysql_create_db.
|
|
After wait_if_global_read_lock() we have protection against another
|
|
global read lock. If we would acquire LOCK_mysql_create_db first,
|
|
another thread could step in and get the global read lock before we
|
|
reach wait_if_global_read_lock(). If this thread tries the same as we
|
|
(admin a db), it would then go and wait on LOCK_mysql_create_db...
|
|
Furthermore wait_if_global_read_lock() checks if the current thread
|
|
has the global read lock and refuses the operation with
|
|
ER_CANT_UPDATE_WITH_READLOCK if applicable.
|
|
*/
|
|
if (wait_if_global_read_lock(thd, 0, 1))
|
|
{
|
|
error= -1;
|
|
goto exit2;
|
|
}
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
/* Check directory */
|
|
path_len= build_table_filename(path, sizeof(path), db, "", "", 0);
|
|
path[path_len-1]= 0; // Remove last '/' from path
|
|
|
|
if (my_stat(path,&stat_info,MYF(0)))
|
|
{
|
|
if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
|
|
{
|
|
my_error(ER_DB_CREATE_EXISTS, MYF(0), db);
|
|
error= -1;
|
|
goto exit;
|
|
}
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
|
|
if (!silent)
|
|
send_ok(thd);
|
|
error= 0;
|
|
goto exit;
|
|
}
|
|
else
|
|
{
|
|
if (my_errno != ENOENT)
|
|
{
|
|
my_error(EE_STAT, MYF(0), path, my_errno);
|
|
goto exit;
|
|
}
|
|
if (my_mkdir(path,0777,MYF(0)) < 0)
|
|
{
|
|
my_error(ER_CANT_CREATE_DB, MYF(0), db, my_errno);
|
|
error= -1;
|
|
goto exit;
|
|
}
|
|
}
|
|
|
|
path[path_len-1]= FN_LIBCHAR;
|
|
strmake(path+path_len, MY_DB_OPT_FILE, sizeof(path)-path_len-1);
|
|
if (write_db_opt(thd, path, create_info))
|
|
{
|
|
/*
|
|
Could not create options file.
|
|
Restore things to beginning.
|
|
*/
|
|
path[path_len]= 0;
|
|
if (rmdir(path) >= 0)
|
|
{
|
|
error= -1;
|
|
goto exit;
|
|
}
|
|
/*
|
|
We come here when we managed to create the database, but not the option
|
|
file. In this case it's best to just continue as if nothing has
|
|
happened. (This is a very unlikely senario)
|
|
*/
|
|
}
|
|
|
|
if (!silent)
|
|
{
|
|
char *query;
|
|
uint query_length;
|
|
|
|
if (!thd->query) // Only in replication
|
|
{
|
|
query= tmp_query;
|
|
query_length= (uint) (strxmov(tmp_query,"create database `",
|
|
db, "`", NullS) - tmp_query);
|
|
}
|
|
else
|
|
{
|
|
query= thd->query;
|
|
query_length= thd->query_length;
|
|
}
|
|
|
|
ha_binlog_log_query(thd, 0, LOGCOM_CREATE_DB,
|
|
query, query_length,
|
|
db, "");
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, query, query_length, 0,
|
|
/* suppress_use */ TRUE);
|
|
|
|
/*
|
|
Write should use the database being created as the "current
|
|
database" and not the threads current database, which is the
|
|
default. If we do not change the "current database" to the
|
|
database being created, the CREATE statement will not be
|
|
replicated when using --binlog-do-db to select databases to be
|
|
replicated.
|
|
|
|
An example (--binlog-do-db=sisyfos):
|
|
|
|
CREATE DATABASE bob; # Not replicated
|
|
USE bob; # 'bob' is the current database
|
|
CREATE DATABASE sisyfos; # Not replicated since 'bob' is
|
|
# current database.
|
|
USE sisyfos; # Will give error on slave since
|
|
# database does not exist.
|
|
*/
|
|
qinfo.db = db;
|
|
qinfo.db_len = strlen(db);
|
|
|
|
/* These DDL methods and logging protected with LOCK_mysql_create_db */
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
send_ok(thd, result);
|
|
}
|
|
|
|
exit:
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/* db-name is already validated when we come here */
|
|
|
|
bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
|
|
{
|
|
char path[FN_REFLEN+16];
|
|
long result=1;
|
|
int error= 0;
|
|
DBUG_ENTER("mysql_alter_db");
|
|
|
|
/*
|
|
Do not alter database if another thread is holding read lock.
|
|
Wait for global read lock before acquiring LOCK_mysql_create_db.
|
|
After wait_if_global_read_lock() we have protection against another
|
|
global read lock. If we would acquire LOCK_mysql_create_db first,
|
|
another thread could step in and get the global read lock before we
|
|
reach wait_if_global_read_lock(). If this thread tries the same as we
|
|
(admin a db), it would then go and wait on LOCK_mysql_create_db...
|
|
Furthermore wait_if_global_read_lock() checks if the current thread
|
|
has the global read lock and refuses the operation with
|
|
ER_CANT_UPDATE_WITH_READLOCK if applicable.
|
|
*/
|
|
if ((error=wait_if_global_read_lock(thd,0,1)))
|
|
goto exit2;
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
/*
|
|
Recreate db options file: /dbpath/.db.opt
|
|
We pass MY_DB_OPT_FILE as "extension" to avoid
|
|
"table name to file name" encoding.
|
|
*/
|
|
build_table_filename(path, sizeof(path), db, "", MY_DB_OPT_FILE, 0);
|
|
if ((error=write_db_opt(thd, path, create_info)))
|
|
goto exit;
|
|
|
|
/*
|
|
Change options if current database is being altered
|
|
TODO: Delete this code
|
|
*/
|
|
if (thd->db && !strcmp(thd->db,db))
|
|
{
|
|
thd->db_charset= create_info->default_table_charset ?
|
|
create_info->default_table_charset :
|
|
thd->variables.collation_server;
|
|
thd->variables.collation_database= thd->db_charset;
|
|
}
|
|
|
|
ha_binlog_log_query(thd, 0, LOGCOM_ALTER_DB,
|
|
thd->query, thd->query_length,
|
|
db, "");
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query, thd->query_length, 0,
|
|
/* suppress_use */ TRUE);
|
|
|
|
/*
|
|
Write should use the database being created as the "current
|
|
database" and not the threads current database, which is the
|
|
default.
|
|
*/
|
|
qinfo.db = db;
|
|
qinfo.db_len = strlen(db);
|
|
|
|
thd->clear_error();
|
|
/* These DDL methods and logging protected with LOCK_mysql_create_db */
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
send_ok(thd, result);
|
|
|
|
exit:
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Drop all tables in a database and the database itself
|
|
|
|
SYNOPSIS
|
|
mysql_rm_db()
|
|
thd Thread handle
|
|
db Database name in the case given by user
|
|
It's already validated and set to lower case
|
|
(if needed) when we come here
|
|
if_exists Don't give error if database doesn't exists
|
|
silent Don't generate errors
|
|
|
|
RETURN
|
|
FALSE ok (Database dropped)
|
|
ERROR Error
|
|
*/
|
|
|
|
bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
|
|
{
|
|
long deleted=0;
|
|
int error= 0;
|
|
char path[FN_REFLEN+16];
|
|
MY_DIR *dirp;
|
|
uint length;
|
|
TABLE_LIST* dropped_tables= 0;
|
|
DBUG_ENTER("mysql_rm_db");
|
|
|
|
/*
|
|
Do not drop database if another thread is holding read lock.
|
|
Wait for global read lock before acquiring LOCK_mysql_create_db.
|
|
After wait_if_global_read_lock() we have protection against another
|
|
global read lock. If we would acquire LOCK_mysql_create_db first,
|
|
another thread could step in and get the global read lock before we
|
|
reach wait_if_global_read_lock(). If this thread tries the same as we
|
|
(admin a db), it would then go and wait on LOCK_mysql_create_db...
|
|
Furthermore wait_if_global_read_lock() checks if the current thread
|
|
has the global read lock and refuses the operation with
|
|
ER_CANT_UPDATE_WITH_READLOCK if applicable.
|
|
*/
|
|
if (wait_if_global_read_lock(thd, 0, 1))
|
|
{
|
|
error= -1;
|
|
goto exit2;
|
|
}
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
|
|
|
|
length= build_table_filename(path, sizeof(path), db, "", "", 0);
|
|
strmov(path+length, MY_DB_OPT_FILE); // Append db option file name
|
|
del_dbopt(path); // Remove dboption hash entry
|
|
path[length]= '\0'; // Remove file name
|
|
|
|
/* See if the directory exists */
|
|
if (!(dirp= my_dir(path,MYF(MY_DONT_SORT))))
|
|
{
|
|
if (!if_exists)
|
|
{
|
|
error= -1;
|
|
my_error(ER_DB_DROP_EXISTS, MYF(0), db);
|
|
goto exit;
|
|
}
|
|
else
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_DB_DROP_EXISTS, ER(ER_DB_DROP_EXISTS), db);
|
|
}
|
|
else
|
|
{
|
|
pthread_mutex_lock(&LOCK_open);
|
|
remove_db_from_cache(db);
|
|
pthread_mutex_unlock(&LOCK_open);
|
|
|
|
|
|
error= -1;
|
|
if ((deleted= mysql_rm_known_files(thd, dirp, db, path, 0,
|
|
&dropped_tables)) >= 0)
|
|
{
|
|
ha_drop_database(path);
|
|
query_cache_invalidate1(db);
|
|
error = 0;
|
|
}
|
|
}
|
|
if (!silent && deleted>=0)
|
|
{
|
|
const char *query;
|
|
ulong query_length;
|
|
if (!thd->query)
|
|
{
|
|
/* The client used the old obsolete mysql_drop_db() call */
|
|
query= path;
|
|
query_length= (uint) (strxmov(path, "drop database `", db, "`",
|
|
NullS) - path);
|
|
}
|
|
else
|
|
{
|
|
query =thd->query;
|
|
query_length= thd->query_length;
|
|
}
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, query, query_length, 0,
|
|
/* suppress_use */ TRUE);
|
|
/*
|
|
Write should use the database being created as the "current
|
|
database" and not the threads current database, which is the
|
|
default.
|
|
*/
|
|
qinfo.db = db;
|
|
qinfo.db_len = strlen(db);
|
|
|
|
thd->clear_error();
|
|
/* These DDL methods and logging protected with LOCK_mysql_create_db */
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
thd->server_status|= SERVER_STATUS_DB_DROPPED;
|
|
send_ok(thd, (ulong) deleted);
|
|
thd->server_status&= ~SERVER_STATUS_DB_DROPPED;
|
|
}
|
|
else if (mysql_bin_log.is_open())
|
|
{
|
|
char *query, *query_pos, *query_end, *query_data_start;
|
|
TABLE_LIST *tbl;
|
|
uint db_len;
|
|
|
|
if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
|
|
goto exit; /* not much else we can do */
|
|
query_pos= query_data_start= strmov(query,"drop table ");
|
|
query_end= query + MAX_DROP_TABLE_Q_LEN;
|
|
db_len= strlen(db);
|
|
|
|
for (tbl= dropped_tables; tbl; tbl= tbl->next_local)
|
|
{
|
|
uint tbl_name_len;
|
|
|
|
/* 3 for the quotes and the comma*/
|
|
tbl_name_len= strlen(tbl->table_name) + 3;
|
|
if (query_pos + tbl_name_len + 1 >= query_end)
|
|
{
|
|
/* These DDL methods and logging protected with LOCK_mysql_create_db */
|
|
write_to_binlog(thd, query, query_pos -1 - query, db, db_len);
|
|
query_pos= query_data_start;
|
|
}
|
|
|
|
*query_pos++ = '`';
|
|
query_pos= strmov(query_pos,tbl->table_name);
|
|
*query_pos++ = '`';
|
|
*query_pos++ = ',';
|
|
}
|
|
|
|
if (query_pos != query_data_start)
|
|
{
|
|
/* These DDL methods and logging protected with LOCK_mysql_create_db */
|
|
write_to_binlog(thd, query, query_pos -1 - query, db, db_len);
|
|
}
|
|
}
|
|
|
|
exit:
|
|
(void)sp_drop_db_routines(thd, db); /* QQ Ignore errors for now */
|
|
Events::drop_schema_events(thd, db);
|
|
/*
|
|
If this database was the client's selected database, we silently
|
|
change the client's selected database to nothing (to have an empty
|
|
SELECT DATABASE() in the future). For this we free() thd->db and set
|
|
it to 0.
|
|
*/
|
|
if (thd->db && !strcmp(thd->db, db))
|
|
thd->set_db(NULL, 0);
|
|
VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
|
|
start_waiting_global_read_lock(thd);
|
|
exit2:
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/*
|
|
Removes files with known extensions plus all found subdirectories that
|
|
are 2 hex digits (raid directories).
|
|
thd MUST be set when calling this function!
|
|
*/
|
|
|
|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
|
|
const char *org_path, uint level,
|
|
TABLE_LIST **dropped_tables)
|
|
{
|
|
long deleted=0;
|
|
ulong found_other_files=0;
|
|
char filePath[FN_REFLEN];
|
|
TABLE_LIST *tot_list=0, **tot_list_next;
|
|
List<String> raid_dirs;
|
|
DBUG_ENTER("mysql_rm_known_files");
|
|
DBUG_PRINT("enter",("path: %s", org_path));
|
|
|
|
tot_list_next= &tot_list;
|
|
|
|
for (uint idx=0 ;
|
|
idx < (uint) dirp->number_off_files && !thd->killed ;
|
|
idx++)
|
|
{
|
|
FILEINFO *file=dirp->dir_entry+idx;
|
|
char *extension;
|
|
DBUG_PRINT("info",("Examining: %s", file->name));
|
|
|
|
/* skiping . and .. */
|
|
if (file->name[0] == '.' && (!file->name[1] ||
|
|
(file->name[1] == '.' && !file->name[2])))
|
|
continue;
|
|
|
|
/* Check if file is a raid directory */
|
|
if ((my_isdigit(system_charset_info, file->name[0]) ||
|
|
(file->name[0] >= 'a' && file->name[0] <= 'f')) &&
|
|
(my_isdigit(system_charset_info, file->name[1]) ||
|
|
(file->name[1] >= 'a' && file->name[1] <= 'f')) &&
|
|
!file->name[2] && !level)
|
|
{
|
|
char newpath[FN_REFLEN], *copy_of_path;
|
|
MY_DIR *new_dirp;
|
|
String *dir;
|
|
uint length;
|
|
|
|
strxmov(newpath,org_path,"/",file->name,NullS);
|
|
length= unpack_filename(newpath,newpath);
|
|
if ((new_dirp = my_dir(newpath,MYF(MY_DONT_SORT))))
|
|
{
|
|
DBUG_PRINT("my",("New subdir found: %s", newpath));
|
|
if ((mysql_rm_known_files(thd, new_dirp, NullS, newpath,1,0)) < 0)
|
|
goto err;
|
|
if (!(copy_of_path= (char*) thd->memdup(newpath, length+1)) ||
|
|
!(dir= new (thd->mem_root) String(copy_of_path, length,
|
|
&my_charset_bin)) ||
|
|
raid_dirs.push_back(dir))
|
|
goto err;
|
|
continue;
|
|
}
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
else if (file->name[0] == 'a' && file->name[1] == 'r' &&
|
|
file->name[2] == 'c' && file->name[3] == '\0')
|
|
{
|
|
/* .frm archive */
|
|
char newpath[FN_REFLEN];
|
|
MY_DIR *new_dirp;
|
|
strxmov(newpath, org_path, "/", "arc", NullS);
|
|
(void) unpack_filename(newpath, newpath);
|
|
if ((new_dirp = my_dir(newpath, MYF(MY_DONT_SORT))))
|
|
{
|
|
DBUG_PRINT("my",("Archive subdir found: %s", newpath));
|
|
if ((mysql_rm_arc_files(thd, new_dirp, newpath)) < 0)
|
|
goto err;
|
|
continue;
|
|
}
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
if (!(extension= strrchr(file->name, '.')))
|
|
extension= strend(file->name);
|
|
if (find_type(extension, &deletable_extentions,1+2) <= 0)
|
|
{
|
|
if (find_type(extension, ha_known_exts(),1+2) <= 0)
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
/* just for safety we use files_charset_info */
|
|
if (db && !my_strcasecmp(files_charset_info,
|
|
extension, reg_ext))
|
|
{
|
|
/* Drop the table nicely */
|
|
*extension= 0; // Remove extension
|
|
TABLE_LIST *table_list=(TABLE_LIST*)
|
|
thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+2);
|
|
if (!table_list)
|
|
goto err;
|
|
table_list->db= (char*) (table_list+1);
|
|
table_list->table_name= strmov(table_list->db, db) + 1;
|
|
VOID(filename_to_tablename(file->name, table_list->table_name,
|
|
strlen(file->name) + 1));
|
|
table_list->alias= table_list->table_name; // If lower_case_table_names=2
|
|
/* Link into list */
|
|
(*tot_list_next)= table_list;
|
|
tot_list_next= &table_list->next_local;
|
|
deleted++;
|
|
}
|
|
else
|
|
{
|
|
strxmov(filePath, org_path, "/", file->name, NullS);
|
|
if (my_delete_with_symlink(filePath,MYF(MY_WME)))
|
|
{
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
if (thd->killed ||
|
|
(tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1)))
|
|
goto err;
|
|
|
|
/* Remove RAID directories */
|
|
{
|
|
List_iterator<String> it(raid_dirs);
|
|
String *dir;
|
|
while ((dir= it++))
|
|
if (rmdir(dir->c_ptr()) < 0)
|
|
found_other_files++;
|
|
}
|
|
my_dirend(dirp);
|
|
|
|
if (dropped_tables)
|
|
*dropped_tables= tot_list;
|
|
|
|
/*
|
|
If the directory is a symbolic link, remove the link first, then
|
|
remove the directory the symbolic link pointed at
|
|
*/
|
|
if (found_other_files)
|
|
{
|
|
my_error(ER_DB_DROP_RMDIR, MYF(0), org_path, EEXIST);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
else
|
|
{
|
|
/* Don't give errors if we can't delete 'RAID' directory */
|
|
if (rm_dir_w_symlink(org_path, level == 0))
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
DBUG_RETURN(deleted);
|
|
|
|
err:
|
|
my_dirend(dirp);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
|
|
/*
|
|
Remove directory with symlink
|
|
|
|
SYNOPSIS
|
|
rm_dir_w_symlink()
|
|
org_path path of derictory
|
|
send_error send errors
|
|
RETURN
|
|
0 OK
|
|
1 ERROR
|
|
*/
|
|
|
|
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error)
|
|
{
|
|
char tmp_path[FN_REFLEN], *pos;
|
|
char *path= tmp_path;
|
|
DBUG_ENTER("rm_dir_w_symlink");
|
|
unpack_filename(tmp_path, org_path);
|
|
#ifdef HAVE_READLINK
|
|
int error;
|
|
char tmp2_path[FN_REFLEN];
|
|
|
|
/* Remove end FN_LIBCHAR as this causes problem on Linux in readlink */
|
|
pos= strend(path);
|
|
if (pos > path && pos[-1] == FN_LIBCHAR)
|
|
*--pos=0;
|
|
|
|
if ((error= my_readlink(tmp2_path, path, MYF(MY_WME))) < 0)
|
|
DBUG_RETURN(1);
|
|
if (!error)
|
|
{
|
|
if (my_delete(path, MYF(send_error ? MY_WME : 0)))
|
|
{
|
|
DBUG_RETURN(send_error);
|
|
}
|
|
/* Delete directory symbolic link pointed at */
|
|
path= tmp2_path;
|
|
}
|
|
#endif
|
|
/* Remove last FN_LIBCHAR to not cause a problem on OS/2 */
|
|
pos= strend(path);
|
|
|
|
if (pos > path && pos[-1] == FN_LIBCHAR)
|
|
*--pos=0;
|
|
if (rmdir(path) < 0 && send_error)
|
|
{
|
|
my_error(ER_DB_DROP_RMDIR, MYF(0), path, errno);
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Remove .frm archives from directory
|
|
|
|
SYNOPSIS
|
|
thd thread handler
|
|
dirp list of files in archive directory
|
|
db data base name
|
|
org_path path of archive directory
|
|
|
|
RETURN
|
|
> 0 number of removed files
|
|
-1 error
|
|
*/
|
|
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
|
|
const char *org_path)
|
|
{
|
|
long deleted= 0;
|
|
ulong found_other_files= 0;
|
|
char filePath[FN_REFLEN];
|
|
DBUG_ENTER("mysql_rm_arc_files");
|
|
DBUG_PRINT("enter", ("path: %s", org_path));
|
|
|
|
for (uint idx=0 ;
|
|
idx < (uint) dirp->number_off_files && !thd->killed ;
|
|
idx++)
|
|
{
|
|
FILEINFO *file=dirp->dir_entry+idx;
|
|
char *extension, *revision;
|
|
DBUG_PRINT("info",("Examining: %s", file->name));
|
|
|
|
/* skiping . and .. */
|
|
if (file->name[0] == '.' && (!file->name[1] ||
|
|
(file->name[1] == '.' && !file->name[2])))
|
|
continue;
|
|
|
|
extension= fn_ext(file->name);
|
|
if (extension[0] != '.' ||
|
|
extension[1] != 'f' || extension[2] != 'r' ||
|
|
extension[3] != 'm' || extension[4] != '-')
|
|
{
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
revision= extension+5;
|
|
while (*revision && my_isdigit(system_charset_info, *revision))
|
|
revision++;
|
|
if (*revision)
|
|
{
|
|
found_other_files++;
|
|
continue;
|
|
}
|
|
strxmov(filePath, org_path, "/", file->name, NullS);
|
|
if (my_delete_with_symlink(filePath,MYF(MY_WME)))
|
|
{
|
|
goto err;
|
|
}
|
|
}
|
|
if (thd->killed)
|
|
goto err;
|
|
|
|
my_dirend(dirp);
|
|
|
|
/*
|
|
If the directory is a symbolic link, remove the link first, then
|
|
remove the directory the symbolic link pointed at
|
|
*/
|
|
if (!found_other_files &&
|
|
rm_dir_w_symlink(org_path, 0))
|
|
DBUG_RETURN(-1);
|
|
DBUG_RETURN(deleted);
|
|
|
|
err:
|
|
my_dirend(dirp);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Internal implementation: switch current database to a valid one.
|
|
|
|
@param thd Thread context.
|
|
@param new_db_name Name of the database to switch to. The function will
|
|
take ownership of the name (the caller must not free
|
|
the allocated memory). If the name is NULL, we're
|
|
going to switch to NULL db.
|
|
@param new_db_access Privileges of the new database.
|
|
@param new_db_charset Character set of the new database.
|
|
*/
|
|
|
|
static void mysql_change_db_impl(THD *thd,
|
|
LEX_STRING *new_db_name,
|
|
ulong new_db_access,
|
|
CHARSET_INFO *new_db_charset)
|
|
{
|
|
/* 1. Change current database in THD. */
|
|
|
|
if (new_db_name == NULL)
|
|
{
|
|
/*
|
|
THD::set_db() does all the job -- it frees previous database name and
|
|
sets the new one.
|
|
*/
|
|
|
|
thd->set_db(NULL, 0);
|
|
}
|
|
else if (new_db_name == &INFORMATION_SCHEMA_NAME)
|
|
{
|
|
/*
|
|
Here we must use THD::set_db(), because we want to copy
|
|
INFORMATION_SCHEMA_NAME constant.
|
|
*/
|
|
|
|
thd->set_db(INFORMATION_SCHEMA_NAME.str, INFORMATION_SCHEMA_NAME.length);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
Here we already have a copy of database name to be used in THD. So,
|
|
we just call THD::reset_db(). Since THD::reset_db() does not releases
|
|
the previous database name, we should do it explicitly.
|
|
*/
|
|
|
|
x_free(thd->db);
|
|
|
|
thd->reset_db(new_db_name->str, new_db_name->length);
|
|
}
|
|
|
|
/* 2. Update security context. */
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
thd->security_ctx->db_access= new_db_access;
|
|
#endif
|
|
|
|
/* 3. Update db-charset environment variables. */
|
|
|
|
thd->db_charset= new_db_charset;
|
|
thd->variables.collation_database= new_db_charset;
|
|
}
|
|
|
|
|
|
/**
|
|
@brief Change the current database.
|
|
|
|
@param thd thread handle
|
|
@param name database name
|
|
@param force_switch if this flag is set (TRUE), mysql_change_db() will
|
|
switch to NULL db if the specified database is not
|
|
available anymore. Corresponding warning will be
|
|
thrown in this case. This flag is used to change
|
|
database in stored-routine-execution code.
|
|
|
|
@details Check that the database name corresponds to a valid and existent
|
|
database, check access rights (unless called with no_access_check), and
|
|
set the current database. This function is called to change the current
|
|
database upon user request (COM_CHANGE_DB command) or temporarily, to
|
|
execute a stored routine.
|
|
|
|
This function is not the only way to switch the database that is
|
|
currently employed. When the replication slave thread switches the
|
|
database before executing a query, it calls thd->set_db directly.
|
|
However, if the query, in turn, uses a stored routine, the stored routine
|
|
will use this function, even if it's run on the slave.
|
|
|
|
This function allocates the name of the database on the system heap: this
|
|
is necessary to be able to uniformly change the database from any module
|
|
of the server. Up to 5.0 different modules were using different memory to
|
|
store the name of the database, and this led to memory corruption:
|
|
a stack pointer set by Stored Procedures was used by replication after
|
|
the stack address was long gone.
|
|
|
|
@return Operation status
|
|
@retval FALSE Success
|
|
@retval TRUE Error
|
|
*/
|
|
|
|
bool mysql_change_db(THD *thd, const LEX_STRING *new_db_name, bool force_switch)
|
|
{
|
|
LEX_STRING new_db_file_name;
|
|
|
|
Security_context *sctx= thd->security_ctx;
|
|
ulong db_access= sctx->db_access;
|
|
|
|
DBUG_ENTER("mysql_change_db");
|
|
DBUG_PRINT("enter",("name: '%s'", new_db_name->str));
|
|
|
|
if (new_db_name == NULL ||
|
|
new_db_name->length == 0)
|
|
{
|
|
if (force_switch)
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR));
|
|
|
|
/* Change db to NULL. */
|
|
|
|
mysql_change_db_impl(thd, NULL, 0, thd->variables.collation_server);
|
|
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
else
|
|
{
|
|
my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
|
|
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
|
|
if (my_strcasecmp(system_charset_info, new_db_name->str,
|
|
INFORMATION_SCHEMA_NAME.str) == 0)
|
|
{
|
|
/* Switch database to INFORMATION_SCHEMA. */
|
|
|
|
mysql_change_db_impl(thd, &INFORMATION_SCHEMA_NAME, SELECT_ACL,
|
|
system_charset_info);
|
|
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
/*
|
|
Now we need to make a copy because check_db_name requires a
|
|
non-constant argument. Actually, it takes database file name.
|
|
|
|
TODO: fix check_db_name().
|
|
*/
|
|
|
|
new_db_file_name.str= my_strndup(new_db_name->str, new_db_name->length,
|
|
MYF(MY_WME));
|
|
new_db_file_name.length= new_db_name->length;
|
|
|
|
if (new_db_file_name.str == NULL)
|
|
DBUG_RETURN(TRUE); /* the error is set */
|
|
|
|
/*
|
|
NOTE: if check_db_name() fails, we should throw an error in any case,
|
|
even if we are called from sp_head::execute().
|
|
|
|
It's next to impossible however to get this error when we are called
|
|
from sp_head::execute(). But let's switch database to NULL in this case
|
|
to be sure.
|
|
*/
|
|
|
|
if (check_db_name(&new_db_file_name))
|
|
{
|
|
my_error(ER_WRONG_DB_NAME, MYF(0), new_db_file_name.str);
|
|
my_free(new_db_file_name.str, MYF(0));
|
|
|
|
if (force_switch)
|
|
{
|
|
/* Change db to NULL. */
|
|
mysql_change_db_impl(thd, NULL, 0, thd->variables.collation_server);
|
|
}
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
DBUG_PRINT("info",("Use database: %s", new_db_file_name.str));
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
db_access=
|
|
test_all_bits(sctx->master_access, DB_ACLS) ?
|
|
DB_ACLS :
|
|
acl_get(sctx->host,
|
|
sctx->ip,
|
|
sctx->priv_user,
|
|
new_db_file_name.str,
|
|
FALSE) | sctx->master_access;
|
|
|
|
if (!force_switch &&
|
|
!(db_access & DB_ACLS) &&
|
|
(!grant_option || check_grant_db(thd, new_db_file_name.str)))
|
|
{
|
|
my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
|
|
sctx->priv_user,
|
|
sctx->priv_host,
|
|
new_db_file_name.str);
|
|
general_log_print(thd, COM_INIT_DB, ER(ER_DBACCESS_DENIED_ERROR),
|
|
sctx->priv_user, sctx->priv_host, new_db_file_name.str);
|
|
my_free(new_db_file_name.str, MYF(0));
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
#endif
|
|
|
|
if (check_db_dir_existence(new_db_file_name.str))
|
|
{
|
|
if (force_switch)
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_BAD_DB_ERROR, ER(ER_BAD_DB_ERROR),
|
|
new_db_file_name.str);
|
|
|
|
my_free(new_db_file_name.str, MYF(0));
|
|
|
|
/* Change db to NULL. */
|
|
|
|
mysql_change_db_impl(thd, NULL, 0, thd->variables.collation_server);
|
|
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
else
|
|
{
|
|
my_error(ER_BAD_DB_ERROR, MYF(0), new_db_file_name.str);
|
|
my_free(new_db_file_name.str, MYF(0));
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
|
|
/*
|
|
NOTE: in mysql_change_db_impl() new_db_file_name is assigned to THD
|
|
attributes and will be freed in THD::~THD().
|
|
*/
|
|
|
|
{
|
|
HA_CREATE_INFO db_options;
|
|
|
|
load_db_opt_by_name(thd, new_db_name->str, &db_options);
|
|
|
|
mysql_change_db_impl(thd, &new_db_file_name, db_access,
|
|
db_options.default_table_charset ?
|
|
db_options.default_table_charset :
|
|
thd->variables.collation_server);
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
static int
|
|
lock_databases(THD *thd, const char *db1, uint length1,
|
|
const char *db2, uint length2)
|
|
{
|
|
pthread_mutex_lock(&LOCK_lock_db);
|
|
while (!thd->killed &&
|
|
(hash_search(&lock_db_cache,(uchar*) db1, length1) ||
|
|
hash_search(&lock_db_cache,(uchar*) db2, length2)))
|
|
{
|
|
wait_for_condition(thd, &LOCK_lock_db, &COND_refresh);
|
|
pthread_mutex_lock(&LOCK_lock_db);
|
|
}
|
|
|
|
if (thd->killed)
|
|
{
|
|
pthread_mutex_unlock(&LOCK_lock_db);
|
|
return 1;
|
|
}
|
|
|
|
lock_db_insert(db1, length1);
|
|
lock_db_insert(db2, length2);
|
|
creating_database++;
|
|
|
|
/*
|
|
Wait if a concurent thread is creating a table at the same time.
|
|
The assumption here is that it will not take too long until
|
|
there is a point in time when a table is not created.
|
|
*/
|
|
|
|
while (!thd->killed && creating_table)
|
|
{
|
|
wait_for_condition(thd, &LOCK_lock_db, &COND_refresh);
|
|
pthread_mutex_lock(&LOCK_lock_db);
|
|
}
|
|
|
|
if (thd->killed)
|
|
{
|
|
lock_db_delete(db1, length1);
|
|
lock_db_delete(db2, length2);
|
|
creating_database--;
|
|
pthread_mutex_unlock(&LOCK_lock_db);
|
|
pthread_cond_signal(&COND_refresh);
|
|
return(1);
|
|
}
|
|
|
|
/*
|
|
We can unlock now as the hash will protect against anyone creating a table
|
|
in the databases we are using
|
|
*/
|
|
pthread_mutex_unlock(&LOCK_lock_db);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Rename database.
|
|
|
|
SYNOPSIS
|
|
mysql_rename_db()
|
|
thd Thread handler
|
|
olddb Old database name
|
|
newdb New database name
|
|
|
|
DESCRIPTION
|
|
This function is invoked whenever a RENAME DATABASE query is executed:
|
|
|
|
RENAME DATABASE 'olddb' TO 'newdb'.
|
|
|
|
NOTES
|
|
|
|
If we have managed to rename (move) tables to the new database
|
|
but something failed on a later step, then we store the
|
|
RENAME DATABASE event in the log. mysql_rename_db() is atomic in
|
|
the sense that it will rename all or none of the tables.
|
|
|
|
TODO:
|
|
- Better trigger, stored procedure, event, grant handling,
|
|
see the comments below.
|
|
NOTE: It's probably a good idea to call wait_if_global_read_lock()
|
|
once in mysql_rename_db(), instead of locking inside all
|
|
the required functions for renaming triggerts, SP, events, grants, etc.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
|
|
bool mysql_rename_db(THD *thd, LEX_STRING *old_db, LEX_STRING *new_db)
|
|
{
|
|
int error= 0, change_to_newdb= 0;
|
|
char path[FN_REFLEN+16];
|
|
uint length;
|
|
HA_CREATE_INFO create_info;
|
|
MY_DIR *dirp;
|
|
TABLE_LIST *table_list;
|
|
SELECT_LEX *sl= thd->lex->current_select;
|
|
DBUG_ENTER("mysql_rename_db");
|
|
|
|
if (lock_databases(thd, old_db->str, old_db->length,
|
|
new_db->str, new_db->length))
|
|
return 1;
|
|
|
|
/*
|
|
Let's remember if we should do "USE newdb" afterwards.
|
|
thd->db will be cleared in mysql_rename_db()
|
|
*/
|
|
if (thd->db && !strcmp(thd->db, old_db->str))
|
|
change_to_newdb= 1;
|
|
|
|
build_table_filename(path, sizeof(path)-1,
|
|
old_db->str, "", MY_DB_OPT_FILE, 0);
|
|
if ((load_db_opt(thd, path, &create_info)))
|
|
create_info.default_table_charset= thd->variables.collation_server;
|
|
|
|
length= build_table_filename(path, sizeof(path)-1, old_db->str, "", "", 0);
|
|
if (length && path[length-1] == FN_LIBCHAR)
|
|
path[length-1]=0; // remove ending '\'
|
|
if ((error= my_access(path,F_OK)))
|
|
{
|
|
my_error(ER_BAD_DB_ERROR, MYF(0), old_db->str);
|
|
goto exit;
|
|
}
|
|
|
|
/* Step1: Create the new database */
|
|
if ((error= mysql_create_db(thd, new_db->str, &create_info, 1)))
|
|
goto exit;
|
|
|
|
/* Step2: Move tables to the new database */
|
|
if ((dirp = my_dir(path,MYF(MY_DONT_SORT))))
|
|
{
|
|
uint nfiles= (uint) dirp->number_off_files;
|
|
for (uint idx=0 ; idx < nfiles && !thd->killed ; idx++)
|
|
{
|
|
FILEINFO *file= dirp->dir_entry + idx;
|
|
char *extension, tname[FN_REFLEN];
|
|
LEX_STRING table_str;
|
|
DBUG_PRINT("info",("Examining: %s", file->name));
|
|
|
|
/* skiping non-FRM files */
|
|
if (my_strcasecmp(files_charset_info,
|
|
(extension= fn_rext(file->name)), reg_ext))
|
|
continue;
|
|
|
|
/* A frm file found, add the table info rename list */
|
|
*extension= '\0';
|
|
|
|
table_str.length= filename_to_tablename(file->name,
|
|
tname, sizeof(tname)-1);
|
|
table_str.str= (char*) sql_memdup(tname, table_str.length + 1);
|
|
Table_ident *old_ident= new Table_ident(thd, *old_db, table_str, 0);
|
|
Table_ident *new_ident= new Table_ident(thd, *new_db, table_str, 0);
|
|
if (!old_ident || !new_ident ||
|
|
!sl->add_table_to_list(thd, old_ident, NULL,
|
|
TL_OPTION_UPDATING, TL_IGNORE) ||
|
|
!sl->add_table_to_list(thd, new_ident, NULL,
|
|
TL_OPTION_UPDATING, TL_IGNORE))
|
|
{
|
|
error= 1;
|
|
my_dirend(dirp);
|
|
goto exit;
|
|
}
|
|
}
|
|
my_dirend(dirp);
|
|
}
|
|
|
|
if ((table_list= thd->lex->query_tables) &&
|
|
(error= mysql_rename_tables(thd, table_list, 1)))
|
|
{
|
|
/*
|
|
Failed to move all tables from the old database to the new one.
|
|
In the best case mysql_rename_tables() moved all tables back to the old
|
|
database. In the worst case mysql_rename_tables() moved some tables
|
|
to the new database, then failed, then started to move the tables back,
|
|
and then failed again. In this situation we have some tables in the
|
|
old database and some tables in the new database.
|
|
Let's delete the option file, and then the new database directory.
|
|
If some tables were left in the new directory, rmdir() will fail.
|
|
It garantees we never loose any tables.
|
|
*/
|
|
build_table_filename(path, sizeof(path)-1,
|
|
new_db->str,"",MY_DB_OPT_FILE, 0);
|
|
my_delete(path, MYF(MY_WME));
|
|
length= build_table_filename(path, sizeof(path)-1, new_db->str, "", "", 0);
|
|
if (length && path[length-1] == FN_LIBCHAR)
|
|
path[length-1]=0; // remove ending '\'
|
|
rmdir(path);
|
|
goto exit;
|
|
}
|
|
|
|
|
|
/*
|
|
Step3: move all remaining files to the new db's directory.
|
|
Skip db opt file: it's been created by mysql_create_db() in
|
|
the new directory, and will be dropped by mysql_rm_db() in the old one.
|
|
Trigger TRN and TRG files are be moved as regular files at the moment,
|
|
without any special treatment.
|
|
|
|
Triggers without explicit database qualifiers in table names work fine:
|
|
use d1;
|
|
create trigger trg1 before insert on t2 for each row set @a:=1
|
|
rename database d1 to d2;
|
|
|
|
TODO: Triggers, having the renamed database explicitely written
|
|
in the table qualifiers.
|
|
1. when the same database is renamed:
|
|
create trigger d1.trg1 before insert on d1.t1 for each row set @a:=1;
|
|
rename database d1 to d2;
|
|
Problem: After database renaming, the trigger's body
|
|
still points to the old database d1.
|
|
2. when another database is renamed:
|
|
create trigger d3.trg1 before insert on d3.t1 for each row
|
|
insert into d1.t1 values (...);
|
|
rename database d1 to d2;
|
|
Problem: After renaming d1 to d2, the trigger's body
|
|
in the database d3 still points to database d1.
|
|
*/
|
|
|
|
if ((dirp = my_dir(path,MYF(MY_DONT_SORT))))
|
|
{
|
|
uint nfiles= (uint) dirp->number_off_files;
|
|
for (uint idx=0 ; idx < nfiles ; idx++)
|
|
{
|
|
FILEINFO *file= dirp->dir_entry + idx;
|
|
char oldname[FN_REFLEN], newname[FN_REFLEN];
|
|
DBUG_PRINT("info",("Examining: %s", file->name));
|
|
|
|
/* skiping . and .. and MY_DB_OPT_FILE */
|
|
if ((file->name[0] == '.' &&
|
|
(!file->name[1] || (file->name[1] == '.' && !file->name[2]))) ||
|
|
!my_strcasecmp(files_charset_info, file->name, MY_DB_OPT_FILE))
|
|
continue;
|
|
|
|
/* pass empty file name, and file->name as extension to avoid encoding */
|
|
build_table_filename(oldname, sizeof(oldname)-1,
|
|
old_db->str, "", file->name, 0);
|
|
build_table_filename(newname, sizeof(newname)-1,
|
|
new_db->str, "", file->name, 0);
|
|
my_rename(oldname, newname, MYF(MY_WME));
|
|
}
|
|
my_dirend(dirp);
|
|
}
|
|
|
|
/*
|
|
Step4: TODO: moving stored procedures in the 'proc' system table
|
|
We need a new function: sp_move_db_routines(thd, olddb, newdb)
|
|
Which will basically have the same effect with:
|
|
UPDATE proc SET db='newdb' WHERE db='olddb'
|
|
Note, for 5.0 to 5.1 upgrade purposes we don't really need it.
|
|
|
|
The biggest problem here is that we can't have a lock on LOCK_open() while
|
|
calling open_table() for 'proc'.
|
|
|
|
Two solutions:
|
|
- Start by opening the 'event' and 'proc' (and other) tables for write
|
|
even before creating the 'to' database. (This will have the nice
|
|
effect of blocking another 'rename database' while the lock is active).
|
|
- Use the solution "Disable create of new tables during lock table"
|
|
|
|
For an example of how to read through all rows, see:
|
|
sql_help.cc::search_topics()
|
|
*/
|
|
|
|
/*
|
|
Step5: TODO: moving events in the 'event' system table
|
|
We need a new function evex_move_db_events(thd, olddb, newdb)
|
|
Which will have the same effect with:
|
|
UPDATE event SET db='newdb' WHERE db='olddb'
|
|
Note, for 5.0 to 5.1 upgrade purposes we don't really need it.
|
|
*/
|
|
|
|
/*
|
|
Step6: TODO: moving grants in the 'db', 'tables_priv', 'columns_priv'.
|
|
Update each grant table, doing the same with:
|
|
UPDATE system_table SET db='newdb' WHERE db='olddb'
|
|
*/
|
|
|
|
/*
|
|
Step7: drop the old database.
|
|
remove_db_from_cache(olddb) and query_cache_invalidate(olddb)
|
|
are done inside mysql_rm_db(), no needs to execute them again.
|
|
mysql_rm_db() also "unuses" if we drop the current database.
|
|
*/
|
|
error= mysql_rm_db(thd, old_db->str, 0, 1);
|
|
|
|
/* Step8: logging */
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
Query_log_event qinfo(thd, thd->query, thd->query_length, 0, TRUE);
|
|
thd->clear_error();
|
|
mysql_bin_log.write(&qinfo);
|
|
}
|
|
|
|
/* Step9: Let's do "use newdb" if we renamed the current database */
|
|
if (change_to_newdb)
|
|
error|= mysql_change_db(thd, new_db, 0);
|
|
|
|
exit:
|
|
pthread_mutex_lock(&LOCK_lock_db);
|
|
/* Remove the databases from db lock cache */
|
|
lock_db_delete(old_db->str, old_db->length);
|
|
lock_db_delete(new_db->str, new_db->length);
|
|
creating_database--;
|
|
/* Signal waiting CREATE TABLE's to continue */
|
|
pthread_cond_signal(&COND_refresh);
|
|
pthread_mutex_unlock(&LOCK_lock_db);
|
|
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
Check if there is directory for the database name.
|
|
|
|
SYNOPSIS
|
|
check_db_dir_existence()
|
|
db_name database name
|
|
|
|
RETURN VALUES
|
|
FALSE There is directory for the specified database name.
|
|
TRUE The directory does not exist.
|
|
*/
|
|
|
|
bool check_db_dir_existence(const char *db_name)
|
|
{
|
|
char db_dir_path[FN_REFLEN];
|
|
uint db_dir_path_len;
|
|
|
|
db_dir_path_len= build_table_filename(db_dir_path, sizeof(db_dir_path),
|
|
db_name, "", "", 0);
|
|
|
|
if (db_dir_path_len && db_dir_path[db_dir_path_len - 1] == FN_LIBCHAR)
|
|
db_dir_path[db_dir_path_len - 1]= 0;
|
|
|
|
/* Check access. */
|
|
|
|
return my_access(db_dir_path, F_OK);
|
|
}
|