diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
commit | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch) | |
tree | f0b9f34521554ce94ef9a5bd6c7e5f595459240f /include | |
parent | ea7830eef48333e28f98a9b91f05a95735b465a3 (diff) | |
parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
download | mariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql/service_my_snprintf.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h index bd1f069c527..6757a658fb6 100644 --- a/include/mysql/service_my_snprintf.h +++ b/include/mysql/service_my_snprintf.h @@ -55,7 +55,8 @@ Supported formats are 's' (null pointer is accepted, printed as "(null)"), 'b' (extension, see below), 'c', 'd', 'i', 'u', 'x', 'o', - 'X', 'p' (works as 0x%x), 'f', 'g', 'M' (extension, see below). + 'X', 'p' (works as 0x%x), 'f', 'g', 'M' (extension, see below), + 'T' (extension, see below). Standard syntax for positional arguments $n is supported. @@ -69,6 +70,9 @@ Format 'M': takes one integer, prints this integer, space, double quote error message, double quote. In other words printf("%M", n) === printf("%d \"%s\"", n, strerror(n)) + + Format 'T': takes string and print it like s but if the strints should be + truncated puts "..." at the end. */ #ifdef __cplusplus |