diff options
| author | unknown <sergefp@mysql.com> | 2005-05-01 19:07:01 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-01 19:07:01 +0400 |
| commit | 21eed96b0261a6c6eff4f8df1493a0e57decf2bb (patch) | |
| tree | b73b89ec50788347770f8e2d1a205784b6bc4089 | |
| parent | d1d474c812a1020af48bebe6ecc68bdc51d0674c (diff) | |
| parent | 7ecca388affd6c3aeea2243b383356df71ea34fa (diff) | |
| download | mariadb-git-21eed96b0261a6c6eff4f8df1493a0e57decf2bb.tar.gz | |
Merge mysql.com:/home/psergey/mysql-4.1-bug9228
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
sql/protocol.cc:
Auto merged
| -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 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)); } |