1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manually reapplied msvenssons changes to new BK tree:

Browse Source 
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
This commit is contained in:
unknown 2006-06-06 13:40:15 +03:00
parent 2017107969
commit 0b870cc18e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/CMakeLists.txt
View File

@ -1,4 +1,4 @@
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

2
sql/filesort.cc
View File

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

2
sql/handler.cc
View File

@ -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" },