diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 11:37:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 11:37:29 +0200 |
| commit | 2ba487cfe8bd95b90a537a5e9e54b5c1a5a35f37 (patch) | |
| tree | d807814af6a0e1bb93b9f0060244220a0830dcc8 /sql/partition_info.cc | |
| parent | afc56a509cc7d3d651ca68ad826ca183da8dc7cc (diff) | |
| parent | ef3147b1d64b298486fc6f77f9e84b28a9d1c5b3 (diff) | |
| download | mariadb-git-2ba487cfe8bd95b90a537a5e9e54b5c1a5a35f37.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 5939da09eae..a60ca28044f 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2006, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2010, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -957,7 +957,8 @@ bool partition_info::vers_set_expression(THD *thd, partition_element *el, MYSQL_ col_val->fixed= 1; continue; } - Item *item_expression= new (thd->mem_root) Item_datetime_literal(thd, &t); + Item *item_expression= new (thd->mem_root) + Item_datetime_literal(thd, &t, 0); if (!item_expression) return true; /* We initialize col_val with bogus max value to make fix_partition_func() and check_range_constants() happy. |