diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-06-04 00:47:30 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-06-04 00:47:30 +0100 |
| commit | 2786f549937f8cb3792d277f0cba216beebe170d (patch) | |
| tree | 05cc0c9d1080211780cf5e0693be08549fcbfb9d /sql/log_event_old.cc | |
| parent | d91dde90d39fe27beb00195868b250a111154479 (diff) | |
| parent | ee0738edfe6643160c55a57654c71ffc3c6da80d (diff) | |
| download | mariadb-git-2786f549937f8cb3792d277f0cba216beebe170d.tar.gz | |
BUG 53893: Automerged from mysql-5.1-bugteam-gca into mysql-trunk-merge.
Post-push fix.
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 59cc2005f56..d9b48cd134e 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -2353,14 +2353,11 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli) BI image that is null and part of UNNI. */ bool null_found= FALSE; - - for (uint i=0, fieldnr= keyinfo->key_part[i].fieldnr - 1 ; - (i < keyinfo->key_parts) && !null_found ; - i++, fieldnr= keyinfo->key_part[i].fieldnr - 1) + for (uint i=0; i < keyinfo->key_parts && !null_found; i++) { + uint fieldnr= keyinfo->key_part[i].fieldnr - 1; Field **f= table->field+fieldnr; - if ((*f)->is_null()) - null_found= TRUE; + null_found= (*f)->is_null(); } if (!null_found) |