diff options
author | unknown <konstantin@mysql.com> | 2006-01-18 15:15:09 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2006-01-18 15:15:09 +0300 |
commit | f9bef505ece36b992c17d38c2c6714504d66d1b3 (patch) | |
tree | 615bbf8a236ace6dcc24da1dee532712f102f681 /innobase/log | |
parent | 596666f74a83e989edb712eab9949d2a13c08fac (diff) | |
parent | 22bc685dbf3769e4df9aedf139635c8b85bdeb37 (diff) | |
download | mariadb-git-f9bef505ece36b992c17d38c2c6714504d66d1b3.tar.gz |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/etc/ignore:
auto-union
libmysql/Makefile.shared:
Auto merged
configure.in:
Manual merge.
libmysql/libmysql.c:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'innobase/log')
0 files changed, 0 insertions, 0 deletions