summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-09-02 07:58:42 +0300
committerunknown <monty@donna.mysql.com>2000-09-02 07:58:42 +0300
commit40f6a9a9da1b6aeda9a850e468cb3f584caaa254 (patch)
tree28fa78a52ce90f0133e1275fabcefa57cfc8fa02 /sql/field.h
parent5a95cfdd68544f1728f7c2d3e92220bcafb7ac1a (diff)
downloadmariadb-git-40f6a9a9da1b6aeda9a850e468cb3f584caaa254.tar.gz
Quoting of TIMESTAMP columns and small optimizations
Build-tools/Do-compile: Fixes for remote build Docs/manual.texi: Mainly updates for Access 2000 client/mysqldump.c: Added quoting of TIMESTAMP columns include/mysql.h: Added quoting of TIMESTAMP columns include/mysql_com.h: Added quoting of TIMESTAMP columns libmysql/libmysql.c: Added quoting of TIMESTAMP columns scripts/mysql_install_db.sh: Fixed http address sql-bench/Results/ATIS-mysql-NT_4.0: New test results sql-bench/Results/RUN-mysql-NT_4.0: New test results sql-bench/Results/alter-table-mysql-NT_4.0: New test results sql-bench/Results/big-tables-mysql-NT_4.0: New test results sql-bench/Results/connect-mysql-NT_4.0: New test results sql-bench/Results/create-mysql-NT_4.0: New test results sql-bench/Results/insert-mysql-NT_4.0: New test results sql-bench/Results/select-mysql-NT_4.0: New test results sql-bench/Results/wisconsin-mysql-NT_4.0: New test results sql/ChangeLog: Changelog sql/field.h: Added quoting of TIMESTAMP columns sql/mysql_priv.h: Optimizing sql/mysqld.cc: Optimizing sql/sql_class.cc: Optimizing sql/sql_parse.cc: Added use of new 'localhost' variable sql/violite.c: Fixed print bug
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 12a4a48562f..075e0feea96 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -514,7 +514,7 @@ public:
Field_timestamp(char *ptr_arg, uint32 len_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg);
- enum Item_result result_type () const { return INT_RESULT; }
+ enum Item_result result_type () const { return field_length == 8 || field_length == 14 ? INT_RESULT : STRING_RESULT; }
enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;}
enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
void store(const char *to,uint length);