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
d293c425
Commit
d293c425
authored
Oct 22, 2010
by
Jon Olav Hauglid
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.5-runtime to mysql-5.5-bugteam
No conflicts
parents
5ff1cbb8
26e7ee2f
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
369 additions
and
114 deletions
+369
-114
mysql-test/extra/rpl_tests/rpl_row_sp003.test
mysql-test/extra/rpl_tests/rpl_row_sp003.test
+16
-2
mysql-test/r/grant.result
mysql-test/r/grant.result
+0
-2
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+44
-0
mysql-test/r/lock_sync.result
mysql-test/r/lock_sync.result
+34
-0
mysql-test/r/sp-security.result
mysql-test/r/sp-security.result
+27
-2
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
+2
-2
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
+2
-2
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
+2
-2
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
+5
-5
mysql-test/suite/rpl/r/rpl_row_sp003.result
mysql-test/suite/rpl/r/rpl_row_sp003.result
+9
-1
mysql-test/t/grant.test
mysql-test/t/grant.test
+0
-5
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+53
-0
mysql-test/t/lock_sync.test
mysql-test/t/lock_sync.test
+55
-0
mysql-test/t/sp-security.test
mysql-test/t/sp-security.test
+35
-2
sql/sp.cc
sql/sp.cc
+6
-32
sql/sp.h
sql/sp.h
+0
-3
sql/sp_head.cc
sql/sp_head.cc
+7
-4
sql/sql_base.cc
sql/sql_base.cc
+13
-1
sql/sql_parse.cc
sql/sql_parse.cc
+41
-41
sql/sql_show.cc
sql/sql_show.cc
+18
-7
sql/sql_show.h
sql/sql_show.h
+0
-1
No files found.
mysql-test/extra/rpl_tests/rpl_row_sp003.test
View file @
d293c425
...
@@ -35,10 +35,23 @@ connection master1;
...
@@ -35,10 +35,23 @@ connection master1;
send
CALL
test
.
p1
();
send
CALL
test
.
p1
();
connection
master
;
connection
master
;
# To make sure tha the call on master1 arrived at the get_lock
# Make sure that the call on master1 arrived at the get_lock.
sleep
1
;
let
$wait_condition
=
select
count
(
*
)
=
1
from
information_schema
.
processlist
where
state
=
'User lock'
and
info
=
'SELECT get_lock("test", 100)'
;
--
source
include
/
wait_condition
.
inc
CALL
test
.
p2
();
CALL
test
.
p2
();
SELECT
release_lock
(
"test"
);
SELECT
release_lock
(
"test"
);
connection
master1
;
# Reap CALL test.p1() to ensure that it has fully completed
# before doing any selects on test.t1.
--
reap
# Release lock acquired by it.
SELECT
release_lock
(
"test"
);
connection
master
;
SELECT
*
FROM
test
.
t1
;
SELECT
*
FROM
test
.
t1
;
#show binlog events;
#show binlog events;
--
source
include
/
wait_for_ndb_to_binlog
.
inc
--
source
include
/
wait_for_ndb_to_binlog
.
inc
...
@@ -51,6 +64,7 @@ DROP TABLE IF EXISTS test.t1;
...
@@ -51,6 +64,7 @@ DROP TABLE IF EXISTS test.t1;
eval
CREATE
TABLE
test
.
t1
(
a
INT
,
PRIMARY
KEY
(
a
))
ENGINE
=
$engine_type
;
eval
CREATE
TABLE
test
.
t1
(
a
INT
,
PRIMARY
KEY
(
a
))
ENGINE
=
$engine_type
;
CALL
test
.
p2
();
CALL
test
.
p2
();
CALL
test
.
p1
();
CALL
test
.
p1
();
SELECT
release_lock
(
"test"
);
SELECT
*
FROM
test
.
t1
;
SELECT
*
FROM
test
.
t1
;
sync_slave_with_master
;
sync_slave_with_master
;
...
...
mysql-test/r/grant.result
View file @
d293c425
...
@@ -1448,8 +1448,6 @@ CREATE USER 'userbug33464'@'localhost';
...
@@ -1448,8 +1448,6 @@ CREATE USER 'userbug33464'@'localhost';
GRANT CREATE ROUTINE ON dbbug33464.* TO 'userbug33464'@'localhost';
GRANT CREATE ROUTINE ON dbbug33464.* TO 'userbug33464'@'localhost';
userbug33464@localhost dbbug33464
userbug33464@localhost dbbug33464
DROP PROCEDURE IF EXISTS sp3;
DROP FUNCTION IF EXISTS fn1;
CREATE PROCEDURE sp3(v1 char(20))
CREATE PROCEDURE sp3(v1 char(20))
BEGIN
BEGIN
SELECT * from dbbug33464.t6 where t6.f2= 'xyz';
SELECT * from dbbug33464.t6 where t6.f2= 'xyz';
...
...
mysql-test/r/information_schema.result
View file @
d293c425
...
@@ -1807,3 +1807,47 @@ USING (TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME)
...
@@ -1807,3 +1807,47 @@ USING (TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME)
WHERE COLUMNS.TABLE_SCHEMA = 'test'
WHERE COLUMNS.TABLE_SCHEMA = 'test'
AND COLUMNS.TABLE_NAME = 't1';
AND COLUMNS.TABLE_NAME = 't1';
TABLE_SCHEMA TABLE_NAME COLUMN_NAME CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME TABLE_CATALOG ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
TABLE_SCHEMA TABLE_NAME COLUMN_NAME CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME TABLE_CATALOG ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
#
# A test case for Bug#56540 "Exception (crash) in sql_show.cc
# during rqg_info_schema test on Windows"
# Ensure that we never access memory of a closed table,
# in particular, never access table->field[] array.
# Before the fix, the below test case, produced
# valgrind errors.
#
drop table if exists t1;
drop view if exists v1;
create table t1 (a int, b int);
create view v1 as select t1.a, t1.b from t1;
alter table t1 change b c int;
lock table t1 read;
# --> connection con1
flush tables;
# --> connection default
select * from information_schema.views;
TABLE_CATALOG def
TABLE_SCHEMA test
TABLE_NAME v1
VIEW_DEFINITION select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1`
CHECK_OPTION NONE
IS_UPDATABLE
DEFINER root@localhost
SECURITY_TYPE DEFINER
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
Warnings:
Level Warning
Code 1356
Message View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
unlock tables;
#
# Cleanup.
#
# --> connection con1
# Reaping 'flush tables'
# --> connection default
drop table t1;
drop view v1;
#
# End of 5.5 tests
#
mysql-test/r/lock_sync.result
View file @
d293c425
...
@@ -704,3 +704,37 @@ SET DEBUG_SYNC="now SIGNAL query";
...
@@ -704,3 +704,37 @@ SET DEBUG_SYNC="now SIGNAL query";
# Connection default
# Connection default
DROP EVENT e2;
DROP EVENT e2;
SET DEBUG_SYNC="RESET";
SET DEBUG_SYNC="RESET";
#
# Bug#55930 Assertion `thd->transaction.stmt.is_empty() ||
# thd->in_sub_stmt || (thd->state..
#
DROP TABLE IF EXISTS t1;
CREATE TABLE t1(a INT) engine=InnoDB;
INSERT INTO t1 VALUES (1), (2);
# Connection con1
SET SESSION lock_wait_timeout= 1;
SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
# Sending:
OPTIMIZE TABLE t1;
# Connection con2
SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
SET DEBUG_SYNC= 'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock';
# Sending:
INSERT INTO t1 VALUES (3);
# Connection default
SET DEBUG_SYNC= 'now WAIT_FOR thrlock';
SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
# Connection con1
# Reaping: OPTIMIZE TABLE t1
Table Op Msg_type Msg_text
test.t1 optimize note Table does not support optimize, doing recreate + analyze instead
test.t1 optimize error Lock wait timeout exceeded; try restarting transaction
test.t1 optimize status Operation failed
Warnings:
Error 1205 Lock wait timeout exceeded; try restarting transaction
SET DEBUG_SYNC= 'now SIGNAL release_thrlock';
# Connection con2
# Reaping: INSERT INTO t1 VALUES (3)
# Connection default
DROP TABLE t1;
SET DEBUG_SYNC= 'RESET';
mysql-test/r/sp-security.result
View file @
d293c425
...
@@ -44,7 +44,7 @@ ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
...
@@ -44,7 +44,7 @@ ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
create procedure db1_secret.dummy() begin end;
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
drop procedure db1_secret.dummy;
drop procedure db1_secret.dummy;
ERROR 42000:
PROCEDURE db1_secret.dummy does not exist
ERROR 42000:
alter routine command denied to user 'user1'@'localhost' for routine 'db1_secret.dummy'
drop procedure db1_secret.stamp;
drop procedure db1_secret.stamp;
ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db1_secret.stamp'
ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db1_secret.stamp'
drop function db1_secret.db;
drop function db1_secret.db;
...
@@ -58,7 +58,7 @@ ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
...
@@ -58,7 +58,7 @@ ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
create procedure db1_secret.dummy() begin end;
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
drop procedure db1_secret.dummy;
drop procedure db1_secret.dummy;
ERROR 42000:
PROCEDURE db1_secret.dummy does not exist
ERROR 42000:
alter routine command denied to user ''@'%' for routine 'db1_secret.dummy'
drop procedure db1_secret.stamp;
drop procedure db1_secret.stamp;
ERROR 42000: alter routine command denied to user ''@'%' for routine 'db1_secret.stamp'
ERROR 42000: alter routine command denied to user ''@'%' for routine 'db1_secret.stamp'
drop function db1_secret.db;
drop function db1_secret.db;
...
@@ -567,3 +567,28 @@ DROP USER 'tester';
...
@@ -567,3 +567,28 @@ DROP USER 'tester';
DROP USER 'Tester';
DROP USER 'Tester';
DROP DATABASE B48872;
DROP DATABASE B48872;
End of 5.0 tests.
End of 5.0 tests.
#
# Test for bug#57061 "User without privilege on routine can discover
# its existence."
#
drop database if exists mysqltest_db;
create database mysqltest_db;
# Create user with no privileges on mysqltest_db database.
create user bug57061_user@localhost;
create function mysqltest_db.f1() returns int return 0;
create procedure mysqltest_db.p1() begin end;
# Connect as user 'bug57061_user@localhost'
# Attempt to drop routine on which user doesn't have privileges
# should result in the same 'access denied' type of error whether
# routine exists or not.
drop function if exists mysqltest_db.f_does_not_exist;
ERROR 42000: alter routine command denied to user 'bug57061_user'@'localhost' for routine 'mysqltest_db.f_does_not_exist'
drop procedure if exists mysqltest_db.p_does_not_exist;
ERROR 42000: alter routine command denied to user 'bug57061_user'@'localhost' for routine 'mysqltest_db.p_does_not_exist'
drop function if exists mysqltest_db.f1;
ERROR 42000: alter routine command denied to user 'bug57061_user'@'localhost' for routine 'mysqltest_db.f1'
drop procedure if exists mysqltest_db.p1;
ERROR 42000: alter routine command denied to user 'bug57061_user'@'localhost' for routine 'mysqltest_db.p1'
# Connection 'default'.
drop user bug57061_user@localhost;
drop database mysqltest_db;
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
View file @
d293c425
...
@@ -110,10 +110,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
...
@@ -110,10 +110,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
flush privileges;
DROP PROCEDURE IF EXISTS db_storedproc_1.sp3;
DROP FUNCTION IF EXISTS db_storedproc_1.fn1;
user_1@localhost db_storedproc_1
user_1@localhost db_storedproc_1
DROP PROCEDURE IF EXISTS sp3;
DROP FUNCTION IF EXISTS fn1;
CREATE PROCEDURE sp3(v1 char(20))
CREATE PROCEDURE sp3(v1 char(20))
BEGIN
BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
...
...
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
View file @
d293c425
...
@@ -111,10 +111,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
...
@@ -111,10 +111,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
flush privileges;
DROP PROCEDURE IF EXISTS db_storedproc_1.sp3;
DROP FUNCTION IF EXISTS db_storedproc_1.fn1;
user_1@localhost db_storedproc_1
user_1@localhost db_storedproc_1
DROP PROCEDURE IF EXISTS sp3;
DROP FUNCTION IF EXISTS fn1;
CREATE PROCEDURE sp3(v1 char(20))
CREATE PROCEDURE sp3(v1 char(20))
BEGIN
BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
...
...
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
View file @
d293c425
...
@@ -111,10 +111,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
...
@@ -111,10 +111,10 @@ Ensure that root always has the GRANT CREATE ROUTINE privilege.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
grant create routine on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
flush privileges;
DROP PROCEDURE IF EXISTS db_storedproc_1.sp3;
DROP FUNCTION IF EXISTS db_storedproc_1.fn1;
user_1@localhost db_storedproc_1
user_1@localhost db_storedproc_1
DROP PROCEDURE IF EXISTS sp3;
DROP FUNCTION IF EXISTS fn1;
CREATE PROCEDURE sp3(v1 char(20))
CREATE PROCEDURE sp3(v1 char(20))
BEGIN
BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
...
...
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
View file @
d293c425
...
@@ -117,15 +117,15 @@ create user 'user_1'@'localhost';
...
@@ -117,15 +117,15 @@ create user 'user_1'@'localhost';
grant
create
routine
on
db_storedproc_1
.*
to
'user_1'
@
'localhost'
;
grant
create
routine
on
db_storedproc_1
.*
to
'user_1'
@
'localhost'
;
flush
privileges
;
flush
privileges
;
--
disable_warnings
DROP
PROCEDURE
IF
EXISTS
db_storedproc_1
.
sp3
;
DROP
FUNCTION
IF
EXISTS
db_storedproc_1
.
fn1
;
--
enable_warnings
# disconnect default;
# disconnect default;
connect
(
user2
,
localhost
,
user_1
,
,
db_storedproc_1
);
connect
(
user2
,
localhost
,
user_1
,
,
db_storedproc_1
);
--
source
suite
/
funcs_1
/
include
/
show_connection
.
inc
--
source
suite
/
funcs_1
/
include
/
show_connection
.
inc
--
disable_warnings
DROP
PROCEDURE
IF
EXISTS
sp3
;
DROP
FUNCTION
IF
EXISTS
fn1
;
--
enable_warnings
delimiter
//;
delimiter
//;
CREATE
PROCEDURE
sp3
(
v1
char
(
20
))
CREATE
PROCEDURE
sp3
(
v1
char
(
20
))
BEGIN
BEGIN
...
...
mysql-test/suite/rpl/r/rpl_row_sp003.result
View file @
d293c425
...
@@ -26,6 +26,11 @@ CALL test.p2();
...
@@ -26,6 +26,11 @@ CALL test.p2();
SELECT release_lock("test");
SELECT release_lock("test");
release_lock("test")
release_lock("test")
1
1
get_lock("test", 100)
1
SELECT release_lock("test");
release_lock("test")
1
SELECT * FROM test.t1;
SELECT * FROM test.t1;
a
a
5
5
...
@@ -37,7 +42,10 @@ CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=INNODB;
...
@@ -37,7 +42,10 @@ CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=INNODB;
CALL test.p2();
CALL test.p2();
CALL test.p1();
CALL test.p1();
get_lock("test", 100)
get_lock("test", 100)
0
1
SELECT release_lock("test");
release_lock("test")
1
SELECT * FROM test.t1;
SELECT * FROM test.t1;
a
a
8
8
...
...
mysql-test/t/grant.test
View file @
d293c425
...
@@ -1419,11 +1419,6 @@ GRANT CREATE ROUTINE ON dbbug33464.* TO 'userbug33464'@'localhost';
...
@@ -1419,11 +1419,6 @@ GRANT CREATE ROUTINE ON dbbug33464.* TO 'userbug33464'@'localhost';
connect
(
connbug33464
,
localhost
,
userbug33464
,
,
dbbug33464
);
connect
(
connbug33464
,
localhost
,
userbug33464
,
,
dbbug33464
);
--
source
suite
/
funcs_1
/
include
/
show_connection
.
inc
--
source
suite
/
funcs_1
/
include
/
show_connection
.
inc
--
disable_warnings
DROP
PROCEDURE
IF
EXISTS
sp3
;
DROP
FUNCTION
IF
EXISTS
fn1
;
--
enable_warnings
delimiter
//;
delimiter
//;
CREATE
PROCEDURE
sp3
(
v1
char
(
20
))
CREATE
PROCEDURE
sp3
(
v1
char
(
20
))
BEGIN
BEGIN
...
...
mysql-test/t/information_schema.test
View file @
d293c425
...
@@ -1555,3 +1555,56 @@ WHERE COLUMNS.TABLE_SCHEMA = 'test'
...
@@ -1555,3 +1555,56 @@ WHERE COLUMNS.TABLE_SCHEMA = 'test'
AND
COLUMNS
.
TABLE_NAME
=
't1'
;
AND
COLUMNS
.
TABLE_NAME
=
't1'
;
--
echo
#
--
echo
# A test case for Bug#56540 "Exception (crash) in sql_show.cc
--
echo
# during rqg_info_schema test on Windows"
--
echo
# Ensure that we never access memory of a closed table,
--
echo
# in particular, never access table->field[] array.
--
echo
# Before the fix, the below test case, produced
--
echo
# valgrind errors.
--
echo
#
--
disable_warnings
drop
table
if
exists
t1
;
drop
view
if
exists
v1
;
--
enable_warnings
create
table
t1
(
a
int
,
b
int
);
create
view
v1
as
select
t1
.
a
,
t1
.
b
from
t1
;
alter
table
t1
change
b
c
int
;
lock
table
t1
read
;
connect
(
con1
,
localhost
,
root
,,);
--
echo
# --> connection con1
connection
con1
;
send
flush
tables
;
--
echo
# --> connection default
connection
default
;
let
$wait_condition
=
select
count
(
*
)
=
1
from
information_schema
.
processlist
where
state
=
"Waiting for table flush"
and
info
=
"flush tables"
;
--
source
include
/
wait_condition
.
inc
--
vertical_results
select
*
from
information_schema
.
views
;
--
horizontal_results
unlock
tables
;
--
echo
#
--
echo
# Cleanup.
--
echo
#
--
echo
# --> connection con1
connection
con1
;
--
echo
# Reaping 'flush tables'
reap
;
disconnect
con1
;
--
source
include
/
wait_until_disconnected
.
inc
--
echo
# --> connection default
connection
default
;
drop
table
t1
;
drop
view
v1
;
--
echo
#
--
echo
# End of 5.5 tests
--
echo
#
mysql-test/t/lock_sync.test
View file @
d293c425
...
@@ -1023,6 +1023,61 @@ DROP EVENT e2;
...
@@ -1023,6 +1023,61 @@ DROP EVENT e2;
SET
DEBUG_SYNC
=
"RESET"
;
SET
DEBUG_SYNC
=
"RESET"
;
--
echo
#
--
echo
# Bug#55930 Assertion `thd->transaction.stmt.is_empty() ||
--
echo
# thd->in_sub_stmt || (thd->state..
--
echo
#
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
--
enable_warnings
CREATE
TABLE
t1
(
a
INT
)
engine
=
InnoDB
;
INSERT
INTO
t1
VALUES
(
1
),
(
2
);
connect
(
con1
,
localhost
,
root
);
connect
(
con2
,
localhost
,
root
);
--
echo
# Connection con1
connection
con1
;
SET
SESSION
lock_wait_timeout
=
1
;
SET
DEBUG_SYNC
=
'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze'
;
--
echo
# Sending:
--
send
OPTIMIZE
TABLE
t1
--
echo
# Connection con2
connection
con2
;
SET
DEBUG_SYNC
=
'now WAIT_FOR opti_recreate'
;
SET
DEBUG_SYNC
=
'after_lock_tables_takes_lock SIGNAL thrlock WAIT_FOR release_thrlock'
;
--
echo
# Sending:
--
send
INSERT
INTO
t1
VALUES
(
3
)
--
echo
# Connection default
connection
default
;
SET
DEBUG_SYNC
=
'now WAIT_FOR thrlock'
;
SET
DEBUG_SYNC
=
'now SIGNAL opti_analyze'
;
--
echo
# Connection con1
connection
con1
;
--
echo
# Reaping: OPTIMIZE TABLE t1
--
reap
SET
DEBUG_SYNC
=
'now SIGNAL release_thrlock'
;
disconnect
con1
;
--
source
include
/
wait_until_disconnected
.
inc
--
echo
# Connection con2
connection
con2
;
--
echo
# Reaping: INSERT INTO t1 VALUES (3)
--
reap
disconnect
con2
;
--
source
include
/
wait_until_disconnected
.
inc
--
echo
# Connection default
connection
default
;
DROP
TABLE
t1
;
SET
DEBUG_SYNC
=
'RESET'
;
# Check that all connections opened by test cases in this file are really
# Check that all connections opened by test cases in this file are really
# gone so execution of other tests won't be affected by their presence.
# gone so execution of other tests won't be affected by their presence.
--
source
include
/
wait_until_count_sessions
.
inc
--
source
include
/
wait_until_count_sessions
.
inc
mysql-test/t/sp-security.test
View file @
d293c425
...
@@ -82,7 +82,7 @@ select * from db1_secret.t1;
...
@@ -82,7 +82,7 @@ select * from db1_secret.t1;
# ...and not this
# ...and not this
--
error
ER_DBACCESS_DENIED_ERROR
--
error
ER_DBACCESS_DENIED_ERROR
create
procedure
db1_secret
.
dummy
()
begin
end
;
create
procedure
db1_secret
.
dummy
()
begin
end
;
--
error
ER_
SP_DOES_NOT_EXIST
--
error
ER_
PROCACCESS_DENIED_ERROR
drop
procedure
db1_secret
.
dummy
;
drop
procedure
db1_secret
.
dummy
;
--
error
ER_PROCACCESS_DENIED_ERROR
--
error
ER_PROCACCESS_DENIED_ERROR
drop
procedure
db1_secret
.
stamp
;
drop
procedure
db1_secret
.
stamp
;
...
@@ -106,7 +106,7 @@ select * from db1_secret.t1;
...
@@ -106,7 +106,7 @@ select * from db1_secret.t1;
# ...and not this
# ...and not this
--
error
ER_DBACCESS_DENIED_ERROR
--
error
ER_DBACCESS_DENIED_ERROR
create
procedure
db1_secret
.
dummy
()
begin
end
;
create
procedure
db1_secret
.
dummy
()
begin
end
;
--
error
ER_
SP_DOES_NOT_EXIST
--
error
ER_
PROCACCESS_DENIED_ERROR
drop
procedure
db1_secret
.
dummy
;
drop
procedure
db1_secret
.
dummy
;
--
error
ER_PROCACCESS_DENIED_ERROR
--
error
ER_PROCACCESS_DENIED_ERROR
drop
procedure
db1_secret
.
stamp
;
drop
procedure
db1_secret
.
stamp
;
...
@@ -926,6 +926,39 @@ DROP DATABASE B48872;
...
@@ -926,6 +926,39 @@ DROP DATABASE B48872;
--
echo
End
of
5.0
tests
.
--
echo
End
of
5.0
tests
.
--
echo
#
--
echo
# Test for bug#57061 "User without privilege on routine can discover
--
echo
# its existence."
--
echo
#
--
disable_warnings
drop
database
if
exists
mysqltest_db
;
--
enable_warnings
create
database
mysqltest_db
;
--
echo
# Create user with no privileges on mysqltest_db database.
create
user
bug57061_user
@
localhost
;
create
function
mysqltest_db
.
f1
()
returns
int
return
0
;
create
procedure
mysqltest_db
.
p1
()
begin
end
;
--
echo
# Connect as user 'bug57061_user@localhost'
connect
(
conn1
,
localhost
,
bug57061_user
,,);
--
echo
# Attempt to drop routine on which user doesn't have privileges
--
echo
# should result in the same 'access denied' type of error whether
--
echo
# routine exists or not.
--
error
ER_PROCACCESS_DENIED_ERROR
drop
function
if
exists
mysqltest_db
.
f_does_not_exist
;
--
error
ER_PROCACCESS_DENIED_ERROR
drop
procedure
if
exists
mysqltest_db
.
p_does_not_exist
;
--
error
ER_PROCACCESS_DENIED_ERROR
drop
function
if
exists
mysqltest_db
.
f1
;
--
error
ER_PROCACCESS_DENIED_ERROR
drop
procedure
if
exists
mysqltest_db
.
p1
;
--
echo
# Connection 'default'.
connection
default
;
disconnect
conn1
;
drop
user
bug57061_user
@
localhost
;
drop
database
mysqltest_db
;
# Wait till all disconnects are completed
# Wait till all disconnects are completed
--
source
include
/
wait_until_count_sessions
.
inc
--
source
include
/
wait_until_count_sessions
.
inc
sql/sp.cc
View file @
d293c425
...
@@ -779,6 +779,9 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
...
@@ -779,6 +779,9 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
int
ret
=
0
;
int
ret
=
0
;
if
(
check_stack_overrun
(
thd
,
STACK_MIN_SIZE
,
(
uchar
*
)
&
ret
))
return
TRUE
;
thd
->
lex
=
&
newlex
;
thd
->
lex
=
&
newlex
;
newlex
.
current_select
=
NULL
;
newlex
.
current_select
=
NULL
;
...
@@ -1505,6 +1508,9 @@ sp_find_routine(THD *thd, int type, sp_name *name, sp_cache **cp,
...
@@ -1505,6 +1508,9 @@ sp_find_routine(THD *thd, int type, sp_name *name, sp_cache **cp,
(
int
)
name
->
m_name
.
length
,
name
->
m_name
.
str
,
(
int
)
name
->
m_name
.
length
,
name
->
m_name
.
str
,
type
,
cache_only
));
type
,
cache_only
));
if
(
check_stack_overrun
(
thd
,
STACK_MIN_SIZE
,
(
uchar
*
)
&
depth
))
return
NULL
;
if
((
sp
=
sp_cache_lookup
(
cp
,
name
)))
if
((
sp
=
sp_cache_lookup
(
cp
,
name
)))
{
{
ulong
level
;
ulong
level
;
...
@@ -1636,38 +1642,6 @@ sp_exist_routines(THD *thd, TABLE_LIST *routines, bool any)
...
@@ -1636,38 +1642,6 @@ sp_exist_routines(THD *thd, TABLE_LIST *routines, bool any)
}
}
/**
Check if a routine exists in the mysql.proc table, without actually
parsing the definition. (Used for dropping).
@param thd thread context
@param name name of procedure
@retval
0 Success
@retval
non-0 Error; SP_OPEN_TABLE_FAILED or SP_KEY_NOT_FOUND
*/
int
sp_routine_exists_in_table
(
THD
*
thd
,
int
type
,
sp_name
*
name
)
{
TABLE
*
table
;
int
ret
;
Open_tables_backup
open_tables_state_backup
;
if
(
!
(
table
=
open_proc_table_for_read
(
thd
,
&
open_tables_state_backup
)))
ret
=
SP_OPEN_TABLE_FAILED
;
else
{
if
((
ret
=
db_find_routine_aux
(
thd
,
type
,
name
,
table
))
!=
SP_OK
)
ret
=
SP_KEY_NOT_FOUND
;
close_system_tables
(
thd
,
&
open_tables_state_backup
);
}
return
ret
;
}
extern
"C"
uchar
*
sp_sroutine_key
(
const
uchar
*
ptr
,
size_t
*
plen
,
extern
"C"
uchar
*
sp_sroutine_key
(
const
uchar
*
ptr
,
size_t
*
plen
,
my_bool
first
)
my_bool
first
)
{
{
...
...
sql/sp.h
View file @
d293c425
...
@@ -100,9 +100,6 @@ sp_cache_routine(THD *thd, int type, sp_name *name,
...
@@ -100,9 +100,6 @@ sp_cache_routine(THD *thd, int type, sp_name *name,
bool
bool
sp_exist_routines
(
THD
*
thd
,
TABLE_LIST
*
procs
,
bool
any
);
sp_exist_routines
(
THD
*
thd
,
TABLE_LIST
*
procs
,
bool
any
);
int
sp_routine_exists_in_table
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
bool
bool
sp_show_create_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
sp_show_create_routine
(
THD
*
thd
,
int
type
,
sp_name
*
name
);
...
...
sql/sp_head.cc
View file @
d293c425
...
@@ -1233,11 +1233,8 @@ sp_head::execute(THD *thd)
...
@@ -1233,11 +1233,8 @@ sp_head::execute(THD *thd)
The same with db_load_routine() required circa 7k bytes and
The same with db_load_routine() required circa 7k bytes and
14k bytes accordingly. Hence, here we book the stack with some
14k bytes accordingly. Hence, here we book the stack with some
reasonable margin.
reasonable margin.
Reverting back to 8 * STACK_MIN_SIZE until further fix.
8 * STACK_MIN_SIZE is required on some exotic platforms.
*/
*/
if
(
check_stack_overrun
(
thd
,
8
*
STACK_MIN_SIZE
,
(
uchar
*
)
&
old_packet
))
if
(
check_stack_overrun
(
thd
,
STACK_MIN_SIZE
,
(
uchar
*
)
&
old_packet
))
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
/* init per-instruction memroot */
/* init per-instruction memroot */
...
@@ -2902,6 +2899,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
...
@@ -2902,6 +2899,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
It's merged with the saved parent's value at the exit of this func.
It's merged with the saved parent's value at the exit of this func.
*/
*/
bool
parent_modified_non_trans_table
=
thd
->
transaction
.
stmt
.
modified_non_trans_table
;
bool
parent_modified_non_trans_table
=
thd
->
transaction
.
stmt
.
modified_non_trans_table
;
if
(
check_stack_overrun
(
thd
,
STACK_MIN_SIZE
,
(
uchar
*
)
&
parent_modified_non_trans_table
))
DBUG_RETURN
(
TRUE
);
thd
->
transaction
.
stmt
.
modified_non_trans_table
=
FALSE
;
thd
->
transaction
.
stmt
.
modified_non_trans_table
=
FALSE
;
DBUG_ASSERT
(
!
thd
->
derived_tables
);
DBUG_ASSERT
(
!
thd
->
derived_tables
);
DBUG_ASSERT
(
thd
->
change_list
.
is_empty
());
DBUG_ASSERT
(
thd
->
change_list
.
is_empty
());
...
@@ -3057,6 +3057,9 @@ sp_instr_stmt::execute(THD *thd, uint *nextp)
...
@@ -3057,6 +3057,9 @@ sp_instr_stmt::execute(THD *thd, uint *nextp)
DBUG_ENTER
(
"sp_instr_stmt::execute"
);
DBUG_ENTER
(
"sp_instr_stmt::execute"
);
DBUG_PRINT
(
"info"
,
(
"command: %d"
,
m_lex_keeper
.
sql_command
()));
DBUG_PRINT
(
"info"
,
(
"command: %d"
,
m_lex_keeper
.
sql_command
()));
if
(
check_stack_overrun
(
thd
,
STACK_MIN_SIZE
,
(
uchar
*
)
&
res
))
DBUG_RETURN
(
TRUE
);
query
=
thd
->
query
();
query
=
thd
->
query
();
query_length
=
thd
->
query_length
();
query_length
=
thd
->
query_length
();
#if defined(ENABLED_PROFILING)
#if defined(ENABLED_PROFILING)
...
...
sql/sql_base.cc
View file @
d293c425
...
@@ -2903,7 +2903,11 @@ retry_share:
...
@@ -2903,7 +2903,11 @@ retry_share:
if
(
check_and_update_table_version
(
thd
,
table_list
,
share
))
if
(
check_and_update_table_version
(
thd
,
table_list
,
share
))
goto
err_unlock
;
goto
err_unlock
;
if
(
table_list
->
i_s_requested_object
&
OPEN_TABLE_ONLY
)
if
(
table_list
->
i_s_requested_object
&
OPEN_TABLE_ONLY
)
{
my_error
(
ER_NO_SUCH_TABLE
,
MYF
(
0
),
table_list
->
db
,
table_list
->
table_name
);
goto
err_unlock
;
goto
err_unlock
;
}
/* Open view */
/* Open view */
if
(
open_new_frm
(
thd
,
share
,
alias
,
if
(
open_new_frm
(
thd
,
share
,
alias
,
...
@@ -2931,7 +2935,11 @@ retry_share:
...
@@ -2931,7 +2935,11 @@ retry_share:
*/
*/
if
(
table_list
->
i_s_requested_object
&
OPEN_VIEW_ONLY
)
if
(
table_list
->
i_s_requested_object
&
OPEN_VIEW_ONLY
)
{
my_error
(
ER_NO_SUCH_TABLE
,
MYF
(
0
),
table_list
->
db
,
table_list
->
table_name
);
goto
err_unlock
;
goto
err_unlock
;
}
if
(
!
(
flags
&
MYSQL_OPEN_IGNORE_FLUSH
))
if
(
!
(
flags
&
MYSQL_OPEN_IGNORE_FLUSH
))
{
{
...
@@ -5319,7 +5327,11 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
...
@@ -5319,7 +5327,11 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
end:
end:
if
(
table
==
NULL
)
if
(
table
==
NULL
)
{
if
(
!
thd
->
in_sub_stmt
)
trans_rollback_stmt
(
thd
);
close_thread_tables
(
thd
);
close_thread_tables
(
thd
);
}
thd_proc_info
(
thd
,
0
);
thd_proc_info
(
thd
,
0
);
DBUG_RETURN
(
table
);
DBUG_RETURN
(
table
);
}
}
...
...
sql/sql_parse.cc
View file @
d293c425
...
@@ -4032,17 +4032,6 @@ create_sp_error:
...
@@ -4032,17 +4032,6 @@ create_sp_error:
int
sp_result
;
int
sp_result
;
int
type
=
(
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
?
int
type
=
(
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
?
TYPE_ENUM_PROCEDURE
:
TYPE_ENUM_FUNCTION
);
TYPE_ENUM_PROCEDURE
:
TYPE_ENUM_FUNCTION
);
/*
@todo: here we break the metadata locking protocol by
looking up the information about the routine without
a metadata lock. Rewrite this piece to make sp_drop_routine
return whether the routine existed or not.
*/
sp_result
=
sp_routine_exists_in_table
(
thd
,
type
,
lex
->
spname
);
thd
->
warning_info
->
opt_clear_warning_info
(
thd
->
query_id
);
if
(
sp_result
==
SP_OK
)
{
char
*
db
=
lex
->
spname
->
m_db
.
str
;
char
*
db
=
lex
->
spname
->
m_db
.
str
;
char
*
name
=
lex
->
spname
->
m_name
.
str
;
char
*
name
=
lex
->
spname
->
m_name
.
str
;
...
@@ -4063,7 +4052,8 @@ create_sp_error:
...
@@ -4063,7 +4052,8 @@ create_sp_error:
*/
*/
close_mysql_tables
(
thd
);
close_mysql_tables
(
thd
);
if
(
sp_automatic_privileges
&&
!
opt_noacl
&&
if
(
sp_result
!=
SP_KEY_NOT_FOUND
&&
sp_automatic_privileges
&&
!
opt_noacl
&&
sp_revoke_privileges
(
thd
,
db
,
name
,
sp_revoke_privileges
(
thd
,
db
,
name
,
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
))
lex
->
sql_command
==
SQLCOM_DROP_PROCEDURE
))
{
{
...
@@ -4074,7 +4064,7 @@ create_sp_error:
...
@@ -4074,7 +4064,7 @@ create_sp_error:
goto
error
;
goto
error
;
}
}
#endif
#endif
}
res
=
sp_result
;
res
=
sp_result
;
switch
(
sp_result
)
{
switch
(
sp_result
)
{
case
SP_OK
:
case
SP_OK
:
...
@@ -5128,10 +5118,17 @@ bool check_stack_overrun(THD *thd, long margin,
...
@@ -5128,10 +5118,17 @@ bool check_stack_overrun(THD *thd, long margin,
if
((
stack_used
=
used_stack
(
thd
->
thread_stack
,(
char
*
)
&
stack_used
))
>=
if
((
stack_used
=
used_stack
(
thd
->
thread_stack
,(
char
*
)
&
stack_used
))
>=
(
long
)
(
my_thread_stack_size
-
margin
))
(
long
)
(
my_thread_stack_size
-
margin
))
{
{
char
ebuff
[
MYSQL_ERRMSG_SIZE
];
/*
my_snprintf
(
ebuff
,
sizeof
(
ebuff
),
ER
(
ER_STACK_OVERRUN_NEED_MORE
),
Do not use stack for the message buffer to ensure correct
behaviour in cases we have close to no stack left.
*/
char
*
ebuff
=
new
char
[
MYSQL_ERRMSG_SIZE
];
if
(
ebuff
)
{
my_snprintf
(
ebuff
,
MYSQL_ERRMSG_SIZE
,
ER
(
ER_STACK_OVERRUN_NEED_MORE
),
stack_used
,
my_thread_stack_size
,
margin
);
stack_used
,
my_thread_stack_size
,
margin
);
my_message
(
ER_STACK_OVERRUN_NEED_MORE
,
ebuff
,
MYF
(
ME_FATALERROR
));
my_message
(
ER_STACK_OVERRUN_NEED_MORE
,
ebuff
,
MYF
(
ME_FATALERROR
));
delete
[]
ebuff
;
}
return
1
;
return
1
;
}
}
#ifndef DBUG_OFF
#ifndef DBUG_OFF
...
@@ -7220,6 +7217,9 @@ bool parse_sql(THD *thd,
...
@@ -7220,6 +7217,9 @@ bool parse_sql(THD *thd,
Object_creation_ctx
*
backup_ctx
=
NULL
;
Object_creation_ctx
*
backup_ctx
=
NULL
;
if
(
check_stack_overrun
(
thd
,
2
*
STACK_MIN_SIZE
,
(
uchar
*
)
&
backup_ctx
))
return
TRUE
;
if
(
creation_ctx
)
if
(
creation_ctx
)
backup_ctx
=
creation_ctx
->
set_n_backup
(
thd
);
backup_ctx
=
creation_ctx
->
set_n_backup
(
thd
);
...
...
sql/sql_show.cc
View file @
d293c425
...
@@ -4934,18 +4934,29 @@ static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
...
@@ -4934,18 +4934,29 @@ static int get_schema_views_record(THD *thd, TABLE_LIST *tables,
else
else
table
->
field
[
4
]
->
store
(
STRING_WITH_LEN
(
"NONE"
),
cs
);
table
->
field
[
4
]
->
store
(
STRING_WITH_LEN
(
"NONE"
),
cs
);
if
(
table
->
pos_in_table_list
->
table_open_method
&
/*
OPEN_FULL_TABLE
)
Only try to fill in the information about view updatability
if it is requested as part of the top-level query (i.e.
it's select * from i_s.views, as opposed to, say, select
security_type from i_s.views). Do not try to access the
underlying tables if there was an error when opening the
view: all underlying tables are released back to the table
definition cache on error inside open_normal_and_derived_tables().
If a field is not assigned explicitly, it defaults to NULL.
*/
if
(
res
==
FALSE
&&
table
->
pos_in_table_list
->
table_open_method
&
OPEN_FULL_TABLE
)
{
{
updatable_view
=
0
;
updatable_view
=
0
;
if
(
tables
->
algorithm
!=
VIEW_ALGORITHM_TMPTABLE
)
if
(
tables
->
algorithm
!=
VIEW_ALGORITHM_TMPTABLE
)
{
{
/*
/*
We should use tables->view->select_lex.item_list here and
We should use tables->view->select_lex.item_list here
can not use Field_iterator_view because the view always uses
and can not use Field_iterator_view because the view
temporary algorithm during opening for I_S and
always uses temporary algorithm during opening for I_S
TABLE_LIST fields 'field_translation' & 'field_translation_end'
and TABLE_LIST fields 'field_translation'
are uninitialized is this case.
& 'field_translation_end' are uninitialized is this
case.
*/
*/
List
<
Item
>
*
fields
=
&
tables
->
view
->
select_lex
.
item_list
;
List
<
Item
>
*
fields
=
&
tables
->
view
->
select_lex
.
item_list
;
List_iterator
<
Item
>
it
(
*
fields
);
List_iterator
<
Item
>
it
(
*
fields
);
...
...
sql/sql_show.h
View file @
d293c425
...
@@ -104,7 +104,6 @@ bool mysqld_show_storage_engines(THD *thd);
...
@@ -104,7 +104,6 @@ bool mysqld_show_storage_engines(THD *thd);
bool
mysqld_show_authors
(
THD
*
thd
);
bool
mysqld_show_authors
(
THD
*
thd
);
bool
mysqld_show_contributors
(
THD
*
thd
);
bool
mysqld_show_contributors
(
THD
*
thd
);
bool
mysqld_show_privileges
(
THD
*
thd
);
bool
mysqld_show_privileges
(
THD
*
thd
);
bool
mysqld_show_column_types
(
THD
*
thd
);
char
*
make_backup_log_name
(
char
*
buff
,
const
char
*
name
,
const
char
*
log_ext
);
char
*
make_backup_log_name
(
char
*
buff
,
const
char
*
name
,
const
char
*
log_ext
);
void
calc_sum_of_all_status
(
STATUS_VAR
*
to
);
void
calc_sum_of_all_status
(
STATUS_VAR
*
to
);
void
append_definer
(
THD
*
thd
,
String
*
buffer
,
const
LEX_STRING
*
definer_user
,
void
append_definer
(
THD
*
thd
,
String
*
buffer
,
const
LEX_STRING
*
definer_user
,
...
...
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