Merge lp:~linuxjedi/drizzle/elliott-bug-651950 into lp:drizzle/7.0

[Andrew Hutchings]

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-10-02 14:41:31 +0000
+++ client/drizzledump_data.cc	2010-10-04 15:27:46 +0000
@@ -306,7 +306,7 @@
             (obj.table->fields[i]->type.compare("VARBINARY") == 0)))
             os << obj.convertHex((unsigned char*)row[i], row_sizes[i]);
           else
-            os << "'" << obj.escape(row[i], row_sizes[i]) << "'";
+            os << "'" << DrizzleDumpData::escape(row[i], row_sizes[i]) << "'";
         }
         else
           os << row[i];
@@ -353,7 +353,7 @@
 }
 
 /* Ripped out of libdrizzle, hopefully a little safer */
-std::string DrizzleDumpData::escape(const char* from, size_t from_size) const
+std::string DrizzleDumpData::escape(const char* from, size_t from_size)
 {
   std::string output;
 
@@ -421,7 +421,14 @@
     os << "AUTO_INCREMENT=" << obj.autoIncrement << " ";
   }
 
-  os << "COLLATE = " << obj.collate << ";" << std::endl << std::endl;
+  os << "COLLATE = " << obj.collate;
+
+  if (not obj.comment.empty())
+  {
+    os << " COMMENT = '" << obj.comment << "'";
+  }
+
+  os << ";" << std::endl << std::endl;
 
   return os;
 }

=== modified file 'client/drizzledump_data.h'
--- client/drizzledump_data.h	2010-09-30 13:36:29 +0000
+++ client/drizzledump_data.h	2010-10-04 15:27:46 +0000
@@ -116,6 +116,7 @@
     std::string displayName;
     std::string engineName;
     std::string collate;
+    std::string comment;
 
     // Currently MySQL only, hard to do in Drizzle
     uint64_t autoIncrement;
@@ -165,7 +166,7 @@
 
     virtual std::ostream& checkDateTime(std::ostream &os, const char*, uint32_t) const { return os; }
     std::string convertHex(const unsigned char* from, size_t from_size) const;
-    std::string escape(const char* from, size_t from_size) const;
+    static std::string escape(const char* from, size_t from_size);
 };
 
 class DrizzleDumpConnection

=== modified file 'client/drizzledump_drizzle.cc'
--- client/drizzledump_drizzle.cc	2010-10-02 14:37:55 +0000
+++ client/drizzledump_drizzle.cc	2010-10-04 15:27:46 +0000
@@ -40,7 +40,7 @@
   if (verbose)
     std::cerr << _("-- Retrieving table structures for ") << databaseName << "..." << std::endl;
 
-  query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA='";
+  query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT, TABLE_COMMENT FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA='";
   query.append(databaseName);
   query.append("' ORDER BY TABLE_NAME");
 
@@ -51,6 +51,7 @@
 
   while ((row= drizzle_row_next(result)))
   {
+    size_t* row_sizes= drizzle_row_field_sizes(result);
     std::string tableName(row[0]);
     std::string displayName(tableName);
     cleanTableName(displayName);
@@ -62,6 +63,10 @@
     table->collate= row[1];
     table->engineName= row[2];
     table->autoIncrement= boost::lexical_cast<uint64_t>(row[3]);
+    if (row[4])
+      table->comment= DrizzleDumpData::escape(row[4], row_sizes[4]);
+    else
+      table->comment= "";
     table->database= this;
     if ((not table->populateFields()) or (not table->populateIndexes()))
     {

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-10-02 14:36:07 +0000
+++ client/drizzledump_mysql.cc	2010-10-04 15:27:46 +0000
@@ -41,7 +41,7 @@
   if (verbose)
     std::cerr << _("-- Retrieving table structures for ") << databaseName << "..." << std::endl;
 
-  query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE != 'VIEW' AND TABLE_SCHEMA='";
+  query="SELECT TABLE_NAME, TABLE_COLLATION, ENGINE, AUTO_INCREMENT, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE != 'VIEW' AND TABLE_SCHEMA='";
   query.append(databaseName);
   query.append("' ORDER BY TABLE_NAME");
 
@@ -52,6 +52,7 @@
 
   while ((row= drizzle_row_next(result)))
   {
+    size_t* row_sizes= drizzle_row_field_sizes(result);
     std::string tableName(row[0]);
     std::string displayName(tableName);
     cleanTableName(displayName);
@@ -67,6 +68,11 @@
     else
       table->autoIncrement= 0;
 
+    if (row[4])
+      table->comment= DrizzleDumpData::escape(row[4], row_sizes[4]);
+    else
+      table->comment= "";
+
     table->database= this;
     if ((not table->populateFields()) or (not table->populateIndexes()))
     {