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

fix compilation errors for builds w/o maria engine.

Browse Source 
tests still fail, the fix will come from 5.1 tree
This commit is contained in:
Sergei Golubchik 2010-05-10 15:46:08 +02:00
parent cb325eb2b2
commit 7715f237cc
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_select.cc
View File

@ -122,14 +122,9 @@ static COND *optimize_cond(JOIN *join, COND *conds,
List<TABLE_LIST> *join_list, List<TABLE_LIST> *join_list,
Item::cond_result *cond_value); Item::cond_result *cond_value);
static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item); static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item);
static bool static bool create_internal_tmp_table_from_heap2(THD *, TABLE *,
create_internal_tmp_table_from_heap2(THD *thd, TABLE *table, ENGINE_COLUMNDEF *, ENGINE_COLUMNDEF **,
ENGINE_COLUMNDEF *start_recinfo, int, bool, handlerton *, const char *);
ENGINE_COLUMNDEF **recinfo,
int error,
bool ignore_last_dupp_key_error,
handlerton *hton,
const char *proc_info);
static int do_select(JOIN *join,List<Item> *fields,TABLE *tmp_table, static int do_select(JOIN *join,List<Item> *fields,TABLE *tmp_table,
Procedure *proc); Procedure *proc);
@ -11916,10 +11911,10 @@ bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table,
/* Create internal MyISAM temporary table */ /* Create internal MyISAM temporary table */
static bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
ENGINE_COLUMNDEF *start_recinfo, ENGINE_COLUMNDEF *start_recinfo,
ENGINE_COLUMNDEF **recinfo, ENGINE_COLUMNDEF **recinfo,
ulonglong options) ulonglong options)
{ {
int error; int error;
MI_KEYDEF keydef; MI_KEYDEF keydef;
@ -11950,7 +11945,7 @@ static bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
uniquedef.null_are_equal=1; uniquedef.null_are_equal=1;
/* Create extra column for hash value */ /* Create extra column for hash value */
bzero((uchar*) param->recinfo,sizeof(*param->recinfo)); bzero((uchar*) *recinfo,sizeof(**recinfo));
(*recinfo)->type= FIELD_CHECK; (*recinfo)->type= FIELD_CHECK;
(*recinfo)->length=MI_UNIQUE_HASH_LENGTH; (*recinfo)->length=MI_UNIQUE_HASH_LENGTH;
(*recinfo)++; (*recinfo)++;
@ -12033,11 +12028,13 @@ static bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
*/ */
bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table, bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table,
TMP_TABLE_PARAM *param, ENGINE_COLUMNDEF *start_recinfo,
ENGINE_COLUMNDEF **recinfo,
int error, int error,
bool ignore_last_dupp_key_error) bool ignore_last_dupp_key_error)
{ {
return create_internal_tmp_table_from_heap2(thd, table, param, error, return create_internal_tmp_table_from_heap2(thd, table,
start_recinfo, recinfo, error,
ignore_last_dupp_key_error, ignore_last_dupp_key_error,
myisam_hton, myisam_hton,
"converting HEAP to MyISAM"); "converting HEAP to MyISAM");