Updated PBXT to version 1.0.08 RC2

1 files changed, 62 insertions, 62 deletions

diff --git a/mysql-test/suite/pbxt/r/alter_table.result b/mysql-test/suite/pbxt/r/alter_table.result
index 467bb54a2a9..7f9ad9665fe 100644
--- a/mysql-test/suite/pbxt/r/alter_table.result
+++ b/mysql-test/suite/pbxt/r/alter_table.result
@@ -126,23 +126,23 @@ key (n4, n1, n2, n3) );
 alter table t1 disable keys;
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	n1	1	n1	NULL	0	NULL	NULL		BTREE	
-t1	1	n1_2	1	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n1_2	2	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n1_2	3	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n1_2	4	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	1	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	2	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	3	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	4	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n3	1	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n3	2	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n3	3	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n3	4	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	1	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	2	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n4	3	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	4	n3	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	0	n1	1	n1	A	0	NULL	NULL		BTREE	
+t1	1	n1_2	1	n1	A	0	NULL	NULL		BTREE	
+t1	1	n1_2	2	n2	A	0	NULL	NULL	YES	BTREE	
+t1	1	n1_2	3	n3	A	0	NULL	NULL	YES	BTREE	
+t1	1	n1_2	4	n4	A	0	NULL	NULL	YES	BTREE	
+t1	1	n2	1	n2	A	0	NULL	NULL	YES	BTREE	
+t1	1	n2	2	n3	A	0	NULL	NULL	YES	BTREE	
+t1	1	n2	3	n4	A	0	NULL	NULL	YES	BTREE	
+t1	1	n2	4	n1	A	0	NULL	NULL		BTREE	
+t1	1	n3	1	n3	A	0	NULL	NULL	YES	BTREE	
+t1	1	n3	2	n4	A	0	NULL	NULL	YES	BTREE	
+t1	1	n3	3	n1	A	0	NULL	NULL		BTREE	
+t1	1	n3	4	n2	A	0	NULL	NULL	YES	BTREE	
+t1	1	n4	1	n4	A	0	NULL	NULL	YES	BTREE	
+t1	1	n4	2	n1	A	0	NULL	NULL		BTREE	
+t1	1	n4	3	n2	A	0	NULL	NULL	YES	BTREE	
+t1	1	n4	4	n3	A	0	NULL	NULL	YES	BTREE	
 insert into t1 values(10,RAND()*1000,RAND()*1000,RAND());
 insert into t1 values(9,RAND()*1000,RAND()*1000,RAND());
 insert into t1 values(8,RAND()*1000,RAND()*1000,RAND());
@@ -156,23 +156,23 @@ insert into t1 values(1,RAND()*1000,RAND()*1000,RAND());
 alter table t1 enable keys;
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	n1	1	n1	NULL	10	NULL	NULL		BTREE	
-t1	1	n1_2	1	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n1_2	2	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n1_2	3	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n1_2	4	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	1	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	2	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	3	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n2	4	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n3	1	n3	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n3	2	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n3	3	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n3	4	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	1	n4	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	2	n1	NULL	NULL	NULL	NULL		BTREE	
-t1	1	n4	3	n2	NULL	NULL	NULL	NULL	YES	BTREE	
-t1	1	n4	4	n3	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	0	n1	1	n1	A	10	NULL	NULL		BTREE	
+t1	1	n1_2	1	n1	A	10	NULL	NULL		BTREE	
+t1	1	n1_2	2	n2	A	10	NULL	NULL	YES	BTREE	
+t1	1	n1_2	3	n3	A	10	NULL	NULL	YES	BTREE	
+t1	1	n1_2	4	n4	A	10	NULL	NULL	YES	BTREE	
+t1	1	n2	1	n2	A	10	NULL	NULL	YES	BTREE	
+t1	1	n2	2	n3	A	10	NULL	NULL	YES	BTREE	
+t1	1	n2	3	n4	A	10	NULL	NULL	YES	BTREE	
+t1	1	n2	4	n1	A	10	NULL	NULL		BTREE	
+t1	1	n3	1	n3	A	10	NULL	NULL	YES	BTREE	
+t1	1	n3	2	n4	A	10	NULL	NULL	YES	BTREE	
+t1	1	n3	3	n1	A	10	NULL	NULL		BTREE	
+t1	1	n3	4	n2	A	10	NULL	NULL	YES	BTREE	
+t1	1	n4	1	n4	A	10	NULL	NULL	YES	BTREE	
+t1	1	n4	2	n1	A	10	NULL	NULL		BTREE	
+t1	1	n4	3	n2	A	10	NULL	NULL	YES	BTREE	
+t1	1	n4	4	n3	A	10	NULL	NULL	YES	BTREE	
 drop table t1;
 create table t1 (i int unsigned not null auto_increment primary key);
 alter table t1 rename t2;
