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

Merge host.loc:/home/uchum/work/5.1-opt-33699

Browse Source 
into  host.loc:/home/uchum/work/5.1-opt


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  Merge with local tree (bug#33699).
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  Merge with local tree (bug#33699).
This commit is contained in:
unknown 2008-01-11 21:39:45 +04:00
commit d52a1a144b
18 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
View File

@ -419,7 +419,7 @@ connection master;
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
--echo --echo
--echo ** Delete from Master ** --echo ** Delete from Master **

1
mysql-test/include/ps_modify.inc
View File

@ -108,6 +108,7 @@ execute stmt1 using @arg00, @arg01;
select a,b from t1 where a=@arg00; select a,b from t1 where a=@arg00;
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
--error 1048
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
select a,b from t1 order by a; select a,b from t1 order by a;
set @arg00=0; set @arg00=0;

12
mysql-test/r/auto_increment.result
View File

@ -231,8 +231,7 @@ a b
204 7 204 7
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=NULL where b=6; update t1 set a=NULL where b=6;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
update t1 set a=300 where b=7; update t1 set a=300 where b=7;
SET SQL_MODE=''; SET SQL_MODE='';
insert into t1(a,b)values(NULL,8); insert into t1(a,b)values(NULL,8);
@ -247,7 +246,7 @@ a b
1 1 1 1
200 2 200 2
201 4 201 4
0 6 203 6
300 7 300 7
301 8 301 8
400 9 400 9
@ -263,6 +262,7 @@ a b
1 1 1 1
200 2 200 2
201 4 201 4
203 6
300 7 300 7
301 8 301 8
400 9 400 9
@ -273,20 +273,20 @@ a b
405 14 405 14
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=NULL where b=13; update t1 set a=NULL where b=13;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
update t1 set a=500 where b=14; update t1 set a=500 where b=14;
select * from t1 order by b; select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
201 4 201 4
203 6
300 7 300 7
301 8 301 8
400 9 400 9
401 10 401 10
402 11 402 11
0 13 404 13
500 14 500 14
drop table t1; drop table t1;
create table t1 (a bigint); create table t1 (a bigint);

8
mysql-test/r/null.result
View File

@ -93,11 +93,9 @@ INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55";
Warnings: Warnings:
Warning 1265 Data truncated for column 'd' at row 1 Warning 1265 Data truncated for column 'd' at row 1
UPDATE t1 SET d=1/NULL; UPDATE t1 SET d=1/NULL;
Warnings: ERROR 23000: Column 'd' cannot be null
Warning 1265 Data truncated for column 'd' at row 1
UPDATE t1 SET d=NULL; UPDATE t1 SET d=NULL;
Warnings: ERROR 23000: Column 'd' cannot be null
Warning 1048 Column 'd' cannot be null
INSERT INTO t1 (a) values (null); INSERT INTO t1 (a) values (null);
ERROR 23000: Column 'a' cannot be null ERROR 23000: Column 'a' cannot be null
INSERT INTO t1 (a) values (1/null); INSERT INTO t1 (a) values (1/null);
@ -132,7 +130,7 @@ Warning 1048 Column 'd' cannot be null
Warning 1048 Column 'd' cannot be null Warning 1048 Column 'd' cannot be null
select * from t1; select * from t1;
a b c d a b c d
0 0000-00-00 00:00:00 0 0 0000-00-00 00:00:00 2003
0 0000-00-00 00:00:00 0 0 0000-00-00 00:00:00 0
0 0000-00-00 00:00:00 0 0 0000-00-00 00:00:00 0
0 0000-00-00 00:00:00 0 0 0000-00-00 00:00:00 0

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

@ -1303,12 +1303,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;

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

@ -1286,12 +1286,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;

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

@ -1287,12 +1287,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;

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

@ -1329,12 +1329,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;
@ -4351,12 +4350,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;

3
mysql-test/r/warnings.result
View File

@ -98,8 +98,7 @@ Warning 1265 Data truncated for column 'c' at row 1
Warning 1265 Data truncated for column 'c' at row 2 Warning 1265 Data truncated for column 'c' at row 2
alter table t1 add d char(2); alter table t1 add d char(2);
update t1 set a=NULL where a=10; update t1 set a=NULL where a=10;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
update t1 set c='mysql ab' where c='test'; update t1 set c='mysql ab' where c='test';
Warnings: Warnings:
Warning 1265 Data truncated for column 'c' at row 4 Warning 1265 Data truncated for column 'c' at row 4

5
mysql-test/suite/ndb/r/ps_7ndb.result
View File

@ -1286,12 +1286,11 @@ a b
set @arg00=NULL; set @arg00=NULL;
set @arg01=2; set @arg01=2;
execute stmt1 using @arg00, @arg01; execute stmt1 using @arg00, @arg01;
Warnings: ERROR 23000: Column 'a' cannot be null
Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a; select a,b from t1 order by a;
a b a b
0 two
1 one 1 one
2 two
3 three 3 three
4 four 4 four
set @arg00=0; set @arg00=0;

12
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
View File

@ -454,9 +454,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **
@ -1595,9 +1593,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **
@ -2736,9 +2732,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **

12
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
View File

@ -454,9 +454,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **
@ -1595,9 +1593,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **
@ -2736,9 +2732,7 @@ f1 f2 f3 f4
update t31 set f5=555555555555555 where f3=6; update t31 set f5=555555555555555 where f3=6;
update t31 set f2=2 where f3=2; update t31 set f2=2 where f3=2;
update t31 set f1=NULL where f3=1; update t31 set f1=NULL where f3=1;
update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3; update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
Warnings:
Warning 1048 Column 'f3' cannot be null
** Delete from Master ** ** Delete from Master **

2
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
View File

@ -49,7 +49,7 @@ kill @id;
drop table t2,t3; drop table t2,t3;
insert into t4 values (3),(4); insert into t4 values (3),(4);
connection master; connection master;
--error 0,1053,2013 --error 0,1053,2013,1048
reap; reap;
connection master1; connection master1;
save_master_pos; save_master_pos;

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

@ -149,6 +149,7 @@ delete from t1 where a=0;
update t1 set a=0 where b=5; update t1 set a=0 where b=5;
select * from t1 order by b; select * from t1 order by b;
delete from t1 where a=0; delete from t1 where a=0;
--error 1048
update t1 set a=NULL where b=6; update t1 set a=NULL where b=6;
update t1 set a=300 where b=7; update t1 set a=300 where b=7;
SET SQL_MODE=''; SET SQL_MODE='';
@ -164,6 +165,7 @@ delete from t1 where a=0;
update t1 set a=0 where b=12; update t1 set a=0 where b=12;
select * from t1 order by b; select * from t1 order by b;
delete from t1 where a=0; delete from t1 where a=0;
--error 1048
update t1 set a=NULL where b=13; update t1 set a=NULL where b=13;
update t1 set a=500 where b=14; update t1 set a=500 where b=14;
select * from t1 order by b; select * from t1 order by b;

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

@ -61,7 +61,9 @@ drop table t1;
# #
CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default 0, c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0); CREATE TABLE t1 (a varchar(16) NOT NULL default '', b smallint(6) NOT NULL default 0, c datetime NOT NULL default '0000-00-00 00:00:00', d smallint(6) NOT NULL default 0);
INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55"; INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55";
--error 1048
UPDATE t1 SET d=1/NULL; UPDATE t1 SET d=1/NULL;
--error 1048
UPDATE t1 SET d=NULL; UPDATE t1 SET d=NULL;
--error 1048 --error 1048
INSERT INTO t1 (a) values (null); INSERT INTO t1 (a) values (null);

1
mysql-test/t/warnings.test
View File

@ -65,6 +65,7 @@ create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5));
insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test'); insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test');
alter table t1 modify c char(4); alter table t1 modify c char(4);
alter table t1 add d char(2); alter table t1 add d char(2);
--error 1048
update t1 set a=NULL where a=10; update t1 set a=NULL where a=10;
update t1 set c='mysql ab' where c='test'; update t1 set c='mysql ab' where c='test';
update t1 set d=c; update t1 set d=c;

4
sql/sql_update.cc
View File

@ -526,7 +526,9 @@ int mysql_update(THD *thd,
init_read_record(&info,thd,table,select,0,1); init_read_record(&info,thd,table,select,0,1);
updated= found= 0; updated= found= 0;
thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */ /* Generate an error when trying to set a NOT NULL field to NULL. */
thd->count_cuted_fields= ignore ? CHECK_FIELD_WARN
: CHECK_FIELD_ERROR_FOR_NULL;
thd->cuted_fields=0L; thd->cuted_fields=0L;
thd->proc_info="Updating"; thd->proc_info="Updating";

2
tests/mysql_client_test.c
View File

@ -15674,7 +15674,7 @@ static void test_mysql_insert_id()
myquery(rc); myquery(rc);
res= mysql_insert_id(mysql); res= mysql_insert_id(mysql);
DIE_UNLESS(res == 0); DIE_UNLESS(res == 0);
rc= mysql_query(mysql, "update t2 set f1=NULL where f1=14"); rc= mysql_query(mysql, "update t2 set f1=0 where f1=14");
myquery(rc); myquery(rc);
res= mysql_insert_id(mysql); res= mysql_insert_id(mysql);
DIE_UNLESS(res == 0); DIE_UNLESS(res == 0);