diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-21 12:54:28 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-21 12:54:28 +0400 |
| commit | bcc2100f9d0bd1a2c21acd0de831e9dd1b8a703e (patch) | |
| tree | a2e91e854ce56a86fca49481a63f424ad47d97ac /sql/sys_vars.ic | |
| parent | 9dc81f7d387050dd62f2307b15c63c3a3f5ea1b0 (diff) | |
| download | mariadb-git-bcc2100f9d0bd1a2c21acd0de831e9dd1b8a703e.tar.gz | |
MDEV-16471 mysqldump throws "Variable 'sql_mode' can't be set to the value of 'NULL' (1231)"
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 498204deb92..c0b7950518b 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1354,7 +1354,8 @@ public: if (var->value->result_type() == STRING_RESULT) { - if (!(res=var->value->val_str_ascii(&str))) + if (!(res= var->value->val_str_ascii_revert_empty_string_is_null(thd, + &str))) return true; else { |