- alternative slow log configration param

Changed files:
    log_slow_queries.patch -> 1.1
    mysql-workbench.spec -> 1.44

diff --git a/log_slow_queries.patch b/log_slow_queries.patch
new file mode 100644 (file)
index 0000000..efdaa9f
--- /dev/null
+++ b/log_slow_queries.patch
@@ -0,0 +1,11 @@
+--- mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_admin_control.py~     2012-02-21 18:53:37.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/./plugins/wb.admin/backend/wb_admin_control.py      2012-05-11 20:03:42.732364945 +0300
+@@ -675,7 +675,7 @@
+                 general_log_file_path = opts[config_section].get('log', '').strip(' "') if opts.has_key(config_section) else ''
+                 self.server_profile.general_log_file_path = general_log_file_path or os.path.join(datadir, hostname + '.log')
+                 
+-                slow_query_log_file = opts[config_section].get('log-slow-queries', '').strip(' "') if opts.has_key(config_section) else ''
++                slow_query_log_file = (opts[config_section].get('log-slow-queries', '') or opts[config_section].get('log_slow_queries', '')).strip(' "') if opts.has_key(config_section) else ''
+                 self.server_profile.slow_log_file_path = slow_query_log_file or os.path.join(datadir, hostname + '.slow')
+                 
+                 error_log_file_path = opts[config_section].get('log-error', '').strip(' "') if opts.has_key(config_section) else ''

diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index ce1cca7f6f4096d3cf3e9143e2c984d077e2965d..59b4566dc56ebe46a465d915f3bedb7fa093b9e5 100644 (file)
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -15,6 +15,7 @@ Patch3:               automake.patch
 Patch4:                glib.patch
 Patch5:                pld-profile.patch
 Patch6:                get_local_ip_list.patch
+Patch7:                log_slow_queries.patch
 URL:           http://wb.mysql.com/
 BuildRequires: OpenGL-devel
 BuildRequires: autoconf
@@ -86,6 +87,7 @@ rm -rf ext/yassl
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 cp -p '%{SOURCE1}' res/mysql.profiles
 
 %build