bk commit into 5.1 tree (ramil:1.2616)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-10 18:57:09+04:00, ramil@stripped +1 -0
  manual merge.

  mysql-test/r/ps.result@stripped, 2007-11-10 18:57:06+04:00, ramil@stripped +5 -0
    manual merge.

diff -Nrup a/mysql-test/r/ps.result b/mysql-test/r/ps.result
--- a/mysql-test/r/ps.result	2007-11-10 18:43:37 +04:00
+++ b/mysql-test/r/ps.result	2007-11-10 18:57:06 +04:00
@@ -1143,6 +1143,11 @@ a
 13
 DEALLOCATE PREPARE st1;
 DROP TABLE t1;
+create table t1 (a int, b tinyint);
+prepare st1 from 'update t1 set b= (str_to_date(a, a))';
+execute st1;
+deallocate prepare st1;
+drop table t1;
 End of 4.1 tests.
 create table t1 (a varchar(20));
 insert into t1 values ('foo');