Commit d46c7366 authored by unknown's avatar unknown
Browse files

Enable REPLACE ... SELECT in prepared statements. 


mysql-test/include/ps_modify.inc:
  replace ... select now works.
mysql-test/r/ps_2myisam.result:
  replace ... select now works.
mysql-test/r/ps_3innodb.result:
  replace ... select now works.
mysql-test/r/ps_4heap.result:
  replace ... select now works.
mysql-test/r/ps_5merge.result:
  replace ... select now works.
mysql-test/r/ps_6bdb.result:
  replace ... select now works.
mysql-test/r/ps_7ndb.result:
  replace ... select now works.
mysql-test/t/ps_7ndb.test:
  replace ... select now works.
sql/sql_prepare.cc:
  Enable SQLCOM_REPLACE_SELECT: no need for any code changes but
  enable this SQLCOM in the switch.
parent 6ca39e96

mysql-test/include/ps_modify.inc

+4 −1
Original line number Diff line number Diff line
@@ -322,8 +322,11 @@ select a,b from t1 where a >= 1000 order by a ; 
delete from t1 where a >= 1000 ;



## replace

--error 1295

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

execute stmt1;

execute stmt1;

execute stmt1;







## multi table statements

mysql-test/r/ps_2myisam.result

+3 −1
Original line number Diff line number Diff line
@@ -1581,7 +1581,9 @@ a b 
1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

execute stmt1;

execute stmt1;

execute stmt1;

test_sequence

------ multi table tests ------

delete from t1 ;

mysql-test/r/ps_3innodb.result

+3 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,9 @@ a b 
1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

execute stmt1;

execute stmt1;

execute stmt1;

test_sequence

------ multi table tests ------

delete from t1 ;

mysql-test/r/ps_4heap.result

+3 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,9 @@ a b 
1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

execute stmt1;

execute stmt1;

execute stmt1;

test_sequence

------ multi table tests ------

delete from t1 ;

mysql-test/r/ps_5merge.result

+6 −2
Original line number Diff line number Diff line
@@ -1607,7 +1607,9 @@ a b 
1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

execute stmt1;

execute stmt1;

execute stmt1;

test_sequence

------ multi table tests ------

delete from t1 ;
@@ -4615,7 +4617,9 @@ a b 
1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

execute stmt1;

execute stmt1;

execute stmt1;

test_sequence

------ multi table tests ------

delete from t1 ;