mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
7c56b08216
- Changed Cached_item_field not copy data for fields with NULL value - In key_copy() and key_restore() don't copy data for fields with NULL value Fixed code to avoid valgrind warnings - Use c_ptr_safe instead of c_ptr() Removed "QQ" from comments (QQ was ment to be used for internal comments that should be removed before pushing) Fixed wrong alias used (from previous patch) sql/event_db_repository.cc: Update testing if event table is valid (to avoid valgrind errors) sql/ha_partition.cc: m_ordered_scan_ongoing was not initialized Reset null bits in record to avoid valgrind errors sql/handler.h: Added flag if storage engine will write row verbatim and the row contains varchar or null fields (in which case we must clear the row to avoid valgrind warnings) sql/item_buff.cc: Changed Cached_item_field not copy data for fields with NULL value (Optimization and avoids valgrind warnings) sql/item_func.cc: c_ptr() -> c_ptr_safe() sql/key.cc: In key_copy() and key_restore() don't copy data for fields with NULL value sql/opt_range.cc: c_ptr() -> c_ptr_safe() sql/sql_base.cc: Added TRASH() to table->record[0] to find out if we access not initialzed data. Initialize null_bytes to: - Get consistent tests - Ensure we don't get valgrind warnings for null fields (as we may only update a couple of bits in a byte) sql/sql_class.cc: Removed "QQ" from comments sql/sql_insert.cc: Initialize row to default values if we are using valgrind and row will be copied verbatim to disk in storage engine. sql/sql_load.cc: QQ -> TODO sql/sql_parse.cc: Removed old not used code marked QQ and withing "#ifdef REMOVED" sql/sql_select.cc: QQ -> TODO Initialize some variables that was used uninitialized Added DBUG_ASSERT() to find out if thd was not properly initialized for sub queries sql/sql_test.cc: Fixed format for printing to DBUG file Fixed wrong alias used (from previous patch) sql/sql_trigger.h: QQ -> TODO sql/table.cc: QQ -> TODO storage/maria/ha_maria.cc: Mark table with HA_RECORD_MUST_BE_CLEAN_ON_WRITE, if row is written verbatim to disk and contains varchar or null fields. storage/maria/ma_open.c: Added flags if table has varchar or null fields storage/maria/maria_def.h: Added flags if table has varchar or null fields storage/myisam/ha_myisam.cc: Mark table with HA_RECORD_MUST_BE_CLEAN_ON_WRITE, if row is written verbatim to disk and contains varchar or null fields. storage/myisam/mi_open.c: Fixed memory overrun bug when using fulltext keys storage/xtradb/row/row0sel.c: Removed initialization of null bits. (not needed anymore)
176 lines
4.2 KiB
C++
176 lines
4.2 KiB
C++
/* Copyright (C) 2000-2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
/**
|
|
@file
|
|
|
|
@brief
|
|
Buffers to save and compare item values
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
/**
|
|
Create right type of Cached_item for an item.
|
|
*/
|
|
|
|
Cached_item *new_Cached_item(THD *thd, Item *item, bool pass_through_ref)
|
|
{
|
|
if (pass_through_ref && item->real_item()->type() == Item::FIELD_ITEM &&
|
|
!(((Item_field *) (item->real_item()))->field->flags & BLOB_FLAG))
|
|
{
|
|
Item_field *real_item= (Item_field *) item->real_item();
|
|
Field *cached_field= real_item->field;
|
|
return new Cached_item_field(cached_field);
|
|
}
|
|
switch (item->result_type()) {
|
|
case STRING_RESULT:
|
|
return new Cached_item_str(thd, (Item_field *) item);
|
|
case INT_RESULT:
|
|
return new Cached_item_int((Item_field *) item);
|
|
case REAL_RESULT:
|
|
return new Cached_item_real(item);
|
|
case DECIMAL_RESULT:
|
|
return new Cached_item_decimal(item);
|
|
case ROW_RESULT:
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
Cached_item::~Cached_item() {}
|
|
|
|
/**
|
|
Compare with old value and replace value with new value.
|
|
|
|
@return
|
|
Return true if values have changed
|
|
*/
|
|
|
|
Cached_item_str::Cached_item_str(THD *thd, Item *arg)
|
|
:item(arg),
|
|
value_max_length(min(arg->max_length, thd->variables.max_sort_length)),
|
|
value(value_max_length)
|
|
{}
|
|
|
|
bool Cached_item_str::cmp(void)
|
|
{
|
|
String *res;
|
|
bool tmp;
|
|
|
|
if ((res=item->val_str(&tmp_value)))
|
|
res->length(min(res->length(), value_max_length));
|
|
if (null_value != item->null_value)
|
|
{
|
|
if ((null_value= item->null_value))
|
|
return TRUE; // New value was null
|
|
tmp=TRUE;
|
|
}
|
|
else if (null_value)
|
|
return 0; // new and old value was null
|
|
else
|
|
tmp= sortcmp(&value,res,item->collation.collation) != 0;
|
|
if (tmp)
|
|
value.copy(*res); // Remember for next cmp
|
|
return tmp;
|
|
}
|
|
|
|
Cached_item_str::~Cached_item_str()
|
|
{
|
|
item=0; // Safety
|
|
}
|
|
|
|
bool Cached_item_real::cmp(void)
|
|
{
|
|
double nr= item->val_real();
|
|
if (null_value != item->null_value || nr != value)
|
|
{
|
|
null_value= item->null_value;
|
|
value=nr;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
bool Cached_item_int::cmp(void)
|
|
{
|
|
longlong nr=item->val_int();
|
|
if (null_value != item->null_value || nr != value)
|
|
{
|
|
null_value= item->null_value;
|
|
value=nr;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
bool Cached_item_field::cmp(void)
|
|
{
|
|
bool tmp= FALSE; // Value is identical
|
|
/* Note that field can't be a blob here ! */
|
|
if (null_value != field->is_null())
|
|
{
|
|
null_value= !null_value;
|
|
tmp= TRUE; // Value has changed
|
|
}
|
|
|
|
/*
|
|
If value is not null and value changed (from null to not null or
|
|
becasue of value change), then copy the new value to buffer.
|
|
*/
|
|
if (! null_value && (tmp || (tmp= (field->cmp(buff) != 0))))
|
|
field->get_image(buff,length,field->charset());
|
|
return tmp;
|
|
}
|
|
|
|
|
|
Cached_item_decimal::Cached_item_decimal(Item *it)
|
|
:item(it)
|
|
{
|
|
my_decimal_set_zero(&value);
|
|
}
|
|
|
|
|
|
bool Cached_item_decimal::cmp()
|
|
{
|
|
my_decimal tmp;
|
|
my_decimal *ptmp= item->val_decimal(&tmp);
|
|
if (null_value != item->null_value ||
|
|
(!item->null_value && my_decimal_cmp(&value, ptmp)))
|
|
{
|
|
null_value= item->null_value;
|
|
/* Save only not null values */
|
|
if (!null_value)
|
|
{
|
|
my_decimal2decimal(ptmp, &value);
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
** Instansiate templates
|
|
*****************************************************************************/
|
|
|
|
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
|
|
template class List<Cached_item>;
|
|
template class List_iterator<Cached_item>;
|
|
#endif
|