bzr commit into mysql-pe branch (svoj:3719)

[Sergey Vojtovich]

#At file:///home/svoj/devel/bzr-mysql/mysql-pe-push/ based on revid:joro@stripped

 3719 Sergey Vojtovich	2009-11-27 [merge]
      Merge 5.1-bugteam -> pe.

    modified:
      mysql-test/t/bug47671.test
=== modified file 'mysql-test/t/bug47671.test'
--- a/mysql-test/t/bug47671.test	2009-11-25 06:55:49 +0000
+++ b/mysql-test/t/bug47671.test	2009-11-27 13:55:08 +0000
@@ -1,6 +1,9 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
 --echo #
 --echo # Bug#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
 --echo #
 --echo # Extract only charset information from 'status' command output using regex
 --replace_regex /.*mysql.*// /Connection.*// /Current.*//  /SSL.*// /Using.*// /Server version.*// /Protocol.*// /UNIX.*// /Uptime.*// /Threads.*//
---exec $MYSQL -u root test -e "status";
+--exec $MYSQL -e "status";


Attachment: [text/bzr-bundle] bzr/[e-mail]