List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:November 21 2012 3:14pm
Subject:bzr push into mysql-trunk branch (kevin.lewis:5058 to 5059)
View as plain text  
 5059 kevin.lewis@stripped	2012-11-21 [merge]
      Merge 15882860 from mysql-5.6

    modified:
      storage/innobase/os/os0file.cc
 5058 Nuno Carvalho	2012-11-21
      BUG#15891524: RLI_FAKE MODE IS NOT UNSET AFTER BINLOG REPLAY
      
      Updated result file.

    modified:
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
=== modified file 'storage/innobase/os/os0file.cc'
--- a/storage/innobase/os/os0file.cc	revid:nuno.carvalho@stripped
+++ b/storage/innobase/os/os0file.cc	revid:kevin.lewis@stripped
@@ -3087,9 +3087,9 @@ os_file_status(
 {
 #ifdef __WIN__
 	int		ret;
-	struct _stat	statinfo;
+	struct _stat64	statinfo;
 
-	ret = _stat(path, &statinfo);
+	ret = _stat64(path, &statinfo);
 	if (ret && (errno == ENOENT || errno == ENOTDIR)) {
 		/* file does not exist */
 		*exists = FALSE;
@@ -3162,9 +3162,9 @@ os_file_get_status(
 	int		ret;
 
 #ifdef __WIN__
-	struct _stat	statinfo;
+	struct _stat64	statinfo;
 
-	ret = _stat(path, &statinfo);
+	ret = _stat64(path, &statinfo);
 
 	if (ret && (errno == ENOENT || errno == ENOTDIR)) {
 		/* file does not exist */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (kevin.lewis:5058 to 5059) kevin.lewis21 Nov