bzr push into mysql-next-mr-stage branch (magnus.blaudd:3314 to 3315) WL#3126

[Magnus Blåudd]

 3315 Magnus Blåudd	2010-10-20
      Wl#3126
       - fix failing test on Windows by removing the troublesome quotes

    modified:
      mysql-test/r/mysql.result
      mysql-test/t/mysql.test
 3314 Magnus Blåudd	2010-10-19
      WL#3126
        - fix problem with "anonymous union in struct" by naming the union "ci"
          which is short for "client info"

    modified:
      include/mysql.h
      include/mysql.h.pp
      sql-common/client.c
=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2010-10-18 12:18:18 +0000
+++ b/mysql-test/r/mysql.result	2010-10-20 10:50:50 +0000
@@ -435,4 +435,4 @@ Bug #47147: mysql client option --skip-c
 
 End of tests
 Connected
-OK
+1

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2010-10-18 12:18:18 +0000
+++ b/mysql-test/t/mysql.test	2010-10-20 10:50:50 +0000
@@ -433,4 +433,4 @@ drop table t1;
 # WL#3126 TCP address binding for mysql client library;
 # - running mysql --protocol=tcp --bind-address=127.0.0.1
 #
---exec $MYSQL --protocol=tcp --bind-address=127.0.0.1 -e "select \"OK\" as Connected"
+--exec $MYSQL --protocol=tcp --bind-address=127.0.0.1 -e "select 1 as Connected"

No bundle (reason: useless for push emails).