bk commit into 4.1 tree (iggy:1.2516)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
4.1 repository of iggy. When iggy 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, 2006-07-19 17:00:39-04:00, iggy@stripped +3 -0
  Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
  into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328
  MERGE: 1.2510.27.1

  client/mysql.cc@stripped, 2006-07-19 16:57:09-04:00, iggy@stripped +0 -0
    Auto merged
    MERGE: 1.218.1.1

  mysql-test/r/bug20328.result@stripped, 2006-07-19 16:59:55-04:00, iggy@stripped +0 -0
    Merge rename: mysql-test/r/mysql_client.result -> mysql-test/r/bug20328.result

  mysql-test/t/bug20328.test@stripped, 2006-07-19 17:00:36-04:00, iggy@stripped +0 -0
    Merge rename: mysql-test/t/mysql_client.test -> mysql-test/t/bug20328.test

# 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:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-4.1-maint_bug20328/RESYNC

--- 1.219/client/mysql.cc	2006-07-19 17:00:42 -04:00
+++ 1.220/client/mysql.cc	2006-07-19 17:00:42 -04:00
@@ -1052,7 +1052,7 @@
       (We want to allow help, print and clear anywhere at line start
     */
     if (execute_commands && (named_cmds || glob_buffer.is_empty()) 
-	&& !in_string && (com=find_command(line,0)))
+	&& !ml_comment && !in_string && (com=find_command(line,0)))
     {
       if ((*com->func)(&glob_buffer,line) > 0)
 	break;