database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Enable REPLACE ... SELECT in prepared statements.

Browse Source
This commit is contained in:
konstantin@mysql.com
2004-10-30 17:17:52 +04:00
parent 475aaac8ee
commit e97a79f2ee
9 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/ps_modify.inc
View File

@@ -322,8 +322,11 @@ select a,b from t1 where a >= 1000 order by a ;
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
## replace ## replace
--error 1295
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';
execute stmt1;
execute stmt1;
execute stmt1;
## multi table statements ## multi table statements

4
mysql-test/r/ps_2myisam.result
View File

@@ -1581,7 +1581,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

4
mysql-test/r/ps_3innodb.result
View File

@@ -1564,7 +1564,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

4
mysql-test/r/ps_4heap.result
View File

@@ -1565,7 +1565,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

8
mysql-test/r/ps_5merge.result
View File

@@ -1607,7 +1607,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;
@@ -4615,7 +4617,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

4
mysql-test/r/ps_6bdb.result
View File

@@ -1564,7 +1564,9 @@ a b
1200 x1000_1updatedupdated 1200 x1000_1updatedupdated
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; 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 test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

1
mysql-test/r/ps_7ndb.result
View File

@@ -1543,7 +1543,6 @@ a b
1000 x1000_1 1000 x1000_1
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';
ERROR HY000: This command is not supported in the prepared statement protocol yet
test_sequence test_sequence
------ multi table tests ------ ------ multi table tests ------
delete from t1 ; delete from t1 ;

2
mysql-test/t/ps_7ndb.test
View File

@@ -339,8 +339,8 @@ select a,b from t1 where a >= 1000 order by a ;
delete from t1 where a >= 1000 ; delete from t1 where a >= 1000 ;
## replace ## replace
--error 1295
prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' '; prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';
--error 1031
## multi table statements ## multi table statements
--disable_query_log --disable_query_log

1
sql/sql_prepare.cc
View File

@@ -1442,6 +1442,7 @@ static int send_prepare_results(Prepared_statement *stmt, bool text_protocol)
break; break;
case SQLCOM_INSERT_SELECT: case SQLCOM_INSERT_SELECT:
case SQLCOM_REPLACE_SELECT:
res= mysql_test_insert_select(stmt, tables); res= mysql_test_insert_select(stmt, tables);
break; break;