diff options
author | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-10-06 19:14:33 +0300 |
commit | 62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a (patch) | |
tree | 4e2cfa6a6a8032773454e22aa802b2798b2935b8 /mysys/errors.c | |
parent | 96458f8f64641d5b974a17733af8c709b513bfe0 (diff) | |
parent | 0944bed7fcb59fb38230a750bd820a22b3b6b476 (diff) | |
download | mariadb-git-62f3cd6a31d3c1ffe7ad17d9de862a3c0859f56a.tar.gz |
Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
Diffstat (limited to 'mysys/errors.c')
-rw-r--r-- | mysys/errors.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 255b6893c73..5401c2b3cc6 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -41,7 +41,7 @@ const char * NEAR globerrs[GLOBERRS]= "Can't change dir to '%s' (Errcode: %d)", "Warning: '%s' had %d links", "%d files and %d streams is left open\n", - "Disk is full writing '%s'. Waiting for someone to free space...", + "Disk is full writing '%s' (Errcode: %d). Waiting for someone to free space... Retry in %d secs", "Can't create directory '%s' (Errcode: %d)", "Character set '%s' is not a compiled character set and is not specified in the '%s' file", "Out of resources when opening file '%s' (Errcode: %d)", |