bzr push into mysql-trunk branch (marc.alff:3244 to 3245)

[Marc Alff]

 3245 Marc Alff	2011-06-29 [merge]
      Merge mysql-5.5 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/t/relaylog.test
 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
=== modified file 'mysql-test/suite/perfschema/r/relaylog.result'
--- a/mysql-test/suite/perfschema/r/relaylog.result	2011-03-11 10:48:37 +0000
+++ b/mysql-test/suite/perfschema/r/relaylog.result	2011-06-29 20:25:37 +0000
@@ -52,10 +52,11 @@ select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
 from performance_schema.events_waits_summary_global_by_event_name
-where event_name like "%MYSQL_BIN_LOG%" order by event_name;
+where event_name like "%MYSQL_BIN_LOG%"
+  and event_name not like "%MYSQL_BIN_LOG::update_cond"
+  order by event_name;
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids	NONE
-wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	NONE
 "Expect no slave relay log"
@@ -68,9 +69,10 @@ EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NU
 wait/io/file/sql/relaylog	0	0	0	0
 wait/io/file/sql/relaylog_index	0	0	0	0
 select * from performance_schema.events_waits_summary_global_by_event_name
-where event_name like "%MYSQL_RELAY_LOG%" order by event_name;
+where event_name like "%MYSQL_RELAY_LOG%"
+  and event_name not like "%MYSQL_RELAY_LOG::update_cond"
+  order by event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
-wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond	0	0	0	0	0
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	0	0	0	0	0
 "============ Performance schema on slave ============"
 select * from performance_schema.file_summary_by_instance
@@ -124,10 +126,11 @@ select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
 from performance_schema.events_waits_summary_global_by_event_name
-where event_name like "%MYSQL_BIN_LOG%" order by event_name;
+where event_name like "%MYSQL_BIN_LOG%"
+  and event_name not like "%MYSQL_BIN_LOG::update_cond"
+  order by event_name;
 EVENT_NAME	COUNT_STAR
 wait/synch/cond/sql/MYSQL_BIN_LOG::COND_prep_xids	NONE
-wait/synch/cond/sql/MYSQL_BIN_LOG::update_cond	NONE
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_index	MANY
 wait/synch/mutex/sql/MYSQL_BIN_LOG::LOCK_prep_xids	NONE
 "Expect a slave relay log"
@@ -162,8 +165,9 @@ select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
 from performance_schema.events_waits_summary_global_by_event_name
-where event_name like "%MYSQL_RELAY_LOG%" order by event_name;
+where event_name like "%MYSQL_RELAY_LOG%"
+  and event_name not like "%MYSQL_RELAY_LOG::update_cond"
+  order by event_name;
 EVENT_NAME	COUNT_STAR
-wait/synch/cond/sql/MYSQL_RELAY_LOG::update_cond	MANY
 wait/synch/mutex/sql/MYSQL_RELAY_LOG::LOCK_index	MANY
 include/stop_slave.inc

=== modified file 'mysql-test/suite/perfschema/t/relaylog.test'
--- a/mysql-test/suite/perfschema/t/relaylog.test	2011-03-11 10:45:16 +0000
+++ b/mysql-test/suite/perfschema/t/relaylog.test	2011-06-29 20:18:07 +0000
@@ -41,6 +41,8 @@ drop table test.t1;
 # To ensure robustness:
 # - log file rotation is limited to file .000001 and .000002
 # - statistics are normalized to "NONE" or "MANY"
+# - statistics on ::update_cond conditions are not collected,
+#   since this is too much dependent on execution.
 #
 
 connection master;
@@ -84,7 +86,9 @@ select
   EVENT_NAME,
   if (count_star > 0, "MANY", "NONE") as COUNT_STAR
   from performance_schema.events_waits_summary_global_by_event_name
-  where event_name like "%MYSQL_BIN_LOG%" order by event_name;
+  where event_name like "%MYSQL_BIN_LOG%"
+  and event_name not like "%MYSQL_BIN_LOG::update_cond"
+  order by event_name;
 
 -- echo "Expect no slave relay log"
 
@@ -95,7 +99,9 @@ select * from performance_schema.file_su
   where event_name like "%relaylog%" order by event_name;
 
 select * from performance_schema.events_waits_summary_global_by_event_name
-  where event_name like "%MYSQL_RELAY_LOG%" order by event_name;
+  where event_name like "%MYSQL_RELAY_LOG%"
+  and event_name not like "%MYSQL_RELAY_LOG::update_cond"
+  order by event_name;
 
 sync_slave_with_master;
 -- echo "============ Performance schema on slave ============"
@@ -142,7 +148,9 @@ select
   EVENT_NAME,
   if (count_star > 0, "MANY", "NONE") as COUNT_STAR
   from performance_schema.events_waits_summary_global_by_event_name
-  where event_name like "%MYSQL_BIN_LOG%" order by event_name;
+  where event_name like "%MYSQL_BIN_LOG%"
+  and event_name not like "%MYSQL_BIN_LOG::update_cond"
+  order by event_name;
 
 -- echo "Expect a slave relay log"
 
@@ -173,7 +181,9 @@ select
   EVENT_NAME,
   if (count_star > 0, "MANY", "NONE") as COUNT_STAR
   from performance_schema.events_waits_summary_global_by_event_name
-  where event_name like "%MYSQL_RELAY_LOG%" order by event_name;
+  where event_name like "%MYSQL_RELAY_LOG%"
+  and event_name not like "%MYSQL_RELAY_LOG::update_cond"
+  order by event_name;
 
 --source include/stop_slave.inc
 

No bundle (reason: useless for push emails).