diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-10-04 16:46:00 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-10-04 16:46:00 -0400 |
| commit | ed13b0ee0306bab3beeab17bc1515bc667e0039b (patch) | |
| tree | 981720af4e17984b833444a2525b8e6f89d753fc /client | |
| parent | 5549ed3a4a5bfe84ff6a0561cab4e0cda7c470bc (diff) | |
| parent | 78f47b1b1080833241860c6213854fe04487ff12 (diff) | |
| download | mariadb-git-ed13b0ee0306bab3beeab17bc1515bc667e0039b.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -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 7f495ccdafb..7e15a5dbbad 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2416,7 +2416,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 @@ -2431,10 +2431,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 */")); } @@ -2661,7 +2659,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; |