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
73dfb402
Commit
73dfb402
authored
Mar 02, 2020
by
Rahul Anand
Committed by
Robert Bindar
Mar 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-20500: Bad error msg on disabling local infile
parent
8f8cc5f4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
mysql-test/suite/sys_vars/r/local_infile_func.result
mysql-test/suite/sys_vars/r/local_infile_func.result
+1
-1
mysql-test/suite/sys_vars/t/local_infile_func.test
mysql-test/suite/sys_vars/t/local_infile_func.test
+1
-1
sql/share/errmsg-utf8.txt
sql/share/errmsg-utf8.txt
+4
-1
sql/sql_parse.cc
sql/sql_parse.cc
+3
-2
No files found.
mysql-test/suite/sys_vars/r/local_infile_func.result
View file @
73dfb402
...
...
@@ -29,7 +29,7 @@ DROP TABLE IF EXISTS t1;
create table t1(a int);
LOAD DATA LOCAL INFILE
'MYSQLTEST_VARDIR/std_data/numbers.txt' INTO TABLE test.t1;
ERROR
42000: The used command is not allowed with this MariaDB version
ERROR
HY000: The used command is not allowed because the MariaDB server or client has disabled the local infile capability
SELECT count(*) from t1;
count(*)
0
...
...
mysql-test/suite/sys_vars/t/local_infile_func.test
View file @
73dfb402
...
...
@@ -74,7 +74,7 @@ DROP TABLE IF EXISTS t1;
create
table
t1
(
a
int
);
--
replace_result
$MYSQLTEST_VARDIR
MYSQLTEST_VARDIR
--
Error
ER_
NOT_ALLOWED_COMMAN
D
--
Error
ER_
LOAD_INFILE_CAPABILITY_DISABLE
D
eval
LOAD
DATA
LOCAL
INFILE
'$MYSQLTEST_VARDIR/std_data/numbers.txt'
INTO
TABLE
test
.
t1
;
...
...
sql/share/errmsg-utf8.txt
View file @
73dfb402
...
...
@@ -7945,3 +7945,6 @@ ER_PART_STARTS_BEYOND_INTERVAL
eng "%`s: STARTS is later than query time, first history partition may exceed INTERVAL value"
ER_GALERA_REPLICATION_NOT_SUPPORTED
eng "DDL-statement is forbidden as table storage engine does not support Galera replication"
ER_LOAD_INFILE_CAPABILITY_DISABLED
eng "The used command is not allowed because the MariaDB server or client has disabled the local infile capability"
rum "Comanda folosită nu este permisă deoarece clientul sau serverul MariaDB a dezactivat această capabilitate"
\ No newline at end of file
sql/sql_parse.cc
View file @
73dfb402
...
...
@@ -4940,7 +4940,8 @@ mysql_execute_command(THD *thd)
if
(
!
(
thd
->
client_capabilities
&
CLIENT_LOCAL_FILES
)
||
!
opt_local_infile
)
{
my_message
(
ER_NOT_ALLOWED_COMMAND
,
ER_THD
(
thd
,
ER_NOT_ALLOWED_COMMAND
),
MYF
(
0
));
my_message
(
ER_LOAD_INFILE_CAPABILITY_DISABLED
,
ER_THD
(
thd
,
ER_LOAD_INFILE_CAPABILITY_DISABLED
),
MYF
(
0
));
goto
error
;
}
}
...
...
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