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

BUG#53893: RBR: nullable unique key can lead to out-of-sync slave

Browse Source 
Post-push fix.
  
There was a valgrind issue on the loop that checks whether there
are NULL fields in the UNIQUE KEY or not. In detail, for the last 
iteration the server may read out of the key_part array boundaries,
making valgrind to output warnings.

We fix this by correcting the loop, ie, moving the part that reads
from the key_part to be inside the loop statement block. This way
the assignment is protected by the loop condition.
This commit is contained in:
Luis Soares 2010-06-04 00:45:07 +01:00
parent 20fc48fc38
commit 1b61dcf434
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.
*/
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)

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.
*/
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)