3205 Sergey Vojtovich 2009-11-27
Fixes for bug47671.test:
- embedded server doesn't support external clients
- removed unnecessary command line options
@ mysql-test/t/bug47671.test
Fixes for bug47671.test:
- embedded server doesn't support external clients
- removed unnecessary command line options
modified:
mysql-test/t/bug47671.test
3204 Georgi Kodinov 2009-11-27 [merge]
merge
modified:
mysql-test/r/sp-security.result
mysql-test/t/sp-security.test
sql/sql_acl.cc
=== 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/svoj@sun.com-20091127135508-nmov19g6t3uf6kfi.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-bugteam branch (svoj:3204 to 3205) | Sergey Vojtovich | 27 Nov |
