From: Alexander Barkov
Date: February 18 2011 2:17pm
Subject: bzr commit into mysql-5.1 branch (alexander.barkov:3601)
List-Archive: http://lists.mysql.com/commits/131636
Message-Id: <201102181417.p1IEHpfl029412@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6411569809999520514=="

--===============6411569809999520514==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bar/mysql-bzr/mysql-5.1.b58036v3/ based on revid:alexander.barkov@stripped

 3601 Alexander Barkov	2011-02-18
      A post-fix for b58036.

    modified:
      tests/mysql_client_test.c
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-02-18 13:12:36 +0000
+++ b/tests/mysql_client_test.c	2011-02-18 14:17:37 +0000
@@ -18417,7 +18417,7 @@ static void test_bug58036()
     if (!opt_silent)
       printf("mysql_real_connect() succeeded (failure expected)\n");
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   if (!opt_silent)
@@ -18443,7 +18443,7 @@ static void test_bug58036()
       printf("mysql_real_connect() failed: %s (%d)\n",
              mysql_error(conn), mysql_errno(conn));
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   mysql_options(conn, MYSQL_SET_CHARSET_NAME, "ucs2");
@@ -18452,7 +18452,7 @@ static void test_bug58036()
     if (!opt_silent)
       printf("mysql_change_user() succedded, error expected!");
     mysql_close(conn);
-    DIE();
+    DIE("");
   }
 
   if (!opt_silent)


--===============6411569809999520514==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/alexander.barkov@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.barkov@stripped\
#   1ap03g3pk6f2mmxs
# target_branch: file:///home/bar/mysql-bzr/mysql-5.1.b58036v3/
# testament_sha1: 754fe34290b93bb1953f2b76d9b31310592cebf0
# timestamp: 2011-02-18 17:17:51 +0300
# base_revision_id: alexander.barkov@stripped\
#   cxdh5l1ircy0t4p1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRCyjDkAAZjfgEAQUGP//3Yg
AAC////wUAN3a8HeeOkACSiTTJieqaZo9DU1PKBtNCND1BoMkk9Tynqaep5I09QA0AAAANENE0nk
Rp6gAABoAADFNKekaaAMgNAANAGgCSSZDU08kZMhkBBogyMECi+VJTn3+JCuhFEXzgiFMmyC5LU2
BAUbNGpaIgHWgj0+CIjUiTmYe6RRL3+9LUFuQEsVy/JimzGqdpeiMVXnjUotBkIy0fA8VcGfW7dH
DZphUkaFYkbKJ4nYTQNdBkE50aTDgNUzAh8QQIQTGkG9UD/E7Vi83RiXufqCcwO/L1/NQiHhmZOs
EOowCuuE9owWmxOFSYx1Xi17BGpLvzheafwKzmywbJiYTiVArzFhFgbKHWvNixH6mDebbRbyuykN
9N5bltCZE0ibQP014u8aRfAppHBcGLxziu0vpNMjRt1lRSQInJ3MIyaJvYjju00DGPwswzlTbLqH
0RgPSheYKImvKxAVWpOtzGcxDRUC9hQGnGwOBWGCZzjWuZhgvMD5QFMgiEADC4UwQRmfUxTsrhAn
iy15CcOtGkWh08SEDYu4baFBbFkbTQTAI46yorFT5ZLajGPrt0kjzJpBjBk+HVZKPJQdqzI5ekSK
Whrj2vLi07csUjxJbSh0YPCwgMbl0ppk6grha9SMeaR4rpE+/nnYkevYx5RlOzgKVZ4F3KebMM7O
jKp6WZDUj+pHJGpobwluu5eGkvmoJpD14V+kAUOIcSq7yQpx9s4mQ81NhhfhN5NbRQEnG0Nt7nua
yTi+zTxZJ+NHFpWvdNVxUhVPo3y15kxkoVAmqJxY+oVhC/MRF1Ok478NvCESsN53HIWtG47jG7MG
eEfe1F1RlJrfO7yTcFVM3Jxs9wl87tdFwcQ6hHnZCT8ToLWFNBsBdTduDsFgWUA/nWkMfXFIoTXd
KivkkSVOGgvh2FCBqgJ3rVUZMZ1vBgVDuMgHMmVJ842lviXgqg1PKf6kZg5ZuTT0grRX7/UGL8GZ
PKvEUYbqbfI/2g2niNZNwk5JY4A9GjhIq6QBVrZRqg8PMIM0n0aMDg4jIGrXbl7NzLJMEQZrZ+bL
0CT36hlB0pq2468Iz6TKNukJA0HKeOGXOpiz8MkVrAGTzkdrGgC7w5FwqFanh2D1gXxO4yi/sf8X
ckU4UJAQsow5


--===============6411569809999520514==--