bk commit into 5.0 tree (jimw:1.2252)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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@stripped, 2006-08-24 10:00:22-07:00, jimw@rama.(none) +2 -0
  Merge bk-internal:/home/bk/mysql-5.0-maint
  into  rama.(none):/home/jimw/my/mysql-5.0-clean
  MERGE: 1.2216.27.1

  mysql-test/r/grant.result@stripped, 2006-08-24 10:00:19-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.56.1.1

  mysql-test/t/grant.test@stripped, 2006-08-24 10:00:19-07:00, jimw@rama.(none) +0 -0
    Auto merged
    MERGE: 1.44.1.1

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.57/mysql-test/r/grant.result	2006-08-24 10:00:25 -07:00
+++ 1.58/mysql-test/r/grant.result	2006-08-24 10:00:25 -07:00
@@ -526,7 +526,7 @@ Db	char(64)	NO	PRI		
 User	char(16)	NO	PRI		
 Table_name	char(64)	NO	PRI		
 Grantor	char(77)	NO	MUL		
-Timestamp	timestamp	YES		CURRENT_TIMESTAMP	
+Timestamp	timestamp	NO		CURRENT_TIMESTAMP	
 Table_priv	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')	NO			
 Column_priv	set('Select','Insert','Update','References')	NO			
 use test;