summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-02-17 15:07:01 +0400
committerunknown <gluh@gluh.mysql.r18.ru>2003-02-17 15:07:01 +0400
commit00addf22bf01f4529506b043fd15c075f5c98349 (patch)
tree9e22423bcb3742b86a18b513ab6af5435fa4ac88 /sql/item_sum.cc
parentb3982368a8607db812ac548a6f29a4762f05cd06 (diff)
parent679fe2ee5785978bac36666438795dfcf8e6e839 (diff)
downloadmariadb-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_sum.cc')
-rw-r--r--sql/item_sum.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index c2db50345d1..fc59569e25b 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -387,7 +387,7 @@ double Item_sum_hybrid::val()
return (double) sum_int;
case REAL_RESULT:
return sum;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -422,7 +422,7 @@ Item_sum_hybrid::val_str(String *str)
else
str->set((longlong) sum_int,thd_charset());
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -467,7 +467,7 @@ bool Item_sum_min::add()
}
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -513,7 +513,7 @@ bool Item_sum_max::add()
}
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;