From ea196b6eaa3696f1d3c20b396d1f7f62e3b540fc Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 23 Feb 2017 02:43:49 +0100 Subject: Workaround for an exception when connecting to MySQL 8.0 (#2699) --- .../Source/SPMySQLConnection Categories/Databases & Tables.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m index 0b9651f6..7b215db4 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m @@ -124,6 +124,7 @@ // Perform the query and record state SPMySQLResult *databaseResult = [self queryString:databaseQuery]; [databaseResult setDefaultRowReturnType:SPMySQLResultRowAsArray]; + [databaseResult setReturnDataAsStrings:YES]; //see #2699 // Retrieve the result into an array if the query was successful if (![self queryErrored]) { -- cgit v1.2.3 From ce8a18950e4778d7ae4a5f1e3a7ce5d53464d90d Mon Sep 17 00:00:00 2001 From: Quentin Mazars-Simon Date: Fri, 24 Feb 2017 11:35:47 -0500 Subject: Fix typo when exporting processes list --- Source/SPProcessListController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 96d8f3a2..d04273e1 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -238,7 +238,7 @@ static NSString *SPTableViewIDColumnIdentifier = @"Id"; [panel beginSheetModalForWindow:[self window] completionHandler:^(NSInteger returnCode) { if (returnCode == NSOKButton) { if ([processesFiltered count] > 0) { - NSMutableString *processesString = [NSMutableString stringWithFormat:@"# MySQL server proceese for %@\n\n", [[SPAppDelegate frontDocument] host]]; + NSMutableString *processesString = [NSMutableString stringWithFormat:@"# MySQL server processes for %@\n\n", [[SPAppDelegate frontDocument] host]]; for (NSDictionary *process in processesFiltered) { -- cgit v1.2.3