diff options
| -rw-r--r-- | mysql-test/main/except.test | 1 | ||||
| -rw-r--r-- | mysql-test/main/intersect.test | 1 | ||||
| -rw-r--r-- | sql/sql_class.h | 4 | ||||
| -rw-r--r-- | sql/sql_union.cc | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/main/except.test b/mysql-test/main/except.test index 702502ca7e5..de387cc84d7 100644 --- a/mysql-test/main/except.test +++ b/mysql-test/main/except.test @@ -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; diff --git a/mysql-test/main/intersect.test b/mysql-test/main/intersect.test index b420aa20e33..a99aa9271cd 100644 --- a/mysql-test/main/intersect.test +++ b/mysql-test/main/intersect.test @@ -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 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() { 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); |