bk commit into 5.1 tree (sergefp:1.2073)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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
  1.2073 06/01/18 21:29:48 sergefp@stripped +2 -0
  WL#2985: Merge

  sql/sql_partition.cc
    1.24 06/01/18 21:15:14 sergefp@stripped +4 -2
    WL#2985: Merge

  sql/mysqld.cc
    1.520 06/01/18 21:15:14 sergefp@stripped +9 -8
    Fix compile warnings (as directed by Serg)

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r5

--- 1.519/sql/mysqld.cc	2006-01-17 11:24:49 +03:00
+++ 1.520/sql/mysqld.cc	2006-01-18 21:15:14 +03:00
@@ -6470,24 +6470,24 @@
 {
   var->type= SHOW_CHAR;
   if (!ssl_acceptor_fd)
-    var->value= "NONE";
+    var->value= const_cast<char*>("NONE");
   else
     switch (SSL_CTX_get_session_cache_mode(ssl_acceptor_fd->ssl_context))
     {
     case SSL_SESS_CACHE_OFF:
-      var->value= "OFF"; break;
+      var->value= const_cast<char*>("OFF"); break;
     case SSL_SESS_CACHE_CLIENT:
-      var->value= "CLIENT"; break;
+      var->value= const_cast<char*>("CLIENT"); break;
     case SSL_SESS_CACHE_SERVER:
-      var->value= "SERVER"; break;
+      var->value= const_cast<char*>("SERVER"); break;
     case SSL_SESS_CACHE_BOTH:
-      var->value= "BOTH"; break;
+      var->value= const_cast<char*>("BOTH"); break;
     case SSL_SESS_CACHE_NO_AUTO_CLEAR:
-      var->value= "NO_AUTO_CLEAR"; break;
+      var->value= const_cast<char*>("NO_AUTO_CLEAR"); break;
     case SSL_SESS_CACHE_NO_INTERNAL_LOOKUP:
-      var->value= "NO_INTERNAL_LOOKUP"; break;
+      var->value= const_cast<char*>("NO_INTERNAL_LOOKUP"); break;
     default:
-      var->value= "Unknown"; break;
+      var->value= const_cast<char*>("Unknown"); break;
     }
   return 0;
 }
@@ -6508,6 +6508,7 @@
   *((long *)buff)= (long)thd->net.vio->ssl_arg ?
                          SSL_session_reused((SSL*) thd->net.vio->ssl_arg) :
                          0;
+  return 0;
 }
 
 static int show_ssl_get_default_timeout(THD *thd, SHOW_VAR *var, char *buff)

--- 1.23/sql/sql_partition.cc	2006-01-18 14:09:00 +03:00
+++ 1.24/sql/sql_partition.cc	2006-01-18 21:15:14 +03:00
@@ -5878,7 +5878,8 @@
     }
     else
     {
-      if (!part_info->get_partition_id(part_info, &part_id))
+      longlong dummy;
+      if (!part_info->get_partition_id(part_info, &part_id, &dummy))
       {
         init_single_partition_iterator(part_id, part_iter);
         return 1; /* Ok, iterator initialized */
@@ -5991,8 +5992,9 @@
   {
     field->store(part_iter->start_val, FALSE);
     part_iter->start_val++;
+    longlong dummy;
     if (!part_iter->part_info->get_partition_id(part_iter->part_info, 
-                                                &part_id))
+                                                &part_id, &dummy))
       return part_id;
   }
   return NOT_A_PARTITION_ID;