Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 (9757a3a2) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/include/ps_query.inc

+5 −5

Original line number	Diff line number	Diff line
		@@ -115,15 +115,15 @@ execute stmt1 using @arg00;

		# variations on 'group_concat'
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		#
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;

		@@ -223,7 +223,7 @@ execute stmt1 using @arg00, @arg01;
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		# parameter in LIKE
		prepare stmt1 from ' select b FROM t1 where b like ? ';

mysql-test/r/ps_2myisam.result

+9 −9

Original line number	Diff line number	Diff line
		@@ -192,23 +192,23 @@ a concat(b,?)
		3 threeMySQL
		4 fourMySQL
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		group_concat(@arg00,b)
		group_concat(@arg00,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(?,b)
		group_concat(?,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		group_concat(b,@arg00)
		group_concat(b,@arg00 order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(b,?)
		group_concat(b,? order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		set @arg00='first' ;
		set @arg01='second' ;
		@@ -319,7 +319,7 @@ a
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		b
		one

mysql-test/r/ps_3innodb.result

+9 −9

Original line number	Diff line number	Diff line
		@@ -192,23 +192,23 @@ a concat(b,?)
		3 threeMySQL
		4 fourMySQL
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		group_concat(@arg00,b)
		group_concat(@arg00,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(?,b)
		group_concat(?,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		group_concat(b,@arg00)
		group_concat(b,@arg00 order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(b,?)
		group_concat(b,? order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		set @arg00='first' ;
		set @arg01='second' ;
		@@ -319,7 +319,7 @@ a
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		b
		one

mysql-test/r/ps_4heap.result

+9 −9

Original line number	Diff line number	Diff line
		@@ -193,23 +193,23 @@ a concat(b,?)
		3 threeMySQL
		4 fourMySQL
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		group_concat(@arg00,b)
		group_concat(@arg00,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(?,b)
		group_concat(?,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		group_concat(b,@arg00)
		group_concat(b,@arg00 order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(b,?)
		group_concat(b,? order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		set @arg00='first' ;
		set @arg01='second' ;
		@@ -320,7 +320,7 @@ a
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		b
		one

mysql-test/r/ps_5merge.result

+18 −18

Original line number	Diff line number	Diff line
		@@ -235,23 +235,23 @@ a concat(b,?)
		3 threeMySQL
		4 fourMySQL
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		group_concat(@arg00,b)
		group_concat(@arg00,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(?,b)
		group_concat(?,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		group_concat(b,@arg00)
		group_concat(b,@arg00 order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(b,?)
		group_concat(b,? order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		set @arg00='first' ;
		set @arg01='second' ;
		@@ -362,7 +362,7 @@ a
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		b
		one
		@@ -3243,23 +3243,23 @@ a concat(b,?)
		3 threeMySQL
		4 fourMySQL
		set @arg00='MySQL' ;
		select group_concat(@arg00,b) from t1
		select group_concat(@arg00,b order by a) from t1
		group by 'a' ;
		group_concat(@arg00,b)
		group_concat(@arg00,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		prepare stmt1 from ' select group_concat(?,b) from t1
		prepare stmt1 from ' select group_concat(?,b order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(?,b)
		group_concat(?,b order by a)
		MySQLone,MySQLtwo,MySQLthree,MySQLfour
		select group_concat(b,@arg00) from t1
		select group_concat(b,@arg00 order by a) from t1
		group by 'a' ;
		group_concat(b,@arg00)
		group_concat(b,@arg00 order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		prepare stmt1 from ' select group_concat(b,?) from t1
		prepare stmt1 from ' select group_concat(b,? order by a) from t1
		group by ''a'' ' ;
		execute stmt1 using @arg00;
		group_concat(b,?)
		group_concat(b,? order by a)
		oneMySQL,twoMySQL,threeMySQL,fourMySQL
		set @arg00='first' ;
		set @arg01='second' ;
		@@ -3370,7 +3370,7 @@ a
		set @arg00= 'one' ;
		set @arg01= 'two' ;
		set @arg02= 'five' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) ' ;
		prepare stmt1 from ' select b FROM t1 where b in (?,?,?) order by b ' ;
		execute stmt1 using @arg00, @arg01, @arg02 ;
		b
		one