diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
| commit | 02979daab48d871e8c43a227b8f4462128439f17 (patch) | |
| tree | 21dba14f0073df2328677ed0a90a3596f043bdeb /sql/sql_handler.cc | |
| parent | efbfcc8b73d9fd8bafd86ab387e0c1edd39e208b (diff) | |
| parent | 192aa295b4bc877d0fed24154c57304c3f789179 (diff) | |
| download | mariadb-git-02979daab48d871e8c43a227b8f4462128439f17.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 36a879fc5cd..12119997430 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -681,7 +681,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler, HA_ONLY_WHOLE_INDEX)) { my_error(ER_KEY_DOESNT_SUPPORT, MYF(0), - table->file->index_type(handler->keyno), keyinfo->name); + table->file->index_type(handler->keyno), keyinfo->name.str); return 1; } |