database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 'mysql-5.1' into mysql-5.5

Browse Source
This commit is contained in:
Sreeharsha Ramanavarapu
2015-08-03 08:17:27 +05:30
parent 18b2c77780 8006ad8053
commit b2df544886
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/opt_range.cc
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights
* reserved. * reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@@ -3296,7 +3296,16 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree)
key_tree->min_flag | key_tree->min_flag |
key_tree->max_flag, key_tree->max_flag,
&subpart_iter); &subpart_iter);
DBUG_ASSERT(res); /* We can't get "no satisfying subpartitions" */ if (res == 0)
{
/*
The only case where we can get "no satisfying subpartitions"
returned from the above call is when an error has occurred.
*/
DBUG_ASSERT(range_par->thd->is_error());
return 0;
}
if (res == -1) if (res == -1)
goto pop_and_go_right; /* all subpartitions satisfy */ goto pop_and_go_right; /* all subpartitions satisfy */