diff options
| author | unknown <petr@mysql.com> | 2006-06-07 23:58:08 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2006-06-07 23:58:08 +0400 |
| commit | 27e10733054ca854b24668a2a2aab2f8d183ec40 (patch) | |
| tree | 64d2dd04074c8827a7cbea7098f16b0bd1e17c69 /sql/rpl_rli.h | |
| parent | b23b410584be6d4766ac76b274c310798c571e66 (diff) | |
| parent | b092d16c882aceb3c6f931ccdb00f29296cfbf98 (diff) | |
| download | mariadb-git-27e10733054ca854b24668a2a2aab2f8d183ec40.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/devel/5.1-logs-final
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 99606353080..392f12c2a71 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -69,7 +69,7 @@ typedef struct st_relay_log_info Protected with internal locks. Must get data_lock when resetting the logs. */ - MYSQL_LOG relay_log; + MYSQL_BIN_LOG relay_log; LOG_INFO linfo; IO_CACHE cache_buf,*cur_log; |