Hi all,
I was looking to solve a bug [0], and found some differences between master and QA_3_3 (where QA_3_3 seemed correct). I wondered why it was changed and found that the change was introduced by a merge I did [1] : commit 20a402ba29776f2ed1ba3122e48df98bfc11cafe
But what's strange about this commit is that it seems to merge two commits. One of mine, where I solved a bug (diff1 [2]) and another one (diff2 [3]), where the reported bug [0] is introduced. When I try to figure out where this commit comes from, I only find it was committed by me. But I'm quite sure I didn't. Moreover because that commit changes a lot of files, and I changed only ChangeLog and server_status.php So I'm a bit confused now : Where did this commit come from? Who did it? Why did it end up in my merge (according to git), but it doesn't show up in the original report I got by mail when committing this merge? And more important : should it be reversed?
I would be grateful if anyone could explain what happened back then.
[0] : https://sourceforge.net/tracker/?func=detail&aid=3119874&group_id=23... [1] : http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin... [2] : http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin... [3] : http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin...