aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmoagx <post@wickenrode.com>2012-10-03 15:24:45 +0000
committerdmoagx <post@wickenrode.com>2012-10-03 15:24:45 +0000
commit68eeb66eae2cc4d7dc1dcec7b12afc8391558b67 (patch)
tree1c6861603c3b80b0fb79374ee96fe98fcedc5642
parent94bc5d55dfad3e0018e530a12bfa2cde40b3d8e8 (diff)
downloadsequelpro-68eeb66eae2cc4d7dc1dcec7b12afc8391558b67.tar.gz
sequelpro-68eeb66eae2cc4d7dc1dcec7b12afc8391558b67.tar.bz2
sequelpro-68eeb66eae2cc4d7dc1dcec7b12afc8391558b67.zip
* Rename latin1_german_ci to latin1_german1_ci (checking with mysql3.23 sources and mysql doc that seems to have always been it's name?) #1476
-rw-r--r--Source/SPDataImport.m1
-rw-r--r--Source/SPDatabaseCharacterSets.m2
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m
index 25d60ee8..3a2f3004 100644
--- a/Source/SPDataImport.m
+++ b/Source/SPDataImport.m
@@ -1714,6 +1714,7 @@
*/
- (void)_importBackgroundProcess:(NSString *)filename
{
+ [[NSThread currentThread] setName:@"Sequel Pro Background Importer"];
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *fileType = [[importFormatPopup selectedItem] title];
diff --git a/Source/SPDatabaseCharacterSets.m b/Source/SPDatabaseCharacterSets.m
index 91e9327b..7ef5362a 100644
--- a/Source/SPDatabaseCharacterSets.m
+++ b/Source/SPDatabaseCharacterSets.m
@@ -262,7 +262,7 @@ const SPDatabaseCharSets charsets[] =
{
5,
"latin1",
- "latin1_german_ci",
+ "latin1_german1_ci",
"cp1252 West European"
},
{