database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-19 10:49:00 +03:00
parent efbfcc8b73 192aa295b4
commit 02979daab4
76 changed files with 4013 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_handler.cc
View File

@ -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;
}