diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-14 11:38:46 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-14 11:38:46 -0500 |
| commit | 8e476e6cbe313fadb6e0cd4402ff8c9d2d487406 (patch) | |
| tree | 9c3d55cd08893b821c355fded3d962bb79a0e67c /sql/handler.cc | |
| parent | e0f0f5f6d0b983619a67725c6a3351c31a547852 (diff) | |
| download | mariadb-git-8e476e6cbe313fadb6e0cd4402ff8c9d2d487406.tar.gz | |
MDEV#5534: mysql_tzinfo_to_sql generates wrong query
mysql_tzinfo_to_sql tries to set wsrep_replicate_myisam
as SESSION variable, while its a GLOBAL-only system variable,
and thus the resulting sql would fail to load.
Fixed by changing the scope to GLOBAL in the SET command.
Also added following include files to facilitate testing :
* include/have_wsrep.inc
* include/not_wsrep.inc
* include/have_wsrep_enabled.inc
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index a392171ec18..5f12a6b5c96 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5407,7 +5407,7 @@ void ha_wsrep_fake_trx_id(THD *thd) } else { - WSREP_WARN("cannot get get fake InnoDB transaction ID"); + WSREP_WARN("cannot get fake InnoDB transaction ID"); } DBUG_VOID_RETURN; |