summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-11-07 16:26:29 -0700
committerunknown <tsmith@ramayana.hindu.god>2007-11-07 16:26:29 -0700
commit3a7e070f53565c225b19bd633effbd21d2822b10 (patch)
tree985e1a3104a72b480c88c6f6ee954c6a627ecd64 /include
parent7bb73945459e71bdd8fa1297dc3fd313306235cc (diff)
parent707f42a6b988d94630f3e43dad410311f40ac4f8 (diff)
downloadmariadb-git-3a7e070f53565c225b19bd633effbd21d2822b10.tar.gz
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50 include/my_sys.h: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 4f7e75a836e..d31ebb1f440 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -691,6 +691,8 @@ extern WF_PACK *wf_comp(my_string str);
extern int wf_test(struct wild_file_pack *wf_pack,const char *name);
extern void wf_end(struct wild_file_pack *buffer);
extern size_s strip_sp(my_string str);
+extern my_bool array_append_string_unique(const char *str,
+ const char **array, size_t size);
extern void get_date(my_string to,int timeflag,time_t use_time);
extern void soundex(CHARSET_INFO *, my_string out_pntr, my_string in_pntr,pbool remove_garbage);
extern int init_record_cache(RECORD_CACHE *info,uint cachesize,File file,