diff options
Diffstat (limited to 'mysql-test/r/ps_5merge.result')
| -rw-r--r-- | mysql-test/r/ps_5merge.result | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index af5d08d5eb4..f4903baf979 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -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 |