diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
| commit | 5be07ceaddcae282a1c41b62fb3222715c773577 (patch) | |
| tree | fd4bc4e87a0385cd676cd34fe9ba93dd57358f2e /mysql-test/r/merge.result | |
| parent | 1d47bbe3bf80f5fbd2770d56c97f788f8401ffa0 (diff) | |
| parent | 83d455be90a06e8fc1293a611061bd9529ed8536 (diff) | |
| download | mariadb-git-5be07ceaddcae282a1c41b62fb3222715c773577.tar.gz | |
Merge 5.5.24 back into main 5.5.
This is a weave merge, but without any conflicts.
In 14 source files, the copyright year needed to be updated to 2012.
Diffstat (limited to 'mysql-test/r/merge.result')
0 files changed, 0 insertions, 0 deletions