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

Manual merge

Browse Source
This commit is contained in:
igor@rurik.mysql.com
2005-06-23 11:22:30 -07:00
parent 0a5223bf8a 1c348f48a9
commit 268110b34b
9 changed files with 273 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -11766,10 +11766,12 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref)
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
for (store_key **copy=ref->key_copy ; *copy ; copy++)
{
if ((*copy)->copy())
int res;
if ((res= (*copy)->copy()))
{
thd->count_cuted_fields= save_count_cuted_fields;
return 1; // Something went wrong
if ((res= res & 1))
return res; // Something went wrong
}
}
thd->count_cuted_fields= save_count_cuted_fields;