Commit 270d4c9d authored by unknown's avatar unknown
Browse files

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660 

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


client/mysqldump.c:
  Auto merged
parents 4b494e2f 26b34e82

client/mysqldump.c

+3 −5
Original line number Diff line number Diff line
@@ -3389,7 +3389,7 @@ static int do_reset_master(MYSQL *mysql_con) 
}





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
@@ -3404,10 +3404,8 @@ static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now) 
                                        "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 */"));

}
@@ -3897,7 +3895,7 @@ int main(int argc, char **argv) 
  if ((opt_lock_all_tables || opt_master_data) &&

      do_flush_tables_read_lock(mysql))

    goto err;

  if (opt_single_transaction && start_transaction(mysql, test(opt_master_data)))

  if (opt_single_transaction && start_transaction(mysql))

      goto err;

  if (opt_delete_master_logs && do_reset_master(mysql))

    goto err;