Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e97a79f2
Commit
e97a79f2
authored
Oct 30, 2004
by
konstantin@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable REPLACE ... SELECT in prepared statements.
parent
475aaac8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
9 deletions
+24
-9
mysql-test/include/ps_modify.inc
mysql-test/include/ps_modify.inc
+4
-1
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_2myisam.result
+3
-1
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_3innodb.result
+3
-1
mysql-test/r/ps_4heap.result
mysql-test/r/ps_4heap.result
+3
-1
mysql-test/r/ps_5merge.result
mysql-test/r/ps_5merge.result
+6
-2
mysql-test/r/ps_6bdb.result
mysql-test/r/ps_6bdb.result
+3
-1
mysql-test/r/ps_7ndb.result
mysql-test/r/ps_7ndb.result
+0
-1
mysql-test/t/ps_7ndb.test
mysql-test/t/ps_7ndb.test
+1
-1
sql/sql_prepare.cc
sql/sql_prepare.cc
+1
-0
No files found.
mysql-test/include/ps_modify.inc
View file @
e97a79f2
...
@@ -322,8 +322,11 @@ select a,b from t1 where a >= 1000 order by a ;
...
@@ -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
...
...
mysql-test/r/ps_2myisam.result
View file @
e97a79f2
...
@@ -1581,7 +1581,9 @@ a b
...
@@ -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 ;
...
...
mysql-test/r/ps_3innodb.result
View file @
e97a79f2
...
@@ -1564,7 +1564,9 @@ a b
...
@@ -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 ;
...
...
mysql-test/r/ps_4heap.result
View file @
e97a79f2
...
@@ -1565,7 +1565,9 @@ a b
...
@@ -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 ;
...
...
mysql-test/r/ps_5merge.result
View file @
e97a79f2
...
@@ -1607,7 +1607,9 @@ a b
...
@@ -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
...
@@ -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 ;
...
...
mysql-test/r/ps_6bdb.result
View file @
e97a79f2
...
@@ -1564,7 +1564,9 @@ a b
...
@@ -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 ;
...
...
mysql-test/r/ps_7ndb.result
View file @
e97a79f2
...
@@ -1543,7 +1543,6 @@ a b
...
@@ -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 ;
...
...
mysql-test/t/ps_7ndb.test
View file @
e97a79f2
...
@@ -339,8 +339,8 @@ select a,b from t1 where a >= 1000 order by a ;
...
@@ -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
...
...
sql/sql_prepare.cc
View file @
e97a79f2
...
@@ -1442,6 +1442,7 @@ static int send_prepare_results(Prepared_statement *stmt, bool text_protocol)
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment