summaryrefslogtreecommitdiff
path: root/SSL
diff options
context:
space:
mode:
authorunknown <tsmith@siva.hindu.god>2007-04-18 14:50:32 -0600
committerunknown <tsmith@siva.hindu.god>2007-04-18 14:50:32 -0600
commit6ff11d70a82c293b8bfba594f0ca744736257c76 (patch)
tree58740e92430fa18bd25f051d28dea0f953b33fca /SSL
parent4eecb58fd65e77091c930f0a039a59e85d2c1b5d (diff)
parentff2e7f450b00bf8814833f754fb624c3e239524f (diff)
downloadmariadb-git-6ff11d70a82c293b8bfba594f0ca744736257c76.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50 mysys/my_alloc.c: Auto merged sql/mysqld.cc: Auto merged
Diffstat (limited to 'SSL')
0 files changed, 0 insertions, 0 deletions