diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:38:30 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-12-16 20:38:30 +0200 |
| commit | 237315c076c1813e497918fbc1115426edc4e60d (patch) | |
| tree | 8c8a9929b2bebab8306087cf5314b5524d74340d /zlib | |
| parent | be71f3ccb61d3c4f1ebc096ba4e5e1563f578681 (diff) | |
| parent | 79e40ef6e45768a6fe0b9f4e5223b5a7fe684ca5 (diff) | |
| download | mariadb-git-237315c076c1813e497918fbc1115426edc4e60d.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-maria.new
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'zlib')
0 files changed, 0 insertions, 0 deletions