diff options
| author | unknown <serg@serg.mylan> | 2003-10-14 00:27:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-14 00:27:04 +0200 |
| commit | 83f5a6a34fde659b3ffae221fd2e393f88e5087b (patch) | |
| tree | 10b7333c848a9ba4cc2116b460435a41bcfb8ce3 /sql | |
| parent | 08bb033b537247521314211457fff76a5cfdd5e2 (diff) | |
| parent | 13b4c6e05c295b2eb3efebe34648ccc7fdfab591 (diff) | |
| download | mariadb-git-83f5a6a34fde659b3ffae221fd2e393f88e5087b.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql')
| -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; } |