--- parser3/src/main/pa_sql_driver_manager.C	2009/07/06 08:47:10	1.89
+++ parser3/src/main/pa_sql_driver_manager.C	2012/03/16 09:24:14	1.91
@@ -1,12 +1,10 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2009/07/06 08:47:10 $";
-
 #include "pa_sql_driver_manager.h"
 #include "ltdl.h"
 #include "pa_threads.h"
@@ -17,6 +15,8 @@ static const char * const IDENT_SQL_DRIV
 #include "pa_vtable.h"
 #include "pa_charsets.h"
 
+volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.91 2012/03/16 09:24:14 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H;
+
 // globals
 
 SQL_Driver_manager* SQL_driver_manager=0;
@@ -179,7 +179,7 @@ SQL_Connection* SQL_Driver_manager::get_
 				is_dlinited=true;
 			}
 
-			const char* filename=library->cstr_taint(String::L_FILE_SPEC);
+			const char* filename=library->taint_cstr(String::L_FILE_SPEC);
 			lt_dlhandle handle=lt_dlopen(filename);
 			if (!handle) {
 				const char* error=lt_dlerror();
@@ -209,7 +209,7 @@ SQL_Connection* SQL_Driver_manager::get_
 			// initialise by connecting to sql client dynamic link library
 			char* dlopen_file_spec_cstr=
 				dlopen_file_spec && dlopen_file_spec->length()?
-				dlopen_file_spec->cstrm_taint(String::L_AS_IS):0;
+				dlopen_file_spec->taint_cstrm(String::L_AS_IS):0;
 			if(const char* error=driver->initialize(dlopen_file_spec_cstr))
 				throw Exception(0,
 					library,