diff options
| author | unknown <guilhem@mysql.com> | 2003-10-09 18:19:17 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-10-09 18:19:17 +0200 |
| commit | 952ea762b3c1be8442a8a8c6d4dc5a7effc372f6 (patch) | |
| tree | b51cf752e1e862ee545490fd325391fa2b053a0e | |
| parent | 5533f59aea36828dba80d89a68eea15a08e95593 (diff) | |
| parent | 7e1a1032e826e867e41cdd3361b40fac33956543 (diff) | |
| download | mariadb-git-952ea762b3c1be8442a8a8c6d4dc5a7effc372f6.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 10d451a88bc..12698c8eda4 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1017,11 +1017,12 @@ static int check_master_version(MYSQL* mysql, MASTER_INFO* mi) BINLOG_FORMAT_323_GEQ_57 ; break; case '4': - case '5': mi->old_format = BINLOG_FORMAT_CURRENT; break; default: - errmsg = "Master reported unrecognized MySQL version"; + /* 5.0 is not supported */ + errmsg = "Master reported an unrecognized MySQL version. Note that 4.0 \ +slaves can't replicate a 5.0 or newer master."; break; } |