Merge 10.1 into 10.2

MariaDB · Aug 31, 2017 · 5660c06 · 5660c06
2 parents a9e71c7 + be45f08
commit 5660c06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)