mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
BitKeeper/etc/ignore:
  auto-union
mysys/my_alloc.c:
  Auto merged
This commit is contained in:
unknown 2001-11-05 01:42:47 +02:00
commit 906f94ba5f
2 changed files with 4 additions and 0 deletions
Show stats 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/mysqlbinlog
sql/mysqld
sql/mysqld-purecov
sql/mysqld-purify
sql/mysqld-quantify
sql/share/*.sys
sql/share/charsets/gmon.out
sql/share/gmon.out

1
mysys/my_alloc.c
View file

@ -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)
{