diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /mysys/stacktrace.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'mysys/stacktrace.c')
| -rw-r--r-- | mysys/stacktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/stacktrace.c b/mysys/stacktrace.c index 402520990b6..613911e4495 100644 --- a/mysys/stacktrace.c +++ b/mysys/stacktrace.c @@ -95,7 +95,7 @@ static int safe_print_str(const char *addr, int max_len) /* Read up to the maximum number of bytes. */ while (total) { - count= min(sizeof(buf), total); + count= MY_MIN(sizeof(buf), total); if ((nbytes= pread(fd, buf, count, offset)) < 0) { @@ -348,7 +348,7 @@ void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack) if (!stack_bottom || (uchar*) stack_bottom > (uchar*) &fp) { - ulong tmp= min(0x10000,thread_stack); + ulong tmp= MY_MIN(0x10000,thread_stack); /* Assume that the stack starts at the previous even 65K */ stack_bottom= (uchar*) (((ulong) &fp + tmp) & ~(ulong) 0xFFFF); my_safe_printf_stderr("Cannot determine thread, fp=%p, " |