List:Commits« Previous MessageNext Message »
From:tomas Date:October 14 2007 12:27pm
Subject:bk commit into 5.1 tree (tomas:1.2643)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-14 14:27:38+02:00, tomas@stripped +1 -0
  WL#4080
  - correction of result file, adopting to changes in common test file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result@stripped, 2007-10-14 14:27:35+02:00, tomas@stripped +165 -147
    WL#4080
    - correction of result file, adopting to changes in common test file

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result	2007-10-08 22:02:58 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result	2007-10-14 14:27:35 +02:00
@@ -6,15 +6,15 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 **** Test 1 ****
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X)");
-create table t1 (a int key, b varchar(32), X int unsigned) engine ndb;
-create table t2 (a int key, b varchar(32), c int unsigned) engine ndb;
+create table t1 (a int, b varchar(32), X int unsigned, d varchar(9), primary key (a, d)) engine ndb;
+create table t2 (a int key, b varchar(32), c int unsigned, d varchar(9)) engine ndb;
 begin;
-insert into t1 values (1, "Master t1 a=1 at X=10", 10);
-insert into t1 values (2, "Master t1 a=2 at X=10", 10);
-insert into t1 values (3, "Master t1 a=3 at X=10", 10);
-insert into t2 values (1, "Master t2 a=1 at c=10", 10);
-insert into t2 values (2, "Master t2 a=2 at c=10", 10);
-insert into t2 values (3, "Master t2 a=3 at c=10", 10);
+insert into t1 values (1, "Master t1 a=1 at X=10", 10, '111');
+insert into t1 values (2, "Master t1 a=2 at X=10", 10, '111222');
+insert into t1 values (3, "Master t1 a=3 at X=10", 10, '111222333');
+insert into t2 values (1, "Master t2 a=1 at c=10", 10, '111');
+insert into t2 values (2, "Master t2 a=2 at c=10", 10, '111222');
+insert into t2 values (3, "Master t2 a=3 at c=10", 10, '111222333');
 commit;
 SELECT VARIABLE_VALUE-@init_ndb_conflict_fn_max FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE "NDB_CONFLICT_FN_MAX";
 VARIABLE_VALUE-@init_ndb_conflict_fn_max
@@ -23,29 +23,31 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=10	10
-2	Master t1 a=2 at X=10	10
-3	Master t1 a=3 at X=10	10
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=10	10
-2	Master t2 a=2 at c=10	10
-3	Master t2 a=3 at c=10	10
-begin;
-update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1;
-update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2;
-update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=10	10	111
+2	Master t1 a=2 at X=10	10	111222
+3	Master t1 a=3 at X=10	10	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=10	10	111
+2	Master t2 a=2 at c=10	10	111222
+3	Master t2 a=3 at c=10	10	111222333
+begin;
+update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1 and d='111';
+update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2 and d='111222';
+update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3 and d='111222333';
 update t2 set b="Slave t2 a=1 at c=12", c=12 where a=1;
 update t2 set b="Slave t2 a=2 at c=12", c=12 where a=2;
 update t2 set b="Slave t2 a=3 at c=12", c=12 where a=3;
 commit;
 begin;
-update t1 set b="Master t1 a=1 at X=11", X=11 where a=1;
-update t1 set b="Master t1 a=2 at X=11", X=11 where a=2;
-update t1 set b="Master t1 a=3 at X=11", X=11 where a=3;
+update t1 set b="Master t1 a=1 at X=11", X=11 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=11", X=11 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=11", X=11 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=11", c=11 where a=1;
 update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
 update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
