From: Alexander Barkov
Date: March 3 2011 8:28am
Subject: bzr push into mysql-5.1 branch (alexander.barkov:3606 to 3607) Bug#58036
 Bug#11765108
List-Archive: http://lists.mysql.com/commits/132344
X-Bug: 58036,11765108
Message-Id: <201103030828.p238SqAl010561@bar.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 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
 3606 Vinay Fisrekar	2011-03-01
      Bug#11766165 - 59211: SELECT RETURNS DIFFERENT VALUE FOR MIN(YEAR) FUNCTION
      Result File Correction For Bug Fix

    modified:
      mysql-test/suite/engines/iuds/r/insert_year.result
=== 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();
       }
     }

No bundle (reason: useless for push emails).