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

into mysql.com:/home/mysql_src/mysql-5.0-clean

innobase/os/os0file.c

@@ -1767,7 +1767,7 @@ os_file_flush(
 #else
 	int	ret;
 
-#ifdef HAVE_DARWIN_THREADS
+#if defined(HAVE_DARWIN_THREADS) && defined(F_FULLFSYNC) 
 	/* Apple has disabled fsync() for internal disk drives in OS X. That
 	caused corruption for a user when he tested a power outage. Let us in
 	OS X use a nonstandard flush method recommended by an Apple

sql/sql_acl.cc

@@ -5197,6 +5197,7 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name)
     DBUG_RETURN(TRUE);
 
   thd->lex->ssl_type= SSL_TYPE_NOT_SPECIFIED;
+  bzero((char*) &thd->lex->mqh, sizeof(thd->lex->mqh));
 
   result= mysql_procedure_grant(thd, tables, user_list,
   				DEFAULT_CREATE_PROC_ACLS, 0, 1);