diff options
author | Michael Widenius <monty@askmonty.org> | 2011-10-05 16:56:17 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-10-05 16:56:17 +0300 |
commit | 47d5a20b14cbb4a9c3042fd2ac9b004889cac3df (patch) | |
tree | 8634743fe3d458fad10eea35953fea002cd14e6c /mysql-test/r/derived_opt.result | |
parent | 5ed31f107353ecd2f6ab0a13aa6f5fa319556eda (diff) | |
parent | 5f607a2c705063ef23a9974b34151a991e80538f (diff) | |
download | mariadb-git-47d5a20b14cbb4a9c3042fd2ac9b004889cac3df.tar.gz |
Automatic merge with 5.2
Diffstat (limited to 'mysql-test/r/derived_opt.result')
0 files changed, 0 insertions, 0 deletions