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

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

Browse Source 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/sp.result:
  Use local
This commit is contained in:
unknown 2007-06-01 17:50:24 +04:00
commit b21f87e8b6
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/mysql.test
View File

@ -263,7 +263,7 @@ EOF
--exec $MYSQL test -e "show status" 2>&1 > /dev/null --exec $MYSQL test -e "show status" 2>&1 > /dev/null
--exec $MYSQL --help 2>&1 > /dev/null --exec $MYSQL --help 2>&1 > /dev/null
--exec $MYSQL --version 2>&1 > /dev/null --exec $MYSQL --version 2>&1 > /dev/null
--enable_quary_log --enable_query_log
# #
# bug #26851: Mysql Client --pager Buffer Overflow # bug #26851: Mysql Client --pager Buffer Overflow

2
mysql-test/t/mysqltest.test
View File

@ -1871,7 +1871,7 @@ DROP TABLE t1;
--disable_query_log --disable_query_log
--exec $MYSQL_TEST --help 2>&1 > /dev/null --exec $MYSQL_TEST --help 2>&1 > /dev/null
--exec $MYSQL_TEST --version 2>&1 > /dev/null --exec $MYSQL_TEST --version 2>&1 > /dev/null
--enable_quary_log --enable_query_log
--disable_abort_on_error --disable_abort_on_error
--error 1 --error 1
--exec $MYSQL_TEST a b c 2>&1 > /dev/null --exec $MYSQL_TEST a b c 2>&1 > /dev/null

4
mysql-test/t/order_by.test
View File

@ -719,10 +719,10 @@ CREATE TABLE t1 (a INT UNSIGNED NOT NULL, b TIME);
INSERT INTO t1 (a) VALUES (100000), (0), (100), (1000000),(10000), (1000), (10); INSERT INTO t1 (a) VALUES (100000), (0), (100), (1000000),(10000), (1000), (10);
UPDATE t1 SET b = SEC_TO_TIME(a); UPDATE t1 SET b = SEC_TO_TIME(a);
-- Correct ORDER # Correct ORDER
SELECT a, b FROM t1 ORDER BY b DESC; SELECT a, b FROM t1 ORDER BY b DESC;
-- must be ordered as the above # must be ordered as the above
SELECT a, b FROM t1 ORDER BY SEC_TO_TIME(a) DESC; SELECT a, b FROM t1 ORDER BY SEC_TO_TIME(a) DESC;
DROP TABLE t1; DROP TABLE t1;

2
mysql-test/t/row.test
View File

@ -7,10 +7,8 @@ select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3));
select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3)); select row(10,2,3) IN (row(3,2,3), row(1,2,3), row(1,3,3));
select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3)); select row(1,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3)); select row(10,2,3) IN (row(3,NULL,3), row(1,2,3), row(1,3,3));
--disable_ps_warnings
select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a')); select row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'));
select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3)); select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3));
--enable_ps_warnings
select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3)); select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3)); select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3)); select row('b',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));

2
mysql-test/t/sp.test
View File

@ -7095,7 +7095,7 @@ use test|
--disable_warnings --disable_warnings
drop function if exists bug20777| drop function if exists bug20777|
drop table if exists examplebug20777| drop table if exists examplebug20777|
--enabled_warnings --enable_warnings
create function bug20777(f1 bigint unsigned) returns bigint unsigned create function bug20777(f1 bigint unsigned) returns bigint unsigned
begin begin
set f1 = (f1 - 10); set f1 = (f1 + 10); set f1 = (f1 - 10); set f1 = (f1 + 10);

4
mysql-test/t/subselect3.test
View File

@ -260,11 +260,11 @@ insert into t2 values
('dd', 1, NULL); ('dd', 1, NULL);
alter table t1 add index idx(ie1,ie2); alter table t1 add index idx(ie1,ie2);
--cc 3 NULL NULL # cc 3 NULL NULL
select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=3 and b is null ; select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=3 and b is null ;
insert into t2 values ('new1', 10,10); insert into t2 values ('new1', 10,10);
insert into t1 values ('new1', 1234, 10, NULL); insert into t1 values ('new1', 1234, 10, NULL);
-- new1, 10, 10, NULL, # new1, 10, 10, NULL,
select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=10 and b=10; select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=10 and b=10;
explain extended explain extended
select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=10 and b=10; select oref, a, b, (a,b) in (select ie1,ie2 from t1 where oref=t2.oref) Z from t2 where a=10 and b=10;