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
d0128f5e
Commit
d0128f5e
authored
May 13, 2009
by
Ramil Kalimullin
Browse files
Options
Browse Files
Download
Plain Diff
Auto-merge.
parents
272c17d1
80fdebaf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
mysql-test/r/func_str.result
mysql-test/r/func_str.result
+9
-0
mysql-test/t/func_str.test
mysql-test/t/func_str.test
+10
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+2
-2
No files found.
mysql-test/r/func_str.result
View file @
d0128f5e
...
@@ -2525,6 +2525,15 @@ SELECT DATE_FORMAT(c, GET_FORMAT(DATE, 'eur')) h, CONCAT(UPPER(aa),', ', aa) i F
...
@@ -2525,6 +2525,15 @@ SELECT DATE_FORMAT(c, GET_FORMAT(DATE, 'eur')) h, CONCAT(UPPER(aa),', ', aa) i F
h i
h i
31.12.2008 AAAAAA, aaaaaa
31.12.2008 AAAAAA, aaaaaa
DROP TABLE t1;
DROP TABLE t1;
#
# BUG#44774: load_file function produces valgrind warnings
#
CREATE TABLE t1 (a TINYBLOB);
INSERT INTO t1 VALUES ('aaaaaaaa');
SELECT LOAD_FILE(a) FROM t1;
LOAD_FILE(a)
NULL
DROP TABLE t1;
End of 5.0 tests
End of 5.0 tests
drop table if exists t1;
drop table if exists t1;
create table t1(f1 tinyint default null)engine=myisam;
create table t1(f1 tinyint default null)engine=myisam;
...
...
mysql-test/t/func_str.test
View file @
d0128f5e
...
@@ -1282,6 +1282,16 @@ INSERT INTO t1 VALUES ('2008-12-31','aaaaaa');
...
@@ -1282,6 +1282,16 @@ INSERT INTO t1 VALUES ('2008-12-31','aaaaaa');
SELECT
DATE_FORMAT
(
c
,
GET_FORMAT
(
DATE
,
'eur'
))
h
,
CONCAT
(
UPPER
(
aa
),
', '
,
aa
)
i
FROM
t1
;
SELECT
DATE_FORMAT
(
c
,
GET_FORMAT
(
DATE
,
'eur'
))
h
,
CONCAT
(
UPPER
(
aa
),
', '
,
aa
)
i
FROM
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# BUG#44774: load_file function produces valgrind warnings
--
echo
#
CREATE
TABLE
t1
(
a
TINYBLOB
);
INSERT
INTO
t1
VALUES
(
'aaaaaaaa'
);
SELECT
LOAD_FILE
(
a
)
FROM
t1
;
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
#
#
...
...
sql/item_strfunc.cc
View file @
d0128f5e
...
@@ -2943,7 +2943,7 @@ String *Item_load_file::val_str(String *str)
...
@@ -2943,7 +2943,7 @@ String *Item_load_file::val_str(String *str)
)
)
goto
err
;
goto
err
;
(
void
)
fn_format
(
path
,
file_name
->
c_ptr
(),
mysql_real_data_home
,
""
,
(
void
)
fn_format
(
path
,
file_name
->
c_ptr
_safe
(),
mysql_real_data_home
,
""
,
MY_RELATIVE_PATH
|
MY_UNPACK_FILENAME
);
MY_RELATIVE_PATH
|
MY_UNPACK_FILENAME
);
/* Read only allowed from within dir specified by secure_file_priv */
/* Read only allowed from within dir specified by secure_file_priv */
...
@@ -2969,7 +2969,7 @@ String *Item_load_file::val_str(String *str)
...
@@ -2969,7 +2969,7 @@ String *Item_load_file::val_str(String *str)
}
}
if
(
tmp_value
.
alloc
(
stat_info
.
st_size
))
if
(
tmp_value
.
alloc
(
stat_info
.
st_size
))
goto
err
;
goto
err
;
if
((
file
=
my_open
(
file_name
->
c_
ptr
(),
O_RDONLY
,
MYF
(
0
)))
<
0
)
if
((
file
=
my_open
(
file_name
->
ptr
(),
O_RDONLY
,
MYF
(
0
)))
<
0
)
goto
err
;
goto
err
;
if
(
my_read
(
file
,
(
uchar
*
)
tmp_value
.
ptr
(),
stat_info
.
st_size
,
MYF
(
MY_NABP
)))
if
(
my_read
(
file
,
(
uchar
*
)
tmp_value
.
ptr
(),
stat_info
.
st_size
,
MYF
(
MY_NABP
)))
{
{
...
...
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