- 27 Jun, 2006 5 commits
-
-
unknown authored
5th cut, moved DB related code to Event_db_repository and updated accordingly the remanining code. Moved change/restore_security_context() to class THD Removed events_priv.h Next step is to reorganize create/update_event() and parsing for them. But probably some other refactoring could be done in the meanwhile. The changes so far pass the test suite. BitKeeper/deleted/.del-events_priv.h~2e8bce2cf35997df: Delete: sql/events_priv.h sql/Makefile.am: events_priv.h is no more sql/event_data_objects.cc: reorganize events code sql/event_data_objects.h: reorganize events code sql/event_db_repository.cc: reorganize events code sql/event_db_repository.h: reorganize events code sql/event_scheduler.cc: reorganize events code sql/event_scheduler.h: reorganize events code sql/events.cc: reorganize events code sql/events.h: reorganize events code sql/mysqld.cc: reorganize events code sql/set_var.cc: reorganize events code sql/sql_class.cc: add ::change_security_context() and restore_security_context() sql/sql_class.h: add ::change_security_context() and restore_security_context() sql/sql_db.cc: reorganize Events code sql/sql_parse.cc: reorganize Events code sql/sql_show.cc: reorganize Events code
-
unknown authored
the parsing. Next step will be to refactor of usage of Event_timed during Events::create_event() and Events::update_event(). Disallow: - CREATE EVENT ... DO CREATE EVENT ...; - ALTER EVENT ... DO CREATE EVENT ...; - CREATE EVENT ... DO ALTER EVENT DO ....; - CREATE PROCEDURE ... BEGIN CREATE EVENT ... END| Allowed: - CREATE EVENT ... DO DROP EVENT yyy; - CREATE EVENT ... DO ALTER EVENT yyy; (the nested ALTER EVENT can have anything but DO clause) - ALTER EVENT ... DO ALTER EVENT yyy; (the nested ALTER EVENT can have anything but DO clause) - ALTER EVENT ... DO DROP EVENT yyy; - CREATE PROCEDURE ... BEGIN ALTER EVENT ... END| (the nested ALTER EVENT can have anything but DO clause) - CREATE PROCEDURE ... BEGIN DROP EVENT ... END| mysql-test/r/events.result: update results mysql-test/r/events_bugs.result: update results mysql-test/t/events.test: use number as error, mysql-test-run does not like the name. will come back to this later, now it's enough to pass the test. disable nested events / events in SP, when the nested event has a body. If no body is provided, namely DROP EVENT or ALTER that changes the characteristics, then these are allowed. mysql-test/t/events_bugs.test: use number as error, mysql-test-run does not like the name. will come back to this later, now it's enough to pass the test. disable nested events / events in SP, when the nested event has a body. If no body is provided, namely DROP EVENT or ALTER that changes the characteristics, then these are allowed. sql/share/errmsg.txt: new message sql/sql_yacc.yy: refactor CREATE EVENT parsing to fit into the structure CREATE DEFINER=xxx EVENT The actual definer part is not used, but parsed, for now. Disable nested CREATE EVENTS, CREATE EVENT inside CREATE PROCEDURE. And an event DDL with body inside an ALTER. This stops the following : - CREATE EVENT ... DO CREATE EVENT ...; - ALTER EVENT ... DO CREATE EVENT ...; - CREATE EVENT ... DO ALTER EVENT DO ....; - CREATE PROCEDURE ... BEGIN CREATE EVENT ... END| This allows: - CREATE EVENT ... DO DROP EVENT yyy; - CREATE EVENT ... DO ALTER EVENT yyy; (the nested ALTER EVENT can have anything but DO clause) - ALTER EVENT ... DO ALTER EVENT yyy; (the nested ALTER EVENT can have anything but DO clause) - ALTER EVENT ... DO DROP EVENT yyy; - CREATE PROCEDURE ... BEGIN ALTER EVENT ... END| (the nested ALTER EVENT can have anything but DO clause) - CREATE PROCEDURE ... BEGIN DROP EVENT ... END|
-
unknown authored
Third cut to simplify parsing phase. Now DROP EVENT works. Overloaded few functions to be able to use either sp_name or pass two LEX_STRINGs instead of a Event_timed pointer. This is transitional and eventually the old functions will be removed. For now DROP EVENT also works, does not need anymore a parsing object (Event_timed) and definer initialization because everyone who has EVENT_ACL can drop events, and this is checked on execution time in sql_parse.cc from the security context, as it should be. sql/event_data_objects.cc: overload few functions sql/event_scheduler.cc: Event_scheduler::drop_event() actually does not need Event_timed object but just an identifier, hence pass only sp_name. Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually the old version will be removed. This is being done as transitional step to be able to test frequently code. sql/event_scheduler.h: Event_scheduler::drop_event() actually does not need Event_timed object but just an identifier, hence pass only sp_name. Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually the old version will be removed. This is being done as transitional step to be able to test frequently code. sql/events.cc: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/events.h: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/events_priv.h: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/sql_parse.cc: SQLCOM_DROP_EVENT does not need lex->event_parse_data object and is more like SQLCOM_SHOW_CREATE_EVENT. Therefore, move it to the block that handles the latter. sql/sql_yacc.yy: DROP EVENT does not need a parsing object, just a name. Store it as lex->spname. Pretty similar handling to the one of SHOW CREATE EVENT.
-
unknown authored
Second cut of separating parsing phase from execution phase Separate Event_timed from parsing phase and introducing Event_parse_data. sql/event_data_objects.cc: second cut, copy Event_timed::init_body() to Event_parse_data::init_body() Init the body during parsing, everything else keep as a pointer to Item or some other pointer to use for later initialization. sql/event_data_objects.h: get the identifier as sp_name*, later will initialize our structures sql/events.cc: for easy transition add temporarily parse_data, later Event_timed *et will be removed. Do slow transition because Event_timed is so tightly integrated that a front-attack by removing things from this class was unsuccessful. Do things step by step by eliminating dependencies. Hence, the code could be checked with the current test suite too (early testing) sql/events.h: for easy transition add temporarily parse_data, later Event_timed *et will be removed. Do slow transition because Event_timed is so tightly integrated that a front-attack by removing things from this class was unsuccessful. Do things step by step by eliminating dependencies. Hence, the code could be checked with the current test suite too (early testing) BitKeeper/etc/ignore: Added libmysql/viosocket.o.6WmSJk libmysqld/event_data_objects.cc libmysqld/event_db_repository.cc libmysqld/event_queue.cc server-tools/instance-manager/net_serv.cc to the ignore list sql/share/errmsg.txt: remove this message, not used and needed for now sql/sql_lex.h: for easy transition add temporarily parse_data, later Event_timed *et will be removed. Do slow transition because Event_timed is so tightly integrated that a front-attack by removing things from this class was unsuccessful. Do things step by step by eliminating dependencies. Hence, the code could be checked with the current test suite too (early testing) sql/sql_parse.cc: for easy transition add temporarily parse_data, later Event_timed *et will be removed. Do slow transition because Event_timed is so tightly integrated that a front-attack by removing things from this class was unsuccessful. Do things step by step by eliminating dependencies. Hence, the code could be checked with the current test suite too (early testing) sql/sql_yacc.yy: for easy transition add temporarily parse_data, later Event_timed *et will be removed. Do slow transition because Event_timed is so tightly integrated that a front-attack by removing things from this class was unsuccessful. Do things step by step by eliminating dependencies. Hence, the code could be checked with the current test suite too (early testing)
-
unknown authored
Infrastructure built. Added the foreseen files and change Makefile.am/CMakeLists.txt accordingly. libmysqld/Makefile.am: add new files. this is first cut of WL3337u sql/CMakeLists.txt: add more files to build sql/Makefile.am: add new files. this is first cut of WL3337 sql/event_scheduler.cc: event_timed.h -> event_data_objects.h (WL#3337) sql/events.cc: event_timed.h -> event_data_objects.h (WL#3337) sql/share/errmsg.txt: new error message sql/event_data_objects.cc: event_timed.h -> event_data_objects.h (WL#3337) sql/event_data_objects.h: event_timed.h -> event_data_objects.h (WL#3337) sql/sql_parse.cc: event_timed.h -> event_data_objects.h (WL#3337) sql/sql_show.cc: event_timed.h -> event_data_objects.h (WL#3337) sql/sql_yacc.yy: event_timed.h -> event_data_objects.h (WL#3337)
-
- 26 Jun, 2006 2 commits
-
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime-bug16992 mysql-test/t/events.test: Auto merged mysql-test/t/events_grant.test: Auto merged sql/sql_show.cc: Auto merged
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime-bug18897 mysql-test/t/events_bugs.test: Auto merged sql/sql_parse.cc: Auto merged
-
- 23 Jun, 2006 5 commits
-
-
unknown authored
alter event rename". ALTER EVENT ... RENAME statement hasn't checked privileges for the target database. It also caused server crashes when target database was not specified explicitly and there was no current database. This fix adds missing privilege check and check for the case when target database is not specified explicitly or implicitly. mysql-test/r/events_bugs.result: update result mysql-test/t/events_bugs.test: add test case for bug 18897 Events: unauthorized action possible with alter event rename: - test rename to db the user does not have access to - test rename when there is no selected db sql/sql_parse.cc: Additional check for the situation when no db is selected. CREATE EVENT abc and ALTER EVENT db.abc RENAME TO xyz, and DROP EVENT abc won't work if there is no selected DB.
-
unknown authored
into mysql.com:/home/cps/mysql/devel/5.1-curs-bug
-
unknown authored
BitKeeper/deleted/.del-sql_state.c~3b39d30b649690f3: Delete: server-tools/instance-manager/sql_state.c BitKeeper/deleted/.del-password.c~9d4b6a4c57887ac7: Delete: server-tools/instance-manager/password.c BitKeeper/deleted/.del-pack.c~4754cd15e3058c75: Delete: server-tools/instance-manager/pack.c BitKeeper/deleted/.del-net_serv.cc~120fb81d7e670308: Delete: server-tools/instance-manager/net_serv.cc
-
unknown authored
into lmy004.:/work/mysql-5.1-runtime-bug20624
-
unknown authored
(fix for bug#20290 Event mechanism incompatible with embedded server, but tests tried) mysql-test/t/events.test: disable test in embedded mysql-test/t/events_bugs.test: disable test in embedded mysql-test/t/events_grant.test: disable test in embedded mysql-test/t/events_logs_tests.test: disable test in embedded mysql-test/t/events_microsec.test: disable test in embedded mysql-test/t/events_scheduling.test: disable test in embedded mysql-test/t/events_stress.test: disable test in embedded
-
- 22 Jun, 2006 8 commits
-
-
unknown authored
into mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294 mysql-test/t/disabled.def: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
-
unknown authored
into mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
-
unknown authored
im_instance_conf fails randomly. mysql-test/r/im_options.result: Updated result file. mysql-test/t/im_instance_conf.imtest: Added a note about specific of CREATE INSTANCE usage in IM-tests. mysql-test/t/im_options.imtest: 1. Specify socket-file-name for new instance so that the test does not depend on another running test-suite on the same box. 2. Added a note about specific of CREATE INSTANCE usage in IM-tests.
-
unknown authored
(this is a change to a faulty test file) mysql-test/r/events_logs_tests.result: update result mysql-test/t/events_logs_tests.test: fix the test file, so TRUNCATE should not land into the slow_log This happens on loaded machines, for example when running few suites in parallel. fix for bug #20624: events_logs_tests.test fails randomly
-
unknown authored
into mysql.com:/home/bk/fix-mysql-5.1 sql/sql_insert.cc: Auto merged
-
unknown authored
sql/handler.cc: Generating table maps from all locks that can be available: THD::extra_lock, THD::lock, and THD::locked_tables. sql/sql_class.h: Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create. Removing select_insert::lock. sql/sql_insert.cc: Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create. Removing select_insert::lock.
-
unknown authored
Introduced EVENTS.EVENT_DEFINITION, like ROUTINES.ROUTINE_DEFINITION Hence, the contents of the current EVENTS.EVENT_BODY become the contents of EVENT_DEFINITION. EVENT_BODY will contain always, for now, "SQL" (wo quotes). mysql-test/r/events.result: update result event_body -> event_definition event_body -> SQL mysql-test/r/events_grant.result: update result event_body -> event_definition event_body -> SQL mysql-test/r/information_schema.result: update result event_body -> event_definition mysql-test/t/events.test: update result event_body -> event_definition event_body -> SQL mysql-test/t/events_grant.test: update result event_body -> event_definition event_body -> SQL sql/sql_show.cc: Introduce enum_i_s_events_fields, because I hate recounting all the time a field is changed. Rename EVENT_BODY to EVENT_DEFINITION Introduce EVENT_BODY after that to be "SQL" (final fix for bug#16992 Events: Information schema troubles ) ?
-
unknown authored
storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged support-files/mysql.server.sh: Auto merged support-files/mysql.spec.sh: Auto merged
-
- 21 Jun, 2006 20 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/partition_error.result: Auto merged sql/mysql_priv.h: Auto merged mysql-test/r/partition.result: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/show_check.result: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_delete.cc: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
-
unknown authored
storage/ndb/test/run-test/daily-devel-tests.txt: test_event_merge
-
unknown authored
Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/mysql_priv.h: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_insert.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_parse.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_table.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure
-
unknown authored
storage/ndb/test/ndbapi/test_event_merge.cpp: test multiple tables and getGCIEventOperations storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: fix getGCIEventOperations when merge events is on storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: fix getGCIEventOperations when merge events is on
-
unknown authored
into mysql.com:/usr/home/ram/work/mysql-5.1
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
-
unknown authored
-
unknown authored
mysql-test/extra/rpl_tests/rpl_log.test: Fix for bug #20601: rpl_ndb_log.test failure - replace insignificant columns to make tests repeatable mysql-test/r/rpl_ndb_log.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted mysql-test/r/rpl_row_log.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted mysql-test/r/rpl_row_log_innodb.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted
-
unknown authored
into mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294 sql/mysqld.cc: Auto merged mysql-test/t/disabled.def: Manually merged.
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/r/sql_mode.result: Auto merged mysql-test/t/sql_mode.test: Auto merged sql/ha_ndbcluster.cc: Auto merged client/mysqldump.c: Manual merge mysql-test/r/mysqldump.result: Manual merge mysql-test/t/mysqldump.test: Manual merge
-
unknown authored
fails randomly. The problem is that the test was affected by other running test-suites on the same box. The fix affects the test only, no code touched. mysql-test/r/im_instance_conf.result: Updated result file. mysql-test/t/disabled.def: Enable IM tests. mysql-test/t/im_instance_conf.imtest: Modify the test so that it does not depend on running test-suites on the same box.
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/t/disabled.def: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
-