--- misc/mysql_splitter/splitter.cpp	2011/04/11 05:14:37	1284
+++ misc/mysql_splitter/splitter.cpp	2011/05/11 19:19:07	1460
@@ -18,10 +18,10 @@
 string remove_comments(string in) {
 	bool isComment = false;
 	ostringstream out;
-	for (int i=0; i<in.length() -1; i++) {
-		if (in.at(i) == '/' && in.at(i+1) == '*')  
+	for (unsigned int i=0; i<in.length() -1; i++) {
+		if (in.at(i) == '/' && in.at(i+1) == '*')
 			isComment = true;
-		
+
 		if (in.at(i) == '*' && in.at(i+1) == '/') {
 			i++;
 			isComment = false;
@@ -89,7 +89,7 @@
 		cout << "No file named " << inputfile << endl;
 		return 1;
 	}
-	
+
 
 	ifstream in( inputfile.c_str() );
 	ofstream out;
@@ -99,17 +99,22 @@
 	if (!in.is_open() ) {
 		cout << "Could not open " << argv[1] << endl;
 		return 2;
-	}
+	}
+
+	time_t start = time(NULL);
+
+	const char* SEARCH = "CREATE DATABASE";
+	const int SEARCHLEN = strlen(SEARCH);
 
 	while ( in.good() ) {
 		in.getline(linebuf, BUFSIZE);
 
-		string line(linebuf);
-
 
 		//if (line.substr(0, 15) == "CREATE DATABASE" ) {
-		if ( boost::starts_with(line, "CREATE DATABASE") ) {
+		//if ( boost::starts_with(line, "CREATE DATABASE") ) {
+		if (strncmp(linebuf,SEARCH, SEARCHLEN) == 0) {
 
+            string line(linebuf);
 			if (out.is_open() ) {
 				out.close();
 			}
@@ -143,16 +148,20 @@
 
 
 		if (out.is_open() ) {
-			out << line << endl;
+			out << linebuf << endl;
 		} else {
-			header << line << endl; //collect preamble for later use
+			header << linebuf << endl; //collect preamble for later use
 		}
 
 	}
 
 
 	if(out.is_open())
-		out.close();
+		out.close();
+
+    time_t end = time(NULL);
+
+    cout << "Elapsed " << (end-start) << " seconds" << endl;
 
 
 	in.close();