diff options
| author | unknown <thek@adventure.(none)> | 2008-02-01 14:14:37 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-02-01 14:14:37 +0100 |
| commit | 36265f707c406afa4455dd24a6cc7c682f10efd3 (patch) | |
| tree | f3a2815a6fd9457aa543771067bc63077a57d75f /mysql-test/t/mysql_comments.sql | |
| parent | 97355f4e0a39260b7c54f1ee688e4738f42a0166 (diff) | |
| parent | f7d8fb1cdde7a9655b984827547a7f4f85560834 (diff) | |
| download | mariadb-git-36265f707c406afa4455dd24a6cc7c682f10efd3.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201
into adventure.(none):/home/thek/Development/cpp/bug33201/my51-bug33201
mysql-test/t/grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/grant.result:
Manual merge
Diffstat (limited to 'mysql-test/t/mysql_comments.sql')
0 files changed, 0 insertions, 0 deletions