jenkins-bot has submitted this change and it was merged.
Change subject: ...and back to utf8 as default charset
......................................................................
...and back to utf8 as default charset
The version of MySQLdb that is packaged for Precise does not know about
utf8mb4. I (inexcusably) tested against the dev branch of MySQLdb.
Keeping the 191 limit to ease migration in the future.
Change-Id: I807e1d3a6f192b13e36811af376806d6a92e122d
---
M server/bin/json2sql
M server/eventlogging/jrm.py
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/bin/json2sql b/server/bin/json2sql
index d8cb7c8..3238739 100755
--- a/server/bin/json2sql
+++ b/server/bin/json2sql
@@ -42,10 +42,6 @@
logging.basicConfig(stream=sys.stderr, level=args.loglevel)
logging.getLogger('sqlalchemy.engine').setLevel(args.loglevel)
-# XXX(ori, 28-Apr-2013): this coerces 'utf8' client encoding to 'utf8mb4';
-# required only until change XXX is merged.
-if db.endswith('utf8'):
- db = db + 'mb4'
meta = sqlalchemy.MetaData(args.db)
sub = eventlogging.zmq_subscribe(args.input, sid=args.sid, json=True)
diff --git a/server/eventlogging/jrm.py b/server/eventlogging/jrm.py
index fd6efad..d505726 100644
--- a/server/eventlogging/jrm.py
+++ b/server/eventlogging/jrm.py
@@ -34,7 +34,7 @@
#: A dictionary mapping database engine names to table defaults.
ENGINE_TABLE_OPTIONS = {
'mysql': {
- 'mysql_charset': 'utf8mb4',
+ 'mysql_charset': 'utf8',
'mysql_engine': 'InnoDB'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/61280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I807e1d3a6f192b13e36811af376806d6a92e122d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
