bk commit into 6.0 tree (thek:1.2627)

[kpettersson]

Below is the list of changes that have just been committed into a local
6.0 repository of thek.  When thek 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, 2008-04-10 09:37:24+02:00, thek@adventure.(none) +2 -0
  Fixed build warnings.

  sql/si_objects.cc@stripped, 2008-04-10 09:37:21+02:00, thek@adventure.(none) +2 -2
    Fixed build warning truncation from 'int' to 'bool'

  sql/sql_parse.cc@stripped, 2008-04-10 09:37:22+02:00, thek@adventure.(none) +1 -1
    Fixed build warning truncation from 'int' to 'bool'. Fourth parameter 
    is <>0 which previously ment "is a SHOW command" and this implied 
    any combination of privilege requirement would do (=TRUE).

diff -Nrup a/sql/si_objects.cc b/sql/si_objects.cc
--- a/sql/si_objects.cc	2008-02-29 15:37:40 +01:00
+++ b/sql/si_objects.cc	2008-04-10 09:37:21 +02:00
@@ -118,7 +118,7 @@ int silent_exec(THD *thd, String *query)
 /*
   This method gets the create statement for a procedure or function.
 */
-int serialize_routine(THD *thd,
+bool serialize_routine(THD *thd,
                      int type,
                       String db_name,
                       String r_name,
@@ -184,7 +184,7 @@ int serialize_routine(THD *thd,
   else
   {
     string->length(0);
-    ret= -1;
+    ret= TRUE;
   }
   if (type == TYPE_ENUM_PROCEDURE)
     thd->variables.max_sp_recursion_depth--;
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2008-04-09 11:06:14 +02:00
+++ b/sql/sql_parse.cc	2008-04-10 09:37:22 +02:00
@@ -1137,7 +1137,7 @@ bool dispatch_command(enum enum_server_c
     if (check_access(thd,SELECT_ACL,table_list.db,&table_list.grant.privilege,
 		     0, 0, test(table_list.schema_table)))
       break;
-    if (check_grant(thd, SELECT_ACL, &table_list, 2, UINT_MAX, 0))
+    if (check_grant(thd, SELECT_ACL, &table_list, TRUE, UINT_MAX, FALSE))
       break;
     /* init structures for VIEW processing */
     table_list.select_lex= &(thd->lex->select_lex);