Konstantin Osipov 00dc9a6e70 Merge next-mr -> next-4284. ... Cherry-pick a fix Bug#37148 from next-mr, to preserve file ids of the added files, and ensure that all the necessary changes have been pulled. Since initially Bug#37148 was null-merged into 6.0, the changeset that is now being cherry-picked was likewise null merged into next-4284. Now that Bug#37148 has been reapplied to 6.0, try to make it work with next-4284. This is also necessary to be able to pull other changes from 5.1-rep into next-4284. To resolve the merge issues use this changeset applied to 6.0: revid:jperkin@sun.com-20091216103628-ylhqf7s6yegui2t9 revno: 3776.1.1 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 6.0-codebase-bugfixing timestamp: Thu 2009-12-17 17:02:50 +0800 message: Fix merge problem with Bug#37148		2010-02-04 23:15:47 +03:00
..
r	Merge next-mr -> next-4284.	2010-02-04 23:15:47 +03:00
std_data	Bug#47323 : mysqlbinlog --verbose displays bad output when events contain subset of columns	2009-10-09 16:54:48 +08:00
t	Merge next-mr -> next-4284.	2010-02-04 23:15:47 +03:00
combinations	WL#4350 Options in my.cnf style config file should not start with --	2008-09-05 15:31:09 +02:00