diff options
| author | unknown <jimw@mysql.com> | 2006-06-28 12:26:21 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-06-28 12:26:21 -0700 |
| commit | 01d3a61fefdce51ae946b10359b8c1c39b90d8e5 (patch) | |
| tree | e0a56f22164103a72115793083e5997fac5daa1c /mysql-test/r/federated.result | |
| parent | 23474afb8d061e70081f7c221d8b9a7152d1e7f8 (diff) | |
| parent | 12e62a8e89c2c37268e7a0d845fa4029c7dd3e40 (diff) | |
| download | mariadb-git-01d3a61fefdce51ae946b10359b8c1c39b90d8e5.tar.gz | |
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
Diffstat (limited to 'mysql-test/r/federated.result')
| -rw-r--r-- | mysql-test/r/federated.result | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result index 49974615c68..2f81db25088 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/r/federated.result @@ -1689,6 +1689,22 @@ id c1 c2 9 abc ppc drop table federated.t1, federated.t2; drop table federated.t1, federated.t2; +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:9308/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; DROP DATABASE IF EXISTS federated; DROP TABLE IF EXISTS federated.t1; |