diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-12-15 06:21:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-12-15 06:21:15 +0200 |
| commit | af583b828303e5ad7a285b54d60fb1b3669ee2a9 (patch) | |
| tree | eadc127bca394c93278bb5da69b78bb61c008951 /sql/slave.cc | |
| parent | 2bcbffa0c50f5a09152d1b7b4de7a65abc9283b6 (diff) | |
| download | mariadb-git-af583b828303e5ad7a285b54d60fb1b3669ee2a9.tar.gz | |
After merge fixes:
- Remove compiler warnings
- Fix merge errors
- Indentation fixes
sql/ha_ndbcluster.cc:
After merge fixes
sql/slave.cc:
After merge fixes
sql/sp.cc:
After merge fixes
sql/sql_table.cc:
After merge fixes
sql/sql_view.cc:
After merge fixes
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index e1b1e62bf1c..100e5795da8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4393,6 +4393,8 @@ int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len) pthread_mutex_t *log_lock= rli->relay_log.get_log_lock(); DBUG_ENTER("queue_event"); + LINT_INIT(inc_pos); + if (mi->rli.relay_log.description_event_for_queue->binlog_version<4 && buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT /* a way to escape */) DBUG_RETURN(queue_old_event(mi,buf,event_len)); @@ -4533,7 +4535,7 @@ int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len) err: pthread_mutex_unlock(&mi->data_lock); - DBUG_PRINT("info", ("error=%d", error)); + DBUG_PRINT("info", ("error: %d", error)); DBUG_RETURN(error); } |