bzr push into mysql-5.5-bugfixing branch (tor.didriksen:3205 to 3206)

[Tor Didriksen]

 3206 Tor Didriksen	2010-09-10
      Header files should be self-contained

    modified:
      storage/perfschema/ha_perfschema.cc
 3205 Marc Alff	2010-09-09
      Bug#56521 Assertion failed: (m_state == 2), function allocated_to_free, pfs_lock.h (138)
      
      Before this fix, it was possible to build the server:
      - with the performance schema
      - with a dummy implementation of my_atomic (MY_ATOMIC_MODE_DUMMY).
      
      In this case, the resulting binary will just crash,
      as this configuration is not supported.
      
      This fix enforces that the build will fail with a compilation error in this
      configuration, instead of resulting in a broken binary.

    modified:
      storage/perfschema/ha_perfschema.cc
=== modified file 'storage/perfschema/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-09-09 20:28:47 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-09-10 09:10:38 +0000
@@ -19,8 +19,8 @@
 */
 
 #include "my_global.h"
-#include "my_atomic.h"
 #include "my_pthread.h"
+#include "my_atomic.h"
 #include "sql_plugin.h"
 #include "mysql/plugin.h"
 #include "ha_perfschema.h"


Attachment: [text/bzr-bundle] bzr/[e-mail]