Commit e809d1e1 authored by unknown's avatar unknown
Browse files

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

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 2e43fc33 f4958dc0

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -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)

sql/sql_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -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;