diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
| commit | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (patch) | |
| tree | 0716fe20a806adbe55581d9e996f29dcb3a5ab0b /extra/mariabackup/backup_mysql.cc | |
| parent | 7075d7fce626ee915c9ae9308cfb4a8120e83e44 (diff) | |
| parent | ab2458c61fab2d8e6ead63577af434738874f1cf (diff) | |
| download | mariadb-git-e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 2ff7e56f3ad..a9eef808008 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -153,7 +153,7 @@ xb_mysql_connect() return(NULL); } - xb_mysql_query(connection, "SET SESSION wait_timeout=2147483", + xb_mysql_query(connection, "SET SESSION wait_timeout=2147483, max_statement_time=0", false, true); return(connection); |