diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /storage/myisam/myisampack.c | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
Diffstat (limited to 'storage/myisam/myisampack.c')
| -rw-r--r-- | storage/myisam/myisampack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 1985a53acf8..74be8b99d87 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -2144,7 +2144,8 @@ static my_off_t write_huff_tree(HUFF_TREE *huff_tree, uint trees) */ if (!(packed_tree=(uint*) my_alloca(sizeof(uint)*length*2))) { - my_error(EE_OUTOFMEMORY,MYF(ME_BELL),sizeof(uint)*length*2); + my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_FATALERROR), + sizeof(uint)*length*2); return 0; } |