diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-25 10:55:05 +0800 |
| commit | dad4291b781495cfdc8abac9dc2902621bfb3b56 (patch) | |
| tree | 79b80f370265c5019547a5ef30b218665a358d84 /sql/events.cc | |
| parent | 3cae7d1187795a8089b6f54ac60cf2a0e579cf89 (diff) | |
| parent | 2b16517522afad76bc94b07bdaa8af64091e713b (diff) | |
| download | mariadb-git-dad4291b781495cfdc8abac9dc2902621bfb3b56.tar.gz | |
Manual merge with Conflicts:
sql_udf.cc
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/events.cc b/sql/events.cc index c3a57578f2b..4c6dd0f35d1 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -479,7 +479,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, } /* If the definer is not set or set to CURRENT_USER, the value of CURRENT_USER will be written into the binary log as the definer for the SQL thread. */ - write_bin_log(thd, TRUE, log_query.c_ptr(), log_query.length()); + ret= write_bin_log(thd, TRUE, log_query.c_ptr(), log_query.length()); } } pthread_mutex_unlock(&LOCK_event_metadata); @@ -604,7 +604,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, new_element); /* Binlog the alter event. */ DBUG_ASSERT(thd->query() && thd->query_length()); - write_bin_log(thd, TRUE, thd->query(), thd->query_length()); + ret= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); } } pthread_mutex_unlock(&LOCK_event_metadata); @@ -682,7 +682,7 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) event_queue->drop_event(thd, dbname, name); /* Binlog the drop event. */ DBUG_ASSERT(thd->query() && thd->query_length()); - write_bin_log(thd, TRUE, thd->query(), thd->query_length()); + ret= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); } pthread_mutex_unlock(&LOCK_event_metadata); /* Restore the state of binlog format */ @@ -882,8 +882,7 @@ Events::fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */) if (thd->lex->sql_command == SQLCOM_SHOW_EVENTS) { DBUG_ASSERT(thd->lex->select_lex.db); - if (!is_schema_db(thd->lex->select_lex.db, // There is no events in I_S - strlen(thd->lex->select_lex.db)) && + if (!is_schema_db(thd->lex->select_lex.db) && // There is no events in I_S check_access(thd, EVENT_ACL, thd->lex->select_lex.db, 0, 0, 0, 0)) DBUG_RETURN(1); db= thd->lex->select_lex.db; |