diff options
| author | Kristofer.Pettersson@naruto. <> | 2007-07-25 12:19:51 +0200 |
|---|---|---|
| committer | Kristofer.Pettersson@naruto. <> | 2007-07-25 12:19:51 +0200 |
| commit | 6516156c1a2bb7c517776a4a2eb85c8e629fc39a (patch) | |
| tree | b876e04be5ea7a60fb2bbb515429f5847f4c2987 /server-tools | |
| parent | 556ec10ea6ef5091599e9449ea1e3462f6f70cbb (diff) | |
| parent | b7d58113f51a87b100fe2334861acc594512772c (diff) | |
| download | mariadb-git-6516156c1a2bb7c517776a4a2eb85c8e629fc39a.tar.gz | |
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into naruto.:C:/cpp/mysql-5.1-runtime
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 { |