summaryrefslogtreecommitdiff
path: root/mysql-test/r/federated.result
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.local>2006-07-27 14:12:41 +0400
committerunknown <kostja@bodhi.local>2006-07-27 14:12:41 +0400
commit5bfa1e67419a3a9b7a2b4c938df00428a3b0f44e (patch)
tree054c500435de65a34ecd43604097bf1944f68465 /mysql-test/r/federated.result
parent5b6016c14e1e3cc3450e67a6bba0827a4099bdbe (diff)
downloadmariadb-git-5bfa1e67419a3a9b7a2b4c938df00428a3b0f44e.tar.gz
Post-merge fixes.
storage/myisam/mi_create.c: Post-merge fixes (Thanks Ingo).
Diffstat (limited to 'mysql-test/r/federated.result')
-rw-r--r--mysql-test/r/federated.result33
1 files changed, 17 insertions, 16 deletions
diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index b7b3af7d60a..4bb279add69 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1603,22 +1603,6 @@ 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;
@@ -1733,6 +1717,23 @@ 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: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;
+End of 5.0 tests
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
DROP TABLE IF EXISTS federated.t1;