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

List:       kde-commits
Subject:    =?utf-8?q?=5Bamarok=5D_src/core-impl/collections/db/sql/mysqleco?=
From:       Jeremy Whiting <jpwhiting () kde ! org>
Date:       2011-03-04 22:25:10
Message-ID: 20110304222510.7FE6AA60C9 () git ! kde ! org
[Download RAW message or body]

Git commit c62bb9a2ba514165e8e430302aafb19bfb95b9ce by Jeremy Whiting.
Committed on 04/03/2011 at 23:24.
Pushed by whiting into branch 'master'.

Don't use deprecated mysql call, and pass in "amarok".
P.S. Ian Monroe told me to do this.

M  +2    -1    src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp \


http://commits.kde.org/amarok/c62bb9a2ba514165e8e430302aafb19bfb95b9ce

diff --git a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp \
b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp index \
                4e8088d..258675a 100644
--- a/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
+++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
@@ -82,7 +82,8 @@ MySqlEmbeddedStorage::MySqlEmbeddedStorage( const QString \
&storageLocation )  }
 
     setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
-    if( mysql_server_init( 0 , 0, 0 ) != 0 )
+    char *args[] = { "amarok" };
+    if( mysql_library_init( 1 , args, 0 ) != 0 )
     {
         error() << "MySQL library initialization failed.";
         reportError( "init" );


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