bk commit into 6.0 tree (malff:1.2648)

[marc.alff]

Below is the list of changes that have just been committed into a local
6.0 repository of malff.  When malff 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-05-20 12:32:24-06:00, malff@stripped. +1 -0
  Fixed build break

  sql/sql_signal.cc@stripped, 2008-05-20 12:32:22-06:00, malff@stripped. +3 -1
    fixed build break due to Item_int constructors

diff -Nrup a/sql/sql_signal.cc b/sql/sql_signal.cc
--- a/sql/sql_signal.cc	2008-05-20 10:57:14 -06:00
+++ b/sql/sql_signal.cc	2008-05-20 12:32:22 -06:00
@@ -708,6 +708,7 @@ int assign_stmt_target(THD *thd, Item *t
   Settable_routine_parameter *setter;
   int result= 1;
   int32 int_value;
+  ulonglong ullvalue;
   Item *value= NULL;
 
   /* FIXME: this is prototype code, to be continued */
@@ -746,7 +747,8 @@ int assign_stmt_target(THD *thd, Item *t
              "GET DIAGNOSTICS (DYNAMIC_FUNCTION_CODE)");
     break;
   case DIAG_ROW_COUNT:
-    value= new (thd->mem_root) Item_int(thd->main_da.m_stmt_area.m_rowcount);
+    ullvalue= thd->main_da.m_stmt_area.m_rowcount;
+    value= new (thd->mem_root) Item_int(ullvalue);
     break;
   case DIAG_TRANSACTIONS_COMMITTED:
     my_error(ER_NOT_SUPPORTED_YET, MYF(0),