1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2017-08-31 18:06:11 +03:00
commit 5660c061fa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/my_winerr.c
View File

@ -75,7 +75,9 @@ static struct errentry errtable[]= {
{ ERROR_ALREADY_EXISTS, EEXIST }, /* 183 */ { ERROR_ALREADY_EXISTS, EEXIST }, /* 183 */
{ ERROR_FILENAME_EXCED_RANGE, ENOENT }, /* 206 */ { ERROR_FILENAME_EXCED_RANGE, ENOENT }, /* 206 */
{ ERROR_NESTING_NOT_ALLOWED, EAGAIN }, /* 215 */ { ERROR_NESTING_NOT_ALLOWED, EAGAIN }, /* 215 */
{ ERROR_NOT_ENOUGH_QUOTA, ENOMEM } /* 1816 */ { ERROR_FILE_SYSTEM_LIMITATION, EFBIG }, /* 665 */
{ ERROR_NO_SYSTEM_RESOURCES, ENOMEM }, /* 1450 */
{ ERROR_NOT_ENOUGH_QUOTA, ENOMEM } /* 1816 */
}; };
/* size of the table */ /* size of the table */

2
sql/sql_class.cc
View File

@ -236,7 +236,7 @@ bool Foreign_key::validate(List<Create_field> &table_fields)
sql_field->field_name)) {} sql_field->field_name)) {}
if (!sql_field) if (!sql_field)
{ {
my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), column->field_name); my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), column->field_name.str);
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
if (type == Key::FOREIGN_KEY && sql_field->vcol_info) if (type == Key::FOREIGN_KEY && sql_field->vcol_info)