diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-10-04 15:31:14 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-10-04 15:31:14 -0400 |
| commit | d3144a9d6c5aa07b07568cd0d1d808cc9b9b9d89 (patch) | |
| tree | a3325558446271e33eb058090d6d1d45042b4359 /client/mysqldump.c | |
| parent | 0c72b05a83a54ef86957ad03d73aa96b4c05e252 (diff) | |
| parent | 78f47b1b1080833241860c6213854fe04487ff12 (diff) | |
| download | mariadb-git-d3144a9d6c5aa07b07568cd0d1d808cc9b9b9d89.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660
client/mysqldump.c:
Auto merged
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 e3c13bb0451..e4ca7728447 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3050,7 +3050,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 @@ -3065,10 +3065,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 */")); } @@ -3553,7 +3551,7 @@ int main(int argc, char **argv) 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; |