diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 14:26:18 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-09-04 14:26:18 +0200 |
| commit | ba6b37a005544016e02a8900ff04aaa069d10bf2 (patch) | |
| tree | 42d1e07e7edc815a2a02df65a292d8324fb796d5 /sql/log.cc | |
| parent | 6a81fa6df52bacd61c4549324fe83611f23a816d (diff) | |
| download | mariadb-git-ba6b37a005544016e02a8900ff04aaa069d10bf2.tar.gz | |
bug#21965
merge to 5.1 - yet another merge fix
sql/log.cc:
yet another merge fix
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 64226ec2ec9..1bc7ff4f01e 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2266,7 +2266,7 @@ int MYSQL_BIN_LOG::get_current_log(LOG_INFO* linfo) return ret; } -int MYSQL_LOG::raw_get_current_log(LOG_INFO* linfo) +int MYSQL_BIN_LOG::raw_get_current_log(LOG_INFO* linfo) { strmake(linfo->log_file_name, log_file_name, sizeof(linfo->log_file_name)-1); linfo->pos = my_b_tell(&log_file); |