bzr push into mysql-trunk branch (jon.hauglid:3243 to 3244) Bug#12694147

[Jon Olav Hauglid]

 3244 Jon Olav Hauglid	2011-06-29
      Bug#12694147 COMPILING WITH -DWITHOUT_PARTITION_STORAGE_ENGINE=1
                   AND WITHOUT -O FAILS! (formerly known as 61625)
      
      The problem was that the server would not compile if partitioning
      was disabled. This was caused by two calls to the 
      partition_key_modified() function which is only defined if
      partitioning support is enabled. This regression was caused by
      the patch for Bug#11762751.
      
      This patch fixes the problem by wrapping the offending calls in
      #ifdef WITH_PARTITION_STORAGE_ENGINE / #endif.
      
      The patch also fixes a test case which used partitioning without
      having "--source include/have_partition.inc". This meant that the
      test case would fail on servers configured without partitioning.
      
      No test case added.

    modified:
      mysql-test/suite/perfschema/t/part_table_io.test
      sql/sql_update.cc
 3243 Marko Mäkelä	2011-06-29 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/include/trx0sys.h
=== modified file 'mysql-test/suite/perfschema/t/part_table_io.test'
--- a/mysql-test/suite/perfschema/t/part_table_io.test	2010-11-09 05:02:46 +0000
+++ b/mysql-test/suite/perfschema/t/part_table_io.test	2011-06-29 14:46:58 +0000
@@ -15,6 +15,7 @@
 
 # Tests for PERFORMANCE_SCHEMA table io
 
+--source include/have_partition.inc
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source ../include/table_io_setup_helper.inc

=== modified file 'sql/sql_update.cc'
--- a/sql/sql_update.cc	2011-06-24 09:29:07 +0000
+++ b/sql/sql_update.cc	2011-06-29 14:46:58 +0000
@@ -1056,6 +1056,7 @@ bool unsafe_key_update(TABLE_LIST *leave
         TABLE *table2= tl2->table;
         if (table2->map & tables_for_update && table1->s == table2->s)
         {
+#ifdef WITH_PARTITION_STORAGE_ENGINE
           // A table is updated through two aliases
           if (table_partitioned &&
               (partition_key_modified(table1, table1->write_set) ||
@@ -1069,6 +1070,7 @@ bool unsafe_key_update(TABLE_LIST *leave
                                          : tl2->alias);
             return true;
           }
+#endif
 
           if (primkey_clustered)
           {

No bundle (reason: useless for push emails).