summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael T. Dean <mdean@mythtv.org>2012-03-09 23:17:10 (GMT)
committer Michael T. Dean <mdean@mythtv.org>2012-03-09 23:17:10 (GMT)
commit0bc768ee6c73a23fc46042aec4be5f69d67e9f36 (patch)
tree7a90379dac0c2fc9c1d85439c6af4f35285b4d34
parent9fb1c3e77a17e69d47eaabac861681a0a3f39fee (diff)
Fix some DB locking issues on MySQL 5.5
affecting DB upgrades.
-rw-r--r--mythtv/libs/libmythtv/dbcheck.cpp11
-rw-r--r--mythtv/libs/libmythtv/videodbcheck.cpp4
2 files changed, 0 insertions, 15 deletions
diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
index 216ccc7..c559d5c 100644
--- a/mythtv/libs/libmythtv/dbcheck.cpp
+++ b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -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 '',"
diff --git a/mythtv/libs/libmythtv/videodbcheck.cpp b/mythtv/libs/libmythtv/videodbcheck.cpp
index 9110f84..bbee676 100644
--- a/mythtv/libs/libmythtv/videodbcheck.cpp
+++ b/mythtv/libs/libmythtv/videodbcheck.cpp
@@ -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 '',"