From 0b870cc18e552dab5f33174c583b8af01f24ba9d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jun 2006 13:40:15 +0300 Subject: Manually reapplied msvenssons changes to new BK tree: Add definition of YASSL_PREFIX to Cmake file Change "and" to "&&" Remove the "static" directive SunCC can't use the function extra/yassl/CMakeLists.txt: Add definition of YASSL_PREFIX to Cmake file sql/filesort.cc: Change "and" to "&&" sql/handler.cc: Remove the "static" directive SunCC can't use the function --- sql/filesort.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/filesort.cc') diff --git a/sql/filesort.cc b/sql/filesort.cc index 38c7910be91..4e48df5db9f 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -454,7 +454,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, /* Temporary set for register_used_fields and register_field_in_read_map */ sort_form->read_set= &sort_form->tmp_set; register_used_fields(param); - if (select and select->cond) + if (select && select->cond) select->cond->walk(&Item::register_field_in_read_map, 1, (byte*) sort_form); sort_form->column_bitmaps_set(&sort_form->tmp_set, &sort_form->tmp_set); -- cgit v1.2.1