From: Joerg Bruehe
Date: December 16 2011 6:56pm
Subject: bzr push into mysql-5.5 branch (joerg.bruehe:3654 to 3656)
List-Archive: http://lists.mysql.com/commits/142151
Message-Id: <201112161856.pBGIuBM4021981@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3656 Joerg Bruehe	2011-12-16 [merge]
      Empty upmerge of 5.0 and 5.1 version number increases.

 3655 Joerg Bruehe	2011-12-16
      Raise version number after cloning 5.5.20

    modified:
      VERSION
 3654 Chaithra Gopalareddy	2011-12-15
      Bug#13344643:Format function in view looses locale information
      
      Problem description:
      When a view is created using function FORMAT and if FORMAT function uses locale
      option,definition of view saved into server doesn't contain that locale information,
      Ex:
      create  table test2 (bb decimal (10,2));
      insert into test2 values (10.32),(10009.2),(12345678.21);
      create view test3 as select format(bb,1,'sk_SK') as cc from test2;
      select * from test3;
      +--------------+
      | cc           |
      +--------------+
      | 10.3         |
      | 10,009.2     |
      | 12,345,678.2 |
      +--------------+
      3 rows in set (0.02 sec)
      
      show create view test3
                      View: test3
               Create View: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`
      SQL SECURITY DEFINER VIEW `test3` AS select format(`test2`.`bb`,1) AS `cc`
      from `test2`
      character_set_client: latin1
      collation_connection: latin1_swedish_ci
      1 row in set (0.02 sec)
      
      Problem Analysis:
      The function Item_func_format::print() which prints the query string to create
      the view does not print the third argument (i.e the locale information). Hence
       view is created without locale information. 
      
      Problem Solution:
      If argument count is more than 2 we now print the third argument onto the query string.
      
      Files changed:
      sql/item_strfunc.cc
      Function call changes: Item_func_format::print()
      mysql-test/t/select.test
      Added test case to test the bug
      mysql-test/r/select.result
      Result of the test case appended here

    modified:
      mysql-test/r/select.result
      mysql-test/t/select.test
      sql/item_strfunc.cc
=== modified file 'VERSION'
--- a/VERSION	2011-11-23 11:33:59 +0000
+++ b/VERSION	2011-12-16 18:41:35 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=20
+MYSQL_VERSION_PATCH=21
 MYSQL_VERSION_EXTRA=

No bundle (reason: useless for push emails).