Commit 5188f031 authored by unknown's avatar unknown
Browse files

Patch two (the final one) for Bug#7306 "the server side preparedStatement 

 error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.


mysql-test/include/ps_modify.inc:
  Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
  Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
  Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
  Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
  Add basic test coverage for LIMIT ?, ?.
sql/item.h:
  Add a short-cut for (ulonglong) val_int() to Item.
  Add a constructor to Item_int() that accepts ulonglong.
  Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
  Now select_limit has type Item *.
  We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
  it will be allocated in runtime memory root and freed in the end of
  execution.
sql/sp_head.cc:
  Add a special initalization state for stored procedures to 
  be able to easily distinguish the first execution of a stored procedure
  from prepared statement prepare.
sql/sql_class.h:
  Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
  the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
  - use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
    evreryplace. Add a warning about use of set_limit in 
  mysql_derived_filling.
sql/sql_error.cc:
  - use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
    evreryplace.
  - this change is also aware of bug#11095 "show warnings limit 0 returns 
  all rows instead of zero rows", so the one who merges the bugfix from
  4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
  - use unit->set_limit() to initalize 
  unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
  Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
  Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
  - use unit->set_limit() to initalize 
  unit->select_limit_cnt,offset_limit_cnt everyplace. 
  - we can create an Item_int to set global limit of a statement:
  it will be created in the runtime mem root and freed in the end of
  execution.
sql/sql_repl.cc:
  Use unit->set_limit to initialize limits.
sql/sql_select.cc:
  - select_limit is now Item* so the proper way to check for default value
  is to compare it with NULL.
sql/sql_union.cc:
  Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
  Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
  Add grammar support for LIMIT ?, ? clause.
parent a9ccff55

mysql-test/include/ps_modify.inc

+2 −5
Original line number Diff line number Diff line
@@ -174,11 +174,8 @@ where a=2 
limit 1';

execute stmt1 ;

select a,b from t1 where b = 'bla' ;

# currently (May 2004, Version 4.1) it is impossible

-- error 1064

prepare stmt1 from 'update t1 set b=''bla''

where a=2

limit ?';

prepare stmt1 from 'update t1 set b=''bla'' where a=2 limit ?';

execute stmt1 using @arg00;



--disable_query_log

select '------ insert tests ------' as test_sequence ;

mysql-test/include/ps_query.inc

+2 −4
Original line number Diff line number Diff line
@@ -300,10 +300,8 @@ set @arg00=1; 
prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

# currently (May 2004, Version 4.1) it is impossible

-- error 1064

prepare stmt1 from ' select a,b from t1

limit ? ';

prepare stmt1 from ' select a,b from t1 limit ? ';

execute stmt1 using @arg00;



##### parameter used in many places

set @arg00='b' ;

mysql-test/r/ps.result

+41 −0
Original line number Diff line number Diff line
@@ -634,3 +634,44 @@ id 
3

deallocate prepare stmt;

drop table t1, t2;

create table t1 (a int);

insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);

prepare stmt from "select * from t1 limit ?, ?";

set @offset=0, @limit=1;

execute stmt using @offset, @limit;

a

1

select * from t1 limit 0, 1;

a

1

set @offset=3, @limit=2;

execute stmt using @offset, @limit;

a

4

5

select * from t1 limit 3, 2;

a

4

5

prepare stmt from "select * from t1 limit ?";

execute stmt using @limit;

a

1

2

prepare stmt from "select * from t1 where a in (select a from t1 limit ?)";

ERROR 42000: This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'

prepare stmt from "select * from t1 union all select * from t1 limit ?, ?";

set @offset=9;

set @limit=2;

execute stmt using @offset, @limit;

a

10

1

prepare stmt from "(select * from t1 limit ?, ?) union all

                   (select * from t1 limit ?, ?) order by a limit ?";

execute stmt using @offset, @limit, @offset, @limit, @limit;

a

10

10

drop table t1;

deallocate prepare stmt;

mysql-test/r/ps_2myisam.result

+6 −7
Original line number Diff line number Diff line
@@ -444,9 +444,10 @@ limit 1 '; 
execute stmt1 ;

a	b

1	one

prepare stmt1 from ' select a,b from t1

limit ? ';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 2

prepare stmt1 from ' select a,b from t1 limit ? ';

execute stmt1 using @arg00;

a	b

1	one

set @arg00='b' ;

set @arg01=0 ;

set @arg02=2 ;
@@ -1381,10 +1382,8 @@ execute stmt1 ; 
select a,b from t1 where b = 'bla' ;

a	b

2	bla

prepare stmt1 from 'update t1 set b=''bla''

where a=2

limit ?';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 3

prepare stmt1 from 'update t1 set b=''bla'' where a=2 limit ?';

execute stmt1 using @arg00;

test_sequence

------ insert tests ------

delete from t1 ;

mysql-test/r/ps_3innodb.result

+6 −7
Original line number Diff line number Diff line
@@ -444,9 +444,10 @@ limit 1 '; 
execute stmt1 ;

a	b

1	one

prepare stmt1 from ' select a,b from t1

limit ? ';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 2

prepare stmt1 from ' select a,b from t1 limit ? ';

execute stmt1 using @arg00;

a	b

1	one

set @arg00='b' ;

set @arg01=0 ;

set @arg02=2 ;
@@ -1364,10 +1365,8 @@ execute stmt1 ; 
select a,b from t1 where b = 'bla' ;

a	b

2	bla

prepare stmt1 from 'update t1 set b=''bla''

where a=2

limit ?';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 3

prepare stmt1 from 'update t1 set b=''bla'' where a=2 limit ?';

execute stmt1 using @arg00;

test_sequence

------ insert tests ------

delete from t1 ;