Merge buzz.(none):/home/davi/mysql-5.0-runtime

into  buzz.(none):/home/davi/mysql-5.1-runtime


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/item.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_user_variables.result:
  Manual merge
mysql-test/suite/rpl/t/rpl_user_variables.test:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 7c669851db4..108cf5e9ab3 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8219,10 +8219,10 @@ limit_options:
         ;
 
 limit_option:
-          param_marker
-          {
-            ((Item_param *) $1)->set_strict_type(INT_RESULT);
-          }
+        param_marker
+        {
+          ((Item_param *) $1)->limit_clause_param= TRUE;
+        }
         | ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); }
         | LONG_NUM      { $$= new Item_uint($1.str, $1.length); }
         | NUM           { $$= new Item_uint($1.str, $1.length); }