summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-03-10 10:12:23 +0100
committerunknown <knielsen@knielsen-hq.org>2010-03-10 10:12:23 +0100
commit4d7b6a6ea157bfa193376fb6367b64dd23e0d058 (patch)
treed0413974498733fac08c2e0dee7719eda7a4a48a /include/my_sys.h
parentb1a6297986d59c7d4a13ee7df89b4b7c384aa22b (diff)
parent0230d51be8e336edbfa2a04c0f5bfdb9feaa6122 (diff)
downloadmariadb-git-4d7b6a6ea157bfa193376fb6367b64dd23e0d058.tar.gz
Automerge MySQL 5.1.44 merge into latest MariaDB trunk.
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index e8b48f089b6..d4af719c021 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -999,7 +999,6 @@ extern my_bool resolve_collation(const char *cl_name,
CHARSET_INFO *default_cl,
CHARSET_INFO **cl);
-extern void free_charsets(void);
extern char *get_charsets_dir(char *buf);
extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2);
extern my_bool init_compiled_charsets(myf flags);