diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-07 12:43:10 +0400 |
| commit | 8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39 (patch) | |
| tree | 72fa33f92344a89792845bab9225cef56b4138c4 /sql/sql_string.cc | |
| parent | 3f327432942ef5db14dd905ffd147f234dc74bfb (diff) | |
| parent | 3b862aaa10942e7405b90cf80d0c3baca4cda55d (diff) | |
| download | mariadb-git-8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 4d577fffb3e..9a21c0a9144 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -535,22 +535,21 @@ bool String::append(const char *s) return append(s, (uint) strlen(s)); } - - -bool String::append_ulonglong(ulonglong val) +bool String::append_longlong(longlong val) { if (realloc(str_length+MAX_BIGINT_WIDTH+2)) return TRUE; - char *end= (char*) longlong10_to_str(val, (char*) Ptr + str_length, 10); + char *end= (char*) longlong10_to_str(val, (char*) Ptr + str_length, -10); str_length= end - Ptr; return FALSE; } -bool String::append_longlong(longlong val) + +bool String::append_ulonglong(ulonglong val) { if (realloc(str_length+MAX_BIGINT_WIDTH+2)) return TRUE; - char *end= (char*) longlong10_to_str(val, (char*) Ptr + str_length, -10); + char *end= (char*) longlong10_to_str(val, (char*) Ptr + str_length, 10); str_length= end - Ptr; return FALSE; } |