Merge with 3.23.51

Fixed wrong usage of sprintf() in ha_innodb.cc


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.ja.texi:
  Auto merged
include/config-os2.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/key.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
Docs/manual.texi:
  Merge with 3.23.51
configure.in:
  Merge with 3.23.51
include/Makefile.am:
  Merge with 3.23.51
innobase/dict/dict0load.c:
  Merge with 3.23.51
innobase/include/univ.i:
  Merge with 3.23.51
innobase/row/row0mysql.c:
  Merge with 3.23.51
innobase/srv/srv0srv.c:
  Merge with 3.23.51
innobase/srv/srv0start.c:
  Merge with 3.23.51
myisam/mi_cache.c:
  Merge with 3.23.51
myisammrg/myrg_rnext.c:
  Merge with 3.23.51
myisammrg/myrg_rprev.c:
  Merge with 3.23.51
sql/ha_innodb.cc:
  Merge with 3.23.51
  Changed used of sprintf() to make code portable.
sql/handler.cc:
  Indentation change
sql/lex.h:
  Comment cleanup
sql/log.cc:
  Merge with 3.23.51
sql/log_event.h:
  Merge with 3.23.51
sql/mysql_priv.h:
  Merge with 3.23.51
sql/mysqld.cc:
  Merge with 3.23.51
  Cleaned up handling of innodb_flush_log_at_trx_commit
sql/share/portuguese/errmsg.txt:
  Merge with 3.23.51
sql/slave.cc:
  Not merged as this affects many files; Will be fixed in next changeset
sql/slave.h:
  Merge with 3.23.51
sql/sql_acl.cc:
  Merge with 3.23.51 (no changes)
sql/sql_db.cc:
  Merge with 3.23.51
sql/sql_parse.cc:
  Merge with 3.23.51
sql/sql_yacc.yy:
  Merge with 3.23.51
  (Renamed NO_FOREIGN_KEY_CHECKS and RELAXED_UNIQUE_CHECKS)
support-files/mysql.spec.sh:
  Merge with 3.23.51

4 files changed, 30 insertions, 34 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]
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 0602921abc1..3c388d611d8 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -42,20 +42,19 @@ server-id	= 1
 #set-variable	= bdb_cache_size=64M
 #set-variable	= bdb_max_lock=100000
 
-# Uncomment the following if you are using Innobase tables
-#innodb_data_file_path = ibdata1:1000M
+# Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
+#innodb_data_file_path = ibdata1: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=256M
+#set-variable = innodb_additional_mem_pool_size=20M
+# Set .._log_file_size to 25 % of buffer pool size
+#set-variable = innodb_log_file_size=64M
 #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
 
 # Point the following paths to different dedicated disks
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
index bddba03eee9..a92494358cb 100644
--- a/support-files/my-medium.cnf.sh
+++ b/support-files/my-medium.cnf.sh
@@ -44,20 +44,19 @@ server-id	= 1
 #set-variable	= bdb_cache_size=4M
 #set-variable	= bdb_max_lock=10000
 
-# Uncomment the following if you are using Innobase tables
-#innodb_data_file_path = ibdata1:400M
+# Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
+#innodb_data_file_path = ibdata1: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
+# 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=16M
+#set-variable = innodb_additional_mem_pool_size=2M
+# Set .._log_file_size to 25 % of buffer pool size
 #set-variable = innodb_log_file_size=5M
 #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]
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index 9e7d07ec449..b8941184fe0 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -41,20 +41,19 @@ server-id	= 1
 # Uncomment the following if you are NOT using BDB tables
 #skip-bdb
 
-# Uncomment the following if you are using Innobase tables
-#innodb_data_file_path = ibdata1:100M
+# Uncomment the following if you are using InnoDB tables
 #innodb_data_home_dir = @localstatedir@/
+#innodb_data_file_path = ibdata1: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
+# 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=16M
+#set-variable = innodb_additional_mem_pool_size=2M
+# Set .._log_file_size to 25 % of buffer pool size
 #set-variable = innodb_log_file_size=5M
 #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]