Cleanups

configure.in:
  Only allow --with-pstack on Linux x86
mysql-test/t/merge.test:
  Add test of using db.tablename in UNION()
mysys/mf_qsort.c:
  Fix when using purify
mysys/my_dup.c:
  Cleanup
mysys/raid.cc:
  Cleanup
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_innobase.cc:
  Remove warnings
sql/mysqld.cc:
  Remove not used option from --help
sql/sql_class.h:
  Cleanup

9 files changed, 15 insertions, 15 deletions

diff --git a/configure.in b/configure.in
index 5b2328fea0f..f7560ffc401 100644
--- a/configure.in
+++ b/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"
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 6820242d562..90efdfa2d33 100644
--- a/mysql-test/t/merge.test
+++ b/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;
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index ed79aab6fd9..3db6fae0520 100644
--- a/mysys/mf_qsort.c
+++ b/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));
diff --git a/mysys/my_dup.c b/mysys/my_dup.c
index 2b3f8f9dd06..5191a3bed37 100644
--- a/mysys/my_dup.c
+++ b/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);
diff --git a/mysys/raid.cc b/mysys/raid.cc
index 48aa5cdb134..2e17a2c3f58 100644
--- a/mysys/raid.cc
+++ b/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",
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index b6621a056a5..36683c0f239 100644
--- a/sql/gen_lex_hash.cc
+++ b/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);
 
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 5287c228637..9db4368bc69 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -2704,7 +2704,7 @@ ha_innobase::records_in_range(
    	DBUG_ENTER("records_in_range");
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "estimating range size";
+		prebuilt->trx->op_info = (char*) "estimating range size";
 	}
    	
 	active_index = keynr;
@@ -2740,7 +2740,7 @@ ha_innobase::records_in_range(
     	my_free((char*) key_val_buff2, MYF(0));
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
 	DBUG_RETURN((ha_rows) n_rows);
@@ -2763,7 +2763,7 @@ ha_innobase::estimate_number_of_rows(void)
 	dict_table_t*	ib_table;
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info =
+	  prebuilt->trx->op_info = (char*)
 				"estimating upper bound of table size";
 	}   	
 
@@ -2780,7 +2780,7 @@ ha_innobase::estimate_number_of_rows(void)
 	/* The minimum clustered index record size is 20 bytes */
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
 	return((ha_rows) (1000 + data_file_length / 20));
@@ -2822,7 +2822,7 @@ ha_innobase::info(
  	DBUG_ENTER("info");
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "calculating table stats";
+		prebuilt->trx->op_info = (char*) "calculating table stats";
 	}
    	
  	ib_table = prebuilt->table;
@@ -2888,7 +2888,7 @@ ha_innobase::info(
   	}
 
 	if (prebuilt->trx) {
-		prebuilt->trx->op_info = "";
+		prebuilt->trx->op_info = (char*) "";
 	}
    	
   	DBUG_VOID_RETURN;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b228d0e4b15..545ec38de39 100644
--- a/sql/mysqld.cc
+++ b/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
diff --git a/sql/sql_class.h b/sql/sql_class.h
index a99bce0d6bc..085ea3d7b34 100644
--- a/sql/sql_class.h
+++ b/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;