mariadb

Tree: 57dc12563f

Author	SHA1	Message	Date
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.	19 years ago
unknown	8ed9a54008	Update the result file with an updated comment.	19 years ago
unknown	c4311efa06	Merge bodhi.local:/opt/local/work/mysql-5.0-runtime into bodhi.local:/opt/local/work/mysql-5.1-runtime	19 years ago
unknown	20fd65ff83	Try to fix events_logs_tests race on Windows. mysql-test/t/events_logs_tests.test: Try to fix a race condition that breaks this test on Windows.	19 years ago
unknown	817442e873	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into bodhi.local:/opt/local/work/mysql-5.1-runtime	19 years ago
unknown	54a0f623c7	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.local:/opt/local/work/mysql-5.0-runtime	19 years ago
unknown	858ff63811	Fix warnings on Windows. sql/event_data_objects.cc: Fix Windows 64 bit build warnings. No better fix exists at the moment.	19 years ago
unknown	33a51fd843	Fix a broken merge. scripts/mysql_system_tables.sql: Add time_zone to the list of mysql.event columns. scripts/mysql_system_tables_fix.sql: Update after a bad merge: now mysql_system_tables_fix contains only alter definitions, no CREATE definitions (single definition source approach that was implemented by Magnus).	19 years ago
unknown	c242662096	Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt sql/sql_insert.cc: Auto merged	19 years ago
unknown	c71bff6d1c	sql_insert.cc: After merge fix. sql/sql_insert.cc: After merge fix.	19 years ago
unknown	ca16e7038c	Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_insert.cc: Manually merged.	19 years ago
unknown	3798a7d500	sql_insert.cc: Removed wrong fix for the bug#27006. The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21. trigger.test, trigger.result: Corrected test case for the bug#27006. sql/sql_insert.cc: Removed wrong fix for the bug#27006. The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21. mysql-test/t/trigger.test: Corrected test case for the bug#27006. mysql-test/r/trigger.result: Corrected test case for the bug#27006.	19 years ago
unknown	f81e917aca	Merge bodhi.local:/opt/local/work/mysql-5.0-runtime into bodhi.local:/opt/local/work/mysql-5.1-runtime mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.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	19 years ago
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.	19 years ago
unknown	14ab9bef52	Merge bk-internal.mysql.com:/home/bk/mysql-5.0 into bodhi.local:/opt/local/work/mysql-5.0-runtime sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.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 mysql-test/r/sp.result: SCCS merged mysql-test/t/sp.test: SCCS merged	19 years ago
unknown	6bb4208084	dbug/dbug.c: unused variable removed include/config-win.h: SIZEOF_INT include/my_global.h: win64 fix support-files/Makefile.am: automake magic dbug/dbug.c: unused variable removed include/config-win.h: SIZEOF_INT include/my_global.h: win64 fix support-files/Makefile.am: automake magic	19 years ago
unknown	9128a807d8	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/sql_insert.cc: Auto merged	19 years ago
unknown	7d383909db	wl#3700 - post-review fixes: s/ulonglong/key_part_map/, comments include/heap.h: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ include/my_base.h: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ include/myisam.h: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ include/myisammrg.h: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ sql/event_db_repository.cc: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ sql/ha_partition.cc: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ sql/ha_partition.h: wl#3700 - post-review fixes: s/ulonglong/key_part_map/ sql/sql_select.h: wl#3700 - post-review fixes: remove tab_to_keypart_map()	19 years ago
unknown	84d24679b9	sql_insert.cc: Post-merge fix. sql/sql_insert.cc: Post-merge fix.	19 years ago
unknown	929b7b1b5f	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged	19 years ago
unknown	f5ca94684a	Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_insert.cc: Manually merged	19 years ago
unknown	a263017494	remove unnecessary line	19 years ago
unknown	68f09e7792	merging	19 years ago
unknown	793c30612a	Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt into mysql.com:/home/hf/work/mrg/mysql-5.1-opt mysql-test/r/insert_update.result: Auto merged mysql-test/t/insert_update.test: Auto merged mysql-test/t/skip_grants.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_insert.cc: merging	19 years ago
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.	19 years ago
unknown	354e15f068	Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1 into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-wl3698	19 years ago
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	19 years ago
unknown	6d93f15039	Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY UPDATE if the row wasn't actually changed. This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers not firing if a row wasn't actually changed by the update part of the INSERT .. ON DUPLICATE KEY UPDATE. Now triggers are always fired if a row is touched by the INSERT ... ON DUPLICATE KEY UPDATE. sql/sql_insert.cc: Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY UPDATE if the row wasn't actually changed. Now triggers are always fired if a row is touched by the INSERT ... ON DUPLICATE KEY UPDATE. mysql-test/r/trigger.result: Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY UPDATE if the row wasn't actually changed. mysql-test/t/trigger.test: Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY UPDATE if the row wasn't actually changed.	19 years ago
unknown	c259b5765c	Merge kpdesk.mysql.com:/home/thek/dev/bug26807/my51-bug26807 into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-runtime sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged	19 years ago
unknown	2b2fb67460	Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server - Crash occured because Event engine is only initialized if ACLs are used but not properly marked as disabled. - The patch is to mark the Event engine as DISABLED if no ACLs are used to avoid access of uninitialized variables. mysql-test/r/skip_grants.result: Added test case mysql-test/t/skip_grants.test: Added test case	19 years ago
unknown	8b11016034	Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into janus.mylan:/usr/home/serg/Abk/mysql-5.1 include/my_global.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item_subselect.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_servers.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/tztime.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged	19 years ago
unknown	43b9ff1b21	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B26261-5.0-opt sql/mysql_priv.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_prepare.cc: Auto merged mysql-test/r/insert_update.result: SCCS merged mysql-test/t/insert_update.test: SCCS merged	19 years ago
unknown	2e8e78a42c	Bug #26261 : INSERT uses query_id to verify what fields are mentioned in the fields list of the INSERT command. However the check for that is made after the ON DUPLICATE KEY is processed. This causes all the fields mentioned in ON DUPLICATE KEY to be considered as mentioned in the fields list of INSERT. Moved the check up, right after processing the fields list. mysql-test/r/insert_update.result: Bug #26261: test case mysql-test/t/insert_update.test: Bug #26261: test case sql/mysql_priv.h: Bug #26261: moved the check inside mysql_prepare_insert sql/sql_insert.cc: Bug #26261: move the check inside mysql_prepare_insert before setting up the ON DUPLICATE KEY part sql/sql_prepare.cc: Bug #26261: moved the check inside mysql_prepare_insert	19 years ago
unknown	1a259b885f	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	19 years ago
unknown	a51b768600	Bug#26285 selecting information_schema crahes server The crash happens when 'skip-grant-tables' is enabled. We skip the filling of I_S privilege tables if acl_cache is not initialized. mysql-test/r/skip_grants.result: test result mysql-test/t/skip_grants.test: test case sql/sql_acl.cc: skip filling of I_S privilege tables if acl_cache is not initialized	19 years ago
unknown	0270e811d0	Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt into mysql.com:/home/hf/work/mrg/mysql-5.1-opt	19 years ago
unknown	6b428e8507	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/mrg/mysql-5.0-opt	19 years ago
unknown	68197e5371	Merge bk@192.168.21.1:mysql-5.1-opt into mysql.com:/home/hf/work/mrg/mysql-5.1-opt	19 years ago
unknown	eac4c7eeef	Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt into mysql.com:/home/hf/work/mrg/mysql-5.1-opt sql/sql_parse.cc: Auto merged	19 years ago
unknown	173dc70d3f	Merge bk@192.168.21.1:mysql-5.0 into mysql.com:/home/hf/work/mrg/mysql-5.0-opt sql/sql_parse.cc: Auto merged	19 years ago
unknown	cf2842b56d	Merge bk@192.168.21.1:mysql-5.1 into mysql.com:/home/hf/work/mrg/mysql-5.1-opt sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged	19 years ago
unknown	917cec7195	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M51/mysql-5.1 configure.in: Null-merge, a 5.00 version change does not affect 5.1	19 years ago
unknown	8ec3caa9b1	Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines into mysql.com:/home/svoj/devel/bk/mysql-5.1-engines	19 years ago
unknown	0d31e0f3cf	Raise version number after cloning 5.0.38	19 years ago
unknown	19ab799da5	Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/bk/mysql-5.0-engines	19 years ago
unknown	496f421a69	Merge moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql mysql-test/r/insert_update.result: Auto merged mysql-test/t/insert_update.test: Auto merged sql/sql_class.h: Manual merge sql/sql_insert.cc: Manual merge	19 years ago
unknown	c6ab94bdf1	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql	19 years ago
unknown	542f18a31a	Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were touched but not actually changed. The LAST_INSERT_ID() is reset to 0 if no rows were inserted or changed. This is the case when an INSERT ... ON DUPLICATE KEY UPDATE updates a row with the same values as the row contains. Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows successfully inserted or touched. The new 'touched' field is added to the COPY_INFO structure. It holds the number of rows that were touched no matter whether they were actually changed or not. sql/sql_class.h: Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were touched but not actually changed. The new 'touched' field is added to the COPY_INFO structure. It holds the number of rows that were touched no matter whether they were actually changed or not. mysql-test/r/insert_update.result: Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were touched but not actually changed. mysql-test/t/insert_update.test: Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were touched but not actually changed. sql/sql_insert.cc: Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were touched but not actually changed. Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows successfully inserted or touched.	19 years ago
unknown	44137aa359	Bug#26765 "typo when running mysql-test-run" Fix a typo (togheter -> together) mysql-test/mysql-test-run.pl: Fix a typo (togheter -> together) storage/ndb/test/include/NDBT_Error.hpp: Fix a typo (togheter -> together) storage/ndb/test/include/NDBT_ReturnCodes.h: Fix a typo (togheter -> together)	19 years ago
unknown	b42da2dd01	merging	19 years ago

1 2 3 4 5 ...

44098 Commits (57dc12563f099c7802ea8eaeb0c52ac4082de67a) All Branches Search

44098 Commits (57dc12563f099c7802ea8eaeb0c52ac4082de67a)

All Branches