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

Merge with 4.0.6

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-12-05 19:38:42 +02:00
parent 564487d7c0 496a0e1630
commit 859b688476
88 changed files with 2094 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_handler.cc
View File

@ -180,10 +180,10 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
Item *item;
for (key_len=0 ; (item=it_ke++) ; key_part++)
{
(void) item->save_in_field(key_part->field);
(void) item->save_in_field(key_part->field, 1);
key_len+=key_part->store_length;
}
if (!(key= (byte*) sql_calloc(ALIGN_SIZE(key_len))))
if (!(key= (byte*) thd->calloc(ALIGN_SIZE(key_len))))
{
send_error(thd,ER_OUTOFMEMORY);
goto err;