mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
f252f9248a
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c BitKeeper/etc/ignore: added libmysqld/ha_ndbcluster_cond.cc --- added debian/defs.mk debian/control client/completion_hash.cc: Remove not needed casts client/my_readline.h: Remove some old types client/mysql.cc: Simplify types client/mysql_upgrade.c: Remove some old types Update call to dirname_part client/mysqladmin.cc: Remove some old types client/mysqlbinlog.cc: Remove some old types Change some buffers to be uchar to avoid casts client/mysqlcheck.c: Remove some old types client/mysqldump.c: Remove some old types Remove some not needed casts Change some string lengths to size_t client/mysqlimport.c: Remove some old types client/mysqlshow.c: Remove some old types client/mysqlslap.c: Remove some old types Remove some not needed casts client/mysqltest.c: Removed some old types Removed some not needed casts Updated hash-get-key function arguments Updated parameters to dirname_part() client/readline.cc: Removed some old types Removed some not needed casts Changed some string lengths to use size_t client/sql_string.cc: Removed some old types dbug/dbug.c: Removed some old types Changed some string lengths to use size_t Changed some prototypes to avoid casts extra/comp_err.c: Removed some old types extra/innochecksum.c: Removed some old types extra/my_print_defaults.c: Removed some old types extra/mysql_waitpid.c: Removed some old types extra/perror.c: Removed some old types extra/replace.c: Removed some old types Updated parameters to dirname_part() extra/resolve_stack_dump.c: Removed some old types extra/resolveip.c: Removed some old types include/config-win.h: Removed some old types include/decimal.h: Changed binary strings to be uchar* instead of char* include/ft_global.h: Removed some old types include/hash.h: Removed some old types include/heap.h: Removed some old types Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable include/keycache.h: Removed some old types include/m_ctype.h: Removed some old types Changed some string lengths to use size_t Changed character length functions to return uint unsigned char -> uchar include/m_string.h: Removed some old types Changed some string lengths to use size_t include/my_alloc.h: Changed some string lengths to use size_t include/my_base.h: Removed some old types include/my_dbug.h: Removed some old types Changed some string lengths to use size_t Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage include/my_getopt.h: Removed some old types include/my_global.h: Removed old types: my_size_t -> size_t byte -> uchar gptr -> uchar * include/my_list.h: Removed some old types include/my_nosys.h: Removed some old types include/my_pthread.h: Removed some old types include/my_sys.h: Removed some old types Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read() Changed some string lengths to use size_t my_malloc() / my_free() now uses void * Updated parameters to dirname_part() & my_uncompress() include/my_tree.h: Removed some old types include/my_trie.h: Removed some old types include/my_user.h: Changed some string lengths to use size_t include/my_vle.h: Removed some old types include/my_xml.h: Removed some old types Changed some string lengths to use size_t include/myisam.h: Removed some old types include/myisammrg.h: Removed some old types include/mysql.h: Removed some old types Changed byte streams to use uchar* instead of char* include/mysql_com.h: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts include/queues.h: Removed some old types include/sql_common.h: Removed some old types include/sslopt-longopts.h: Removed some old types include/violite.h: Removed some old types Changed some string lengths to use size_t libmysql/client_settings.h: Removed some old types libmysql/libmysql.c: Removed some old types libmysql/manager.c: Removed some old types libmysqld/emb_qcache.cc: Removed some old types libmysqld/emb_qcache.h: Removed some old types libmysqld/lib_sql.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts true -> TRUE, false -> FALSE mysys/array.c: Removed some old types mysys/charset.c: Changed some string lengths to use size_t mysys/checksum.c: Include zlib to get definition for crc32 Removed some old types mysys/default.c: Removed some old types Changed some string lengths to use size_t mysys/default_modify.c: Changed some string lengths to use size_t Removed some not needed casts mysys/hash.c: Removed some old types Changed some string lengths to use size_t Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function. hash_element now takes 'ulong' as the index type (cleanup) mysys/list.c: Removed some old types mysys/mf_cache.c: Changed some string lengths to use size_t mysys/mf_dirname.c: Removed some old types Changed some string lengths to use size_t Added argument to dirname_part() to avoid calculation of length for 'to' mysys/mf_fn_ext.c: Removed some old types Updated parameters to dirname_part() mysys/mf_format.c: Removed some old types Changed some string lengths to use size_t mysys/mf_getdate.c: Removed some old types mysys/mf_iocache.c: Removed some old types Changed some string lengths to use size_t Changed calculation of 'max_length' to be done the same way in all functions mysys/mf_iocache2.c: Removed some old types Changed some string lengths to use size_t Clean up comments Removed not needed indentation mysys/mf_keycache.c: Removed some old types mysys/mf_keycaches.c: Removed some old types mysys/mf_loadpath.c: Removed some old types mysys/mf_pack.c: Removed some old types Changed some string lengths to use size_t Removed some not needed casts Removed very old VMS code Updated parameters to dirname_part() Use result of dirnam_part() to remove call to strcat() mysys/mf_path.c: Removed some old types mysys/mf_radix.c: Removed some old types mysys/mf_same.c: Removed some old types mysys/mf_sort.c: Removed some old types mysys/mf_soundex.c: Removed some old types mysys/mf_strip.c: Removed some old types mysys/mf_tempdir.c: Removed some old types mysys/mf_unixpath.c: Removed some old types mysys/mf_wfile.c: Removed some old types mysys/mulalloc.c: Removed some old types mysys/my_alloc.c: Removed some old types Changed some string lengths to use size_t Use void* as type for allocated memory area Removed some not needed casts Changed argument 'Size' to 'length' according coding guidelines mysys/my_chsize.c: Changed some buffers to be uchar* to avoid casts mysys/my_compress.c: More comments Removed some old types Changed string lengths to use size_t Changed arguments to my_uncompress() to make them easier to understand Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) Changed type of 'pack_data' argument to packfrm() to avoid casts. mysys/my_conio.c: Changed some string lengths to use size_t mysys/my_create.c: Removed some old types mysys/my_div.c: Removed some old types mysys/my_error.c: Removed some old types mysys/my_fopen.c: Removed some old types mysys/my_fstream.c: Removed some old types Changed some string lengths to use size_t writen -> written mysys/my_getopt.c: Removed some old types mysys/my_getwd.c: Removed some old types More comments mysys/my_init.c: Removed some old types mysys/my_largepage.c: Removed some old types Changed some string lengths to use size_t mysys/my_lib.c: Removed some old types mysys/my_lockmem.c: Removed some old types mysys/my_malloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/my_memmem.c: Indentation cleanup mysys/my_once.c: Removed some old types Changed malloc(), free() and related functions to use void * mysys/my_open.c: Removed some old types mysys/my_pread.c: Removed some old types Changed all functions to use size_t Added comment for how my_pread() / my_pwrite() are supposed to work. Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. (If we ever would really need this, it should be enabled only with a flag argument) mysys/my_quick.c: Removed some old types Changed all functions to use size_t mysys/my_read.c: Removed some old types Changed all functions to use size_t mysys/my_realloc.c: Removed some old types Use void* as type for allocated memory area Changed all functions to use size_t mysys/my_static.c: Removed some old types mysys/my_static.h: Removed some old types mysys/my_vle.c: Removed some old types mysys/my_wincond.c: Removed some old types mysys/my_windac.c: Removed some old types mysys/my_write.c: Removed some old types Changed all functions to use size_t mysys/ptr_cmp.c: Removed some old types Changed all functions to use size_t mysys/queues.c: Removed some old types mysys/safemalloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/string.c: Removed some old types Changed all functions to use size_t mysys/testhash.c: Removed some old types mysys/thr_alarm.c: Removed some old types mysys/thr_lock.c: Removed some old types mysys/tree.c: Removed some old types mysys/trie.c: Removed some old types mysys/typelib.c: Removed some old types plugin/daemon_example/daemon_example.cc: Removed some old types regex/reginit.c: Removed some old types server-tools/instance-manager/buffer.cc: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/buffer.h: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/commands.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_map.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_options.cc: Changed buffer to be of type uchar* Replaced alloc_root + strcpy() with strdup_root() server-tools/instance-manager/mysql_connection.cc: Changed buffer to be of type uchar* server-tools/instance-manager/options.cc: Removed some old types server-tools/instance-manager/parse.cc: Changed some string lengths to use size_t server-tools/instance-manager/parse.h: Removed some old types Changed some string lengths to use size_t server-tools/instance-manager/protocol.cc: Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t server-tools/instance-manager/protocol.h: Changed some string lengths to use size_t server-tools/instance-manager/user_map.cc: Removed some old types Changed some string lengths to use size_t sql/derror.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/discover.cc: Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts sql/event_data_objects.cc: Removed some old types Added missing casts for alloc() and sprintf() sql/event_db_repository.cc: Changed some buffers to be uchar* to avoid casts Added missing casts for sprintf() sql/event_queue.cc: Removed some old types sql/field.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/field.h: Removed some old types Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). Changed some string lengths to use size_t Removed some not needed casts Changed val_xxx(xxx, new_ptr) to take const pointers sql/field_conv.cc: Removed some old types Added casts required because memory area pointers are now uchar* sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/gen_lex_hash.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/gstream.h: Added required cast sql/ha_ndbcluster.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Added required casts Removed some not needed casts sql/ha_ndbcluster.h: Removed some old types sql/ha_ndbcluster_binlog.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake() Changed some string lengths to use size_t Added missing casts for alloc() and sprintf() sql/ha_ndbcluster_binlog.h: Removed some old types sql/ha_ndbcluster_cond.cc: Removed some old types Removed some not needed casts sql/ha_ndbcluster_cond.h: Removed some old types sql/ha_partition.cc: Removed some old types Changed prototype for change_partition() to avoid casts sql/ha_partition.h: Removed some old types sql/handler.cc: Removed some old types Changed some string lengths to use size_t sql/handler.h: Removed some old types Changed some string lengths to use size_t Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts sql/hash_filo.h: Removed some old types Changed all functions to use size_t sql/hostname.cc: Removed some old types sql/item.cc: Removed some old types Changed some string lengths to use size_t Use strmake() instead of memdup() to create a null terminated string. Updated calls to new Field() sql/item.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.cc: Removed some old types Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.h: Removed some old types sql/item_create.cc: Removed some old types sql/item_func.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added test for failing alloc() in init_result_field() Remove old confusing comment Fixed compiler warning sql/item_func.h: Removed some old types sql/item_row.cc: Removed some old types sql/item_row.h: Removed some old types sql/item_strfunc.cc: Include zlib (needed becasue we call crc32) Removed some old types sql/item_strfunc.h: Removed some old types Changed some types to match new function prototypes sql/item_subselect.cc: Removed some old types sql/item_subselect.h: Removed some old types sql/item_sum.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/item_sum.h: Removed some old types sql/item_timefunc.cc: Removed some old types Changed some string lengths to use size_t sql/item_timefunc.h: Removed some old types sql/item_xmlfunc.cc: Changed some string lengths to use size_t sql/item_xmlfunc.h: Removed some old types sql/key.cc: Removed some old types Removed some not needed casts sql/lock.cc: Removed some old types Added some cast to my_multi_malloc() arguments for safety sql/log.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Changed usage of pwrite() to not assume it holds the cursor position for the file Made usage of my_read() safer sql/log_event.cc: Removed some old types Added checking of return value of malloc() in pack_info() Changed some buffers to be uchar* to avoid casts Removed some 'const' to avoid casts Added missing casts for alloc() and sprintf() Added required casts Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety sql/log_event.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/log_event_old.cc: Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/log_event_old.h: Changed some buffers to be uchar* to avoid casts sql/mf_iocache.cc: Removed some old types sql/my_decimal.cc: Changed memory area to use uchar* sql/my_decimal.h: Changed memory area to use uchar* sql/mysql_priv.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some string lengths to use size_t Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow Changed some buffers to be uchar* to avoid casts sql/mysqld.cc: Removed some old types sql/net_serv.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Ensure that vio_read()/vio_write() return values are stored in a size_t variable Removed some not needed casts sql/opt_range.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/opt_range.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/opt_sum.cc: Removed some old types Removed some not needed casts sql/parse_file.cc: Removed some old types Changed some string lengths to use size_t Changed alloc_root + memcpy + set end 0 -> strmake_root() sql/parse_file.h: Removed some old types sql/partition_info.cc: Removed some old types Added missing casts for alloc() Changed some buffers to be uchar* to avoid casts sql/partition_info.h: Changed some buffers to be uchar* to avoid casts sql/protocol.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/protocol.h: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/records.cc: Removed some old types sql/repl_failsafe.cc: Removed some old types Changed some string lengths to use size_t Added required casts sql/rpl_filter.cc: Removed some old types Updated hash-get-key function arguments Changed some string lengths to use size_t sql/rpl_filter.h: Changed some string lengths to use size_t sql/rpl_injector.h: Removed some old types sql/rpl_record.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts sql/rpl_record.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/rpl_record_old.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/rpl_record_old.h: Removed some old types Changed some buffers to be uchar* to avoid cast sql/rpl_rli.cc: Removed some old types sql/rpl_tblmap.cc: Removed some old types sql/rpl_tblmap.h: Removed some old types sql/rpl_utility.cc: Removed some old types sql/rpl_utility.h: Removed some old types Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length sql/set_var.cc: Removed some old types Updated parameters to dirname_part() sql/set_var.h: Removed some old types sql/slave.cc: Removed some old types Changed some string lengths to use size_t sql/slave.h: Removed some old types sql/sp.cc: Removed some old types Added missing casts for printf() sql/sp.h: Removed some old types Updated hash-get-key function arguments sql/sp_cache.cc: Removed some old types Added missing casts for printf() Updated hash-get-key function arguments sql/sp_head.cc: Removed some old types Added missing casts for alloc() and printf() Added required casts Updated hash-get-key function arguments sql/sp_head.h: Removed some old types sql/sp_pcontext.cc: Removed some old types sql/sp_pcontext.h: Removed some old types sql/sql_acl.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added required casts sql/sql_analyse.cc: Changed some buffers to be uchar* to avoid casts sql/sql_analyse.h: Changed some buffers to be uchar* to avoid casts sql/sql_array.h: Removed some old types sql/sql_base.cc: Removed some old types Updated hash-get-key function arguments sql/sql_binlog.cc: Removed some old types Added missing casts for printf() sql/sql_cache.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts Changed some string lengths to use size_t sql/sql_cache.h: Removed some old types Removed reference to not existing function cache_key() Updated hash-get-key function arguments sql/sql_class.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() Updated hash-get-key function arguments Moved THD::max_row_length() to table.cc (as it's not depending on THD) Removed some not needed casts sql/sql_class.h: Removed some old types Changed malloc(), free() and related functions to use void * Removed some not needed casts Changed some string lengths to use size_t Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD sql/sql_connect.cc: Removed some old types Added required casts sql/sql_db.cc: Removed some old types Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety Added missing casts for alloc() sql/sql_delete.cc: Removed some old types sql/sql_handler.cc: Removed some old types Updated hash-get-key function arguments Added some cast to my_multi_malloc() arguments for safety sql/sql_help.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_insert.cc: Removed some old types Added missing casts for alloc() and printf() sql/sql_lex.cc: Removed some old types sql/sql_lex.h: Removed some old types Removed some not needed casts sql/sql_list.h: Removed some old types Removed some not needed casts sql/sql_load.cc: Removed some old types Removed compiler warning sql/sql_manager.cc: Removed some old types sql/sql_map.cc: Removed some old types sql/sql_map.h: Removed some old types sql/sql_olap.cc: Removed some old types sql/sql_parse.cc: Removed some old types Trivial move of code lines to make things more readable Changed some string lengths to use size_t Added missing casts for alloc() sql/sql_partition.cc: Removed some old types Removed compiler warnings about not used functions Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_partition.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_plugin.cc: Removed some old types Added missing casts for alloc() Updated hash-get-key function arguments sql/sql_prepare.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Added missing casts for alloc() and printf() sql-common/client.c: Removed some old types Changed some memory areas to use uchar* sql-common/my_user.c: Changed some string lengths to use size_t sql-common/pack.c: Changed some buffers to be uchar* to avoid casts sql/sql_repl.cc: Added required casts Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/sql_select.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some old types sql/sql_select.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_servers.cc: Removed some old types Updated hash-get-key function arguments sql/sql_show.cc: Removed some old types Added missing casts for alloc() Removed some not needed casts sql/sql_string.cc: Removed some old types Added required casts sql/sql_table.cc: Removed some old types Removed compiler warning about not used variable Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_test.cc: Removed some old types sql/sql_trigger.cc: Removed some old types Added missing casts for alloc() sql/sql_udf.cc: Removed some old types Updated hash-get-key function arguments sql/sql_union.cc: Removed some old types sql/sql_update.cc: Removed some old types Removed some not needed casts sql/sql_view.cc: Removed some old types sql/sql_yacc.yy: Removed some old types Changed some string lengths to use size_t Added missing casts for alloc() sql/stacktrace.c: Removed some old types sql/stacktrace.h: Removed some old types sql/structs.h: Removed some old types sql/table.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Removed setting of LEX_STRING() arguments in declaration Added required casts More function comments Moved max_row_length() here from sql_class.cc/sql_class.h sql/table.h: Removed some old types Changed some string lengths to use size_t sql/thr_malloc.cc: Use void* as type for allocated memory area Changed all functions to use size_t sql/tzfile.h: Changed some buffers to be uchar* to avoid casts sql/tztime.cc: Changed some buffers to be uchar* to avoid casts Updated hash-get-key function arguments Added missing casts for alloc() Removed some not needed casts sql/uniques.cc: Removed some old types Removed some not needed casts sql/unireg.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added missing casts for alloc() storage/archive/archive_reader.c: Removed some old types storage/archive/azio.c: Removed some old types Removed some not needed casts storage/archive/ha_archive.cc: Removed some old types Changed type for 'frmblob' in archive_discover() to match handler Updated hash-get-key function arguments Removed some not needed casts storage/archive/ha_archive.h: Removed some old types storage/blackhole/ha_blackhole.cc: Removed some old types storage/blackhole/ha_blackhole.h: Removed some old types storage/csv/ha_tina.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts storage/csv/ha_tina.h: Removed some old types Removed some not needed casts storage/csv/transparent_file.cc: Removed some old types Changed type of 'bytes_read' to be able to detect read errors Fixed indentation storage/csv/transparent_file.h: Removed some old types storage/example/ha_example.cc: Removed some old types Updated hash-get-key function arguments storage/example/ha_example.h: Removed some old types storage/federated/ha_federated.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts storage/federated/ha_federated.h: Removed some old types storage/heap/_check.c: Changed some buffers to be uchar* to avoid casts storage/heap/_rectest.c: Removed some old types storage/heap/ha_heap.cc: Removed some old types storage/heap/ha_heap.h: Removed some old types storage/heap/heapdef.h: Removed some old types storage/heap/hp_block.c: Removed some old types Changed some string lengths to use size_t storage/heap/hp_clear.c: Removed some old types storage/heap/hp_close.c: Removed some old types storage/heap/hp_create.c: Removed some old types storage/heap/hp_delete.c: Removed some old types storage/heap/hp_hash.c: Removed some old types storage/heap/hp_info.c: Removed some old types storage/heap/hp_open.c: Removed some old types storage/heap/hp_rfirst.c: Removed some old types storage/heap/hp_rkey.c: Removed some old types storage/heap/hp_rlast.c: Removed some old types storage/heap/hp_rnext.c: Removed some old types storage/heap/hp_rprev.c: Removed some old types storage/heap/hp_rrnd.c: Removed some old types storage/heap/hp_rsame.c: Removed some old types storage/heap/hp_scan.c: Removed some old types storage/heap/hp_test1.c: Removed some old types storage/heap/hp_test2.c: Removed some old types storage/heap/hp_update.c: Removed some old types storage/heap/hp_write.c: Removed some old types Changed some string lengths to use size_t storage/innobase/handler/ha_innodb.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() and printf() Removed some not needed casts storage/innobase/handler/ha_innodb.h: Removed some old types storage/myisam/ft_boolean_search.c: Removed some old types storage/myisam/ft_nlq_search.c: Removed some old types storage/myisam/ft_parser.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ft_static.c: Removed some old types storage/myisam/ft_stopwords.c: Removed some old types storage/myisam/ft_update.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ftdefs.h: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/fulltext.h: Removed some old types storage/myisam/ha_myisam.cc: Removed some old types storage/myisam/ha_myisam.h: Removed some old types storage/myisam/mi_cache.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_check.c: Removed some old types storage/myisam/mi_checksum.c: Removed some old types storage/myisam/mi_close.c: Removed some old types storage/myisam/mi_create.c: Removed some old types storage/myisam/mi_delete.c: Removed some old types storage/myisam/mi_delete_all.c: Removed some old types storage/myisam/mi_dynrec.c: Removed some old types storage/myisam/mi_extra.c: Removed some old types storage/myisam/mi_key.c: Removed some old types storage/myisam/mi_locking.c: Removed some old types storage/myisam/mi_log.c: Removed some old types storage/myisam/mi_open.c: Removed some old types Removed some not needed casts Check argument of my_write()/my_pwrite() in functions returning int Added casting of string lengths to size_t storage/myisam/mi_packrec.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_page.c: Removed some old types storage/myisam/mi_preload.c: Removed some old types storage/myisam/mi_range.c: Removed some old types storage/myisam/mi_rfirst.c: Removed some old types storage/myisam/mi_rkey.c: Removed some old types storage/myisam/mi_rlast.c: Removed some old types storage/myisam/mi_rnext.c: Removed some old types storage/myisam/mi_rnext_same.c: Removed some old types storage/myisam/mi_rprev.c: Removed some old types storage/myisam/mi_rrnd.c: Removed some old types storage/myisam/mi_rsame.c: Removed some old types storage/myisam/mi_rsamepos.c: Removed some old types storage/myisam/mi_scan.c: Removed some old types storage/myisam/mi_search.c: Removed some old types storage/myisam/mi_static.c: Removed some old types storage/myisam/mi_statrec.c: Removed some old types storage/myisam/mi_test1.c: Removed some old types storage/myisam/mi_test2.c: Removed some old types storage/myisam/mi_test3.c: Removed some old types storage/myisam/mi_unique.c: Removed some old types storage/myisam/mi_update.c: Removed some old types storage/myisam/mi_write.c: Removed some old types storage/myisam/myisam_ftdump.c: Removed some old types storage/myisam/myisamchk.c: Removed some old types storage/myisam/myisamdef.h: Removed some old types storage/myisam/myisamlog.c: Removed some old types Indentation fix storage/myisam/myisampack.c: Removed some old types storage/myisam/rt_index.c: Removed some old types storage/myisam/rt_split.c: Removed some old types storage/myisam/sort.c: Removed some old types storage/myisam/sp_defs.h: Removed some old types storage/myisam/sp_key.c: Removed some old types storage/myisammrg/ha_myisammrg.cc: Removed some old types storage/myisammrg/ha_myisammrg.h: Removed some old types storage/myisammrg/myrg_close.c: Removed some old types storage/myisammrg/myrg_def.h: Removed some old types storage/myisammrg/myrg_delete.c: Removed some old types storage/myisammrg/myrg_open.c: Removed some old types Updated parameters to dirname_part() storage/myisammrg/myrg_queue.c: Removed some old types storage/myisammrg/myrg_rfirst.c: Removed some old types storage/myisammrg/myrg_rkey.c: Removed some old types storage/myisammrg/myrg_rlast.c: Removed some old types storage/myisammrg/myrg_rnext.c: Removed some old types storage/myisammrg/myrg_rnext_same.c: Removed some old types storage/myisammrg/myrg_rprev.c: Removed some old types storage/myisammrg/myrg_rrnd.c: Removed some old types storage/myisammrg/myrg_rsame.c: Removed some old types storage/myisammrg/myrg_update.c: Removed some old types storage/myisammrg/myrg_write.c: Removed some old types storage/ndb/include/util/ndb_opts.h: Removed some old types storage/ndb/src/cw/cpcd/main.cpp: Removed some old types storage/ndb/src/kernel/vm/Configuration.cpp: Removed some old types storage/ndb/src/mgmclient/main.cpp: Removed some old types storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Removed some old types Removed old disabled code storage/ndb/src/mgmsrv/main.cpp: Removed some old types storage/ndb/src/ndbapi/NdbBlob.cpp: Removed some old types storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Added required casts storage/ndb/src/ndbapi/NdbScanOperation.cpp: Added required casts storage/ndb/tools/delete_all.cpp: Removed some old types storage/ndb/tools/desc.cpp: Removed some old types storage/ndb/tools/drop_index.cpp: Removed some old types storage/ndb/tools/drop_tab.cpp: Removed some old types storage/ndb/tools/listTables.cpp: Removed some old types storage/ndb/tools/ndb_config.cpp: Removed some old types storage/ndb/tools/restore/consumer_restore.cpp: Changed some buffers to be uchar* to avoid casts with new defintion of packfrm() storage/ndb/tools/restore/restore_main.cpp: Removed some old types storage/ndb/tools/select_all.cpp: Removed some old types storage/ndb/tools/select_count.cpp: Removed some old types storage/ndb/tools/waiter.cpp: Removed some old types strings/bchange.c: Changed function to use uchar * and size_t strings/bcmp.c: Changed function to use uchar * and size_t strings/bmove512.c: Changed function to use uchar * and size_t strings/bmove_upp.c: Changed function to use uchar * and size_t strings/ctype-big5.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-bin.c: Changed functions to use size_t strings/ctype-cp932.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-czech.c: Fixed indentation Changed functions to use size_t strings/ctype-euc_kr.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-eucjpms.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-gb2312.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-gbk.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-latin1.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-mb.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-simple.c: Changed functions to use size_t Simpler loops for caseup/casedown unsigned int -> uint unsigned char -> uchar strings/ctype-sjis.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-tis620.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-uca.c: Changed functions to use size_t unsigned char -> uchar strings/ctype-ucs2.c: Moved inclusion of stdarg.h to other includes usigned char -> uchar Changed functions to use size_t Changed character length functions to return uint strings/ctype-ujis.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-utf8.c: Changed functions to use size_t unsigned char -> uchar Indentation fixes strings/ctype-win1250ch.c: Indentation fixes Changed functions to use size_t strings/ctype.c: Changed functions to use size_t strings/decimal.c: Changed type for memory argument to uchar * strings/do_ctype.c: Indentation fixes strings/my_strtoll10.c: unsigned char -> uchar strings/my_vsnprintf.c: Changed functions to use size_t strings/r_strinstr.c: Removed some old types Changed functions to use size_t strings/str_test.c: Removed some old types strings/strappend.c: Changed functions to use size_t strings/strcont.c: Removed some old types strings/strfill.c: Removed some old types strings/strinstr.c: Changed functions to use size_t strings/strlen.c: Changed functions to use size_t strings/strmake.c: Changed functions to use size_t strings/strnlen.c: Changed functions to use size_t strings/strnmov.c: Changed functions to use size_t strings/strto.c: unsigned char -> uchar strings/strtod.c: Changed functions to use size_t strings/strxnmov.c: Changed functions to use size_t strings/xml.c: Changed functions to use size_t Indentation fixes tests/mysql_client_test.c: Removed some old types tests/thread_test.c: Removed some old types vio/test-ssl.c: Removed some old types vio/test-sslclient.c: Removed some old types vio/test-sslserver.c: Removed some old types vio/vio.c: Removed some old types vio/vio_priv.h: Removed some old types Changed vio_read()/vio_write() to work with size_t vio/viosocket.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viossl.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viosslfactories.c: Removed some old types vio/viotest-ssl.c: Removed some old types win/README: More explanations
1052 lines
29 KiB
C++
1052 lines
29 KiB
C++
/* Copyright (C) 2004-2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "event_db_repository.h"
|
|
#include "event_data_objects.h"
|
|
#include "events.h"
|
|
#include "sql_show.h"
|
|
|
|
static
|
|
const TABLE_FIELD_W_TYPE event_table_fields[ET_FIELD_COUNT] =
|
|
{
|
|
{
|
|
{ C_STRING_WITH_LEN("db") },
|
|
{ C_STRING_WITH_LEN("char(64)") },
|
|
{ C_STRING_WITH_LEN("utf8") }
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("name") },
|
|
{ C_STRING_WITH_LEN("char(64)") },
|
|
{ C_STRING_WITH_LEN("utf8") }
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("body") },
|
|
{ C_STRING_WITH_LEN("longblob") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("definer") },
|
|
{ C_STRING_WITH_LEN("char(77)") },
|
|
{ C_STRING_WITH_LEN("utf8") }
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("execute_at") },
|
|
{ C_STRING_WITH_LEN("datetime") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("interval_value") },
|
|
{ C_STRING_WITH_LEN("int(11)") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("interval_field") },
|
|
{ C_STRING_WITH_LEN("enum('YEAR','QUARTER','MONTH','DAY',"
|
|
"'HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR',"
|
|
"'DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND',"
|
|
"'DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND',"
|
|
"'SECOND_MICROSECOND')") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("created") },
|
|
{ C_STRING_WITH_LEN("timestamp") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("modified") },
|
|
{ C_STRING_WITH_LEN("timestamp") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("last_executed") },
|
|
{ C_STRING_WITH_LEN("datetime") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("starts") },
|
|
{ C_STRING_WITH_LEN("datetime") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("ends") },
|
|
{ C_STRING_WITH_LEN("datetime") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("status") },
|
|
{ C_STRING_WITH_LEN("enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("on_completion") },
|
|
{ C_STRING_WITH_LEN("enum('DROP','PRESERVE')") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("sql_mode") },
|
|
{ C_STRING_WITH_LEN("set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES',"
|
|
"'IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION',"
|
|
"'NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB',"
|
|
"'NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40',"
|
|
"'ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES',"
|
|
"'STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES',"
|
|
"'ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER',"
|
|
"'HIGH_NOT_PRECEDENCE')") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("comment") },
|
|
{ C_STRING_WITH_LEN("char(64)") },
|
|
{ C_STRING_WITH_LEN("utf8") }
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("originator") },
|
|
{ C_STRING_WITH_LEN("int(10)") },
|
|
{NULL, 0}
|
|
},
|
|
{
|
|
{ C_STRING_WITH_LEN("time_zone") },
|
|
{ C_STRING_WITH_LEN("char(64)") },
|
|
{ C_STRING_WITH_LEN("latin1") }
|
|
}
|
|
};
|
|
|
|
|
|
/**
|
|
Puts some data common to CREATE and ALTER EVENT into a row.
|
|
|
|
Used both when an event is created and when it is altered.
|
|
|
|
@param thd THD
|
|
@param table The row to fill out
|
|
@param et Event's data
|
|
@param is_update CREATE EVENT or ALTER EVENT
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error
|
|
*/
|
|
|
|
static bool
|
|
mysql_event_fill_row(THD *thd, TABLE *table, Event_parse_data *et,
|
|
my_bool is_update)
|
|
{
|
|
CHARSET_INFO *scs= system_charset_info;
|
|
enum enum_events_table_field f_num;
|
|
Field **fields= table->field;
|
|
|
|
DBUG_ENTER("mysql_event_fill_row");
|
|
|
|
DBUG_PRINT("info", ("dbname=[%s]", et->dbname.str));
|
|
DBUG_PRINT("info", ("name =[%s]", et->name.str));
|
|
DBUG_PRINT("info", ("body =[%s]", et->body.str));
|
|
|
|
if (table->s->fields < ET_FIELD_COUNT)
|
|
{
|
|
/*
|
|
Safety: this can only happen if someone started the server
|
|
and then altered mysql.event.
|
|
*/
|
|
my_error(ER_COL_COUNT_DOESNT_MATCH_CORRUPTED, MYF(0), table->alias,
|
|
(int) ET_FIELD_COUNT, table->s->fields);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
if (fields[f_num= ET_FIELD_DEFINER]->
|
|
store(et->definer.str, et->definer.length, scs))
|
|
goto err_truncate;
|
|
|
|
if (fields[f_num= ET_FIELD_DB]->store(et->dbname.str, et->dbname.length, scs))
|
|
goto err_truncate;
|
|
|
|
if (fields[f_num= ET_FIELD_NAME]->store(et->name.str, et->name.length, scs))
|
|
goto err_truncate;
|
|
|
|
/* both ON_COMPLETION and STATUS are NOT NULL thus not calling set_notnull()*/
|
|
fields[ET_FIELD_ON_COMPLETION]->store((longlong)et->on_completion, TRUE);
|
|
|
|
fields[ET_FIELD_STATUS]->store((longlong)et->status, TRUE);
|
|
|
|
fields[ET_FIELD_ORIGINATOR]->store((longlong)et->originator, TRUE);
|
|
|
|
|
|
/*
|
|
Change the SQL_MODE only if body was present in an ALTER EVENT and of course
|
|
always during CREATE EVENT.
|
|
*/
|
|
if (et->body.str)
|
|
{
|
|
fields[ET_FIELD_SQL_MODE]->store((longlong)thd->variables.sql_mode, TRUE);
|
|
if (fields[f_num= ET_FIELD_BODY]->store(et->body.str, et->body.length, scs))
|
|
goto err_truncate;
|
|
}
|
|
|
|
if (et->expression)
|
|
{
|
|
const String *tz_name= thd->variables.time_zone->get_name();
|
|
if (!is_update || !et->starts_null)
|
|
{
|
|
fields[ET_FIELD_TIME_ZONE]->set_notnull();
|
|
fields[ET_FIELD_TIME_ZONE]->store(tz_name->ptr(), tz_name->length(),
|
|
tz_name->charset());
|
|
}
|
|
|
|
fields[ET_FIELD_INTERVAL_EXPR]->set_notnull();
|
|
fields[ET_FIELD_INTERVAL_EXPR]->store((longlong)et->expression, TRUE);
|
|
|
|
fields[ET_FIELD_TRANSIENT_INTERVAL]->set_notnull();
|
|
|
|
fields[ET_FIELD_TRANSIENT_INTERVAL]->
|
|
store(interval_type_to_name[et->interval].str,
|
|
interval_type_to_name[et->interval].length,
|
|
scs);
|
|
|
|
fields[ET_FIELD_EXECUTE_AT]->set_null();
|
|
|
|
if (!et->starts_null)
|
|
{
|
|
MYSQL_TIME time;
|
|
my_tz_UTC->gmt_sec_to_TIME(&time, et->starts);
|
|
|
|
fields[ET_FIELD_STARTS]->set_notnull();
|
|
fields[ET_FIELD_STARTS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
|
|
}
|
|
|
|
if (!et->ends_null)
|
|
{
|
|
MYSQL_TIME time;
|
|
my_tz_UTC->gmt_sec_to_TIME(&time, et->ends);
|
|
|
|
fields[ET_FIELD_ENDS]->set_notnull();
|
|
fields[ET_FIELD_ENDS]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
|
|
}
|
|
}
|
|
else if (et->execute_at)
|
|
{
|
|
const String *tz_name= thd->variables.time_zone->get_name();
|
|
fields[ET_FIELD_TIME_ZONE]->set_notnull();
|
|
fields[ET_FIELD_TIME_ZONE]->store(tz_name->ptr(), tz_name->length(),
|
|
tz_name->charset());
|
|
|
|
fields[ET_FIELD_INTERVAL_EXPR]->set_null();
|
|
fields[ET_FIELD_TRANSIENT_INTERVAL]->set_null();
|
|
fields[ET_FIELD_STARTS]->set_null();
|
|
fields[ET_FIELD_ENDS]->set_null();
|
|
|
|
MYSQL_TIME time;
|
|
my_tz_UTC->gmt_sec_to_TIME(&time, et->execute_at);
|
|
|
|
fields[ET_FIELD_EXECUTE_AT]->set_notnull();
|
|
fields[ET_FIELD_EXECUTE_AT]->
|
|
store_time(&time, MYSQL_TIMESTAMP_DATETIME);
|
|
}
|
|
else
|
|
{
|
|
DBUG_ASSERT(is_update);
|
|
/*
|
|
it is normal to be here when the action is update
|
|
this is an error if the action is create. something is borked
|
|
*/
|
|
}
|
|
|
|
((Field_timestamp *)fields[ET_FIELD_MODIFIED])->set_time();
|
|
|
|
if (et->comment.str)
|
|
{
|
|
if (fields[f_num= ET_FIELD_COMMENT]->
|
|
store(et->comment.str, et->comment.length, scs))
|
|
goto err_truncate;
|
|
}
|
|
|
|
DBUG_RETURN(FALSE);
|
|
|
|
err_truncate:
|
|
my_error(ER_EVENT_DATA_TOO_LONG, MYF(0), fields[f_num]->field_name);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
|
|
/*
|
|
Performs an index scan of event_table (mysql.event) and fills schema_table.
|
|
|
|
SYNOPSIS
|
|
Event_db_repository::index_read_for_db_for_i_s()
|
|
thd Thread
|
|
schema_table The I_S.EVENTS table
|
|
event_table The event table to use for loading (mysql.event)
|
|
db For which schema to do an index scan.
|
|
|
|
RETURN VALUE
|
|
0 OK
|
|
1 Error
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table,
|
|
TABLE *event_table,
|
|
const char *db)
|
|
{
|
|
int ret=0;
|
|
CHARSET_INFO *scs= system_charset_info;
|
|
KEY *key_info;
|
|
uint key_len;
|
|
uchar *key_buf= NULL;
|
|
LINT_INIT(key_buf);
|
|
|
|
DBUG_ENTER("Event_db_repository::index_read_for_db_for_i_s");
|
|
|
|
DBUG_PRINT("info", ("Using prefix scanning on PK"));
|
|
event_table->file->ha_index_init(0, 1);
|
|
key_info= event_table->key_info;
|
|
|
|
if (key_info->key_parts == 0 ||
|
|
key_info->key_part[0].field != event_table->field[ET_FIELD_DB])
|
|
{
|
|
/* Corrupted table: no index or index on a wrong column */
|
|
my_error(ER_CANNOT_LOAD_FROM_TABLE, MYF(0), "event");
|
|
ret= 1;
|
|
goto end;
|
|
}
|
|
|
|
event_table->field[ET_FIELD_DB]->store(db, strlen(db), scs);
|
|
key_len= key_info->key_part[0].store_length;
|
|
|
|
if (!(key_buf= (uchar *)alloc_root(thd->mem_root, key_len)))
|
|
{
|
|
/* Don't send error, it would be done by sql_alloc_error_handler() */
|
|
ret= 1;
|
|
goto end;
|
|
}
|
|
|
|
key_copy(key_buf, event_table->record[0], key_info, key_len);
|
|
if (!(ret= event_table->file->index_read(event_table->record[0], key_buf,
|
|
(key_part_map)1, HA_READ_PREFIX)))
|
|
{
|
|
DBUG_PRINT("info",("Found rows. Let's retrieve them. ret=%d", ret));
|
|
do
|
|
{
|
|
ret= copy_event_to_schema_table(thd, schema_table, event_table);
|
|
if (ret == 0)
|
|
ret= event_table->file->index_next_same(event_table->record[0],
|
|
key_buf, key_len);
|
|
} while (ret == 0);
|
|
}
|
|
DBUG_PRINT("info", ("Scan finished. ret=%d", ret));
|
|
|
|
/* ret is guaranteed to be != 0 */
|
|
if (ret == HA_ERR_END_OF_FILE || ret == HA_ERR_KEY_NOT_FOUND)
|
|
ret= 0;
|
|
else
|
|
event_table->file->print_error(ret, MYF(0));
|
|
|
|
end:
|
|
event_table->file->ha_index_end();
|
|
|
|
DBUG_RETURN(test(ret));
|
|
}
|
|
|
|
|
|
/*
|
|
Performs a table scan of event_table (mysql.event) and fills schema_table.
|
|
|
|
SYNOPSIS
|
|
Events_db_repository::table_scan_all_for_i_s()
|
|
thd Thread
|
|
schema_table The I_S.EVENTS in memory table
|
|
event_table The event table to use for loading.
|
|
|
|
RETURN VALUE
|
|
FALSE OK
|
|
TRUE Error
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::table_scan_all_for_i_s(THD *thd, TABLE *schema_table,
|
|
TABLE *event_table)
|
|
{
|
|
int ret;
|
|
READ_RECORD read_record_info;
|
|
DBUG_ENTER("Event_db_repository::table_scan_all_for_i_s");
|
|
|
|
init_read_record(&read_record_info, thd, event_table, NULL, 1, 0);
|
|
|
|
/*
|
|
rr_sequential, in read_record(), returns 137==HA_ERR_END_OF_FILE,
|
|
but rr_handle_error returns -1 for that reason. Thus, read_record()
|
|
returns -1 eventually.
|
|
*/
|
|
do
|
|
{
|
|
ret= read_record_info.read_record(&read_record_info);
|
|
if (ret == 0)
|
|
ret= copy_event_to_schema_table(thd, schema_table, event_table);
|
|
} while (ret == 0);
|
|
|
|
DBUG_PRINT("info", ("Scan finished. ret=%d", ret));
|
|
end_read_record(&read_record_info);
|
|
|
|
/* ret is guaranteed to be != 0 */
|
|
DBUG_RETURN(ret == -1? FALSE:TRUE);
|
|
}
|
|
|
|
|
|
/**
|
|
Fills I_S.EVENTS with data loaded from mysql.event. Also used by
|
|
SHOW EVENTS
|
|
|
|
The reason we reset and backup open tables here is that this
|
|
function may be called from any query that accesses
|
|
INFORMATION_SCHEMA - including a query that is issued from
|
|
a pre-locked statement, one that already has open and locked
|
|
tables.
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::fill_schema_events(THD *thd, TABLE_LIST *tables,
|
|
const char *db)
|
|
{
|
|
TABLE *schema_table= tables->table;
|
|
TABLE *event_table= NULL;
|
|
int ret= 0;
|
|
|
|
DBUG_ENTER("Event_db_repository::fill_schema_events");
|
|
DBUG_PRINT("info",("db=%s", db? db:"(null)"));
|
|
|
|
if (open_event_table(thd, TL_READ, &event_table))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
/*
|
|
1. SELECT I_S => use table scan. I_S.EVENTS does not guarantee order
|
|
thus we won't order it. OTOH, SHOW EVENTS will be
|
|
ordered.
|
|
2. SHOW EVENTS => PRIMARY KEY with prefix scanning on (db)
|
|
Reasoning: Events are per schema, therefore a scan over an index
|
|
will save use from doing a table scan and comparing
|
|
every single row's `db` with the schema which we show.
|
|
*/
|
|
if (db)
|
|
ret= index_read_for_db_for_i_s(thd, schema_table, event_table, db);
|
|
else
|
|
ret= table_scan_all_for_i_s(thd, schema_table, event_table);
|
|
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_PRINT("info", ("Return code=%d", ret));
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/**
|
|
Open mysql.event table for read.
|
|
|
|
It's assumed that the caller knows what they are doing:
|
|
- whether it was necessary to reset-and-backup the open tables state
|
|
- whether the requested lock does not lead to a deadlock
|
|
- whether this open mode would work under LOCK TABLES, or inside a
|
|
stored function or trigger.
|
|
|
|
@param[in] thd Thread context
|
|
@param[in] lock_type How to lock the table
|
|
@param[out] table We will store the open table here
|
|
|
|
@retval TRUE open and lock failed - an error message is pushed into the
|
|
stack
|
|
@retval FALSE success
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::open_event_table(THD *thd, enum thr_lock_type lock_type,
|
|
TABLE **table)
|
|
{
|
|
TABLE_LIST tables;
|
|
DBUG_ENTER("Event_db_repository::open_event_table");
|
|
|
|
tables.init_one_table("mysql", "event", lock_type);
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
*table= tables.table;
|
|
tables.table->use_all_columns();
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/**
|
|
Creates an event record in mysql.event table.
|
|
|
|
Creates an event. Relies on mysql_event_fill_row which is shared with
|
|
::update_event.
|
|
|
|
@pre All semantic checks must be performed outside. This function
|
|
only creates a record on disk.
|
|
@pre The thread handle has no open tables.
|
|
|
|
@param[in,out] THD
|
|
@param[in] parse_data Parsed event definition
|
|
@param[in] create_if_not TRUE if IF NOT EXISTS clause was provided
|
|
to CREATE EVENT statement
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data,
|
|
my_bool create_if_not)
|
|
{
|
|
int ret= 1;
|
|
TABLE *table= NULL;
|
|
|
|
DBUG_ENTER("Event_db_repository::create_event");
|
|
|
|
DBUG_PRINT("info", ("open mysql.event for update"));
|
|
|
|
if (open_event_table(thd, TL_WRITE, &table))
|
|
goto end;
|
|
|
|
DBUG_PRINT("info", ("name: %.*s", (int) parse_data->name.length,
|
|
parse_data->name.str));
|
|
|
|
DBUG_PRINT("info", ("check existance of an event with the same name"));
|
|
if (!find_named_event(parse_data->dbname, parse_data->name, table))
|
|
{
|
|
if (create_if_not)
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_EVENT_ALREADY_EXISTS, ER(ER_EVENT_ALREADY_EXISTS),
|
|
parse_data->name.str);
|
|
ret= 0;
|
|
}
|
|
else
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), parse_data->name.str);
|
|
goto end;
|
|
}
|
|
|
|
DBUG_PRINT("info", ("non-existent, go forward"));
|
|
|
|
restore_record(table, s->default_values); // Get default values for fields
|
|
|
|
if (system_charset_info->cset->
|
|
numchars(system_charset_info, parse_data->dbname.str,
|
|
parse_data->dbname.str + parse_data->dbname.length) >
|
|
table->field[ET_FIELD_DB]->char_length())
|
|
{
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), parse_data->dbname.str);
|
|
goto end;
|
|
}
|
|
|
|
if (system_charset_info->cset->
|
|
numchars(system_charset_info, parse_data->name.str,
|
|
parse_data->name.str + parse_data->name.length) >
|
|
table->field[ET_FIELD_NAME]->char_length())
|
|
{
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), parse_data->name.str);
|
|
goto end;
|
|
}
|
|
|
|
if (parse_data->body.length > table->field[ET_FIELD_BODY]->field_length)
|
|
{
|
|
my_error(ER_TOO_LONG_BODY, MYF(0), parse_data->name.str);
|
|
goto end;
|
|
}
|
|
|
|
((Field_timestamp *)table->field[ET_FIELD_CREATED])->set_time();
|
|
|
|
/*
|
|
mysql_event_fill_row() calls my_error() in case of error so no need to
|
|
handle it here
|
|
*/
|
|
if (mysql_event_fill_row(thd, table, parse_data, FALSE))
|
|
goto end;
|
|
|
|
table->field[ET_FIELD_STATUS]->store((longlong)parse_data->status, TRUE);
|
|
|
|
if ((ret= table->file->ha_write_row(table->record[0])))
|
|
{
|
|
table->file->print_error(ret, MYF(0));
|
|
goto end;
|
|
}
|
|
ret= 0;
|
|
|
|
end:
|
|
if (table)
|
|
close_thread_tables(thd);
|
|
DBUG_RETURN(test(ret));
|
|
}
|
|
|
|
|
|
/**
|
|
Used to execute ALTER EVENT. Pendant to Events::update_event().
|
|
|
|
@param[in,out] thd thread handle
|
|
@param[in] parse_data parsed event definition
|
|
@paran[in[ new_dbname not NULL if ALTER EVENT RENAME
|
|
points at a new database name
|
|
@param[in] new_name not NULL if ALTER EVENT RENAME
|
|
points at a new event name
|
|
|
|
@pre All semantic checks are performed outside this function,
|
|
it only updates the event definition on disk.
|
|
@pre We don't have any tables open in the given thread.
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error (reported)
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::update_event(THD *thd, Event_parse_data *parse_data,
|
|
LEX_STRING *new_dbname,
|
|
LEX_STRING *new_name)
|
|
{
|
|
CHARSET_INFO *scs= system_charset_info;
|
|
TABLE *table= NULL;
|
|
int ret= 1;
|
|
DBUG_ENTER("Event_db_repository::update_event");
|
|
|
|
/* None or both must be set */
|
|
DBUG_ASSERT(new_dbname && new_name || new_dbname == new_name);
|
|
|
|
if (open_event_table(thd, TL_WRITE, &table))
|
|
goto end;
|
|
|
|
DBUG_PRINT("info", ("dbname: %s", parse_data->dbname.str));
|
|
DBUG_PRINT("info", ("name: %s", parse_data->name.str));
|
|
DBUG_PRINT("info", ("user: %s", parse_data->definer.str));
|
|
|
|
/* first look whether we overwrite */
|
|
if (new_name)
|
|
{
|
|
DBUG_PRINT("info", ("rename to: %s@%s", new_dbname->str, new_name->str));
|
|
if (!find_named_event(*new_dbname, *new_name, table))
|
|
{
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), new_name->str);
|
|
goto end;
|
|
}
|
|
}
|
|
/*
|
|
...and then if there is such an event. Don't exchange the blocks
|
|
because you will get error 120 from table handler because new_name will
|
|
overwrite the key and SE will tell us that it cannot find the already found
|
|
row (copied into record[1] later
|
|
*/
|
|
if (find_named_event(parse_data->dbname, parse_data->name, table))
|
|
{
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), parse_data->name.str);
|
|
goto end;
|
|
}
|
|
|
|
store_record(table,record[1]);
|
|
|
|
/* Don't update create on row update. */
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
/*
|
|
mysql_event_fill_row() calls my_error() in case of error so no need to
|
|
handle it here
|
|
*/
|
|
if (mysql_event_fill_row(thd, table, parse_data, TRUE))
|
|
goto end;
|
|
|
|
if (new_dbname)
|
|
{
|
|
table->field[ET_FIELD_DB]->store(new_dbname->str, new_dbname->length, scs);
|
|
table->field[ET_FIELD_NAME]->store(new_name->str, new_name->length, scs);
|
|
}
|
|
|
|
if ((ret= table->file->ha_update_row(table->record[1], table->record[0])))
|
|
{
|
|
table->file->print_error(ret, MYF(0));
|
|
goto end;
|
|
}
|
|
ret= 0;
|
|
|
|
end:
|
|
if (table)
|
|
close_thread_tables(thd);
|
|
DBUG_RETURN(test(ret));
|
|
}
|
|
|
|
|
|
/**
|
|
Delete event record from mysql.event table.
|
|
|
|
@param[in,out] thd thread handle
|
|
@param[in] db Database name
|
|
@param[in] name Event name
|
|
@param[in] drop_if_exists DROP IF EXISTS clause was specified.
|
|
If set, and the event does not exist,
|
|
the error is downgraded to a warning.
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error (reported)
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::drop_event(THD *thd, LEX_STRING db, LEX_STRING name,
|
|
bool drop_if_exists)
|
|
{
|
|
TABLE *table= NULL;
|
|
int ret= 1;
|
|
|
|
DBUG_ENTER("Event_db_repository::drop_event");
|
|
DBUG_PRINT("enter", ("%s@%s", db.str, name.str));
|
|
|
|
if (open_event_table(thd, TL_WRITE, &table))
|
|
goto end;
|
|
|
|
if (!find_named_event(db, name, table))
|
|
{
|
|
if ((ret= table->file->ha_delete_row(table->record[0])))
|
|
table->file->print_error(ret, MYF(0));
|
|
goto end;
|
|
}
|
|
|
|
/* Event not found */
|
|
if (!drop_if_exists)
|
|
{
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), name.str);
|
|
goto end;
|
|
}
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
|
|
"Event", name.str);
|
|
ret= 0;
|
|
|
|
end:
|
|
if (table)
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_RETURN(test(ret));
|
|
}
|
|
|
|
|
|
/**
|
|
Positions the internal pointer of `table` to the place where (db, name)
|
|
is stored.
|
|
|
|
In case search succeeded, the table cursor points at the found row.
|
|
|
|
@param[in] db database name
|
|
@param[in] name event name
|
|
@param[in,out] table mysql.event table
|
|
|
|
|
|
@retval FALSE an event with such db/name key exists
|
|
@reval TRUE no record found or an error occured.
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::find_named_event(LEX_STRING db, LEX_STRING name,
|
|
TABLE *table)
|
|
{
|
|
uchar key[MAX_KEY_LENGTH];
|
|
DBUG_ENTER("Event_db_repository::find_named_event");
|
|
DBUG_PRINT("enter", ("name: %.*s", (int) name.length, name.str));
|
|
|
|
/*
|
|
Create key to find row. We have to use field->store() to be able to
|
|
handle VARCHAR and CHAR fields.
|
|
Assumption here is that the two first fields in the table are
|
|
'db' and 'name' and the first key is the primary key over the
|
|
same fields.
|
|
*/
|
|
if (db.length > table->field[ET_FIELD_DB]->field_length ||
|
|
name.length > table->field[ET_FIELD_NAME]->field_length)
|
|
DBUG_RETURN(TRUE);
|
|
|
|
table->field[ET_FIELD_DB]->store(db.str, db.length, &my_charset_bin);
|
|
table->field[ET_FIELD_NAME]->store(name.str, name.length, &my_charset_bin);
|
|
|
|
key_copy(key, table->record[0], table->key_info, table->key_info->key_length);
|
|
|
|
if (table->file->index_read_idx(table->record[0], 0, key, HA_WHOLE_KEY,
|
|
HA_READ_KEY_EXACT))
|
|
{
|
|
DBUG_PRINT("info", ("Row not found"));
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("Row found!"));
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
Drops all events in the selected database, from mysql.event.
|
|
|
|
SYNOPSIS
|
|
Event_db_repository::drop_schema_events()
|
|
thd Thread
|
|
schema The database to clean from events
|
|
*/
|
|
|
|
void
|
|
Event_db_repository::drop_schema_events(THD *thd, LEX_STRING schema)
|
|
{
|
|
DBUG_ENTER("Event_db_repository::drop_schema_events");
|
|
drop_events_by_field(thd, ET_FIELD_DB, schema);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/**
|
|
Drops all events which have a specific value of a field.
|
|
|
|
@pre The thread handle has no open tables.
|
|
|
|
@param[in,out] thd Thread
|
|
@param[in,out] table mysql.event TABLE
|
|
@param[in] field Which field of the row to use for matching
|
|
@param[in] field_value The value that should match
|
|
*/
|
|
|
|
void
|
|
Event_db_repository::drop_events_by_field(THD *thd,
|
|
enum enum_events_table_field field,
|
|
LEX_STRING field_value)
|
|
{
|
|
int ret= 0;
|
|
TABLE *table= NULL;
|
|
READ_RECORD read_record_info;
|
|
DBUG_ENTER("Event_db_repository::drop_events_by_field");
|
|
DBUG_PRINT("enter", ("field=%d field_value=%s", field, field_value.str));
|
|
|
|
if (open_event_table(thd, TL_WRITE, &table))
|
|
DBUG_VOID_RETURN;
|
|
|
|
/* only enabled events are in memory, so we go now and delete the rest */
|
|
init_read_record(&read_record_info, thd, table, NULL, 1, 0);
|
|
while (!ret && !(read_record_info.read_record(&read_record_info)) )
|
|
{
|
|
char *et_field= get_field(thd->mem_root, table->field[field]);
|
|
|
|
/* et_field may be NULL if the table is corrupted or out of memory */
|
|
if (et_field)
|
|
{
|
|
LEX_STRING et_field_lex= { et_field, strlen(et_field) };
|
|
DBUG_PRINT("info", ("Current event %s name=%s", et_field,
|
|
get_field(thd->mem_root,
|
|
table->field[ET_FIELD_NAME])));
|
|
|
|
if (!sortcmp_lex_string(et_field_lex, field_value, system_charset_info))
|
|
{
|
|
DBUG_PRINT("info", ("Dropping"));
|
|
if ((ret= table->file->ha_delete_row(table->record[0])))
|
|
table->file->print_error(ret, MYF(0));
|
|
}
|
|
}
|
|
}
|
|
end_read_record(&read_record_info);
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/**
|
|
Looks for a named event in mysql.event and then loads it from
|
|
the table.
|
|
|
|
@pre The given thread does not have open tables.
|
|
|
|
@retval FALSE success
|
|
@retval TRUE error
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::load_named_event(THD *thd, LEX_STRING dbname,
|
|
LEX_STRING name, Event_basic *etn)
|
|
{
|
|
TABLE *table= NULL;
|
|
bool ret;
|
|
|
|
DBUG_ENTER("Event_db_repository::load_named_event");
|
|
DBUG_PRINT("enter",("thd: 0x%lx name: %*s", (long) thd,
|
|
(int) name.length, name.str));
|
|
|
|
if (!(ret= open_event_table(thd, TL_READ, &table)))
|
|
{
|
|
if ((ret= find_named_event(dbname, name, table)))
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), name.str);
|
|
else if ((ret= etn->load_from_row(thd, table)))
|
|
my_error(ER_CANNOT_LOAD_FROM_TABLE, MYF(0), "event");
|
|
|
|
close_thread_tables(thd);
|
|
}
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/**
|
|
Update the event record in mysql.event table with a changed status
|
|
and/or last execution time.
|
|
|
|
@pre The thread handle does not have open tables.
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::
|
|
update_timing_fields_for_event(THD *thd,
|
|
LEX_STRING event_db_name,
|
|
LEX_STRING event_name,
|
|
bool update_last_executed,
|
|
my_time_t last_executed,
|
|
bool update_status,
|
|
ulonglong status)
|
|
{
|
|
TABLE *table= NULL;
|
|
Field **fields;
|
|
int ret= 1;
|
|
|
|
DBUG_ENTER("Event_db_repository::update_timing_fields_for_event");
|
|
|
|
/*
|
|
Turn off row binlogging of event timing updates. These are not used
|
|
for RBR of events replicated to the slave.
|
|
*/
|
|
if (thd->current_stmt_binlog_row_based)
|
|
thd->clear_current_stmt_binlog_row_based();
|
|
|
|
if (open_event_table(thd, TL_WRITE, &table))
|
|
goto end;
|
|
|
|
fields= table->field;
|
|
|
|
if (find_named_event(event_db_name, event_name, table))
|
|
goto end;
|
|
|
|
store_record(table, record[1]);
|
|
/* Don't update create on row update. */
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
if (update_last_executed)
|
|
{
|
|
MYSQL_TIME time;
|
|
my_tz_UTC->gmt_sec_to_TIME(&time, last_executed);
|
|
|
|
fields[ET_FIELD_LAST_EXECUTED]->set_notnull();
|
|
fields[ET_FIELD_LAST_EXECUTED]->store_time(&time,
|
|
MYSQL_TIMESTAMP_DATETIME);
|
|
}
|
|
if (update_status)
|
|
{
|
|
fields[ET_FIELD_STATUS]->set_notnull();
|
|
fields[ET_FIELD_STATUS]->store(status, TRUE);
|
|
}
|
|
|
|
if ((ret= table->file->ha_update_row(table->record[1], table->record[0])))
|
|
{
|
|
table->file->print_error(ret, MYF(0));
|
|
goto end;
|
|
}
|
|
|
|
ret= 0;
|
|
|
|
end:
|
|
if (table)
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_RETURN(test(ret));
|
|
}
|
|
|
|
|
|
/**
|
|
Open mysql.db, mysql.user and mysql.event and check whether:
|
|
- mysql.db exists and is up to date (or from a newer version of MySQL),
|
|
- mysql.user has column Event_priv at an expected position,
|
|
- mysql.event exists and is up to date (or from a newer version of
|
|
MySQL)
|
|
|
|
This function is called only when the server is started.
|
|
@pre The passed in thread handle has no open tables.
|
|
|
|
@retval FALSE OK
|
|
@retval TRUE Error, an error message is output to the error log.
|
|
*/
|
|
|
|
bool
|
|
Event_db_repository::check_system_tables(THD *thd)
|
|
{
|
|
TABLE_LIST tables;
|
|
int ret= FALSE;
|
|
const unsigned int event_priv_column_position= 29;
|
|
|
|
DBUG_ENTER("Event_db_repository::check_system_tables");
|
|
DBUG_PRINT("enter", ("thd: 0x%lx", (long) thd));
|
|
|
|
|
|
/* Check mysql.db */
|
|
tables.init_one_table("mysql", "db", TL_READ);
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
|
{
|
|
ret= 1;
|
|
sql_print_error("Cannot open mysql.db");
|
|
}
|
|
else
|
|
{
|
|
if (table_check_intact(tables.table, MYSQL_DB_FIELD_COUNT,
|
|
mysql_db_table_fields))
|
|
ret= 1;
|
|
/* in case of an error, the message is printed inside table_check_intact */
|
|
|
|
close_thread_tables(thd);
|
|
}
|
|
/* Check mysql.user */
|
|
tables.init_one_table("mysql", "user", TL_READ);
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
|
{
|
|
ret= 1;
|
|
sql_print_error("Cannot open mysql.user");
|
|
}
|
|
else
|
|
{
|
|
if (tables.table->s->fields < event_priv_column_position ||
|
|
strncmp(tables.table->field[event_priv_column_position]->field_name,
|
|
STRING_WITH_LEN("Event_priv")))
|
|
{
|
|
sql_print_error("mysql.user has no `Event_priv` column at position %d",
|
|
event_priv_column_position);
|
|
ret= 1;
|
|
}
|
|
close_thread_tables(thd);
|
|
}
|
|
/* Check mysql.event */
|
|
tables.init_one_table("mysql", "event", TL_READ);
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
|
{
|
|
ret= 1;
|
|
sql_print_error("Cannot open mysql.event");
|
|
}
|
|
else
|
|
{
|
|
if (table_check_intact(tables.table, ET_FIELD_COUNT, event_table_fields))
|
|
ret= 1;
|
|
/* in case of an error, the message is printed inside table_check_intact */
|
|
close_thread_tables(thd);
|
|
}
|
|
|
|
DBUG_RETURN(test(ret));
|
|
}
|