bk commit into 4.1 tree (monty:1.2523) BUG#19694

[monty]

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2523 06/06/30 02:25:35 monty@stripped +5 -0
  Fixed include file usage
  hp_test2 now works again
  Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)

  strings/strtod.c
    1.17 06/06/30 02:25:33 monty@stripped +2 -2
    Fixed include files

  mysys/my_handler.c
    1.22 06/06/30 02:25:33 monty@stripped +1 -0
    Added missing include file

  include/my_global.h
    1.104 06/06/30 02:25:33 monty@stripped +2 -2
    Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694)

  heap/hp_test2.c
    1.22 06/06/30 02:25:33 monty@stripped +1 -0
    Added max_table_size (fixes that hp_test2 works again)

  heap/hp_test1.c
    1.15 06/06/30 02:25:33 monty@stripped +2 -1
    Portability fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-4.1

--- 1.14/heap/hp_test1.c	2003-11-20 22:06:17 +02:00
+++ 1.15/heap/hp_test1.c	2006-06-30 02:25:33 +03:00
@@ -44,6 +44,7 @@
   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 @@
   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;

--- 1.21/heap/hp_test2.c	2003-11-20 22:06:17 +02:00
+++ 1.22/heap/hp_test2.c	2006-06-30 02:25:33 +03:00
@@ -74,6 +74,7 @@
   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;

--- 1.16/strings/strtod.c	2005-02-22 12:51:20 +02:00
+++ 1.17/strings/strtod.c	2006-06-30 02:25:33 +03:00
@@ -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

--- 1.21/mysys/my_handler.c	2005-10-25 02:27:29 +03:00
+++ 1.22/mysys/my_handler.c	2006-06-30 02:25:33 +03:00
@@ -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,

--- 1.103/include/my_global.h	2005-09-13 21:46:53 +03:00
+++ 1.104/include/my_global.h	2006-06-30 02:25:33 +03:00
@@ -976,8 +976,8 @@
 #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 float8get(V,M) doubleget((V),(M))
+#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))
 #define floatget(V,M)    memcpy((byte*) &V,(byte*) (M),sizeof(float))