Commit 8e12b66b authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
parents 477e0b13 3e2dfa97

mysql-test/r/federated.result

+16 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,22 @@ fld_cid fld_name fld_parentid fld_delt 
5	Torkel	0	0

DROP TABLE federated.t1;

DROP TABLE federated.bug_17377_table;

create table t1 (id int not null auto_increment primary key, val int);

create table t1

(id int not null auto_increment primary key, val int) engine=federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';

insert into t1 values (1,0),(2,0);

update t1 set val = NULL where id = 1;

select * from t1;

id	val

1	NULL

2	0

select * from t1;

id	val

1	NULL

2	0

drop table t1;

drop table t1;

drop table if exists federated.t1;

create table federated.t1 (a int, b int, c int);

drop table if exists federated.t1;

mysql-test/t/federated.test

+20 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,25 @@ drop table federated.t1, federated.t2; 
connection master;

--enable_parsing



#

# Bug #16494: Updates that set a column to NULL fail sometimes

#

connection slave;

create table t1 (id int not null auto_increment primary key, val int);

connection master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table t1

  (id int not null auto_increment primary key, val int) engine=federated

  connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t1';

insert into t1 values (1,0),(2,0);

update t1 set val = NULL where id = 1;

select * from t1;

connection slave;

select * from t1;

drop table t1;

connection master;

drop table t1;



# 

# Additional test for bug#18437 "Wrong values inserted with a before

# update trigger on NDB table". SQL-layer didn't properly inform
@@ -1377,6 +1396,7 @@ connection master; 
# for ON INSERT triggers only. Tests for other types of triggers reside

# in ndb_trigger.test.

#

connection slave;

--disable_warnings

drop table if exists federated.t1;

--enable_warnings

netware/BUILD/mwasmnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwasmnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwasmnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwccnlm

+4 −1
Original line number Diff line number Diff line
@@ -7,4 +7,7 @@ set -e 
# convert it to "-I../include"

args=" "`echo $* | sed -e 's/-I.\/../-I../g'`



wine --debugmsg -all -- mwccnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwccnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwldnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwldnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwldnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'