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
d3d6432f
Commit
d3d6432f
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/mysql-4.0
parents
62b38d20
287906e9
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
1 deletion
+6
-1
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+3
-0
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+1
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
d3d6432f
...
@@ -61,6 +61,7 @@ paul@teton.kitebird.com
...
@@ -61,6 +61,7 @@ paul@teton.kitebird.com
pem@mysql.com
pem@mysql.com
peter@linux.local
peter@linux.local
peter@mysql.com
peter@mysql.com
ram@mysql.r18.ru
ram@ram.(none)
ram@ram.(none)
ranger@regul.home.lan
ranger@regul.home.lan
root@x3.internalnet
root@x3.internalnet
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/func_str.result
View file @
d3d6432f
...
@@ -155,6 +155,9 @@ quote(concat('abc\'', '\\cba'))
...
@@ -155,6 +155,9 @@ quote(concat('abc\'', '\\cba'))
select quote(1/0), quote('\0\Z');
select quote(1/0), quote('\0\Z');
quote(1/0) quote('\0\Z')
quote(1/0) quote('\0\Z')
NULL '\0\Z'
NULL '\0\Z'
select length(quote(concat(char(0),"test")));
length(quote(concat(char(0),"test")))
8
select reverse("");
select reverse("");
reverse("")
reverse("")
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/func_str.test
View file @
d3d6432f
...
@@ -64,6 +64,7 @@ select decode(encode("abcdef","monty"),"monty")="abcdef";
...
@@ -64,6 +64,7 @@ select decode(encode("abcdef","monty"),"monty")="abcdef";
select
quote
(
'\'\"\\test'
);
select
quote
(
'\'\"\\test'
);
select
quote
(
concat
(
'abc\''
,
'\\cba'
));
select
quote
(
concat
(
'abc\''
,
'\\cba'
));
select
quote
(
1
/
0
),
quote
(
'\0\Z'
);
select
quote
(
1
/
0
),
quote
(
'\0\Z'
);
select
length
(
quote
(
concat
(
char
(
0
),
"test"
)));
#
#
# Wrong usage of functions
# Wrong usage of functions
...
...
This diff is collapsed.
Click to expand it.
sql/item_strfunc.cc
View file @
d3d6432f
...
@@ -2134,7 +2134,7 @@ String *Item_func_quote::val_str(String *str)
...
@@ -2134,7 +2134,7 @@ String *Item_func_quote::val_str(String *str)
*/
*/
to
=
(
char
*
)
str
->
ptr
()
+
new_length
-
1
;
to
=
(
char
*
)
str
->
ptr
()
+
new_length
-
1
;
*
to
--=
'\''
;
*
to
--=
'\''
;
for
(
start
=
(
char
*
)
arg
->
ptr
()
;
end
--
!=
start
;
to
--
)
for
(
start
=
(
char
*
)
arg
->
ptr
()
,
end
=
start
+
arg_length
;
end
--
!=
start
;
to
--
)
{
{
/*
/*
We can't use the bitmask here as we want to replace \O and ^Z with 0
We can't use the bitmask here as we want to replace \O and ^Z with 0
...
...
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