bk commit into 5.0 tree (serg:1.1947)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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
  1.1947 05/06/02 15:45:20 serg@stripped +2 -0
  cleanup

  sql/item_func.cc
    1.207 05/06/02 15:45:10 serg@stripped +6 -3
    don't call arg[0]->val_xxx() twice

  extra/yassl/src/ssl.cpp
    1.5 05/06/02 15:45:10 serg@stripped +1 -1
    unresolved __cxa_pure_virtual

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.206/sql/item_func.cc	Thu Jun  2 07:49:57 2005
+++ 1.207/sql/item_func.cc	Thu Jun  2 15:45:10 2005
@@ -2325,9 +2325,6 @@ longlong Item_func_field::val_int()
 {
   DBUG_ASSERT(fixed == 1);
 
-  if (args[0]->is_null())
-    return 0;
-
   if (cmp_type == STRING_RESULT)
   {
     String *field;
@@ -2343,6 +2340,8 @@ longlong Item_func_field::val_int()
   else if (cmp_type == INT_RESULT)
   {
     longlong val= args[0]->val_int();
+    if (args[0]->null_value)
+      return 0;
     for (uint i=1; i < arg_count ; i++)
     {
       if (!args[i]->is_null() && val == args[i]->val_int())
@@ -2353,6 +2352,8 @@ longlong Item_func_field::val_int()
   {
     my_decimal dec_arg_buf, *dec_arg,
                dec_buf, *dec= args[0]->val_decimal(&dec_buf);
+    if (args[0]->null_value)
+      return 0;
     for (uint i=1; i < arg_count; i++)
     {
       dec_arg= args[i]->val_decimal(&dec_arg_buf);
@@ -2363,6 +2364,8 @@ longlong Item_func_field::val_int()
   else
   {
     double val= args[0]->val_real();
+    if (args[0]->null_value)
+      return 0;
     for (uint i=1; i < arg_count ; i++)
     {
       if (!args[i]->is_null() && val == args[i]->val_real())

--- 1.4/extra/yassl/src/ssl.cpp	Tue May 31 17:56:25 2005
+++ 1.5/extra/yassl/src/ssl.cpp	Thu Jun  2 15:45:10 2005
@@ -36,7 +36,7 @@
 #include "handshake.hpp"
 #include "yassl_int.hpp"
 #include <stdio.h>
-
+#include "runtime.hpp"
 
 namespace yaSSL {