1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/ram/work/b28464.new/b28464.new.5.0

Browse Source 
into  mysql.com:/home/ram/work/b28464.new/b28464.new.5.1


mysql-test/t/limit.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  SCCS merged
This commit is contained in:
unknown 2007-05-24 18:42:38 +05:00
commit a27fd67b51
5 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/limit.result
View File

@ -91,3 +91,14 @@ select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
c c
28 28
drop table t1; drop table t1;
prepare s from "select 1 limit ?";
set @a='qwe';
execute s using @a;
ERROR HY000: Incorrect arguments to EXECUTE
prepare s from "select 1 limit 1, ?";
execute s using @a;
ERROR HY000: Incorrect arguments to EXECUTE
prepare s from "select 1 limit ?, ?";
execute s using @a, @a;
ERROR HY000: Incorrect arguments to EXECUTE
End of 5.0 tests

17
mysql-test/t/limit.test
View File

@ -71,3 +71,20 @@ explain select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3; select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
#
# Bug #28464: a string argument to 'limit ?' PS
#
prepare s from "select 1 limit ?";
set @a='qwe';
--error 1210
execute s using @a;
prepare s from "select 1 limit 1, ?";
--error 1210
execute s using @a;
prepare s from "select 1 limit ?, ?";
--error 1210
execute s using @a, @a;
--echo End of 5.0 tests

3
sql/item.cc
View File

@ -2348,6 +2348,7 @@ default_set_param_func(Item_param *param,
Item_param::Item_param(unsigned pos_in_query_arg) : Item_param::Item_param(unsigned pos_in_query_arg) :
strict_type(FALSE),
state(NO_VALUE), state(NO_VALUE),
item_result_type(STRING_RESULT), item_result_type(STRING_RESULT),
/* Don't pretend to be a literal unless value for this item is set. */ /* Don't pretend to be a literal unless value for this item is set. */
@ -2542,6 +2543,8 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry)
if (entry && entry->value) if (entry && entry->value)
{ {
item_result_type= entry->type; item_result_type= entry->type;
if (strict_type && required_result_type != item_result_type)
DBUG_RETURN(1);
switch (item_result_type) { switch (item_result_type) {
case REAL_RESULT: case REAL_RESULT:
set_double(*(double*)entry->value); set_double(*(double*)entry->value);

9
sql/item.h
View File

@ -1456,8 +1456,10 @@ class Item_param :public Item
char cnvbuf[MAX_FIELD_WIDTH]; char cnvbuf[MAX_FIELD_WIDTH];
String cnvstr; String cnvstr;
Item *cnvitem; Item *cnvitem;
public: bool strict_type;
enum Item_result required_result_type;
public:
enum enum_item_param_state enum enum_item_param_state
{ {
NO_VALUE, NULL_VALUE, INT_VALUE, REAL_VALUE, NO_VALUE, NULL_VALUE, INT_VALUE, REAL_VALUE,
@ -1585,6 +1587,11 @@ public:
Otherwise return FALSE. Otherwise return FALSE.
*/ */
bool eq(const Item *item, bool binary_cmp) const; bool eq(const Item *item, bool binary_cmp) const;
void set_strict_type(enum Item_result result_type_arg)
{
strict_type= TRUE;
required_result_type= result_type_arg;
}
}; };

3
sql/sql_yacc.yy
View File

@ -7911,6 +7911,9 @@ limit_options:
; ;
limit_option: limit_option:
param_marker param_marker
{
((Item_param *) $1)->set_strict_type(INT_RESULT);
}
| ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); } | ULONGLONG_NUM { $$= new Item_uint($1.str, $1.length); }
| LONG_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); } | NUM { $$= new Item_uint($1.str, $1.length); }