diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
| commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
| tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /mysys/mf_keycache.c | |
| parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
| parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
| download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index d9bc0e9094e..3263459bd72 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -274,7 +274,7 @@ struct st_hash_link }; /* simple states of a block */ -#define BLOCK_ERROR 1 /* an error occured when performing file i/o */ +#define BLOCK_ERROR 1 /* an error occurred when performing file i/o */ #define BLOCK_READ 2 /* file block is in the block buffer */ #define BLOCK_IN_SWITCH 4 /* block is preparing to read new page */ #define BLOCK_REASSIGNED 8 /* blk does not accept requests for old page */ |