diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-02-17 15:07:01 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-02-17 15:07:01 +0400 |
| commit | 00addf22bf01f4529506b043fd15c075f5c98349 (patch) | |
| tree | 9e22423bcb3742b86a18b513ab6af5435fa4ac88 /sql/item_func.cc | |
| parent | b3982368a8607db812ac548a6f29a4762f05cd06 (diff) | |
| parent | 679fe2ee5785978bac36666438795dfcf8e6e839 (diff) | |
| download | mariadb-git-00addf22bf01f4529506b043fd15c075f5c98349.tar.gz | |
Merge gluh@192.168.21.1:/usr/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar
sql/filesort.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 45d666fb47b..41082805aa8 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -251,7 +251,7 @@ Field *Item_func::tmp_table_field(TABLE *t_arg) else res= new Field_string(max_length, maybe_null, name, t_arg, charset()); break; - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); break; @@ -910,7 +910,7 @@ String *Item_func_min_max::val_str(String *str) } return res; } - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); return 0; @@ -1466,7 +1466,7 @@ bool udf_handler::get_arguments() to+= ALIGN_SIZE(sizeof(double)); } break; - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); ; @@ -1926,7 +1926,7 @@ longlong Item_func_benchmark::val_int() case STRING_RESULT: (void) args[0]->val_str(&tmp); break; - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); return 0; @@ -2062,7 +2062,7 @@ Item_func_set_user_var::update() (void) val_str(&tmp); break; } - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); break; @@ -2143,7 +2143,7 @@ Item_func_get_user_var::val_str(String *str) return NULL; } break; - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); break; @@ -2164,7 +2164,7 @@ double Item_func_get_user_var::val() return (double) *(longlong*) entry->value; case STRING_RESULT: return atof(entry->value); // This is null terminated - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); return 0; @@ -2185,7 +2185,7 @@ longlong Item_func_get_user_var::val_int() return *(longlong*) entry->value; case STRING_RESULT: return strtoull(entry->value,NULL,10); // String is null terminated - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); return 0; |