Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


configure.in:
  Auto merged

configure.in

@@ -2436,9 +2436,9 @@ AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
 
 if test "$THREAD_SAFE_CLIENT" = "no"
 then
-  sql_client_dirs="strings regex mysys extra libmysql client"
+  sql_client_dirs="strings regex mysys dbug extra libmysql client"
 else
-  sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"
+  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
   linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
   AC_CONFIG_FILES(libmysql_r/Makefile)
   AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should the client be thread safe])

storage/myisam/mi_packrec.c

@@ -592,8 +592,8 @@ static uint copy_decode_table(uint16 *to_pos, uint offset,
 			      uint16 *decode_table)
 {
   uint prev_offset;
-  prev_offset= offset;
   DBUG_ENTER("copy_decode_table");
+  prev_offset= offset;
 
   /* Descent on the left side. */
   if (!(*decode_table & IS_CHAR))