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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
unknown 2005-07-02 20:18:43 +03:00
commit c7ab92c28a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -8223,12 +8223,10 @@ cp_buffer_from_ref(THD *thd, TABLE_REF *ref)
thd->count_cuted_fields= CHECK_FIELD_IGNORE; thd->count_cuted_fields= CHECK_FIELD_IGNORE;
for (store_key **copy=ref->key_copy ; *copy ; copy++) for (store_key **copy=ref->key_copy ; *copy ; copy++)
{ {
int res; if ((*copy)->copy() & 1)
if ((res= (*copy)->copy()))
{ {
thd->count_cuted_fields= save_count_cuted_fields; thd->count_cuted_fields= save_count_cuted_fields;
if ((res= res & 1)) return 1; // Something went wrong
return res; // Something went wrong
} }
} }
thd->count_cuted_fields= save_count_cuted_fields; thd->count_cuted_fields= save_count_cuted_fields;
@ -8827,7 +8825,8 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
DBUG_RETURN(0); DBUG_RETURN(0);
err: err:
delete [] param->copy_field; // This is never 0 if (copy)
delete [] param->copy_field;
param->copy_field=0; param->copy_field=0;
err2: err2:
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);