diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-28 10:55:31 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-08 10:58:49 +0200 |
| commit | 5fcba6eb264e0f0af2eb83502bc8da031bef567f (patch) | |
| tree | 27ab5d3a3c2273b791609d6431e100316ba85983 /mysys/my_fopen.c | |
| parent | 88632726e88471d492a6125f0cd4a4a3c25a6923 (diff) | |
| download | mariadb-git-5fcba6eb264e0f0af2eb83502bc8da031bef567f.tar.gz | |
small cleanup
* my_aes.h doesn't compile without my_global.h
* typo in a comment
* redundant condition
* if encryption plugin fails, there's no encryption_key_manager
at plugin deinit time
* encryption plugin tests must run when plugin.so is present,
not when a plugin is active (otherwise the test will be skipped
when plugin fails to initialize).
Diffstat (limited to 'mysys/my_fopen.c')
| -rw-r--r-- | mysys/my_fopen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index ede434f2c32..3ec5e0ba0b1 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.c @@ -87,8 +87,7 @@ FILE *my_fopen(const char *filename, int flags, myf MyFlags) my_errno=errno; DBUG_PRINT("error",("Got error %d on open",my_errno)); if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) - my_error((flags & O_RDONLY) || (flags == O_RDONLY ) ? EE_FILENOTFOUND : - EE_CANTCREATEFILE, + my_error((flags & O_RDONLY) ? EE_FILENOTFOUND : EE_CANTCREATEFILE, MYF(ME_BELL+ME_WAITTANG), filename, my_errno); DBUG_RETURN((FILE*) 0); } /* my_fopen */ |