Commit afbda7c1 authored by jcole@tetra.spaceapes.com's avatar jcole@tetra.spaceapes.com
Browse files

Merge jcole@work.mysql.com:/home/bk/mysql 

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
parents 6cf720e6 c270903a

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -7882,6 +7882,9 @@ able to mix @code{INSERT} and @code{SELECT}. Currently we use mutexes 
to emulate @code{pread()}/@code{pwrite()}.  We will, in the long run,

replace the file level interface with a virtual interface so that we can

use the @code{readfile()}/@code{writefile()} interface on NT to get more speed.

The current implementation will however limit the number of open files

@strong{MySQL} can use to 1024, which means that you will not be able to

run as many concurrent threads on NT as on Unix.















@item Blocking read















@strong{MySQL} uses a blocking read for each connection.

























include/config-win.h



+1
−2






























Original line number
Diff line number
Diff line








@@ -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))

































include/mysys_err.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -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 */

































myisam/mi_close.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -36,7 +36,7 @@ int mi_close(register MI_INFO *info)













  if (info->lock_type == F_EXTRA_LCK)















    info->lock_type=F_UNLCK;			/* HA_EXTRA_NO_USER_CHANGE */





























  if (share->reopen == 1)













  if (share->reopen == 1 && share->kfile >= 0)















    _mi_decrement_open_count(info);































  if (info->lock_type != F_UNLCK)

































myisam/mi_extra.c



+2
−0






























Original line number
Diff line number
Diff line








@@ -241,6 +241,8 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function)













	error=my_errno;















      info->lock_type = F_UNLCK;















    }













    if (share->kfile >= 0)













      _mi_decrement_open_count(info);















    if (share->kfile >= 0 && my_close(share->kfile,MYF(0)))















      error=my_errno;















    {