diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2007-07-25 12:15:29 +0200 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2007-07-25 12:15:29 +0200 |
| commit | 696b001ab719f3ecc50da7b72580dddb0e216d8a (patch) | |
| tree | f961862fc4f6136a6765b9aaf7b522b68bc36238 /server-tools | |
| parent | 3232f483a1d30f8ec6122a23747d1db1397b50f1 (diff) | |
| download | mariadb-git-696b001ab719f3ecc50da7b72580dddb0e216d8a.tar.gz | |
Fix of build errors for windows.
server-tools/instance-manager/parse_output.cc:
* Fixed merge error: retval -> op_status
* Fixed warning: unsigned compared with signed.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/parse_output.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc index 4dc67657512..3511589acd6 100644 --- a/server-tools/instance-manager/parse_output.cc +++ b/server-tools/instance-manager/parse_output.cc @@ -300,7 +300,7 @@ bool Mysqld_output_parser_win::run_command(const char *command) &si_start_info, /* STARTUPINFO pointer. */ &pi_proc_info); /* Rec. PROCESS_INFORMATION. */ - if (!retval) + if (!op_status) { CloseHandle(m_h_child_stdout_rd); CloseHandle(m_h_child_stdout_wr); @@ -324,7 +324,7 @@ bool Mysqld_output_parser_win::read_line(char *line_buffer, char *buff_ptr= line_buffer; char ch; - while (buff_ptr - line_buffer < line_buffer_size) + while ((unsigned)(buff_ptr - line_buffer) < line_buffer_size) { do { |