summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-01-31 16:23:05 -0500
committerunknown <cmiller@zippy.cornsilk.net>2007-01-31 16:23:05 -0500
commitffe6fae3bb0961a07a22c1e0fb90a4d123d22690 (patch)
tree310051f9adb743a7d4761e730eb5dc7f6124cf95 /config
parent3d6e5feaf956d86751f3a1774fafd3bbaea3b1bc (diff)
parent92a7c1ed9c6dec1fee17a830fdabe9272d6692bd (diff)
downloadmariadb-git-ffe6fae3bb0961a07a22c1e0fb90a4d123d22690.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged scripts/mysqld_multi.sh: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions