bk commit into 5.1 tree (hartmut:1.2338)

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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@stripped, 2006-10-30 11:46:22+01:00, hartmut@stripped +10 -0
  Merge hholzgraefe@stripped:/home/bk/mysql-5.1-maint
  into  mysql.com:/home/hartmut/projects/mysql/dev/5.1-maint
  MERGE: 1.2310.3.14

  sql/item_cmpfunc.cc@stripped, 2006-10-30 11:46:12+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.224.1.2

  sql/opt_range.cc@stripped, 2006-10-30 11:46:12+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.242.1.1

  sql/sql_base.cc@stripped, 2006-10-30 11:46:13+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.356.2.1

  sql/sql_class.cc@stripped, 2006-10-30 11:46:13+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.294.1.3

  sql/sql_parse.cc@stripped, 2006-10-30 11:46:14+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.589.1.1

  sql/sql_table.cc@stripped, 2006-10-30 11:46:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.368.1.1

  sql/table.cc@stripped, 2006-10-30 11:46:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.243.1.2

  sql/unireg.cc@stripped, 2006-10-30 11:46:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.87.1.2

  strings/ctype-utf8.c@stripped, 2006-10-30 11:46:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.104.1.1

  vio/viossl.c@stripped, 2006-10-30 11:46:15+01:00, hartmut@stripped +0 -0
    Auto merged
    MERGE: 1.39.1.1

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1-maint/RESYNC

