summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2005-05-01 19:07:01 +0400
committersergefp@mysql.com <>2005-05-01 19:07:01 +0400
commitc83b78169e52a40241d0dc0e88cddbd84420c572 (patch)
treeb73b89ec50788347770f8e2d1a205784b6bc4089 /sql/protocol.cc
parente721ec37ff18526564d65b09390f6c60292287b3 (diff)
parentacca8f7af3908de1769de6a3c4d78ae958e69a53 (diff)
downloadmariadb-git-c83b78169e52a40241d0dc0e88cddbd84420c572.tar.gz
Merge mysql.com:/home/psergey/mysql-4.1-bug9228
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index 2ea435d84ef..9a96da004c5 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -820,7 +820,7 @@ bool Protocol_simple::store_long(longlong from)
#endif
char buff[20];
return net_store_data((char*) buff,
- (uint) (int10_to_str((int)from,buff, (from <0)?-10:10)-buff));
+ (uint) (int10_to_str((long int)from,buff, (from <0)?-10:10)-buff));
}