diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-08 16:15:43 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-08 16:15:43 +0400 |
| commit | b8ff601ebf2890bfe6bd2fe127aa33ae2b1bc90c (patch) | |
| tree | 0395fcb868371022eb3f915e0b11a1b63efaac28 /mysql-test/r/mysqldump.result | |
| parent | 55c10a09ee2ffc6295fd1ce3323b2b20aca7a2fb (diff) | |
| parent | 6aa09b4c23d22d90107e6a5ae24462c7ab05fde5 (diff) | |
| download | mariadb-git-b8ff601ebf2890bfe6bd2fe127aa33ae2b1bc90c.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b24158
into mysql.com:/usr/home/bar/mysql-5.1.b20396
mysql-test/r/rpl_do_grant.result:
Auto merged
mysql-test/t/rpl_do_grant.test:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqldump.result')
0 files changed, 0 insertions, 0 deletions