diff options
author | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
---|---|---|
committer | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
commit | 7a92412c5959ce3c216485be1951dead7d778326 (patch) | |
tree | 466955c9bb93adf167f39ad0a759ea8e1ac8144d /sql/sql_help.cc | |
parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
parent | 62513bb1bca33902fa909ca13b25c550046ee3ae (diff) | |
download | mariadb-git-7a92412c5959ce3c216485be1951dead7d778326.tar.gz |
Merge fix for BUG#35478 into 5.1
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r-- | sql/sql_help.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index e424425272e..f51ad318568 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -186,7 +186,7 @@ int search_topics(THD *thd, TABLE *topics, struct st_find_field *find_fields, int count= 0; READ_RECORD read_record_info; - init_read_record(&read_record_info, thd, topics, select,1,0); + init_read_record(&read_record_info, thd, topics, select, 1, 0, FALSE); while (!read_record_info.read_record(&read_record_info)) { if (!select->cond->val_int()) // Doesn't match like @@ -226,7 +226,7 @@ int search_keyword(THD *thd, TABLE *keywords, struct st_find_field *find_fields, int count= 0; READ_RECORD read_record_info; - init_read_record(&read_record_info, thd, keywords, select,1,0); + init_read_record(&read_record_info, thd, keywords, select, 1, 0, FALSE); while (!read_record_info.read_record(&read_record_info) && count<2) { if (!select->cond->val_int()) // Dosn't match like @@ -350,7 +350,7 @@ int search_categories(THD *thd, TABLE *categories, DBUG_ENTER("search_categories"); - init_read_record(&read_record_info, thd, categories, select,1,0); + init_read_record(&read_record_info, thd, categories, select,1,0,FALSE); while (!read_record_info.read_record(&read_record_info)) { if (select && !select->cond->val_int()) @@ -384,7 +384,7 @@ void get_all_items_for_category(THD *thd, TABLE *items, Field *pfname, DBUG_ENTER("get_all_items_for_category"); READ_RECORD read_record_info; - init_read_record(&read_record_info, thd, items, select,1,0); + init_read_record(&read_record_info, thd, items, select,1,0,FALSE); while (!read_record_info.read_record(&read_record_info)) { if (!select->cond->val_int()) |