File errmsg-mysql51-embedded.diff of Package amarok
--- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1
+++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52
@@ -109,18 +109,17 @@
dir.mkpath( "." );
}
- static const int num_elements = 8;
+ static const int num_elements = 7;
char **server_options = new char* [ num_elements + 1 ];
server_options[0] = const_cast<char*>( "amarokmysqld" );
server_options[1] = defaultsLine;
server_options[2] = databaseLine;
// CAUTION: if we ever change the table type we will need to fix a number of MYISAM specific
// functions, such as FULLTEXT indexing.
- server_options[3] = const_cast<char*>( "--default-table-type=MYISAM" );
- server_options[4] = const_cast<char*>( "--default-storage-engine=MYISAM" );
- server_options[5] = const_cast<char*>( "--loose-skip-innodb" );
- server_options[6] = const_cast<char*>( "--skip-grant-tables" );
- server_options[7] = const_cast<char*>( "--myisam-recover=FORCE" );
+ server_options[3] = const_cast<char*>( "--default-storage-engine=MYISAM" );
+ server_options[4] = const_cast<char*>( "--skip-grant-tables" );
+ server_options[5] = const_cast<char*>( "--myisam-recover=FORCE" );
+ server_options[6] = const_cast<char*>( "--language=/usr/share/kde4/apps/amarok" );
server_options[num_elements] = 0;
char **server_groups = new char* [ 3 ];