@@ -57,21 +59,23 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Slave t1 a=1 at X=12	12
-2	Slave t1 a=2 at X=12	12
-3	Slave t1 a=3 at X=12	12
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=11	11
-2	Master t2 a=2 at c=11	11
-3	Master t2 a=3 at c=11	11
-begin;
-update t1 set b="Master t1 a=1 at X=13", X=13 where a=1;
-update t1 set b="Master t1 a=2 at X=13", X=13 where a=2;
-update t1 set b="Master t1 a=3 at X=13", X=13 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Slave t1 a=1 at X=12	12	111
+2	Slave t1 a=2 at X=12	12	111222
+3	Slave t1 a=3 at X=12	12	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=11	11	111
+2	Master t2 a=2 at c=11	11	111222
+3	Master t2 a=3 at c=11	11	111222333
+begin;
+update t1 set b="Master t1 a=1 at X=13", X=13 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=13", X=13 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=13", X=13 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=13", c=13 where a=1;
 update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
 update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
@@ -83,30 +87,32 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=13	13
-2	Master t1 a=2 at X=13	13
-3	Master t1 a=3 at X=13	13
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=13	13
-2	Master t2 a=2 at c=13	13
-3	Master t2 a=3 at c=13	13
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=13	13	111
+2	Master t1 a=2 at X=13	13	111222
+3	Master t1 a=3 at X=13	13	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=13	13	111
+2	Master t2 a=2 at c=13	13	111222
+3	Master t2 a=3 at c=13	13	111222333
 drop table t1, t2;
 **** Test 2 ****
 set global ndb_log_update_as_write=1;
 update mysql.ndb_replication set binlog_type=4;
-create table t1 (a int key, b varchar(32), X bigint unsigned) engine ndb;
-create table t2 (a int key, b varchar(32), c int unsigned) engine ndb;
+create table t1 (a int, b varchar(32), X bigint unsigned, d varchar(9), primary key (a, d)) engine ndb;
+create table t2 (a int key, b varchar(32), c int unsigned, d varchar(9)) engine ndb;
 begin;
-insert into t1 values (1, "Master t1 a=1 at X=10", 10);
-insert into t1 values (2, "Master t1 a=2 at X=10", 10);
-insert into t1 values (3, "Master t1 a=3 at X=10", 10);
-insert into t2 values (1, "Master t2 a=1 at c=10", 10);
-insert into t2 values (2, "Master t2 a=2 at c=10", 10);
-insert into t2 values (3, "Master t2 a=3 at c=10", 10);
+insert into t1 values (1, "Master t1 a=1 at X=10", 10, '111');
+insert into t1 values (2, "Master t1 a=2 at X=10", 10, '111222');
+insert into t1 values (3, "Master t1 a=3 at X=10", 10, '111222333');
+insert into t2 values (1, "Master t2 a=1 at c=10", 10, '111');
+insert into t2 values (2, "Master t2 a=2 at c=10", 10, '111222');
+insert into t2 values (3, "Master t2 a=3 at c=10", 10, '111222333');
 commit;
 SELECT VARIABLE_VALUE-@init_ndb_conflict_fn_max FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE "NDB_CONFLICT_FN_MAX";
 VARIABLE_VALUE-@init_ndb_conflict_fn_max
@@ -115,29 +121,31 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=10	10
-2	Master t1 a=2 at X=10	10
-3	Master t1 a=3 at X=10	10
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=10	10
-2	Master t2 a=2 at c=10	10
-3	Master t2 a=3 at c=10	10
-begin;
-update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1;
-update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2;
-update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=10	10	111
+2	Master t1 a=2 at X=10	10	111222
+3	Master t1 a=3 at X=10	10	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=10	10	111
+2	Master t2 a=2 at c=10	10	111222
+3	Master t2 a=3 at c=10	10	111222333
+begin;
+update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1 and d='111';
+update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2 and d='111222';
+update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3 and d='111222333';
 update t2 set b="Slave t2 a=1 at c=12", c=12 where a=1;
 update t2 set b="Slave t2 a=2 at c=12", c=12 where a=2;
 update t2 set b="Slave t2 a=3 at c=12", c=12 where a=3;
 commit;
 begin;
