Changeset b1882f3 in trac.git
- Timestamp:
- Apr 11, 2022, 2:57:59 PM (2 years ago)
- Branches:
- 1.6-stable, trunk
- Children:
- 9d9d33e
- Parents:
- 94d21f8 (diff), c7938d8 (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
r94d21f8 rb1882f3 330 330 tables=', '.join(non_utf8bin))) 331 331 332 SUPPORTED_COLLATIONS = (('utf8', 'utf8_bin'), ('utf8mb4', 'utf8mb4_bin')) 332 SUPPORTED_COLLATIONS = ( 333 ('utf8mb4', 'utf8mb4_bin'), 334 ('utf8mb3', 'utf8_bin'), 335 ('utf8', 'utf8_bin'), 336 ) 333 337 334 338 def _verify_variables(self, db): … … 402 406 cursor.execute("SHOW VARIABLES WHERE " 403 407 " variable_name='character_set_database'") 404 self.charset = cursor.fetchone()[1] 408 charset = cursor.fetchone()[1] 409 if charset == 'utf8mb3': 410 charset = 'utf8' 411 self.charset = charset 405 412 cursor.close() 406 413 if self.charset != opts['charset']:
Note:
See TracChangeset
for help on using the changeset viewer.