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
c9068232
Commit
c9068232
authored
17 years ago
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into trift2.:/MySQL/M50/push-5.0
parents
a231b057
5e541e98
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
90 additions
and
0 deletions
+90
-0
CMakeLists.txt
CMakeLists.txt
+5
-0
mysql-test/r/sp-vars.result
mysql-test/r/sp-vars.result
+41
-0
mysql-test/t/sp-vars.test
mysql-test/t/sp-vars.test
+44
-0
No files found.
CMakeLists.txt
View file @
c9068232
...
...
@@ -154,6 +154,11 @@ IF(EMBED_MANIFESTS)
# Disable automatic manifest generation.
STRING
(
REPLACE
"/MANIFEST"
"/MANIFEST:NO"
CMAKE_EXE_LINKER_FLAGS
${
CMAKE_EXE_LINKER_FLAGS
}
)
# Explicitly disable it since it is the default for newer versions of VS
STRING
(
REGEX MATCH
"MANIFEST:NO"
tmp_manifest
${
CMAKE_EXE_LINKER_FLAGS
}
)
IF
(
NOT tmp_manifest
)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/MANIFEST:NO"
)
ENDIF
(
tmp_manifest
)
# Set the processor architecture.
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
SET
(
PROCESSOR_ARCH
"X64"
)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/sp-vars.result
View file @
c9068232
...
...
@@ -1161,3 +1161,44 @@ CALL p1();
v_text
abc|def
DROP PROCEDURE p1;
DROP PROCEDURE IF EXISTS bug27415_text_test|
DROP PROCEDURE IF EXISTS bug27415_text_test2|
CREATE PROCEDURE bug27415_text_test(entity_id_str_in text)
BEGIN
DECLARE str_remainder text;
SET str_remainder = entity_id_str_in;
select 'before substr', str_remainder;
SET str_remainder = SUBSTRING(str_remainder, 3);
select 'after substr', str_remainder;
END|
CREATE PROCEDURE bug27415_text_test2(entity_id_str_in text)
BEGIN
DECLARE str_remainder text;
DECLARE str_remainder2 text;
SET str_remainder2 = entity_id_str_in;
select 'before substr', str_remainder2;
SET str_remainder = SUBSTRING(str_remainder2, 3);
select 'after substr', str_remainder;
END|
CALL bug27415_text_test('a,b,c')|
before substr str_remainder
before substr a,b,c
after substr str_remainder
after substr b,c
CALL bug27415_text_test('a,b,c')|
before substr str_remainder
before substr a,b,c
after substr str_remainder
after substr b,c
CALL bug27415_text_test2('a,b,c')|
before substr str_remainder2
before substr a,b,c
after substr str_remainder
after substr b,c
CALL bug27415_text_test('a,b,c')|
before substr str_remainder
before substr a,b,c
after substr str_remainder
after substr b,c
DROP PROCEDURE bug27415_text_test|
DROP PROCEDURE bug27415_text_test2|
This diff is collapsed.
Click to expand it.
mysql-test/t/sp-vars.test
View file @
c9068232
...
...
@@ -1367,4 +1367,48 @@ CALL p1();
DROP
PROCEDURE
p1
;
#
# Bug #27415 Text Variables in stored procedures
# If the SP varible was also referenced on the right side
# the result was corrupted.
#
DELIMITER
|
;
--
disable_warnings
DROP
PROCEDURE
IF
EXISTS
bug27415_text_test
|
DROP
PROCEDURE
IF
EXISTS
bug27415_text_test2
|
--
enable_warnings
CREATE
PROCEDURE
bug27415_text_test
(
entity_id_str_in
text
)
BEGIN
DECLARE
str_remainder
text
;
SET
str_remainder
=
entity_id_str_in
;
select
'before substr'
,
str_remainder
;
SET
str_remainder
=
SUBSTRING
(
str_remainder
,
3
);
select
'after substr'
,
str_remainder
;
END
|
CREATE
PROCEDURE
bug27415_text_test2
(
entity_id_str_in
text
)
BEGIN
DECLARE
str_remainder
text
;
DECLARE
str_remainder2
text
;
SET
str_remainder2
=
entity_id_str_in
;
select
'before substr'
,
str_remainder2
;
SET
str_remainder
=
SUBSTRING
(
str_remainder2
,
3
);
select
'after substr'
,
str_remainder
;
END
|
CALL
bug27415_text_test
(
'a,b,c'
)
|
CALL
bug27415_text_test
(
'a,b,c'
)
|
CALL
bug27415_text_test2
(
'a,b,c'
)
|
CALL
bug27415_text_test
(
'a,b,c'
)
|
DROP
PROCEDURE
bug27415_text_test
|
DROP
PROCEDURE
bug27415_text_test2
|
DELIMITER
;
|
# End of 5.0 tests.
This diff is collapsed.
Click to expand it.
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