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
fb8ac41a
Commit
fb8ac41a
authored
15 years ago
by
Andrei Elkin
Browse files
Options
Browse Files
Download
Plain Diff
merge from 5.1-pe-stage to a local tree
parents
27cf6879
aca1a83f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
226 additions
and
1 deletion
+226
-1
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/binlog.test
+40
-0
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
+32
-0
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
+32
-0
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/r/rpl_temporary.result
+10
-0
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/suite/rpl/t/rpl_temporary.test
+38
-0
sql/sp_head.cc
sql/sp_head.cc
+5
-0
sql/sql_class.cc
sql/sql_class.cc
+9
-0
sql/sql_class.h
sql/sql_class.h
+4
-0
sql/sql_parse.cc
sql/sql_parse.cc
+56
-1
No files found.
mysql-test/extra/binlog_tests/binlog.test
View file @
fb8ac41a
...
...
@@ -164,6 +164,46 @@ DROP TABLE t1;
DROP
DATABASE
bug39182
;
USE
test
;
#
# Bug#35383: binlog playback and replication breaks due to
# name_const substitution
#
DELIMITER
//;
CREATE
PROCEDURE
p1
(
IN
v1
INT
)
BEGIN
CREATE
TABLE
t1
SELECT
v1
;
DROP
TABLE
t1
;
END
//
CREATE
PROCEDURE
p2
()
BEGIN
DECLARE
v1
INT
;
CREATE
TABLE
t1
SELECT
v1
+
1
;
DROP
TABLE
t1
;
END
//
CREATE
PROCEDURE
p3
(
IN
v1
INT
)
BEGIN
CREATE
TABLE
t1
SELECT
1
FROM
DUAL
WHERE
v1
!=
0
;
DROP
TABLE
t1
;
END
//
CREATE
PROCEDURE
p4
(
IN
v1
INT
)
BEGIN
DECLARE
v2
INT
;
CREATE
TABLE
t1
SELECT
1
,
v1
,
v2
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
SELECT
1
,
v1
+
1
,
v2
;
DROP
TABLE
t1
;
END
//
DELIMITER
;
//
CALL
p1
(
1
);
CALL
p2
();
CALL
p3
(
0
);
CALL
p4
(
0
);
DROP
PROCEDURE
p1
;
DROP
PROCEDURE
p2
;
DROP
PROCEDURE
p3
;
DROP
PROCEDURE
p4
;
--
echo
End
of
5.0
tests
# Test of a too big SET INSERT_ID: see if the truncated value goes
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/binlog/r/binlog_row_binlog.result
View file @
fb8ac41a
...
...
@@ -1137,6 +1137,38 @@ DROP PROCEDURE p1;
DROP TABLE t1;
DROP DATABASE bug39182;
USE test;
CREATE PROCEDURE p1(IN v1 INT)
BEGIN
CREATE TABLE t1 SELECT v1;
DROP TABLE t1;
END//
CREATE PROCEDURE p2()
BEGIN
DECLARE v1 INT;
CREATE TABLE t1 SELECT v1+1;
DROP TABLE t1;
END//
CREATE PROCEDURE p3(IN v1 INT)
BEGIN
CREATE TABLE t1 SELECT 1 FROM DUAL WHERE v1!=0;
DROP TABLE t1;
END//
CREATE PROCEDURE p4(IN v1 INT)
BEGIN
DECLARE v2 INT;
CREATE TABLE t1 SELECT 1, v1, v2;
DROP TABLE t1;
CREATE TABLE t1 SELECT 1, v1+1, v2;
DROP TABLE t1;
END//
CALL p1(1);
CALL p2();
CALL p3(0);
CALL p4(0);
DROP PROCEDURE p1;
DROP PROCEDURE p2;
DROP PROCEDURE p3;
DROP PROCEDURE p4;
End of 5.0 tests
reset master;
create table t1 (id tinyint auto_increment primary key);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View file @
fb8ac41a
...
...
@@ -644,6 +644,38 @@ DROP PROCEDURE p1;
DROP TABLE t1;
DROP DATABASE bug39182;
USE test;
CREATE PROCEDURE p1(IN v1 INT)
BEGIN
CREATE TABLE t1 SELECT v1;
DROP TABLE t1;
END//
CREATE PROCEDURE p2()
BEGIN
DECLARE v1 INT;
CREATE TABLE t1 SELECT v1+1;
DROP TABLE t1;
END//
CREATE PROCEDURE p3(IN v1 INT)
BEGIN
CREATE TABLE t1 SELECT 1 FROM DUAL WHERE v1!=0;
DROP TABLE t1;
END//
CREATE PROCEDURE p4(IN v1 INT)
BEGIN
DECLARE v2 INT;
CREATE TABLE t1 SELECT 1, v1, v2;
DROP TABLE t1;
CREATE TABLE t1 SELECT 1, v1+1, v2;
DROP TABLE t1;
END//
CALL p1(1);
CALL p2();
CALL p3(0);
CALL p4(0);
DROP PROCEDURE p1;
DROP PROCEDURE p2;
DROP PROCEDURE p3;
DROP PROCEDURE p4;
End of 5.0 tests
reset master;
create table t1 (id tinyint auto_increment primary key);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/suite/rpl/r/rpl_temporary.result
View file @
fb8ac41a
...
...
@@ -108,3 +108,13 @@ select * from t1;
a
1
drop table t1;
Bug#43748
make a non-privileged user on slave.
FLUSH PRIVILEGES;
GRANT USAGE ON *.* TO user43748@127.0.0.1 IDENTIFIED BY 'meow';
try to KILL system-thread as non-privileged user.
KILL `select id from information_schema.processlist where command='Binlog Dump'`;
ERROR HY000: You are not owner of thread `select id from information_schema.processlist where command='Binlog Dump'`
throw out test-user on slave.
DROP USER user43748@127.0.0.1;
done. back to master.
This diff is collapsed.
Click to expand it.
mysql-test/suite/rpl/t/rpl_temporary.test
View file @
fb8ac41a
...
...
@@ -222,4 +222,42 @@ drop table t1;
# Delete the anonymous users
source
include
/
delete_anonymous_users
.
inc
;
#
# Bug#43748: crash when non-super user tries to kill the replication threads
#
--
echo
Bug
#43748
connection
slave
;
--
echo
make
a
non
-
privileged
user
on
slave
.
FLUSH
PRIVILEGES
;
GRANT
USAGE
ON
*.*
TO
user43748
@
127.0
.
0.1
IDENTIFIED
BY
'meow'
;
let
$id
=
`SELECT id FROM information_schema.processlist WHERE user='system user' LIMIT 1`
;
connect
(
cont43748
,
127.0
.
0.1
,
user43748
,
meow
,
test
,
$SLAVE_MYPORT
,);
connection
cont43748
;
--
echo
try
to
KILL
system
-
thread
as
non
-
privileged
user
.
--
replace_result
$id
"`select id from information_schema.processlist where command='Binlog Dump'`"
--
error
ER_KILL_DENIED_ERROR
eval
KILL
$id
;
disconnect
cont43748
;
connection
slave
;
--
echo
throw
out
test
-
user
on
slave
.
DROP
USER
user43748
@
127.0
.
0.1
;
connection
master
;
--
echo
done
.
back
to
master
.
# End of tests
This diff is collapsed.
Click to expand it.
sql/sp_head.cc
View file @
fb8ac41a
...
...
@@ -956,6 +956,8 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
qbuf
.
length
(
0
);
cur
=
query_str
->
str
;
prev_pos
=
res
=
0
;
thd
->
query_name_consts
=
0
;
for
(
Item_splocal
**
splocal
=
sp_vars_uses
.
front
();
splocal
<
sp_vars_uses
.
back
();
splocal
++
)
{
...
...
@@ -989,6 +991,8 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
res
|=
qbuf
.
append
(
')'
);
if
(
res
)
break
;
thd
->
query_name_consts
++
;
}
res
|=
qbuf
.
append
(
cur
+
prev_pos
,
query_str
->
length
-
prev_pos
);
if
(
res
)
...
...
@@ -2853,6 +2857,7 @@ sp_instr_stmt::execute(THD *thd, uint *nextp)
*
nextp
=
m_ip
+
1
;
thd
->
query
=
query
;
thd
->
query_length
=
query_length
;
thd
->
query_name_consts
=
0
;
if
(
!
thd
->
is_error
())
thd
->
main_da
.
reset_diagnostics_area
();
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.cc
View file @
fb8ac41a
...
...
@@ -599,6 +599,7 @@ THD::THD()
one_shot_set
=
0
;
file_id
=
0
;
query_id
=
0
;
query_name_consts
=
0
;
warn_id
=
0
;
db_charset
=
global_system_variables
.
collation_database
;
bzero
(
ha_data
,
sizeof
(
ha_data
));
...
...
@@ -2805,6 +2806,14 @@ Security_context::restore_security_context(THD *thd,
}
#endif
bool
Security_context
::
user_matches
(
Security_context
*
them
)
{
return
((
user
!=
NULL
)
&&
(
them
->
user
!=
NULL
)
&&
!
strcmp
(
user
,
them
->
user
));
}
/****************************************************************************
Handling of open and locked tables states.
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.h
View file @
fb8ac41a
...
...
@@ -813,6 +813,7 @@ public:
void
restore_security_context
(
THD
*
thd
,
Security_context
*
backup
);
#endif
bool
user_matches
(
Security_context
*
);
};
...
...
@@ -1774,6 +1775,9 @@ public:
sp_cache
*
sp_proc_cache
;
sp_cache
*
sp_func_cache
;
/** number of name_const() substitutions, see sp_head.cc:subst_spvars() */
uint
query_name_consts
;
/*
If we do a purge of binary logs, log index info of the threads
that are currently reading it needs to be adjusted. To do that
...
...
This diff is collapsed.
Click to expand it.
sql/sql_parse.cc
View file @
fb8ac41a
...
...
@@ -2558,6 +2558,43 @@ mysql_execute_command(THD *thd)
{
select_result
*
result
;
/*
If:
a) we inside an SP and there was NAME_CONST substitution,
b) binlogging is on (STMT mode),
c) we log the SP as separate statements
raise a warning, as it may cause problems
(see 'NAME_CONST issues' in 'Binary Logging of Stored Programs')
*/
if
(
thd
->
query_name_consts
&&
mysql_bin_log
.
is_open
()
&&
thd
->
variables
.
binlog_format
==
BINLOG_FORMAT_STMT
&&
!
mysql_bin_log
.
is_query_in_union
(
thd
,
thd
->
query_id
))
{
List_iterator_fast
<
Item
>
it
(
select_lex
->
item_list
);
Item
*
item
;
uint
splocal_refs
=
0
;
/* Count SP local vars in the top-level SELECT list */
while
((
item
=
it
++
))
{
if
(
item
->
is_splocal
())
splocal_refs
++
;
}
/*
If it differs from number of NAME_CONST substitution applied,
we may have a SOME_FUNC(NAME_CONST()) in the SELECT list,
that may cause a problem with binary log (see BUG#35383),
raise a warning.
*/
if
(
splocal_refs
!=
thd
->
query_name_consts
)
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_UNKNOWN_ERROR
,
"Invoked routine ran a statement that may cause problems with "
"binary log, see 'NAME_CONST issues' in 'Binary Logging of Stored Programs' "
"section of the manual."
);
}
select_lex
->
options
|=
SELECT_NO_UNLOCK
;
unit
->
set_limit
(
select_lex
);
...
...
@@ -6890,8 +6927,26 @@ uint kill_one_thread(THD *thd, ulong id, bool only_kill_query)
VOID
(
pthread_mutex_unlock
(
&
LOCK_thread_count
));
if
(
tmp
)
{
/*
If we're SUPER, we can KILL anything, including system-threads.
No further checks.
KILLer: thd->security_ctx->user could in theory be NULL while
we're still in "unauthenticated" state. This is a theoretical
case (the code suggests this could happen, so we play it safe).
KILLee: tmp->security_ctx->user will be NULL for system threads.
We need to check so Jane Random User doesn't crash the server
when trying to kill a) system threads or b) unauthenticated users'
threads (Bug#43748).
If user of both killer and killee are non-NULL, proceed with
slayage if both are string-equal.
*/
if
((
thd
->
security_ctx
->
master_access
&
SUPER_ACL
)
||
!
strcmp
(
thd
->
security_ctx
->
user
,
tmp
->
security_ctx
->
user
))
thd
->
security_ctx
->
user_matches
(
tmp
->
security_ctx
))
{
tmp
->
awake
(
only_kill_query
?
THD
::
KILL_QUERY
:
THD
::
KILL_CONNECTION
);
error
=
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