Commit bc40c03d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1

parents 355000fa 9b8e0274

VC++Files/mysys/mysys.dsp

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ SOURCE=.\array.c 
!ENDIF



# End Source File

 

# Begin Source File

SOURCE=".\my_access.c"

# End Source File

 

# Begin Source File



SOURCE=".\charset-def.c"

VC++Files/mysys/mysys_ia64.dsp

+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,13 @@ LIB32=link.exe -lib 
# Name "mysys - WinIA64 Max"

# Name "mysys - WinIA64 TLS_DEBUG"

# Name "mysys - WinIA64 TLS"



# Begin Source File



SOURCE=.\my_access.c



# End Source File

 

# Begin Source File



SOURCE=.\array.c

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -573,6 +573,11 @@ extern char *_my_strdup_with_length(const byte *from, uint length, 
				    const char *sFile, uint uLine,

				    myf MyFlag);



#ifdef __WIN__

extern int my_access(const char *path, int amode);

#else

#define my_access access

#endif



#ifndef TERMINATE

extern void TERMINATE(FILE *file);

myisam/sp_key.c

+7 −3
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ static int sp_get_geometry_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
                              double *mbr, int top);

static int sp_mbr_from_wkb(uchar (*wkb), uint size, uint n_dims, double *mbr);



static void get_double(double *d, const byte *pos)

{

  float8get(*d, pos);

}

  

uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key,

		 const byte *record, my_off_t filepos)
@@ -80,7 +84,7 @@ uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key, 
      else if (keyseg->type == HA_KEYTYPE_DOUBLE)

      {

	double nr;

	float8get(nr, pos);

	get_double(&nr, pos);

	if (isnan(nr))

	{

 	  bzero(key, length);
@@ -138,7 +142,7 @@ static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
  {

    if ((*wkb) > end - 8)

      return -1;

    float8get(ord, (*wkb));

    get_double(&ord, *wkb);

    (*wkb)+= 8;

    if (ord < *mbr)

      float8store((char*) mbr, ord);

mysql-test/r/reserved_win_names.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

lower_case_table_names 1