diff options
| author | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-02-13 15:30:00 +0100 |
| commit | 01c2ca5b8adbb6ad86defe286c294ff43ba864cb (patch) | |
| tree | b18d35bd6d44eca9b87d18a27bf8c62a767396fa /sql/item_func.cc | |
| parent | d0b456fead3ea73a9b60d2dbc2fd903e8e62508b (diff) | |
| parent | 26c7003e377609dd0aec79690793f6e390c8f8d5 (diff) | |
| download | mariadb-git-01c2ca5b8adbb6ad86defe286c294ff43ba864cb.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 34a61ba0353..82ff9de4a56 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2254,7 +2254,7 @@ double user_var_entry::val(my_bool *null_value) case INT_RESULT: return (double) *(longlong*) value; case STRING_RESULT: - return atof(value); // This is null terminated + return my_atof(value); // This is null terminated case ROW_RESULT: DBUG_ASSERT(1); // Impossible break; |