diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2006-11-16 10:06:36 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2006-11-16 10:06:36 -0700 |
| commit | f224238f8aed243f47e49090ef08c9fae5d05a01 (patch) | |
| tree | dff7790fbd704ce58fe490553fe15bd1d5c171fc /sql/item_func.h | |
| parent | 9d4d6ffed30f593323d40cf316a8ec4cd3784b85 (diff) | |
| parent | 2975d65cd86dea288d968c55fd0ffd177a92f390 (diff) | |
| download | mariadb-git-f224238f8aed243f47e49090ef08c9fae5d05a01.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-22684
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index dc4371ac967..0d6141dfd27 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -925,10 +925,9 @@ public: class Item_func_benchmark :public Item_int_func { - ulong loop_count; public: - Item_func_benchmark(ulong loop_count_arg,Item *expr) - :Item_int_func(expr), loop_count(loop_count_arg) + Item_func_benchmark(Item *count_expr, Item *expr) + :Item_int_func(count_expr, expr) {} longlong val_int(); const char *func_name() const { return "benchmark"; } |