diff options
| author | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-22 15:48:07 +0200 |
|---|---|---|
| committer | unknown <georg@lmy002.wdf.sap.corp> | 2005-07-22 15:48:07 +0200 |
| commit | 53118f40e7a7b6984af2c04373efdaf8ce965972 (patch) | |
| tree | d1ff8d7ef819f79a2af6d300e403b8bb265c6ec2 /sql | |
| parent | 62cd4c14154fa02f0811d158bcceb201d5ba4b02 (diff) | |
| parent | 0c17b6ed37011ba2997f129f2b32f811a397eab5 (diff) | |
| download | mariadb-git-53118f40e7a7b6984af2c04373efdaf8ce965972.tar.gz | |
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/protocol_cursor.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc index ed2d0b583d0..093a2bf2b90 100644 --- a/sql/protocol_cursor.cc +++ b/sql/protocol_cursor.cc @@ -114,8 +114,7 @@ bool Protocol_cursor::write() for (; cur_field < fields_end; cur_field++, data_tmp++) { - if ((len= net_field_length((uchar **)&cp)) == 0 || - len == NULL_LENGTH) + if ((len= net_field_length((uchar **)&cp)) == NULL_LENGTH) { *data_tmp= 0; } |