summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager
diff options
context:
space:
mode:
authorunknown <Kristofer.Pettersson@naruto.>2007-07-25 12:19:51 +0200
committerunknown <Kristofer.Pettersson@naruto.>2007-07-25 12:19:51 +0200
commitef7cf7d07f8d4e47432090aa31859d85e927ab1b (patch)
treeb876e04be5ea7a60fb2bbb515429f5847f4c2987 /server-tools/instance-manager
parent5e0e5e5e3b6e63018e4e355c6c046357df19c546 (diff)
parent696b001ab719f3ecc50da7b72580dddb0e216d8a (diff)
downloadmariadb-git-ef7cf7d07f8d4e47432090aa31859d85e927ab1b.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/instance-manager')
-rw-r--r--server-tools/instance-manager/parse_output.cc4
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
{