diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-04 16:32:42 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-04 16:32:42 +0200 |
| commit | a9243256561811436245c846b1ad05812e0a62e3 (patch) | |
| tree | 075560442ea23458f2ec0f14bb66460900fb5f3a /sql | |
| parent | 6426564753a8a023085307a53476e6a5bc7fc03c (diff) | |
| parent | 7fc608619260d6f74e70b990cdf48fff15e9e115 (diff) | |
| download | mariadb-git-a9243256561811436245c846b1ad05812e0a62e3.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql')
| -rwxr-xr-x | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index b431ee075fe..7e8484eeb50 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -18,7 +18,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") -SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS") +SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include diff --git a/sql/set_var.cc b/sql/set_var.cc index 38721c154e6..910deafc432 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -128,7 +128,9 @@ static void fix_net_write_timeout(THD *thd, enum_var_type type); static void fix_net_retry_count(THD *thd, enum_var_type type); static void fix_max_join_size(THD *thd, enum_var_type type); static void fix_query_cache_size(THD *thd, enum_var_type type); +#ifdef HAVE_QUERY_CACHE static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type); +#endif static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type); static void fix_max_binlog_size(THD *thd, enum_var_type type); static void fix_max_relay_log_size(THD *thd, enum_var_type type); |