mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bug #12116 patch

Browse source 
sql/field.h:
  64-bit safe is_null with offset
sql/key.cc:
  64-bit safe is_null with offset
This commit is contained in:
unknown 2005-07-22 17:05:16 -04:00
commit 183caf2ea4
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/field.h
View file

@ -185,6 +185,12 @@ public:
return test(record[(uint) (null_ptr - (uchar*) table->record[0])] & return test(record[(uint) (null_ptr - (uchar*) table->record[0])] &
null_bit); null_bit);
} }
inline bool is_null_in_record_with_offset(my_ptrdiff_t offset)
{
if (!null_ptr)
return 0;
return test(null_ptr[offset] & null_bit);
}
inline void set_null(int row_offset=0) inline void set_null(int row_offset=0)
{ if (null_ptr) null_ptr[row_offset]|= null_bit; } { if (null_ptr) null_ptr[row_offset]|= null_bit; }
inline void set_notnull(int row_offset=0) inline void set_notnull(int row_offset=0)

4
sql/key.cc
View file

@ -473,8 +473,8 @@ int key_rec_cmp(void *key, byte *first_rec, byte *second_rec)
if (key_part->null_bit) if (key_part->null_bit)
{ {
/* The key_part can contain NULL values */ /* The key_part can contain NULL values */
bool first_is_null= field->is_null(first_diff); bool first_is_null= field->is_null_in_record_with_offset(first_diff);
bool sec_is_null= field->is_null(sec_diff); bool sec_is_null= field->is_null_in_record_with_offset(sec_diff);
/* /*
NULL is smaller then everything so if first is NULL and the other NULL is smaller then everything so if first is NULL and the other
not then we know that we should return -1 and for the opposite not then we know that we should return -1 and for the opposite