diff options
author | unknown <monty@mysql.com> | 2004-10-20 15:14:06 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-10-20 15:14:06 +0300 |
commit | 7bdb93aa7e8b2c4d003f68635af8e1cbe757f6e6 (patch) | |
tree | 3fce040abacdba1cc2171e39b806356fdd5de92f /sql/lock.cc | |
parent | 6875cf36d1625449f539c9eaefb8171158231ee2 (diff) | |
parent | aa14d7361d3bd6fd6943d8732363f392cb316a65 (diff) | |
download | mariadb-git-7bdb93aa7e8b2c4d003f68635af8e1cbe757f6e6.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
innobase/srv/srv0srv.c:
Auto merged
Diffstat (limited to 'sql/lock.cc')
0 files changed, 0 insertions, 0 deletions