summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-09-22 20:22:55 +0200
committerSergei Golubchik <serg@mariadb.org>2017-09-23 20:22:46 +0200
commit80b9ce359312c1520623531bf173ee048317fee3 (patch)
tree2b6ae2fbaa78af922e9182bb6e5484b6e0c24da3 /sql/item.h
parent1320ad5b9253256afe98e948d25ed0a423a1e6da (diff)
downloadmariadb-git-80b9ce359312c1520623531bf173ee048317fee3.tar.gz
MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT()
3-argument form of DATE_FORMAT
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index 3f8ccb88392..04dad5265d3 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -491,6 +491,8 @@ struct find_selective_predicates_list_processor_data
List<st_cond_statistic> list;
};
+class MY_LOCALE;
+
class Item_equal;
class COND_EQUAL;
@@ -644,6 +646,8 @@ public:
*/
String *val_str() { return val_str(&str_value); }
+ const MY_LOCALE *locale_from_val_str();
+
LEX_CSTRING name; /* Name of item */
/* Original item name (if it was renamed)*/
const char *orig_name;