diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-04 08:42:36 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-04 08:42:36 +0200 |
| commit | 66fed4ae521eb9e4fbdd1a9022cedd3c2ea372a6 (patch) | |
| tree | 97d40fd01f4e781a1b7908f7356986c766277ac9 /client | |
| parent | 34c494cc6ff11be38b70932ec7a6074b59888914 (diff) | |
| parent | fd7d13540ead9296e512a22dc869f7c2bae4f974 (diff) | |
| download | mariadb-git-66fed4ae521eb9e4fbdd1a9022cedd3c2ea372a6.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into sin.intern.azundris.com:/home/tnurnberg/30444/50-30444
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -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 a9be10b7997..4916492201b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3352,6 +3352,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") || |