From 8ff44eaeefff5079b04bddff48ef48e5054de729 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Wed, 3 Jan 2007 03:33:26 +0400
Subject: [PATCH 1/2] mysql_upgrade disabled in embedded server

---
 mysql-test/t/mysql_upgrade.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test
index 4200ba844f7..c6133f8e85f 100644
--- a/mysql-test/t/mysql_upgrade.test
+++ b/mysql-test/t/mysql_upgrade.test
@@ -1,3 +1,6 @@
+# Can't run test of external client with embedded server
+-- source include/not_embedded.inc
+
 # Only run test if "mysql_upgrade" is found
 --require r/have_mysql_upgrade.result
 --disable_query_log

From 8c2d34c3c6c5c0db42ef8d95c76a439585d973c8 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Wed, 3 Jan 2007 03:35:57 +0400
Subject: [PATCH 2/2] merging

---
 mysql-test/r/flush_block_commit_notembedded.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/flush_block_commit_notembedded.result b/mysql-test/r/flush_block_commit_notembedded.result
index 09c1bcafafe..599efeb3e2d 100644
--- a/mysql-test/r/flush_block_commit_notembedded.result
+++ b/mysql-test/r/flush_block_commit_notembedded.result
@@ -6,7 +6,7 @@ flush tables with read lock;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	98		
- commit;
+commit;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	98