Removed redundant #includes and fixed spelling mistakes.

simon-graham · simon-graham · commit a1792fa833c9 · 2013-12-19T16:32:55.000Z
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
@@ -40,7 +40,7 @@
 #define Data_MySQL_Connector_INCLUDED
 
 
-#include "MySQL.h"
+#include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/Connector.h"
 
 
diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -42,8 +42,6 @@
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
 
-#include <vector>
-
 namespace Poco {
 namespace Data {
 namespace MySQL {
@@ -87,7 +85,7 @@ class SessionHandle
 		/// Commit transaction
 
 	void rollback();
-		/// Rollback trabsaction
+		/// Rollback transaction
 
 	operator MYSQL* ();
 
diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -42,8 +42,6 @@
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
 
-#include <vector>
-
 namespace Poco {
 namespace Data {
 namespace MySQL {
diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp
@@ -143,7 +143,7 @@ bool Extractor::extract(std::size_t pos, char& val)
 bool Extractor::extract(std::size_t pos, std::string& val)
 {
 	if (_metadata.columnsReturned() <= pos)
-		throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain");
+		throw MySQLException("Extractor: attempt to extract more parameters, than query result contain");
 	
 	if (_metadata.isNull(static_cast<Poco::UInt32>(pos)))
 	return false;
@@ -161,7 +161,7 @@ bool Extractor::extract(std::size_t pos, std::string& val)
 bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val)
 {
 	if (_metadata.columnsReturned() <= pos)
-		throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain");
+		throw MySQLException("Extractor: attempt to extract more parameters, than query result contain");
 	
 	if (_metadata.isNull(static_cast<Poco::UInt32>(pos)))
 	return false;
@@ -177,7 +177,7 @@ bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val)
 bool Extractor::extract(std::size_t pos, Poco::Data::CLOB& val)
 {
 	if (_metadata.columnsReturned() <= pos)
-		throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain");
+		throw MySQLException("Extractor: attempt to extract more parameters, than query result contain");
 	
 	if (_metadata.isNull(static_cast<Poco::UInt32>(pos)))
 	return false;
@@ -243,7 +243,7 @@ bool Extractor::isNull(std::size_t col, std::size_t row)
 	poco_assert(row == POCO_DATA_INVALID_ROW);
 
 	if (_metadata.columnsReturned() <= col)
-		throw MySQLException("Extractor: attempt to extract more paremeters, than query result contain");
+		throw MySQLException("Extractor: attempt to extract more parameters, than query result contain");
 
 	if (_metadata.isNull(static_cast<Poco::UInt32>(col)))
 		return true;
diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h
@@ -348,13 +348,13 @@ class Data_API Statement
 		/// Returns true if statement is in a state that allows the internal storage to be modified.
 
 	Storage storage() const;
-		/// Returns the internal storage type for the stamement.
+		/// Returns the internal storage type for the statement.
 
 	void setStorage(const std::string& storage);
-		/// Sets the internal storage type for the stamement.
+		/// Sets the internal storage type for the statement.
 
 	const std::string& getStorage() const;
-		/// Returns the internal storage type for the stamement.
+		/// Returns the internal storage type for the statement.
 
 	std::size_t columnsExtracted(int dataSet = StatementImpl::USE_CURRENT_DATA_SET) const;
 		/// Returns the number of columns returned for current data set.
