diff options
author | unknown <iggy@recycle.(none)> | 2007-01-18 11:40:22 -0500 |
---|---|---|
committer | unknown <iggy@recycle.(none)> | 2007-01-18 11:40:22 -0500 |
commit | 4ee678f9d2e7e5a04401dd4c5e7c51b5673b8171 (patch) | |
tree | ae5dcbe86c1237e32fc759c53d5928dc41331600 /include | |
parent | 1a0bd37c4d5741e7297f318da07d77767a537ca7 (diff) | |
parent | b1bfec73099b8349f07673e68d1d7ac25316dd4c (diff) | |
download | mariadb-git-4ee678f9d2e7e5a04401dd4c5e7c51b5673b8171.tar.gz |
Merge recycle.(none):/src/bug22807/my50-bug22807
into recycle.(none):/src/bug22807/my51-bug22807
client/mysql_upgrade.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/string.c:
Auto merged
Diffstat (limited to 'include')
-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 77367c1f246..aa8cef1a25a 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -782,6 +782,8 @@ extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str, extern my_bool dynstr_append(DYNAMIC_STRING *str, const char *append); my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append, uint length); +extern my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, + ...); extern my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str); extern my_bool dynstr_realloc(DYNAMIC_STRING *str, ulong additional_size); extern my_bool dynstr_trunc(DYNAMIC_STRING *str, int n); |