1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG 53893: Automerged from mysql-5.1-bugteam-gca into mysql-5.1-bugteam.

Browse Source 
Post-push fix.
This commit is contained in:
Luis Soares 2010-06-04 00:49:09 +01:00
commit ef0200bd49
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/log_event.cc
View File

@ -9029,14 +9029,11 @@ int Rows_log_event::find_row(const Relay_log_info *rli)
BI image that is null and part of UNNI. BI image that is null and part of UNNI.
*/ */
bool null_found= FALSE; bool null_found= FALSE;
for (uint i=0; i < keyinfo->key_parts && !null_found; i++)
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)
{ {
uint fieldnr= keyinfo->key_part[i].fieldnr - 1;
Field **f= table->field+fieldnr; Field **f= table->field+fieldnr;
if ((*f)->is_null()) null_found= (*f)->is_null();
null_found= TRUE;
} }
if (!null_found) if (!null_found)

9
sql/log_event_old.cc
View File

@ -2442,14 +2442,11 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli)
BI image that is null and part of UNNI. BI image that is null and part of UNNI.
*/ */
bool null_found= FALSE; bool null_found= FALSE;
for (uint i=0; i < keyinfo->key_parts && !null_found; i++)
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)
{ {
uint fieldnr= keyinfo->key_part[i].fieldnr - 1;
Field **f= table->field+fieldnr; Field **f= table->field+fieldnr;
if ((*f)->is_null()) null_found= (*f)->is_null();
null_found= TRUE;
} }
if (!null_found) if (!null_found)