summaryrefslogtreecommitdiff
path: root/merge
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-02-25 18:16:45 +0400
committerunknown <bar@mysql.com>2005-02-25 18:16:45 +0400
commit54dadffc749e283b95ff513f0a686fd84a1132d9 (patch)
tree24e89c59ada5da976b60ed45adeda0d70b360013 /merge
parent2908ccf5b4f68a1b486773c422c4a6c7611c0973 (diff)
parent3c5b16eebed40cf72d9deaa800229266bdf75f9a (diff)
downloadmariadb-git-54dadffc749e283b95ff513f0a686fd84a1132d9.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-again
Diffstat (limited to 'merge')
0 files changed, 0 insertions, 0 deletions