summaryrefslogtreecommitdiff
path: root/merge
diff options
context:
space:
mode:
authorunknown <dean@mysql.com>2005-02-16 19:15:08 -0600
committerunknown <dean@mysql.com>2005-02-16 19:15:08 -0600
commit026bb52678a2a8ca1cc2b242b5dfaa38c56261b9 (patch)
tree9701c724db1e5bf028487bf78d7390c29e577813 /merge
parentcb17889f47b0d128a192709840bb1c403715768f (diff)
parent7c5c37bdeba94e648a8d62561d5e87f5c7ea7e47 (diff)
downloadmariadb-git-026bb52678a2a8ca1cc2b242b5dfaa38c56261b9.tar.gz
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
Diffstat (limited to 'merge')
0 files changed, 0 insertions, 0 deletions