Merge lp:~mordred/drizzle/bug682842 into lp:drizzle/7.0

[Monty Taylor]

Replaced a bunch of catch(...) with catch (std::exception&)

=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-11-11 16:51:37 +0000
+++ client/drizzledump.cc	2010-12-02 00:41:29 +0000
@@ -200,7 +200,7 @@
       opt_destination_port, opt_destination_user, opt_destination_password,
       false);
   }
-  catch (...)
+  catch (std::exception&)
   {
     cerr << "Could not connect to destination database server" << endl;
     maybe_exit(EX_DRIZZLEERR);
@@ -225,7 +225,7 @@
       DrizzleDumpDatabase *database= *i;
       sout << *database;
     }
-    catch (...)
+    catch (std::exception&)
     {
       std::cout << _("Error inserting into destination database") << std::endl;
       if (not ignore_errors)
@@ -754,7 +754,7 @@
     db_connection = new DrizzleDumpConnection(current_host, opt_drizzle_port,
       current_user, opt_password, use_drizzle_protocol);
   }
-  catch (...)
+  catch (std::exception&)
   {
     maybe_exit(EX_DRIZZLEERR);
   }

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-11-02 10:28:05 +0000
+++ client/drizzledump_data.cc	2010-12-02 00:41:29 +0000
@@ -526,7 +526,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     errorHandler(NULL, ret, "when trying to connect");
-    throw 1;
+    throw std::exception();
   }
 
   boost::match_flag_type flags = boost::match_default; 

=== modified file 'client/drizzledump_data.h'
--- client/drizzledump_data.h	2010-10-27 21:23:31 +0000
+++ client/drizzledump_data.h	2010-12-02 00:41:29 +0000
@@ -262,7 +262,7 @@
     void writeString(std::string &str)
     {
       if (not connection->queryNoResult(str))
-        throw 1;
+        throw std::exception();
     }
 
     void setConnection(DrizzleDumpConnection *conn) { connection= conn; }

=== modified file 'client/drizzledump_drizzle.cc'
--- client/drizzledump_drizzle.cc	2010-10-15 12:45:07 +0000
+++ client/drizzledump_drizzle.cc	2010-12-02 00:41:29 +0000
@@ -351,7 +351,7 @@
   result= dcon->query(query);
 
   if (result == NULL)
-    throw 1;
+    throw std::exception();
 }
 
 DrizzleDumpDataDrizzle::~DrizzleDumpDataDrizzle()

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-11-02 10:28:05 +0000
+++ client/drizzledump_mysql.cc	2010-12-02 00:41:29 +0000
@@ -570,7 +570,7 @@
 
   result= dcon->query(query);
   if (result == NULL)
-    throw 1;
+    throw std::exception();
 }
 
 DrizzleDumpDataMySQL::~DrizzleDumpDataMySQL()

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2010-11-29 03:53:29 +0000
+++ drizzled/drizzled.cc	2010-12-02 00:41:29 +0000
@@ -1356,7 +1356,7 @@
   {
     po::store(parsed, vm);
   }
-  catch (...)
+  catch (std::exception&)
   {
     errmsg_printf(ERRMSG_LVL_ERROR, _("Duplicate entry for command line option\n"));
     unireg_abort(1);

=== modified file 'drizzled/module/loader.cc'
--- drizzled/module/loader.cc	2010-11-08 19:36:08 +0000
+++ drizzled/module/loader.cc	2010-12-02 00:41:29 +0000
@@ -1719,7 +1719,7 @@
         add_sys_var_to_list(v);
         test_module->addSysVar(v);
       }
-      catch (...)
+      catch (std::exception&)
       {
         errmsg_printf(ERRMSG_LVL_ERROR,
                       _("Plugin '%s' has conflicting system variables"),

=== modified file 'drizzled/plugin/storage_engine.cc'
--- drizzled/plugin/storage_engine.cc	2010-11-27 03:55:30 +0000
+++ drizzled/plugin/storage_engine.cc	2010-12-02 00:41:29 +0000
@@ -1067,7 +1067,8 @@
 
   bool success;
 
-  try {
+  try
+  {
     success= table_message.SerializeToZeroCopyStream(output);
   }
   catch (...)

=== modified file 'drizzled/program_options/config_file.h'
--- drizzled/program_options/config_file.h	2010-11-14 02:04:38 +0000
+++ drizzled/program_options/config_file.h	2010-12-02 00:41:29 +0000
@@ -65,7 +65,7 @@
       return boost::lexical_cast<std::string>(new_size);
     }
   }
-  catch (...)
+  catch (std::exception&)
   { }
 
   return arg_val;

=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2010-11-22 20:27:31 +0000
+++ drizzled/sql_parse.cc	2010-12-02 00:41:29 +0000
@@ -755,6 +755,7 @@
         {
           // Just try to catch any random failures that could have come
           // during execution.
+          unireg_abort(1);
         }
         DRIZZLE_QUERY_EXEC_DONE(0);
       }

=== modified file 'drizzled/sys_var.cc'
--- drizzled/sys_var.cc	2010-11-18 03:22:35 +0000
+++ drizzled/sys_var.cc	2010-12-02 00:41:29 +0000
@@ -1657,7 +1657,7 @@
     add_sys_var_to_list(&sys_version_compile_vendor, my_long_options);
     add_sys_var_to_list(&sys_warning_count, my_long_options);
   }
-  catch (...)
+  catch (std::exception&)
   {
     errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to initialize system variables"));
     return(1);