summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael T. Dean <mdean@mythtv.org>2012-03-10 01:23:52 (GMT)
committer Michael T. Dean <mdean@mythtv.org>2012-03-10 01:23:52 (GMT)
commit4ef6458b2f4df2ff2bedb720a216833b1384dd55 (patch)
tree47910432f69aa8f01ec859a0df8c38b75d0d3d22
parent23eb527dd26bdab4f50d9d77c5cafabb957ba76d (diff)
Fix some DB locking issues on MySQL 5.5
affecting DB upgrades. (backported from 0bc768ee6)
-rw-r--r--mythtv/libs/libmythtv/dbcheck.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
index afb8fbb..be59cf9 100644
--- a/mythtv/libs/libmythtv/dbcheck.cpp
+++ b/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 '',"