diff options
| author | lars@mysql.com <> | 2005-02-17 00:28:04 +0100 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-02-17 00:28:04 +0100 |
| commit | 8663d777754923c0a2316229efdb70d042e640b7 (patch) | |
| tree | 27dda50b9f272c5a12dfabb176dadaec38903539 /sql | |
| parent | 3261bf189ac2667697b58a101e2940fe01e90695 (diff) | |
| download | mariadb-git-8663d777754923c0a2316229efdb70d042e640b7.tar.gz | |
BUG#8297: If query is filtered on slave, do not put it in general log.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 19113a3b97e..37072d7845b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1016,7 +1016,6 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) VOID(pthread_mutex_unlock(&LOCK_thread_count)); thd->variables.pseudo_thread_id= thread_id; // for temp tables - mysql_log.write(thd,COM_QUERY,"%s",thd->query); DBUG_PRINT("query",("%s",thd->query)); if (ignored_error_code((expected_error= error_code)) || !check_expected_error(thd,rli,expected_error)) @@ -1046,6 +1045,10 @@ START SLAVE; . Query: '%s'", expected_error, thd->query); goto end; } + /* If the query was not ignored, it is printed to the general log */ + if (thd->net.last_errno != ER_SLAVE_IGNORED_TABLE) + mysql_log.write(thd,COM_QUERY,"%s",thd->query); + /* If we expected a non-zero error code, and we don't get the same error code, and none of them should be ignored. |