diff --git a/include/config-win.h b/include/config-win.h
index e6f03a10afb..bb6d663bd8d 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -316,7 +316,7 @@ inline double ulonglong2double(ulonglong value)
 #define FN_ROOTDIR	"\\"
 #define FN_NETWORK_DRIVES	/* Uses \\ to indicate network drives */
 #define FN_NO_CASE_SENCE	/* Files are not case-sensitive */
-#define MY_NFILE	1024
+#define MY_NFILE	2048
 
 #define DO_NOT_REMOVE_THREAD_WRAPPERS
 #define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V))
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 1603a7eb26a..a3ba14373b2 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -91,7 +91,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   bool is_fifo=0;
   LOAD_FILE_INFO lf_info;
   char *db = table_list->db;			// This is never null
-  /* If no current database, use database where table is located */
+  /*
+    If path for file is not defined, we will use the current database.
+    If this is not set, we will use the directory where the table to be
+    loaded is located
+  */
   char *tdb= thd->db ? thd->db : db;		// Result is never null
   bool transactional_table, log_delayed;
   ulong skip_lines= ex->skip_lines;
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 955e5cfda8a..218ea6b5b8d 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -150,7 +150,9 @@ int rea_create_table(my_string file_name,
 
   my_free((gptr) screen_buff,MYF(0));
   my_afree((gptr) keybuff);
-  if (opt_sync_frm && my_sync(file, MYF(MY_WME)))
+
+  if (opt_sync_frm && !(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
+      my_sync(file, MYF(MY_WME)))
     goto err2;
   if (my_close(file,MYF(MY_WME)) ||
       ha_create_table(file_name,create_info,0))