bzr push into mysql-6.0 branch (kostja:2721 to 2722) Bug#38249

[Konstantin Osipov]

 2722 Konstantin Osipov	2008-10-03
      Fix Bug#38249 innodb_log_arch_dir still in support files
      Remove a non-supported variable from cnf file templates.
modified:
  support-files/my-huge.cnf.sh
  support-files/my-large.cnf.sh
  support-files/my-medium.cnf.sh
  support-files/my-small.cnf.sh

 2721 Konstantin Osipov	2008-10-03
      A fix and a test case for Bug#36473 Assertion "! is_set()" fails in 
      Diagnostics_area::set_ok_status with Falcon.
      
      When running in strict mode, update_auto_increment() function
      may return an error. In case of Bug#36473 the error was due to an 
      out of range auto increment value for a TINYINT column.
      Falcon handler implementation did not check for the return value
      and that led to an attempt to commit statement transaction in the
      server and return success status to the user.
      Fix by checking the return value of update_auto_increment().
modified:
  mysql-test/suite/falcon/r/falcon_bugs.result
  mysql-test/suite/falcon/t/falcon_bugs.test
  storage/falcon/ha_falcon.cpp

=== modified file 'support-files/my-huge.cnf.sh'
--- a/support-files/my-huge.cnf.sh	2008-07-19 08:31:33 +0000
+++ b/support-files/my-huge.cnf.sh	2008-10-02 21:56:21 +0000
@@ -121,7 +121,6 @@ server-id	= 1
 #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@/
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M

=== modified file 'support-files/my-large.cnf.sh'
--- a/support-files/my-large.cnf.sh	2008-07-19 08:31:33 +0000
+++ b/support-files/my-large.cnf.sh	2008-10-02 21:56:21 +0000
@@ -121,7 +121,6 @@ server-id	= 1
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = @localstatedir@/
-#innodb_log_arch_dir = @localstatedir@/
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 256M

=== modified file 'support-files/my-medium.cnf.sh'
--- a/support-files/my-medium.cnf.sh	2008-07-19 08:31:33 +0000
+++ b/support-files/my-medium.cnf.sh	2008-10-02 21:56:21 +0000
@@ -119,7 +119,6 @@ server-id	= 1
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = @localstatedir@/
-#innodb_log_arch_dir = @localstatedir@/
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M

=== modified file 'support-files/my-small.cnf.sh'
--- a/support-files/my-small.cnf.sh	2008-07-09 22:13:42 +0000
+++ b/support-files/my-small.cnf.sh	2008-10-02 21:56:21 +0000
@@ -52,7 +52,6 @@ server-id	= 1
 #innodb_data_home_dir = @localstatedir@/
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = @localstatedir@/
-#innodb_log_arch_dir = @localstatedir@/
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 16M