[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/akonadi/server
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-03-08 9:40:57
Message-ID: 1268041257.237088.4173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1100673 by vkrause:

Add MySQL default location on Maemo to the search path, should make the
patch in the package unecessary.


 M  +1 -1      CMakeLists.txt  
 M  +2 -1      src/storage/dbconfigmysql.cpp  


--- trunk/kdesupport/akonadi/server/CMakeLists.txt #1100672:1100673
@@ -1,5 +1,5 @@
 
-find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec \
/usr/local/libexec /opt/mysql/libexec /usr/mysql/bin ) +find_program( \
MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec \
/opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin )  if( MYSQLD_EXECUTABLE)
    message( STATUS "MySQL Server found." )
 else ( MYSQLD_EXECUTABLE )
--- trunk/kdesupport/akonadi/server/src/storage/dbconfigmysql.cpp #1100672:1100673
@@ -66,7 +66,8 @@
       << QLatin1String( "/usr/local/libexec" )
       << QLatin1String( "/usr/libexec" )
       << QLatin1String( "/opt/mysql/libexec" )
-      << QLatin1String( "/opt/local/lib/mysql5/bin" );
+      << QLatin1String( "/opt/local/lib/mysql5/bin" )
+      << QLatin1String( "/opt/mysql/sbin" );
   if ( defaultServerPath.isEmpty() )
     defaultServerPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysqld" ), \
mysqldSearchPath );  


[prev in list] [next in list] [prev in thread] [next in thread]