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 /sql/rpl_utility.cc | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index 1b9e744bcc1..33e04e488cb 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -779,7 +779,7 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli, /* We only check the initial columns for the tables. */ - uint const cols_to_check= min(table->s->fields, size()); + uint const cols_to_check= MY_MIN(table->s->fields, size()); TABLE *tmp_table= NULL; for (uint col= 0 ; col < cols_to_check ; ++col) |