diff options
| author | Monty <monty@mariadb.org> | 2017-05-07 18:26:10 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-05-08 02:33:35 +0300 |
| commit | 1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 (patch) | |
| tree | ff59557c55b06495d93a3420e8aac09588a87a9d /sql/sys_vars.ic | |
| parent | 276b0c8ef03046cc210e4eeab7231cb8d9f16bac (diff) | |
| download | mariadb-git-1e04ad284c6ac0a9ce433f827bc6dbfbd6029007.tar.gz | |
Fixed compiler warnings and warnings from build.tags
Other things
- Ensure that ut_d() is set to EXPR if ut_ad() is DEBUG_ASSERT()
If not, we will get a crash in purge_sys_t::~purge_sys_t() as
this ut_ad() code expect's that the ut_d() codes has been executed
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index a157538d528..f9acfb3b657 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -612,7 +612,9 @@ public: /* parse and feel list with default values */ if (thd) { +#ifndef DBUG_OFF bool res= +#endif sysvartrack_validate_value(thd, var->save_result.string_value.str, var->save_result.string_value.length); |