List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 18 2010 6:25pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3417)
View as plain text  
#At file:///home/msvensson/mysql/tmp/iaR9cGL0cM/7.0/ based on revid:magnus.blaudd@stripped18151033-iua2m7c6saazuogz

 3417 Magnus Blåudd	2010-02-18 [merge]
      Merge 7.0-bug50599 -> 7.0

    modified:
      mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
      mysql-test/suite/ndb/t/show_attributes.inc
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/tools/desc.cpp
=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result	2009-10-23 16:30:54 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result	2010-02-18 12:51:52 +0000
@@ -87,7 +87,7 @@ a6 Time NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Datetime NULL AT=FIXED ST=DISK
 a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
-a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 SELECT * FROM test.t1 ORDER BY a1;
 a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
 1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -187,7 +187,7 @@ a6 Time NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Datetime NULL AT=FIXED ST=DISK
 a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
-a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 SELECT * FROM test.t1 ORDER BY a1;
 a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
 1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data
@@ -274,7 +274,7 @@ a6 Time NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Datetime NULL AT=FIXED ST=DISK
 a9 Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=DISK
-a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 ALTER TABLE test.t1 ENGINE=MyISAM;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
@@ -397,11 +397,11 @@ a6 Bigint NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
-a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2
-a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
+a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 SELECT a1, a2,a3,hex(a4),a5,a6,a7,a8,a9,a10,a11,a12,a13 FROM test.t1 ORDER BY a1;
 a1	a2	a3	hex(a4)	a5	a6	a7	a8	a9	a10	a11	a12	a13
 1	2.2345	20000001	0	1	23457	2006-01-01	07:04:00	1971-05-28 16:55:03	abc	abcdefg	LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL	Text Field
@@ -468,11 +468,11 @@ a6 Bigint NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
-a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2
-a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
+a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 ALTER TABLE test.t1 DROP INDEX a2_i;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
@@ -504,11 +504,11 @@ a6 Bigint NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
-a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2
-a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
+a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 TRUNCATE TABLE test.t1;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
@@ -540,11 +540,11 @@ a6 Bigint NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
-a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2
-a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2
-a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2
+a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
+a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 ALTER TABLE test.t1 DROP a14;
 ALTER TABLE test.t1 DROP a13;
 ALTER TABLE test.t1 DROP a12;

=== modified file 'mysql-test/suite/ndb/r/ndb_dd_restore_compat.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2009-07-13 13:22:46 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_restore_compat.result	2010-02-18 12:51:52 +0000
@@ -36,7 +36,7 @@ a6 Time NULL AT=FIXED ST=DISK
 a7 Date NULL AT=FIXED ST=DISK
 a8 Datetime NULL AT=FIXED ST=DISK
 a9 Varchar(255;latin1_swedish_ci) NULL AT=FIXED ST=DISK
-a10 Blob(256,2000,16) NULL AT=FIXED ST=DISK BV=1
+a10 Blob(256,2000,16) NULL AT=FIXED ST=DISK BV=1 BT=NDB$BLOB_#_#
 select * from t1 order by a1;
 a1	a2	a3	a4	a5	a6	a7	a8	a9	a10
 1	2	2000000001	aaa1	34.2	04:03:02	2006-01-01	1971-05-28 16:55:03	bbbbbbbbbbbbb1	binary data

=== modified file 'mysql-test/suite/ndb/t/show_attributes.inc'
--- a/mysql-test/suite/ndb/t/show_attributes.inc	2009-07-15 20:47:18 +0000
+++ b/mysql-test/suite/ndb/t/show_attributes.inc	2010-02-18 12:51:52 +0000
@@ -14,6 +14,7 @@ eval LOAD DATA INFILE '$dump_file' INTO 
 --remove_file $dump_file
 
 # Query the temporary table
+--replace_regex /BT=NDB\$BLOB_[0-9]+_[0-9]+/BT=NDB$BLOB_#_#/
 SELECT TRIM(TRAILING "\r" FROM a) as 'Attributes:' FROM test.desc
   WHERE a LIKE BINARY "%ST=%";
 

=== modified file 'storage/ndb/src/ndbapi/NdbDictionary.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionary.cpp	2010-02-18 12:14:26 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp	2010-02-18 16:37:48 +0000
@@ -2775,6 +2775,7 @@ operator<<(NdbOut& out, const NdbDiction
   case NdbDictionary::Column::Blob:
   case NdbDictionary::Column::Text:
     out << " BV=" << col.getBlobVersion();
+    out << " BT=" << ((col.getBlobTable() != 0) ? col.getBlobTable()->getName() : "<none>");
     break;
   default:
     break;

=== modified file 'storage/ndb/tools/desc.cpp'
--- a/storage/ndb/tools/desc.cpp	2010-02-18 12:14:26 +0000
+++ b/storage/ndb/tools/desc.cpp	2010-02-18 16:37:48 +0000
@@ -33,6 +33,7 @@ int desc_hashmap(Ndb_cluster_connection 
 static const char* _dbname = "TEST_DB";
 static int _unqualified = 0;
 static int _partinfo = 0;
+static int _blobinfo = 0;
 
 const char *load_default_groups[]= { "mysql_cluster",0 };
 
@@ -53,6 +54,9 @@ static struct my_option my_long_options[
   { "retries", 'r', "Retry every second for # retries",
     (uchar**) &_retries, (uchar**) &_retries, 0,
     GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, 
+  { "blob-info", 'b', "Show information for hidden blob tables (requires -p)",
+    (uchar**) &_blobinfo, (uchar**) &_blobinfo, 0,
+    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -281,7 +285,24 @@ int desc_table(Ndb *myndb, char* name)
   ndbout << endl;
 
   if (_partinfo)
+  {
     print_part_info(myndb, pTab);
+    ndbout << endl;
+    if (_blobinfo)
+    {
+      int noOfAttributes = pTab->getNoOfColumns();
+      for (int i = 0; i < noOfAttributes; i++)
+      {
+        const NdbDictionary::Column* column = pTab->getColumn(i);
+        if ((column->getType() == NdbDictionary::Column::Blob) || 
+          (column->getType() == NdbDictionary::Column::Text))
+        {
+          print_part_info(myndb, (NDBT_Table*) column->getBlobTable());
+          ndbout << endl;
+        }
+      }
+    }
+  }
 	
   return 1;
 }
@@ -309,7 +330,12 @@ void print_part_info(Ndb* pNdb, NDBT_Tab
     { 0, 0, 0 }
   };
 
-  ndbout << "-- Per partition info -- " << endl;
+  ndbout << "-- Per partition info";
+
+  if (_blobinfo && _partinfo)
+    ndbout << " for " << pTab->getName();
+
+  ndbout << " -- " << endl;
   
   const Uint32 codeWords= 1;
   Uint32 codeSpace[ codeWords ];
@@ -380,7 +406,6 @@ void print_part_info(Ndb* pNdb, NDBT_Tab
       printf("\n");
     }
   } while(0);
-  
   pTrans->close();
 }
 
@@ -406,6 +431,5 @@ int desc_hashmap(Ndb_cluster_connection 
     delete [] tmp;
     return 1;
   }
-
   return 0;
 }

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20100218182454-m3kckfdyopdfxcnr.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3417)Magnus Blåudd18 Feb