From 9e6b13b5f24f22a74bd2a8ca2c008e83cf376c00 Mon Sep 17 00:00:00 2001
From: unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru>
Date: Sat, 10 Nov 2007 18:57:09 +0400
Subject: [PATCH] manual merge.

---
 mysql-test/r/ps.result | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index edac68a88d6..14dec382244 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -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');