diff options
| author | unknown <sergefp@mysql.com> | 2006-07-22 16:18:28 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2006-07-22 16:18:28 +0400 |
| commit | 0f5797f57697750a6177e4dbe3c04a4fefcdae41 (patch) | |
| tree | d138b6951b4c19e7a672516cb40325d583980dcc /sql | |
| parent | 0950a31683bfc38e26e7b21139a6ea3defb03e23 (diff) | |
| download | mariadb-git-0f5797f57697750a6177e4dbe3c04a4fefcdae41.tar.gz | |
Post-merge fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_subselect.cc | 2 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 3c279d827b2..6675c9e7b25 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -575,7 +575,7 @@ Item_allany_subselect::Item_allany_subselect(Item * left_exp, chooser_compare_func_creator fc, st_select_lex *select_lex, bool all_arg) - :Item_in_subselect(), all(all_arg), func_creator(fc) + :Item_in_subselect(), func_creator(fc), all(all_arg) { DBUG_ENTER("Item_in_subselect::Item_in_subselect"); left_expr= left_exp; diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 619755fc6ff..3298b4e6c8e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -523,6 +523,8 @@ class sys_var; class Comp_creator; typedef Comp_creator* (*chooser_compare_func_creator)(bool invert); #include "item.h" +extern my_decimal decimal_zero; + /* sql_parse.cc */ void free_items(Item *item); void cleanup_items(Item *item); |