diff options
author | gluh@gluh.mysql.r18.ru <> | 2003-02-17 15:07:01 +0400 |
---|---|---|
committer | gluh@gluh.mysql.r18.ru <> | 2003-02-17 15:07:01 +0400 |
commit | 063668c08dcb64bec4d8ae2af807c562a47048b0 (patch) | |
tree | 9e22423bcb3742b86a18b513ab6af5435fa4ac88 /sql/sql_select.cc | |
parent | 893d7e5f8ba699dd9d173640a4557fa27569ef5c (diff) | |
parent | 7cfbabd807f3b21b85d8b24f97a9dc6c47dde81b (diff) | |
download | mariadb-git-063668c08dcb64bec4d8ae2af807c562a47048b0.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
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4543c6bc5d0..d3f41265e78 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4007,7 +4007,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, item->name,table,item->charset()); return new Field_string(item_sum->max_length,maybe_null, item->name,table,item->charset()); - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); return 0; @@ -4067,7 +4067,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, new_field= new Field_string(item->max_length,maybe_null, item->name,table,item->str_value.charset()); break; - case ROW_RESULT: + default: // This case should never be choosen DBUG_ASSERT(0); break; |