diff options
| author | Ruihang Xia <waynestxia@gmail.com> | 2019-08-28 12:04:02 +0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-08-31 18:56:50 -0700 |
| commit | 95f35bb75d8c3a518ee90ec82eb4e237c3b4e508 (patch) | |
| tree | 797f084a4a33d04e0a085719df3c79072d823961 /sql/sql_union.cc | |
| parent | a896bebfa6d00b0bb7685956196a7977d9273652 (diff) | |
| download | mariadb-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_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 1bd65f8c758..862b7292e4a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -499,7 +499,7 @@ bool select_unit_ext::disable_index_if_needed(SELECT_LEX *curr_sl) -1 conversion happened */ -int select_unit_ext::unfold_record(int cnt) +int select_unit_ext::unfold_record(longlong cnt) { DBUG_ASSERT(cnt > 0); |