Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

sql/item_func.h

@@ -1318,7 +1318,7 @@ class Item_func_sp :public Item_func
   longlong val_int()
   {
     if (execute(&result_field))
-      return 0LL;
+      return (longlong) 0;
     return result_field->val_int();   
   }