Commit 4ff48e46 authored by monty@bitch.mysql.fi's avatar monty@bitch.mysql.fi

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

parents 3afb157c 1282838d
......@@ -404,6 +404,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
......
......@@ -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)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment