database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Code Activity

merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.

Browse Source
This commit is contained in:
Guilhem Bichot
2009-03-11 16:32:42 +01:00
parent a15d25f07e 11570d64fc
commit b0fcbc84ef
188 changed files with 4013 additions and 5332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/safemalloc.c
View File

@@ -147,7 +147,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags)
error_handler_hook=fatal_error_handler_hook;
if (MyFlags & (MY_FAE+MY_WME))
{
char buff[SC_MAXWIDTH];
char buff[256];
my_errno=errno;
sprintf(buff,"Out of memory at line %d, '%s'", lineno, filename);
my_message(EE_OUTOFMEMORY, buff, MYF(ME_BELL+ME_WAITTANG+ME_NOREFRESH));