bzr commit into connector-cpp-bzr branch (andrey.hristov:232)

[andrey.hristov]

#At bzr+ssh://ahristov@stripped/bzrroot/public/connector-cpp-bzr/trunk/

  232 andrey.hristov@stripped	2008-11-10
      Portability fixes
modified:
  driver/mysql_metadata.cpp
  examples/resultset_types.cpp

per-file messages:
  driver/mysql_metadata.cpp
    Fix after global search and replace
  examples/resultset_types.cpp
    Make it portable
=== modified file 'driver/mysql_metadata.cpp'
--- a/driver/mysql_metadata.cpp	2008-11-05 10:10:28 +0000
+++ b/driver/mysql_metadata.cpp	2008-11-10 18:26:29 +0000
@@ -910,7 +910,7 @@ MySQL_ConnectionMetaData::getSchemaObjec
 	static const std::string view_ddl_column("Create View");
 	static const std::string procedure_ddl_column("Create Procedure");
 	static const std::string function_ddl_column("Create Function");
-	static const std::string trigger_ddl_column("SQL Original sql::Statement");
+	static const std::string trigger_ddl_column("SQL Original Statement");
 
 	if (catalogName.length() > 0) {
 		tables_where_clause.append(" WHERE table_type<>'VIEW' AND table_schema = '").append(catalogName).append("' ");

=== modified file 'examples/resultset_types.cpp'
--- a/examples/resultset_types.cpp	2008-11-10 17:08:42 +0000
+++ b/examples/resultset_types.cpp	2008-11-10 18:26:29 +0000
@@ -35,6 +35,12 @@
 // Connection parameter and sample data
 #include "examples.h"
 
+#ifdef _WIN32
+#define L64(x) x##i64
+#else
+#define L64(x) x##LL
+#endif
+
 using namespace std;
 
 /**
@@ -65,7 +71,7 @@ int main(int argc, const char **argv) 
 	string c_string;
 	bool c_bool1 = true, c_bool2;
 	/* TODO: long long is not C++, its C99 !!! */
-	long long c_long1 = 9223372036854775807, c_long2;
+	long long c_long1 = L64(9223372036854775807), c_long2;
 	double c_double1 = -999.9999, c_double2;