bk commit into 5.0 tree (brian:1.1960)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.0 repository of brian. When brian does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1960 05/06/08 22:29:10 brian@stripped +2 -0
  Merge baker@stripped:/home/bk/mysql-5.0
  into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0

  sql/sql_acl.cc
    1.158 05/06/08 22:28:35 brian@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.180 05/06/08 22:28:33 brian@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	brian
# Host:	brian-akers-computer.local
# Root:	/Users/brian/mysql/mysql-5.0/RESYNC

--- 1.179/sql/log_event.cc	2005-06-06 11:21:25 -07:00
+++ 1.180/sql/log_event.cc	2005-06-08 22:28:33 -07:00
@@ -707,7 +707,7 @@
   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)

--- 1.157/sql/sql_acl.cc	2005-06-06 23:31:00 -07:00
+++ 1.158/sql/sql_acl.cc	2005-06-08 22:28:35 -07:00
@@ -5172,7 +5172,7 @@
 				  grant_proc->db,
 				  grant_proc->tname,
                                   is_proc,
-				  ~0, 1))
+				  ~(ulong)0, 1))
 	  {
 	    revoked= 1;
 	    continue;
@@ -5240,7 +5240,7 @@
 	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;