diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
| commit | e415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch) | |
| tree | f113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /sql/sql_analyse.cc | |
| parent | 046418ad956c98c3788d79650fcb50479844df3b (diff) | |
| parent | a1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff) | |
| download | mariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz | |
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index a57bd41c7e6..218f1a6bab1 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -242,7 +242,7 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len) if (str == end) { info->is_float = 1; // we can't use variable decimals here - return 1; + DBUG_RETURN(1); } DBUG_RETURN(0); } |