diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-09-23 16:47:08 +0300 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-09-23 16:47:08 +0300 |
| commit | acf218b708c68f5fff9fea9450a438116866f1d5 (patch) | |
| tree | dabaf9b38c2c72433e000b36b0a628d9d36fbb38 /server-tools | |
| parent | f5c00b0dbda74c899067880ac0de5c489d54b19f (diff) | |
| download | mariadb-git-acf218b708c68f5fff9fea9450a438116866f1d5.tar.gz | |
Several fixes revelaled by Intel compiler.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/instance_options.cc | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/protocol.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 70950a91015..59bb3b61181 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -469,7 +469,7 @@ int Instance_options::add_option(const char* option) case SAVE_WHOLE: *(selected_options->value)= tmp; return 0; - defaut: + default: break; } } diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc index cd1be805b6b..71c225e82c3 100644 --- a/server-tools/instance-manager/protocol.cc +++ b/server-tools/instance-manager/protocol.cc @@ -74,7 +74,7 @@ int net_send_error(struct st_net *net, uint sql_errno) MYSQL_ERRMSG_SIZE]; // message char *pos= buff; - enum { ERROR_PACKET_CODE= 255 }; + int ERROR_PACKET_CODE= 255; *pos++= ERROR_PACKET_CODE; int2store(pos, sql_errno); pos+= 2; @@ -95,7 +95,7 @@ int net_send_error_323(struct st_net *net, uint sql_errno) MYSQL_ERRMSG_SIZE]; // message char *pos= buff; - enum { ERROR_PACKET_CODE= 255 }; + int ERROR_PACKET_CODE= 255; *pos++= ERROR_PACKET_CODE; int2store(pos, sql_errno); pos+= 2; @@ -148,14 +148,14 @@ int store_to_protocol_packet(Buffer *buf, const char *string, uint *position) int send_eof(struct st_net *net) { - char buff[1 + /* eof packet code */ - 2 + /* warning count */ - 2]; /* server status */ + uchar buff[1 + /* eof packet code */ + 2 + /* warning count */ + 2]; /* server status */ buff[0]=254; int2store(buff+1, 0); int2store(buff+3, 0); - return my_net_write(net, buff, sizeof buff); + return my_net_write(net, (char*) buff, sizeof buff); } int send_fields(struct st_net *net, LIST *fields) @@ -195,7 +195,7 @@ int send_fields(struct st_net *net, LIST *fields) int2store(send_buff.buffer + position, 1); /* charsetnr */ int4store(send_buff.buffer + position + 2, field->length); /* field length */ - send_buff.buffer[position+6]= FIELD_TYPE_STRING; /* type */ + send_buff.buffer[position+6]= (uint) FIELD_TYPE_STRING; /* type */ int2store(send_buff.buffer + position + 7, 0); /* flags */ send_buff.buffer[position + 9]= (char) 0; /* decimals */ send_buff.buffer[position + 10]= 0; |