@@ -286,17 +286,17 @@ insert into t1 values(1,1), (2,1), (3, 1);
 alter table t1 add unique (a,b), add key (b);
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	0	a	1	a	A	300	NULL	NULL	YES	BTREE	
+t1	0	a	2	b	A	300	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	300	NULL	NULL	YES	BTREE	
 analyze table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
-t1	0	a	2	b	A	NULL	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	0	a	1	a	A	300	NULL	NULL	YES	BTREE	
+t1	0	a	2	b	A	300	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	300	NULL	NULL	YES	BTREE	
 drop table t1;
 CREATE TABLE t1 (i int(10), index(i) );
 ALTER TABLE t1 DISABLE KEYS;
@@ -545,37 +545,37 @@ drop table if exists t1;
 create table t1 (a int, key(a));
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 "this used not to disable the index"
 alter table t1 modify a int, disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 enable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 modify a bigint, disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 enable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 add b char(10), disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 add c decimal(10,2), enable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 "this however did"
 alter table t1 disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 desc t1;
 Field	Type	Null	Key	Default	Extra
 a	bigint(20)	YES	MUL	NULL	
@@ -585,7 +585,7 @@ alter table t1 add d decimal(15,5);
 "The key should still be disabled"
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 drop table t1;
 "Now will test with one unique index"
 create table t1(a int, b char(10), unique(a));
@@ -595,7 +595,7 @@ t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE
 alter table t1 disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	a	1	a	NULL	0	NULL	NULL	YES	BTREE	
+t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
 alter table t1 enable keys;
 "If no copy on noop change, this won't touch the data file"
 "Unique index, no change"
@@ -623,12 +623,12 @@ create table t1(a int, b char(10), unique(a), key(b));
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 alter table t1 disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	a	1	a	NULL	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 alter table t1 enable keys;
 "If no copy on noop change, this won't touch the data file"
 "The non-unique index will be disabled"
@@ -636,31 +636,31 @@ alter table t1 modify a int, disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 alter table t1 enable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	a	1	a	NULL	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	NULL	NULL	NULL	NULL	YES	BTREE	
+t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 "Change the type implying data copy"
 "The non-unique index will be disabled"
 alter table t1 modify a bigint, disable keys;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 "Change again the type, but leave the indexes as_is"
 alter table t1 modify a int;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 "Try the same. When data is no copied on similar tables, this is noop"
 alter table t1 modify a int;
 show indexes from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	a	1	a	A	0	NULL	NULL	YES	BTREE	
-t1	1	b	1	b	A	NULL	NULL	NULL	YES	BTREE	
+t1	1	b	1	b	A	0	NULL	NULL	YES	BTREE	
 drop table t1;
 create database mysqltest;
 create table t1 (c1 int);
@@ -697,11 +697,11 @@ DROP TABLE IF EXISTS bug24219_2;
 CREATE TABLE bug24219 (a INT, INDEX(a));
 SHOW INDEX FROM bug24219;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-bug24219	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+bug24219	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 ALTER TABLE bug24219 RENAME TO bug24219_2, DISABLE KEYS;
 SHOW INDEX FROM bug24219_2;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-bug24219_2	1	a	1	a	A	NULL	NULL	NULL	YES	BTREE	
+bug24219_2	1	a	1	a	A	0	NULL	NULL	YES	BTREE	
 DROP TABLE bug24219_2;
 create table t1 (mycol int(10) not null);
 alter table t1 alter column mycol set default 0;
@@ -882,7 +882,7 @@ int_field	int(10) unsigned	NO	MUL	NULL
 char_field	char(10)	YES		NULL	
 SHOW INDEXES FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	1	int_field	1	int_field	A	NULL	NULL	NULL		BTREE	
+t1	1	int_field	1	int_field	A	0	NULL	NULL		BTREE	
 INSERT INTO t1 VALUES (1, "edno"), (1, "edno"), (2, "dve"), (3, "tri"), (5, "pet");
 "Non-copy data change - new frm, but old data and index files"
 ALTER TABLE t1