=== modified file 'mysql-test/disabled.def' --- mysql-test/disabled.def 2013-11-20 11:05:39 +0000 +++ mysql-test/disabled.def 2014-04-01 10:53:10 +0000 @@ -15,7 +15,6 @@ lowercase_table3 : Bug#11762269 read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists 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-05-14 Anitha Dependent on PB2 changes - eventum#41836 #show_explain : Psergey: random timeout in range-checked-for-each record query. ssl_crl_clients_valid : broken upstream ssl_crl : broken upstream === modified file 'mysql-test/r/mysql_embedded.result' --- mysql-test/r/mysql_embedded.result 2011-06-13 18:41:24 +0000 +++ mysql-test/r/mysql_embedded.result 2014-04-01 10:50:00 +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' --- mysql-test/t/mysql_embedded.test 2011-06-16 13:55:11 +0000 +++ mysql-test/t/mysql_embedded.test 2014-04-01 10:58:14 +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"