diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | e1f748c0bd7e347dbefb831d64755d834845d15b (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /include/my_global.h | |
| parent | 80935b8659411177bc3fca4e0eb9f7747577eb1d (diff) | |
| parent | ed9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff) | |
| download | mariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/my_global.h b/include/my_global.h index d23bbbde576..d7bedd100a0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1632,17 +1632,6 @@ do { doubleget_union _tmp; \ #endif /* WORDS_BIGENDIAN */ -/* sprintf does not always return the number of bytes :- */ -#ifdef SPRINTF_RETURNS_INT -#define my_sprintf(buff,args) sprintf args -#else -#ifdef SPRINTF_RETURNS_PTR -#define my_sprintf(buff,args) ((int)(sprintf args - buff)) -#else -#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff)) -#endif -#endif - #ifndef THREAD #define thread_safe_increment(V,L) (V)++ #define thread_safe_decrement(V,L) (V)-- |