bzr push into mysql-5.1-bugteam branch (davi:2804 to 2805) Bug#38249

[Davi Arnaut]

 2805 Davi Arnaut	2009-02-12
      Backport from 6.0 fix for Bug#38249
      
      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

 2804 Georgi Kodinov	2009-02-12 [merge]
      merged additional fix for bug 33813 to 5.1-bugteam
      modified:
        sql/sql_yacc.yy

=== modified file 'support-files/my-huge.cnf.sh'
--- a/support-files/my-huge.cnf.sh	2008-10-03 12:24:19 +0000
+++ b/support-files/my-huge.cnf.sh	2009-02-12 22:32:37 +0000
@@ -124,7 +124,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-10-03 12:24:19 +0000
+++ b/support-files/my-large.cnf.sh	2009-02-12 22:32:37 +0000
@@ -124,7 +124,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-10-03 12:24:19 +0000
+++ b/support-files/my-medium.cnf.sh	2009-02-12 22:32:37 +0000
@@ -122,7 +122,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-12-28 07:03:44 +0000
+++ b/support-files/my-small.cnf.sh	2009-02-12 22:32:37 +0000
@@ -55,7 +55,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