bzr push into mysql-trunk branch (mayank.prasad:3570 to 3571) Bug#12561297

[Mayank Prasad]

 3571 Mayank Prasad	2011-11-08
      bug#12561297 : Disabling mysql_embedded test case
      
      Innodb behavior to expect /usr/local/mysql directory, 
      causes this test case to fail. Therefore disabling it.

    modified:
      mysql-test/t/disabled.def
 3570 Marc Alff	2011-11-07
      Fixed several issues affecting the embedded build.
      
      1) in psi.h, do not compile with the performance schema instrumentation,
      for the embedded build.
      
      2) in mysql_socket.h, cleanup compiler warnings when building
      without the socket instrumentation
      
      3) in mysqld.cc, remove un needed code for embedded builds
      
      4) in sql_class.h, remove un needed instrumentation state,
      when compiling for embedded

    modified:
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/psi.h
      sql/mysqld.cc
      sql/sql_class.h
      sql/sql_parse.cc
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-11-04 09:18:36 +0000
+++ b/mysql-test/t/disabled.def	2011-11-08 06:40:03 +0000
@@ -16,3 +16,4 @@ alter_table-big          : Bug#11748731
 create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
+mysql_embedded           : Bug#12561297 2011-11-08 Mayank Innodb behavior causes this test case to fail.

No bundle (reason: useless for push emails).