bk commit into 5.1 tree (kent:1.1952)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.1952 05/11/02 23:07:21 kent@stripped +3 -0
  AsyncFile.cpp:
    Cast result from strstr() to char* for HP-UX compile
  print_file.cpp:
    HP-UX compiler don't like variable shadowing
  base64.c:
    Moved variable declaration to beginning of the block
    SCO/HP compilers don't like increment a void* variable

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.24 05/11/02 22:20:19 kent@stripped +1 -1
    Cast result from strstr() to char* for HP-UX compile

  storage/ndb/src/kernel/blocks/print_file.cpp
    1.2 05/11/02 22:18:41 kent@stripped +2 -2
    HP-UX compiler don't like variable shadowing

  mysys/base64.c
    1.10 05/11/02 21:30:35 kent@stripped +9 -5
    Moved variable declaration to beginning of the block
    SCO/HP compilers don't like increment a void* variable

# 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:	kent
# Host:	c-7d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.1/storage/ndb/src/kernel/blocks/print_file.cpp	2005-10-25 14:18:32 +02:00
+++ 1.2/storage/ndb/src/kernel/blocks/print_file.cpp	2005-11-02 22:18:41 +01:00
@@ -83,11 +83,11 @@
     }
     
     Uint32 sz;
-    Uint32 i = 0;
+    Uint32 j = 0;
     do {
       buffer.grow(g_page_size);
       sz = fread(buffer.get_data(), 1, g_page_size, f);
-      if((* g_print_page)(i++, buffer.get_data(), sz))
+      if((* g_print_page)(j++, buffer.get_data(), sz))
 	break;
     } while(sz == g_page_size);
     

--- 1.9/mysys/base64.c	2005-11-02 12:58:19 +01:00
+++ 1.10/mysys/base64.c	2005-11-02 21:30:35 +01:00
@@ -56,13 +56,14 @@
 
   for (; i < src_len; len += 4)
   {
+    unsigned c;
+
     if (len == 76)
     {
       len= 0;
       *dst++= '\n';
     }
 
-    unsigned c;
     c= s[i++];
     c <<= 8;
 
@@ -128,7 +129,8 @@
 {
   char b[3];
   size_t i= 0;
-  void *d= dst;
+  char *dst_base= (char *)dst;
+  char *d= dst_base;
   size_t j;
 
   while (i < size)
@@ -187,7 +189,7 @@
   {
     return -1;
   }
-  return d - dst;
+  return d - dst_base;
 }
 
 
@@ -216,6 +218,8 @@
 
     char * src= (char *) malloc(src_len);
     char * s= src;
+    char * str;
+    char * dst;
 
     for (j= 0; j<src_len; j++)
     {
@@ -224,11 +228,11 @@
     }
 
     /* Encode */
-    char * str= (char *) malloc(base64_needed_encoded_length(src_len));
+    str= (char *) malloc(base64_needed_encoded_length(src_len));
     require(base64_encode(src, src_len, str) == 0);
 
     /* Decode */
-    char * dst= (char *) malloc(base64_needed_decoded_length(strlen(str)));
+    dst= (char *) malloc(base64_needed_decoded_length(strlen(str)));
     dst_len= base64_decode(str, strlen(str), dst);
     require(dst_len == src_len);
 

--- 1.23/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2005-10-13 10:52:15 +02:00
+++ 1.24/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2005-11-02 22:20:19 +01:00
@@ -983,7 +983,7 @@
   char* tmp;
   const char * name = theFileName.c_str();
   const char * base = theFileName.get_base_name();
-  while((tmp = strstr(base, DIR_SEPARATOR)))
+  while((tmp = (char *)strstr(base, DIR_SEPARATOR)))
   {
     char t = tmp[0];
     tmp[0] = 0;