[Pkg-mysql-commits] r2215 - in mysql-5.6/trunk/debian: . additions patches

[Bjoern Boschman]

Author: jesusch-guest
Date: 2013-02-26 12:36:41 +0000 (Tue, 26 Feb 2013)
New Revision: 2215

Added:
   mysql-5.6/trunk/debian/patches/mysql-bug-68416.patch
Modified:
   mysql-5.6/trunk/debian/additions/my.cnf
   mysql-5.6/trunk/debian/changelog
   mysql-5.6/trunk/debian/patches/series
Log:
added mysql-bug-68416.patch
added innodb_data_file_path for upgrade path


Modified: mysql-5.6/trunk/debian/additions/my.cnf
===================================================================
--- mysql-5.6/trunk/debian/additions/my.cnf	2013-02-18 15:17:12 UTC (rev 2214)
+++ mysql-5.6/trunk/debian/additions/my.cnf	2013-02-26 12:36:41 UTC (rev 2215)
@@ -94,6 +94,10 @@
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
 # Read the manual for more InnoDB related options. There are many!
 #
+# It seems that we need this for successful mysql-5.1 -> mysql-5.6 upgrade
+innodb_data_file_path=ibdata1:10M:autoextend
+
+#
 # * Security Features
 #
 # Read the manual, too, if you want chroot!

Modified: mysql-5.6/trunk/debian/changelog
===================================================================
--- mysql-5.6/trunk/debian/changelog	2013-02-18 15:17:12 UTC (rev 2214)
+++ mysql-5.6/trunk/debian/changelog	2013-02-26 12:36:41 UTC (rev 2215)
@@ -2,6 +2,8 @@
 
   * new upstream release 
   * mysql_install_db is now a perl script. Do not run it with bash
+  * added mysql-bug-68416.patch to disable my.cnf auto-generate during mysql_install_db 
+  * added innodb_data_file_path to my.cnf for mysql-5.1 => mysql-5.6 upgrade path
 
  -- Bjoern Boschman <bjoern at boschman.de>  Tue, 05 Feb 2013 14:38:29 +0100
 

Added: mysql-5.6/trunk/debian/patches/mysql-bug-68416.patch
===================================================================
--- mysql-5.6/trunk/debian/patches/mysql-bug-68416.patch	                        (rev 0)
+++ mysql-5.6/trunk/debian/patches/mysql-bug-68416.patch	2013-02-26 12:36:41 UTC (rev 2215)
@@ -0,0 +1,37 @@
+Index: mysql-5.6-5.6.10+dfsg.obsolete.0.012252664034353/scripts/mysql_install_db.pl.in
+===================================================================
+--- mysql-5.6-5.6.10+dfsg.obsolete.0.012252664034353.orig/scripts/mysql_install_db.pl.in	2013-02-18 17:13:47.000000000 +0100
++++ mysql-5.6-5.6.10+dfsg.obsolete.0.012252664034353/scripts/mysql_install_db.pl.in	2013-02-18 17:14:05.000000000 +0100
+@@ -425,32 +425,6 @@
+ my $copy_cfg_file;
+ 
+ # ----------------------------------------------------------------------
+-# This will be the default config file
+-# ----------------------------------------------------------------------
+-
+-$config_file= "$basedir/my.cnf";
+-
+-my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
+-				  "share","share/mysql","support-files");
+--e $cfg_template or cannot_find_file("my-default.cnf");
+-
+-$copy_cfg_file= $config_file;
+-if (-e $copy_cfg_file)
+-{
+-  $copy_cfg_file =~ s/my.cnf/my-new.cnf/;
+-  # Too early to print warning here, the user may not notice
+-}
+-open (TEMPL, $cfg_template) or error("Could not open config template");
+-open (CFG, "> $copy_cfg_file") or error("Could not open config file");
+-while (<TEMPL>)
+-{
+-  # Remove lines beginning with # *** which are template comments
+-  print CFG $_ unless /^# \*\*\*/;
+-}
+-close CFG;
+-close TEMPL;
+-
+-# ----------------------------------------------------------------------
+ # Now we can get arguments from the groups [mysqld] and [mysql_install_db]
+ # in the my.cfg file, then re-run to merge with command line arguments.
+ # ----------------------------------------------------------------------

Modified: mysql-5.6/trunk/debian/patches/series
===================================================================
--- mysql-5.6/trunk/debian/patches/series	2013-02-18 15:17:12 UTC (rev 2214)
+++ mysql-5.6/trunk/debian/patches/series	2013-02-26 12:36:41 UTC (rev 2215)
@@ -14,3 +14,4 @@
 #versioned_symbols.patch
 mysql-bug.67018.patch
 mysql-bug.63130.patch
+mysql-bug-68416.patch