diff options
| author | mskold@mysql.com <> | 2005-02-18 13:16:25 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-02-18 13:16:25 +0100 |
| commit | adb94fcb2c2c3503e0dbb740b3dc1a56ffc38b93 (patch) | |
| tree | 1806bbfdae93e335455eabd788130395199d3b42 /sql/item_func.h | |
| parent | d9b8e1730da212bcf4dcf5ab78d707303b66395f (diff) | |
| parent | 4c5801c8e503be7099293816747f082dc8c2b5c6 (diff) | |
| download | mariadb-git-adb94fcb2c2c3503e0dbb740b3dc1a56ffc38b93.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index d454f0ace59..783e54ba144 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -351,7 +351,7 @@ class Item_func_div :public Item_num_op { public: Item_func_div(Item *a,Item *b) :Item_num_op(a,b) {} - longlong int_op() { DBUG_ASSERT(0); } + longlong int_op() { DBUG_ASSERT(0); return 0; } double real_op(); my_decimal *decimal_op(my_decimal *); const char *func_name() const { return "/"; } |