summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-08-24 15:29:01 +0200
committerunknown <knielsen@knielsen-hq.org>2012-08-24 15:29:01 +0200
commitced3907c02dfa3b237e14d79aa800b3a0769e94a (patch)
tree1189a55392ca290d6c9e8446250b7a9384feafb6 /sql/item.h
parentcaa535eb9fa97bd7c2190292bb4a3a3c1aaa71e3 (diff)
parentfc666a0df6c69a620d3cffacd78e2569fb0ac410 (diff)
downloadmariadb-git-ced3907c02dfa3b237e14d79aa800b3a0769e94a.tar.gz
Merge from 5.3
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 f7f3edda384..8855996b76c 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -656,6 +656,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);