1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-dump-5.0
This commit is contained in:
unknown 2004-09-26 19:09:43 +03:00
commit c1cd53bc63
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log_event.cc
View File

@ -571,7 +571,7 @@ bool Log_event::write_header(IO_CACHE* file, ulong event_data_length)
int4store(header+ SERVER_ID_OFFSET, server_id);
int4store(header+ EVENT_LEN_OFFSET, data_written);
int4store(header+ LOG_POS_OFFSET, log_pos);
int4store(header+ FLAGS_OFFSET, flags);
int2store(header+ FLAGS_OFFSET, flags);
DBUG_RETURN(my_b_safe_write(file, header, sizeof(header)) != 0);
}

9
sql/sql_trigger.cc
View File

@ -2,6 +2,7 @@
#include "sp_head.h"
#include "sql_trigger.h"
#include "parse_file.h"
#include "sql_acl.h"
static const LEX_STRING triggers_file_type= {(char *)"TRIGGERS", 8};
@ -54,7 +55,13 @@ int mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
if (open_and_lock_tables(thd, tables))
DBUG_RETURN(-1);
// TODO: We should check if user has TRIGGER privilege for table here.
/*
TODO: We should check if user has TRIGGER privilege for table here.
Now we just require SUPER privilege for creating/dropping because
we don't have proper privilege checking for triggers in place yet.
*/
if (check_global_access(thd, SUPER_ACL))
DBUG_RETURN(1);
table= tables->table;