diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:52:31 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:52:31 +0200 |
| commit | 95270c9c434cd35a86403dd696f85bac98e7bf26 (patch) | |
| tree | fee58d211564ea0987a5b4de6c57d46d31091960 /sql | |
| parent | 6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (diff) | |
| parent | 75a949fb414f8b3ed851a466d84788085c9dbe42 (diff) | |
| download | mariadb-git-95270c9c434cd35a86403dd696f85bac98e7bf26.tar.gz | |
Merge with latest MariaDB 5.1 trunk.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_string.cc | 8 |
3 files changed, 2 insertions, 11 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b234b2f31b2..d80681d337f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -947,7 +947,6 @@ struct Query_cache_query_flags #define query_cache_abort(A) #define query_cache_end_of_result(A) -#define query_cache_invalidate_by_MyISAM_filename_ref NULL #define query_cache_maybe_disabled(T) 1 #define query_cache_is_cacheable_query(L) 0 #endif /*HAVE_QUERY_CACHE*/ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f4c6ae4d56a..114c07b2ca2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8429,7 +8429,7 @@ mysqld_get_one_option(int optid, break; case OPT_LOG_SLOW_FILTER: global_system_variables.log_slow_filter= - find_bit_type_or_exit(argument, &log_slow_verbosity_typelib, + find_bit_type_or_exit(argument, &log_slow_filter_typelib, opt->name, &error); /* If we are using filters, we set opt_slow_admin_statements to be always @@ -8441,7 +8441,7 @@ mysqld_get_one_option(int optid, break; case OPT_LOG_SLOW_VERBOSITY: global_system_variables.log_slow_verbosity= - find_bit_type_or_exit(argument, &log_slow_filter_typelib, + find_bit_type_or_exit(argument, &log_slow_verbosity_typelib, opt->name, &error); if (error) return 1; diff --git a/sql/sql_string.cc b/sql/sql_string.cc index e9927c8e85c..bdecabd782b 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -27,14 +27,6 @@ #include <floatingpoint.h> #endif -/* - The following extern declarations are ok as these are interface functions - required by the string function -*/ - -extern uchar* sql_alloc(unsigned size); -extern void sql_element_free(void *ptr); - #include "sql_string.h" /***************************************************************************** |