diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-05 13:11:38 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-10-05 13:11:38 +0200 |
| commit | ff8c716ff5d4ccf40da74b6ec2310fd78a241fc0 (patch) | |
| tree | c6c44f3abcb606d1a0bb0b6357f7442372bd27ac /mysql-test/mysql-test-run.pl | |
| parent | f4ab8c295a6ae100d2bdb016f7d6505d2e20e135 (diff) | |
| parent | 5e9a2811762fef39e3badd5d50941d6fe4dd5feb (diff) | |
| download | mariadb-git-ff8c716ff5d4ccf40da74b6ec2310fd78a241fc0.tar.gz | |
Merge sin.intern.azundris.com:/home/tnurnberg/19828/50-19828
into sin.intern.azundris.com:/home/tnurnberg/19828/51-19828
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/mysql-test-run.pl')
0 files changed, 0 insertions, 0 deletions