diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
| commit | cd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch) | |
| tree | bf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/events.cc | |
| parent | 16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff) | |
| parent | b30c1886dc52153009c2ea67878a9763448f461e (diff) | |
| download | mariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/events.cc b/sql/events.cc index af36ede39ec..f7ff2b0ccf1 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -465,7 +465,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, if (!dropped) { /* Binlog the create event. */ - DBUG_ASSERT(thd->query && thd->query_length); + DBUG_ASSERT(thd->query() && thd->query_length()); String log_query; if (create_query_string(thd, &log_query)) { @@ -595,8 +595,8 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, event_queue->update_event(thd, parse_data->dbname, parse_data->name, new_element); /* Binlog the alter event. */ - DBUG_ASSERT(thd->query && thd->query_length); - write_bin_log(thd, TRUE, thd->query, thd->query_length); + DBUG_ASSERT(thd->query() && thd->query_length()); + write_bin_log(thd, TRUE, thd->query(), thd->query_length()); } } pthread_mutex_unlock(&LOCK_event_metadata); @@ -670,8 +670,8 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) if (event_queue) 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); + DBUG_ASSERT(thd->query() && thd->query_length()); + write_bin_log(thd, TRUE, thd->query(), thd->query_length()); } pthread_mutex_unlock(&LOCK_event_metadata); DBUG_RETURN(ret); |