Merge bk-internal:/home/bk/mysql-5.0-engines

into  mysql.com:/home/jimw/my/mysql-5.0-16494


sql/ha_federated.cc:
  Auto merged
mysql-test/r/federated.result:
  Resolve conflict
mysql-test/t/federated.test:
  Resolve conflict

1 files changed, 18 insertions, 0 deletions

diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 780008cf13a..4af253dc326 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1361,4 +1361,22 @@ drop table federated.t1, federated.t2;
 connection slave;
 drop table federated.t1, federated.t2;
 
+#
+# 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;
+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;
+
 source include/federated_cleanup.inc;