Commit 75c45487 authored by unknown's avatar unknown

Fix some mysqltest warnings.


mysql-test/r/sp.result:
  Update results.
mysql-test/t/mysql.test:
  Fix a typo.
mysql-test/t/mysqltest.test:
  Fix a typo.
mysql-test/t/order_by.test:
  Fix a typo.
mysql-test/t/row.test:
  Remove an unsupported command.
mysql-test/t/sp.test:
  Fix a typo.
mysql-test/t/subselect3.test:
  Fix  mysqltest warnings - now it warns when sees some suspicious --
  comment
parent 0bb59671
...@@ -6018,6 +6018,8 @@ select bug20777(9223372036854775810) as '9223372036854775810 2**63+2'; ...@@ -6018,6 +6018,8 @@ select bug20777(9223372036854775810) as '9223372036854775810 2**63+2';
select bug20777(-9223372036854775808) as 'lower bounds signed bigint'; select bug20777(-9223372036854775808) as 'lower bounds signed bigint';
lower bounds signed bigint lower bounds signed bigint
0 0
Warnings:
Warning 1264 Out of range value adjusted for column 'f1' at row 1
select bug20777(9223372036854775807) as 'upper bounds signed bigint'; select bug20777(9223372036854775807) as 'upper bounds signed bigint';
upper bounds signed bigint upper bounds signed bigint
9223372036854775807 9223372036854775807
...@@ -6030,9 +6032,13 @@ upper bounds unsigned bigint ...@@ -6030,9 +6032,13 @@ upper bounds unsigned bigint
select bug20777(18446744073709551616) as 'upper bounds unsigned bigint + 1'; select bug20777(18446744073709551616) as 'upper bounds unsigned bigint + 1';
upper bounds unsigned bigint + 1 upper bounds unsigned bigint + 1
18446744073709551615 18446744073709551615
Warnings:
Warning 1264 Out of range value adjusted for column 'f1' at row 1
select bug20777(-1) as 'lower bounds unsigned bigint - 1'; select bug20777(-1) as 'lower bounds unsigned bigint - 1';
lower bounds unsigned bigint - 1 lower bounds unsigned bigint - 1
0 0
Warnings:
Warning 1264 Out of range value adjusted for column 'f1' at row 1
create table examplebug20777 as select create table examplebug20777 as select
0 as 'i', 0 as 'i',
bug20777(9223372036854775806) as '2**63-2', bug20777(9223372036854775806) as '2**63-2',
...@@ -6044,7 +6050,12 @@ bug20777(18446744073709551615) as '2**64-1', ...@@ -6044,7 +6050,12 @@ bug20777(18446744073709551615) as '2**64-1',
bug20777(18446744073709551616) as '2**64', bug20777(18446744073709551616) as '2**64',
bug20777(0) as '0', bug20777(0) as '0',
bug20777(-1) as '-1'; bug20777(-1) as '-1';
Warnings:
Warning 1264 Out of range value adjusted for column 'f1' at row 1
Warning 1264 Out of range value adjusted for column 'f1' at row 1
insert into examplebug20777 values (1, 9223372036854775806, 9223372036854775807, 223372036854775808, 9223372036854775809, 18446744073709551614, 18446744073709551615, 8446744073709551616, 0, -1); insert into examplebug20777 values (1, 9223372036854775806, 9223372036854775807, 223372036854775808, 9223372036854775809, 18446744073709551614, 18446744073709551615, 8446744073709551616, 0, -1);
Warnings:
Warning 1264 Out of range value adjusted for column '-1' at row 1
show create table examplebug20777; show create table examplebug20777;
Table Create Table Table Create Table
examplebug20777 CREATE TABLE `examplebug20777` ( examplebug20777 CREATE TABLE `examplebug20777` (
......
...@@ -262,7 +262,7 @@ EOF ...@@ -262,7 +262,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
......
...@@ -1871,7 +1871,7 @@ DROP TABLE t1; ...@@ -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
......
...@@ -719,10 +719,10 @@ CREATE TABLE t1 (a INT UNSIGNED NOT NULL, b TIME); ...@@ -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;
...@@ -7,10 +7,8 @@ select (1,2,3) IN ((3,2,3), (1,2,3), (1,3,3)); ...@@ -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));
......
...@@ -6975,7 +6975,7 @@ use test| ...@@ -6975,7 +6975,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);
......
...@@ -260,11 +260,11 @@ insert into t2 values ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment