database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch 'openquery/MDEV-6916-maria-5.5-check_view-r4408' into 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2015-04-28 21:11:49 +02:00
parent fbab0685a7 83ce3529b8
commit f9c02d7c29
22 changed files with 918 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@ -643,7 +643,8 @@ found:
open_table_error(share, share->error, share->open_errno, share->errarg);
DBUG_RETURN(0);
}
if (share->is_view && !(db_flags & OPEN_VIEW))
if ((share->is_view && !(db_flags & OPEN_VIEW)) ||
(!share->is_view && (db_flags & OPEN_VIEW_ONLY)))
{
open_table_error(share, 1, ENOENT, 0);
DBUG_RETURN(0);
@ -3027,7 +3028,11 @@ retry_share:
mysql_mutex_lock(&LOCK_open);
if (!(share= get_table_share_with_discover(thd, table_list, key,
key_length, OPEN_VIEW,
key_length,
(OPEN_VIEW |
((table_list->required_type ==
FRMTYPE_VIEW) ?
OPEN_VIEW_ONLY : 0)),
&error,
hash_value)))
{