diff options
| author | unknown <monty@mysql.com> | 2006-06-05 06:16:08 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-05 06:16:08 +0300 |
| commit | 6c3babe52c28d28a92d242307e13723500dce969 (patch) | |
| tree | 4be36749abc142ae1362b83f9053e569a7a98099 /sql/event_scheduler.cc | |
| parent | 555eb848f2aa3ac5eb09b251072930eb38cd8f7e (diff) | |
| download | mariadb-git-6c3babe52c28d28a92d242307e13723500dce969.tar.gz | |
After merge fixes
Remove compiler warnings
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Fixed regex to get rid of xid= in output
mysql-test/r/mysqlcheck.result:
Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqlcheck.test:
Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqldump.test:
Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files
sql/event_scheduler.cc:
Remove compiler warnings
sql/ha_partition.cc:
Don't divide with 0 when checking current auto_increment value
sql/handler.cc:
After merge fix
sql/mysqld.cc:
Remove comiler warning
sql/partition_info.cc:
After merge fix
Fixed memory reference overrun for some wrong partition definitions
sql/sql_base.cc:
After merge fix
Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
sql/sql_select.cc:
Simple optimization
sql/sql_show.cc:
Remove compiler warning
sql/sql_table.cc:
After merge fix
storage/csv/ha_tina.cc:
Ensure table maps are restored properly
storage/ndb/include/ndbapi/Ndb.hpp:
Remove compiler warning
Diffstat (limited to 'sql/event_scheduler.cc')
| -rw-r--r-- | sql/event_scheduler.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index e360254fdd2..db855e9135b 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -873,13 +873,19 @@ Event_scheduler::drop_event(THD *thd, Event_timed *et) */ enum Event_scheduler::enum_error_code -Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema, +Event_scheduler::replace_event(THD *thd, Event_timed *et, + LEX_STRING *new_schema, LEX_STRING *new_name) { enum enum_error_code res; Event_timed *et_old, *et_new= NULL; LEX_STRING old_schema, old_name; + LINT_INIT(old_schema.str); + LINT_INIT(old_schema.length); + LINT_INIT(old_name.str); + LINT_INIT(old_name.length); + DBUG_ENTER("Event_scheduler::replace_event"); DBUG_PRINT("enter", ("thd=%p et=%p et=[%s.%s] lock=%p", thd, et, et->dbname.str, et->name.str, &LOCK_scheduler_data)); |