Merge 10.1 into 10.2
This commit is contained in:
commit
5660c061fa
@ -75,7 +75,9 @@ static struct errentry errtable[]= {
|
||||
{ ERROR_ALREADY_EXISTS, EEXIST }, /* 183 */
|
||||
{ ERROR_FILENAME_EXCED_RANGE, ENOENT }, /* 206 */
|
||||
{ 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 */
|
||||
|
@ -236,7 +236,7 @@ bool Foreign_key::validate(List<Create_field> &table_fields)
|
||||
sql_field->field_name)) {}
|
||||
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);
|
||||
}
|
||||
if (type == Key::FOREIGN_KEY && sql_field->vcol_info)
|
||||
|
Loading…
x
Reference in New Issue
Block a user