summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2009-08-11 18:59:20 +0200
committerJoerg Bruehe <joerg@mysql.com>2009-08-11 18:59:20 +0200
commitadaa961a3f235948cf38c7c4ce4ab59d0c22f427 (patch)
treea4d7da6a17c5699bb32ef98168eb15c410187c74
parentb43fb3e915417447192fea8f40748cc63352f23e (diff)
parent54958e8851662842984df6490c03a11ae7dc1c29 (diff)
downloadmariadb-git-adaa961a3f235948cf38c7c4ce4ab59d0c22f427.tar.gz
Merge main 5.0 with 5.0-build,
automerge didn't handle this correctly, so test "view" was corrected manually.
0 files changed, 0 insertions, 0 deletions