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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
90aa17c2
Commit
90aa17c2
authored
Mar 17, 2007
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into trift2.:/MySQL/M51/push-5.1
parents
e9fb4a68
08a63f8a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mysql-test/r/loaddata.result
mysql-test/r/loaddata.result
+3
-3
mysql-test/t/loaddata.test
mysql-test/t/loaddata.test
+2
-2
No files found.
mysql-test/r/loaddata.result
View file @
90aa17c2
...
@@ -157,12 +157,12 @@ MYSQLTEST_VARDIR/
...
@@ -157,12 +157,12 @@ MYSQLTEST_VARDIR/
set @@secure_file_priv= 0;
set @@secure_file_priv= 0;
ERROR HY000: Variable 'secure_file_priv' is a read only variable
ERROR HY000: Variable 'secure_file_priv' is a read only variable
truncate table t1;
truncate table t1;
load data infile 'MYSQL_TEST_DIR/
Makefile
' into table t1;
load data infile 'MYSQL_TEST_DIR/
t/loaddata.test
' into table t1;
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
select * from t1;
select * from t1;
a b c
a b c
select load_file("MYSQL_TEST_DIR/
Makefile
");
select load_file("MYSQL_TEST_DIR/
t/loaddata.test
");
load_file("MYSQL_TEST_DIR/
Makefile
")
load_file("MYSQL_TEST_DIR/
t/loaddata.test
")
NULL
NULL
drop table t1, t2;
drop table t1, t2;
CREATE TABLE t1 (a int);
CREATE TABLE t1 (a int);
...
...
mysql-test/t/loaddata.test
View file @
90aa17c2
...
@@ -130,12 +130,12 @@ set @@secure_file_priv= 0;
...
@@ -130,12 +130,12 @@ set @@secure_file_priv= 0;
truncate
table
t1
;
truncate
table
t1
;
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
error
1290
--
error
1290
eval
load
data
infile
'$MYSQL_TEST_DIR/
Makefile
'
into
table
t1
;
eval
load
data
infile
'$MYSQL_TEST_DIR/
t/loaddata.test
'
into
table
t1
;
select
*
from
t1
;
select
*
from
t1
;
# Test "load_file" returns NULL
# Test "load_file" returns NULL
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
eval
select
load_file
(
"
$MYSQL_TEST_DIR
/
Makefile
"
);
eval
select
load_file
(
"
$MYSQL_TEST_DIR
/
t/loaddata.test
"
);
# cleanup
# cleanup
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
...
...
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