Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix some DB locking issues on MySQL 5.5

affecting DB upgrades.
  • Loading branch information...
commit 0bc768ee6c73a23fc46042aec4be5f69d67e9f36 1 parent 9fb1c3e
Michael T. Dean sphery authored
11 mythtv/libs/libmythtv/dbcheck.cpp
View
@@ -3729,12 +3729,7 @@ NULL
}
// Perform the actual upgrade
- QString qtmp = QString(
- "ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
const char *updates[] = {
-tmp.constData(),
"ALTER TABLE callsignnetworkmap"
" MODIFY callsign varbinary(20) NOT NULL default '',"
" MODIFY network varbinary(20) NOT NULL default '';",
@@ -3978,13 +3973,7 @@ NULL
if (dbver == "1216")
{
- QString qtmp = QString(
- "ALTER DATABASE %1 DEFAULT CHARACTER SET "
- "utf8 COLLATE utf8_general_ci;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
const char *updates[] = {
-tmp.constData(),
"ALTER TABLE callsignnetworkmap"
" DEFAULT CHARACTER SET default,"
" MODIFY callsign varchar(20) CHARACTER SET utf8 NOT NULL default '',"
4 mythtv/libs/libmythtv/videodbcheck.cpp
View
@@ -379,8 +379,6 @@ bool doUpgradeVideoDatabaseSchema(void)
if (dbver == "1016")
{
const QString updates[] = {
-QString("ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
- .arg(gCoreContext->GetDatabaseParams().dbName),
"ALTER TABLE dvdbookmark"
" MODIFY serialid varbinary(16) NOT NULL default '',"
" MODIFY name varbinary(32) default NULL;",
@@ -425,8 +423,6 @@ QString("ALTER DATABASE %1 DEFAULT CHARACTER SET latin1;")
if (dbver == "1017")
{
const QString updates[] = {
-QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;")
- .arg(gCoreContext->GetDatabaseParams().dbName),
"ALTER TABLE dvdbookmark"
" DEFAULT CHARACTER SET default,"
" MODIFY serialid varchar(16) CHARACTER SET utf8 NOT NULL default '',"
Please sign in to comment.
Something went wrong with that request. Please try again.