bzr push into mysql-trunk branch (mayank.prasad:3227 to 3228) Bug#11764633

[Mayank Prasad]

 3228 Mayank Prasad	2011-06-22
      Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED
      
      Description:
      Test case for this bug had dependency on Bug#12561297 which has 
      been fixed now. So pushing test case.
     @ mysql-test/r/mysql_embedded.result
        Result file.
     @ mysql-test/t/mysql_embedded.test
        Test case which tries to Tee to a file inside a directory
        which doesn't exist.

    modified:
      mysql-test/r/mysql_embedded.result
      mysql-test/t/mysql_embedded.test
 3227 Marko Mäkelä	2011-06-22 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
=== modified file 'mysql-test/r/mysql_embedded.result'
--- a/mysql-test/r/mysql_embedded.result	2011-06-13 18:41:24 +0000
+++ b/mysql-test/r/mysql_embedded.result	2011-06-22 11:46:29 +0000
@@ -3,3 +3,7 @@
 #
 1
 1
+#
+# Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED
+#
+Error logging to file 'foo/bar'

=== modified file 'mysql-test/t/mysql_embedded.test'
--- a/mysql-test/t/mysql_embedded.test	2011-06-16 13:55:11 +0000
+++ b/mysql-test/t/mysql_embedded.test	2011-06-22 11:46:29 +0000
@@ -1,12 +1,18 @@
+--source include/is_embedded.inc
+
 --echo #
 --echo # Bug#12561297 : LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
 --echo #
 
---source include/is_embedded.inc
-
 # Test case require mysql_embedded to be present
 if(!$MYSQL_EMBEDDED)
 {
   --skip Test requires mysql_embedded executable
 }
 --exec $MYSQL_EMBEDDED -e 'select 1'
+
+--echo #
+--echo # Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDED
+--echo #
+
+--exec $MYSQL_EMBEDDED -e '\T foo/bar'

No bundle (reason: useless for push emails).