diff options
author | unknown <malff/marcsql@weblab.(none)> | 2007-03-14 15:36:11 -0600 |
---|---|---|
committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-14 15:36:11 -0600 |
commit | 34a0de585afdfd4ee62f880387730f00394666f4 (patch) | |
tree | 4cfbf7f3bbb30d7fad0e2abfd590ae5a06fdcd3f /sql/item_subselect.cc | |
parent | fa57a563ce66f4b024da4b50ea4109bf0d45e202 (diff) | |
parent | cfcd27b3db1459c11e89ca21510438ac9ee55747 (diff) | |
download | mariadb-git-34a0de585afdfd4ee62f880387730f00394666f4.tar.gz |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-26503-merge
mysql-test/t/sp-error.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 135ed33feec..e42387c2237 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1080,7 +1080,8 @@ Item_in_subselect::single_value_transformer(JOIN *join, Item *having= item, *orig_item= item; select_lex->item_list.empty(); select_lex->item_list.push_back(new Item_int("Not_used", - (longlong) 1, 21)); + (longlong) 1, + MY_INT64_NUM_DECIMAL_DIGITS)); select_lex->ref_pointer_array[0]= select_lex->item_list.head(); item= func->create(expr, item); |