diff options
| author | unknown <davi@buzz.(none)> | 2008-02-28 20:22:50 -0300 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-02-28 20:22:50 -0300 |
| commit | 05480a88636a16119fe2ac658869a5dc415d88af (patch) | |
| tree | 676edb9a4be1993cb98b1e11f9a509999832bf6d /sql/sql_class.h | |
| parent | 944f2599fedfaa7c9a4348a2fd505419eb59a5b6 (diff) | |
| parent | 8b77945615ed06a9ae0c1861943b73f46f3cbb71 (diff) | |
| download | mariadb-git-05480a88636a16119fe2ac658869a5dc415d88af.tar.gz | |
Merge buzz.(none):/home/davi/mysql-5.0-runtime
into buzz.(none):/home/davi/mysql-5.1-runtime
mysql-test/r/ps.result:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/item.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_user_variables.result:
Manual merge
mysql-test/suite/rpl/t/rpl_user_variables.test:
Manual merge
sql/sql_yacc.yy:
Manual merge
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 2f225834545..78d25cb1894 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2606,7 +2606,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; |