bzr commit into mysql-5.1-telco-6.3 branch (monty:2623)

[Monty Taylor]

#At file:///home/mtaylor/src/mysql/mysql-5.1-telco-6.3/

 2623 Monty Taylor	2008-06-03 [merge]
      Merged up and fixed criss-cross merge problem. 
modified:
  client/mysqltest.c

=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c	2008-05-30 10:23:04 +0000
+++ b/client/mysqltest.c	2008-05-30 15:39:09 +0000
@@ -7236,6 +7236,8 @@ int main(int argc, char **argv)
 	break;
       }
       case Q_COMMENT:
+      {
+        const char* p= command->query;
         command->last_argument= command->end;
 
         /* Don't output comments in v1 */
@@ -7247,13 +7249,13 @@ int main(int argc, char **argv)
           break;
 
         /* Write comment's with two starting #'s to result file */
-        const char* p= command->query;
         if (p && *p == '#' && *(p+1) == '#')
         {
           dynstr_append_mem(&ds_res, command->query, command->query_len);
           dynstr_append(&ds_res, "\n");
         }
 	break;
+      }
       case Q_EMPTY_LINE:
         /* Don't output newline in v1 */
         if (opt_result_format_version == 1)