summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorbaker@bk-internal.mysql.com <>2006-12-03 21:19:35 +0100
committerbaker@bk-internal.mysql.com <>2006-12-03 21:19:35 +0100
commitdbe5f0acc5e9d59d5baa3e9d21e3a17e7f371148 (patch)
tree6ba887bb99250d0f79767a453ce445684766e62b /server-tools
parenta63d255bac88cfa9396330a409b3a7e5437ec9e5 (diff)
parent31d67280f71b3ce47465c1844e09465e602522a4 (diff)
downloadmariadb-git-dbe5f0acc5e9d59d5baa3e9d21e3a17e7f371148.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/protocol.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/protocol.cc b/server-tools/instance-manager/protocol.cc
index 4a8c4d0b88d..2d2f71d43fe 100644
--- a/server-tools/instance-manager/protocol.cc
+++ b/server-tools/instance-manager/protocol.cc
@@ -194,7 +194,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]= (char) FIELD_TYPE_STRING; /* type */
+ send_buff.buffer[position+6]= (char) MYSQL_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;