- (let ((mysql-path
- (uffi:find-foreign-library *mysql-library-candidate-names*
- *mysql-library-candidate-directories*
- :drive-letters
- *mysql-library-candidate-drive-letters*)))
- (unless (probe-file mysql-path)
- (error "Can't find mysql client library to load"))
- (uffi:load-foreign-library *libz-library-path*)
- (uffi:load-foreign-library mysql-path
- :module "mysql"
- :supporting-libraries
- *mysql-supporting-libraries*)
- (uffi:load-foreign-library *clsql-mysql-library-path*
- :module "clsql-mysql"
- :supporting-libraries
- (append *mysql-supporting-libraries*)))
+ (clsql:push-library-path
+ (make-pathname :directory clsql-mysql-system::*library-file-dir*))
+
+ (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+ :module "mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+
+ (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+ :module "clsql-mysql"
+ :supporting-libraries *mysql-supporting-libraries*)