diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-26 11:00:17 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-26 11:00:17 +0100 |
| commit | 14f7a1772090a702f0715b075781ef0acbe1afd7 (patch) | |
| tree | 3ee05b06b0b664426c55d7713a1e6937a75db104 /extra | |
| parent | 778747a847c040128badd21bb15d3d3fd8fd8a29 (diff) | |
| parent | d21c7ec1f5ee45abdfb04319c715cc4711379b8a (diff) | |
| download | mariadb-git-14f7a1772090a702f0715b075781ef0acbe1afd7.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/r/rpl_temporary.result:
Use local
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions