Merge mysql.com:/home/jonas/src/mysql-4.1 (cbfac1be) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+13 −0

Original line number	Diff line number	Diff line
		@@ -792,3 +792,16 @@ libmysql/my_time.c
		libmysqld/my_time.c
		sql/mysql_tzinfo_to_sql
		sql/mysql_tzinfo_to_sql.cc
		ndb/src/cw/cpcd/ndb_cpcd
		ndb/src/kernel/ndbd
		ndb/src/kernel/blocks/backup/restore/ndb_restore
		ndb/src/mgmclient/ndb_mgm
		ndb/src/mgmsrv/ndb_mgmd
		ndb/tools/ndb_delete_all
		ndb/tools/ndb_desc
		ndb/tools/ndb_drop_index
		ndb/tools/ndb_drop_table
		ndb/tools/ndb_select_all
		ndb/tools/ndb_select_count
		ndb/tools/ndb_show_tables
		ndb/tools/ndb_waiter

+110 −0

Original line number	Diff line number	Diff line
		@@ -1548,6 +1548,116 @@ Z,z,Ź,ź,Ż,ż
		ǁ
		ǂ
		ǃ
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_slovak_ci;
		group_concat(c1 order by c1)
		÷
		×
		A,a,À,Á,Â,Ã,Å,à,á,â,ã,å,Ā,ā,Ă,ă,Ą,ą,Ǎ,ǎ,Ǟ,ǟ,Ǡ,ǡ,Ǻ,ǻ
		AA,Aa,aA,aa
		Ä,ä
		Æ,æ,Ǣ,ǣ,Ǽ,ǽ
		B,b
		ƀ
		Ɓ
		Ƃ,ƃ
		C,c,Ç,ç,Ć,ć,Ĉ,ĉ,Ċ,ċ
		cH
		Č,č
		Ƈ,ƈ
		D,d,Ď,ď
		DZ,Dz,dZ,dz,Ǆ,ǅ,ǆ,Ǳ,ǲ,ǳ
		Đ,đ
		Ɖ
		Ɗ
		Ƌ,ƌ
		Ð,ð
		E,e,È,É,Ê,Ë,è,é,ê,ë,Ē,ē,Ĕ,ĕ,Ė,ė,Ę,ę,Ě,ě
		Ǝ,ǝ
		Ə
		Ɛ
		F,f
		Ƒ,ƒ
		G,g,Ĝ,ĝ,Ğ,ğ,Ġ,ġ,Ģ,ģ,Ǧ,ǧ,Ǵ,ǵ
		Ǥ,ǥ
		Ɠ
		Ɣ
		Ƣ,ƣ
		H,h,Ĥ,ĥ
		CH,Ch,ch
		ƕ,Ƕ
		Ħ,ħ
		I,i,Ì,Í,Î,Ï,ì,í,î,ï,Ĩ,ĩ,Ī,ī,Ĭ,ĭ,Į,į,İ,Ǐ,ǐ
		IJ,Ij,iJ,ij,Ĳ,ĳ
		ı
		Ɨ
		Ɩ
		J,j,Ĵ,ĵ,ǰ
		K,k,Ķ,ķ,Ǩ,ǩ
		Ƙ,ƙ
		L,l,Ĺ,ĺ,Ļ,ļ,Ľ,ľ
		Ŀ,ŀ
		LJ,Lj,lJ,lj,Ǉ,ǈ,ǉ
		LL,Ll,lL,ll
		Ł,ł
		ƚ
		ƛ
		M,m
		N,n,Ñ,ñ,Ń,ń,Ņ,ņ,Ň,ň,Ǹ,ǹ
		NJ,Nj,nJ,nj,Ǌ,ǋ,ǌ
		Ɲ
		ƞ
		Ŋ,ŋ
		O,o,Ò,Ó,Õ,Ö,ò,ó,õ,ö,Ō,ō,Ŏ,ŏ,Ő,ő,Ơ,ơ,Ǒ,ǒ,Ǫ,ǫ,Ǭ,ǭ
		OE,Oe,oE,oe,Œ,œ
		Ô,ô
		Ø,ø,Ǿ,ǿ
		Ɔ
		Ɵ
		P,p
		Ƥ,ƥ
		Q,q
		ĸ
		R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
		RR,Rr,rR,rr
		Ʀ
		S,s,Ś,ś,Ŝ,ŝ,Ş,ş,ſ
		SS,Ss,sS,ss,ß
		Š,š
		Ʃ
		ƪ
		T,t,Ţ,ţ,Ť,ť
		ƾ
		Ŧ,ŧ
		ƫ
		Ƭ,ƭ
		Ʈ
		U,u,Ù,Ú,Û,Ü,ù,ú,û,ü,Ũ,ũ,Ū,ū,Ŭ,ŭ,Ů,ů,Ű,ű,Ų,ų,Ư,ư,Ǔ,ǔ,Ǖ,ǖ,Ǘ,ǘ,Ǚ,ǚ,Ǜ,ǜ
		Ɯ
		Ʊ
		V,v
		Ʋ
		W,w,Ŵ,ŵ
		X,x
		Y,y,Ý,ý,ÿ,Ŷ,ŷ,Ÿ
		Ƴ,ƴ
		Z,z,Ź,ź,Ż,ż
		ƍ
		Ž,ž
		Ƶ,ƶ
		Ʒ,Ǯ,ǯ
		Ƹ,ƹ
		ƺ
		Þ,þ
		ƿ,Ƿ
		ƻ
		Ƨ,ƨ
		Ƽ,ƽ
		Ƅ,ƅ
		ŉ
		ǀ
		ǁ
		ǂ
		ǃ
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_spanish2_ci;
		group_concat(c1 order by c1)
		÷

+30 −0

Original line number	Diff line number	Diff line
		@@ -321,3 +321,33 @@ HAVING LEFT(names, 1) ='J';
		names
		John###Anna###Bill
		DROP TABLE t1;
		CREATE TABLE t1 ( a int, b TEXT );
		INSERT INTO t1 VALUES (1,'First Row'), (2,'Second Row');
		SELECT GROUP_CONCAT(b ORDER BY b) FROM t1 GROUP BY a;
		GROUP_CONCAT(b ORDER BY b)
		First Row
		Second Row
		DROP TABLE t1;
		CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY (a_id)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		INSERT INTO t1 VALUES (1),(2),(3);
		CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),
		CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2);
		SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN (t2) on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz;
		a_id b_list
		1 1,2,3
		2 4,5
		3 NULL
		DROP TABLE t2;
		DROP TABLE t1;
		CREATE TABLE t1 (A_ID INT NOT NULL,A_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID));
		INSERT INTO t1 VALUES (1,'ABC'), (2,'EFG'), (3,'HIJ');
		CREATE TABLE t2 (A_ID INT NOT NULL,B_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID,B_DESC));
		INSERT INTO t2 VALUES (1,'A'),(1,'B'),(3,'F');
		SELECT t1.A_ID, GROUP_CONCAT(t2.B_DESC) AS B_DESC FROM t1 LEFT JOIN t2 ON t1.A_ID=t2.A_ID GROUP BY t1.A_ID ORDER BY t1.A_DESC;
		A_ID B_DESC
		1 A,B
		2 NULL
		3 F
		DROP TABLE t1;
		DROP TABLE t2;

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ select group_concat(c1 order by c1) from t1 group by c1 collate utf8_turkish_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_czech_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_danish_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_lithuanian_ci;
		--select group_concat(c1 order by c1) from t1 group by c1 collate utf8_slovak_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_slovak_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_spanish2_ci;
		select group_concat(c1 order by c1) from t1 group by c1 collate utf8_roman_ci;

+35 −0

Original line number	Diff line number	Diff line
		@@ -201,3 +201,38 @@ SELECT GROUP_CONCAT(a SEPARATOR '\|\|') AS names FROM t1
		SELECT GROUP_CONCAT(a SEPARATOR '###') AS names FROM t1
		HAVING LEFT(names, 1) ='J';
		DROP TABLE t1;

		#
		# check blobs
		#

		CREATE TABLE t1 ( a int, b TEXT );
		INSERT INTO t1 VALUES (1,'First Row'), (2,'Second Row');
		SELECT GROUP_CONCAT(b ORDER BY b) FROM t1 GROUP BY a;
		DROP TABLE t1;

		#
		# check null values #1
		#

		CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY (a_id)) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		INSERT INTO t1 VALUES (1),(2),(3);
		CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),
		CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2);
		SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN (t2) on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz;
		DROP TABLE t2;
		DROP TABLE t1;

		#
		# check null values #2
		#

		CREATE TABLE t1 (A_ID INT NOT NULL,A_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID));
		INSERT INTO t1 VALUES (1,'ABC'), (2,'EFG'), (3,'HIJ');
		CREATE TABLE t2 (A_ID INT NOT NULL,B_DESC CHAR(3) NOT NULL,PRIMARY KEY (A_ID,B_DESC));
		INSERT INTO t2 VALUES (1,'A'),(1,'B'),(3,'F');
		SELECT t1.A_ID, GROUP_CONCAT(t2.B_DESC) AS B_DESC FROM t1 LEFT JOIN t2 ON t1.A_ID=t2.A_ID GROUP BY t1.A_ID ORDER BY t1.A_DESC;
		DROP TABLE t1;
		DROP TABLE t2;