merge

sql/mysqld.cc:
  Auto merged

configure.in

@@ -687,7 +687,7 @@ int main()
     [USE_PSTACK=$withval],
     [USE_PSTACK=yes])
   pstack_libs= pstack_dirs=
-  if test "$USE_PSTACK" = yes
+  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i386"
   then
     have_libiberty= have_libbfd=
     my_save_LIBS="$LIBS"

mysql-test/t/merge.test

@@ -22,7 +22,7 @@ insert into t2 select NULL,message from t1;
 insert into t1 select NULL,message from t2;
 insert into t2 select NULL,message from t1;
 insert into t1 select NULL,message from t2;
-create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(t1,t2);
+create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(test.t1,test.t2);
 explain select * from t3 where a < 10;
 explain select * from t3 where a > 10 and a < 20;
 select * from t3 where a = 10;

mysys/mf_qsort.c

@@ -110,7 +110,7 @@ qsort_t qsort(void *base_ptr, size_t count, size_t size, qsort_cmp cmp)
   stack_ptr = stack + 1;
 #ifdef HAVE_purify
   /* The first element in the stack will be accessed for the last POP */
-  stack[0].lo=stack[0].hi=0;
+  stack[0].low=stack[0].high=0;
 #endif
   pivot = (char *) my_alloca((int) size);
   ptr_cmp= size == sizeof(char*) && !((low - (char*) 0)& (sizeof(char*)-1));

mysys/my_dup.c

@@ -29,7 +29,7 @@
 File my_dup(File file, myf MyFlags)
 {
   File fd;
-  char *filename;
+  const char *filename;
   DBUG_ENTER("my_dup");
   DBUG_PRINT("my",("file: %d  MyFlags: %d", MyFlags));
   fd = dup(file);

mysys/raid.cc

@@ -420,8 +420,8 @@ IsRaid(File fd)
 RaidFd::
 RaidFd(uint raid_type, uint raid_chunks, ulong raid_chunksize)
   :_raid_type(raid_type), _raid_chunks(raid_chunks),
-   _raid_chunksize(raid_chunksize), _position(0), _fd_vector(0),
-   _size(RAID_SIZE_UNKNOWN)
+   _raid_chunksize(raid_chunksize), _position(0), _size(RAID_SIZE_UNKNOWN),
+   _fd_vector(0)
 {
   DBUG_ENTER("RaidFd::RaidFd");
   DBUG_PRINT("enter",("RaidFd_type: %u  Disks: %u  Chunksize: %d",

sql/gen_lex_hash.cc

@@ -472,7 +472,8 @@ int main(int argc,char **argv)
   int error;
 
   MY_INIT(argv[0]);
-  start_value=3579077L; best_t1=6681742L;  best_t2=142815L;  best_type=3; /* mode=5167  add=7  type: 0 */
+
+  start_value=2250933L;  best_t1=2721579L;  best_t2=4627039L;  best_type=3; /* mode=4567  add=4  type: 0 */
   if (get_options(argc,(char **) argv))
     exit(1);
 

sql/mysqld.cc

@@ -3202,7 +3202,6 @@ static void usage(void)
 			BACKUP or FORCE.\n\
   --memlock		Lock mysqld in memory\n\
   -n, --new		Use very new possible 'unsafe' functions\n\
-  --no-mix-table-types  Do not use transactional and non-transactional tables in a single query\n
   -o, --old-protocol	Use the old (3.20) protocol\n\
   -P, --port=...	Port number to use for connection\n");
 #ifdef ONE_THREAD

sql/sql_class.h

@@ -614,7 +614,7 @@ public:
   Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg,
 	 uint size, ulong max_in_memory_size_arg);
   ~Unique();
-  inline bool Unique::unique_add(gptr ptr)
+  inline bool unique_add(gptr ptr)
   {
     if (tree.elements_in_tree > max_elements && flush())
       return 1;