manual merge.

2691d9b1 · ramil/ram@mysql.com/ramil.myoffice.izhnet.ru · c102112f · 2691d9b1
Commit 2691d9b1 authored Nov 10, 2007 by ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mysql-test/r/ps.result mysql-test/r/ps.result +5 -0

No files found.
--- 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');