mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/bkroot/mysql-5.1-new

Browse source 
into  mysql.com:/home/bk/fix-mysql-5.1-new
This commit is contained in:
mats@mysql.com 2006-03-07 08:40:09 +01:00
commit 3f7b8cfb6e
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sql/log_event.cc
View file

@ -6424,6 +6424,13 @@ static int find_and_fetch_row(TABLE *table, byte *key)
if (table->s->keys > 0) if (table->s->keys > 0)
{ {
int error; int error;
/*
We need to set the null bytes to ensure that the filler bit
are all set when returning. There are storage engines that
just set the necessary bits on the bytes and don't set the
filler bits correctly.
*/
table->record[1][table->s->null_bytes - 1]= 0xFF;
if ((error= table->file->index_read_idx(table->record[1], 0, key, if ((error= table->file->index_read_idx(table->record[1], 0, key,
table->key_info->key_length, table->key_info->key_length,
HA_READ_KEY_EXACT))) HA_READ_KEY_EXACT)))
@ -6452,6 +6459,13 @@ static int find_and_fetch_row(TABLE *table, byte *key)
while (record_compare(table)) while (record_compare(table))
{ {
int error; int error;
/*
We need to set the null bytes to ensure that the filler bit
are all set when returning. There are storage engines that
just set the necessary bits on the bytes and don't set the
filler bits correctly.
*/
table->record[1][table->s->null_bytes - 1]= 0xFF;
if ((error= table->file->index_next(table->record[1]))) if ((error= table->file->index_next(table->record[1])))
{ {
table->file->print_error(error, MYF(0)); table->file->print_error(error, MYF(0));
@ -6466,6 +6480,13 @@ static int find_and_fetch_row(TABLE *table, byte *key)
int error= 0; int error= 0;
do do
{ {
/*
We need to set the null bytes to ensure that the filler bit
are all set when returning. There are storage engines that
just set the necessary bits on the bytes and don't set the
filler bits correctly.
*/
table->record[1][table->s->null_bytes - 1]= 0xFF;
error= table->file->rnd_next(table->record[1]); error= table->file->rnd_next(table->record[1]);
switch (error) switch (error)
{ {