diff options
| author | unknown <kostja@bodhi.local> | 2006-07-08 21:45:02 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-08 21:45:02 +0400 |
| commit | cad24c097ebc348c1dcb1dd888a0fb89a3844cde (patch) | |
| tree | b6199047edbf5520736ded4cb1c19af19d49a477 /mysql-test/r/federated.result | |
| parent | e1f3149c1685a9e186d67bc2f8024570ab1edb48 (diff) | |
| parent | e6f010b63eb9d846810bff75352fa9aa5424426f (diff) | |
| download | mariadb-git-cad24c097ebc348c1dcb1dd888a0fb89a3844cde.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
myisam/mi_create.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/federated.result:
Manual merge.
mysql-test/t/federated.test:
Manual merge.
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 89db2834fe6..709e44579e2 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/r/federated.result @@ -1717,6 +1717,22 @@ a b c 5 6 30 drop tables federated.t1, federated.t2; drop table federated.t1; +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; DROP DATABASE IF EXISTS federated; DROP TABLE IF EXISTS federated.t1; |