diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 17:31:20 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-29 17:31:20 +0400 |
| commit | 307ed01440291b47e938073666f5e77c62eefb8c (patch) | |
| tree | 264982c7494f97fc034269d9b20c340299092a4b /client/sql_string.cc | |
| parent | 6a188877d440749e51aafdc98e4e656ae166d9ba (diff) | |
| download | mariadb-git-307ed01440291b47e938073666f5e77c62eefb8c.tar.gz | |
Move latin1 into a separarte file
Diffstat (limited to 'client/sql_string.cc')
| -rw-r--r-- | client/sql_string.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/sql_string.cc b/client/sql_string.cc index 5083fb13105..652ea1737e4 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -135,14 +135,14 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs) if (decimals >= NOT_FIXED_DEC) { sprintf(buff,"%.14g",num); // Enough for a DATETIME - return copy(buff, (uint32) strlen(buff), my_charset_latin1, cs); + return copy(buff, (uint32) strlen(buff), &my_charset_latin1, cs); } #ifdef HAVE_FCONVERT int decpt,sign; char *pos,*to; VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1)); - if (!my_isdigit(my_charset_latin1, buff[1])) + if (!my_isdigit(&my_charset_latin1, buff[1])) { // Nan or Inf pos=buff+1; if (sign) @@ -150,7 +150,7 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs) buff[0]='-'; pos=buff; } - return copy(pos,(uint32) strlen(pos), my_charset_latin1, cs); + return copy(pos,(uint32) strlen(pos), &my_charset_latin1, cs); } if (alloc((uint32) ((uint32) decpt+3+decimals))) return TRUE; @@ -200,7 +200,7 @@ end: #else sprintf(buff,"%.*f",(int) decimals,num); #endif - return copy(buff,(uint32) strlen(buff), my_charset_latin1, cs); + return copy(buff,(uint32) strlen(buff), &my_charset_latin1, cs); #endif } |