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/item_func.h | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index ecdbd4c30ed..dced158bb86 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1,7 +1,7 @@ #ifndef ITEM_FUNC_INCLUDED #define ITEM_FUNC_INCLUDED /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 2020, MariaDB 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 @@ -2574,15 +2574,15 @@ public: char *end_not_used; String *res; res= val_str(&str_value); - return res ? my_strntod(res->charset(),(char*) res->ptr(), - res->length(), &end_not_used, &err_not_used) : 0.0; + return res ? res->charset()->strntod((char*) res->ptr(), res->length(), + &end_not_used, &err_not_used) : 0.0; } longlong val_int() { int err_not_used; String *res; res=val_str(&str_value); - return res ? my_strntoll(res->charset(),res->ptr(),res->length(),10, - (char**) 0, &err_not_used) : (longlong) 0; + return res ? res->charset()->strntoll(res->ptr(),res->length(),10, + (char**) 0, &err_not_used) : (longlong) 0; } my_decimal *val_decimal(my_decimal *dec_buf) { |