diff --git a/configure.in b/configure.in
index 2a238a1f221f2f9db0d532cfb5894cafb0204366..900e9f0ac1631252a5dce6d81e67c166b30bd0a6 100644
--- a/configure.in
+++ b/configure.in
@@ -2438,9 +2438,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])
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index ba16d2c8c9b101f6f9fc40582c4926150c79f9df..34c22a9fcc022bc341920167c7914e698b5c592f 100644
--- a/storage/myisam/mi_packrec.c
+++ b/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))