rev 20205 - in kde-extras/digikam/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2016-01-04 00:08:58 +0000 (Mon, 04 Jan 2016)
New Revision: 20205

Added:
   kde-extras/digikam/trunk/debian/patches/mysql-global-conf.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
Fix mysql configuration to allow MySQL 5.6 to start.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2016-01-03 23:20:40 UTC (rev 20204)
+++ kde-extras/digikam/trunk/debian/changelog	2016-01-04 00:08:58 UTC (rev 20205)
@@ -4,8 +4,11 @@
     - Add libkface 15.08.3 sources as digikam_4.14.0.orig-libkface15083.tar.xz
     - Create symlink extra/libkface; build using DIGIKAMSC_COMPILE_LIBKFACE=ON
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jan 2016 15:55:34 -0600
+  * patches/mysql-global-conf.patch: New.  Change mysql option table_cache
+    to table_open_cache.  Closes: #808729.
 
+ -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jan 2016 17:47:55 -0600
+
 digikam (4:4.14.0-1) unstable; urgency=medium
 
   * New upstream release 4.14.0.  (Closes: #777110, #795956)

Added: kde-extras/digikam/trunk/debian/patches/mysql-global-conf.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/mysql-global-conf.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/mysql-global-conf.patch	2016-01-04 00:08:58 UTC (rev 20205)
@@ -0,0 +1,30 @@
+Description: correct mysql-global configuration
+Author: gisl at leonde.de
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808729
+Forwarded: no
+Reviewed-by: Steve Robbins <smr at debian.org>
+
+mysql-global.conf uses an unsupported option 
+that causes the db server to not start at all.
+
+See https://bugs.mysql.com/bug.php?id=68315
+
+MySQL 5.1.3 table_cache is depreciated as per change log
+(table_open_cache is replaced with table_cache).  In MySQL 5.5, we can
+still use table_cache while in MySQL 5.6 mysqld fails to start when
+table_cache is used instead of table_open_cache.
+
+
+
+
+--- digikam-4.14.0.orig/core/data/database/mysql-global.conf
++++ digikam-4.14.0/core/data/database/mysql-global.conf
+@@ -20,7 +20,7 @@
+ #lower_case_table_names=1
+ character_set_server=latin1
+ collation_server=latin1_general_ci
+-table_cache=200
++table_open_cache=200
+ thread_cache_size=3
+ log_bin=mysql-bin
+ expire_logs_days=3

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2016-01-03 23:20:40 UTC (rev 20204)
+++ kde-extras/digikam/trunk/debian/patches/series	2016-01-04 00:08:58 UTC (rev 20205)
@@ -1,2 +1,3 @@
 #upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
+mysql-global-conf.patch
 sendimages-icedove.diff