diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-04 08:32:43 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-04 08:32:43 +0200 |
| commit | fd7d13540ead9296e512a22dc869f7c2bae4f974 (patch) | |
| tree | da94408d339121f11f08b85ab681f1945087c083 | |
| parent | 28ec0efcb6810c98af5bfbeeaaf0bfa13343a874 (diff) | |
| parent | 3f4eaf57e9907011ef97de1cec4f512ce59aabb3 (diff) | |
| download | mariadb-git-fd7d13540ead9296e512a22dc869f7c2bae4f974.tar.gz | |
Merge sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
client/mysqldump.c:
Auto merged
| -rw-r--r-- | client/mysqldump.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 1a024a923f5..6cbe261d622 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3321,6 +3321,18 @@ static int start_transaction(MYSQL *mysql_con) need the REPEATABLE READ level (not anything lower, for example READ COMMITTED would give one new consistent read per dumped table). */ + if ((mysql_get_server_version(mysql_con) < 40100) && opt_master_data) + { + fprintf(stderr, "-- %s: the combination of --single-transaction and " + "--master-data requires a MySQL server version of at least 4.1 " + "(current server's version is %s). %s\n", + ignore_errors ? "Warning" : "Error", + mysql_con->server_version ? mysql_con->server_version : "unknown", + ignore_errors ? "Continuing due to --force, backup may not be consistent across all tables!" : "Aborting."); + if (!ignore_errors) + exit(EX_MYSQLERR); + } + return (mysql_query_with_error_report(mysql_con, 0, "SET SESSION TRANSACTION ISOLATION " "LEVEL REPEATABLE READ") || |