diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-31 18:06:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-31 18:06:11 +0300 |
| commit | 5660c061faf30a87f186fe6691a3e723eed34442 (patch) | |
| tree | 02a49dfe55c578fae21aa3ecbdb1c53ee9380905 | |
| parent | a9e71c77e429e5cf35bb5373a4bda41983d21002 (diff) | |
| parent | be45f083e6e7d8da6dbf2349d9c59673d7e61139 (diff) | |
| download | mariadb-git-5660c061faf30a87f186fe6691a3e723eed34442.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | mysys/my_winerr.c | 4 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_winerr.c b/mysys/my_winerr.c index 92e1fa83d78..a3f6229b74e 100644 --- a/mysys/my_winerr.c +++ b/mysys/my_winerr.c @@ -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 */ diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e8fe4afc690..003a4019017 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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) |