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 | 52c26d05bb0be9a9e691957f7bc201b402799960 (patch) | |
tree | 3ee05b06b0b664426c55d7713a1e6937a75db104 /extra | |
parent | bce773ea4e97657c208bbb07e673d188eeab075b (diff) | |
parent | 51b59d69074212cf8ab3b2f8e3cd49592f7ba088 (diff) | |
download | mariadb-git-52c26d05bb0be9a9e691957f7bc201b402799960.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