diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-16 14:51:50 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-16 14:51:50 +0200 |
| commit | 3e748505de096195821ece6018187b82e1b979c1 (patch) | |
| tree | 8ab0a6f4f3bc691738b016bba8914df568f9f211 | |
| parent | 2b1044d8a4d3d71e9ed03e89b17cd63f3e525b1d (diff) | |
| download | mariadb-git-3e748505de096195821ece6018187b82e1b979c1.tar.gz | |
Fix MySQL Bug #21978 : 'flush_time' value set for 1800 sec
This setting is obsolete now. It could makes sense in the past, situations open file handles
limit was low. It does not make sense anymore to flush all files every 1.5 hours now, after 2048
myisam file limit is removed as fix to MySQL bug #24509.
| -rw-r--r-- | sql/mysql_priv.h | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index bd2f31fbe1d..db1c385c992 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -401,7 +401,6 @@ protected: #define DELAYED_LIMIT 100 /**< pause after xxx inserts */ #define DELAYED_QUEUE_SIZE 1000 #define DELAYED_WAIT_TIMEOUT 5*60 /**< Wait for delayed insert */ -#define FLUSH_TIME 0 /**< Don't flush tables */ #define MAX_CONNECT_ERRORS 10 ///< errors before disabling host #ifdef __NETWARE__ @@ -411,8 +410,6 @@ protected: #endif #if defined(__WIN__) -#undef FLUSH_TIME -#define FLUSH_TIME 1800 /**< Flush every half hour */ #define INTERRUPT_PRIOR -2 #define CONNECT_PRIOR -1 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3fee65fe963..19d5a84e67d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7104,7 +7104,7 @@ each time the SQL thread starts.", { "flush_time", OPT_FLUSH_TIME, "A dedicated thread is created to flush all tables at the given interval.", &flush_time, &flush_time, 0, GET_ULONG, REQUIRED_ARG, - FLUSH_TIME, 0, LONG_TIMEOUT, 0, 1, 0}, + 0 , 0, LONG_TIMEOUT, 0, 1, 0}, { "ft_boolean_syntax", OPT_FT_BOOLEAN_SYNTAX, "List of operators for MATCH ... AGAINST ( ... IN BOOLEAN MODE).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |