merge (60479953) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/union.result

+14 −0

Original line number	Diff line number	Diff line
		@@ -1235,6 +1235,20 @@ show columns from t2;
		Field Type Null Key Default Extra
		a varchar(3) YES NULL
		drop table t2, t1;
		CREATE TABLE t1 (a mediumtext);
		CREATE TABLE t2 (b varchar(20));
		INSERT INTO t1 VALUES ('a'),('b');
		SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
		left(a,100000000)
		a
		b
		create table t3 SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
		show create table t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		`left(a,100000000)` longtext
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		drop tables t1,t2,t3;
		create table t1 ( id int not null auto_increment, primary key (id), col1 int);
		insert into t1 (col1) values (2),(3),(4),(5),(6);
		select 99 union all select id from t1 order by 1;

+10 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1;
		show columns from t2;
		drop table t2, t1;

		#
		# correct conversion long string to TEXT (BUG#10025)
		#
		CREATE TABLE t1 (a mediumtext);
		CREATE TABLE t2 (b varchar(20));
		INSERT INTO t1 VALUES ('a'),('b');
		SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
		create table t3 SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
		show create table t3;
		drop tables t1,t2,t3;

		#
		# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM

+2 −2

Original line number	Diff line number	Diff line
		@@ -3100,8 +3100,8 @@ Field Item_type_holder::make_field_by_type(TABLE table)
		enum_set_typelib, collation.collation);
		case MYSQL_TYPE_VAR_STRING:
		table->db_create_options\|= HA_OPTION_PACK_RECORD;
		return new Field_string(max_length, maybe_null, name, table,
		collation.collation);
		fld_type= MYSQL_TYPE_STRING;
		break;
		default:
		break;
		}