database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Sundry changes to fix merge problems. Most of these are duplicated

Browse Source 
in 5.0-community, but pulling to merge was very hard.
This commit is contained in:
cmiller@zippy.cornsilk.net
2007-10-31 16:39:59 -04:00
parent 44ba122726
commit 872d65a547
6 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/mysqld.cc
View File

@@ -5654,8 +5654,8 @@ master-ssl",
(uchar**) &mysqld_port_timeout, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
{"profiling_history_size", OPT_PROFILING, "Limit of query profiling memory",
(gptr*) &global_system_variables.profiling_history_size,
(gptr*) &max_system_variables.profiling_history_size,
(uchar**) &global_system_variables.profiling_history_size,
(uchar**) &max_system_variables.profiling_history_size,
0, GET_ULONG, REQUIRED_ARG, 15, 0, 100, 0, 0, 0},
#endif
{"relay-log", OPT_RELAY_LOG,
@@ -7204,7 +7204,6 @@ static void mysql_init_variables(void)
"d:t:i:o,/tmp/mysqld.trace");
#endif
opt_error_log= IF_WIN(1,0);
#endif
#ifdef COMMUNITY_SERVER
have_community_features = SHOW_OPTION_YES;
#else