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

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

Browse Source
This commit is contained in:
monty@bitch.mysql.fi
2001-11-05 01:42:47 +02:00
parent 3afb157ca2 1282838dc6
commit 4ff48e4617
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.bzrignore
View File

@@ -404,6 +404,9 @@ sql/lex_hash.h
sql/mini_client_errors.c sql/mini_client_errors.c
sql/mysqlbinlog sql/mysqlbinlog
sql/mysqld sql/mysqld
sql/mysqld-purecov
sql/mysqld-purify
sql/mysqld-quantify
sql/share/*.sys sql/share/*.sys
sql/share/charsets/gmon.out sql/share/charsets/gmon.out
sql/share/gmon.out sql/share/gmon.out

1
mysys/my_alloc.c
View File

@@ -20,6 +20,7 @@
#include <my_global.h> #include <my_global.h>
#include <my_sys.h> #include <my_sys.h>
#include <m_string.h> #include <m_string.h>
#define EXTRA_DEBUG
void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size) void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size)
{ {