diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
| commit | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (patch) | |
| tree | 667c2782c7fcee247010d3413aaf80a81fc6dd92 /sql/sql_class.h | |
| parent | 6a6e77eeffc7dbd72888ef685fdb93fc2ae7aed6 (diff) | |
| parent | 0db1f520c629455b4766c3d8f57a9767d7f6a98f (diff) | |
| download | mariadb-git-c425bf421da9ffa55d3d568f70508fa12dd07aa0.tar.gz | |
Merge chunk from trunk.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index aaa7bcf8104..45539f774b5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2337,7 +2337,7 @@ class user_var_entry bool unsigned_flag; double val_real(my_bool *null_value); - longlong val_int(my_bool *null_value); + longlong val_int(my_bool *null_value) const; String *val_str(my_bool *null_value, String *str, uint decimals); my_decimal *val_decimal(my_bool *null_value, my_decimal *result); DTCollation collation; |