summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <tnurnberg@sin.intern.azundris.com>2007-10-04 08:38:27 +0200
committerunknown <tnurnberg@sin.intern.azundris.com>2007-10-04 08:38:27 +0200
commit814bc3e8950b88914eca7b479df230eb3a4223ad (patch)
treecc238c487970c0dc8a076f3b56765b5aad7c513d /client
parent866225919c303f36e83b6af10e3908bcb39bda62 (diff)
parentfd7d13540ead9296e512a22dc869f7c2bae4f974 (diff)
downloadmariadb-git-814bc3e8950b88914eca7b479df230eb3a4223ad.tar.gz
Merge sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
into sin.intern.azundris.com:/home/tnurnberg/30444/51-30444 client/mysqldump.c: Auto merged
Diffstat (limited to 'client')
-rw-r--r--client/mysqldump.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index fe7c03fe77e..33d0182f435 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -4098,6 +4098,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") ||