diff options
| -rw-r--r-- | include/config-win.h | 3 | ||||
| -rw-r--r-- | include/mysys_err.h | 2 | ||||
| -rw-r--r-- | myisam/mi_log.c | 12 | ||||
| -rw-r--r-- | myisam/myisamdef.h | 1 | ||||
| -rw-r--r-- | mysys/errors.c | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/include/config-win.h b/include/config-win.h index d9a6ce8d56b..024a708b3b5 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -288,8 +288,7 @@ inline double ulonglong2double(ulonglong value) #define FN_NETWORK_DRIVES /* Uses \\ to indicate network drives */ #define FN_NO_CASE_SENCE /* Files are not case-sensitive */ #define FN_LOWER_CASE TRUE /* Files are represented in lower case */ -#define MY_NFILE 127 /* This is only used to save filenames */ - +#define MY_NFILE 1024 #define DO_NOT_REMOVE_THREAD_WRAPPERS #define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V)) diff --git a/include/mysys_err.h b/include/mysys_err.h index 660bb60edee..b379f5bcbc9 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -22,7 +22,7 @@ extern "C" { #endif #define GLOB 0 /* Error maps */ -#define GLOBERRS 23 /* Max number of error messages in map's */ +#define GLOBERRS 24 /* Max number of error messages in map's */ #define EE(X) globerrs[ X ] /* Defines to add error to right map */ extern const char * NEAR globerrs[]; /* my_error_messages is here */ diff --git a/myisam/mi_log.c b/myisam/mi_log.c index d223cc69bcc..2d00387a945 100644 --- a/myisam/mi_log.c +++ b/myisam/mi_log.c @@ -14,7 +14,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Logging of isamcommands and records on logfile */ +/* + Logging of MyISAM commands and records on logfile for debugging + The log can be examined with help of the myisamlog command. +*/ #include "myisamdef.h" #if defined(MSDOS) || defined(__WIN__) @@ -30,14 +33,15 @@ #undef GETPID /* For HPUX */ #ifdef THREAD -#define GETPID() (log_type == 1 ? getpid() : (long) my_thread_id()); +#define GETPID() (log_type == 1 ? myisam_pid : (long) my_thread_id()); #else -#define GETPID() getpid() +#define GETPID() myisam_pid #endif /* Activate logging if flag is 1 and reset logging if flag is 0 */ static int log_type=0; +ulong myisam_pid=0; int mi_log(int activate_log) { @@ -48,6 +52,8 @@ int mi_log(int activate_log) log_type=activate_log; if (activate_log) { + if (!myisam_pid) + myisam_pid=(ulong) getpid(); if (myisam_log_file < 0) { if ((myisam_log_file = my_create(fn_format(buff,myisam_log_filename, diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index 8784afca0d9..e436e0872ca 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -384,6 +384,7 @@ extern uchar NEAR myisam_file_magic[],NEAR myisam_pack_file_magic[]; extern uint NEAR myisam_read_vec[],NEAR myisam_readnext_vec[]; extern uint myisam_quick_table_bits; extern File myisam_log_file; +extern ulong myisam_pid; /* This is used by _mi_calc_xxx_key_length och _mi_store_key */ diff --git a/mysys/errors.c b/mysys/errors.c index f74a56ed5e5..c2c1b8ffcc3 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -44,7 +44,7 @@ const char * NEAR globerrs[GLOBERRS]= "%d files and %d streams is left open\n", "Disk is full writing '%s'. Waiting for someone to free space...", "Can't create directory '%s' (Errcode: %d)", - "Character set '%s' is not a compiled character set and is not specified in the '%s' file" + "Character set '%s' is not a compiled character set and is not specified in the '%s' file", "Out of resources when opening file '%s' (Errcode: %d)", }; |