bzr push into mysql-trunk branch (marc.alff:3843 to 3844)

[Marc Alff]

 3844 Marc Alff	2012-05-15
      Fixed the order of parameters when calling _aligned_malloc (Windows specific)

    modified:
      storage/perfschema/pfs_global.cc
 3843 Marc Alff	2012-05-15 [merge]
      local merge

    modified:
      storage/innobase/fts/fts0que.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'storage/perfschema/pfs_global.cc'
--- a/storage/perfschema/pfs_global.cc	2012-05-15 16:18:30 +0000
+++ b/storage/perfschema/pfs_global.cc	2012-05-15 19:14:49 +0000
@@ -64,7 +64,7 @@ void *pfs_malloc(size_t size, myf flags)
 #else
 #ifdef HAVE_ALIGNED_MALLOC
   /* Windows */
-  ptr= _aligned_malloc(PFS_ALIGNEMENT, size);
+  ptr= _aligned_malloc(size, PFS_ALIGNEMENT);
   if (unlikely(ptr == NULL))
     return NULL;
 #else

No bundle (reason: useless for push emails).