summaryrefslogtreecommitdiff
path: root/sql/partition_element.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-11-30 16:10:35 +0100
committerAleksey Midenkov <midenok@gmail.com>2017-12-05 17:57:06 +0300
commita46f585aa7ad9891b507ca80b6a81d284a8a27f9 (patch)
tree5e33909f13dae202a7267a792590accb770e5d68 /sql/partition_element.h
parent30841c03829ef11b09662c9b84f9b358f006b0c5 (diff)
downloadmariadb-git-a46f585aa7ad9891b507ca80b6a81d284a8a27f9.tar.gz
restore Field::get_timestamp() prototype
Diffstat (limited to 'sql/partition_element.h')
-rw-r--r--sql/partition_element.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/partition_element.h b/sql/partition_element.h
index fc486abffc2..da08a15b2ce 100644
--- a/sql/partition_element.h
+++ b/sql/partition_element.h
@@ -130,14 +130,16 @@ public:
my_time_t min_time()
{
mysql_rwlock_rdlock(&lock);
- my_time_t res= min_value.get_timestamp();
+ ulong sec_part;
+ my_time_t res= min_value.get_timestamp(&sec_part);
mysql_rwlock_unlock(&lock);
return res;
}
my_time_t max_time()
{
mysql_rwlock_rdlock(&lock);
- my_time_t res= max_value.get_timestamp();
+ ulong sec_part;
+ my_time_t res= max_value.get_timestamp(&sec_part);
mysql_rwlock_unlock(&lock);
return res;
}