diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 13:59:00 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-21 13:59:00 +0500 |
| commit | 2e2741913df3d03649d8fff3539520f2e4c4b074 (patch) | |
| tree | e8b2156f4d9545f88f277fa501ae750643638097 /include | |
| parent | 389f70dedd03ca1c980b9df7cb5d6082da01ebd0 (diff) | |
| parent | 4dbef8c2e3a432dc2efc9f91270e1e1ea53a8399 (diff) | |
| download | mariadb-git-2e2741913df3d03649d8fff3539520f2e4c4b074.tar.gz | |
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
sql/set_var.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 86ca6ec6a1f..5a769791955 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -216,7 +216,6 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); extern void free_charsets(void); -extern char *list_charsets(myf want_flags); /* my_free() this string... */ extern char *get_charsets_dir(char *buf); extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); |