mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source 
mysql-test/r/mysqldump.result:
  Fixed tests (changed becasue of new checking of float numbers during parsing)
This commit is contained in:
unknown 2004-10-05 03:05:20 +03:00
parent 45a7c6581f
commit 2f9c7c0b09
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/mysqldump.result
View file

@ -27,7 +27,9 @@ CREATE TABLE `t1` (
INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('0987654321098765432109876543210987654321.00000000000000000000');
DROP TABLE t1;
CREATE TABLE t1 (a double);
INSERT INTO t1 VALUES (-9e999999);
INSERT INTO t1 VALUES ('-9e999999');
Warnings:
Warning 1264 Out of range value adjusted for column 'a' at row 1
CREATE TABLE `t1` (
`a` double default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;

12
mysql-test/r/view.result
View file

@ -1347,8 +1347,8 @@ insert into v1 values(3);
ERROR HY000: CHECK OPTION failed 'test.v1'
insert ignore into v1 values (2),(3),(0);
Warnings:
Error 1365 CHECK OPTION failed 'test.v1'
Error 1365 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
select * from t1;
a
1
@ -1361,8 +1361,8 @@ create table t2 (a int);
insert into t2 values (2),(3),(0);
insert ignore into v1 SELECT a from t2;
Warnings:
Error 1365 CHECK OPTION failed 'test.v1'
Error 1365 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
select * from t1;
a
1
@ -1384,7 +1384,7 @@ a
update v1 set a=a+1;
update ignore v1,t2 set v1.a=v1.a+1 where v1.a=t2.a;
Warnings:
Error 1365 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
select * from t1;
a
1
@ -1418,7 +1418,7 @@ insert into v1 values (1) on duplicate key update a=2;
ERROR HY000: CHECK OPTION failed 'test.v1'
insert ignore into v1 values (1) on duplicate key update a=2;
Warnings:
Error 1365 CHECK OPTION failed 'test.v1'
Error 1369 CHECK OPTION failed 'test.v1'
select * from t1;
a
1

16
mysql-test/t/view.test
View file

@ -394,7 +394,7 @@ drop table t1;
# syntax compatibility
#
create table t1 (a int);
-- error 1364
-- error 1368
create view v1 as select distinct a from t1 WITH CHECK OPTION;
create view v1 as select a from t1 WITH CHECK OPTION;
create view v2 as select a from t1 WITH CASCADED CHECK OPTION;
@ -1318,7 +1318,7 @@ create table t1 (a int);
create view v1 as select * from t1 where a < 2 with check option;
# simple insert
insert into v1 values(1);
-- error 1365
-- error 1369
insert into v1 values(3);
# simple insert with ignore
insert ignore into v1 values (2),(3),(0);
@ -1327,7 +1327,7 @@ select * from t1;
delete from t1;
# INSERT SELECT test
insert into v1 SELECT 1;
-- error 1365
-- error 1369
insert into v1 SELECT 3;
# prepare data for next check
create table t2 (a int);
@ -1337,7 +1337,7 @@ insert ignore into v1 SELECT a from t2;
select * from t1;
#simple UPDATE test
update v1 set a=-1 where a=0;
-- error 1365
-- error 1369
update v1 set a=2 where a=1;
select * from t1;
# prepare data for next check
@ -1364,12 +1364,12 @@ create view v2 as select * from v1 where a > 0 with local check option;
create view v3 as select * from v1 where a > 0 with cascaded check option;
insert into v2 values (1);
insert into v3 values (1);
-- error 1365
-- error 1369
insert into v2 values (0);
-- error 1365
-- error 1369
insert into v3 values (0);
insert into v2 values (2);
-- error 1365
-- error 1369
insert into v3 values (2);
select * from t1;
drop view v3,v2,v1;
@ -1381,7 +1381,7 @@ drop table t1;
create table t1 (a int, primary key (a));
create view v1 as select * from t1 where a < 2 with check option;
insert into v1 values (1) on duplicate key update a=2;
-- error 1365
-- error 1369
insert into v1 values (1) on duplicate key update a=2;
insert ignore into v1 values (1) on duplicate key update a=2;
select * from t1;