diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2011-03-14 15:06:44 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2011-03-14 15:06:44 -0300 |
| commit | ebaf3de8b713cd7f1dd88950e0d37ad4fb828057 (patch) | |
| tree | 4aeaf06433441796a8b350fbeb18289e0f2c5dab /sql/sql_analyse.cc | |
| parent | cf2af2bd6f59a1127239bf5ca1588d8b4e7a1c83 (diff) | |
| parent | 07106d4ad95175b50db878c16b12215b2221db87 (diff) | |
| download | mariadb-git-ebaf3de8b713cd7f1dd88950e0d37ad4fb828057.tar.gz | |
Merge of mysql-5.1 into mysql-5.5.
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 e3c0ed28052..b070768a7b6 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); } |