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:05:33 (GMT)
commitad0ba2a952f891773c59b61309645db815360278 (patch)
treebe299b188e4a3082f157e1781ef43db62b976bb1
parentcd8c9c26d073f0676653a6ffe789fb323eafca57 (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. (cherry picked from commit c419275d59de30b3f368013c1e5928f3a409e5cb)
-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 be59cf9..c2afd1c 100644
--- a/mythtv/libs/libmythtv/dbcheck.cpp
+++ b/mythtv/libs/libmythtv/dbcheck.cpp
@@ -5553,12 +5553,7 @@ bool InitializeMythSchema(void)
VERBOSE(VB_IMPORTANT, "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 '',"