Commit 9358311c authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0

parents 2f603156 7be9a3ef

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -381,6 +381,9 @@ sql/lex_hash.h 
sql/mini_client_errors.c

sql/mysqlbinlog

sql/mysqld

sql/mysqld-purecov

sql/mysqld-purify

sql/mysqld-quantify

sql/share/*.sys

sql/share/charsets/gmon.out

sql/share/gmon.out

mysys/my_alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <my_global.h>

#include <my_sys.h>

#include <m_string.h>

#define EXTRA_DEBUG



void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size)

{