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

extra/yassl/CMakeLists.txt

-ADD_DEFINITIONS("-DWIN32 -D_LIB")
+ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
 
 INCLUDE_DIRECTORIES(include taocrypt/include mySTL)
 ADD_LIBRARY(yassl src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 

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

sql/handler.cc

@@ -3172,7 +3172,7 @@ namespace {
     return res != 0 ? res : strcmp(x->name, y->name);
   }
 
-  static bool check_table_binlog_row_based(THD *thd, TABLE *table)
+  bool check_table_binlog_row_based(THD *thd, TABLE *table)
   {
     static st_table_data const ignore[] = {
       { "mysql", "event" },