mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
58 commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
unknown
|
63791f4cc4 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime client/mysqlbinlog.cc: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item_func.h: Auto merged sql/item_xmlfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/heap/hp_hash.c: Auto merged tests/mysql_client_test.c: Auto merged sql/item_func.cc: Manual merge. sql/sp.cc: Manual merge. sql/sql_cache.cc: Manual merge. sql/sql_table.cc: Manual merge. strings/my_vsnprintf.c: Manual merge. |
||
unknown
|
6e84990797 |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/comp_err.c: Auto merged include/decimal.h: Auto merged include/my_getopt.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/typelib.c: Auto merged sql/derror.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/rpl_utility.h: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged sql/tztime.cc: Auto merged sql/unireg.cc: Auto merged storage/example/ha_example.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged strings/decimal.c: Auto merged strings/strtod.c: Auto merged include/hash.h: Manual merge with 5.1 main tree. mysys/my_getopt.c: Manual merge with 5.1 main tree. sql/field.h: Manual merge with 5.1 main tree. sql/ha_ndbcluster.cc: Manual merge with 5.1 main tree. sql/item_cmpfunc.h: Manual merge with 5.1 main tree. sql/item_create.cc: Manual merge with 5.1 main tree. sql/item_func.h: Manual merge with 5.1 main tree. sql/key.cc: Manual merge with 5.1 main tree. sql/lock.cc: Manual merge with 5.1 main tree. sql/mysqld.cc: Manual merge with 5.1 main tree. sql/set_var.cc: Manual merge with 5.1 main tree. sql/set_var.h: Manual merge with 5.1 main tree. sql/sql_base.cc: Manual merge with 5.1 main tree. sql/sql_handler.cc: Manual merge with 5.1 main tree. sql/sql_insert.cc: Manual merge with 5.1 main tree. sql/sql_plugin.cc: Manual merge with 5.1 main tree. sql/sql_table.cc: Manual merge with 5.1 main tree. sql/sql_yacc.yy: Manual merge with 5.1 main tree. sql/table.cc: Manual merge with 5.1 main tree. storage/innobase/handler/ha_innodb.cc: Manual merge with 5.1 main tree. storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Manual merge with 5.1 main tree. storage/ndb/tools/restore/restore_main.cpp: Manual merge with 5.1 main tree. |
||
unknown
|
e5fe02615e |
build break cleanup
include/config-win.h: cleanup, windows build break include/my_pthread.h: cleanup, windows build break sql/event_queue.cc: warnings cleanup, unititialized waiting_on_cond tests/mysql_client_test.c: warnings cleanup |
||
unknown
|
3da4eef700 |
Fix for bug#28075 COM_DEBUG crashes mysqld
Uninitialized in the constructor member variables were pointing to nirvana and causing a crash when debug information of the Event Scheduler was dumped in result to COM_DEBUG packet sent to the server. sql/event_queue.cc: Initialize member variables or they will point to nirvana and could possible cause a crash during dumping of debug information. sql/event_queue.h: remove unneeded line sql/event_scheduler.cc: Initialize member variables or they will point to nirvana and could possible cause a crash during dumping of debug information. sql/event_scheduler.h: remove unneeded state |
||
unknown
|
f252f9248a |
WL#3817: Simplify string / memory area types and make things more consistent (first part)
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 |
||
unknown
|
2f664e46c6 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-wl2936-two client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ndb_dd_basic.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ndb_dd_basic.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/hash.c: Auto merged sql/event_queue.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged include/typelib.h: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge mysys/typelib.c: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge |
||
unknown
|
dcef028f71 |
wl#2936 post-merge fixes
client/mysqltest.c: warnings extra/comp_err.c: warnings sql/event_queue.cc: warnings sql/handler.h: warnings sql/opt_range.cc: warnings sql/opt_range.h: warnings sql/rpl_mi.cc: warnings sql/sql_class.cc: wl#2936 post-merge fixes, warnings |
||
unknown
|
7cb8a33b1a |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936 client/mysql.cc: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ndb_dd_basic.test: Auto merged mysql-test/t/partition_innodb.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/array.c: Auto merged mysys/typelib.c: Auto merged sql/event_queue.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/example/ha_example.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/include/trx0trx.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged include/typelib.h: merged mysql-test/mysql-test-run.pl: merged mysql-test/r/flush2.result: merged mysql-test/r/ndb_dd_basic.result: merged mysql-test/r/partition_innodb.result: merged mysql-test/r/ps_1general.result: merged mysql-test/t/ps_1general.test: merged sql/ha_ndbcluster.cc: merged sql/item_create.cc: merged sql/mysqld.cc: merged sql/rpl_utility.h: merged sql/set_var.cc: merged sql/sql_class.cc: merged sql/sql_yacc.yy: merged storage/innobase/handler/ha_innodb.cc: merged storage/innobase/handler/ha_innodb.h: merged |
||
unknown
|
bf2aaad97d |
wl#2936 - fixing problems
include/mysql/plugin.h: warning. no int/realsize mysys/my_getopt.c: combination of prefixes (e.g. --loose-skip-) didn't work sql/event_queue.cc: warning sql/handler.cc: assert sql/handler.h: comment sql/item_create.cc: warnings sql/log.cc: warnings sql/mysqld.cc: wl#2936 - fixing problems (memory leak in load_defaults, garbage in opt_[slow_]logname sql/partition_element.h: warnings sql/rpl_utility.h: warnings sql/set_var.cc: comment sql/set_var.h: warnings sql/sql_class.cc: warnings sql/sql_parse.cc: warnings sql/sql_plugin.cc: wl#2936 - fixing problems: portability, coding style, reporting of spurious errors, crashes, incorrect help output storage/example/ha_example.cc: comment storage/innobase/handler/ha_innodb.cc: wl#2936 - fixing problems (crash) |
||
unknown
|
a2989a35f5 |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged include/my_time.h: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/sp.test: Auto merged mysys/my_malloc.c: Auto merged mysys/my_static.c: Auto merged mysys/safemalloc.c: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/time.cc: Auto merged storage/archive/ha_archive.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged tests/mysql_client_test.c: Auto merged client/client_priv.h: Manual merge with main 5.1 source. sql/event_data_objects.cc: Manual merge with main 5.1 source. sql/event_db_repository.cc: Manual merge with main 5.1 source. sql/mysqld.cc: Manual merge with main 5.1 source. sql/sql_load.cc: Manual merge with main 5.1 source. sql/sql_parse.cc: Manual merge with main 5.1 source. |
||
unknown
|
a36054f420 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into vajra.(none):/opt/local/work/mysql-5.1-c1 mysql-test/r/events_bugs.result: Auto merged mysql-test/r/events_scheduling.result: Auto merged mysql-test/t/events.test: Auto merged mysql-test/t/events_scheduling.test: Auto merged sql/event_data_objects.h: Auto merged sql/event_db_repository.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/r/events.result: e Use local. mysql-test/r/events_restart_phase1.result: Use local mysql-test/r/events_time_zone.result: SCCS merged mysql-test/t/events_restart_phase1.test: Use local sql/event_data_objects.cc: Use local sql/event_db_repository.cc: Manual merge. sql/event_queue.cc: Manual merge. sql/events.cc: Manual merge. |
||
unknown
|
fa1d637e89 |
A set of changes aiming to make the Event Scheduler more user-friendly
when there are no up-to-date system tables to support it: - initialize the scheduler before reporting "Ready for connections". This ensures that warnings, if any, are printed before "Ready for connections", and this message is not mangled. - do not abort the scheduler if there are no system tables - check the tables once at start up, remember the status and disable the scheduler if the tables are not up to date. If one attempts to use the scheduler with bad tables, issue an error message. - clean up the behaviour of the module under LOCK TABLES and pre-locking mode - make sure implicit commit of Events DDL works as expected. - add more tests Collateral clean ups in the events code. This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work when mysql.event is damaged mysql-test/r/events.result: Update results. mysql-test/r/events_bugs.result: Update results. mysql-test/r/events_restart_phase1.result: Update results. mysql-test/r/events_restart_phase2.result: Update results. mysql-test/r/events_restart_phase3.result: Update results. mysql-test/r/events_scheduling.result: Update results. mysql-test/r/events_time_zone.result: Update results. mysql-test/t/events.test: Add new tests for tampering with mysql.event and some more tests for sub-statements, LOCK TABLES mode and pre-locking. mysql-test/t/events_bugs.test: Move the non-concurrent part of test for Bug 16420 to this file. mysql-test/t/events_restart_phase1.test: Rewrite events_restart_* tests to take into account that now we check mysql.event table only once, at server startup. mysql-test/t/events_restart_phase2.test: Rewrite events_restart_* tests to take into account that now we check mysql.event table only once, at server startup. mysql-test/t/events_restart_phase3.test: Rewrite events_restart_* tests to take into account that now we check mysql.event table only once, at server startup. mysql-test/t/events_scheduling.test: Add more coverage for event_scheduler global variable. mysql-test/t/events_time_zone.test: Move the non-concurrent part of the tests for Bug 16420 to events_bugs.test sql/event_data_objects.cc: Move update_timing_fields functionality to Event_db_repository. Make loading of events from a table record more robust to tampering with the table - now we do not check mysql.event on every table open. sql/event_data_objects.h: Cleanup. sql/event_db_repository.cc: Now Event_db_repository is responsible for table I/O only. All the logic of events DDL is handled outside, in Events class please refer to the added test coverage to see how this change affected the behavior of Event Scheduler. Dependency on sp_head.h and sp.h removed. Make this module robust to tweaks with mysql.event table. Move check_system_tables from events.cc to this file sql/event_db_repository.h: Cleanup declarations (remove unused ones, change return type to bool from int). sql/event_queue.cc: Update to adapt to the new start up scheme of the Event Scheduler. sql/event_queue.h: Cleanup declarations. sql/event_scheduler.cc: Make all the error messages uniform: [SEVERITY] Event Scheduler: [user][schema.event] message Using append_identifier for error logging was an overkill - we may need it only if the system character set may have NUL (null character) as part of a valid identifier, this is currently never the case, whereas additional quoting did not look nice in the log. sql/event_scheduler.h: Cleanup the headers. sql/events.cc: Use a different start up procedure of Event Scheduler: - at start up, try to check the system tables first. If they are not up-to-date, disable the scheduler. - try to load all the active events. In case of a load error, abort start up. - do not parse an event on start up. Parsing only gives some information about event validity, but far not all. Consolidate the business logic of Events DDL in this module. Now opt_event_scheduler may change after start up and thus is protected by LOCK_event_metadata mutex. sql/events.h: Use all-static-data-members approach to implement Singleton pattern. sql/mysqld.cc: New invocation scheme of Events. Move some logic to events.cc. Initialize the scheduler before reporting "Ready for connections". sql/set_var.cc: Clean up sys_var_thd_sql_mode::symbolic_mode_representation to work with a LEX_STRING. Move more logic related to @@events_scheduler global variable to Events module. sql/set_var.h: Update declarations. sql/share/errmsg.txt: If someone tampered with mysql.event table after the server has started we no longer give him/her a complete report what was actually broken. Do not send the user to look at the error log in such case, as there is nothing there (check_table_intact is not executed). sql/sp_head.cc: Update to a new declaration of sys_var_thd_sql_mode::symbolic_mode_representation sql/sql_db.cc: New invocation scheme of Events module. sql/sql_parse.cc: Move more logic to Events module. Make sure that we are consistent in the way access rights are checked for Events DDL: always after committing the current transaction and checking the system tables. sql/sql_show.cc: Update to the new declarations of sys_var_thd_sql_mode::symbolic_mode_representation sql/sql_test.cc: New invocation scheme of events. sql/table.cc: mysql.event is a system table. Update check_table_intact to be concurrent, more verbose, and less smart. sql/table.h: Add a helper method. mysql-test/r/events_trans.result: New BitKeeper file ``mysql-test/r/events_trans.result'' mysql-test/t/events_trans.test: New BitKeeper file ``mysql-test/t/events_trans.test'': test cases for Event Scheduler that require a transactional storage engine. |
||
unknown
|
67da87d82e |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel mysql-test/t/sp.test: Auto merged mysys/typelib.c: Auto merged sql/event_data_objects.cc: Auto merged sql/event_db_repository.cc: Auto merged sql/event_queue.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged sql/strfunc.cc: Auto merged sql/table.cc: Auto merged include/typelib.h: Merged from 5.1 main tree. mysql-test/r/sp.result: Merged from 5.1 main tree. |
||
unknown
|
e552b08fcd |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_db_repository.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged strings/ctype-utf8.c: Auto merged |
||
unknown
|
7b1bfbb77a |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime mysql-test/r/events_bugs.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/events.test: Auto merged sql/event_data_objects.cc: Auto merged sql/event_data_objects.h: Auto merged sql/event_db_repository.h: Auto merged sql/event_queue.cc: Auto merged sql/events.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_servers.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/r/events.result: Manual merge. sql/event_db_repository.cc: Manual merge. sql/sql_parse.cc: Manual merge. |
||
unknown
|
4a0f5887b7 |
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl mysql-test/t/events.test: Auto merged sql/event_queue.cc: Auto merged sql/events.cc: Auto merged sql/lex.h: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. BitKeeper/deleted/.del-mysql_create_system_tables.sh: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events_grant.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/events_restart_phase1.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/r/system_mysql_db.result: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. mysql-test/t/events_restart_phase1.test: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. scripts/mysql_system_tables.sql: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. scripts/mysql_system_tables_fix.sql: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_data_objects.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_data_objects.h: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_db_repository.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/event_db_repository.h: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. sql/sql_udf.cc: WL#3629 : Replication of Invocation and Invoked Features Manual merge prior to pushing patches. |
||
unknown
|
75686dc73f |
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects errors that occurred in a local manual merge as a result of updating the local repository and includes changes necessary to correct problems found during the recalculation of next execution of events in RBR. mysql-test/include/rpl_events.inc: WL#3629 - Replication of Invocation and Invoked Features This patch changes the rpl_events test to be more comprehensive in catching errors as a result of RBR. Changes include clarification of SELECTs with WHERE clauses and synchronization with master and slave. mysql-test/r/rpl_events.result: WL#3629 - Replication of Invocation and Invoked Features This patch changes the results for the rpl_events test to accomodate the changes in the test. scripts/mysql_system_tables.sql: WL#3629 - Replication of Invocation and Invoked Features This patch adds the originator column and a new enum value to the mysql.event table. This change was necessary to accomodate changes as a result of other patches. sql/event_data_objects.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. The status check was changed to include either ENABLED or DISABLED in the gate to change the status to SLAVESIDE_DISABLED for events replicated to the slave. This patch also includes an update to correct a problem encountered during testing after the local merge. The update_timing_fields method is replicating the timing changes in RBR to the slave thereby over writing the change to the status column in the process. This code includes a check to turn off the next binlog event if in RBR. sql/event_queue.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. The code was corrected to include both types of disabled status enums (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods. sql/sql_show.cc: WL#3629 - Replication of Invocation and Invoked Features This patch corrects an error in merging that occurred during manual merge. It corrects the order in which the originator column appears in the show structures. The error caused incorrect output on SHOW EVENTS commands. |
||
unknown
|
ff1d6b2252 |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629 BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: Auto merged BitKeeper/deleted/.del-mysql_create_system_tables.sh: Auto merged scripts/mysql_system_tables_fix.sql: Auto merged sql/event_data_objects.cc: Auto merged sql/slave.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/event_data_objects.h: Manual merge. sql/event_queue.cc: Manual merge. sql/events.cc: Manual merge. |
||
unknown
|
212ecf348c |
Removed not used define YY_MAGIC_BELOW
Made year 2000 handling more uniform Removed year 2000 handling out from calc_days() The above removes some bugs in date/datetimes with year between 0 and 200 Now we get a note when we insert a datetime value into a date column For default values to CREATE, don't give errors for warning level NOTE Fixed some compiler failures Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support) Removed duplicate typedef TIME and replaced it with MYSQL_TIME Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE" Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value" Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)" include/my_time.h: Removed not used define YY_MAGIC_BELOW Added prototype for year_2000_handling() mysql-test/r/date_formats.result: Updated results (fixed bug in date_format() with year < 99) mysql-test/r/func_sapdb.result: Added more testing of make_date() mysql-test/r/func_time.result: Fixed bug in date_sub() with years < 200 mysql-test/r/ps_2myisam.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_3innodb.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_4heap.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_5merge.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/ps_7ndb.result: Now we get a note when we insert a datetime value into a date column mysql-test/r/type_date.result: Added test for date conversions mysql-test/r/type_datetime.result: Added testcase for datetime to date conversion. mysql-test/t/date_formats.test: Added testing of dates < 200 mysql-test/t/func_sapdb.test: More testing of makedate() mysql-test/t/type_date.test: Added test for date conversions mysql-test/t/type_datetime.test: Added testcase for datetime to date conversion. sql/CMakeLists.txt: Added library ws2_32 (needed if we want to compile with IOCP support) sql/event_data_objects.cc: TIME -> MYSQL_TIME sql/event_db_repository.cc: TIME -> MYSQL_TIME sql/event_queue.cc: TIME -> MYSQL_TIME sql/field.cc: Give note if we insert a datetime value in a date field Don't give notes if we are doing internal test conversions (like from convert_constant_item()) More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error)) Revert some changes in Field_newdate::store() to get more optimal code Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set. New parameters to make_truncated_value_warning() sql/field.h: TIME -> MYSQL_TIME sql/item.cc: New parameters to make_truncated_value_warning() Fixed get_date() to call number_to_datetime() if argument is not a string. Fixes Bug#23093 Implicit conversion of 9912101 to date does not match cast(9912101 as date) sql/item.h: TIME -> MYSQL_TIME sql/item_cmpfunc.cc: Don't print notes in convert_constant_item() sql/item_func.h: TIME -> MYSQL_TIME sql/item_timefunc.cc: New parameters to make_truncated_value_warning() Moved year 2000 handling out from calc_days() Don't return NULL for years < 200 in date_add/date_sub sql/item_timefunc.h: TIME -> MYSQL_TIME sql/my_decimal.cc: TIME -> MYSQL_TIME sql/my_decimal.h: TIME -> MYSQL_TIME sql/mysql_priv.h: Added error level to make_truncated_value_warning() sql/protocol.cc: TIME -> MYSQL_TIME sql/protocol.h: TIME -> MYSQL_TIME sql/sp.cc: TIME -> MYSQL_TIME sql/sql_base.cc: Make testing of result value of save_in_field() uniform sql-common/my_time.c: Added year_2000_handling() Removed year 2000 handling from calc_daynr() sql/sql_class.h: TIME -> MYSQL_TIME sql/sql_show.cc: TIME -> MYSQL_TIME sql/structs.h: TIME -> MYSQL_TIME sql/time.cc: Added error level to make_truncated_value_warning() sql/tztime.cc: TIME -> MYSQL_TIME sql/tztime.h: TIME -> MYSQL_TIME sql/unireg.cc: For default values to CREATE, don't give errors for warning level NOTE (Fixed failed CREATE when we give a datetime value to a date field) strings/ctype-utf8.c: Fixed compiler failures win/README: More comments |
||
unknown
|
b2d3dddef5 |
Change module prefix in error messages: SCHEDULER -> Event Scheduler,
to not collide with the recently introduced thread scheduler module. mysql-test/r/events.result: Update test results with new error texts (SCHEDULER -> Event Scheduler, grammar). sql/event_data_objects.cc: SCHEDULER -> Event Scheduler. sql/event_queue.cc: SCHEDULER -> Event Scheduler. sql/event_scheduler.cc: SCHEDULER -> Event Scheduler. sql/events.cc: SCHEDULER -> Event Scheduler. sql/share/errmsg.txt: SCHEDULER -> Event Scheduler. Fix English grammar. |
||
unknown
|
57dc12563f |
Trivial cleanups and whitespace change in Event Scheduler code.
A larger patch is to come, this is to exclude rudimentary changes from it. sql/event_data_objects.cc: Whitespace change. sql/event_data_objects.h: Remove debug allocators - we have safemalloc. sql/event_db_repository.cc: Whitespace change. sql/event_db_repository.h: Whitespace change. sql/event_queue.cc: Remove an unused structure. Whitespace change. sql/event_queue.h: Whitespace. sql/event_scheduler.cc: Whitespace change. sql/event_scheduler.h: Add comments. Whitespace change. sql/events.cc: Whitespace change. sql/events.h: Trivial cleanups. |
||
unknown
|
e9bb08ac0c |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/events_scheduling.result: Auto merged BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: Auto merged BitKeeper/deleted/.del-mysql_create_system_tables.sh: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/events_scheduling.test: Auto merged mysql-test/t/grant_cache.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/view.test: Auto merged scripts/mysql_system_tables_fix.sql: Auto merged sql/event_db_repository.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_help.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/tztime.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged mysql-test/r/skip_grants.result: Manualmerge. mysql-test/r/sp.result: Manualmerge. mysql-test/t/skip_grants.test: Manualmerge. mysql-test/t/sp.test: Manualmerge. sql/event_data_objects.cc: Manualmerge. |
||
unknown
|
998260ae5a |
Fix compilation on Windows broken with the push of bug#16420.
Fix three compilation warnings. sql/event_data_objects.cc: Fix compilation warnings. sql/event_queue.cc: Fix compilation warning: reimplement event_queue_element_compare_q() properly. Use set_timespec() to initialize struct timespec. |
||
unknown
|
086fba7627 |
BUG#16420: Events: timestamps become UTC
BUG#26429: SHOW CREATE EVENT is incorrect for an event that STARTS NOW() BUG#26431: Impossible to re-create an event from backup if its STARTS clause is in the past WL#3698: Events: execution in local time zone The problem was that local times specified by the user in AT, STARTS and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC, and the original time zone was forgotten. This way, event scheduler couldn't honor Daylight Saving Time shifts, and times shown to the user were also in UTC. Additionally, CREATE EVENT didn't allow times in the past, thus preventing straightforward event restoration from old backups. This patch reworks event scheduler time computations, performing them in the time zone associated with the event. Also it allows times to be in the past. The patch adds time_zone column to mysql.event table. NOTE: The patch is almost final, but the bug#9953 should be pushed first. client/mysqldump.c: Before every CREATE EVENT, output its time zone. mysql-test/include/wait_condition.inc: Add optional $wait_timeout parameter. mysql-test/lib/init_db.sql: Add time_zone column. mysql-test/r/events.result: Update result. mysql-test/r/events_bugs.result: Update result. mysql-test/r/events_grant.result: Update result. mysql-test/r/events_restart_phase1.result: Update result. mysql-test/r/events_scheduling.result: Update result. mysql-test/r/mysqldump.result: Update result. mysql-test/r/ps.result: Update result. mysql-test/r/system_mysql_db.result: Update result. mysql-test/t/events.test: Remove STARTS from the result, as it depends on current time. mysql-test/t/events_bugs.test: Time in the past is no longer an error. mysql-test/t/events_restart_phase1.test: Fill new column 'time_zone' in mysql.event. mysql-test/t/events_scheduling.test: Cleanup: disable event scheduler. scripts/mysql_create_system_tables.sh: Add new column 'time_zone' to mysql.event. scripts/mysql_fix_privilege_tables.sql: Add new column 'time_zone' to mysql.event. sql/event_data_objects.cc: The essence of the change is the following: - for internal times use my_time_t instead of TIME. Assignment and comparison is done now on plain numbers. - in init_execute_at(), init_starts(), init_ends() convert given time to number of seconds since Epoch (aka Unix time, in UTC). - handle time_zone field loading and storing. - in get_next_time(), Unix time is converted back to event time zone, interval is added, and the result is converted to UTC again. - fix Event_timed::get_create_event() to report STARTS and ENDS. - before executing the event body we set thread time zone to the event time zone. sql/event_data_objects.h: Add time_zone member to Event_basic class. Store internal times in my_time_t (number of seconds since Epoch), rather than in broken down TIME structure. sql/event_db_repository.cc: Add time_zone column handling. Give a warning and do not create an event if its execution time is in the past, and ON COMPLETION NOT PRESERVE is set, because such an event should be dropped by that time. Also, do not allow ALTER EVENT to set execution time in the past when ON COMPLETION NOT PRESERVE is set. sql/event_db_repository.h: Add enum member for new time zone column. sql/event_queue.cc: Replace handling of broken down times with simple handling of my_time_t. sql/event_queue.h: Store internal times in my_time_t (number of seconds since Epoch), rather than in broken down TIME structure. sql/event_scheduler.cc: Add TODO comment. sql/events.cc: Send time_zone column for SHOW CREATE EVENT. sql/share/errmsg.txt: Update error message, and add two more errors. sql/sql_show.cc: Add TIME_ZONE column to the output of SHOW EVENTS. mysql-test/r/events_time_zone.result: BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/r/events_time_zone.result mysql-test/t/events_time_zone.test: BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/t/events_time_zone.test |
||
unknown
|
62b41b5fbc |
WL#3629 - Replication of Invocation and Invoked Features
This changeset adds replication of events and user-defined functions. There are several bug reports involved in this change: BUG#16421, BUG#17857, BUG#20384: This patch modifies the mysql.events table to permit the addition of another enum value for the status column. The column now has values of ('DISABLED','SLAVESIDE_DISABLED','ENABLED'). A status of SLAVESIDE_DISABLED is set on the slave during replication of events. This enables users to determine which events werereplicated from the master and to later enable them if they promote the slave to a master. The CREATE, ALTER, and DROP statements are binlogged. A new test was added for replication of events (rpl_events). BUG#17671: This patch modifies the code to permit logging of user-defined functions. Note: this is the CREATE FUNCTION ... SONAME variety. A more friendly error message to be displayed should a replicated user-defined function not be found in the loadable library or if the library is missing from the slave.The CREATE andDROP statements are binlogged. A new test was added for replication of user-defined functions (rpl_udf). The patch also adds a new column to the mysql.event table named 'originator' that is used to store the server_id of the server that the event originated on. This enables users to promote a slave to a master and later return the promoted slave to a slave and disable the replicated events. mysql-test/lib/init_db.sql: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the SLAVESIDE_DISABLED to the list of enumerated values for the mysql.event table. This patch adds the column 'originator' to the mysql.event table. mysql-test/r/events.result: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the 'originator' column to the events test results. This was necessary to ensure the manual insert into mysql.event table succeeds because the originator column is set to NOT NULL. mysql-test/r/events_grant.result: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the 'originator' column to the events_grant test results. This was necessary to ensure the manual insert into mysql.event table succeeds because the originator column is set to NOT NULL. mysql-test/r/events_restart_phase1.result: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the 'originator' column to the events_restart_phase1 test results. This was necessary to ensure the manual insert into mysql.event table succeeds because the originator column is set to NOT NULL. mysql-test/r/system_mysql_db.result: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the SLAVESIDE_DISABLED to the list of enumerated values for the mysql.event table. This patch adds the column 'originator' to the mysql.event table. These changes to the result file were necessary to ensure correct test results. mysql-test/t/events.test: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the 'originator' column to the events test. This was necessary to ensure the manual insert into mysql.event table succeeds because the originator column is set to NOT NULL. mysql-test/t/events_restart_phase1.test: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the 'originator' column to the events_restart_phase1 test. This was necessary to ensure the manual insert into mysql.event table succeeds because the originator column is set to NOT NULL. scripts/mysql_create_system_tables.sh: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the SLAVESIDE_DISABLED to the list of enumerated values for the mysql.event table. This patch adds the column 'originator' to the mysql.event table. scripts/mysql_fix_privilege_tables.sql: WL#3629 - Replication of Invocation and Invoked Feature This patch adds the SLAVESIDE_DISABLED to the list of enumerated values for the mysql.event table. This patch adds the column 'originator' to the mysql.event table. sql/event_data_objects.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit processing of the new enum SLAVESIDE_DISABLED which is set on the slave during replication of events. This patch uses the new Event_basic:: enumerated values. sql/event_data_objects.h: WL#3629 - Replication of Invocation and Invoked Features This patch moves the duplicated enumeration values for ENABLED, SLAVESIDE_DISABLED, and DISABLED to the Event_basic class removing them from the other Event_* classes. sql/event_db_repository.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit processing of the new enum SLAVESIDE_DISABLED which is set on the slave during replication of events. The patch also adds a new column to the mysql.event table named 'originator' that is used to store the server_id of the server that the event originated on. This enables users to promote a slave to a master and later return the promoted slave to a slave and disable the replicated events. sql/event_db_repository.h: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to add a new field named 'originator' to the enum_event_table_field and associated structure. sql/event_queue.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit processing of the new enum SLAVESIDE_DISABLED which is set on the slave during replication of events. sql/events.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit processing of the new enum SLAVESIDE_DISABLED which is set on the slave during replication of events. sql/lex.h: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to add the new SLAVESIDE_DISABLE symbol to the lexical parser. sql/slave.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit the capture of the error on the slave when a UDF from a loadable library is not loaded on the server when replicated from the master. sql/sql_parse.cc: WL#3629 - Replication of Invocation and Invoked Features This patch removes the comment because drop functions commands are replicated. sql/sql_show.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to permit processing of the new enum SLAVESIDE_DISABLED which is set on the slave during replication of events. The code also adds changes the display width of the status column for the schema table for the show events command and also adds the new column 'originator' to the events_field_info structure. sql/sql_udf.cc: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to add the binlogging of the create and drop function events. sql/sql_yacc.yy: WL#3629 - Replication of Invocation and Invoked Features This patch modifies the code to change the enumeration of the status column for the events in the parser. The code uses the Event_basic:: enumerations allowing the enums to be defined in one place. mysql-test/t/rpl_events.test: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new test for testing replication of events. The test uses include files so that the test can test under both RBR and SBR. mysql-test/r/rpl_events.result: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new result file for testing replication of events. mysql-test/r/rpl_udf.result: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new result file for testing replication of UDFs. mysql-test/t/rpl_udf.test: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new test for testing replication of UDFs. The test uses include files so that the test can test under both RBR and SBR. mysql-test/include/rpl_events.inc: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new include file for testing replication of events. This file contains the core test procedures. mysql-test/include/rpl_udf.inc: WL#3629 - Replication of Invocation and Invoked Features This patch adds a new include file for testing replication of UDFs. This file contains the core test procedures. |
||
unknown
|
a69a96e26a |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51 client/mysqltest.c: Auto merged include/my_pthread.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/sp.test: Auto merged mysys/my_wincond.c: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged client/mysql_upgrade.c: Manual merge; I chose to keep Magnus' changes because they make the code more simple; always use *only* the option file created by mysql_upgrade. mysql-test/extra/binlog_tests/ctype_cp932.test: Manual merge mysql-test/r/binlog_row_ctype_cp932.result: Manual merge mysql-test/r/binlog_stm_ctype_cp932.result: Manual merge mysql-test/r/mysqlbinlog.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge mysql-test/t/rpl_switch_stm_row_mixed.test: Manual merge |
||
unknown
|
2e34602392 |
Fixed compiler warnings
server-tools/instance-manager/angel.cc: Compiler warnings sql/event_queue.cc: Compier warnings sql/event_scheduler.cc: Compiler warnings sql/events.cc: Compiler warnings |
||
unknown
|
f1476f4395 |
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
- my_time_t is defined as long which means it will not always be the same size as time_t. See explanation in include/my_time.h sql/event_queue.cc: No need to require that "sizeof(time_t) == sizeof(my_time_t)" |
||
unknown
|
25bf1eae6a |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge mysql-test/r/subselect.result: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/subselect.test: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged |
||
unknown
|
3c39b0d831 |
Fix for bug#22740 Events: Decouple Event_queue from Event_db_repository
This patch implements the idea of the bug report by making Event_queue unaware of Event_db_repository by making a higher level class - Events, which is aware of most of all classes, responsible for passing all data needed for adding/updating/deleting an event to/from the queue. Introduces few new classes : - Event_worker_thread - Event_queue_element_for_exec sql/event_data_objects.cc: Introduced a new class Event_queue_element_for_exec According to Konstantin it should be named Event_name and hold only two LEX_STRINGs but `dropped` is not saved on disk and will require additional logic in Event_worker_thread class, after loading to compute whether the event should be dropped or not. It's easier just to pass this flag around. Removed Event_queue_element::drop(). This method was a source of a race condition. At the place where the event should be dropped we call Events::drop_event() which is the only code-flow for dropping. In addition, because ::drop_event() holds Events::LOCK_metadata there is no source of race conditions. Before this patch dropping from ::drop() wasn't under LOCK_metadata and races were possible. Because Events::open_event_table was removed as a method, provisionally events_event_db_repository was exported from events.cc till a solution is build where Event_queue_element does not access directly mysql.event. sql/event_data_objects.h: New class Event_queue_element_for_exec added which is returned from Event_queue::get_top_if_time() and passed through Event_scheduler to Event_worker_thread. There by using the (db)name Event_job_data is instanciated and executed. Dropped Event_queue_element::drop() thd was moved out of Event_job_data as it is now part of Event_queue_element_for_exec sql/event_queue.cc: Removed dependency of Event_queue on Event_db_repository. The instantiation of Event_job_data was moved to class Event_worker_thread In place is a return of an object of Event_queue_element_for_exec is used later for instantiating Event_job_data. The `dropped` flag of Event_queue_element is passed over Event_queue_element_for_exec to the code in Event_worker_thread. sql/event_queue.h: Removed dependency of Event_queue on Event_db_repository Removed dependency on Event_scheduler sql/event_scheduler.cc: Added class Event_worker_thread, which is used during the execution of an event. It has a static init() method to get a pointer to Event_db_repository to be used for instantiation of Event_job_data object. This object it then executed. sql/event_scheduler.h: Added class Event_worker_thread, which is used during the execution of an event. sql/events.cc: Removed Events::open_event_table() because it was a product of a bad architecture. sql/events.h: Removed friend definition, unneeded. Fixed Events::drop_event() to have the previous signature without bool only_from_disk sql/sql_parse.cc: Fix call |
||
unknown
|
f40e0cc0d0 |
After merge fixes
Removed a lot of compiler warnings Removed not used variables, functions and labels Initialize some variables that could be used unitialized (fatal bugs) %ll -> %l BitKeeper/etc/ignore: added storage/archive/archive_reader BUILD/SETUP.sh: ccache now works again BUILD/compile-pentium-gcov: Added marker that we are using gcov and need special version of ccache client/mysql_upgrade.c: after merge fixes client/mysqlbinlog.cc: after merge fixes client/mysqldump.c: Removed compiler warnings client/mysqlimport.c: Removed compiler warnings client/mysqltest.c: Removed compiler warnings mysql-test/t/mysqlcheck.test: After merge fixes mysys/my_bitmap.c: After merge fix sql/event_data_objects.cc: Removed not used variable sql/event_db_repository.cc: Removed not used variable sql/event_queue.cc: Removed not used variable sql/field.cc: After merge fixes sql/filesort.cc: Added missing initialization (could cause core dump on EOM) sql/ha_ndbcluster.cc: After merge fixes Removed not used variables false-> FALSE true -> TRUE %llu -> %lu (portability fix) Fixed bug where field could be used unitialized in build_scan_filter_predicate() sql/ha_ndbcluster_binlog.cc: Removed not used label sql/ha_partition.cc: Removed not used variables sql/handler.cc: Removed not used variable & function sql/item.cc: After merge fixes sql/item_cmpfunc.cc: Removed not used variable sql/item_func.cc: Removed compiler warning sql/item_xmlfunc.cc: Removed not used variables & declarations sql/log.cc: Removed compiler warnings Removed not used variables & label sql/log.h: After merge fixes sql/log_event.cc: Removed not used variable & function sql/mysqld.cc: After merge fixes sql/opt_range.cc: Removed not used declaration sql/partition_info.cc: Removed not used variable sql/protocol.cc: Removed compiler warnings sql/set_var.cc: Removed not used variable sql/set_var.h: After merge fix sql/slave.cc: After merge fixes sql/slave.h: Moved wrong declaration to slave.cc sql/sp.cc: Fixed format of DBUG_PRINT sql/sp_head.cc: After merge fixes sql/spatial.cc: Added DBUG_ASSERT() to verify that LINT_INIT is right sql/sql_class.cc: Removed not used variables sql/sql_insert.cc: After merge fixes sql/sql_parse.cc: Removed not used variable After merge fixes sql/sql_partition.cc: Removed not used variables sql/sql_plugin.cc: Removed compiler warnings when compiling embedded server sql/sql_servers.cc: Removed not used variables Moved wrong placed calle to use_all_columns() sql/sql_servers.h: Moved declaration to right sql_servers.cc sql/sql_show.cc: Removed not used variables and function After merge fixes sql/sql_table.cc: Removed not used variable sql/sql_yacc.yy: Removed not used variables Lex -> lex sql/table.cc: Indentation fix storage/archive/ha_archive.cc: After merge fixes storage/example/ha_example.cc: Indentation fixes storage/federated/ha_federated.cc: Removed not used variables storage/myisam/mi_rkey.c: Added 0x before address storage/myisammrg/ha_myisammrg.cc: Removed old declaration storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: After merge fixes storage/ndb/include/util/SimpleProperties.hpp: After merge fixes storage/ndb/src/common/debugger/EventLogger.cpp: Removed not used function storage/ndb/src/kernel/blocks/suma/Suma.cpp: Removed compiler warnings Removed not used variables storage/ndb/src/mgmsrv/MgmtSrvr.cpp: After merge fixes Removed not used variables storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Removed not used varibles. storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Removed not used variables storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variables and label storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Removed not used label storage/ndb/src/ndbapi/SignalSender.cpp: Removed not used function storage/ndb/src/ndbapi/TransporterFacade.cpp: Removed not used variables storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Moved static declaration from header file storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Moved static declaration from header file support-files/compiler_warnings.supp: Remove some warnings from ndb |
||
unknown
|
61430c77a4 |
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51 BUILD/check-cpu: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/type_enum.test: Auto merged mysql-test/t/view.test: Auto merged mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/event_queue.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged storage/federated/ha_federated.cc: Auto merged server-tools/instance-manager/instance.cc: Use remote (global 5.1 version) sql/unireg.cc: Use remote (5.1 global version) mysql-test/t/trigger.test: Manual merge server-tools/instance-manager/guardian.cc: Manual merge |
||
unknown
|
0517aa59ed |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/myisam.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqlbug.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_show.cc: Auto merged storage/federated/ha_federated.cc: Auto merged mysql-test/r/warnings.result: Manual merge. mysql-test/t/warnings.test: Manual merge. strings/ctype-extra.c: Manual merge. |
||
unknown
|
d7577ecb7d |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge mysql-test/r/sp.result: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/csv/ha_tina.cc: Auto merged tests/mysql_client_test.c: Auto merged |
||
unknown
|
92e68d49d7 |
Many files:
Changed header to GPL version 2 only client/mysqlslap.c: Changed header to GPL version 2 only include/atomic/nolock.h: Changed header to GPL version 2 only include/atomic/rwlock.h: Changed header to GPL version 2 only include/atomic/x86-gcc.h: Changed header to GPL version 2 only include/atomic/x86-msvc.h: Changed header to GPL version 2 only include/my_atomic.h: Changed header to GPL version 2 only include/my_trie.h: Changed header to GPL version 2 only include/my_vle.h: Changed header to GPL version 2 only include/mysql/plugin.h: Changed header to GPL version 2 only mysys/my_atomic.c: Changed header to GPL version 2 only mysys/my_getncpus.c: Changed header to GPL version 2 only mysys/my_memmem.c: Changed header to GPL version 2 only mysys/my_vle.c: Changed header to GPL version 2 only mysys/trie.c: Changed header to GPL version 2 only plugin/Makefile.am: Changed header to GPL version 2 only server-tools/instance-manager/IMService.h: Changed header to GPL version 2 only server-tools/instance-manager/WindowsService.h: Changed header to GPL version 2 only server-tools/instance-manager/exit_codes.h: Changed header to GPL version 2 only server-tools/instance-manager/user_management_commands.h: Changed header to GPL version 2 only sql/authors.h: Changed header to GPL version 2 only sql/contributors.h: Changed header to GPL version 2 only sql/event_data_objects.cc: Changed header to GPL version 2 only sql/event_data_objects.h: Changed header to GPL version 2 only sql/event_db_repository.cc: Changed header to GPL version 2 only sql/event_db_repository.h: Changed header to GPL version 2 only sql/event_queue.cc: Changed header to GPL version 2 only sql/event_queue.h: Changed header to GPL version 2 only sql/event_scheduler.cc: Changed header to GPL version 2 only sql/event_scheduler.h: Changed header to GPL version 2 only sql/events.cc: Changed header to GPL version 2 only sql/events.h: Changed header to GPL version 2 only sql/ha_ndbcluster_binlog.cc: Changed header to GPL version 2 only sql/ha_ndbcluster_binlog.h: Changed header to GPL version 2 only sql/ha_ndbcluster_tables.h: Changed header to GPL version 2 only sql/ha_partition.cc: Changed header to GPL version 2 only sql/ha_partition.h: Changed header to GPL version 2 only sql/item_xmlfunc.cc: Changed header to GPL version 2 only sql/item_xmlfunc.h: Changed header to GPL version 2 only sql/log.h: Changed header to GPL version 2 only sql/partition_element.h: Changed header to GPL version 2 only sql/partition_info.cc: Changed header to GPL version 2 only sql/partition_info.h: Changed header to GPL version 2 only sql/rpl_filter.cc: Changed header to GPL version 2 only sql/rpl_filter.h: Changed header to GPL version 2 only sql/rpl_injector.cc: Changed header to GPL version 2 only sql/rpl_injector.h: Changed header to GPL version 2 only sql/rpl_mi.cc: Changed header to GPL version 2 only sql/rpl_mi.h: Changed header to GPL version 2 only sql/rpl_rli.cc: Changed header to GPL version 2 only sql/rpl_rli.h: Changed header to GPL version 2 only sql/rpl_tblmap.cc: Changed header to GPL version 2 only sql/rpl_tblmap.h: Changed header to GPL version 2 only sql/rpl_utility.cc: Changed header to GPL version 2 only sql/rpl_utility.h: Changed header to GPL version 2 only sql/sql_binlog.cc: Changed header to GPL version 2 only sql/sql_partition.cc: Changed header to GPL version 2 only sql/sql_partition.h: Changed header to GPL version 2 only sql/sql_plugin.cc: Changed header to GPL version 2 only sql/sql_plugin.h: Changed header to GPL version 2 only sql/sql_servers.cc: Changed header to GPL version 2 only sql/sql_servers.h: Changed header to GPL version 2 only sql/sql_tablespace.cc: Changed header to GPL version 2 only sql/sql_yacc.yy.bak: Changed header to GPL version 2 only storage/Makefile.am: Changed header to GPL version 2 only storage/archive/Makefile.am: Changed header to GPL version 2 only storage/blackhole/Makefile.am: Changed header to GPL version 2 only storage/csv/Makefile.am: Changed header to GPL version 2 only storage/example/Makefile.am: Changed header to GPL version 2 only storage/federated/Makefile.am: Changed header to GPL version 2 only storage/innobase/handler/Makefile.am: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/AllocNodeId.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/CreateObj.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/DictObjOp.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/DihFragCount.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/DropFilegroup.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/DropObj.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/Extent.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/RestoreImpl.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/RouteOrd.hpp: Changed header to GPL version 2 only storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp: Changed header to GPL version 2 only storage/ndb/include/ndbapi/NdbIndexStat.hpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp: Changed header to GPL version 2 only storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/diskpage.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/lgman.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/lgman.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/pgman.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/pgman.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/print_file.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/record_types.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/restore.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/restore.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/tsman.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/blocks/tsman.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/DLCFifoList.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/DLCHashTable.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/DynArr256.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/DynArr256.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/KeyTable2Ref.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/LinearPool.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/NdbdSuperPool.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/NdbdSuperPool.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/Pool.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/Pool.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/RWPool.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/RWPool.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/Rope.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/SLFifoList.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/WOPool.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/WOPool.hpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/bench_pool.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Changed header to GPL version 2 only storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp: Changed header to GPL version 2 only storage/ndb/src/mgmsrv/ParamInfo.cpp: Changed header to GPL version 2 only storage/ndb/src/ndbapi/NdbIndexStat.cpp: Changed header to GPL version 2 only storage/ndb/test/ndbapi/testIndexStat.cpp: Changed header to GPL version 2 only storage/ndb/test/tools/listen.cpp: Changed header to GPL version 2 only storage/ndb/tools/restore/ndb_nodegroup_map.h: Changed header to GPL version 2 only strings/my_strchr.c: Changed header to GPL version 2 only unittest/mysys/base64-t.c: Changed header to GPL version 2 only unittest/mysys/bitmap-t.c: Changed header to GPL version 2 only unittest/mysys/my_atomic-t.c: Changed header to GPL version 2 only unittest/mytap/tap.c: Changed header to GPL version 2 only unittest/mytap/tap.h: Changed header to GPL version 2 only win/Makefile.am: Changed header to GPL version 2 only |
||
unknown
|
9121fa507f | Update function description for Event_queue::get_top_for_execution_if_time | ||
unknown
|
b52f52224a |
Reorganize the wait for event to be scheduled loop
Only use "set_timespec" when there is a need to use it |
||
unknown
|
eca724f45c |
Add macro for retrieving sec part of "struct timespec"
Use macros for working with "struct timespec" in event_queue.cc Fix merge problem include/my_pthread.h: Remove merge problem causing "struct timespec" to be declared twice Add macro "get_timespec_sec" used for retrieving the time in seconds sql/event_queue.cc: Use macros for working with "struct timespec" sql/log_event.cc: Add casts from "byte*" to "char*" |
||
unknown
|
62273f8e66 |
remove assert
sql/event_data_objects.cc: add a comments that using gmt_sec_to_TIME() won't be safe after 2038. per andrey's request sql/event_queue.cc: remove assert, which aborts server in the case when it shouldn't |
||
unknown
|
788ad30f08 |
Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems. client/mysqldump.c: Fixed some compiler warnings Added some missing DBUG_RETURN Remove copying of 'cluster' database client/mysqlslap.c: Fixed compiler warnings client/mysqltest.c: After merge fix extra/yassl/taocrypt/include/algebra.hpp: Removed compiler warning mysql-test/include/im_check_env.inc: Fixed race condition (mysqld1 could report 'starting' or 'online' mysql-test/mysql-test-run.pl: After merge fixes Added missing directory to LD_LIBRARY_PATH mysql-test/r/ctype_cp1250_ch.result: After merge fix mysql-test/r/im_cmd_line.result: Fixed race condition mysql-test/r/im_daemon_life_cycle.result: Fixed race condition mysql-test/r/im_instance_conf.result: Fixed race condition mysql-test/r/im_life_cycle.result: Fixed race condition mysql-test/r/im_utils.result: Fixed race condition mysql-test/r/log_tables.result: Fixed wrong result mysql-test/t/disabled.def: Disabled ndb_restore_partion, as ndb_restore_compate caused it to fail, becasue of table 'cluster/def/schema' which is stored in ndb_backup50 mysys/my_compress.c: Removed compiler warnings mysys/my_getopt.c: Ensure we always have at least one space between option name and value plugin/fulltext/plugin_example.c: Removed compiler warnings server-tools/instance-manager/mysql_connection.cc: After merge fix sql/event_data_objects.cc: Fixed compiler warnings Fixed platform compatibility issues (%lld is not portable) sql/event_data_objects.h: Fixed compiler warnings sql/event_db_repository.cc: Fixed compiler warnings sql/event_queue.cc: Fixed compiler warnings sql/event_scheduler.cc: Fixed compiler warnings sql/events.cc: Fixed compiler warnings sql/field.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/ha_ndbcluster_binlog.cc: Fixed compiler warnings sql/ha_partition.cc: Fixed compiler warnings sql/handler.cc: Fixed compiler warnings sql/item_cmpfunc.cc: Fixed DBUG_PRINT style sql/item_func.cc: Fixed compiler warnings sql/log.cc: Fixed compiler warnings sql/log_event.cc: Fixed compiler warnings sql/mysqld.cc: Fixed compiler warnings sql/opt_range.cc: Fixed compiler warnings sql/repl_failsafe.cc: Indentation fixes sql/rpl_rli.cc: Fixed compiler warnings sql/rpl_tblmap.cc: Fixed compiler warnings sql/set_var.cc: Fixed compiler warnings sql/slave.cc: Fixed compiler warnings sql/sp_head.cc: Fixed compiler warnings sql/sql_base.cc: Fixed compiler warnings Fixed indentation sql/sql_binlog.cc: Fixed compiler warnings sql/sql_cache.cc: Fixed compiler warnings sql/sql_class.cc: Fixed compiler warnings sql/sql_handler.cc: Fixed compiler warnings sql/sql_lex.cc: Fixed compiler warnings sql/sql_parse.cc: Fixed compiler warnings sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Fixed compiler warnings sql/sql_table.cc: Fixed compiler warnings sql/sql_test.cc: Fixed DBUG_PRINT style sql/sql_trigger.cc: Fixed DBUG_PRINT style sql/table.cc: Fixed compiler warnings storage/federated/ha_federated.cc: Fixed compiler warnings storage/myisam/mi_rsamepos.c: Fixed compiler warnings storage/ndb/include/ndb_global.h.in: After merge fix storage/ndb/include/util/NdbOut.hpp: Inform gcc that ndbout_c takes a printf() string as argument storage/ndb/include/util/SimpleProperties.hpp: After merge fixes storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings Fixed usage of uninitialized value (Got help from Jonas with patch) storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/lgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/pgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/restore.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/suma/Suma.cpp: Fixed compiler warnings Added missing enum's to switch storage/ndb/src/kernel/vm/Configuration.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/DLHashTable.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/RWPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/WOPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warnings storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/DictCache.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexStat.cpp: Initialize possible uninitialized variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbRecAttr.cpp: Added missing enum's (To avoid compiler warnings) storage/ndb/src/ndbapi/NdbScanOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/ObjectMap.hpp: Fixed compiler warnings storage/ndb/tools/desc.cpp: Fixed compiler warnings storage/ndb/tools/restore/Restore.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings unittest/mytap/t/basic-t.c: Fixed compiler warnings unittest/mytap/tap.c: Fixed compiler warnings |
||
unknown
|
2e5837355b |
Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't
initialized prior to usage as well as deinitialized on shutdown. sql/event_queue.cc: Deinitialize and initialize COND_queue_state |
||
unknown
|
2d8bd87675 |
Temporary fix for a deadlock. Needed so we can go with cloning
5.1.12. sql/event_queue.cc: Temporary workaround to drop the event outside of the scope where LOCK_queue is locked. If it's done inside the scope a possible deadlock can happen, and it happens quite often, escpecially on Windows. |
||
unknown
|
b0220fb363 |
event_queue.cc:
fix sigsegv sql/event_queue.cc: fix sigsegv |
||
unknown
|
04a5f335d3 |
WL#3337 (Event scheduler new architecture)
Remove SHOW SCHEDULER STATUS command and migrate the information output to `mysqladmin debug` (COM_DEBUG) SHOW SCHEDULER STATUS was introduced in 5.1.11, provided some debug information about event scheduler internals and was enabled only in debug builds. sql/event_queue.cc: Remove SHOW SCHEDULER STATUS. Reporting still will be there but through COM_DEBUG (mysqladmin debug) sql/event_queue.h: dump_internal_status cannot return an error, therefore it should be void. sql/event_scheduler.cc: Remove SHOW SCHEDULER STATUS. Reporting still will be there but through COM_DEBUG (mysqladmin debug) sql/event_scheduler.h: dump_internal_status cannot return an error, therefore it should be void. sql/events.cc: Change from outputting the internal data from the wire to the standard output. SHOW SCHEDULER STATUS was removed. sql/events.h: dump_internal_status() cannot return an error, therefore it should be void sql/lex.h: remove SCHEDULER as recognized word. This is part of removing SHOW SCHEDULER STATUS sql/sp_head.cc: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_lex.h: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_parse.cc: SQLCOM_SHOW_SCHEDULER_STATUS has been removed sql/sql_test.cc: Dump Events' internal information on COM_DEBUG sql/sql_yacc.yy: SQLCOM_SHOW_SCHEDULER_STATUS has been removed |
||
unknown
|
e22b6703f8 |
remove unused artifacts
sql/event_db_repository.cc: remove unused variables - reported by MS compiler sql/event_queue.cc: remove unused variables - reported by MS compiler sql/event_scheduler.cc: remove unused label sql/events.cc: remove unused variable and a label - reported by MS compiler |
||
unknown
|
0410cc3a0c |
WL#3337 (Event scheduler new architecture)
This patch makes the relationship between Event_scheduler and Event_queue unidirectional from the former to the latter. The change is that the conditional on which the scheduler sleeped has been moved to the Event_queue and the latter does not call anymore Event_scheduler::queue_changed(), which in turn has be removed. sql/event_queue.cc: Remove dependency of Event_queue on Event_scheduler but not vice versa. Event_scheduler polls whether there is time to execute an event. Removed notify_observers() as the way of calling has changed. Added Event_queue::cond_wait() similar to Event_scheduler::cond_wait(). sql/event_queue.h: init_queue() does not need anymore Event_scheduler object because the relationship is now one-way. Event_scheduler knows about Event_queue but not vice versa. get_top_execution_if_time() does by itself the waiting instead of returning abstime. This simplifies the code in Event_scheduler::run() get_top_execution_if_time() returns only if job_data != NULL or if the scheduler thread was killed. notify_observers() is no more used and therefore removed. Added Event_queue::cond_wait() because now there is waiting on a conditional variable in Event_queue too (like in Event_scheduler for ::stop()). sql/event_scheduler.cc: Change the relationship between Event_scheduler & Event_queue. Event_queue does not know anymore about Event_scheduler. When the scheduler calls get_top_element_if_time() it may fall asleep on a conditional of Event_queue, if either the queue is empty or it's still not time for activation. When the method returns it will return a non-null address, namely an object to be executed. If the return value is NULL, the thread was killed by a call to Event_scheduler::stop() (we assert this). sql/event_scheduler.h: Remove queue_changed() as it is obsoleted by making the relationship between Event_scheduler and Event_queue one-way, from the former to the latter. Event_queue now does not know about Event_scheduler. get_state() is changed to is_running(). The state enum should be private, as it is not needed to be seen from outside anymore. sql/events.cc: Event_queue does not need anymore a pointer to Event_scheduler. |
||
unknown
|
99adbd131a |
WL#3337 (Event scheduler new architecture)
Post-review fixes. Mostly whitespace, int-to-bool return value, fixed comments sql/Makefile.am: compile all submodules of Events before compiling the facade sql/event_data_objects.cc: - Use initialization list - Clean whitespaces - Shorten comments - Fix comments sql/event_data_objects.h: - Fix whitespace sql/event_db_repository.cc: - Change return type from int to bool where only one error code is returned. - Don't use macros but get the maximal number of characters in a column from the column - Fix comments - Make functions which has return value but it's not used - void. sql/event_db_repository.h: - Methods with only one error code int -> bool return value - Remove declaration of fill_schema_events, a function that does not exist sql/event_queue.cc: - Use initialization lists - Let find_n_remove_event delete the object thus making the code more robust. The caller could forget to destruct the object. In addition, find_n_remove_element() does not return a value. - Move check_system_tables() to class Events - Fix comments sql/event_queue.h: - Whitespace changes - init_queue() should allow passing of THD - check_system_tables moved to class Events - find_n_remove_event() is now void sql/event_scheduler.cc: - Initialize res before use - Remove end stop from message sql/event_scheduler.h: Add uninitialized state. The scheduler is in it before init_scheduler() is called. The rationale is that otherwise state has no value before the call. If the system tables were damaged the scheduler won't be initialized but in Events::deinit() Event_scheduler::stop() will be called and this will touch state, generating valgrind warning at minimum. sql/events.cc: - Whitespace changes - Fix comments - Make methods which have only one error code be bool instead of int - Create temporarily a THD to be used for the initialization of Event_queue - Event_queue::check_system_tables() moved to Events::check_system_tables - is_started() is renamed to is_execution_of_events_started() sql/events.h: - Whitespace changes - When a method returns only one error code it should be bool, not int - is_started() renamed to is_execution_of_events_started() sql/set_var.cc: is_started() is renamed to is_execution_of_events_started() sql/sql_db.cc: The return code is not used, thus don't return anything and drop_schema_events() is now void. sql/sql_yacc.yy: - Fix comments - Remove unneeded initialization which is performed in lex_init() sql/share/errmsg.txt: New error message sql/table.cc: - Fix comments - make table_check_intact() accespt const *table_def sql/table.h: Make table_check_intact() accespt const *table_def |
||
unknown
|
e69e640f2e |
WL#3337 (Events new architecture)
Small updates before patch submit. client/mysqltest.c: allow --valgrind option to mysqltest so one can be able to detect whether the test is running under valgrind by having $VALGRIND_TEST, similar to BIG_TEST, in the test file. mysql-test/mysql-test-run.pl: If the test suite is running under valgrind start mysqltest with --valgrind to inform that we run valgrind. mysqltest will provide $VALGRIND_TEST for the test cases. mysql-test/r/events_bugs.result: update result mysql-test/r/events_scheduling.result: update result mysql-test/t/events.test: Increase times or the test will fail under valgrind mysql-test/t/events_bugs.test: Increase times or the test will fail under valgrind mysql-test/t/events_scheduling.test: Remove faulty test Disable the test case for valgrind sql/event_data_objects.cc: count the number of executions sql/event_data_objects.h: flags is not used at all add execution_count to count the number of executions sql/event_db_repository.cc: Initialize wherever needed. Add a comment regarding valgrind warning. sql/event_queue.cc: more debug info in the trace log sql/event_scheduler.cc: Use macro COND_STATE_WAIT() in all cases we need waiting on condition. Hence, we can trace locking, attemption to lock and more with SHOW SCHEDULER STATUS sql/event_scheduler.h: Change the declaration of cond_wait to accept THD sql/events.cc: fix memory leak. Destroy event_queue mysql-test/include/not_valgrind.inc: New BitKeeper file ``mysql-test/include/not_valgrind.inc'' mysql-test/r/not_valgrind.require: New BitKeeper file ``mysql-test/r/not_valgrind.require'' |
||
unknown
|
d65ab09c4d |
update to ease the patch process
sql/event_queue.cc: integrate Event_queue::check_system_tables() into the boot procedure sql/event_queue.h: make Event_queue::check_system_tables() void, instead of bool BitKeeper/etc/ignore: Added sql/.deps/client.Po sql/.deps/derror.Po sql/.deps/des_key_file.Po sql/.deps/discover.Po sql/.deps/event_data_objects.Po sql/.deps/event_db_repository.Po sql/.deps/event_queue.Po sql/.deps/event_scheduler.Po sql/.deps/events.Po sql/.deps/field.Po sql/.deps/field_conv.Po sql/.deps/filesort.Po sql/.deps/gen_lex_hash.Po sql/.deps/gstream.Po sql/.deps/ha_berkeley.Po sql/.deps/ha_federated.Po sql/.deps/ha_heap.Po sql/.deps/ha_innodb.Po sql/.deps/ha_myisam.Po sql/.deps/ha_myisammrg.Po sql/.deps/ha_ndbcluster.Po sql/.deps/ha_ndbcluster_binlog.Po sql/.deps/ha_partition.Po sql/.deps/handler.Po sql/.deps/hash_filo.Po sql/.deps/hostname.Po sql/.deps/init.Po sql/.deps/item.Po sql/.deps/item_buff.Po sql/.deps/item_cmpfunc.Po sql/.deps/item_create.Po sql/.deps/item_func.Po sql/.deps/item_geofunc.Po sql/.deps/item_row.Po sql/.deps/item_strfunc.Po sql/.deps/item_subselect.Po sql/.deps/item_sum.Po sql/.deps/item_timefunc.Po sql/.deps/item_uniq.Po sql/.deps/item_xmlfunc.Po sql/.deps/key.Po sql/.deps/lock.Po sql/.deps/ log.Po sql/.deps/log_event.Po sql/.deps/mf_iocache.Po sql/.deps/mini_client_errors.Po sql/.deps/my_decimal.Po sql/.deps/my_lock.Po sql/.deps/my_time.Po sql/.deps/my_user.Po sql/.deps/mysql_tzinfo_to_sql.Po sql/.deps/mysqld.Po sql/.deps/net_serv.Po sql/.deps/opt_range.Po sql/.deps/opt_sum.Po sql/.deps/pack.Po sql/.deps/parse_file.Po sql/.deps/partition_info.Po sql/.deps/password.Po sql/.deps/procedure.Po sql/.deps/protocol.Po sql/.deps/records.Po sql/.deps/repl_failsafe.Po sql/.deps/rpl_filter.Po sql/.deps/rpl_injector.Po sql/.deps/rpl_tblmap.Po sql/.deps/set_var.Po sql/.deps/slave.Po sql/.deps/sp.Po sql/.deps/sp_cache.Po sql/.deps/sp_head.Po sql/.deps/sp_pcontext.Po sql/.deps/sp_rcontext.Po sql/.deps/spatial.Po sql/.deps/sql_acl.Po sql/.deps/sql_analyse.Po sql/.deps/sql_base.Po sql/.deps/sql_binlog.Po sql/.deps/sql_builtin.Po sql/.deps/sql_cache.Po sql/.deps/sql_class.Po sql/.deps/sql_client.Po sql/.deps/sql_crypt.Po sql/.deps/sql_cursor.Po sql/.deps/sql_db.Po sql/.deps/sql_delete.Po sql/.deps/sql_derived .Po sql/.deps/sql_do.Po sql/.deps/sql_error.Po sql/.deps/sql_handler.Po sql/.deps/sql_help.Po sql/.deps/sql_insert.Po sql/.deps/sql_lex.Po sql/.deps/sql_list.Po sql/.deps/sql_load.Po sql/.deps/sql_manager.Po sql/.deps/sql_map.Po sql/.deps/sql_olap.Po sql/.deps/sql_parse.Po sql/.deps/sql_partition.Po sql/.deps/sql_plugin.Po sql/.deps/sql_prepare.Po sql/.deps/sql_rename.Po sql/.deps/sql_repl.Po sql/.deps/sql_select.Po sql/.deps/sql_show.Po sql/.deps/sql_state.Po sql/.deps/sql_string.Po sql/.deps/sql_table.Po sql/.deps/sql_tablespace.Po sql/.deps/sql_test.Po sql/.deps/sql_trigger.Po sql/.deps/sql_udf.Po sql/.deps/sql_union.Po sql/.deps/sql_update.Po sql/.deps/sql_view.Po sql/.deps/sql_yacc.Po sql/.deps/stacktrace.Po sql/.deps/strfunc.Po sql/.deps/table.Po sql/.deps/thr_malloc.Po sql/.deps/time.Po sql/.deps/tztime.Po sql/.deps/udf_example.Plo sql/.deps/uniques.Po sql/.deps/unireg.Po sql/.libs/udf_example.lai sql/.libs/udf_example.so.0 sql/.libs/udf_example.so.0.0.0 storage/archive/.deps/archive_test-archive_t est.Po storage/archive/.deps/archive_test-azio.Po storage/archive/.deps/ha_archive_la-azio.Plo storage/archive/.deps/ha_archive_la-ha_archive.Plo storage/archive/.deps/libarchive_a-azio.Po storage/archive/.deps/libarchive_a-ha_archive.Po storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po storage/csv/.deps/ha_csv_la-ha_tina.Plo storage/csv/.deps/libcsv_a-ha_tina.Po storage/example/.deps/ha_example_la-ha_example.Plo storage/example/.deps/libexample_a-ha_example.Po storage/heap/.deps/_check.Po storage/heap/.deps/_rectest.Po storage/heap/.deps/hp_block.Po storage/heap/.deps/hp_clear.Po storage/heap/.deps/hp_close.Po storage/heap/.deps/hp_create.Po storage/heap/.deps/hp_delete.Po storage/heap/.deps/hp_extra.Po storage/heap/.deps/hp_hash.Po storage/heap/.deps/hp_info.Po storage/heap/.deps/hp_open.Po storage/heap/.deps/hp_panic.Po storage/heap/.deps/hp_rename.Po storage/heap/.deps/hp_rfirst.Po storage/heap/.deps/hp_rkey.Po storage/heap/.deps/hp_rlast.P o storage/heap/.deps/hp_rnext.Po storage/heap/.deps/hp_rprev.Po storage/heap/.deps/hp_rrnd.Po storage/heap/.deps/hp_rsame.Po storage/heap/.deps/hp_scan.Po storage/heap/.deps/hp_static.Po storage/heap/.deps/hp_test1.Po storage/heap/.deps/hp_test2.Po storage/heap/.deps/hp_update.Po storage/heap/.deps/hp_write.Po storage/innobase/btr/.deps/btr0btr.Po storage/innobase/btr/.deps/btr0cur.Po storage/innobase/btr/.deps/btr0pcur.Po storage/innobase/btr/.deps/btr0sea.Po storage/innobase/buf/.deps/buf0buf.Po storage/innobase/buf/.deps/buf0flu.Po storage/innobase/buf/.deps/buf0lru.Po storage/innobase/buf/.deps/buf0rea.Po storage/innobase/data/.deps/data0data.Po storage/innobase/data/.deps/data0type.Po storage/innobase/dict/.deps/dict0boot.Po storage/innobase/dict/.deps/dict0crea.Po storage/innobase/dict/.deps/dict0dict.Po storage/innobase/dict/.deps/dict0load.Po storage/innobase/dict/.deps/dict0mem.Po storage/innobase/dyn/.deps/dyn0dyn.Po storage/innobase/eval/.deps/eval0eval.Po storage/innobase/eval/.deps/eval0proc. Po storage/innobase/fil/.deps/fil0fil.Po storage/innobase/fsp/.deps/fsp0fsp.Po storage/innobase/fut/.deps/fut0fut.Po storage/innobase/fut/.deps/fut0lst.Po storage/innobase/ha/.deps/ha0ha.Po storage/innobase/ha/.deps/hash0hash.Po storage/innobase/ibuf/.deps/ibuf0ibuf.Po storage/innobase/lock/.deps/lock0lock.Po storage/innobase/log/.deps/log0log.Po storage/innobase/log/.deps/log0recv.Po storage/innobase/mach/.deps/mach0data.Po storage/innobase/mem/.deps/mem0mem.Po storage/innobase/mem/.deps/mem0pool.Po storage/innobase/mtr/.deps/mtr0log.Po storage/innobase/mtr/.deps/mtr0mtr.Po storage/innobase/os/.deps/os0file.Po storage/innobase/os/.deps/os0proc.Po storage/innobase/os/.deps/os0sync.Po storage/innobase/os/.deps/os0thread.Po storage/innobase/page/.deps/page0cur.Po storage/innobase/page/.deps/page0page.Po storage/innobase/pars/.deps/lexyy.Po storage/innobase/pars/.deps/pars0grm.Po storage/innobase/pars/.deps/pars0opt.Po storage/innobase/pars/.deps/pars0pars.Po storage/innobase/pars/.deps/pars0sym.Po storage/i nnobase/que/.deps/que0que.Po storage/innobase/read/.deps/read0read.Po storage/innobase/rem/.deps/rem0cmp.Po storage/innobase/rem/.deps/rem0rec.Po storage/innobase/row/.deps/row0ins.Po storage/innobase/row/.deps/row0mysql.Po storage/innobase/row/.deps/row0purge.Po storage/innobase/row/.deps/row0row.Po storage/innobase/row/.deps/row0sel.Po storage/innobase/row/.deps/row0uins.Po storage/innobase/row/.deps/row0umod.Po storage/innobase/row/.deps/row0undo.Po storage/innobase/row/.deps/row0upd.Po storage/innobase/row/.deps/row0vers.Po storage/innobase/srv/.deps/srv0que.Po storage/innobase/srv/.deps/srv0srv.Po storage/innobase/srv/.deps/srv0start.Po storage/innobase/sync/.deps/sync0arr.Po storage/innobase/sync/.deps/sync0rw.Po storage/innobase/sync/.deps/sync0sync.Po storage/innobase/thr/.deps/thr0loc.Po storage/innobase/trx/.deps/trx0purge.Po storage/innobase/trx/.deps/trx0rec.Po storage/innobase/trx/.deps/trx0roll.Po storage/innobase/trx/.deps/trx0rseg.Po storage/innobase/trx/.deps/trx0sys.Po storage/innobase/t rx/.deps/trx0trx.Po storage/innobase/trx/.deps/trx0undo.Po storage/innobase/usr/.deps/usr0sess.Po storage/innobase/ut/.deps/ut0byte.Po storage/innobase/ut/.deps/ut0dbg.Po storage/innobase/ut/.deps/ut0list.Po storage/innobase/ut/.deps/ut0mem.Po storage/innobase/ut/.deps/ut0rnd.Po storage/innobase/ut/.deps/ut0ut.Po storage/innobase/ut/.deps/ut0vec.Po storage/innobase/ut/.deps/ut0wqueue.Po storage/myisam/.deps/ft_boolean_search.Po storage/myisam/.deps/ft_nlq_search.Po storage/myisam/.deps/ft_parser.Po storage/myisam/.deps/ft_static.Po storage/myisam/.deps/ft_stopwords.Po storage/myisam/.deps/ft_update.Po storage/myisam/.deps/mi_cache.Po storage/myisam/.deps/mi_changed.Po storage/myisam/.deps/mi_check.Po storage/myisam/.deps/mi_checksum.Po storage/myisam/.deps/mi_close.Po storage/myisam/.deps/mi_create.Po storage/myisam/.deps/mi_dbug.Po storage/myisam/.deps/mi_delete.Po storage/myisam/.deps/mi_delete_all.Po storage/myisam/.deps/mi_delete_table.Po storage/myisam/.deps/mi_dynrec.Po storage/myisam/.deps/mi_extra .Po storage/myisam/.deps/mi_info.Po storage/myisam/.deps/mi_key.Po storage/myisam/.deps/mi_keycache.Po storage/myisam/.deps/mi_locking.Po storage/myisam/.deps/mi_log.Po storage/myisam/.deps/mi_open.Po storage/myisam/.deps/mi_packrec.Po storage/myisam/.deps/mi_page.Po storage/myisam/.deps/mi_panic.Po storage/myisam/.deps/mi_preload.Po storage/myisam/.deps/mi_range.Po storage/myisam/.deps/mi_rename.Po storage/myisam/.deps/mi_rfirst.Po storage/myisam/.deps/mi_rkey.Po storage/myisam/.deps/mi_rlast.Po storage/myisam/.deps/mi_rnext.Po storage/myisam/.deps/mi_rnext_same.Po storage/myisam/.deps/mi_rprev.Po storage/myisam/.deps/mi_rrnd.Po storage/myisam/.deps/mi_rsame.Po storage/myisam/.deps/mi_rsamepos.Po storage/myisam/.deps/mi_scan.Po storage/myisam/.deps/mi_search.Po storage/myisam/.deps/mi_static.Po storage/myisam/.deps/mi_statrec.Po storage/myisam/.deps/mi_test1.Po storage/myisam/.deps/mi_test2.Po storage/myisam/.deps/mi_test3.Po storage/myisam/.deps/mi_unique.Po storage/myisam/.deps/mi_update.Po storage/myi sam/.deps/mi_write.Po storage/myisam/.deps/myisam_ftdump.Po storage/myisam/.deps/myisamchk.Po storage/myisam/.deps/myisamlog.Po storage/myisam/.deps/myisampack.Po storage/myisam/.deps/rt_index.Po storage/myisam/.deps/rt_key.Po storage/myisam/.deps/rt_mbr.Po storage/myisam/.deps/rt_split.Po storage/myisam/.deps/rt_test.Po storage/myisam/.deps/sort.Po storage/myisam/.deps/sp_key.Po storage/myisam/.deps/sp_test.Po storage/myisammrg/.deps/myrg_close.Po storage/myisammrg/.deps/myrg_create.Po storage/myisammrg/.deps/myrg_delete.Po storage/myisammrg/.deps/myrg_extra.Po storage/myisammrg/.deps/myrg_info.Po storage/myisammrg/.deps/myrg_locking.Po storage/myisammrg/.deps/myrg_open.Po storage/myisammrg/.deps/myrg_panic.Po storage/myisammrg/.deps/myrg_queue.Po storage/myisammrg/.deps/myrg_range.Po storage/myisammrg/.deps/myrg_rfirst.Po storage/myisammrg/.deps/myrg_rkey.Po storage/myisammrg/.deps/myrg_rlast.Po storage/myisammrg/.deps/myrg_rnext.Po storage/myisammrg/.deps/myrg_rnext_same.Po storage/myisammrg/.deps/myrg _rprev.Po storage/myisammrg/.deps/myrg_rrnd.Po storage/myisammrg/.deps/myrg_rsame.Po storage/myisammrg/.deps/myrg_static.Po storage/myisammrg/.deps/myrg_update.Po storage/myisammrg/.deps/myrg_write.Po strings/.deps/bchange.Po strings/.deps/bcmp.Po strings/.deps/bfill.Po strings/.deps/bmove.Po strings/.deps/bmove512.Po strings/.deps/bmove_upp.Po strings/.deps/conf_to_src.Po strings/.deps/ctype-big5.Po strings/.deps/ctype-bin.Po strings/.deps/ctype-cp932.Po strings/.deps/ctype-czech.Po strings/.deps/ctype-euc_kr.Po strings/.deps/ctype-eucjpms.Po strings/.deps/ctype-extra.Po strings/.deps/ctype-gb2312.Po strings/.deps/ctype-gbk.Po strings/.deps/ctype-latin1.Po strings/.deps/ctype-mb.Po strings/.deps/ctype-simple.Po strings/.deps/ctype-sjis.Po strings/.deps/ctype-tis620.Po strings/.deps/ctype-uca.Po strings/.deps/ctype-ucs2.Po strings/.deps/ctype-ujis.Po strings/.deps/ctype-utf8.Po strings/.deps/ctype-win1250ch.Po strings/.deps/ctype.Po strings/.deps/decimal.Po strings/.deps/int2str.Po strings/.deps/is_prefix .Po strings/.deps/llstr.Po strings/.deps/longlong2str.Po strings/.deps/longlong2str_asm.Po strings/.deps/my_strchr.Po strings/.deps/my_strtoll10.Po strings/.deps/my_vsnprintf.Po strings/.deps/r_strinstr.Po strings/.deps/str2int.Po strings/.deps/str_alloc.Po strings/.deps/strappend.Po strings/.deps/strcend.Po strings/.deps/strcont.Po strings/.deps/strend.Po strings/.deps/strfill.Po strings/.deps/strinstr.Po strings/.deps/strmake.Po strings/.deps/strmov.Po strings/.deps/strnlen.Po strings/.deps/strnmov.Po strings/.deps/strstr.Po strings/.deps/strtod.Po strings/.deps/strtol.Po strings/.deps/strtoll.Po strings/.deps/strtoul.Po strings/.deps/strtoull.Po strings/.deps/strxmov.Po strings/.deps/strxnmov.Po strings/.deps/xml.Po tests/.deps/dummy.Po tests/.deps/insert_test.Po tests/.deps/mysql_client_test.Po tests/.deps/select_test.Po tests/.deps/thread_test.Po tests/.libs/lt-mysql_client_test tests/.libs/mysql_client_test unittest/examples/.deps/no_plan-t.Po unittest/examples/.deps/simple-t.Po unittest/examples/.d eps/skip-t.Po unittest/examples/.deps/skip_all-t.Po unittest/examples/.deps/todo-t.Po unittest/mysys/.deps/base64-t.Po unittest/mysys/.deps/bitmap-t.Po unittest/mysys/.deps/my_atomic-t.Po unittest/mytap/t/.deps/basic-t.Po unittest/mytap/.deps/tap.Po vio/.deps/dummy.Po vio/.deps/test-ssl.Po vio/.deps/test-sslclient.Po vio/.deps/test-sslserver.Po vio/.deps/vio.Po vio/.deps/viosocket.Po vio/.deps/viossl.Po vio/.deps/viosslfactories.Po client/.deps/base64.Po client/.deps/completion_hash.Po client/.deps/dummy.Po client/.deps/mf_tempdir.Po client/.deps/my_bit.Po client/.deps/my_bitmap.Po client/.deps/my_getsystime.Po client/.deps/my_new.Po client/.deps/my_user.Po client/.deps/my_vle.Po client/.deps/mysql.Po client/.deps/mysql_upgrade.Po client/.deps/mysqladmin.Po client/.deps/mysqlbinlog.Po client/.deps/mysqlcheck.Po client/.deps/mysqldump.Po client/.deps/mysqlimport.Po client/.deps/mysqlshow.Po client/.deps/mysqlslap.Po client/.deps/mysqltest.Po client/.deps/readline.Po client/.deps/sql_string.Po client/.libs/ lt-mysql client/.libs/lt-mysqladmin client/.libs/lt-mysqlbinlog client/.libs/lt-mysqlcheck client/.libs/lt-mysqldump client/.libs/lt-mysqlimport client/.libs/lt-mysqlshow client/.libs/lt-mysqlslap client/.libs/lt-mysqltest client/.libs/mysql client/.libs/mysql_upgrade client/.libs/mysqladmin client/.libs/mysqlbinlog client/.libs/mysqlcheck client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqlshow client/.libs/mysqlslap client/.libs/mysqltest cmd-line-utils/libedit/.deps/chared.Po cmd-line-utils/libedit/.deps/common.Po cmd-line-utils/libedit/.deps/el.Po cmd-line-utils/libedit/.deps/emacs.Po cmd-line-utils/libedit/.deps/fcns.Po cmd-line-utils/libedit/.deps/fgetln.Po cmd-line-utils/libedit/.deps/help.Po cmd-line-utils/libedit/.deps/hist.Po cmd-line-utils/libedit/.deps/history.Po cmd-line-utils/libedit/.deps/key.Po cmd-line-utils/libedit/.deps/map.Po cmd-line-utils/libedit/.deps/parse.Po cmd-line-utils/libedit/.deps/prompt.Po cmd-line-utils/libedit/.deps/read.Po cmd-line-utils/libedit/.deps/readl ine.Po cmd-line-utils/libedit/.deps/refresh.Po cmd-line-utils/libedit/.deps/search.Po cmd-line-utils/libedit/.deps/sig.Po cmd-line-utils/libedit/.deps/strlcat.Po cmd-line-utils/libedit/.deps/strlcpy.Po cmd-line-utils/libedit/.deps/term.Po cmd-line-utils/libedit/.deps/tokenizer.Po cmd-line-utils/libedit/.deps/tty.Po cmd-line-utils/libedit/.deps/unvis.Po cmd-line-utils/libedit/.deps/vi.Po cmd-line-utils/libedit/.deps/vis.Po cmd-line-utils/readline/.deps/bind.Po cmd-line-utils/readline/.deps/callback.Po cmd-line-utils/readline/.deps/compat.Po cmd-line-utils/readline/.deps/complete.Po cmd-line-utils/readline/.deps/display.Po cmd-line-utils/readline/.deps/funmap.Po cmd-line-utils/readline/.deps/histexpand.Po cmd-line-utils/readline/.deps/histfile.Po cmd-line-utils/readline/.deps/history.Po cmd-line-utils/readline/.deps/histsearch.Po cmd-line-utils/readline/.deps/input.Po cmd-line-utils/readline/.deps/isearch.Po cmd-line-utils/readline/.deps/keymaps.Po cmd-line-utils/readline/.deps/kill.Po cmd-line-utils/readli ne/.deps/macro.Po cmd-line-utils/readline/.deps/mbutil.Po cmd-line-utils/readline/.deps/misc.Po cmd-line-utils/readline/.deps/nls.Po cmd-line-utils/readline/.deps/parens.Po cmd-line-utils/readline/.deps/readline.Po cmd-line-utils/readline/.deps/rltty.Po cmd-line-utils/readline/.deps/savestring.Po cmd-line-utils/readline/.deps/search.Po cmd-line-utils/readline/.deps/shell.Po cmd-line-utils/readline/.deps/signals.Po cmd-line-utils/readline/.deps/terminal.Po cmd-line-utils/readline/.deps/text.Po cmd-line-utils/readline/.deps/tilde.Po cmd-line-utils/readline/.deps/undo.Po cmd-line-utils/readline/.deps/util.Po cmd-line-utils/readline/.deps/vi_mode.Po cmd-line-utils/readline/.deps/xmalloc.Po dbug/.deps/dbug.Po dbug/.deps/dbug_analyze.Po dbug/.deps/factorial.Po dbug/.deps/my_main.Po dbug/.deps/sanity.Po extra/yassl/src/.deps/buffer.Plo extra/yassl/src/.deps/cert_wrapper.Plo extra/yassl/src/.deps/crypto_wrapper.Plo extra/yassl/src/.deps/handshake.Plo extra/yassl/src/.deps/lock.Plo extra/yassl/src/.deps/log.Plo ex tra/yassl/src/.deps/socket_wrapper.Plo extra/yassl/src/.deps/ssl.Plo extra/yassl/src/.deps/template_instnt.Plo extra/yassl/src/.deps/timer.Plo extra/yassl/src/.deps/yassl_error.Plo extra/yassl/src/.deps/yassl_imp.Plo extra/yassl/src/.deps/yassl_int.Plo extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo extra/yassl/taocrypt/src/.deps/libt aocrypt_la-hash.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo extra/yassl/taocrypt/test/.deps/test-test.Po extra/yassl/testsuite/.deps/testsuite-client.Po extra/yassl/testsuite/.deps/testsuite-echoclient.Po extra/yassl/testsuite/.deps/testsuite-echoserver.Po extra/yassl/testsuite/.deps/testsuite-server.Po extra/yassl/testsuite/.deps/testsuite-test.Po extra/yassl/testsuite/.deps/t estsuite-testsuite.Po extra/.deps/charset2html.Po extra/.deps/comp_err.Po extra/.deps/innochecksum.Po extra/.deps/my_print_defaults.Po extra/.deps/mysql_waitpid.Po extra/.deps/perror.Po extra/.deps/replace.Po extra/.deps/resolve_stack_dump.Po extra/.deps/resolveip.Po libmysql/.deps/array.Plo libmysql/.deps/bchange.Plo libmysql/.deps/bcmp.Plo libmysql/.deps/bmove.Plo libmysql/.deps/bmove_upp.Plo libmysql/.deps/charset-def.Plo libmysql/.deps/charset.Plo libmysql/.deps/client.Plo libmysql/.deps/conf_to_src.Po libmysql/.deps/ctype-big5.Plo libmysql/.deps/ctype-bin.Plo libmysql/.deps/ctype-cp932.Plo libmysql/.deps/ctype-czech.Plo libmysql/.deps/ctype-euc_kr.Plo libmysql/.deps/ctype-eucjpms.Plo libmysql/.deps/ctype-extra.Plo libmysql/.deps/ctype-gb2312.Plo libmysql/.deps/ctype-gbk.Plo libmysql/.deps/ctype-latin1.Plo libmysql/.deps/ctype-mb.Plo libmysql/.deps/ctype-simple.Plo libmysql/.deps/ctype-sjis.Plo libmysql/.deps/ctype-tis620.Plo libmysql/.deps/ctype-uca.Plo libmysql/.deps/ctype-ucs2.Plo libmysql/.deps/ct ype-ujis.Plo libmysql/.deps/ctype-utf8.Plo libmysql/.deps/ctype-win1250ch.Plo libmysql/.deps/ctype.Plo libmysql/.deps/dbug.Plo libmysql/.deps/default.Plo libmysql/.deps/default_modify.Plo libmysql/.deps/errmsg.Plo libmysql/.deps/errors.Plo libmysql/.deps/get_password.Plo libmysql/.deps/hash.Plo libmysql/.deps/int2str.Plo libmysql/.deps/is_prefix.Plo libmysql/.deps/libmysql.Plo libmysql/.deps/list.Plo libmysql/.deps/llstr.Plo libmysql/.deps/longlong2str.Plo libmysql/.deps/manager.Plo libmysql/.deps/md5.Plo libmysql/.deps/mf_cache.Plo libmysql/.deps/mf_dirname.Plo libmysql/.deps/mf_fn_ext.Plo libmysql/.deps/mf_format.Plo libmysql/.deps/mf_iocache.Plo libmysql/.deps/mf_iocache2.Plo libmysql/.deps/mf_loadpath.Plo libmysql/.deps/mf_pack.Plo libmysql/.deps/mf_path.Plo libmysql/.deps/mf_tempfile.Plo libmysql/.deps/mf_unixpath.Plo libmysql/.deps/mf_wcomp.Plo libmysql/.deps/mulalloc.Plo libmysql/.deps/my_alloc.Plo libmysql/.deps/my_chsize.Plo libmysql/.deps/my_compress.Plo libmysql/.deps/my_create.Plo libmysql/.de ps/my_delete.Plo libmysql/.deps/my_div.Plo libmysql/.deps/my_error.Plo libmysql/.deps/my_file.Plo libmysql/.deps/my_fopen.Plo libmysql/.deps/my_fstream.Plo libmysql/.deps/my_gethostbyname.Plo libmysql/.deps/my_getopt.Plo libmysql/.deps/my_getwd.Plo libmysql/.deps/my_init.Plo libmysql/.deps/my_lib.Plo libmysql/.deps/my_malloc.Plo libmysql/.deps/my_messnc.Plo libmysql/.deps/my_net.Plo libmysql/.deps/my_once.Plo libmysql/.deps/my_open.Plo libmysql/.deps/my_port.Plo libmysql/.deps/my_pread.Plo libmysql/.deps/my_pthread.Plo libmysql/.deps/my_read.Plo libmysql/.deps/my_realloc.Plo libmysql/.deps/my_rename.Plo libmysql/.deps/my_seek.Plo libmysql/.deps/my_sleep.Plo libmysql/.deps/my_static.Plo libmysql/.deps/my_strtoll10.Plo libmysql/.deps/my_symlink.Plo libmysql/.deps/my_thr_init.Plo libmysql/.deps/my_time.Plo libmysql/.deps/my_vsnprintf.Plo libmysql/.deps/my_write.Plo libmysql/.deps/net.Plo libmysql/.deps/pack.Plo libmysql/.deps/password.Plo libmysql/.deps/safemalloc.Plo libmysql/.deps/sha1.Plo libmysql/.deps/s tr2int.Plo libmysql/.deps/str_alloc.Plo libmysql/.deps/strcend.Plo libmysql/.deps/strcont.Plo libmysql/.deps/strend.Plo libmysql/.deps/strfill.Plo libmysql/.deps/string.Plo libmysql/.deps/strinstr.Plo libmysql/.deps/strmake.Plo libmysql/.deps/strmov.Plo libmysql/.deps/strnlen.Plo libmysql/.deps/strnmov.Plo libmysql/.deps/strtod.Plo libmysql/.deps/strtoll.Plo libmysql/.deps/strtoull.Plo libmysql/.deps/strxmov.Plo libmysql/.deps/strxnmov.Plo libmysql/.deps/thr_mutex.Plo libmysql/.deps/typelib.Plo libmysql/.deps/vio.Plo libmysql/.deps/viosocket.Plo libmysql/.deps/viossl.Plo libmysql/.deps/viosslfactories.Plo libmysql/.deps/xml.Plo libmysql/.libs/libmysqlclient.lai libmysql/.libs/libmysqlclient.so.15 libmysql/.libs/libmysqlclient.so.15.0.0 libmysql_r/.deps/array.Plo libmysql_r/.deps/bchange.Plo libmysql_r/.deps/bcmp.Plo libmysql_r/.deps/bmove.Plo libmysql_r/.deps/bmove_upp.Plo libmysql_r/.deps/charset-def.Plo libmysql_r/.deps/charset.Plo libmysql_r/.deps/client.Plo libmysql_r/.deps/conf_to_src.Po libmysql_r/. deps/ctype-big5.Plo libmysql_r/.deps/ctype-bin.Plo libmysql_r/.deps/ctype-cp932.Plo libmysql_r/.deps/ctype-czech.Plo libmysql_r/.deps/ctype-euc_kr.Plo libmysql_r/.deps/ctype-eucjpms.Plo libmysql_r/.deps/ctype-extra.Plo libmysql_r/.deps/ctype-gb2312.Plo libmysql_r/.deps/ctype-gbk.Plo libmysql_r/.deps/ctype-latin1.Plo libmysql_r/.deps/ctype-mb.Plo libmysql_r/.deps/ctype-simple.Plo libmysql_r/.deps/ctype-sjis.Plo libmysql_r/.deps/ctype-tis620.Plo libmysql_r/.deps/ctype-uca.Plo libmysql_r/.deps/ctype-ucs2.Plo libmysql_r/.deps/ctype-ujis.Plo libmysql_r/.deps/ctype-utf8.Plo libmysql_r/.deps/ctype-win1250ch.Plo libmysql_r/.deps/ctype.Plo libmysql_r/.deps/dbug.Plo libmysql_r/.deps/default.Plo libmysql_r/.deps/default_modify.Plo libmysql_r/.deps/errmsg.Plo libmysql_r/.deps/errors.Plo libmysql_r/.deps/get_password.Plo libmysql_r/.deps/hash.Plo libmysql_r/.deps/int2str.Plo libmysql_r/.deps/is_prefix.Plo libmysql_r/.deps/libmysql.Plo libmysql_r/.deps/list.Plo libmysql_r/.deps/llstr.Plo libmysql_r/.deps/longlong2str.P lo libmysql_r/.deps/manager.Plo libmysql_r/.deps/md5.Plo libmysql_r/.deps/mf_cache.Plo libmysql_r/.deps/mf_dirname.Plo libmysql_r/.deps/mf_fn_ext.Plo libmysql_r/.deps/mf_format.Plo libmysql_r/.deps/mf_iocache.Plo libmysql_r/.deps/mf_iocache2.Plo libmysql_r/.deps/mf_loadpath.Plo libmysql_r/.deps/mf_pack.Plo libmysql_r/.deps/mf_path.Plo libmysql_r/.deps/mf_tempfile.Plo libmysql_r/.deps/mf_unixpath.Plo libmysql_r/.deps/mf_wcomp.Plo libmysql_r/.deps/mulalloc.Plo libmysql_r/.deps/my_alloc.Plo libmysql_r/.deps/my_chsize.Plo libmysql_r/.deps/my_compress.Plo libmysql_r/.deps/my_create.Plo libmysql_r/.deps/my_delete.Plo libmysql_r/.deps/my_div.Plo libmysql_r/.deps/my_error.Plo libmysql_r/.deps/my_file.Plo libmysql_r/.deps/my_fopen.Plo libmysql_r/.deps/my_fstream.Plo libmysql_r/.deps/my_gethostbyname.Plo libmysql_r/.deps/my_getopt.Plo libmysql_r/.deps/my_getwd.Plo libmysql_r/.deps/my_init.Plo libmysql_r/.deps/my_lib.Plo libmysql_r/.deps/my_malloc.Plo libmysql_r/.deps/my_messnc.Plo libmysql_r/.deps/my_net.Plo libmys ql_r/.deps/my_once.Plo libmysql_r/.deps/my_open.Plo libmysql_r/.deps/my_port.Plo libmysql_r/.deps/my_pread.Plo libmysql_r/.deps/my_pthread.Plo libmysql_r/.deps/my_read.Plo libmysql_r/.deps/my_realloc.Plo libmysql_r/.deps/my_rename.Plo libmysql_r/.deps/my_seek.Plo libmysql_r/.deps/my_sleep.Plo libmysql_r/.deps/my_static.Plo libmysql_r/.deps/my_strtoll10.Plo libmysql_r/.deps/my_symlink.Plo libmysql_r/.deps/my_thr_init.Plo libmysql_r/.deps/my_time.Plo libmysql_r/.deps/my_vsnprintf.Plo libmysql_r/.deps/my_write.Plo libmysql_r/.deps/net.Plo libmysql_r/.deps/pack.Plo libmysql_r/.deps/password.Plo libmysql_r/.deps/safemalloc.Plo libmysql_r/.deps/sha1.Plo libmysql_r/.deps/str2int.Plo libmysql_r/.deps/str_alloc.Plo libmysql_r/.deps/strcend.Plo libmysql_r/.deps/strcont.Plo libmysql_r/.deps/strend.Plo libmysql_r/.deps/strfill.Plo libmysql_r/.deps/string.Plo libmysql_r/.deps/strinstr.Plo libmysql_r/.deps/strmake.Plo libmysql_r/.deps/strmov.Plo libmysql_r/.deps/strnlen.Plo libmysql_r/.deps/strnmov.Plo libmysql_r/.deps /strtod.Plo libmysql_r/.deps/strtoll.Plo libmysql_r/.deps/strtoull.Plo libmysql_r/.deps/strxmov.Plo libmysql_r/.deps/strxnmov.Plo libmysql_r/.deps/thr_mutex.Plo libmysql_r/.deps/typelib.Plo libmysql_r/.deps/vio.Plo libmysql_r/.deps/viosocket.Plo libmysql_r/.deps/viossl.Plo libmysql_r/.deps/viosslfactories.Plo libmysql_r/.deps/xml.Plo libmysql_r/.libs/libmysqlclient_r.lai libmysql_r/.libs/libmysqlclient_r.so.15 libmysql_r/.libs/libmysqlclient_r.so.15.0.0 libmysqld/examples/.deps/completion_hash.Po libmysqld/examples/.deps/mysql.Po libmysqld/examples/.deps/mysql_client_test.Po libmysqld/examples/.deps/mysqltest.Po libmysqld/examples/.deps/readline.Po libmysqld/.deps/client.Po libmysqld/.deps/derror.Po libmysqld/.deps/discover.Po libmysqld/.deps/emb_qcache.Po libmysqld/.deps/errmsg.Po libmysqld/.deps/event_data_objects.Po libmysqld/.deps/event_db_repository.Po libmysqld/.deps/event_queue.Po libmysqld/.deps/event_scheduler.Po libmysqld/.deps/events.Po libmysqld/.deps/field.Po libmysqld/.deps/field_conv.Po lib mysqld/.deps/filesort.Po libmysqld/.deps/get_password.Po libmysqld/.deps/gstream.Po libmysqld/.deps/ha_berkeley.Po libmysqld/.deps/ha_federated.Po libmysqld/.deps/ha_heap.Po libmysqld/.deps/ha_innodb.Po libmysqld/.deps/ha_myisam.Po libmysqld/.deps/ha_myisammrg.Po libmysqld/.deps/ha_ndbcluster.Po libmysqld/.deps/ha_ndbcluster_binlog.Po libmysqld/.deps/ha_partition.Po libmysqld/.deps/handler.Po libmysqld/.deps/hash_filo.Po libmysqld/.deps/hostname.Po libmysqld/.deps/init.Po libmysqld/.deps/item.Po libmysqld/.deps/item_buff.Po libmysqld/.deps/item_cmpfunc.Po libmysqld/.deps/item_create.Po libmysqld/.deps/item_func.Po libmysqld/.deps/item_geofunc.Po libmysqld/.deps/item_row.Po libmysqld/.deps/item_strfunc.Po libmysqld/.deps/item_subselect.Po libmysqld/.deps/item_sum.Po libmysqld/.deps/item_timefunc.Po libmysqld/.deps/item_uniq.Po libmysqld/.deps/item_xmlfunc.Po libmysqld/.deps/key.Po libmysqld/.deps/lib_sql.Po libmysqld/.deps/libmysql.Po libmysqld/.deps/libmysqld.Po libmysqld/.deps/lock.Po libmysqld/.deps/log .Po libmysqld/.deps/log_event.Po libmysqld/.deps/my_decimal.Po libmysqld/.deps/my_time.Po libmysqld/.deps/my_user.Po libmysqld/.deps/net_serv.Po libmysqld/.deps/opt_range.Po libmysqld/.deps/opt_sum.Po libmysqld/.deps/pack.Po libmysqld/.deps/parse_file.Po libmysqld/.deps/partition_info.Po libmysqld/.deps/password.Po libmysqld/.deps/procedure.Po libmysqld/.deps/protocol.Po libmysqld/.deps/records.Po libmysqld/.deps/rpl_filter.Po libmysqld/.deps/rpl_injector.Po libmysqld/.deps/set_var.Po libmysqld/.deps/sp.Po libmysqld/.deps/sp_cache.Po libmysqld/.deps/sp_head.Po libmysqld/.deps/sp_pcontext.Po libmysqld/.deps/sp_rcontext.Po libmysqld/.deps/spatial.Po libmysqld/.deps/sql_acl.Po libmysqld/.deps/sql_analyse.Po libmysqld/.deps/sql_base.Po libmysqld/.deps/sql_builtin.Po libmysqld/.deps/sql_cache.Po libmysqld/.deps/sql_class.Po libmysqld/.deps/sql_crypt.Po libmysqld/.deps/sql_cursor.Po libmysqld/.deps/sql_db.Po libmysqld/.deps/sql_delete.Po libmysqld/.deps/sql_derived.Po libmysqld/.deps/sql_do.Po libmysqld/.deps/s ql_error.Po libmysqld/.deps/sql_handler.Po libmysqld/.deps/sql_help.Po libmysqld/.deps/sql_insert.Po libmysqld/.deps/sql_lex.Po libmysqld/.deps/sql_list.Po libmysqld/.deps/sql_load.Po libmysqld/.deps/sql_manager.Po libmysqld/.deps/sql_map.Po libmysqld/.deps/sql_parse.Po libmysqld/.deps/sql_partition.Po libmysqld/.deps/sql_plugin.Po libmysqld/.deps/sql_prepare.Po libmysqld/.deps/sql_rename.Po libmysqld/.deps/sql_select.Po libmysqld/.deps/sql_show.Po libmysqld/.deps/sql_state.Po libmysqld/.deps/sql_string.Po libmysqld/.deps/sql_table.Po libmysqld/.deps/sql_tablespace.Po libmysqld/.deps/sql_test.Po libmysqld/.deps/sql_trigger.Po libmysqld/.deps/sql_udf.Po libmysqld/.deps/sql_union.Po libmysqld/.deps/sql_update.Po libmysqld/.deps/sql_view.Po libmysqld/.deps/sql_yacc.Po libmysqld/.deps/stacktrace.Po libmysqld/.deps/strfunc.Po libmysqld/.deps/table.Po libmysqld/.deps/thr_malloc.Po libmysqld/.deps/time.Po libmysqld/.deps/tztime.Po libmysqld/.deps/uniques.Po libmysqld/.deps/unireg.Po mysys/.deps/array.Po mysys/.d eps/base64.Po mysys/.deps/charset-def.Po mysys/.deps/charset.Po mysys/.deps/checksum.Po mysys/.deps/default.Po mysys/.deps/default_modify.Po mysys/.deps/errors.Po mysys/.deps/hash.Po mysys/.deps/list.Po mysys/.deps/md5.Po mysys/.deps/mf_brkhant.Po mysys/.deps/mf_cache.Po mysys/.deps/mf_dirname.Po mysys/.deps/mf_fn_ext.Po mysys/.deps/mf_format.Po mysys/.deps/mf_getdate.Po mysys/.deps/mf_iocache.Po mysys/.deps/mf_iocache2.Po mysys/.deps/mf_keycache.Po mysys/.deps/mf_keycaches.Po mysys/.deps/mf_loadpath.Po mysys/.deps/mf_pack.Po mysys/.deps/mf_path.Po mysys/.deps/mf_qsort.Po mysys/.deps/mf_qsort2.Po mysys/.deps/mf_radix.Po mysys/.deps/mf_same.Po mysys/.deps/mf_sort.Po mysys/.deps/mf_strip.Po mysys/.deps/mf_tempdir.Po mysys/.deps/mf_tempfile.Po mysys/.deps/mf_unixpath.Po mysys/.deps/mf_wcomp.Po mysys/.deps/mf_wfile.Po mysys/.deps/mulalloc.Po mysys/.deps/my_access.Po mysys/.deps/my_aes.Po mysys/.deps/my_alarm.Po mysys/.deps/my_alloc.Po mysys/.deps/my_append.Po mysys/.deps/my_atomic.Po mysys/.deps/my_bit.Po mys ys/.deps/my_bitmap.Po mysys/.deps/my_chsize.Po mysys/.deps/my_clock.Po mysys/.deps/my_compress.Po mysys/.deps/my_copy.Po mysys/.deps/my_crc32.Po mysys/.deps/my_create.Po mysys/.deps/my_delete.Po mysys/.deps/my_div.Po mysys/.deps/my_dup.Po mysys/.deps/my_error.Po mysys/.deps/my_file.Po mysys/.deps/my_fopen.Po mysys/.deps/my_fstream.Po mysys/.deps/my_gethostbyname.Po mysys/.deps/my_gethwaddr.Po mysys/.deps/my_getncpus.Po mysys/.deps/my_getopt.Po mysys/.deps/my_getsystime.Po mysys/.deps/my_getwd.Po mysys/.deps/my_handler.Po mysys/.deps/my_init.Po mysys/.deps/my_largepage.Po mysys/.deps/my_lib.Po mysys/.deps/my_libwrap.Po mysys/.deps/my_lock.Po mysys/.deps/my_lockmem.Po mysys/.deps/my_lread.Po mysys/.deps/my_lwrite.Po mysys/.deps/my_malloc.Po mysys/.deps/my_memmem.Po mysys/.deps/my_messnc.Po mysys/.deps/my_mkdir.Po mysys/.deps/my_mmap.Po mysys/.deps/my_net.Po mysys/.deps/my_netware.Po mysys/.deps/my_new.Po mysys/.deps/my_once.Po mysys/.deps/my_open.Po mysys/.deps/my_port.Po mysys/.deps/my_pread.Po mysys/.deps /my_pthread.Po mysys/.deps/my_quick.Po mysys/.deps/my_read.Po mysys/.deps/my_realloc.Po mysys/.deps/my_redel.Po mysys/.deps/my_rename.Po mysys/.deps/my_seek.Po mysys/.deps/my_semaphore.Po mysys/.deps/my_sleep.Po mysys/.deps/my_static.Po mysys/.deps/my_symlink.Po mysys/.deps/my_symlink2.Po mysys/.deps/my_sync.Po mysys/.deps/my_thr_init.Po mysys/.deps/my_vle.Po mysys/.deps/my_windac.Po mysys/.deps/my_write.Po mysys/.deps/ptr_cmp.Po mysys/.deps/queues.Po mysys/.deps/rijndael.Po mysys/.deps/safemalloc.Po mysys/.deps/sha1.Po mysys/.deps/string.Po mysys/.deps/thr_alarm.Po mysys/.deps/thr_lock.Po mysys/.deps/thr_mutex.Po mysys/.deps/thr_rwlock.Po mysys/.deps/tree.Po mysys/.deps/trie.Po mysys/.deps/typelib.Po netware/.deps/libmysqlmain.Po netware/.deps/my_manage.Po netware/.deps/mysql_install_db.Po netware/.deps/mysql_test_run.Po netware/.deps/mysqld_safe.Po plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo plugin/fulltext/.libs/mypluglib.lai plugin/fulltext/.libs/mypluglib.so.0 plugin/fulltext/.libs/myplugli b.so.0.0.0 pstack/.deps/bucomm.Po pstack/.deps/debug.Po pstack/.deps/filemode.Po pstack/.deps/ieee.Po pstack/.deps/linuxthreads.Po pstack/.deps/pstack.Po pstack/.deps/rddbg.Po pstack/.deps/stabs.Po regex/.deps/debug.Po regex/.deps/main.Po regex/.deps/regcomp.Po regex/.deps/regerror.Po regex/.deps/regexec.Po regex/.deps/regfree.Po regex/.deps/reginit.Po regex/.deps/split.Po server-tools/instance-manager/.deps/buffer.Po server-tools/instance-manager/.deps/command.Po server-tools/instance-manager/.deps/commands.Po server-tools/instance-manager/.deps/guardian.Po server-tools/instance-manager/.deps/instance.Po server-tools/instance-manager/.deps/instance_map.Po server-tools/instance-manager/.deps/instance_options.Po server-tools/instance-manager/.deps/liboptions_la-options.Plo server-tools/instance-manager/.deps/liboptions_la-priv.Plo server-tools/instance-manager/.deps/listener.Po server-tools/instance-manager/.deps/log.Po server-tools/instance-manager/.deps/manager.Po server-tools/instance-manager/.deps/mess ages.Po server-tools/instance-manager/.deps/mysql_connection.Po server-tools/instance-manager/.deps/mysqlmanager.Po server-tools/instance-manager/.deps/net_serv.Po server-tools/instance-manager/.deps/parse.Po server-tools/instance-manager/.deps/parse_output.Po server-tools/instance-manager/.deps/protocol.Po server-tools/instance-manager/.deps/thread_registry.Po server-tools/instance-manager/.deps/user_management_commands.Po server-tools/instance-manager/.deps/user_map.Po to the ignore list sql/event_scheduler.cc: Whitespaces and moving around to ease the job of diff sql/event_scheduler.h: init_scheduler() actually does not return anything but 0, then make it void |
||
unknown
|
31caa8c433 |
WL #3337 (Events new architecture)
Final stroke, events should be loaded from disk on server startup. Also check the validity of their bodies if possible during loading. sql/event_data_objects.cc: Remove Event_job_data::free_sp(), move the code to the destructor Change the way we change the security context Steal some code from sql_parse.cc sql/event_data_objects.h: Remove free_sp() Make compile() public, to be used when booting for verifying the integrity of mysql.event sql/event_queue.cc: Make the queue load events from disk on server boot. Compile and thus check for integrity the events. sql/event_queue.h: shift methods around. add queue_loaded boolean. sql/event_scheduler.cc: Rename init_event_thread() to pre_init_event_thread() and make it more generic. Add post_init_event_thread() Export these two as well as deinit_event_thread(). Now it is quite easy to write code to spawn a new event thread whenever needed. sql/event_scheduler.h: export pre_init_event_thread(), post_init_event_thread() and deinit_event_thread() to simplify writing of thread functions. sql/events.cc: Events::init() returns only one error code, then make it bool sql/events.h: Events::init() returns only one error code, then make it bool sql/mysqld.cc: Check the return code of Events::init() sql/sp_head.cc: Add trace info sql/sql_class.cc: Reorganize thd::change_security_context() to load main_security_ctx sql/sql_class.h: Reorganize thd::change_security_context() to load main_security_ctx sql/sql_lex.cc: Initialize lex->spname sql/sql_yacc.yy: Add a comment |