Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql

innobase/pars/pars0grm.c

@@ -95,9 +95,10 @@
 /* The value of the semantic attribute is a pointer to a query tree node
 que_node_t */
 #define YYSTYPE que_node_t*
-#define alloca	mem_alloc
 
 #include "univ.i"
+#undef alloca
+#define alloca	mem_alloc
 #include <math.h>
 #include "pars0pars.h"
 #include "mem0mem.h"

mysys/mf_keycache.c

@@ -327,7 +327,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length,
   }
 
 #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
-  DBUG_EXECUTE("exec",test_key_cache("start of key_cache_write",1););
+  DBUG_EXECUTE("check_keycache",test_key_cache("start of key_cache_write",1););
 #endif
   if (_my_disk_blocks > 0)
   {						/* We have key_cacheing */
@@ -367,7 +367,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length,
   }
 end:
 #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
-  DBUG_EXECUTE("exec",test_key_cache("end of key_cache_write",1););
+  DBUG_EXECUTE("check_keycache",test_key_cache("end of key_cache_write",1););
 #endif
   return(error);
 } /* key_cache_write */
@@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)
   reg1 SEC_LINK *next,**start;
 
 #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
-  DBUG_EXECUTE("exec",test_key_cache("start of find_key_block",0););
+  DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0););
 #endif
 
   *error=0;
@@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error)
   }
   _my_used_last=next;
 #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
-  DBUG_EXECUTE("exec",test_key_cache("end of find_key_block",0););
+  DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0););
 #endif
   return next;
 } /* find_key_block */
@@ -529,7 +529,7 @@ int flush_key_blocks(File file, enum flush_type type)
   pthread_mutex_lock(&THR_LOCK_keycache);
 
 #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG)
-  DBUG_EXECUTE("exec",test_key_cache("start of flush_key_blocks",0););
+  DBUG_EXECUTE("check_keycache",test_key_cache("start of flush_key_blocks",0););
 #endif
   cache=cache_buff;				/* If no key cache */
   if (_my_disk_blocks > 0 &&
@@ -607,7 +607,7 @@ int flush_key_blocks(File file, enum flush_type type)
     }
   }
 #ifndef DBUG_OFF
-  DBUG_EXECUTE("exec",test_key_cache("end of flush_key_blocks",0););
+  DBUG_EXECUTE("check_keycache",test_key_cache("end of flush_key_blocks",0););
 #endif
   pthread_mutex_unlock(&THR_LOCK_keycache);
   if (cache != cache_buff)

sql-bench/crash-me.sh

-#!@PERL@ -w
+#!@PERL@
 # Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
 #
 # This library is free software; you can redistribute it and/or

sql/mysqld.cc

@@ -152,6 +152,22 @@ static uint handler_count;
 static bool opt_console=0,start_mode=0;
 #endif
 
+/* Set prefix for windows binary */
+#ifdef __WIN__
+#undef MYSQL_SERVER_SUFFIX
+#ifdef __NT__
+#if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)
+#define MYSQL_SERVER_SUFFIX "-max-nt"
+#else
+#define MYSQL_SERVER_SUFFIX "-nt"
+#endif /* ...DB */
+#elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)
+#define MYSQL_SERVER_SUFFIX "-max"
+#else
+#define MYSQL_SERVER_SUFFIX ""
+#endif /* __NT__ */
+#endif
+
 #ifdef HAVE_BERKELEY_DB
 SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES;
 #else

sql/sql_select.cc

@@ -5371,7 +5371,8 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
 				   ulong offset, Item *having)
 {
   handler *file=table->file;
-  char *org_record,*new_record, *record;
+  char *org_record,*new_record;
+  byte *record;
   int error;
   ulong reclength=table->reclength-offset;
   DBUG_ENTER("remove_dup_with_compare");