From ad2c37731708a61e069b3583fc6da841a6fb4580 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Mar 2004 15:14:36 +0200 Subject: DBUG_ASSERT(fixed == 1); added to val* small optimisation in signed_literal sql/field.cc: layout fixed sql/item.cc: DBUG_ASSERT(fixed == 1); added to val* layout fixed fixed= 1; added where it was forgoten in fix_fields Item_string can be used without fix_fields sql/item.h: DBUG_ASSERT(fixed == 1); added to val* Item_string can be used without fix_fields sql/item_cmpfunc.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_cmpfunc.h: fixed layout and getting Item statistic sql/item_func.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_func.h: DBUG_ASSERT(fixed == 1); added to val* sql/item_geofunc.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_strfunc.cc: DBUG_ASSERT(fixed == 1); added to val* layout fixed sql/item_strfunc.h: DBUG_ASSERT(fixed == 1); added to val* sql/item_subselect.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_sum.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_sum.h: DBUG_ASSERT(fixed == 1); added to val* sql/item_timefunc.cc: DBUG_ASSERT(fixed == 1); added to val* sql/item_timefunc.h: DBUG_ASSERT(fixed == 1); added to val* sql/item_uniq.h: DBUG_ASSERT(fixed == 1); added to val* sql/sql_base.cc: Item creation revised sql/sql_help.cc: Item creation revised sql/sql_load.cc: Item creation revised sql/sql_parse.cc: fix_field call added sql/sql_select.cc: Item creation revised sql/sql_show.cc: Item creation revised sql/sql_union.cc: Item creation revised sql/sql_update.cc: Item creation revised sql/sql_yacc.yy: Item creation revised small optimisation in signed_literal --- sql/sql_help.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'sql/sql_help.cc') diff --git a/sql/sql_help.cc b/sql/sql_help.cc index e12dde68266..f3d5775133c 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -624,7 +624,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, uint mlen, TABLE_LIST *tables, TABLE *table, Field *pfname, int *error) { - Item *cond= new Item_func_like(new Item_field(pfname), + Item *cond= new Item_func_like(new Item_field(pfname, 1), new Item_string(mask,mlen,pfname->charset()), (char*) "\\"); if (thd->is_fatal_error) @@ -743,15 +743,18 @@ int mysqld_help(THD *thd, const char *mask) else { Field *topic_cat_id= used_fields[help_topic_help_category_id].field; - Item *cond_topic_by_cat= new Item_func_equal(new Item_field(topic_cat_id), - new Item_int((int32)category_id)); - Item *cond_cat_by_cat= new Item_func_equal(new Item_field(cat_cat_id), - new Item_int((int32)category_id)); + Item *cond_topic_by_cat= + new Item_func_equal(new Item_field(topic_cat_id, 1), + new Item_int((int32)category_id)); + Item *cond_cat_by_cat= + new Item_func_equal(new Item_field(cat_cat_id, 1), + new Item_int((int32)category_id)); if (!(select_topics_by_cat= prepare_simple_select(thd,cond_topic_by_cat, tables,tables[0].table, &error)) || - !(select_cat_by_cat= prepare_simple_select(thd,cond_cat_by_cat,tables, - tables[1].table,&error))) + !(select_cat_by_cat= + prepare_simple_select(thd,cond_cat_by_cat,tables, + tables[1].table,&error))) { res= -1; goto end; -- cgit v1.2.1