diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-01-26 20:27:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-01-28 12:29:23 +0400 |
| commit | f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66 (patch) | |
| tree | ce84da1deeea573be5be7db7d739a4c9ba9b40f8 /sql/procedure.h | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/procedure.h')
| -rw-r--r-- | sql/procedure.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/procedure.h b/sql/procedure.h index 8cb8ce9a677..769eac5f217 100644 --- a/sql/procedure.h +++ b/sql/procedure.h @@ -2,6 +2,7 @@ #define PROCEDURE_INCLUDED /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,7 +89,7 @@ public: { int err_not_used; char *end_not_used; - value= my_strntod(cs,(char*) str,length, &end_not_used, &err_not_used); + value= cs->strntod((char*) str,length, &end_not_used, &err_not_used); } double val_real() { return value; } longlong val_int() { return (longlong) value; } @@ -116,7 +117,7 @@ public: void set(double nr) { value=(longlong) nr; } void set(longlong nr) { value=nr; } void set(const char *str,uint length, CHARSET_INFO *cs) - { int err; value=my_strntoll(cs,str,length,10,NULL,&err); } + { int err; value= cs->strntoll(str,length,10,NULL,&err); } double val_real() { return (double) value; } longlong val_int() { return value; } String *val_str(String *s) { s->set(value, default_charset()); return s; } @@ -140,14 +141,14 @@ public: int err_not_used; char *end_not_used; CHARSET_INFO *cs= str_value.charset(); - return my_strntod(cs, (char*) str_value.ptr(), str_value.length(), - &end_not_used, &err_not_used); + return cs->strntod((char*) str_value.ptr(), str_value.length(), + &end_not_used, &err_not_used); } longlong val_int() { int err; CHARSET_INFO *cs=str_value.charset(); - return my_strntoll(cs,str_value.ptr(),str_value.length(),10,NULL,&err); + return cs->strntoll(str_value.ptr(),str_value.length(),10,NULL,&err); } String *val_str(String*) { |