summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorRuihang Xia <waynestxia@gmail.com>2019-08-28 12:04:02 +0800
committerIgor Babaev <igor@askmonty.org>2019-08-31 18:56:50 -0700
commit95f35bb75d8c3a518ee90ec82eb4e237c3b4e508 (patch)
tree797f084a4a33d04e0a085719df3c79072d823961 /sql/sql_class.h
parenta896bebfa6d00b0bb7685956196a7977d9273652 (diff)
downloadmariadb-git-95f35bb75d8c3a518ee90ec82eb4e237c3b4e508.tar.gz
(1) fix type error
(2) remove empty "--error ER_PARSE_ERROR" (3) change three members in class select_unit to protected.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index f59afe52601..48207847fe1 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -5708,7 +5708,7 @@ public:
class select_unit :public select_result_interceptor
{
-public:
+protected:
uint curr_step, prev_step, curr_sel;
enum sub_select_type step;
public:
@@ -5870,7 +5870,7 @@ public:
};
int send_data(List<Item> &items);
void change_select();
- int unfold_record(int cnt);
+ int unfold_record(longlong cnt);
bool send_eof();
bool force_enable_index_if_needed()
{