diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:09:46 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:09:46 +0300 |
| commit | 7e732e74837d7828100e4bc272068e543e274065 (patch) | |
| tree | aaa4614ff9a606292741b8f9cae51014e92af023 /mysys/safemalloc.c | |
| parent | b8381eb964cb8a357406353f5000d06261881885 (diff) | |
| parent | 25c8c0672b9c159a435d5c7892d5fdab007f8d0e (diff) | |
| download | mariadb-git-7e732e74837d7828100e4bc272068e543e274065.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
include/my_pthread.h:
Auto merged
sql/mysqld.cc:
Auto merged
mysys/my_thr_init.c:
Manual merge with 5.0
Diffstat (limited to 'mysys/safemalloc.c')
0 files changed, 0 insertions, 0 deletions