diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-29 15:06:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-29 15:06:37 +0200 |
| commit | 83063c5034a30e1acc61e116e4c33a6cfd80439d (patch) | |
| tree | bbd45be3e5f91cc6952c9b85995f17d5f3df6ffc /client | |
| parent | d0703b458ad8d906901c2b860aabc43d01c2a971 (diff) | |
| parent | 88a3ee71e3c35b28c9223ccd2d592c05f73d0c11 (diff) | |
| download | mariadb-git-83063c5034a30e1acc61e116e4c33a6cfd80439d.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions