diff options
author | unknown <thek@adventure.(none)> | 2007-05-08 12:02:38 +0200 |
---|---|---|
committer | unknown <thek@adventure.(none)> | 2007-05-08 12:02:38 +0200 |
commit | 0adfd75e8882a9eac7be6f9dea9dabddc3a28783 (patch) | |
tree | eb2d54d5882522d1f857124d1cae788127185bbe /mysql-test/r/trigger.result | |
parent | cdca13e9c553ce42587b41d7aa188bab7d3268e9 (diff) | |
parent | 0f67bfba50e1088cc1be1a016c1e75e05ac7bbf0 (diff) | |
download | mariadb-git-0adfd75e8882a9eac7be6f9dea9dabddc3a28783.tar.gz |
Merge adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/r/query_cache.result:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'mysql-test/r/trigger.result')
0 files changed, 0 insertions, 0 deletions