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/sql_partition.cc | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index f042f028450..b8aa4c7e944 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4839,7 +4839,7 @@ that are reorganised. */ start_part= 0; end_part= new_total_partitions - (upper_2n + 1); - end_part= max(lower_2n - 1, end_part); + end_part= MY_MAX(lower_2n - 1, end_part); } else if (new_total_partitions <= upper_2n) { |