diff options
| author | unknown <monty@mysql.com> | 2006-06-06 13:40:15 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-06 13:40:15 +0300 |
| commit | 0b870cc18e552dab5f33174c583b8af01f24ba9d (patch) | |
| tree | 82b49880f9090718cbf70c31cf25208586902565 | |
| parent | 2017107969f25998c2e0970b6bbe3749ef9ea244 (diff) | |
| download | mariadb-git-0b870cc18e552dab5f33174c583b8af01f24ba9d.tar.gz | |
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
| -rw-r--r-- | extra/yassl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/filesort.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index cafa3011e94..e5429876072 100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -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 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); diff --git a/sql/handler.cc b/sql/handler.cc index 9bb051dac30..81c42f9da15 100644 --- a/sql/handler.cc +++ b/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" }, |