database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

field_conv.cc: added comments

Browse Source 
opt_range.cc: modified print_key() so that it doesn't do memory re-allocs when
printing multipart keys over varchar columns. When it did, key printout in 
debug trace was interrupted with my_malloc/free printouts.
This commit is contained in:
Sergey Petrunya
2011-08-17 12:32:15 +04:00
parent 6321619496
commit f240aa4cbf
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/field_conv.cc
View File

@ -204,6 +204,14 @@ static void do_skip(Copy_field *copy __attribute__((unused)))
}
/*
Copy: (NULLable field) -> (NULLable field)
note: if the record we're copying from is NULL-complemetned (i.e.
from_field->table->null_row==1), it will also have all NULLable columns to be
set to NULLs, so we dont need to check table->null_row here.
*/
static void do_copy_null(Copy_field *copy)
{
if (*copy->from_null_ptr & copy->from_bit)
@ -218,6 +226,10 @@ static void do_copy_null(Copy_field *copy)
}
}
/*
Copy: (not-NULL field in table that can be NULL-complemented) -> (NULLable
field)
*/
static void do_outer_field_null(Copy_field *copy)
{
@ -235,6 +247,7 @@ static void do_outer_field_null(Copy_field *copy)
}
/* Copy: (NULL-able field) -> (not NULL-able field) */
static void do_copy_not_null(Copy_field *copy)
{
if (*copy->from_null_ptr & copy->from_bit)
@ -248,6 +261,7 @@ static void do_copy_not_null(Copy_field *copy)
}
/* Copy: (non-NULLable field) -> (NULLable field) */
static void do_copy_maybe_null(Copy_field *copy)
{
*copy->to_null_ptr&= ~copy->to_bit;

2
sql/opt_range.cc
View File

@ -13644,7 +13644,6 @@ print_key(KEY_PART *key_part, const uchar *key, uint used_length)
{
char buff[1024];
const uchar *key_end= key+used_length;
String tmp(buff,sizeof(buff),&my_charset_bin);
uint store_length;
TABLE *table= key_part->field->table;
my_bitmap_map *old_sets[2];
@ -13653,6 +13652,7 @@ print_key(KEY_PART *key_part, const uchar *key, uint used_length)
for (; key < key_end; key+=store_length, key_part++)
{
String tmp(buff,sizeof(buff),&my_charset_bin);
Field *field= key_part->field;
store_length= key_part->store_length;