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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
msvensson@neptunus.(none)
2005-05-27 18:30:35 +02:00
parent 4ea3ec87f3 a07d8b1951
commit cf3e568495
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/view_skip_grants.result → mysql-test/r/skip_grants.result
View File

@ -1,6 +1,10 @@
drop table if exists t1,v1; drop table if exists t1,v1;
drop view if exists t1,v1; drop view if exists t1,v1;
drop procedure if exists f1;
use test; use test;
create table t1 (field1 INT); create table t1 (field1 INT);
CREATE VIEW v1 AS SELECT field1 FROM t1; CREATE VIEW v1 AS SELECT field1 FROM t1;
drop view v1; drop view v1;
drop table t1;
create procedure f1() select 1;
drop procedure f1;

0
mysql-test/t/view_skip_grants-master.opt → mysql-test/t/skip_grants-master.opt
View File

10
mysql-test/t/view_skip_grants.test → mysql-test/t/skip_grants.test
View File

@ -1,6 +1,7 @@
--disable_warnings --disable_warnings
drop table if exists t1,v1; drop table if exists t1,v1;
drop view if exists t1,v1; drop view if exists t1,v1;
drop procedure if exists f1;
--enable_warnings --enable_warnings
use test; use test;
@ -11,4 +12,11 @@ create table t1 (field1 INT);
CREATE VIEW v1 AS SELECT field1 FROM t1; CREATE VIEW v1 AS SELECT field1 FROM t1;
drop view v1; drop view v1;
drop table t1 drop table t1;
#
# Test that we can create and drop procedure without warnings
# see bug#9993
#
create procedure f1() select 1;
drop procedure f1;

2
sql/mysql_priv.h
View File

@ -1102,7 +1102,7 @@ extern my_bool opt_slave_compressed_protocol, use_temp_pool;
extern my_bool opt_readonly, lower_case_file_system; extern my_bool opt_readonly, lower_case_file_system;
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs; extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
extern my_bool opt_secure_auth; extern my_bool opt_secure_auth;
extern my_bool sp_automatic_privileges; extern my_bool sp_automatic_privileges, opt_noacl;
extern my_bool opt_old_style_user_limits, trust_routine_creators; extern my_bool opt_old_style_user_limits, trust_routine_creators;
extern uint opt_crash_binlog_innodb; extern uint opt_crash_binlog_innodb;
extern char *shared_memory_base_name, *mysqld_unix_port; extern char *shared_memory_base_name, *mysqld_unix_port;

3
sql/mysqld.cc
View File

@ -336,6 +336,7 @@ my_bool opt_old_style_user_limits= 0, trust_routine_creators= 0;
changed). False otherwise. changed). False otherwise.
*/ */
volatile bool mqh_used = 0; volatile bool mqh_used = 0;
my_bool opt_noacl;
my_bool sp_automatic_privileges= 1; my_bool sp_automatic_privileges= 1;
#ifdef HAVE_INITGROUPS #ifdef HAVE_INITGROUPS
@ -459,7 +460,7 @@ char *master_ssl_ca, *master_ssl_capath, *master_ssl_cipher;
/* Static variables */ /* Static variables */
static bool kill_in_progress, segfaulted; static bool kill_in_progress, segfaulted;
static my_bool opt_do_pstack, opt_noacl, opt_bootstrap, opt_myisam_log; static my_bool opt_do_pstack, opt_bootstrap, opt_myisam_log;
static int cleanup_done; static int cleanup_done;
static ulong opt_specialflag, opt_myisam_block_size; static ulong opt_specialflag, opt_myisam_block_size;
static char *opt_logname, *opt_update_logname, *opt_binlog_index_name; static char *opt_logname, *opt_update_logname, *opt_binlog_index_name;

4
sql/sql_parse.cc
View File

@ -3992,7 +3992,7 @@ unsent_create_error:
lex->sphead= 0; lex->sphead= 0;
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
/* only add privileges if really neccessary */ /* only add privileges if really neccessary */
if (sp_automatic_privileges && if (sp_automatic_privileges && !opt_noacl &&
check_routine_access(thd, DEFAULT_CREATE_PROC_ACLS, check_routine_access(thd, DEFAULT_CREATE_PROC_ACLS,
db, name, db, name,
lex->sql_command == SQLCOM_CREATE_PROCEDURE, 1)) lex->sql_command == SQLCOM_CREATE_PROCEDURE, 1))
@ -4261,7 +4261,7 @@ unsent_create_error:
lex->sql_command == SQLCOM_DROP_PROCEDURE, 0)) lex->sql_command == SQLCOM_DROP_PROCEDURE, 0))
goto error; goto error;
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
if (sp_automatic_privileges && if (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))
{ {