summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2009-08-04 13:37:32 +0200
committerGuilhem Bichot <guilhem@mysql.com>2009-08-04 13:37:32 +0200
commit7c691a2e3fa8ac7ee654b028c44d1389abc04e8c (patch)
tree089ba643f2c18724f5687caf45f9140b4e087789 /mysys
parentb57e4dbd88671df86e2cf39aff5178976d710b64 (diff)
downloadmariadb-git-7c691a2e3fa8ac7ee654b028c44d1389abc04e8c.tar.gz
Undoing mikael@mysql.com-20081015100345-8tu2vmh7mzs60c23
"Patch to fix bug 38551": it was a manual backport (2008-10-15) of http://lists.mysql.com/commits/56418. But that was an early, non-final patch from the fixer of this bug (TheK): after that backport was made by Mikael, TheK decided to do a different fix, which was finally pushed into 6.0. Then 5.1's code was changed for some other reasons, so now we have a conflict between the old never-approved TheK patch backported to Summit and the latest 5.1. The backport cannot stay, it has to be removed due to the conflict, and then rewritten if desired.
Diffstat (limited to 'mysys')
0 files changed, 0 insertions, 0 deletions