summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2006-10-13 08:43:13 -0400
committerunknown <cmiller@zippy.cornsilk.net>2006-10-13 08:43:13 -0400
commitc7fd27d353dcdff95dbd28c71c1b10de71f51c33 (patch)
treeedf07e7208941f98702afbef08229a0bc824f058 /libmysql
parentf3289e88ab75d719186f285b49ae8f56324f3a5a (diff)
parentb0368a9072ca7e39689d14cc290a574adc37efc4 (diff)
downloadmariadb-git-c7fd27d353dcdff95dbd28c71c1b10de71f51c33.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51-alter BitKeeper/etc/collapsed: auto-union sql/sql_acl.cc: Auto merged
Diffstat (limited to 'libmysql')
0 files changed, 0 insertions, 0 deletions