diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:13 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:13 +0300 |
| commit | c9d2e7759a97c7f32cc28182a171b5ae84622d8f (patch) | |
| tree | 92a1ae3e19e7141ccf712624b6eccf2dccb9bc73 /strings | |
| parent | 4bf227c8c20bfb6ddc9dffd01a2b5189c2745c3b (diff) | |
| parent | 6b8e2938f21c508f67ec141256d1ffc77a935851 (diff) | |
| download | mariadb-git-c9d2e7759a97c7f32cc28182a171b5ae84622d8f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/my_vsnprintf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index dbfd2783a80..34dee0f839f 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -35,6 +35,7 @@ int my_snprintf(char* to, size_t n, const char* fmt, ...) { + int result; va_list args; int result; va_start(args,fmt); @@ -127,6 +128,7 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) return (uint) (to - start); } + #ifdef MAIN #define OVERRUN_SENTRY 250 static void my_printf(const char * fmt, ...) @@ -147,6 +149,7 @@ static void my_printf(const char * fmt, ...) va_end(ar); } + int main() { |