Commit 147640b8 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 68d32bc3 9b14dc88

VC++Files/libmysqld/libmysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -228,10 +228,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

VC++Files/mysqldemb/mysqldemb.dsp

+0 −4
Original line number Diff line number Diff line
@@ -169,10 +169,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

extra/comp_err.c

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static char *HEADERFILE= (char*) "mysqld_error.h"; 
static char *NAMEFILE= (char*) "mysqld_ername.h";

static char *STATEFILE= (char*) "sql_state.h";

static char *TXTFILE= (char*) "../sql/share/errmsg.txt";

static char *DATADIR= (char*) "../sql/share/";

static char *DATADIRECTORY= (char*) "../sql/share/";

static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";



/* Header for errmsg.sys files */
@@ -112,8 +112,8 @@ static struct my_option my_long_options[]= 
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"in_file", 'F', "Input file", (gptr *) & TXTFILE, (gptr *) & TXTFILE,

   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"out_dir", 'D', "Output base directory", (gptr *) & DATADIR,

   (gptr *) & DATADIR,

  {"out_dir", 'D', "Output base directory", (gptr *) & DATADIRECTORY,

   (gptr *) & DATADIRECTORY,

   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"out_file", 'O', "Output filename (errmsg.sys)", (gptr *) & OUTFILE,

   (gptr *) & OUTFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -281,7 +281,7 @@ static int create_sys_files(struct languages *lang_head, 
      DBUG_RETURN(1);

    }



    outfile_end= strxmov(outfile, DATADIR, 

    outfile_end= strxmov(outfile, DATADIRECTORY, 

                         tmp_lang->lang_long_name, NullS);

    if (!my_stat(outfile, &stat_info,MYF(0)))

    {

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ extern char wild_many,wild_one,wild_prefix; 
extern const char *charsets_dir;

extern char *defaults_extra_file;



extern my_bool timed_mutexes;



typedef struct wild_file_pack	/* Struct to hold info when selecting files */

{

  uint		wilds;		/* How many wildcards */

innobase/ut/ut0ut.c

+7 −0
Original line number Diff line number Diff line
@@ -82,10 +82,17 @@ ut_usectime( 
	ulint*	sec,	/* out: seconds since the Epoch */

	ulint*	ms)	/* out: microseconds since the Epoch+*sec */

{

#ifdef __WIN__

	SYSTEMTIME st;

	GetLocalTime(&st);

	*sec = (ulint) st.wSecond;

	*ms  = (ulint) st.wMilliseconds;

#else

	struct timeval	tv;

	gettimeofday(&tv,NULL);

	*sec = (ulint) tv.tv_sec;

	*ms  = (ulint) tv.tv_usec;

#endif

}



/**************************************************************