bzr push into mysql-5.4 branch (k.long:2877 to 2878) Bug#46652

[Kelly Long]

 2878 Kelly Long	2009-08-11
      Fix for Bug #46652.  Logic for mysql_version was not in correct #ifdef location.

    modified:
      sql/table.cc
 2877 Kelly Long	2009-08-04
      split the buffer page hash out from the buffer pool mutex

    modified:
      storage/innodb_plugin/buf/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/buf/buf0rea.c
      storage/innodb_plugin/include/buf0buf.h
      storage/innodb_plugin/include/buf0buf.ic
=== modified file 'sql/table.cc'
--- a/sql/table.cc	2009-03-24 13:58:52 +0000
+++ b/sql/table.cc	2009-08-11 17:45:11 +0000
@@ -969,8 +969,9 @@ static int open_binary_frm(THD *thd, TAB
       */
       next_chunk+= 4;
     }
-    else if (share->mysql_version >= 50110)
+    else
 #endif
+    if (share->mysql_version >= 50110)
     {
       /* New auto_partitioned indicator introduced in 5.1.11 */
 #ifdef WITH_PARTITION_STORAGE_ENGINE


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