Skip to content

Commit

Permalink
Merge commit 'b87faacf805f76daaa5ad9e2e6e39efc3d558289'
Browse files Browse the repository at this point in the history
  • Loading branch information
abhibeckert committed Mar 3, 2017
2 parents 0de6f37 + b87faac commit f659165
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ - (NSArray *)databasesLike:(NSString *)nameLikeString
// 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]) {
Expand Down
2 changes: 1 addition & 1 deletion Source/SPProcessListController.m
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ - (IBAction)saveServerProcesses:(id)sender
[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)
{
Expand Down

0 comments on commit f659165

Please sign in to comment.