diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-10-10 13:12:39 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-10-10 13:12:39 -0400 |
| commit | 13b4c6e05c295b2eb3efebe34648ccc7fdfab591 (patch) | |
| tree | 82eb63e13cea67e5ba5ea64948e115070e6ed194 | |
| parent | 6a90df8b0cfdd003593f585f95b5d3eadce8c7cb (diff) | |
| parent | 952ea762b3c1be8442a8a8c6d4dc5a7effc372f6 (diff) | |
| download | mariadb-git-13b4c6e05c295b2eb3efebe34648ccc7fdfab591.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/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; } |