bk commit into 4.1 tree (msvensson:1.2598) BUG#25505

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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, 2007-01-17 11:51:52+01:00, msvensson@stripped +1 -0
  Bug#25505 Myisam library compiler error on Windows

  myisam/mi_packrec.c@stripped, 2007-01-17 11:51:51+01:00, msvensson@stripped +1 -2
    Combine the declaration of variable and assignment into one line
    since that is allowed befgore declaring another variable in C.

# 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:	msvensson
# Host:	pilot.mysql.com
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.32/myisam/mi_packrec.c	2006-12-20 15:18:08 +01:00
+++ 1.33/myisam/mi_packrec.c	2007-01-17 11:51:51 +01:00
@@ -590,8 +590,7 @@
 static uint copy_decode_table(uint16 *to_pos, uint offset,
 			      uint16 *decode_table)
 {
-  uint prev_offset;
-  prev_offset= offset;
+  uint prev_offset= offset;
   DBUG_ENTER("copy_decode_table");
 
   /* Descent on the left side. */