diff options
| author | unknown <serg@serg.mylan> | 2005-06-03 13:43:17 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-03 13:43:17 +0200 |
| commit | 2906e27a7c3a287be6af12fa2969c034f37f5b40 (patch) | |
| tree | 1973863e5e62f07062c8ae0fb50602d88fc98335 /sql/item_func.cc | |
| parent | b3ca69b1144dd7c06d84ddefd9d52a0f3b404626 (diff) | |
| download | mariadb-git-2906e27a7c3a287be6af12fa2969c034f37f5b40.tar.gz | |
yassl template instantiation - don't do too much
mysys/my_access.c: remove incorrect fix
comments
extra/yassl/taocrypt/src/integer.cpp:
yassl template instantiation - don't do too much
extra/yassl/taocrypt/src/template_instnt.cpp:
yassl template instantiation - don't do too much
mysys/my_access.c:
remove incorrect fix
sql/item_func.cc:
a couple of comment. assert added.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 18c2efb0ace..5af99cb8132 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -695,8 +695,8 @@ String *Item_int_func::val_str(String *str) /* - Check arguments here to determine result's type for function with two - arguments. + Check arguments here to determine result's type for a numeric + function of two arguments. SYNOPSIS Item_num_op::find_num_type() @@ -722,8 +722,9 @@ void Item_num_op::find_num_type(void) hybrid_type= DECIMAL_RESULT; result_precision(); } - else if (r0 == INT_RESULT && r1 == INT_RESULT) + else { + DBUG_ASSERT(r0 == INT_RESULT && r1 == INT_RESULT); decimals= 0; hybrid_type=INT_RESULT; result_precision(); @@ -738,7 +739,9 @@ void Item_num_op::find_num_type(void) /* - Set result type of function if it (type) is depends only on first argument + Set result type for a numeric function of one argument + (can be also used by a numeric function of many arguments, if the result + type depends only on the first argument) SYNOPSIS Item_func_num1::find_num_type() |