database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

DBUG_ASSERT(fixed == 1); added to val*

Browse Source 
small optimisation in signed_literal
This commit is contained in:
bell@sanja.is.com.ua
2004-03-18 15:14:36 +02:00
parent 8035ce40ec
commit 2b45b53066
25 changed files with 504 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_help.cc
View File

@@ -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;