From: Alexander Barkov
Date: March 3 2011 8:28am
Subject: bzr commit into mysql-5.1 branch (alexander.barkov:3607) Bug#58036
 Bug#11765108
List-Archive: http://lists.mysql.com/commits/132343
X-Bug: 58036,11765108
Message-Id: <201103030828.p238SSHj010549@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1518094583487294816=="

--===============1518094583487294816==
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/ based on revid:vinay.fisrekar@stripped

 3607 Alexander Barkov	2011-03-03
      An after-fix for
      Bug#11765108 - Bug#58036: CLIENT UTF32, UTF16, UCS2 SHOULD BE DISALLOWED, THEY CRASH SERVER 
      
      Fixing wrong usage of DBUG_ASSERT.
      In non-debug version thd_init_client_charset
      was not executed at all.

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2011-02-22 21:03:32 +0000
+++ b/sql/sql_parse.cc	2011-03-03 08:25:37 +0000
@@ -1218,7 +1218,8 @@ bool dispatch_command(enum enum_server_c
           We have checked charset earlier,
           so thd_init_client_charset cannot fail.
         */
-        DBUG_ASSERT(!thd_init_client_charset(thd, cs_number));
+        if (thd_init_client_charset(thd, cs_number))
+          DBUG_ASSERT(0);
         thd->update_charset();
       }
     }


--===============1518094583487294816==
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\
#   27l0ldhayo0bl0et
# target_branch: file:///home/bar/mysql-bzr/mysql-5.1/
# testament_sha1: c6151f249a5c63d9275ddce6c9b3196135e4d31e
# timestamp: 2011-03-03 11:28:28 +0300
# base_revision_id: vinay.fisrekar@stripped\
#   g6cfnxp5et5ubk94
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSE8xrUAAZbfgEUQWGf//3/l
n6C////wUAQOt73Lprm9D3evZ64SiIaDU00nhGEaTKfqnqaHpMjTQ9CZBoAZU0npDZCZNE9TBoAB
MIwmmTA0AGRTAKemRGUmT1PKekHqANDR6gAPSeoBklPQ1NpTGSN6gACMgxGAjCYAgSSI0jFD0h6E
0Mj1PUNMQDQAANqNM8KU32r4/H8jtK0WGpjPxRYoCw6mrPG2CXOcVCAl+muz5xIiDfsDVsQJK8Ap
JXT1ksXdM33xQ3DmnTqq1a+2/u+5nWCRZIPsm5111s7epGKg40bIF37J5MN2mePMeYh7hPMip6x9
SMzpPlyMQqgcvLJpFKyglswMoZcuPtAozIUOgidDQlgnWnJDCZRXylnhEJzD09MZhSJ9ApWFMQYk
nNtgN8QQo9Oe54mOi5xB4exjXDQZv25dqWUGG7MfuddAcqmdZs6RpNnlrcwfJqqWRq+WA14gtSkI
q11FaXSjxN2aYSCUmJqVCmTCdAK6GVuZwNIjjmGKSaNRhUSfYqAsI4MLefLTOgcJiZWjxh2LMcr2
stabwf5Rt0uF0xqEdQvfgtmY8wwaNFRq2KQnqaqhNYCJtc981DENceaJAzGvvYjHGV+V9rKegwBi
9M0F6AyZQOSQiySh97xIaKhAxgv9BzgJiTpTek6jQ6kjcKTot1kcxRBE1FiWEcDolants7C6qXop
Rt/LjBsRME9Pb+zElJ1FK9QT3XKez9M+jB0w5ceVT8+ApQMuSl7W8eLbRVWIUnEVezGjZJSIuFji
J0thiDC1O2MHtlTesZmIPDk4zHHplyZ60u7s5YOmu0EgNkMo2Oz0kvXbfyBPnVxGGlJyvmnqeo0e
iiOq8O1T4YGvxRMZsPBNYlz16QfGoq1fJxMjqQRuk+VXOHlISoQEiY4UXo5qBF0JLTYixZVGJ7xv
Sz0R6DlblMBDGJiS9ze+hGAYNxLzNBXOWN9WMUC5MmmB1dhk58l122RW5WltKS0VLb+mENovcip/
inKVgFrL3a5LykhUVfqivDADdKjo8dJJoZRqH1bbxZTR68KMkwm2JrhTLMreCqc5GkIl1G/nimIQ
U8jaJqMEn9g+lIEsCMPzsBYrhPlYhhMoULJugO0FiSnCn4ImAKL4to6JgoNqpNeVrWC8BgLTSCzC
kDhJgg8IKqsTTpMcNhNwQarRsN5IsWOzkHatwgjnCCf6FPjAzKHY0xQGAe5mqYiK8RPSlGywOTig
NAteFukFJusGWMsnk3AFHAowR3QBFWMZmUUQyF4QVmuW+2WIQX2eLkAPSpuJG6AzEC0iWywlZoAk
Y9WnxOq8iAhtGtSysdVroc5wQUUdy9msBZHf19aP7oVQ8zEgNpRTYYKbFBrCIW85lpixotN/QxeL
81mczBODVTPPwSzHsFeYQkBXt66+sIS4tscgHbsQ2GLiBpDbokZBpYGlEFwDQIv8XckU4UJAhPMa
1A==


--===============1518094583487294816==--