database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Avoiding removing dummy TABLE allocated on the stack (BUG#14726).

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2005-11-21 21:11:02 +02:00
parent 13260ea8f3
commit 87a199fc2a
3 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/r/view_grant.result
View File

@ -501,3 +501,20 @@ drop user test14256;
insert into mysql.user select * from t1; insert into mysql.user select * from t1;
flush privileges; flush privileges;
drop table t1; drop table t1;
create database mysqltest;
use mysqltest;
CREATE TABLE t1 (i INT);
CREATE VIEW v1 AS SELECT * FROM t1;
SHOW CREATE VIEW v1;
View Create View
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`i` AS `i` from `t1`
GRANT SELECT, LOCK TABLES ON mysqltest.* TO mysqltest_1@localhost;
use mysqltest;
LOCK TABLES v1 READ;
SHOW CREATE TABLE v1;
ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
UNLOCK TABLES;
use test;
use test;
drop user mysqltest_1@localhost;
drop database mysqltest;

36
mysql-test/t/view_grant.test
View File

@ -664,3 +664,39 @@ insert into mysql.user select * from t1;
flush privileges; flush privileges;
drop table t1; drop table t1;
#
# BUG#14726: freeing stack variable in case of an error of opening
# a view when we have locked tables with LOCK TABLES statement.
#
connection root;
--disable_warnings
create database mysqltest;
--enable_warnings
use mysqltest;
CREATE TABLE t1 (i INT);
CREATE VIEW v1 AS SELECT * FROM t1;
SHOW CREATE VIEW v1;
GRANT SELECT, LOCK TABLES ON mysqltest.* TO mysqltest_1@localhost;
connection user1;
use mysqltest;
LOCK TABLES v1 READ;
-- error ER_TABLEACCESS_DENIED_ERROR
SHOW CREATE TABLE v1;
UNLOCK TABLES;
use test;
connection root;
use test;
drop user mysqltest_1@localhost;
drop database mysqltest;
#
# switch to default connaction
#
disconnect user1;
disconnect root;
connection default;

17
sql/sql_base.cc
View File

@ -1199,17 +1199,16 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
(void) unpack_filename(path, path); (void) unpack_filename(path, path);
if (mysql_frm_type(thd, path, &not_used) == FRMTYPE_VIEW) if (mysql_frm_type(thd, path, &not_used) == FRMTYPE_VIEW)
{ {
TABLE tab;// will not be used (because it's VIEW) but have to be passed /*
Will not be used (because it's VIEW) but has to be passed.
Also we will not free it (because it is a stack variable).
*/
TABLE tab;
table= &tab; table= &tab;
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));
if (open_unireg_entry(thd, table, table_list->db, if (!open_unireg_entry(thd, table, table_list->db,
table_list->table_name, table_list->table_name,
alias, table_list, mem_root)) alias, table_list, mem_root))
{
table->next=table->prev=table;
free_cache_entry(table);
}
else
{ {
DBUG_ASSERT(table_list->view != 0); DBUG_ASSERT(table_list->view != 0);
VOID(pthread_mutex_unlock(&LOCK_open)); VOID(pthread_mutex_unlock(&LOCK_open));