summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael T. Dean <mdean@mythtv.org>2012-03-13 02:03:11 (GMT)
committer Michael T. Dean <mdean@mythtv.org>2012-03-13 02:03:11 (GMT)
commitc419275d59de30b3f368013c1e5928f3a409e5cb (patch)
tree6dc8f3eee8f3bdfbfb090f2c60a43c8404e7dfb1
parentff73126b0349db3a8c4403e9679f6296caa5ca1a (diff)
Fix DB locking issue on MySQL 5.5
affecting DB initialization. This is the DB init equivalent of 0bc768ee6 (and its backported version at 4ef6458b2f ). Thanks to JYA for finding the issue.
-rw-r--r--mythtv/libs/libmythtv/dbcheck.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/mythtv/libs/libmythtv/dbcheck.cpp b/mythtv/libs/libmythtv/dbcheck.cpp
index 6462f3c..d1a1d79 100644
--- a/mythtv/libs/libmythtv/dbcheck.cpp
+++ b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -1987,12 +1987,7 @@ bool InitializeMythSchema(void)
LOG(VB_GENERAL, LOG_NOTICE,
"Inserting MythTV initial database information.");
- QString qtmp = QString("ALTER DATABASE %1 DEFAULT CHARACTER SET utf8;")
- .arg(gCoreContext->GetDatabaseParams().dbName);
- QByteArray tmp = qtmp.toAscii();
-
const char *updates[] = {
-tmp.constData(),
"CREATE TABLE callsignnetworkmap ("
" id int(11) NOT NULL AUTO_INCREMENT,"
" callsign varchar(20) NOT NULL DEFAULT '',"