diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
| commit | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (patch) | |
| tree | 9c02baa18cdca6f60d80e2f7ee7f3f792c293ab9 /libmysqld | |
| parent | 068c61978e3a81836d52b8caf11e044290159ad1 (diff) | |
| download | mariadb-git-3143ad589a24ac7581e2195ba0dc13576cb3c9da.tar.gz | |
Push a lot of small fixes to get larger parts to compile
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 6d718a6baa6..6f8f9ddcfd5 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -885,7 +885,7 @@ write_eof_packet(THD *thd, uint server_status, uint statement_warn_count) is cleared between substatements, and mysqltest gets confused */ thd->cur_data->embedded_info->warning_count= - (thd->spcont ? 0 : min(statement_warn_count, 65535)); + (thd->spcont ? 0 : MY_MIN(statement_warn_count, 65535)); return FALSE; } |