bk commit into 5.1 tree (tnurnberg:1.2486)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg 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, 2007-05-14 08:55:22+02:00, tnurnberg@stripped +2 -0
  Merge blasphemy.mysql.com:/home/tnurnberg/28223/50-28223
  into  blasphemy.mysql.com:/home/tnurnberg/28223/51-28223
  MERGE: 1.1810.2901.3

  client/mysqldump.c@stripped, 2007-05-14 08:54:45+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.214.1.49

  mysql-test/r/mysqldump.result@stripped, 2007-05-14 08:55:08+02:00,
tnurnberg@stripped +3 -4
    manual merge
    MERGE: 1.83.1.41

# 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:	tnurnberg
# Host:	blasphemy.mysql.com
# Root:	/home/tnurnberg/28223/51-28223/RESYNC

--- 1.277/client/mysqldump.c	2007-04-30 23:27:12 +02:00
+++ 1.278/client/mysqldump.c	2007-05-14 08:54:45 +02:00
@@ -1608,6 +1608,9 @@ static uint dump_routines_for_db(char *d
   if (lock_tables)
     mysql_query(mysql, "LOCK TABLES mysql.proc READ");
 
+  if (opt_compact)
+    fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n");
+
   fprintf(sql_file, "DELIMITER ;;\n");
 
   /* 0, retrieve and dump functions, 1, procedures */
@@ -2264,8 +2267,11 @@ static void dump_triggers_for_table(char
     DBUG_VOID_RETURN;
   }
   if (mysql_num_rows(result))
-    fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n\
-DELIMITER ;;\n");
+  {
+    if (opt_compact)
+      fprintf(sql_file, "\n/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;\n");
+    fprintf(sql_file, "\nDELIMITER ;;\n");
+  }
   while ((row= mysql_fetch_row(result)))
   {
     fprintf(sql_file,