diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-05-07 13:05:09 +0200 |
| commit | b381cf843c841151f96541b19bd753cd3bbae326 (patch) | |
| tree | dfc377a1dfbd4d2044a0b799ff5ed6411c7e864f /mysys/my_lockmem.c | |
| parent | d4be9e7bc0cfd5ddd444ecc64daa4166597ca2eb (diff) | |
| parent | e5055e22f1f311fa48457cfcc97b72e93a37329f (diff) | |
| download | mariadb-git-b381cf843c841151f96541b19bd753cd3bbae326.tar.gz | |
mysql-5.5.31 merge
Diffstat (limited to 'mysys/my_lockmem.c')
| -rw-r--r-- | mysys/my_lockmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c index 8f06192d9f8..2e036936c70 100644 --- a/mysys/my_lockmem.c +++ b/mysys/my_lockmem.c @@ -43,7 +43,7 @@ uchar *my_malloc_lock(uint size,myf MyFlags) if (!(ptr=memalign(pagesize,size))) { if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),size); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG+ME_FATALERROR), size); DBUG_RETURN(0); } success = mlock((uchar*) ptr,size); |