bk commit into 4.1 tree (iggy:1.2561)

[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-10-04 16:46:00-04:00, iggy@stripped +1 -0
  Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
  into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
  MERGE: 1.2510.57.3

  client/mysqldump.c@stripped, 2006-10-04 16:45:58-04:00, iggy@stripped +0 -0
    Auto merged
    MERGE: 1.200.1.1

# 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/RESYNC

--- 1.202/client/mysqldump.c	2006-10-04 16:46:03 -04:00
+++ 1.203/client/mysqldump.c	2006-10-04 16:46:03 -04:00
@@ -2416,7 +2416,7 @@
 }
 
 
-static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now)
+static int start_transaction(MYSQL *mysql_con)
 {
   /*
     We use BEGIN for old servers. --single-transaction --master-data will fail
@@ -2431,10 +2431,8 @@
                                         "SET SESSION TRANSACTION ISOLATION "
                                         "LEVEL REPEATABLE READ") ||
           mysql_query_with_error_report(mysql_con, 0,
-                                        consistent_read_now ?
                                         "START TRANSACTION "
-                                        "WITH CONSISTENT SNAPSHOT" :
-                                        "BEGIN"));
+                                        "/*!40100 WITH CONSISTENT SNAPSHOT */"));
 }
 
 
@@ -2661,7 +2659,7 @@
   if ((opt_lock_all_tables || opt_master_data) &&
       do_flush_tables_read_lock(sock))
     goto err;
-  if (opt_single_transaction && start_transaction(sock, test(opt_master_data)))
+  if (opt_single_transaction && start_transaction(sock))
       goto err;
   if (opt_delete_master_logs && do_reset_master(sock))
     goto err;