Merge pull request #173 from helmo/master

Update advisory rules

libraries/advisory_rules.txt

@@ -77,7 +77,7 @@ rule 'Slow query rate' [Questions > 0]
 rule 'Long query time' [!PMA_DRIZZLE]
 	long_query_time
 	value >= 10
-	long_query_time is set to 10 seconds or more, thus only slow queries that take above 10 seconds are logged.
+	{long_query_time} is set to 10 seconds or more, thus only slow queries that take above 10 seconds are logged.
 	It is suggested to set {long_query_time} to a lower value, depending on your environment. Usually a value of 1-5 seconds is suggested.
 	long_query_time is currently set to %ds. | value
 
@@ -212,14 +212,14 @@ rule 'Percentage of sorts that cause temporary tables' [Sort_scan + Sort_range >
 	Sort_merge_passes / (Sort_scan + Sort_range) * 100
 	value > 10
 	Too many sorts are causing temporary tables.
-	Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending on your system memory limits
+	Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, depending on your system memory limits
 	%s% of all sorts cause temporary tables, this value should be lower than 10%. | round(value,1)
 
 rule 'Rate of sorts that cause temporary tables'
 	Sort_merge_passes / Uptime
 	value * 60 * 60 > 1
 	Too many sorts are causing temporary tables.
-	Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending on your system memory limits
+	Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, depending on your system memory limits
 	Temporary tables average: %s, this value should be less than 1 per hour. | ADVISOR_bytime(value,2)
 
 rule 'Sort rows'
@@ -262,7 +262,7 @@ rule 'Rate of reading next table row'
 rule 'tmp_table_size vs. max_heap_table_size'
 	tmp_table_size - max_heap_table_size
 	value !=0
-	tmp_table_size and max_heap_table_size are not the same.
+	{tmp_table_size} and {max_heap_table_size} are not the same.
 	If you have deliberately changed one of either: The server uses the lower value of either to determine the maximum size of in-memory tables. So if you wish to increase the in-memory table limit you will have to increase the other value as well.
 	Current values are tmp_table_size: %s, max_heap_table_size: %s | implode(' ',ADVISOR_formatByteDown(tmp_table_size, 2, 2)), implode(' ',ADVISOR_formatByteDown(max_heap_table_size, 2, 2))
 
@@ -335,14 +335,14 @@ rule 'Percentage of used open files limit' [!PMA_DRIZZLE]
 	Open_files / open_files_limit * 100
 	value > 85
 	The number of open files is approaching the max number of open files.  You may get a "Too many open files" error.
-	Consider increasing {open_files_limit}, and check the error log when restarting after changing open_files_limit.
+	Consider increasing {open_files_limit}, and check the error log when restarting after changing {open_files_limit}.
 	The number of opened files is at %s% of the limit. It should be below 85% | round(value,1)
 
 rule 'Rate of open files' [!PMA_DRIZZLE]
 	Open_files / Uptime
 	value * 60 * 60 > 5
 	The rate of opening files is high.
-	Consider increasing {open_files_limit}, and check the error log when restarting after changing open_files_limit.
+	Consider increasing {open_files_limit}, and check the error log when restarting after changing {open_files_limit}.
 	Opened files rate: %s, this value should be less than 5 per hour | ADVISOR_bytime(value,2)
 
 rule 'Immediate table locks %' [Table_locks_waited + Table_locks_immediate > 0]
@@ -384,16 +384,16 @@ rule 'Slow launch time' [!PMA_DRIZZLE]
 	slow_launch_time
 	value > 2
 	Slow_launch_threads is above 2s
-	Set slow_launch_time to 1s or 2s to correctly count threads that are slow to launch
+	Set {slow_launch_time} to 1s or 2s to correctly count threads that are slow to launch
 	slow_launch_time is set to %s | value
 
 #
 #Connections
 rule 'Percentage of used connections' [!PMA_DRIZZLE]
 	Max_used_connections / max_connections * 100
 	value > 80
-	The maximum amount of used connections is getting close to the value of max_connections.
-	Increase max_connections, or decrease wait_timeout so that connections that do not close database handlers properly get killed sooner. Make sure the code closes database handlers properly.
+	The maximum amount of used connections is getting close to the value of {max_connections}.
+	Increase {max_connections}, or decrease {wait_timeout} so that connections that do not close database handlers properly get killed sooner. Make sure the code closes database handlers properly.
 	Max_used_connections is at %s% of max_connections, it should be below 80% | round(value,1)
 
 rule 'Percentage of aborted connections'
@@ -435,14 +435,14 @@ rule 'Is InnoDB disabled?' [!PMA_DRIZZLE && PMA_MYSQL_INT_VERSION < 50600]
 
 rule 'InnoDB log size' [innodb_buffer_pool_size > 0]
 	innodb_log_file_size / innodb_buffer_pool_size * 100
-	value < 20
+	value < 20 && innodb_log_file_size / (1024 * 1024) < 256
 	The InnoDB log file size is not an appropriate size, in relation to the InnoDB buffer pool.
 	Especially on a system with a lot of writes to InnoDB tables you should set {innodb_log_file_size} to 25% of {innodb_buffer_pool_size}. However the bigger this value, the longer the recovery time will be when database crashes, so this value should not be set much higher than 256 MiB. Please note however that you cannot simply change the value of this variable. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="http://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
 	Your InnoDB log size is at %s% in relation to the InnoDB buffer pool size, it should not be below 20% | round(value,1)
 
 rule 'Max InnoDB log size' [innodb_buffer_pool_size > 0 && innodb_log_file_size / innodb_buffer_pool_size * 100 < 30]
 	innodb_log_file_size / (1024 * 1024)
-	value >= 128
+	value > 256
 	The InnoDB log file size is inadequately large.
 	It is usually sufficient to set {innodb_log_file_size} to 25% of the size of {innodb_buffer_pool_size}. A very big {innodb_log_file_size} slows down the recovery time after a database crash considerably. See also <a href="http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-innodb_log_file_size/">this Article</a>. You need to shutdown the server, remove the InnoDB log files, set the new value in my.cnf, start the server, then check the error logs if everything went fine. See also <a href="http://mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-proper-way.html">this blog entry</a>
 	Your absolute InnoDB log size is %s MiB | round(value,1)
@@ -459,7 +459,7 @@ rule 'InnoDB buffer pool size' [system_memory > 0]
 rule 'MyISAM concurrent inserts' [!PMA_DRIZZLE]
 	concurrent_insert
 	value === 0 || value === 'NEVER'
-	Enable concurrent_insert by setting it to 1
+	Enable {concurrent_insert} by setting it to 1
 	Setting {concurrent_insert} to 1 reduces contention between readers and writers for a given table. See also <a href="http://dev.mysql.com/doc/refman/5.5/en/concurrent-inserts.html">MySQL Documentation</a>
 	concurrent_insert is set to 0