3415 Jonathan Perkin 2011-09-19 [merge]
Merge from mysql-5.5
3414 Tor Didriksen 2011-09-19
Bug#12981106 ADD OPTIMIZER TRACES FOR FOR FILESORT
Post-push fix: record size and cost may be different on 32 bit systems.
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2011-09-13 14:21:50 +0000
+++ b/support-files/mysql.spec.sh 2011-09-19 19:17:36 +0000
@@ -1154,9 +1154,9 @@ echo "====="
* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@stripped>
- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to
- changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to %install)
- this necessitated a move of the libmygcc.a installation from %build to
- %install, which is probably where it belonged in the first place.
+ changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+ this necessitated a move of the libmygcc.a installation to the install
+ phase, which is probably where it belonged in the first place.
* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@stripped>
No bundle (reason: useless for push emails).
|• bzr push into mysql-trunk branch (jonathan.perkin:3414 to 3415) ||Jonathan Perkin||20 Sep|