Commit 1ea49fec authored by unknown's avatar unknown

cleanup


extra/yassl/src/ssl.cpp:
  unresolved __cxa_pure_virtual
sql/item_func.cc:
  don't call arg[0]->val_xxx() twice
parent a381ff7c
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "handshake.hpp" #include "handshake.hpp"
#include "yassl_int.hpp" #include "yassl_int.hpp"
#include <stdio.h> #include <stdio.h>
#include "runtime.hpp"
namespace yaSSL { namespace yaSSL {
......
...@@ -2325,9 +2325,6 @@ longlong Item_func_field::val_int() ...@@ -2325,9 +2325,6 @@ longlong Item_func_field::val_int()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
if (args[0]->is_null())
return 0;
if (cmp_type == STRING_RESULT) if (cmp_type == STRING_RESULT)
{ {
String *field; String *field;
...@@ -2343,6 +2340,8 @@ longlong Item_func_field::val_int() ...@@ -2343,6 +2340,8 @@ longlong Item_func_field::val_int()
else if (cmp_type == INT_RESULT) else if (cmp_type == INT_RESULT)
{ {
longlong val= args[0]->val_int(); longlong val= args[0]->val_int();
if (args[0]->null_value)
return 0;
for (uint i=1; i < arg_count ; i++) for (uint i=1; i < arg_count ; i++)
{ {
if (!args[i]->is_null() && val == args[i]->val_int()) if (!args[i]->is_null() && val == args[i]->val_int())
...@@ -2353,6 +2352,8 @@ longlong Item_func_field::val_int() ...@@ -2353,6 +2352,8 @@ longlong Item_func_field::val_int()
{ {
my_decimal dec_arg_buf, *dec_arg, my_decimal dec_arg_buf, *dec_arg,
dec_buf, *dec= args[0]->val_decimal(&dec_buf); dec_buf, *dec= args[0]->val_decimal(&dec_buf);
if (args[0]->null_value)
return 0;
for (uint i=1; i < arg_count; i++) for (uint i=1; i < arg_count; i++)
{ {
dec_arg= args[i]->val_decimal(&dec_arg_buf); dec_arg= args[i]->val_decimal(&dec_arg_buf);
...@@ -2363,6 +2364,8 @@ longlong Item_func_field::val_int() ...@@ -2363,6 +2364,8 @@ longlong Item_func_field::val_int()
else else
{ {
double val= args[0]->val_real(); double val= args[0]->val_real();
if (args[0]->null_value)
return 0;
for (uint i=1; i < arg_count ; i++) for (uint i=1; i < arg_count ; i++)
{ {
if (!args[i]->is_null() && val == args[i]->val_real()) if (!args[i]->is_null() && val == args[i]->val_real())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment