1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixed a wrong merge in prune_partitions()

Added forgotten partition_explicit_prune from mysql-5.6.

Backported the fix for
Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
from mysql-5.6
This commit is contained in:
Igor Babaev
2013-07-31 06:45:44 -07:00
parent 159866b6d3
commit 507410379a
4 changed files with 2745 additions and 1 deletions

View File

@ -3969,7 +3969,6 @@ end:
thd->no_errors=0;
thd->mem_root= range_par->old_root;
free_root(&alloc,MYF(0)); // Return memory & allocator
DBUG_RETURN(retval);
/*
Must be a subset of the locked partitions.
lock_partitions contains the partitions marked by explicit partition
@ -3993,7 +3992,11 @@ end:
&prune_param.part_info->read_partitions);
}
if (bitmap_is_clear_all(&(prune_param.part_info->read_partitions)))
{
table->all_partitions_pruned_away= true;
retval= TRUE;
}
DBUG_RETURN(retval);
}