Merge branch 'mysql-5.5' into mysql-5.6

Conflicts:
	storage/innobase/os/os0file.c

Author: Bin Su

storage/innobase/os/os0file.cc

@@ -1380,6 +1380,7 @@ os_file_create_simple_no_error_handling_func(
 	*success = (file != INVALID_HANDLE_VALUE);
 #else /* __WIN__ */
 	int		create_flag;
+	const char*	mode_str	= NULL;
 
 	ut_a(name);
 
@@ -1388,6 +1389,8 @@ os_file_create_simple_no_error_handling_func(
 
 	if (create_mode == OS_FILE_OPEN) {
 
+		mode_str = "OPEN";
+
 		if (access_type == OS_FILE_READ_ONLY) {
 
 			create_flag = O_RDONLY;
@@ -1406,10 +1409,14 @@ os_file_create_simple_no_error_handling_func(
 
 	} else if (srv_read_only_mode) {
 
+		mode_str = "OPEN";
+
 		create_flag = O_RDONLY;
 
 	} else if (create_mode == OS_FILE_CREATE) {
 
+		mode_str = "CREATE";
+
 		create_flag = O_RDWR | O_CREAT | O_EXCL;
 
 	} else {
@@ -1424,6 +1431,17 @@ os_file_create_simple_no_error_handling_func(
 
 	*success = file == -1 ? FALSE : TRUE;
 
+	/* This function is always called for data files, we should disable
+	OS caching (O_DIRECT) here as we do in os_file_create_func(), so
+	we open the same file in the same mode, see man page of open(2). */
+	if (!srv_read_only_mode
+	    && *success
+	    && (srv_unix_file_flush_method == SRV_UNIX_O_DIRECT
+		|| srv_unix_file_flush_method == SRV_UNIX_O_DIRECT_NO_FSYNC)) {
+
+		os_file_set_nocache(file, name, mode_str);
+	}
+
 #ifdef USE_FILE_LOCK
 	if (!srv_read_only_mode
 	    && *success