Commit 6946f03e authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/my/mysql-4.1
parents 194c6348 77deeb7e

heap/hp_test1.c

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ int main(int argc, char **argv) 
  get_options(argc,argv);



  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  keyinfo[0].keysegs=1;

  keyinfo[0].seg=keyseg;
@@ -58,7 +59,7 @@ int main(int argc, char **argv) 
  bzero((gptr) flags,sizeof(flags));



  printf("- Creating heap-file\n");

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000l,10l,

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,101L,

		  &hp_create_info) ||

      !(file= heap_open(filename, 2)))

    goto err;

heap/hp_test2.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ int main(int argc, char *argv[]) 
  get_options(argc,argv);

  

  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  write_count=update=opt_delete=0;

  key_check=0;

include/my_global.h

+2 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ do { doubleget_union _tmp; \ 
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \

			     *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \

                         } while (0)

#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)

#define float4get(V,M)   do { *((float *) &(V)) = *((float*) (M)); } while(0)

#define float8get(V,M)   doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))

mysys/my_handler.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

   MA 02111-1307, USA */



#include <my_global.h>

#include "my_handler.h"



int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,

strings/strtod.c

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


 */



#include "my_base.h"				/* Includes errno.h */

#include "m_ctype.h"

#include <my_global.h>				/* Includes errno.h */

#include <m_ctype.h>



#define MAX_DBL_EXP	308

#define MAX_RESULT_FOR_MAX_EXP 1.79769313486232