Skip to content
Browse files

Fix some DB locking issues on MySQL 5.5

affecting DB upgrades.

(backported from 0bc768e)
  • Loading branch information...
1 parent 23eb527 commit 4ef6458b2f4df2ff2bedb720a216833b1384dd55 @sphery sphery committed Mar 9, 2012
Showing with 0 additions and 11 deletions.
  1. +0 −11 mythtv/libs/libmythtv/dbcheck.cpp
View
11 mythtv/libs/libmythtv/dbcheck.cpp
@@ -3722,12 +3722,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 '';",
@@ -3971,13 +3966,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 '',"

0 comments on commit 4ef6458

Please sign in to comment.
Something went wrong with that request. Please try again.