bzr push into mysql-trunk branch (marc.alff:5413 to 5414)

[Marc Alff]

 5414 Marc Alff	2013-01-22 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      storage/perfschema/pfs.cc
 5413 Vasil Dimov	2013-01-22
      Move an InnoDB custom unit test from storage/innobase/handler/ha_innodb.cc
      to unittest/gunit/innodb/ha_innodb-t.cc and convert it to use Google test.
      
      Some of the tests are disabled, because they fail. innobase_convert_name()
      has been changed after the tests were developed and the tests were never
      run after that. Now the function needs to be fixed or the new results
      carefully examined and changed in the test if they are acceptable.

    added:
      unittest/gunit/innodb/ha_innodb-t.cc
    modified:
      storage/innobase/handler/ha_innodb.cc
      unittest/gunit/innodb/CMakeLists.txt
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2013-01-22 11:33:19 +0000
+++ b/storage/perfschema/pfs.cc	2013-01-22 14:50:30 +0000
@@ -2183,7 +2183,6 @@ void pfs_set_thread_info_v1(const char*
   PFS_thread *pfs= my_pthread_get_THR_PFS();
 
   DBUG_ASSERT((info != NULL) || (info_len == 0));
-  DBUG_ASSERT((info == NULL) || (info_len != 0));
 
   if (likely(pfs != NULL))
   {

No bundle (reason: useless for push emails).