-update t1 set b="Master t1 a=1 at X=11", X=11 where a=1;
-update t1 set b="Master t1 a=2 at X=11", X=11 where a=2;
-update t1 set b="Master t1 a=3 at X=11", X=11 where a=3;
+update t1 set b="Master t1 a=1 at X=11", X=11 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=11", X=11 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=11", X=11 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=11", c=11 where a=1;
 update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
 update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
@@ -149,21 +157,23 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Slave t1 a=1 at X=12	12
-2	Slave t1 a=2 at X=12	12
-3	Slave t1 a=3 at X=12	12
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=11	11
-2	Master t2 a=2 at c=11	11
-3	Master t2 a=3 at c=11	11
-begin;
-update t1 set b="Master t1 a=1 at X=13", X=13 where a=1;
-update t1 set b="Master t1 a=2 at X=13", X=13 where a=2;
-update t1 set b="Master t1 a=3 at X=13", X=13 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Slave t1 a=1 at X=12	12	111
+2	Slave t1 a=2 at X=12	12	111222
+3	Slave t1 a=3 at X=12	12	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=11	11	111
+2	Master t2 a=2 at c=11	11	111222
+3	Master t2 a=3 at c=11	11	111222333
+begin;
+update t1 set b="Master t1 a=1 at X=13", X=13 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=13", X=13 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=13", X=13 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=13", c=13 where a=1;
 update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
 update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
@@ -175,30 +185,32 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=13	13
-2	Master t1 a=2 at X=13	13
-3	Master t1 a=3 at X=13	13
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=13	13
-2	Master t2 a=2 at c=13	13
-3	Master t2 a=3 at c=13	13
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=13	13	111
+2	Master t1 a=2 at X=13	13	111222
+3	Master t1 a=3 at X=13	13	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=13	13	111
+2	Master t2 a=2 at c=13	13	111222
+3	Master t2 a=3 at c=13	13	111222333
 drop table t1, t2;
 **** Test 3 ****
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=2;
-create table t1 (a int key, b varchar(32), X int unsigned) engine ndb;
-create table t2 (a int key, b varchar(32), c int unsigned) engine ndb;
+create table t1 (a int, b varchar(32), X int unsigned, d varchar(9), primary key (a, d)) engine ndb;
+create table t2 (a int key, b varchar(32), c int unsigned, d varchar(9)) engine ndb;
 begin;
-insert into t1 values (1, "Master t1 a=1 at X=10", 10);
-insert into t1 values (2, "Master t1 a=2 at X=10", 10);
-insert into t1 values (3, "Master t1 a=3 at X=10", 10);
-insert into t2 values (1, "Master t2 a=1 at c=10", 10);
-insert into t2 values (2, "Master t2 a=2 at c=10", 10);
-insert into t2 values (3, "Master t2 a=3 at c=10", 10);
+insert into t1 values (1, "Master t1 a=1 at X=10", 10, '111');
+insert into t1 values (2, "Master t1 a=2 at X=10", 10, '111222');
+insert into t1 values (3, "Master t1 a=3 at X=10", 10, '111222333');
+insert into t2 values (1, "Master t2 a=1 at c=10", 10, '111');
+insert into t2 values (2, "Master t2 a=2 at c=10", 10, '111222');
+insert into t2 values (3, "Master t2 a=3 at c=10", 10, '111222333');
 commit;
 SELECT VARIABLE_VALUE-@init_ndb_conflict_fn_max FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME LIKE "NDB_CONFLICT_FN_MAX";
 VARIABLE_VALUE-@init_ndb_conflict_fn_max
