bk commit into 6.0 tree (rafal:1.2617)

[rsomla]

Below is the list of changes that have just been committed into a local
6.0 repository of rafal.  When rafal does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-10 10:42:49+02:00, rafal@quant.(none) +3 -0
  Fixing small problems which showed in PB:
  - backup tests not disabled on embedded server,
  - result of debug_sync test updated due to change of error number.

  mysql-test/r/debug_sync.result@stripped, 2008-05-10 10:42:45+02:00, rafal@quant.(none) +1 -1
    Result update due to changed location of error message after previous merge.

  mysql-test/t/backup_charsets.test@stripped, 2008-05-10 10:42:45+02:00, rafal@quant.(none) +2
-0
    Backup tests should not be run on embedded server.

  mysql-test/t/backup_no_be.test@stripped, 2008-05-10 10:42:45+02:00, rafal@quant.(none) +1 -0
    Backup tests should not be run on embedded server.

diff -Nrup a/mysql-test/r/debug_sync.result b/mysql-test/r/debug_sync.result
--- a/mysql-test/r/debug_sync.result	2008-04-29 16:16:49 +02:00
+++ b/mysql-test/r/debug_sync.result	2008-05-10 10:42:45 +02:00
@@ -137,7 +137,7 @@ Variable_name	Value
 debug_sync	ON - current signal: 'something'
 SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
 Warnings:
-Warning	1673	debug sync point wait timed out
+Warning	1717	debug sync point wait timed out
 SET DEBUG_SYNC= 'now SIGNAL nothing';
 SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
diff -Nrup a/mysql-test/t/backup_charsets.test b/mysql-test/t/backup_charsets.test
--- a/mysql-test/t/backup_charsets.test	2008-05-05 17:03:15 +02:00
+++ b/mysql-test/t/backup_charsets.test	2008-05-10 10:42:45 +02:00
@@ -1,3 +1,5 @@
+--source include/not_embedded.inc
+ 
 #
 # This test checks how online backup handles object names encoded using 
 # extended character sets (non-latin1)
diff -Nrup a/mysql-test/t/backup_no_be.test b/mysql-test/t/backup_no_be.test
--- a/mysql-test/t/backup_no_be.test	2008-04-16 20:23:01 +02:00
+++ b/mysql-test/t/backup_no_be.test	2008-05-10 10:42:45 +02:00
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 --source include/have_debug.inc
 
 #