diff options
author | unknown <joerg@mysql.com> | 2005-09-01 22:02:28 +0200 |
---|---|---|
committer | unknown <joerg@mysql.com> | 2005-09-01 22:02:28 +0200 |
commit | 22089ea6bb7e6774f2ba853e3ab756ad228ff909 (patch) | |
tree | 78aed01bc3474284a4520d5908948845f0b5c1a9 /sql/sql_acl.h | |
parent | 8d5c1769178ae70a4ee99978f66d96073a0b9ee8 (diff) | |
parent | dedb5b793175b72fff9ade6842caf138699b06af (diff) | |
download | mariadb-git-22089ea6bb7e6774f2ba853e3ab756ad228ff909.tar.gz |
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M51/merge-5.1
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
0 files changed, 0 insertions, 0 deletions