diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
| commit | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (patch) | |
| tree | 75506bd02a8186a013b5eb16a425de0c1d96bc71 /sql/tztime.cc | |
| parent | 7d4b2b984779e695d0c233d11173b2965d25ef27 (diff) | |
| parent | fe449affcf99fcf63f620994b544eb96d2504cda (diff) | |
| download | mariadb-git-b6ebadaa66ee68b1880c0e10669543d1ba058c18.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 22e14c8272a..4934531c985 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2764,7 +2764,8 @@ main(int argc, char **argv) trunc_tables= trunc_tables_const; printf("set @wsrep_is_on=(%s);\n", wsrep_is_on); - printf("SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt " + printf("SET STATEMENT SQL_MODE='' FOR " + "SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt " " FROM" " (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION" " FROM information_schema.TABLES" |