Merge with 3.23.51

Fixed wrong usage of sprintf() in ha_innodb.cc

1 files changed, 8 insertions, 9 deletions

diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 88d83afb986..50a14b0fc96 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -61,20 +61,19 @@ server-id	= 1 # required unique id between 1 and 2^32 - 1
 #set-variable	= bdb_cache_size=384M
 #set-variable	= bdb_max_lock=100000
 
-# Uncomment the following if you are using Innobase tables
-#innodb_data_file_path = ibdata1:2000M;ibdata2:2000M
+# Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
+#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
 #innodb_log_group_home_dir = @localstatedir@/
 #innodb_log_arch_dir = @localstatedir@/
-#set-variable = innodb_mirrored_log_groups=1
-#set-variable = innodb_log_files_in_group=3
-#set-variable = innodb_log_file_size=5M
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#set-variable = innodb_buffer_pool_size=384M
+#set-variable = innodb_additional_mem_pool_size=20M
+# Set .._log_file_size to 25 % of buffer pool size
+#set-variable = innodb_log_file_size=100M
 #set-variable = innodb_log_buffer_size=8M
 #innodb_flush_log_at_trx_commit=1
-#innodb_log_archive=0
-#set-variable = innodb_buffer_pool_size=16M
-#set-variable = innodb_additional_mem_pool_size=2M
-#set-variable = innodb_file_io_threads=4
 #set-variable = innodb_lock_wait_timeout=50
 
 [mysqldump]