Merge mysql.com:/home/ram/work/b28509/b28509.5.0

into  mysql.com:/home/ram/work/b28509/b28509.5.1


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

1 files changed, 9 insertions, 0 deletions

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index b811a27203c..45cdc6a2101 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1560,6 +1560,15 @@ execute stmt;
 ERROR 42S22: Unknown column 'y.value' in 'field list'
 deallocate prepare stmt;
 drop tables t1;
+prepare stmt from "create table t1 select ?";
+set @a=1.0;
+execute stmt using @a;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `?` decimal(2,1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 End of 5.0 tests.
 create procedure proc_1() reset query cache;
 call proc_1();