summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-08-24 14:02:32 +0200
committerunknown <knielsen@knielsen-hq.org>2012-08-24 14:02:32 +0200
commitfc666a0df6c69a620d3cffacd78e2569fb0ac410 (patch)
treea956401c47c0464ad21f91d7e864af1ab89e0469 /sql/item.h
parente44a800d91a887119d3b612276b37f09b076fee1 (diff)
parent96703a63da2211cefcc480fa4f135acd94743622 (diff)
downloadmariadb-git-fc666a0df6c69a620d3cffacd78e2569fb0ac410.tar.gz
merge from 5.2
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 4953c0c5c9f..ab5243a3d0a 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -620,6 +620,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 set_name_for_rollback(THD *thd, const char *str, uint length,
CHARSET_INFO *cs);
void rename(char *new_name);