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/ha_ndbcluster_binlog.cc | |
| 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/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 144c073d565..c8c34a6ba71 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -436,7 +436,7 @@ static void ndbcluster_binlog_wait(THD *thd) } /* - Called from MYSQL_LOG::reset_logs in log.cc when binlog is emptied + Called from MYSQL_BIN_LOG::reset_logs in log.cc when binlog is emptied */ static int ndbcluster_reset_logs(THD *thd) { @@ -460,7 +460,7 @@ static int ndbcluster_reset_logs(THD *thd) } /* - Called from MYSQL_LOG::purge_logs in log.cc when the binlog "file" + Called from MYSQL_BIN_LOG::purge_logs in log.cc when the binlog "file" is removed */ |