List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:January 28 2011 11:01am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:4147 to 4151)
View as plain text  
 4151 Jonas Oreland	2011-01-28
      ndb - replace_columns in ndb_dd_alter

    modified:
      mysql-test/suite/ndb/t/ndb_dd_alter.test
 4150 Jonas Oreland	2011-01-28
      ndb - replace_columns in ndb_dd_backuprestore

    modified:
      mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test
 4149 Jonas Oreland	2011-01-28
      ndb - try to make ndb_dd_basic deterministic

    modified:
      mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/t/ndb_dd_basic.test
 4148 Jonas Oreland	2011-01-28
      ndb - fix compile warning

    modified:
      sql/ha_ndbcluster.cc
 4147 Maitrayi Sabaratnam	2011-01-27 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_dd_basic.result
      mysql-test/suite/ndb/r/ndb_partition_range.result
      mysql-test/suite/ndb/t/ndb_dd_basic.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result	2011-01-27 17:57:43 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result	2011-01-28 10:48:23 +0000
@@ -167,12 +167,20 @@ INSERT INTO t1 VALUES 
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 501
-select  TABLE_NAME, PARTITION_NAME, TABLE_ROWS, DATA_LENGTH, MAX_DATA_LENGTH, DATA_FREE from INFORMATION_SCHEMA.partitions where table_name='t1';
-TABLE_NAME	PARTITION_NAME	TABLE_ROWS	DATA_LENGTH	MAX_DATA_LENGTH	DATA_FREE
-t1	p0	259	32768	1048576	1039300
-t1	p1	242	32768	1048576	1039640
-select  TABLE_NAME, TABLE_ROWS, DATA_LENGTH, MAX_DATA_LENGTH, DATA_FREE from INFORMATION_SCHEMA.tables where table_name='t1';
-TABLE_NAME	TABLE_ROWS	DATA_LENGTH	MAX_DATA_LENGTH	DATA_FREE
+SELECT table_name, 
+SUM(table_rows),
+SUM(data_length),
+MAX(max_data_length),
+SUM(data_free)
+FROM INFORMATION_SCHEMA.partitions
+WHERE table_name='t1'
+GROUP BY table_name;
+table_name	SUM(table_rows)	SUM(data_length)	MAX(max_data_length)	SUM(data_free)
+t1	501	65536	1048576	2078940
+SELECT table_name, table_rows, data_length, max_data_length, data_free
+FROM information_schema.tables
+WHERE table_name='t1';
+table_name	table_rows	data_length	max_data_length	data_free
 t1	501	65536	2097152	2078940
 CREATE LOGFILE GROUP lg2
 ADD UNDOFILE 'x.dat'

=== modified file 'mysql-test/suite/ndb/t/ndb_dd_alter.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_alter.test	2010-11-30 10:35:37 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_alter.test	2011-01-28 11:00:16 +0000
@@ -161,10 +161,12 @@ enable_query_log;
 
 SELECT * FROM test.t1 ORDER BY a1;
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
 
 ALTER TABLE test.t1 ADD a2 FLOAT, ADD a3 DOUBLE;
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't1' AND partition_name = 'p0';
 
 let $1=20;

=== modified file 'mysql-test/suite/ndb/t/ndb_dd_basic.test'
--- a/mysql-test/suite/ndb/t/ndb_dd_basic.test	2011-01-27 17:57:43 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dd_basic.test	2011-01-28 10:48:23 +0000
@@ -203,9 +203,18 @@ SELECT COUNT(*) FROM t1;
 # WL#5568: Check disk space usage.
 ########################################
 
-select  TABLE_NAME, PARTITION_NAME, TABLE_ROWS, DATA_LENGTH, MAX_DATA_LENGTH, DATA_FREE from INFORMATION_SCHEMA.partitions where table_name='t1';
-
-select  TABLE_NAME, TABLE_ROWS, DATA_LENGTH, MAX_DATA_LENGTH, DATA_FREE from INFORMATION_SCHEMA.tables where table_name='t1';
+SELECT table_name, 
+       SUM(table_rows),
+       SUM(data_length),
+       MAX(max_data_length),
+       SUM(data_free)
+FROM INFORMATION_SCHEMA.partitions
+WHERE table_name='t1'
+GROUP BY table_name;
+
+SELECT table_name, table_rows, data_length, max_data_length, data_free
+FROM information_schema.tables
+WHERE table_name='t1';
 
 ####################################
 # Test error cases with size numbers

=== modified file 'mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test'
--- a/mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test	2008-12-22 16:27:38 +0000
+++ b/mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test	2011-01-28 10:55:54 +0000
@@ -288,16 +288,22 @@ SHOW CREATE TABLE test.t5;
 
 SHOW CREATE TABLE test.t6;
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't1'; 
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't2'; 
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't3'; 
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't4'; 
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't5'; 
 
+--replace_column 13 0 14 0 15 0 16 NULL 18 0
 SELECT * FROM information_schema.partitions WHERE table_name= 't6'; 
 
 SELECT COUNT(*) FROM test.t1; 

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-01-27 17:57:43 +0000
+++ b/sql/ha_ndbcluster.cc	2011-01-28 10:47:59 +0000
@@ -11758,7 +11758,7 @@ ndb_get_table_statistics(THD *thd, ha_nd
     
     while ((check= pOp->nextResult(&dummyRowPtr, TRUE, TRUE)) == 0)
     {
-      DBUG_PRINT("info", ("nextResult rows: %d  commits: %d",
+      DBUG_PRINT("info", ("nextResult rows: %d  commits: %d"
                           "fixed_mem_size %d var_mem_size %d "
                           "fragmentid %d extent_space %d free_extent_space %d",
                           (int)rows, (int)commits, (int)fixed_mem,

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:4147 to 4151) Jonas Oreland28 Jan