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 /libmysqld/libmysql.c | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'libmysqld/libmysql.c')
| -rw-r--r-- | libmysqld/libmysql.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index d931b251bfd..2be94882303 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates - Copyright (c) 2009, 2017, MariaDB Corporation + 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 @@ -1206,7 +1206,7 @@ myodbc_remove_escape(MYSQL *mysql,char *name) { char *to; #ifdef USE_MB - my_bool use_mb_flag=use_mb(mysql->charset); + my_bool use_mb_flag= my_ci_use_mb(mysql->charset); char *UNINIT_VAR(end); if (use_mb_flag) for (end=name; *end ; end++) ; @@ -3198,7 +3198,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t } case MYSQL_TYPE_FLOAT: { - double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err); + double data= my_ci_strntod(&my_charset_latin1, value, length, &endptr, &err); float fdata= (float) data; *param->error= (fdata != data) | MY_TEST(err); floatstore(buffer, fdata); @@ -3206,7 +3206,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, size_t } case MYSQL_TYPE_DOUBLE: { - double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err); + double data= my_ci_strntod(&my_charset_latin1, value, length, &endptr, &err); *param->error= MY_TEST(err); doublestore(buffer, data); break; |