diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 15:47:25 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-07 15:47:25 -0700 |
| commit | f7d4192585ef29b1525f799e7cad4a0e403e90b1 (patch) | |
| tree | b2b8ec8be76873a28415e1a77f069d3a5337dd81 /include/my_sys.h | |
| parent | 8680f86e460d8be123ddbbc855c0e744dd749648 (diff) | |
| parent | 707f42a6b988d94630f3e43dad410311f40ac4f8 (diff) | |
| download | mariadb-git-f7d4192585ef29b1525f799e7cad4a0e403e90b1.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/51
libmysql/Makefile.shared:
Auto merged
mysys/CMakeLists.txt:
Auto merged
mysys/Makefile.am:
Auto merged
include/my_sys.h:
Manual merge
mysys/default.c:
Manual merge:
- We don't support OS/2 in MySQL 5.1
- On Unix, we search /etc/mysql/ in MySQL 5.1
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 2ce36760032..7ae05bb96f7 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -691,6 +691,8 @@ extern WF_PACK *wf_comp(char * 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_t strip_sp(char * str); +extern my_bool array_append_string_unique(const char *str, + const char **array, size_t size); extern void get_date(char * to,int timeflag,time_t use_time); extern void soundex(CHARSET_INFO *, char * out_pntr, char * in_pntr, pbool remove_garbage); |