1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(1) fix type error

Browse Source 
(2) remove empty "--error ER_PARSE_ERROR"
(3) change three members in class select_unit to protected.
This commit is contained in:
Ruihang Xia 2019-08-28 12:04:02 +08:00 committed by Igor Babaev
parent a896bebfa6
commit 95f35bb75d
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/main/except.test
View File

@ -66,7 +66,6 @@ select 1 as a from dual except select 1 from dual;
select 1 from dual ORDER BY 1 except select 1 from dual;
select 1 as a from dual union all select 1 from dual;
--error ER_PARSE_ERROR
create table t1 (a int, b blob, a1 int, b1 blob) engine=MyISAM;

1
mysql-test/main/intersect.test
View File

@ -65,7 +65,6 @@ select 1 as a from dual intersect select 1 from dual;
select 1 from dual ORDER BY 1 intersect select 1 from dual;
select 1 as a from dual union all select 1 from dual;
--error ER_PARSE_ERROR

4
sql/sql_class.h
View File

@ -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()
{

2
sql/sql_union.cc
View File

@ -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);