From 7c0e7321b91e1132916b5be62d6b96f354abe451 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Feb 2004 18:58:21 +0200 Subject: [PATCH 1/2] Added comment --- sql/sql_load.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; From 4e01d4de159920e56f3f0bfa5e943e987c7e45e8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Feb 2004 19:36:53 +0200 Subject: [PATCH 2/2] crease number of open files to 2048 on windows Don't do fsync on temporary .frm files include/config-win.h: Increase number of open files to 2048 on windows sql/unireg.cc: Don't do fsync on temporary files --- include/config-win.h | 2 +- sql/unireg.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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/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))