summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <holyfoot@mysql.com>2006-05-21 18:17:50 +0500
committerunknown <holyfoot@mysql.com>2006-05-21 18:17:50 +0500
commit8697922577fc09bd991bcced3bccd1420f675f46 (patch)
tree444be6e6bd32b33ee6bb75c458413f14fa612d8b
parentb0b60840400149149e1581d1c471339d8cffa17a (diff)
parentabc6e665e147df7dcf7fa71deab136ee96f4f613 (diff)
downloadmariadb-git-8697922577fc09bd991bcced3bccd1420f675f46.tar.gz
Merge mysql.com:/home/hf/work/mysql-5.0.mrg
into mysql.com:/home/hf/work/mysql-5.1.mrge mysql-test/t/init_connect.test: Auto merged mysql-test/t/wait_timeout.test: Auto merged
0 files changed, 0 insertions, 0 deletions