--- parser3/src/classes/table.C	2013/05/16 02:20:13	1.293
+++ parser3/src/classes/table.C	2013/10/04 21:21:54	1.296
@@ -21,7 +21,7 @@
 #include "pa_vbool.h"
 #include "pa_array.h"
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.293 2013/05/16 02:20:13 misha Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.296 2013/10/04 21:21:54 moko Exp $";
 
 // class
 
@@ -933,8 +933,7 @@ static void _sort(Request& r, MethodPara
 	}
 
 	// sort keys
-	_qsort(seq, old_count, sizeof(Table_seq_item), 
-		key_values_are_strings?sort_cmp_string:sort_cmp_double);
+	qsort(seq, old_count, sizeof(Table_seq_item), key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
 	// reorder table as they require in 'seq'
 	for(i=0; i<old_count; i++)
@@ -1029,9 +1028,9 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
 
 			if(rownum_var_name)
-				var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false);
+				var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
 			if(value_var_name)
-				var_context->put_element(*value_var_name, new VTable(&table), false);
+				var_context->put_element(*value_var_name, new VTable(&table));
 
 			StringOrValue sv_processed=r.process(body_code);
 			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
@@ -1054,9 +1053,9 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
  
 			if(rownum_var_name)
-				var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)), false);
+				var_context->put_element(*rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
 			if(value_var_name)
-				var_context->put_element(*value_var_name, new VTable(&table), false);
+				var_context->put_element(*value_var_name, new VTable(&table));
 
 			r.process_write(body_code);
 			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
@@ -1235,11 +1234,7 @@ static void _sql(Request& r, MethodParam
 	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
 
 	Table_sql_event_handlers handlers;
-#ifdef RESOURCES_DEBUG
-	struct timeval mt[2];
-	//measure:before
-	gettimeofday(&mt[0],NULL);
-#endif	
+
 	r.connection()->query(
 		statement_cstr, 
 		placeholders_count, placeholders,
@@ -1247,17 +1242,6 @@ static void _sql(Request& r, MethodParam
 		handlers,
 		statement_string);
 	
-#ifdef RESOURCES_DEBUG
-		//measure:after connect
-	gettimeofday(&mt[1],NULL);
-	
-	double t[2];
-	for(int i=0;i<2;i++)
-	    t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
-	    
-	r.sql_request_time+=t[1]-t[0];
-#endif	    			
-
 	if(bind)
 		unmarshal_bind_updates(*bind, placeholders_count, placeholders);