summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-31 18:06:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-31 18:06:11 +0300
commit5660c061faf30a87f186fe6691a3e723eed34442 (patch)
tree02a49dfe55c578fae21aa3ecbdb1c53ee9380905 /mysys
parenta9e71c77e429e5cf35bb5373a4bda41983d21002 (diff)
parentbe45f083e6e7d8da6dbf2349d9c59673d7e61139 (diff)
downloadmariadb-git-5660c061faf30a87f186fe6691a3e723eed34442.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_winerr.c4
1 files changed, 3 insertions, 1 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 */