database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge perch.ndb.mysql.com:/home/jonas/src/41-work

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge
This commit is contained in:
unknown
2006-09-04 13:46:56 +02:00
parent b931e3ebad d2d605e4ea
commit 14bebaa2dc
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/log.cc
View File

@@ -723,12 +723,17 @@ shutdown the MySQL server and restart it.", name, errno);
int MYSQL_LOG::get_current_log(LOG_INFO* linfo)
{
pthread_mutex_lock(&LOCK_log);
strmake(linfo->log_file_name, log_file_name, sizeof(linfo->log_file_name)-1);
linfo->pos = my_b_tell(&log_file);
int ret = raw_get_current_log(linfo);
pthread_mutex_unlock(&LOCK_log);
return 0;
return ret;
}
int MYSQL_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);
return 0;
}
/*
Move all data up in a file in an filename index file