Merge lp:~linuxjedi/drizzle/trunk-bug-663812 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

Drizzledump migration fixes:

* Link up --destination-database
* Fix retrieving precision/scale for DOUBLE from MySQL when it hasn't been hard set.

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-10-16 20:13:23 +0000
+++ client/drizzledump_data.cc	2010-10-20 13:05:17 +0000
@@ -43,6 +43,7 @@
 extern bool opt_drop_database;
 extern bool opt_autocommit;
 extern bool ignore_errors;
+extern std::string opt_destination_database;
 
 extern boost::unordered_set<std::string> ignore_table;
 extern void maybe_exit(int error);
@@ -192,16 +193,22 @@
     if (not opt_create_db)
     {
       if (opt_drop_database)
-        os << "DROP DATABASE IF EXISTS `" << obj.databaseName << "`" << std::endl;
+      {
+        os << "DROP DATABASE IF EXISTS `"
+          << ((opt_destination_database.empty()) ? obj.databaseName
+          : opt_destination_database) << "`" << std::endl;
+      }
 
-      os << "CREATE DATABASE IF NOT EXISTS `" << obj.databaseName << "`";
+      os << "CREATE DATABASE IF NOT EXISTS `"
+        << ((opt_destination_database.empty()) ? obj.databaseName
+        : opt_destination_database) << "`";
       if (not obj.collate.empty())
        os << " COLLATE = " << obj.collate;
 
       os << ";" << std::endl << std::endl;
     }
-
-    os << "USE `" << obj.databaseName << "`;" << std::endl << std::endl;
+    os << "USE `" << ((opt_destination_database.empty()) ? obj.databaseName
+      : opt_destination_database) << "`;" << std::endl << std::endl;
   }
 
   std::vector<DrizzleDumpTable*>::iterator i;

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-10-12 19:26:10 +0000
+++ client/drizzledump_mysql.cc	2010-10-20 13:05:17 +0000
@@ -203,9 +203,16 @@
     field->isAutoIncrement= (strcmp(row[8], "auto_increment") == 0) ? true : false;
     field->defaultIsNull= field->isNull;
     field->length= (row[4]) ? boost::lexical_cast<uint32_t>(row[4]) : 0;
-    field->decimalPrecision= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
-    field->decimalScale= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
-
+    if ((row[5] != NULL) and (row[6] != NULL))
+    {
+      field->decimalPrecision= boost::lexical_cast<uint32_t>(row[5]);
+      field->decimalScale= boost::lexical_cast<uint32_t>(row[6]);
+    }
+    else
+    {
+      field->decimalPrecision= 0;
+      field->decimalScale= 0;
+    }
 
     fields.push_back(field);
   }