bzr push into mysql-trunk branch (marc.alff:3286 to 3287)

[Marc Alff]

 3287 Marc Alff	2011-07-22
      Fixed build break in unit tests.

    modified:
      unittest/gunit/test_mdl_context_owner.h
 3286 Marc Alff	2011-07-21 [merge]
      Local merge

    modified:
      client/mysqltest.cc
      config.h.cmake
      configure.cmake
      dbug/dbug_analyze.c
      dbug/my_main.c
      dbug/tests.c
      mysql-test/r/func_if.result
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/t/innodb_bug54044.test
      mysql-test/t/func_if.test
      mysys/my_init.c
      sql/field.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
=== modified file 'unittest/gunit/test_mdl_context_owner.h'
--- a/unittest/gunit/test_mdl_context_owner.h	2011-01-27 15:31:18 +0000
+++ b/unittest/gunit/test_mdl_context_owner.h	2011-07-21 22:49:31 +0000
@@ -25,15 +25,22 @@ public:
   Test_MDL_context_owner()
     : m_current_mutex(NULL)
   {}
-  virtual const char* enter_cond(mysql_cond_t *cond,
-                                 mysql_mutex_t* mutex,
-                                 const char* msg)
+  virtual void enter_cond(mysql_cond_t *cond,
+                          mysql_mutex_t* mutex,
+                          const PSI_stage_info *stage,
+                          PSI_stage_info *old_stage,
+                          const char *src_function,
+                          const char *src_file,
+                          int src_line)
   {
     m_current_mutex= mutex;
-    return NULL;
+    return;
   }
 
-  virtual void exit_cond(const char* old_msg)
+  virtual void exit_cond(const PSI_stage_info *stage,
+                         const char *src_function,
+                         const char *src_file,
+                         int src_line)
   {
     mysql_mutex_unlock(m_current_mutex);
   }

No bundle (reason: useless for push emails).