Lots of new benchmark runs

Remember filename for temporary files created with mkstemp
Fixed wrongly allocated BDB share structure
Cleanups for SunPRO


BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.6_sun4m~62028e0375b3b8b:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.6_sun4m~eafc8188345e262b:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.6_sun4m~8a1bd6589a189890:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.6_sun4m~f351a7f3e1e2257e:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-SunOS_5.6_sun4m~a10e3ddfa26a3e7f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-SunOS_5.6_sun4m~9233114ae6f8c5f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-SunOS_5.6_sun4m~3402d060ae20e19:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-SunOS_5.6_sun4m~4da215905bce988d:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.6_sun4m~ec61b14072715dc8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686~28211fb9f0e6ab0e:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686~da28ced3e0aac09c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686~67ae4e91b5f4eabd:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686~a2dcb74a3c73ac18:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686~beedcd769a903c19:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686~fe23ee50aea195f4:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686~f120b0ead3836c81:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686~3b64aff0dfddfff4:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686~d49db545341a732f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.13_SMP_alpha~136bdd9fd1a2cd14:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.13_SMP_alpha~defb62af5958fcac:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.13_SMP_alpha~f6fa9f46d4a6152:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.13_SMP_alpha~16694c5927b7600c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.13_SMP_alpha~c85eb85ba45dd748:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.13_SMP_alpha~b062db76cf6df5d2:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.13_SMP_alpha~b5f4f4c35225f0f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.13_SMP_alpha~a9eedd951eab7e8b:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.13_SMP_alpha~74ec2bf5f55b81f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.13_SMP_alpha~f6d7665c418d62c6:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.13_SMP_alpha~771b40d3280fe8ad:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.13_SMP_alpha~c46d6c283c0e34ae:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.13_SMP_alpha~17f262f12d2244bc:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.13_SMP_alpha~3245ba5633a18e8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.13_SMP_alpha~9fd9c6e036f988d7:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.13_SMP_alpha~744633c6e13a897f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.13_SMP_alpha~ad7babd436f26841:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha~6ad065fe4c6b4fa9:
  ***MISSING WEAVE***
BUILD/compile-pentium:
  Added command line arguments
Docs/manual.texi:
  Update for 3.23.30
configure.in:
  Removed duplicated symbol
include/my_sys.h:
  cleanup of my_open/my_create/my_tempfile
mysys/mf_tempfile.c:
  Remember filename for temporary files created with mkstemp
mysys/my_create.c:
  cleanup of my_open/my_create/my_tempfile
mysys/my_open.c:
  cleanup of my_open/my_create/my_tempfile
scripts/mysqld_multi.sh:
  Use paths from configure
scripts/safe_mysqld.sh:
  Cleanup
sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/connect-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/create-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/insert-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/select-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m:
  New benchmark results
sql/ha_berkeley.cc:
  Fixed wrongly allocated share structure
sql/item_cmpfunc.cc:
  Cleanup
sql/item_cmpfunc.h:
  Cleanup
sql/log_event.h:
  Cleanup
sql/mysqld.cc:
  Changed default number of BDB locks to 10000
sql/sql_class.h:
  cleanup
sql/sql_show.cc:
  cleanup
support-files/mysql.spec.sh:
  Added mysqld_multi
sql-bench/Results-linux/ATIS-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/ATIS-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/alter-table-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/big-tables-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/connect-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/create-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/select-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_dbug-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***
sql-bench/Results-linux/wisconsin-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
  ***MISSING WEAVE***

7 files changed, 30 insertions, 29 deletions

diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index bd2e4ee9272..5f01d44e091 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -1915,14 +1915,16 @@ static BDB_SHARE *get_share(const char *table_name, TABLE *table)
   uint length=(uint) strlen(table_name);
   if (!(share=(BDB_SHARE*) hash_search(&bdb_open_tables, table_name, length)))
   {
-    if ((share=(BDB_SHARE *) my_malloc(sizeof(*share)+length+1 +
-				       sizeof(ha_rows)* table->keys,
+    if ((share=(BDB_SHARE *) my_malloc(ALIGN_SIZE(sizeof(*share))+
+				       sizeof(ha_rows)* table->keys +
+				       length+1,
 				       MYF(MY_WME | MY_ZEROFILL))))
     {
+      share->rec_per_key= (ha_rows*) ((char*) share +
+				      ALIGN_SIZE(sizeof(*share)));
+      share->table_name=(char*) (share->rec_per_key+table->keys);
       share->table_name_length=length;
-      share->table_name=(char*) (share+1);
       strmov(share->table_name,table_name);
-      share->rec_per_key= (ha_rows*) (share+1);
       if (hash_insert(&bdb_open_tables, (char*) share))
       {
 	pthread_mutex_unlock(&bdb_mutex);
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 380ded8943e..84b18201ad1 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -173,13 +173,13 @@ longlong Item_func_eq::val_int()
 void Item_func_equal::fix_length_and_dec()
 {
   Item_bool_func2::fix_length_and_dec();
-  result_type=item_cmp_type(args[0]->result_type(),args[1]->result_type());
+  cmp_result_type=item_cmp_type(args[0]->result_type(),args[1]->result_type());
   maybe_null=null_value=0;
 }
 
 longlong Item_func_equal::val_int()
 {
-  switch (result_type) {
+  switch (cmp_result_type) {
   case STRING_RESULT:
   {
     String *res1,*res2;
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 790d4f3571f..95b2c3bf723 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -70,7 +70,7 @@ public:
 
 class Item_func_equal :public Item_bool_func2
 {
-  Item_result result_type;
+  Item_result cmp_result_type;
 public:
   Item_func_equal(Item *a,Item *b) :Item_bool_func2(a,b) { };
   longlong val_int();
diff --git a/sql/log_event.h b/sql/log_event.h
index 6dde2932014..5260b71adb7 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -80,11 +80,11 @@ public:
   virtual int write_data(IO_CACHE* file __attribute__((unused))) { return 0; }
   virtual Log_event_type get_type_code() = 0;
   Log_event(time_t when_arg, ulong exec_time_arg = 0,
-	    int valid_exec_time_arg = 0, uint32 server_id = 0): when(when_arg),
-    exec_time(exec_time_arg), valid_exec_time(valid_exec_time_arg)
+	    int valid_exec_time_arg = 0, uint32 server_id_arg = 0):
+    when(when_arg), exec_time(exec_time_arg),
+    valid_exec_time(valid_exec_time_arg)
   {
-    if(!server_id) this->server_id = ::server_id;
-    else this->server_id = server_id;
+    server_id = server_id_arg ? server_id_arg : server_id = ::server_id;
   }
 
   Log_event(const char* buf): valid_exec_time(0)
@@ -144,7 +144,7 @@ public:
   }
 #endif
 
-  Query_log_event(IO_CACHE* file, time_t when, uint32 server_id);
+  Query_log_event(IO_CACHE* file, time_t when, uint32 server_id_arg);
   Query_log_event(const char* buf, int event_len);
   ~Query_log_event()
   {
@@ -218,11 +218,11 @@ public:
   THD* thd;
   String field_lens_buf;
   String fields_buf;
-  Load_log_event(THD* thd, sql_exchange* ex, const char* table_name,
-		 List<Item>& fields, enum enum_duplicates handle_dup ):
+  Load_log_event(THD* thd, sql_exchange* ex, const char* table_name_arg,
+		 List<Item>& fields_arg, enum enum_duplicates handle_dup ):
     Log_event(thd->start_time),data_buf(0),thread_id(thd->thread_id),
     num_fields(0),fields(0),field_lens(0),field_block_len(0),
-    table_name(table_name),
+    table_name(table_name_arg),
     db(thd->db),
     fname(ex->file_name),
     thd(thd)
@@ -267,7 +267,7 @@ public:
     
     skip_lines = ex->skip_lines;
 
-    List_iterator<Item> li(fields);
+    List_iterator<Item> li(fields_arg);
     field_lens_buf.length(0);
     fields_buf.length(0);
     Item* item;
@@ -281,12 +281,12 @@ public:
       }
 
     field_lens = (const uchar*)field_lens_buf.ptr();
-    this->fields = fields_buf.ptr();
+    fields = fields_buf.ptr();
   }
-  void set_fields(List<Item> &fields);
+  void set_fields(List<Item> &fields_arg);
 #endif
 
-  Load_log_event(IO_CACHE * file, time_t when, uint32 server_id);
+  Load_log_event(IO_CACHE * file, time_t when, uint32 server_id_arg);
   Load_log_event(const char* buf, int event_len);
   ~Load_log_event()
   {
@@ -325,8 +325,8 @@ public:
     created = (uint32) when;
     memcpy(server_version, ::server_version, sizeof(server_version));
   }
-  Start_log_event(IO_CACHE* file, time_t when_arg, uint32 server_id) :
-    Log_event(when_arg, 0, 0, server_id)
+  Start_log_event(IO_CACHE* file, time_t when_arg, uint32 server_id_arg) :
+    Log_event(when_arg, 0, 0, server_id_arg)
   {
     char buf[sizeof(server_version) + 2 + 4 + 4];
     if (my_b_read(file, (byte*) buf, sizeof(buf)))
@@ -356,7 +356,7 @@ public:
   Intvar_log_event(uchar type_arg, ulonglong val_arg)
     :Log_event(time(NULL)),val(val_arg),type(type_arg)
   {}
-  Intvar_log_event(IO_CACHE* file, time_t when, uint32 server_id);
+  Intvar_log_event(IO_CACHE* file, time_t when, uint32 server_id_arg);
   Intvar_log_event(const char* buf);
   ~Intvar_log_event() {}
   Log_event_type get_type_code() { return INTVAR_EVENT;}
@@ -372,8 +372,8 @@ class Stop_log_event: public Log_event
 public:
   Stop_log_event() :Log_event(time(NULL))
   {}
-  Stop_log_event(IO_CACHE* file, time_t when_arg, uint32 server_id):
-    Log_event(when_arg,0,0,server_id)
+  Stop_log_event(IO_CACHE* file, time_t when_arg, uint32 server_id_arg):
+    Log_event(when_arg,0,0,server_id_arg)
   {
     byte skip[4];
     my_b_read(file, skip, sizeof(skip));	// skip the event length
@@ -400,7 +400,7 @@ public:
     alloced(0)
   {}
   
-  Rotate_log_event(IO_CACHE* file, time_t when, uint32 server_id) ;
+  Rotate_log_event(IO_CACHE* file, time_t when, uint32 server_id_arg) ;
   Rotate_log_event(const char* buf, int event_len);
   ~Rotate_log_event()
   {
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9c47a57b438..5146fef615e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2385,10 +2385,10 @@ CHANGEABLE_VAR changeable_vars[] = {
   { "bdb_cache_size",          (long*) &berkeley_cache_size, 
       KEY_CACHE_SIZE, 20*1024, (long) ~0, 0, IO_SIZE },
   { "bdb_max_lock",            (long*) &berkeley_max_lock, 
-      1000, 0, (long) ~0, 0, 1 },
+      10000, 0, (long) ~0, 0, 1 },
     /* QQ: The following should be removed soon! */
   { "bdb_lock_max",            (long*) &berkeley_max_lock, 
-      1000, 0, (long) ~0, 0, 1 },
+      10000, 0, (long) ~0, 0, 1 },
 #endif
   { "binlog_cache_size", 	(long*) &binlog_cache_size,
       32*1024L, IO_SIZE, ~0L, 0, IO_SIZE },
diff --git a/sql/sql_class.h b/sql/sql_class.h
index b1b734165d0..67aac31257f 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -204,7 +204,7 @@ public:
   char* key;
   char* val;
   i_string_pair():key(0),val(0) { }
-  i_string_pair(char* key, char* val) : key(key),val(val) {}
+  i_string_pair(char* key_arg, char* val_arg) : key(key_arg),val(val_arg) {}
 };
 
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a05a5fcebe9..3094ff26d89 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -537,7 +537,6 @@ mysqld_show_logs(THD *thd)
   DBUG_ENTER("mysqld_show_logs");
 
   List<Item> field_list;
-  Item *item;
   field_list.push_back(new Item_empty_string("File",FN_REFLEN));
   field_list.push_back(new Item_empty_string("Type",10));
   field_list.push_back(new Item_empty_string("Status",10));