From: Tor Didriksen
Date: August 28 2012 2:40pm
Subject: bzr push into mysql-5.6 branch (tor.didriksen:4196 to 4197)
List-Archive: http://lists.mysql.com/commits/144642
Message-Id: <20120828144033.7107.86830.4197@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4197 Tor Didriksen	2012-08-28 [merge]
      NULL merge 5.5 => 5.6

 4196 Sergey Glukhov	2012-08-28
      Bug#14093521 SIMPLE SELECT..WHERE QUERY ON YEAR GIVES DIFFERENT ORDER BY TRANSFORMED RESULT
      Regression was introduced by Ole John's fix for Bug #58628.
      Before that fix result of copying key value to the buffer
      was ignored and the default field value was used as key value.
      After Ole John's fix, result of copying key is taken into
      account and in case of bad values(STORE_KEY_FATAL) 
      it is treated as impossibe condition, so no result is returned.
      The fix is remove the check for result of copying key value.

    modified:
      mysql-test/r/myisam.result
      mysql-test/r/update.result
      mysql-test/t/myisam.test
      sql/sql_select.cc
No bundle (reason: useless for push emails).