diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-12 13:51:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-12 14:09:48 +0200 |
| commit | c64265f3f909427dd87413d398e516b194fcb0db (patch) | |
| tree | 5121b63597c72209b55cf724bd08db11e16c3b37 /sql/sql_handler.cc | |
| parent | b6a44b4c245068c2336b4829a125d463a33b28c0 (diff) | |
| parent | 839cf16bb2de078d5000bcb2f9b3151f1ebda708 (diff) | |
| download | mariadb-git-c64265f3f909427dd87413d398e516b194fcb0db.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 08114b99757..73b6f637a98 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -668,7 +668,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler, (HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE)) == 0)) { 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; } |