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

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
This commit is contained in:
bell@sanja.is.com.ua 2003-11-20 14:31:47 +02:00
commit 1c38b23f96
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/item_cmpfunc.cc
View File

@ -1416,18 +1416,18 @@ cmp_item_row::~cmp_item_row()
void cmp_item_row::store_value(Item *item) void cmp_item_row::store_value(Item *item)
{ {
DBUG_ENTER("cmp_item_row::store_value"); DBUG_ENTER("cmp_item_row::store_value");
THD *thd= current_thd;
n= item->cols(); n= item->cols();
if (!comparators) if (!comparators)
comparators= (cmp_item **) thd->calloc(sizeof(cmp_item *)*n); comparators= (cmp_item **) current_thd->calloc(sizeof(cmp_item *)*n);
if (comparators) if (comparators)
{ {
item->bring_value(); item->bring_value();
item->null_value= 0; item->null_value= 0;
for (uint i=0; i < n; i++) for (uint i=0; i < n; i++)
{ {
if (!(comparators[i]= cmp_item::get_comparator(item->el(i)))) if (!comparators[i])
break; // new failed if (!(comparators[i]= cmp_item::get_comparator(item->el(i))))
break; // new failed
comparators[i]->store_value(item->el(i)); comparators[i]->store_value(item->el(i));
item->null_value|= item->el(i)->null_value; item->null_value|= item->el(i)->null_value;
} }