diff options
| author | unknown <mskold@mysql.com> | 2005-06-14 16:40:50 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-06-14 16:40:50 +0200 |
| commit | 110eb52dcc34eccc68a5f43d6ce7438c0130f4b9 (patch) | |
| tree | b0ebd0174c17d9642bc69e6b49a8a2bb573a3572 | |
| parent | 692fcc00b07a89040a2af8d3709d18f50a8e6b6a (diff) | |
| download | mariadb-git-110eb52dcc34eccc68a5f43d6ce7438c0130f4b9.tar.gz | |
Added order by for failing ps_7ndb test
| -rw-r--r-- | mysql-test/include/ps_query.inc | 2 | ||||
| -rw-r--r-- | mysql-test/r/ps_2myisam.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/ps_4heap.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/ps_5merge.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ps_6bdb.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/ps_7ndb.result | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index 63504a0fa2b..27a86f88231 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -300,7 +300,7 @@ set @arg00=1; prepare stmt1 from ' select a,b from t1 order by a limit 1 '; execute stmt1 ; -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; ##### parameter used in many places diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index 3df9b6dcb6e..5e839bf4a02 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -444,7 +444,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 851178e2aee..c5d5895adca 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -444,7 +444,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 60675a72bdc..8d703ec1ea5 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -445,7 +445,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index a177290daa4..72b0fac4201 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -487,7 +487,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one @@ -3499,7 +3499,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result index 92399c3b3b9..87b1b110f42 100644 --- a/mysql-test/r/ps_6bdb.result +++ b/mysql-test/r/ps_6bdb.result @@ -444,7 +444,7 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b 1 one diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result index c7dabc2016d..c158156d11d 100644 --- a/mysql-test/r/ps_7ndb.result +++ b/mysql-test/r/ps_7ndb.result @@ -444,10 +444,10 @@ limit 1 '; execute stmt1 ; a b 1 one -prepare stmt1 from ' select a,b from t1 limit ? '; +prepare stmt1 from ' select a,b from t1 order by a limit ? '; execute stmt1 using @arg00; a b -3 three +1 one set @arg00='b' ; set @arg01=0 ; set @arg02=2 ; |