From: Date: August 22 2007 12:12pm
Subject: bk commit into 5.2 tree (gluh:1.2572)
List-Archive: http://lists.mysql.com/commits/32866
Message-Id: <20070822101226.212C024A0077@eagle.localdomain>

Below is the list of changes that have just been committed into a local
5.2 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-08-22 15:12:20+05:00, gluh@stripped +1 -0
  compiler warning fix

  sql/sql_show.cc@stripped, 2007-08-22 15:12:18+05:00, gluh@stripped +3 -3
    compiler warning fix

diff -Nrup a/sql/sql_show.cc b/sql/sql_show.cc
--- a/sql/sql_show.cc	2007-08-22 14:13:32 +05:00
+++ b/sql/sql_show.cc	2007-08-22 15:12:18 +05:00
@@ -3514,7 +3514,7 @@ bool store_schema_params(THD *thd, TABLE
   get_field(thd->mem_root, proc_table->field[MYSQL_PROC_FIELD_DB], &sp_db);
   get_field(thd->mem_root, proc_table->field[MYSQL_PROC_FIELD_NAME], &sp_name);
   get_field(thd->mem_root,proc_table->field[MYSQL_PROC_FIELD_DEFINER],&definer);
-  routine_type= proc_table->field[MYSQL_PROC_MYSQL_TYPE]->val_int();
+  routine_type= (uint) proc_table->field[MYSQL_PROC_MYSQL_TYPE]->val_int();
 
   if (!full_access)
     full_access= !strcmp(sp_user, definer.ptr());
@@ -3532,7 +3532,7 @@ bool store_schema_params(THD *thd, TABLE
               &returns);
 
   sp= sp_load_for_information_schema(thd, proc_table, &sp_db, &sp_name,
-                                     proc_table->
+                                     (ulong) proc_table->
                                      field[MYSQL_PROC_FIELD_SQL_MODE]->val_int(),
                                      routine_type,
                                      returns.c_ptr_safe(),
@@ -3673,7 +3673,7 @@ bool store_schema_proc(THD *thd, TABLE *
                   &tmp_string);
 
         sp= sp_load_for_information_schema(thd, proc_table, &sp_db, &sp_name,
-                                           proc_table->
+                                           (ulong) proc_table->
                                            field[MYSQL_PROC_FIELD_SQL_MODE]->
                                            val_int(),
                                            TYPE_ENUM_FUNCTION,