@@ -207,29 +219,31 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=10	10
-2	Master t1 a=2 at X=10	10
-3	Master t1 a=3 at X=10	10
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=10	10
-2	Master t2 a=2 at c=10	10
-3	Master t2 a=3 at c=10	10
-begin;
-update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1;
-update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2;
-update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=10	10	111
+2	Master t1 a=2 at X=10	10	111222
+3	Master t1 a=3 at X=10	10	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=10	10	111
+2	Master t2 a=2 at c=10	10	111222
+3	Master t2 a=3 at c=10	10	111222333
+begin;
+update t1 set b="Slave t1 a=1 at X=12", X=12 where a=1 and d='111';
+update t1 set b="Slave t1 a=2 at X=12", X=12 where a=2 and d='111222';
+update t1 set b="Slave t1 a=3 at X=12", X=12 where a=3 and d='111222333';
 update t2 set b="Slave t2 a=1 at c=12", c=12 where a=1;
 update t2 set b="Slave t2 a=2 at c=12", c=12 where a=2;
 update t2 set b="Slave t2 a=3 at c=12", c=12 where a=3;
 commit;
 begin;
-update t1 set b="Master t1 a=1 at X=11", X=11 where a=1;
-update t1 set b="Master t1 a=2 at X=11", X=11 where a=2;
-update t1 set b="Master t1 a=3 at X=11", X=11 where a=3;
+update t1 set b="Master t1 a=1 at X=11", X=11 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=11", X=11 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=11", X=11 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=11", c=11 where a=1;
 update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
 update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
@@ -241,21 +255,23 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=11	11
-2	Master t1 a=2 at X=11	11
-3	Master t1 a=3 at X=11	11
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=11	11
-2	Master t2 a=2 at c=11	11
-3	Master t2 a=3 at c=11	11
-begin;
-update t1 set b="Master t1 a=1 at X=13", X=13 where a=1;
-update t1 set b="Master t1 a=2 at X=13", X=13 where a=2;
-update t1 set b="Master t1 a=3 at X=13", X=13 where a=3;
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=11	11	111
+2	Master t1 a=2 at X=11	11	111222
+3	Master t1 a=3 at X=11	11	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=11	11	111
+2	Master t2 a=2 at c=11	11	111222
+3	Master t2 a=3 at c=11	11	111222333
+begin;
+update t1 set b="Master t1 a=1 at X=13", X=13 where a=1 and d='111';
+update t1 set b="Master t1 a=2 at X=13", X=13 where a=2 and d='111222';
+update t1 set b="Master t1 a=3 at X=13", X=13 where a=3 and d='111222333';
 update t2 set b="Master t2 a=1 at c=13", c=13 where a=1;
 update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
 update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
@@ -267,15 +283,17 @@ SELECT VARIABLE_VALUE-@init_ndb_conflict
 VARIABLE_VALUE-@init_ndb_conflict_fn_old
 0
 SELECT * FROM `t1$EX` ORDER BY server_id, master_server_id, master_epoch, count;
+SELECT * FROM `t1$EX` ORDER BY a, d;
 SELECT * FROM `t2$EX` ORDER BY server_id, master_server_id, master_epoch, count;
-select * from t1 order by a;
-a	b	X
-1	Master t1 a=1 at X=13	13
-2	Master t1 a=2 at X=13	13
-3	Master t1 a=3 at X=13	13
-select * from t2 order by a;
-a	b	c
-1	Master t2 a=1 at c=13	13
-2	Master t2 a=2 at c=13	13
-3	Master t2 a=3 at c=13	13
+SELECT * FROM `t2$EX` ORDER BY a, d;
+select * from t1 order by a, d;
+a	b	X	d
+1	Master t1 a=1 at X=13	13	111
+2	Master t1 a=2 at X=13	13	111222
+3	Master t1 a=3 at X=13	13	111222333
+select * from t2 order by a, d;
+a	b	c	d
+1	Master t2 a=1 at c=13	13	111
+2	Master t2 a=2 at c=13	13	111222
+3	Master t2 a=3 at c=13	13	111222333
 drop table t1, t2;
Thread
bk commit into 5.1 tree (tomas:1.2643)tomas14 Oct