diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 16:02:16 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 16:02:16 +0200 |
commit | e6290a8270daf884f551230307225b358939bfab (patch) | |
tree | 4292f8f8d0fe51312c30bc6a623ca1313b4727a2 /sql | |
parent | c7f322c91faf97a9f758c288b38e1385fd89b32d (diff) | |
parent | 3fe306c891e90046a3d936d1fc90f733bfc85aff (diff) | |
download | mariadb-git-e6290a8270daf884f551230307225b358939bfab.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
-rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 73b1b88db31..81c16071c8c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -14891,7 +14891,7 @@ const char *dbug_print_sel_arg(SEL_ARG *sel_arg) break; case SEL_ARG::KEY_RANGE: default: - stype=nullptr; + stype= NULL; } if (stype) |