summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-01-14 18:51:00 +0200
committerMichael Widenius <monty@askmonty.org>2010-01-14 18:51:00 +0200
commitd121e6630519a66eec7c953ee0eae623f592ce87 (patch)
treed0e61d2ccd45fdbd82d57737ebb45ec388aee20a /sql/handler.h
parente4535de11fe8eaba8ee5013b9bd5fe3b4b713b55 (diff)
downloadmariadb-git-d121e6630519a66eec7c953ee0eae623f592ce87.tar.gz
Fix for compiler warnings on windows
Fix wrong cast of time() include/my_pthread.h: Safety fix that also removes compiler warnings sql/handler.h: Changed timestamp columns to be of type time_t storage/maria/ma_check.c: Removed wrong cast storage/maria/ma_create.c: Removed wrong cast storage/myisam/mi_check.c: Removed wrong cast storage/myisam/mi_create.c: Removed wrong cast storage/xtradb/handler/ha_innodb.cc: Removed compiler warning on windows
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/handler.h b/sql/handler.h
index db3fb8035f2..d03264a23db 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -891,9 +891,9 @@ typedef struct {
ulonglong delete_length;
ha_rows records;
ulong mean_rec_length;
- ulong create_time;
- ulong check_time;
- ulong update_time;
+ time_t create_time;
+ time_t check_time;
+ time_t update_time;
ulonglong check_sum;
} PARTITION_INFO;
@@ -1060,9 +1060,9 @@ public:
ha_rows records;
ha_rows deleted; /* Deleted records */
ulong mean_rec_length; /* physical reclength */
- ulong create_time; /* When table was created */
- ulong check_time;
- ulong update_time;
+ time_t create_time; /* When table was created */
+ time_t check_time;
+ time_t update_time;
uint block_size; /* index block size */
ha_statistics():