diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
| commit | 416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch) | |
| tree | 5244b83a9f22d4d5899154c9a64a316111bbe6b6 /sql/item.h | |
| parent | adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff) | |
| download | mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz | |
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc:
drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
with loose- prefix ssl errors are ignored
sql-common/client.c:
compiler warnings
sql/field.cc:
use the new function
sql/item.cc:
don't convert time to double or decimal via longlong,
this loses sub-second part.
Use dedicated functions.
sql/item.h:
incorrect cast_to_int type for params
sql/item_strfunc.cc:
use the new function
sql/lex.h:
unused
sql/my_decimal.h:
helper macro
sql/sql_plugin.cc:
workaround for a compiler warning
sql/sql_yacc.yy:
unused
sql/transaction.cc:
fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
compiler warnings
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index f7f3edda384..1f79f833f97 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2231,7 +2231,6 @@ public: Item_param(uint pos_in_query_arg); enum Item_result result_type () const { return item_result_type; } - enum Item_result cast_to_int_type() const { return item_result_type; } enum Type type() const { return item_type; } enum_field_types field_type() const { return param_type; } |