diff options
| author | Abhi Beckert <abhi@abhibeckert.com> | 2017-03-03 10:36:53 +1000 |
|---|---|---|
| committer | Abhi Beckert <abhi@abhibeckert.com> | 2017-03-03 10:36:53 +1000 |
| commit | f6591657661c87743bb4c1ce5e5a8412cc04e943 (patch) | |
| tree | 86d18b62588bb817d33eca6e81e545c4f00d8cee | |
| parent | 0de6f372e1fe9723d01f9e73a75efe4930b68937 (diff) | |
| parent | b87faacf805f76daaa5ad9e2e6e39efc3d558289 (diff) | |
| download | sequelpro-f6591657661c87743bb4c1ce5e5a8412cc04e943.tar.gz sequelpro-f6591657661c87743bb4c1ce5e5a8412cc04e943.tar.bz2 sequelpro-f6591657661c87743bb4c1ce5e5a8412cc04e943.zip | |
Merge commit 'b87faacf805f76daaa5ad9e2e6e39efc3d558289'
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m | 1 | ||||
| -rw-r--r-- | Source/SPProcessListController.m | 2 |
2 files changed, 2 insertions, 1 deletions
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]) { 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) { |