diff options
| author | iggy@rolltop.ignatz42.dyndns.org <> | 2006-10-04 16:41:45 -0400 |
|---|---|---|
| committer | iggy@rolltop.ignatz42.dyndns.org <> | 2006-10-04 16:41:45 -0400 |
| commit | 6ff8998d3cbc8cef05d532c612e4e9d4c28100dd (patch) | |
| tree | 462db43031c4dfc7cf97f4621957bead0ac70a4b /client/mysqldump.c | |
| parent | b69606a5e9a607cc4f7e702c403eac7ca77c01e9 (diff) | |
| parent | 9977eea685ba843fa471321f73d1bf579eee1d64 (diff) | |
| download | mariadb-git-6ff8998d3cbc8cef05d532c612e4e9d4c28100dd.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index c32e2713fc9..b3fe8f12526 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -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; |