--- 1.225/sql/item_cmpfunc.cc	2006-10-30 11:46:33 +01:00
+++ 1.226/sql/item_cmpfunc.cc	2006-10-30 11:46:33 +01:00
@@ -2226,7 +2226,7 @@
 cmp_item_row::~cmp_item_row()
 {
   DBUG_ENTER("~cmp_item_row");
-  DBUG_PRINT("enter",("this: 0x%lx", this));
+  DBUG_PRINT("enter",("this: %p", this));
   if (comparators)
   {
     for (uint i= 0; i < n; i++)
@@ -3058,7 +3058,7 @@
   if (!used_tables_cache)
   {
     owner->was_null|= (!cached_value);
-    DBUG_PRINT("info", ("cached :%d", cached_value));
+    DBUG_PRINT("info", ("cached :%lld", cached_value));
     DBUG_RETURN(cached_value);
   }
   if (args[0]->is_null())

--- 1.244/sql/opt_range.cc	2006-10-30 11:46:33 +01:00
+++ 1.245/sql/opt_range.cc	2006-10-30 11:46:33 +01:00
@@ -2010,7 +2010,7 @@
   uint idx;
   double scan_time;
   DBUG_ENTER("SQL_SELECT::test_quick_select");
-  DBUG_PRINT("enter",("keys_to_use: %lu  prev_tables: %lu  const_tables: %lu",
+  DBUG_PRINT("enter",("keys_to_use: %llu  prev_tables: %lu  const_tables: %lu",
 		      keys_to_use.to_ulonglong(), (ulong) prev_tables,
 		      (ulong) const_tables));
   DBUG_PRINT("info", ("records: %lu", (ulong) head->file->stats.records));

--- 1.359/sql/sql_base.cc	2006-10-30 11:46:33 +01:00
+++ 1.360/sql/sql_base.cc	2006-10-30 11:46:33 +01:00
@@ -2394,7 +2394,7 @@
     {
       DBUG_PRINT("info", ("share: 0x%lx  locked_by_logger: %d "
                           "locked_by_flush: %d  locked_by_name: %d "
-                          "db_stat: %u  version: %u",
+                          "db_stat: %u  version: %lu",
                           (ulong) search->s, search->locked_by_logger,
                           search->locked_by_flush, search->locked_by_name,
                           search->db_stat,

--- 1.298/sql/sql_class.cc	2006-10-30 11:46:33 +01:00
+++ 1.299/sql/sql_class.cc	2006-10-30 11:46:33 +01:00
@@ -552,7 +552,7 @@
 void THD::awake(THD::killed_state state_to_set)
 {
   DBUG_ENTER("THD::awake");
-  DBUG_PRINT("enter", ("this=0x%lx", this));
+  DBUG_PRINT("enter", ("this=%p", this));
   THD_CHECK_SENTRY(this);
   safe_mutex_assert_owner(&LOCK_delete); 
 
@@ -800,7 +800,7 @@
     {
       list_include(prev_changed, curr, changed_table_dup(key, key_length));
       DBUG_PRINT("info", 
-		 ("key_length %u %u", key_length, (*prev_changed)->key_length));
+		 ("key_length %lu %u", key_length, (*prev_changed)->key_length));
       DBUG_VOID_RETURN;
     }
     else if (cmp == 0)
@@ -810,7 +810,7 @@
       {
 	list_include(prev_changed, curr, changed_table_dup(key, key_length));
 	DBUG_PRINT("info", 
-		   ("key_length %u %u", key_length,
+		   ("key_length %lu %u", key_length,
 		    (*prev_changed)->key_length));
 	DBUG_VOID_RETURN;
       }
@@ -822,7 +822,7 @@
     }
   }
   *prev_changed = changed_table_dup(key, key_length);
-  DBUG_PRINT("info", ("key_length %u %u", key_length,
+  DBUG_PRINT("info", ("key_length %lu %u", key_length,
 		      (*prev_changed)->key_length));
   DBUG_VOID_RETURN;
 }

--- 1.590/sql/sql_parse.cc	2006-10-30 11:46:33 +01:00
+++ 1.591/sql/sql_parse.cc	2006-10-30 11:46:33 +01:00
@@ -396,7 +396,7 @@
       DBUG_PRINT("info",
                  ("Capabilities: %lx  packet_length: %ld  Host: '%s'  "
                   "Login user: '%s' Priv_user: '%s'  Using password: %s "
-                  "Access: %u  db: '%s'",
+                  "Access: %lu  db: '%s'",
                   thd->client_capabilities,
                   thd->max_client_packet_length,
                   thd->main_security_ctx.host_or_ip,
@@ -1002,7 +1002,7 @@
   if (thd->client_capabilities & CLIENT_IGNORE_SPACE)
     thd->variables.sql_mode|= MODE_IGNORE_SPACE;
 #ifdef HAVE_OPENSSL
-  DBUG_PRINT("info", ("client capabilities: %d", thd->client_capabilities));
+  DBUG_PRINT("info", ("client capabilities: %lu", thd->client_capabilities));
   if (thd->client_capabilities & CLIENT_SSL)
   {
     /* Do the SSL layering. */
@@ -1158,7 +1158,7 @@
     of handle_one_connection, which is thd. We need to know the
     start of the stack so that we could check for stack overruns.
   */
-  DBUG_PRINT("info", ("handle_one_connection called by thread %d\n",
+  DBUG_PRINT("info", ("handle_one_connection called by thread %lu\n",
 		      thd->thread_id));
   /* now that we've called my_thread_init(), it is safe to call DBUG_* */
 

--- 1.370/sql/sql_table.cc	2006-10-30 11:46:33 +01:00
+++ 1.371/sql/sql_table.cc	2006-10-30 11:46:33 +01:00
@@ -3746,7 +3746,7 @@
 				     enum ha_extra_function function)
 {
   DBUG_ENTER("wait_while_table_is_used");
-  DBUG_PRINT("enter", ("table: '%s'  share: 0x%lx  db_stat: %u  version: %u",
+  DBUG_PRINT("enter", ("table: '%s'  share: 0x%lx  db_stat: %u  version: %lu",
                        table->s->table_name.str, (ulong) table->s,
                        table->db_stat, table->s->version));
 

--- 1.248/sql/table.cc	2006-10-30 11:46:33 +01:00
+++ 1.249/sql/table.cc	2006-10-30 11:46:33 +01:00
@@ -1343,7 +1343,7 @@
   byte *record, *bitmaps;
   Field **field_ptr;
   DBUG_ENTER("open_table_from_share");
-  DBUG_PRINT("enter",("name: '%s.%s'  form: 0x%lx", share->db.str,
+  DBUG_PRINT("enter",("name: '%s.%s'  form: %p", share->db.str,
                       share->table_name.str, outparam));
 
   error= 1;

--- 1.88/sql/unireg.cc	2006-10-30 11:46:33 +01:00
+++ 1.89/sql/unireg.cc	2006-10-30 11:46:33 +01:00
@@ -469,7 +469,7 @@
     int2store(pos+6, key->block_size);
     pos+=8;
     key_parts+=key->key_parts;
-    DBUG_PRINT("loop",("flags: %d  key_parts: %d at 0x%lx",
+    DBUG_PRINT("loop",("flags: %d  key_parts: %d at %p",
 		       key->flags,key->key_parts,
 		       key->key_part));
     for (key_part=key->key_part,key_part_end=key_part+key->key_parts ;
@@ -478,7 +478,7 @@
 
     {
       uint offset;
-      DBUG_PRINT("loop",("field: %d  startpos: %lu  length: %ld",
+      DBUG_PRINT("loop",("field: %d  startpos: %lu  length: %u",
 			 key_part->fieldnr, key_part->offset + data_offset,
                          key_part->length));
       int2store(pos,key_part->fieldnr+1+FIELD_NAME_USED);

--- 1.105/strings/ctype-utf8.c	2006-10-30 11:46:33 +01:00
+++ 1.106/strings/ctype-utf8.c	2006-10-30 11:46:33 +01:00
@@ -4051,6 +4051,7 @@
     my_strntoull_8bit,
     my_strntod_8bit,
     my_strtoll10_8bit,
+    my_strntoull10rnd_8bit,
     my_scan_8bit
 };
 

--- 1.41/vio/viossl.c	2006-10-30 11:46:33 +01:00
+++ 1.42/vio/viossl.c	2006-10-30 11:46:33 +01:00
@@ -26,6 +26,10 @@
 #ifdef HAVE_OPENSSL
 
 #ifdef __NETWARE__
+
+/* yaSSL already uses BSD sockets */
+#ifndef HAVE_YASSL
+
 /*
   The default OpenSSL implementation on NetWare uses WinSock.
   This code allows us to use the BSD sockets.
@@ -47,6 +51,7 @@
 
 #define SSL_set_fd(A, B)  SSL_set_fd_bsd((A), (B))
 
+#endif /* HAVE_YASSL */
 #endif /* __NETWARE__ */