bzr push into mysql-trunk branch (tatjana.nuernberg:4024 to 4025)

[Tatjana Azundris Nuernberg]

 4025 Tatjana Azundris Nuernberg	2012-06-16
      post-merge fixies

    modified:
      mysql-test/r/variables-notembedded.result
 4024 Tatjana Azundris Nuernberg	2012-06-15
      aftermath of Bug#13431369: MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON WINDOWS
      
      turn test case back on.
     @ mysql-test/t/disabled.def
        turn variables-notembedded.test back on
     @ mysql-test/t/variables-notembedded.test
        2013=CR_SERVER_LOST -- on Windows the line can drop before the client sees
        the error code. We just proceed. In the hypothetical case of the server
        actually crashing, the test would fail at the next statement (on connection
        "default").
        Normally, 2013 appears in conjunction with 2006=CR_SERVER_GONE_ERROR, but
        we shouldn't need that here -- either the connection drops in the middle
        of the query, or we receive the proper error message, ER_NET_PACKET_TOO_LARGE.

    modified:
      mysql-test/t/disabled.def
      mysql-test/t/variables-notembedded.test
=== modified file 'mysql-test/r/variables-notembedded.result'
--- a/mysql-test/r/variables-notembedded.result	2012-05-09 16:47:39 +0000
+++ b/mysql-test/r/variables-notembedded.result	2012-06-16 08:49:31 +0000
@@ -164,7 +164,7 @@ max_allowed_packet	2048
 SHOW SESSION VARIABLES LIKE 'net_buffer_length';
 Variable_name	Value
 net_buffer_length	4096
-ERROR 08S01: Got a packet bigger than 'max_allowed_packet' bytes
+Got one of the listed errors
 SELECT LENGTH(a) FROM t1;
 LENGTH(a)
 SET GLOBAL max_allowed_packet=default;

No bundle (reason: useless for push emails).