push into mysql-6.0 branch (aelkin:2659) Bug#36968

[Andrei Elkin]

------------------------------------------------------------
revno: 2659
revision-id: aelkin@stripped
parent: aelkin@stripped
committer: Andrei Elkin <aelkin@stripped>
branch nick: 6.0-bug36968-rpl_temporary_errors_warn
timestamp: Sat 2008-06-14 13:01:26 +0300
message:
  Failing tests fixing:  main.rpl_slave_transaction_retries_basic_64 can/should not
execute on embedded.
modified:
  mysql-test/include/slave_transaction_retries_basic.inc
sp1f-slave_transaction_re-20080508181314-54wsy3ery5ed2jvyj7bbjvvon57sqpa2
  mysql-test/t/rpl_sync_binlog_basic_64.test
sp1f-sync_binlog_basic_64-20080508181328-7rqxz2tuabef4y6qorjs6rj37altvxnh
=== modified file 'mysql-test/include/slave_transaction_retries_basic.inc'
--- a/mysql-test/include/slave_transaction_retries_basic.inc	2008-05-08 18:13:39 +0000
+++ b/mysql-test/include/slave_transaction_retries_basic.inc	2008-06-14 10:01:26 +0000
@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 
 ###################################################################

=== modified file 'mysql-test/t/rpl_sync_binlog_basic_64.test'
--- a/mysql-test/t/rpl_sync_binlog_basic_64.test	2008-05-16 02:44:49 +0000
+++ b/mysql-test/t/rpl_sync_binlog_basic_64.test	2008-06-14 10:01:26 +0000
@@ -6,4 +6,3 @@
 
 --source include/have_64bit.inc
 --source include/sync_binlog_basic.inc
-