diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:56:30 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:56:30 +0300 |
| commit | a9df65e595d6beda3057c9ef37dc3700379500a1 (patch) | |
| tree | 95e4a764cfe8f03084d7c19f157c57a699ed4536 /client | |
| parent | 2373397e13d4004816b61df38a234906eb361e0d (diff) | |
| parent | adcd7be93515460327127e189a7b5ca5b63f232e (diff) | |
| download | mariadb-git-a9df65e595d6beda3057c9ef37dc3700379500a1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
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])); |