Commit 4f8002d6 authored by tnurnberg@sin.intern.azundris.com's avatar tnurnberg@sin.intern.azundris.com
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 

into  sin.intern.azundris.com:/home/tnurnberg/30444/41-30444
parents e7851316 c623e73e

client/mysqldump.c

+12 −0
Original line number Diff line number Diff line
@@ -2428,6 +2428,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") ||