diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-11-12 15:10:26 +0300 |
commit | 0e7c10445f42af4b61d738034e63303b88bf570f (patch) | |
tree | 620a4604b76d4dc5951c401d1c4131a79bbfcd3a /mysys/my_largepage.c | |
parent | 25067ea7e15276dc2c7739015c6a8900805548db (diff) | |
parent | ad6883c4f2df12fe054d996e3ed32669248bfb08 (diff) | |
download | mariadb-git-0e7c10445f42af4b61d738034e63303b88bf570f.tar.gz |
Auto-merge from mysql-trunk.
Diffstat (limited to 'mysys/my_largepage.c')
-rw-r--r-- | mysys/my_largepage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index b50a606c8d8..d96e1048fd0 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -128,7 +128,7 @@ uchar* my_large_malloc_int(size_t size, myf my_flags) { if (my_flags & MY_WME) fprintf(stderr, - "Warning: Failed to allocate %lu bytesx from HugeTLB memory." + "Warning: Failed to allocate %lu bytes from HugeTLB memory." " errno %d\n", (ulong) size, errno); DBUG_RETURN(NULL); |