summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-08-24 12:32:46 +0200
committerunknown <knielsen@knielsen-hq.org>2012-08-24 12:32:46 +0200
commit96703a63da2211cefcc480fa4f135acd94743622 (patch)
treea95df690fd2ca5cf82947213f2da5ad653fc26c1 /sql/item.h
parent60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff)
parentcdeabcfd436c65e0a97e74b1722d0259ba907541 (diff)
downloadmariadb-git-96703a63da2211cefcc480fa4f135acd94743622.tar.gz
Merge from 5.1.
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index 4f1bd10612a..cacf0f43229 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -572,6 +572,7 @@ public:
#endif
} /*lint -e1509 */
void set_name(const char *str, uint length, CHARSET_INFO *cs);
+ void set_name_no_truncate(const char *str, uint length, CHARSET_INFO *cs);
void rename(char *new_name);
void init_make_field(Send_field *tmp_field,enum enum_field_types type);
virtual void cleanup();