List:Commits« Previous MessageNext Message »
From:Ole John Aske Date:April 5 2011 8:50am
Subject:bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4277 to 4278) WL#5568
View as plain text  
 4278 Ole John Aske	2011-04-05
      Updated MTR-resultfile for '--suite=parts' where results has changed as 
      result of wl#5568: 'Extend Ndb-statistics with disk space usage.'

    modified:
      mysql-test/suite/parts/r/ndb_dd_backuprestore.result
 4277 Ole John Aske	2011-04-05
      Updated resultfiles for '--suite=parts' after push of fix for Bug 11764737
      ('OPTIMIZER IS OVERLY EAGER TO REQUEST ORDERED ACCESS')
            
      As results are not any longer implicitly ordered even when 'ORDER BY' 
      is *not* specified the order of rows in these results has changes.
            
      The rows are now ordered in their 'natural' order as determined
      by each storage engine. (Still when 'ORDER BY' is not specifyed)

    modified:
      mysql-test/suite/parts/r/partition_char_innodb.result
      mysql-test/suite/parts/r/partition_char_myisam.result
      mysql-test/suite/parts/r/partition_datetime_innodb.result
      mysql-test/suite/parts/r/partition_datetime_myisam.result
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result
      mysql-test/suite/parts/r/partition_decimal_innodb.result
      mysql-test/suite/parts/r/partition_decimal_myisam.result
      mysql-test/suite/parts/r/partition_float_innodb.result
      mysql-test/suite/parts/r/partition_float_myisam.result
      mysql-test/suite/parts/r/partition_recover_myisam.result
      mysql-test/suite/parts/r/partition_repair_myisam.result
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/r/partition_special_myisam.result
=== modified file 'mysql-test/suite/parts/r/ndb_dd_backuprestore.result'
--- a/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2009-10-26 14:07:51 +0000
+++ b/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2011-04-05 08:50:02 +0000
@@ -402,30 +402,30 @@ t6	CREATE TABLE `t6` (
  PARTITION x2 VALUES LESS THAN (720) ENGINE = ndbcluster) */
 SELECT * FROM information_schema.partitions WHERE table_name= 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
-NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
-NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
-NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	125	44	32768	1048576	0	1021944	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	1048576	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	125	44	32768	1048576	0	1021944	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	1048576	0	0	NULL	NULL	NULL	NULL		default	table_space1
 SELECT * FROM information_schema.partitions WHERE table_name= 't2';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
-NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	126	40	65536	1048576	0	1042464	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	124	40	65536	1048576	0	1042496	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't3';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
-NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
-NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	53	44	32768	1048576	0	1030260	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	114	44	32768	1048576	0	1016840	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	83	44	32768	1048576	0	1023660	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't4';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	250	40	65536	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 NULL	test	t4	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't5';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
-NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	133	36	65536	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	117	36	65536	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't6';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	250	40	65536	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 NULL	test	t6	x2	NULL	2	NULL	RANGE	NULL	pk1	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4277 to 4278) WL#5568Ole John Aske5 Apr