summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-05-26 21:01:54 +0200
committerunknown <msvensson@neptunus.(none)>2005-05-26 21:01:54 +0200
commitc8b88e8e45770ecae2233a5f9fb3dd2a32e17148 (patch)
tree2a8f5ded1a44d711a1cf2b747bd04cfb3e4affdd /sql
parent598b7631cd2fccf315ca28cc372d07a2a5c8ecbb (diff)
downloadmariadb-git-c8b88e8e45770ecae2233a5f9fb3dd2a32e17148.tar.gz
Include fix to function open_binlog from 4.1
- Add O_SHARE when opening file. sql/log.cc: Add O_SHARE when opening file. This is from mysql-4.1 but since function has been moved from sql_repl.cc, it was missed during merge.
Diffstat (limited to 'sql')
-rw-r--r--sql/log.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 91428cf41be..db592649d13 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -232,7 +232,8 @@ File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg)
File file;
DBUG_ENTER("open_binlog");
- if ((file = my_open(log_file_name, O_RDONLY | O_BINARY, MYF(MY_WME))) < 0)
+ if ((file = my_open(log_file_name, O_RDONLY | O_BINARY | O_SHARE,
+ MYF(MY_WME))) < 0)
{
sql_print_error("Failed to open log (file '%s', errno %d)",
log_file_name, my_errno);