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
1c0207d1
Commit
1c0207d1
authored
Dec 12, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
parents
b56d3824
dcc2e663
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
128 additions
and
8 deletions
+128
-8
mysql-test/r/read_only.result
mysql-test/r/read_only.result
+26
-0
mysql-test/t/read_only.test
mysql-test/t/read_only.test
+33
-0
sql/sql_parse.cc
sql/sql_parse.cc
+69
-8
No files found.
mysql-test/r/read_only.result
View file @
1c0207d1
...
@@ -46,4 +46,30 @@ Warnings:
...
@@ -46,4 +46,30 @@ Warnings:
Note 1051 Unknown table 'ttt'
Note 1051 Unknown table 'ttt'
drop table t1,t2;
drop table t1,t2;
drop user test@localhost;
drop user test@localhost;
#
# Bug #27440 read_only allows create and drop database
#
drop database if exists mysqltest_db1;
drop database if exists mysqltest_db2;
delete from mysql.user where User like 'mysqltest_%';
delete from mysql.db where User like 'mysqltest_%';
delete from mysql.tables_priv where User like 'mysqltest_%';
delete from mysql.columns_priv where User like 'mysqltest_%';
flush privileges;
grant all on mysqltest_db2.* to `mysqltest_u1`@`%`;
create database mysqltest_db1;
grant all on mysqltest_db1.* to `mysqltest_u1`@`%`;
flush privileges;
create database mysqltest_db2;
ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
show databases like '%mysqltest_db2%';
Database (%mysqltest_db2%)
drop database mysqltest_db1;
ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
delete from mysql.user where User like 'mysqltest_%';
delete from mysql.db where User like 'mysqltest_%';
delete from mysql.tables_priv where User like 'mysqltest_%';
delete from mysql.columns_priv where User like 'mysqltest_%';
flush privileges;
drop database mysqltest_db1;
set global read_only=0;
set global read_only=0;
mysql-test/t/read_only.test
View file @
1c0207d1
...
@@ -117,4 +117,37 @@ connection default;
...
@@ -117,4 +117,37 @@ connection default;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
drop
user
test
@
localhost
;
drop
user
test
@
localhost
;
--
echo
#
--
echo
# Bug #27440 read_only allows create and drop database
--
echo
#
--
disable_warnings
drop
database
if
exists
mysqltest_db1
;
drop
database
if
exists
mysqltest_db2
;
--
enable_warnings
delete
from
mysql
.
user
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
db
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
tables_priv
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
columns_priv
where
User
like
'mysqltest_%'
;
flush
privileges
;
grant
all
on
mysqltest_db2
.*
to
`mysqltest_u1`
@
`%`
;
create
database
mysqltest_db1
;
grant
all
on
mysqltest_db1
.*
to
`mysqltest_u1`
@
`%`
;
flush
privileges
;
connect
(
con_bug27440
,
127.0
.
0.1
,
mysqltest_u1
,,
test
,
$MASTER_MYPORT
,);
connection
con_bug27440
;
--
error
ER_OPTION_PREVENTS_STATEMENT
create
database
mysqltest_db2
;
show
databases
like
'%mysqltest_db2%'
;
--
error
ER_OPTION_PREVENTS_STATEMENT
drop
database
mysqltest_db1
;
disconnect
con_bug27440
;
connection
default
;
delete
from
mysql
.
user
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
db
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
tables_priv
where
User
like
'mysqltest_%'
;
delete
from
mysql
.
columns_priv
where
User
like
'mysqltest_%'
;
flush
privileges
;
drop
database
mysqltest_db1
;
set
global
read_only
=
0
;
set
global
read_only
=
0
;
sql/sql_parse.cc
View file @
1c0207d1
...
@@ -1597,6 +1597,74 @@ static bool do_command(THD *thd)
...
@@ -1597,6 +1597,74 @@ static bool do_command(THD *thd)
#endif
/* EMBEDDED_LIBRARY */
#endif
/* EMBEDDED_LIBRARY */
/**
@brief Determine if an attempt to update a non-temporary table while the
read-only option was enabled has been made.
This is a helper function to mysql_execute_command.
@note SQLCOM_MULTI_UPDATE is an exception and delt with elsewhere.
@see mysql_execute_command
@returns Status code
@retval TRUE The statement should be denied.
@retval FALSE The statement isn't updating any relevant tables.
*/
static
my_bool
deny_updates_if_read_only_option
(
THD
*
thd
,
TABLE_LIST
*
all_tables
)
{
DBUG_ENTER
(
"deny_updates_if_read_only_option"
);
if
(
!
opt_readonly
)
DBUG_RETURN
(
FALSE
);
LEX
*
lex
=
thd
->
lex
;
const
my_bool
user_is_super
=
((
ulong
)(
thd
->
security_ctx
->
master_access
&
SUPER_ACL
)
==
(
ulong
)
SUPER_ACL
);
if
(
user_is_super
)
DBUG_RETURN
(
FALSE
);
if
(
!
uc_update_queries
[
lex
->
sql_command
])
DBUG_RETURN
(
FALSE
);
/* Multi update is an exception and is dealt with later. */
if
(
lex
->
sql_command
==
SQLCOM_UPDATE_MULTI
)
DBUG_RETURN
(
FALSE
);
const
my_bool
create_temp_tables
=
(
lex
->
sql_command
==
SQLCOM_CREATE_TABLE
)
&&
(
lex
->
create_info
.
options
&
HA_LEX_CREATE_TMP_TABLE
);
const
my_bool
drop_temp_tables
=
(
lex
->
sql_command
==
SQLCOM_DROP_TABLE
)
&&
lex
->
drop_temporary
;
const
my_bool
update_real_tables
=
some_non_temp_table_to_be_updated
(
thd
,
all_tables
)
&&
!
(
create_temp_tables
||
drop_temp_tables
);
const
my_bool
create_or_drop_databases
=
(
lex
->
sql_command
==
SQLCOM_CREATE_DB
)
||
(
lex
->
sql_command
==
SQLCOM_DROP_DB
);
if
(
update_real_tables
||
create_or_drop_databases
)
{
/*
An attempt was made to modify one or more non-temporary tables.
*/
DBUG_RETURN
(
TRUE
);
}
/* Assuming that only temporary tables are modified. */
DBUG_RETURN
(
FALSE
);
}
/*
/*
Perform one connection-level (COM_XXXX) command.
Perform one connection-level (COM_XXXX) command.
...
@@ -2590,14 +2658,7 @@ mysql_execute_command(THD *thd)
...
@@ -2590,14 +2658,7 @@ mysql_execute_command(THD *thd)
When option readonly is set deny operations which change non-temporary
When option readonly is set deny operations which change non-temporary
tables. Except for the replication thread and the 'super' users.
tables. Except for the replication thread and the 'super' users.
*/
*/
if
(
opt_readonly
&&
if
(
deny_updates_if_read_only_option
(
thd
,
all_tables
))
!
(
thd
->
security_ctx
->
master_access
&
SUPER_ACL
)
&&
uc_update_queries
[
lex
->
sql_command
]
&&
!
((
lex
->
sql_command
==
SQLCOM_CREATE_TABLE
)
&&
(
lex
->
create_info
.
options
&
HA_LEX_CREATE_TMP_TABLE
))
&&
!
((
lex
->
sql_command
==
SQLCOM_DROP_TABLE
)
&&
lex
->
drop_temporary
)
&&
((
lex
->
sql_command
!=
SQLCOM_UPDATE_MULTI
)
&&
some_non_temp_table_to_be_updated
(
thd
,
all_tables
)))
{
{
my_error
(
ER_OPTION_PREVENTS_STATEMENT
,
MYF
(
0
),
"--read-only"
);
my_error
(
ER_OPTION_PREVENTS_STATEMENT
,
MYF
(
0
),
"--read-only"
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
...
...
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