bk commit into 5.1 tree (mats:1.2347)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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-10 12:29:24+02:00, mats@romeo.(none) +1 -0
  Fix to make it build on all platforms.
  Replacing C++ code with C code in a C file.

  mysys/mf_iocache2.c@stripped, 2006-10-10 12:29:21+02:00, mats@romeo.(none) +2 -1
    There shall not be C++ code in C files.

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b19459-mysql-5.1-new

--- 1.29/mysys/mf_iocache2.c	2006-10-10 12:29:33 +02:00
+++ 1.30/mysys/mf_iocache2.c	2006-10-10 12:29:33 +02:00
@@ -52,12 +52,13 @@
 my_b_copy_to_file(IO_CACHE *cache, FILE *file)
 {
   byte buf[IO_SIZE];
+  uint bytes_in_cache;
   DBUG_ENTER("my_b_copy_to_file");
 
   /* Reinit the cache to read from the beginning of the cache */
   if (reinit_io_cache(cache, READ_CACHE, 0L, FALSE, FALSE))
     DBUG_RETURN(1);
-  uint bytes_in_cache= my_b_bytes_in_cache(cache);
+  bytes_in_cache= my_b_bytes_in_cache(cache);
   while (bytes_in_cache > 0) {
     uint const read_bytes= min(bytes_in_cache, sizeof(buf));
     DBUG_PRINT("debug", ("Remaining %u bytes - Reading %u bytes",