mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
This commit is contained in:
unknown 2005-06-09 09:20:00 -07:00
commit 4a8024c53d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/log_event.cc
View file

@ -707,7 +707,7 @@ failed my_b_read"));
Log_event *res= 0;
#ifndef max_allowed_packet
THD *thd=current_thd;
uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~0;
uint max_allowed_packet= thd ? thd->variables.max_allowed_packet : ~(ulong)0;
#endif
if (data_len > max_allowed_packet)

4
sql/sql_acl.cc
View file

@ -5172,7 +5172,7 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
grant_proc->db,
grant_proc->tname,
is_proc,
~0, 1))
~(ulong)0, 1))
{
revoked= 1;
continue;
@ -5240,7 +5240,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
lex_user.host.length= strlen(grant_proc->host.hostname);
if (!replace_routine_table(thd,grant_proc,tables[4].table,lex_user,
grant_proc->db, grant_proc->tname,
is_proc, ~0, 1))
is_proc, ~(ulong)0, 1))
{
revoked= 1;
continue;