bk commit into 4.1 tree (joerg:1.2419)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg 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.2419 05/09/02 20:07:08 joerg@stripped +1 -0
  Compile error fix.

  client/mysqltest.c
    1.178 05/09/02 20:07:04 joerg@stripped +2 -2
    Have variable declarations before "DBUG_ENTER",
    the opposite order will fail to compile on some platforms.

# 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:	joerg
# Host:	trift2.
# Root:	/M41/push-4.1

--- 1.177/client/mysqltest.c	2005-09-01 17:21:00 +02:00
+++ 1.178/client/mysqltest.c	2005-09-02 20:07:04 +02:00
@@ -812,9 +812,9 @@
 
 int open_file(const char *name)
 {
+  char buff[FN_REFLEN];
   DBUG_ENTER("open_file");
   DBUG_PRINT("enter", ("name: %s", name));
-  char buff[FN_REFLEN];
   if (!test_if_hard_path(name))
   {
     strxmov(buff, opt_basedir, name, NullS);
@@ -843,9 +843,9 @@
 
 int check_eol_junk(const char *eol)
 {
+  const char *p= eol;
   DBUG_ENTER("check_eol_junk");
   DBUG_PRINT("enter", ("eol: %s", eol));
-  const char *p= eol;
   /* Remove all spacing chars except new line */
   while (*p && my_isspace(charset_info, *p) && (*p != '\n'))
     p++;