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

cleanup

Browse Source
This commit is contained in:
serg@serg.mysql.com 2003-03-14 20:22:06 +01:00
parent f4b165ae05
commit 9749ece292
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/key.cc
View File

@ -67,7 +67,7 @@ int find_ref_key(TABLE *table,Field *field, uint *key_length)
/* Copy a key from record to some buffer */ /* Copy a key from record to some buffer */
/* if length == 0 then copy hole key */ /* if length == 0 then copy whole key */
void key_copy(byte *key,TABLE *table,uint idx,uint key_length) void key_copy(byte *key,TABLE *table,uint idx,uint key_length)
{ {

14
sql/sql_select.cc
View File

@ -2757,19 +2757,15 @@ static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, KEYUSE *org_keyuse,
if (!keyuse->used_tables && if (!keyuse->used_tables &&
!(join->select_options & SELECT_DESCRIBE)) !(join->select_options & SELECT_DESCRIBE))
{ // Compare against constant { // Compare against constant
store_key_item *tmp=new store_key_item(thd, store_key_item tmp(thd, keyinfo->key_part[i].field,
keyinfo->key_part[i].field, (char*)key_buff + maybe_null,
(char*)key_buff + maybe_null ? (char*) key_buff : 0,
maybe_null, keyinfo->key_part[i].length, keyuse->val);
maybe_null ?
(char*) key_buff : 0,
keyinfo->key_part[i].length,
keyuse->val);
if (thd->is_fatal_error) if (thd->is_fatal_error)
{ {
return TRUE; return TRUE;
} }
tmp->copy(); tmp.copy();
} }
else else
*ref_key++= get_store_key(thd, *ref_key++= get_store_key(thd,

3
sql/sql_select.h
View File

@ -174,7 +174,7 @@ class JOIN :public Sql_alloc
Item_sum **sum_funcs; Item_sum **sum_funcs;
Procedure *procedure; Procedure *procedure;
Item *having; Item *having;
Item *tmp_having; // To store Having when processed tenporary table Item *tmp_having; // To store Having when processed temporary table
uint select_options; uint select_options;
select_result *result; select_result *result;
TMP_TABLE_PARAM tmp_table_param; TMP_TABLE_PARAM tmp_table_param;
@ -307,7 +307,6 @@ class store_key :public Sql_alloc
{ {
protected: protected:
Field *to_field; // Store data here Field *to_field; // Store data here
Field *key_field; // Copy of key field
char *null_ptr; char *null_ptr;
char err; char err;
public: public: