Changeset c83148c1 in trac.git
- Timestamp:
- Apr 11, 2022, 2:53:30 PM (2 years ago)
- Branches:
- 1.2-stable, 1.4-stable, 1.6-stable, trunk
- Children:
- 428f8f3, c7938d8
- Parents:
- 42a1180 (diff), 7b2e4760 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trac/db/mysql_backend.py
r42a1180 rc83148c1 329 329 tables=', '.join(non_utf8bin))) 330 330 331 SUPPORTED_COLLATIONS = (('utf8', 'utf8_bin'), ('utf8mb4', 'utf8mb4_bin')) 331 SUPPORTED_COLLATIONS = ( 332 ('utf8mb4', 'utf8mb4_bin'), 333 ('utf8mb3', 'utf8_bin'), 334 ('utf8', 'utf8_bin'), 335 ) 332 336 333 337 def _verify_variables(self, db): … … 399 403 cursor.execute("SHOW VARIABLES WHERE " 400 404 " variable_name='character_set_database'") 401 self.charset = cursor.fetchone()[1] 405 charset = cursor.fetchone()[1] 406 if charset == 'utf8mb3': 407 charset = 'utf8' 408 self.charset = charset 402 409 if self.charset != 'utf8': 403 410 cnx.query("SET NAMES %s" % self.charset)
Note:
See TracChangeset
for help on using the changeset viewer.