database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge branch '10.11' into 11.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 16:39:47 +01:00
parent 52723ec09a 3d0fb15028
commit 69d033d165
660 changed files with 8148 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_help.cc
View File

@@ -203,7 +203,7 @@ int search_topics(THD *thd, TABLE *topics, struct st_find_field *find_fields,
while (!read_record_info.read_record())
{
if (!select->cond->val_int()) // Doesn't match like
if (!select->cond->val_bool()) // Doesn't match like
continue;
memorize_variant_topic(thd,topics,count,find_fields,
names,name,description,example);
@@ -247,7 +247,7 @@ int search_keyword(THD *thd, TABLE *keywords,
while (!read_record_info.read_record() && count<2)
{
if (!select->cond->val_int()) // Dosn't match like
if (!select->cond->val_bool()) // Dosn't match like
continue;
*key_id= (int)find_fields[help_keyword_help_keyword_id].field->val_int();
@@ -381,7 +381,7 @@ int search_categories(THD *thd, TABLE *categories,
DBUG_RETURN(0);
while (!read_record_info.read_record())
{
if (select && !select->cond->val_int())
if (select && !select->cond->val_bool())
continue;
String *lname= new (thd->mem_root) String;
get_field(thd->mem_root,pfname,lname);
@@ -419,7 +419,7 @@ void get_all_items_for_category(THD *thd, TABLE *items, Field *pfname,
while (!read_record_info.read_record())
{
if (!select->cond->val_int())
if (!select->cond->val_bool())
continue;
String *name= new (thd->mem_root) String();
get_field(thd->mem_root,pfname,name);