diff options
| author | unknown <lars@mysql.com> | 2005-02-22 14:12:23 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-02-22 14:12:23 +0100 |
| commit | 2131efb1f0e89035561c5803973abb70f7be0e63 (patch) | |
| tree | 4adac95655abe8bdbba12a688a4a598a1012543f /sql | |
| parent | 29b4d186cbe5f4558016ba43b7aaebbc7aa7dd60 (diff) | |
| parent | 361d8fe55f3b78490ff3b8b1f85e434513b910fb (diff) | |
| download | mariadb-git-2131efb1f0e89035561c5803973abb70f7be0e63.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1
sql/log_event.cc:
Auto merged
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 fabc6718826..d1af78dd751 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. |