diff options
| author | unknown <sanja@montyprogram.com> | 2013-06-19 14:32:14 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-06-19 14:32:14 +0300 |
| commit | dfcc502ab540b4d93fe3d40d0bac15fa3ae449dd (patch) | |
| tree | ab179c039dab8cb251a20efcdd65f96a1eabf9a6 /sql/opt_subselect.cc | |
| parent | 2534521f9a7d66b48cb9ca9402e82a0c58b156d8 (diff) | |
| download | mariadb-git-dfcc502ab540b4d93fe3d40d0bac15fa3ae449dd.tar.gz | |
Finished merging wl5986 started by Igor.
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 4d3d60fc2f5..bda9532e874 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5060,7 +5060,7 @@ public: select_value_catcher(Item_subselect *item_arg) :select_subselect(item_arg) {} - int send_data(List<Item> &items); + bool send_data(List<Item> &items); int setup(List<Item> *items); bool assigned; /* TRUE <=> we've caught a value */ uint n_elements; /* How many elements we get */ @@ -5088,7 +5088,7 @@ int select_value_catcher::setup(List<Item> *items) } -int select_value_catcher::send_data(List<Item> &items) +bool select_value_catcher::send_data(List<Item> &items) { DBUG_ENTER("select_value_catcher::send_data"); DBUG_ASSERT(!assigned); |