diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-02 17:37:23 -0400 |
| commit | ec5a5682b1f594f74568c56d5ac02b794c69ea40 (patch) | |
| tree | a2b49fdf472ff139ea37a0b778aae5c8b78ff47c /client | |
| parent | 751026a1a6c7be8b4df674d5da9ce8c71906d0cd (diff) | |
| parent | 2e12c12e0205d0df1969a9edd7269da04aa4c32c (diff) | |
| download | mariadb-git-ec5a5682b1f594f74568c56d5ac02b794c69ea40.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
client/mysqlbinlog.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 842dfa28f88..b0175103840 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -327,7 +327,7 @@ static void dump_remote_log_entries(const char* logname) len = net_safe_read(mysql); if (len == packet_error) die("Error reading packet from server: %s", mysql_error(mysql)); - if (len == 1 && net->read_pos[0] == 254) + if (len < 8 && net->read_pos[0] == 254) break; // end of data DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n", len, net->read_pos[5])); |