Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Thu Oct 7 22:30:55 CEST 2010. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2010-08-02 13:16:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2010-08-15 09:34:12.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Aug 15 07:31:12 UTC 2010 - wstephenson@novell.com + +- update branch diff to r1163872: + * Improve query performance + * Resolve spurious 'fatal error' in startup log + * Use mysqlcheck instead of mysql_upgrade to avoid permission + lockout + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.g9Qv2o/_old 2010-10-07 22:29:35.000000000 +0200 +++ /var/tmp/diff_new_pack.g9Qv2o/_new 2010-10-07 22:29:35.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: fdupes %endif Version: 1.4.0 -Release: 1 +Release: 2 %define rversion %version License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ 1_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.g9Qv2o/_old 2010-10-07 22:29:35.000000000 +0200 +++ /var/tmp/diff_new_pack.g9Qv2o/_new 2010-10-07 22:29:35.000000000 +0200 @@ -3,5 +3,98 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1127686 -+svn di between //tags/KDE/4.4.3/kdelibs and //branches/KDE/4.4/kdelibs ++current HEAD: 1163872 ++svn di between //tags/akonadi/1.4.0 and //branches/akonadi/1.4 +Index: server/src/storage/dbconfigmysql.h +=================================================================== +--- server/src/storage/dbconfigmysql.h (revision 1157505) ++++ server/src/storage/dbconfigmysql.h (revision 1163873) +@@ -78,7 +78,7 @@ + QString mServerPath; + QString mCleanServerShutdownCommand; + QString mMysqlInstallDbPath; +- QString mMysqlUpgradeDBPath; ++ QString mMysqlCheckPath; + bool mInternalServer; + QProcess *mDatabaseProcess; + }; +Index: server/src/storage/dbconfigmysql.cpp +=================================================================== +--- server/src/storage/dbconfigmysql.cpp (revision 1157505) ++++ server/src/storage/dbconfigmysql.cpp (revision 1163873) +@@ -86,8 +86,8 @@ + mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_install_db" ), mysqldSearchPath ); + akDebug() << "Found mysql_install_db: " << mMysqlInstallDbPath; + +- mMysqlUpgradeDBPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysql_upgrade" ), mysqldSearchPath ); +- akDebug() << "Found mysql_upgrade: " << mMysqlUpgradeDBPath; ++ mMysqlCheckPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysqlcheck" ), mysqldSearchPath ); ++ akDebug() << "Found mysqlcheck: " << mMysqlCheckPath; + + mInternalServer = settings.value( QLatin1String( "QMYSQL/StartServer" ), defaultInternalServer ).toBool(); + if ( mInternalServer ) { +@@ -239,7 +239,7 @@ + if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { + const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); + QProcess::execute( mMysqlInstallDbPath, arguments ); +- } ++ } + + // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate + if ( confUpdate ) { +@@ -267,11 +267,6 @@ + akFatal() << "process error:" << mDatabaseProcess->errorString(); + } + +- if ( !mMysqlUpgradeDBPath.isEmpty() ) { +- const QStringList arguments = QStringList() << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); +- QProcess::execute( mMysqlUpgradeDBPath, arguments ); +- } +- + const QLatin1String initCon( "initConnection" ); + { + QSqlDatabase db = QSqlDatabase::addDatabase( QLatin1String( "QMYSQL" ), initCon ); +@@ -298,6 +293,15 @@ + } + + if ( opened ) { ++ ++ if ( !mMysqlCheckPath.isEmpty() ) { ++ const QStringList arguments = QStringList() << QLatin1String( "--check-upgrade" ) ++ << QLatin1String( "--all-databases" ) ++ << QLatin1String( "--auto-repair" ) ++ << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir ); ++ QProcess::execute( mMysqlCheckPath, arguments ); ++ } ++ + { + QSqlQuery query( db ); + if ( !query.exec( QString::fromLatin1( "USE %1" ).arg( mDatabaseName ) ) ) { +Index: server/src/storage/queryhelper.cpp +=================================================================== +--- server/src/storage/queryhelper.cpp (revision 1157505) ++++ server/src/storage/queryhelper.cpp (revision 1163873) +@@ -32,13 +32,18 @@ + if ( i.size() == 1 ) { + cond.addValueCondition( column, Query::Equals, i.begin() ); + } else { +- Query::Condition subCond( Query::And ); +- subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); +- subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); +- cond.addCondition( subCond ); ++ if ( i.begin() != 1 ) { // 1 is our standard lower bound, so we don't have to check for it explicitly ++ Query::Condition subCond( Query::And ); ++ subCond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); ++ subCond.addValueCondition( column, Query::LessOrEqual, i.end() ); ++ cond.addCondition( subCond ); ++ } else { ++ cond.addValueCondition( column, Query::LessOrEqual, i.end() ); ++ } + } + } else if ( i.hasDefinedBegin() ) { +- cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); ++ if ( i.begin() != 1 ) // 1 is our standard lower bound, so we don't have to check for it explicitly ++ cond.addValueCondition( column, Query::GreaterOrEqual, i.begin() ); + } else if ( i.hasDefinedEnd() ) { + cond.addValueCondition( column, Query::LessOrEqual, i.end() ); + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org