diff options
| -rw-r--r-- | mysql-test/include/ps_query.inc | 10 | ||||
| -rw-r--r-- | mysql-test/r/ps_2myisam.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/ps_4heap.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/ps_5merge.result | 36 | ||||
| -rw-r--r-- | mysql-test/r/ps_6bdb.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/ps_7ndb.result | 30 | ||||
| -rw-r--r-- | mysql-test/t/ps_7ndb.test | 2 |
8 files changed, 75 insertions, 75 deletions
diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index 27ab85410c8..e807e897161 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -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 ? '; diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index 63463baabfd..7abac3bfb48 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -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 diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 70ba4a109d7..e404eb7e97b 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -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 diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 4c68f0c8593..94c9b2c357a 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -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 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 diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index 75358bd201b..0d5054dacdc 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.result @@ -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 diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result index e33bbd7002c..2d3fea3236e 100644 --- a/mysql-test/r/ps_7ndb.result +++ b/mysql-test/r/ps_7ndb.result @@ -193,24 +193,24 @@ 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) -MySQLtwo,MySQLfour,MySQLthree,MySQLone -prepare stmt1 from ' select group_concat(?,b) from t1 +group_concat(@arg00,b order by a) +MySQLone,MySQLtwo,MySQLthree,MySQLfour +prepare stmt1 from ' select group_concat(?,b order by a) from t1 group by ''a'' ' ; execute stmt1 using @arg00; -group_concat(?,b) -MySQLtwo,MySQLfour,MySQLthree,MySQLone -select group_concat(b,@arg00) from t1 +group_concat(?,b order by a) +MySQLone,MySQLtwo,MySQLthree,MySQLfour +select group_concat(b,@arg00 order by a) from t1 group by 'a' ; -group_concat(b,@arg00) -twoMySQL,fourMySQL,threeMySQL,oneMySQL -prepare stmt1 from ' select group_concat(b,?) from t1 +group_concat(b,@arg00 order by a) +oneMySQL,twoMySQL,threeMySQL,fourMySQL +prepare stmt1 from ' select group_concat(b,? order by a) from t1 group by ''a'' ' ; execute stmt1 using @arg00; -group_concat(b,?) -twoMySQL,fourMySQL,threeMySQL,oneMySQL +group_concat(b,? order by a) +oneMySQL,twoMySQL,threeMySQL,fourMySQL set @arg00='first' ; set @arg01='second' ; set @arg02=NULL; @@ -320,11 +320,11 @@ 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 -two one +two prepare stmt1 from ' select b FROM t1 where b like ? '; set @arg00='two' ; execute stmt1 using @arg00 ; @@ -1334,7 +1334,7 @@ prepare stmt1 from 'update t1 set a=? where b=? execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ; affected rows: 0 info: Rows matched: 0 Changed: 0 Warnings: 0 -select a,b from t1 order by a; +select a,b from t1 order by a ; a b 1 one 2 two diff --git a/mysql-test/t/ps_7ndb.test b/mysql-test/t/ps_7ndb.test index 30e45f44a0e..af669a26400 100644 --- a/mysql-test/t/ps_7ndb.test +++ b/mysql-test/t/ps_7ndb.test @@ -177,7 +177,7 @@ prepare stmt1 from 'update t1 set a=? where b=? --enable_info execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ; --disable_info -select a,b from t1 order by a; +select a,b from t1 order by a ; drop table t2 ; ## update with parameters in limit |