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 /dbug | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index b285b32fa17..9ec8044eaf1 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1332,7 +1332,7 @@ void _db_dump_(uint _line_, const char *keyword, if (TRACING) { Indent(cs, cs->level + 1); - pos= min(max(cs->level-cs->stack->sub_level,0)*INDENT,80); + pos= MY_MIN(MY_MAX(cs->level-cs->stack->sub_level,0)*INDENT,80); } else { @@ -1737,7 +1737,7 @@ static void Indent(CODE_STATE *cs, int indent) { int count; - indent= max(indent-1-cs->stack->sub_level,0)*INDENT; + indent= MY_MAX(indent-1-cs->stack->sub_level,0)*INDENT; for (count= 0; count < indent ; count++) { if ((count % INDENT) == 0) |