1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2004-10-07 12:43:07 +00:00
commit 294bcf2cc0
8 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/include/ps_query.inc
View File

@ -115,15 +115,15 @@ execute stmt1 using @arg00;
# variations on 'group_concat' # variations on 'group_concat'
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
# #
select group_concat(b,@arg00) from t1 select group_concat(b,@arg00 order by a) from t1
group by 'a' ; 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
@ -223,7 +223,7 @@ execute stmt1 using @arg00, @arg01;
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
# parameter in LIKE # parameter in LIKE
prepare stmt1 from ' select b FROM t1 where b like ? '; prepare stmt1 from ' select b FROM t1 where b like ? ';

18
mysql-test/r/ps_2myisam.result
View File

@ -192,23 +192,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -319,7 +319,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one

18
mysql-test/r/ps_3innodb.result
View File

@ -192,23 +192,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -319,7 +319,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one

18
mysql-test/r/ps_4heap.result
View File

@ -193,23 +193,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -320,7 +320,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one

36
mysql-test/r/ps_5merge.result
View File

@ -235,23 +235,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -362,7 +362,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one
@ -3243,23 +3243,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -3370,7 +3370,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one

18
mysql-test/r/ps_6bdb.result
View File

@ -192,23 +192,23 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLone,MySQLtwo,MySQLthree,MySQLfour 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
oneMySQL,twoMySQL,threeMySQL,fourMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
@ -319,7 +319,7 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
one one

28
mysql-test/r/ps_7ndb.result
View File

@ -193,24 +193,24 @@ a concat(b,?)
3 threeMySQL 3 threeMySQL
4 fourMySQL 4 fourMySQL
set @arg00='MySQL' ; set @arg00='MySQL' ;
select group_concat(@arg00,b) from t1 select group_concat(@arg00,b order by a) from t1
group by 'a' ; group by 'a' ;
group_concat(@arg00,b) group_concat(@arg00,b order by a)
MySQLtwo,MySQLfour,MySQLthree,MySQLone 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(?,b) group_concat(?,b order by a)
MySQLtwo,MySQLfour,MySQLthree,MySQLone 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 by 'a' ;
group_concat(b,@arg00) group_concat(b,@arg00 order by a)
twoMySQL,fourMySQL,threeMySQL,oneMySQL 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'' ' ; group by ''a'' ' ;
execute stmt1 using @arg00; execute stmt1 using @arg00;
group_concat(b,?) group_concat(b,? order by a)
twoMySQL,fourMySQL,threeMySQL,oneMySQL oneMySQL,twoMySQL,threeMySQL,fourMySQL
set @arg00='first' ; set @arg00='first' ;
set @arg01='second' ; set @arg01='second' ;
set @arg02=NULL; set @arg02=NULL;
@ -320,11 +320,11 @@ a
set @arg00= 'one' ; set @arg00= 'one' ;
set @arg01= 'two' ; set @arg01= 'two' ;
set @arg02= 'five' ; 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 ; execute stmt1 using @arg00, @arg01, @arg02 ;
b b
two
one one
two
prepare stmt1 from ' select b FROM t1 where b like ? '; prepare stmt1 from ' select b FROM t1 where b like ? ';
set @arg00='two' ; set @arg00='two' ;
execute stmt1 using @arg00 ; execute stmt1 using @arg00 ;