bk commit into 5.0 tree (gluh:1.2530)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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, 2007-09-20 14:38:41+05:00, gluh@stripped +1 -0
  result fix

  mysql-test/r/grant.result@stripped, 2007-09-20 14:38:39+05:00, gluh@stripped +1 -1
    result fix

diff -Nrup a/mysql-test/r/grant.result b/mysql-test/r/grant.result
--- a/mysql-test/r/grant.result	2007-09-20 13:54:44 +05:00
+++ b/mysql-test/r/grant.result	2007-09-20 14:38:39 +05: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	NO		0000-00-00 00:00:00	
+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;