diff options
| author | unknown <sergefp@mysql.com> | 2005-04-27 22:49:42 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-04-27 22:49:42 +0400 |
| commit | 756d5da03ff940d5f75f905c61b4c9cbc1fac69b (patch) | |
| tree | 938bbf5cc2fb93a77945acf676360422b24b7448 /sql/protocol.cc | |
| parent | 2ea087205e3f2df5df52b7f595e4b49b8579f145 (diff) | |
| parent | 11652c1f45f1c6be6c15abfe926da1cef1b8b4f9 (diff) | |
| download | mariadb-git-756d5da03ff940d5f75f905c61b4c9cbc1fac69b.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug9298
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
mysql-test/r/group_by.result:
Auto merged
sql/protocol.cc:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 22f1249ca28..2ea435d84ef 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, -10)-buff)); + (uint) (int10_to_str((int)from,buff, (from <0)?-10:10)-buff)); } |