View | Details | Raw Unified | Return to bug 39164
Collapse All | Expand All

(-)a/Koha/Report.pm (+19 lines)
Lines 232-237 sub prep_report { Link Here
232
    $sql = $self->_might_add_limit($sql) if $params->{export};
232
    $sql = $self->_might_add_limit($sql) if $params->{export};
233
233
234
    $sql = "$sql /* saved_sql.id: ${\( $self->id )} */";
234
    $sql = "$sql /* saved_sql.id: ${\( $self->id )} */";
235
236
    # https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39164
237
    my $report_sql_max_statement_time_seconds = C4::Context->config('report_sql_max_statement_time_seconds') // 0;
238
    if ($report_sql_max_statement_time_seconds) {
239
        my %versions = C4::Context::get_versions();
240
        if ( $versions{'mysqlVersion'} =~ /MariaDB/i ) {
241
            $sql = sprintf(
242
                'SET STATEMENT max_statement_time=%d FOR %s',
243
                $report_sql_max_statement_time_seconds,
244
                $sql
245
            );
246
        } else {
247
248
            # mysql timing is in milliseconds
249
            $report_sql_max_statement_time_seconds *= 1000;
250
            $sql =~ s#select#select /*+ MAX_EXECUTION_TIME($report_sql_max_statement_time_seconds) */#i;
251
        }
252
    }
253
235
    return $sql, $headers;
254
    return $sql, $headers;
236
}
255
}
237
256
(-)a/debian/templates/koha-conf-site.xml.in (+1 lines)
Lines 260-265 __END_SRU_PUBLICSERVER__ Link Here
260
 <ca>__DB_TLS_CA_CERTIFICATE__</ca>
260
 <ca>__DB_TLS_CA_CERTIFICATE__</ca>
261
 <cert>__DB_TLS_CLIENT_CERTIFICATE__</cert>
261
 <cert>__DB_TLS_CLIENT_CERTIFICATE__</cert>
262
 <key>__DB_TLS_CLIENT_KEY__</key>
262
 <key>__DB_TLS_CLIENT_KEY__</key>
263
 <report_sql_max_statement_time_seconds>0</report_sql_max_statement_time_seconds>
263
 <biblioserver>biblios</biblioserver>
264
 <biblioserver>biblios</biblioserver>
264
 <biblioservershadow>1</biblioservershadow>
265
 <biblioservershadow>1</biblioservershadow>
265
 <authorityserver>authorities</authorityserver>
266
 <authorityserver>authorities</authorityserver>
(-)a/etc/koha-conf.xml (+1 lines)
Lines 73-78 Link Here
73
 <ca>__DB_TLS_CA_CERTIFICATE__</ca>
73
 <ca>__DB_TLS_CA_CERTIFICATE__</ca>
74
 <cert>__DB_TLS_CLIENT_CERTIFICATE__</cert>
74
 <cert>__DB_TLS_CLIENT_CERTIFICATE__</cert>
75
 <key>__DB_TLS_CLIENT_KEY__</key>
75
 <key>__DB_TLS_CLIENT_KEY__</key>
76
 <report_sql_max_statement_time_seconds>0</report_sql_max_statement_time_seconds>
76
 <biblioserver>biblios</biblioserver>
77
 <biblioserver>biblios</biblioserver>
77
 <biblioservershadow>1</biblioservershadow>
78
 <biblioservershadow>1</biblioservershadow>
78
 <authorityserver>authorities</authorityserver>
79
 <authorityserver>authorities</authorityserver>
(-)a/t/Koha/Config.t (-32 / +33 lines)
Lines 90-127 subtest 'read_from_file() tests' => sub { Link Here
90
            }
90
            }
91
        },
91
        },
92
        'config' => {
92
        'config' => {
93
            'db_scheme'             => 'mysql',
93
            'db_scheme'                             => 'mysql',
94
            'database'              => 'koha',
94
            'database'                              => 'koha',
95
            'hostname'              => 'localhost',
95
            'hostname'                              => 'localhost',
96
            'port'                  => '3306',
96
            'port'                                  => '3306',
97
            'user'                  => 'kohaadmin',
97
            'user'                                  => 'kohaadmin',
98
            'pass'                  => 'katikoan',
98
            'pass'                                  => 'katikoan',
99
            'tls'                   => 'no',
99
            'tls'                                   => 'no',
100
            'ca'                    => '',
100
            'ca'                                    => '',
101
            'cert'                  => '',
101
            'cert'                                  => '',
102
            'key'                   => '',
102
            'key'                                   => '',
103
            'biblioserver'          => 'biblios',
103
            'report_sql_max_statement_time_seconds' => 0,
104
            'biblioservershadow'    => '1',
104
            'biblioserver'                          => 'biblios',
105
            'authorityserver'       => 'authorities',
105
            'biblioservershadow'                    => '1',
106
            'authorityservershadow' => '1',
106
            'authorityserver'                       => 'authorities',
107
            'pluginsdir'            => '/home/koha/var/lib/plugins',
107
            'authorityservershadow'                 => '1',
108
            'enable_plugins'        => '0',
108
            'pluginsdir'                            => '/home/koha/var/lib/plugins',
109
            'upload_path'           => '',
109
            'enable_plugins'                        => '0',
110
            'tmp_path'              => '',
110
            'upload_path'                           => '',
111
            'intranetdir'           => '/home/koha/src',
111
            'tmp_path'                              => '',
112
            'opacdir'               => '/home/koha/src/opac',
112
            'intranetdir'                           => '/home/koha/src',
113
            'opachtdocs'            => '/home/koha/src/koha-tmpl/opac-tmpl',
113
            'opacdir'                               => '/home/koha/src/opac',
114
            'intrahtdocs'           => '/home/koha/src/koha-tmpl/intranet-tmpl',
114
            'opachtdocs'                            => '/home/koha/src/koha-tmpl/opac-tmpl',
115
            'includes'              => '/home/koha/src/koha-tmpl/intranet-tmpl/prog/en/includes/',
115
            'intrahtdocs'                           => '/home/koha/src/koha-tmpl/intranet-tmpl',
116
            'logdir'                => '/home/koha/var/log',
116
            'includes'                              => '/home/koha/src/koha-tmpl/intranet-tmpl/prog/en/includes/',
117
            'docdir'                => '/home/koha/doc',
117
            'logdir'                                => '/home/koha/var/log',
118
            'backupdir'             => '/home/koha/var/spool',
118
            'docdir'                                => '/home/koha/doc',
119
            'mana_config'           => 'https://mana-kb.koha-community.org',
119
            'backupdir'                             => '/home/koha/var/spool',
120
            'backup_db_via_tools'   => '0',
120
            'mana_config'                           => 'https://mana-kb.koha-community.org',
121
            'backup_conf_via_tools' => '0',
121
            'backup_db_via_tools'                   => '0',
122
            'install_log'           => '/home/koha/misc/koha-install-log',
122
            'backup_conf_via_tools'                 => '0',
123
            'useldapserver'         => '1',
123
            'install_log'                           => '/home/koha/misc/koha-install-log',
124
            'ldapserver'            => {
124
            'useldapserver'                         => '1',
125
            'ldapserver'                            => {
125
                ldapserver => {
126
                ldapserver => {
126
                    hostname => 'ldap://another_ldap_server:389',
127
                    hostname => 'ldap://another_ldap_server:389',
127
                    user     => 'user',
128
                    user     => 'user',
(-)a/t/data/koha-conf.xml (-1 / +1 lines)
Lines 72-77 Link Here
72
 <ca></ca>
72
 <ca></ca>
73
 <cert></cert>
73
 <cert></cert>
74
 <key></key>
74
 <key></key>
75
 <report_sql_max_statement_time_seconds>0</report_sql_max_statement_time_seconds>
75
 <biblioserver>biblios</biblioserver>
76
 <biblioserver>biblios</biblioserver>
76
 <biblioservershadow>1</biblioservershadow>
77
 <biblioservershadow>1</biblioservershadow>
77
 <authorityserver>authorities</authorityserver>
78
 <authorityserver>authorities</authorityserver>
78
- 

Return to bug 39164