diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-14 18:58:52 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 20:25:04 +0100 |
| commit | 7a2136433280fa5c38997bbd4b41121b8e727ca0 (patch) | |
| tree | 3c4974b3d98f69450a234fa7ab04cab3ec8c6fd7 /sql | |
| parent | 15f7f5c6bb4eb8ee8d868bb991f25b18d36f64ec (diff) | |
| download | mariadb-git-7a2136433280fa5c38997bbd4b41121b8e727ca0.tar.gz | |
after-merge fix partitioning tests
* use --sort_result in test files as needed
* remove old and wrong mariadb-5.3 related partitioning hack
from ha_tokudb.cc
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 25d6f723628..18259a27bc7 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -20013,6 +20013,7 @@ uint find_shortest_key(TABLE *table, const key_map *usable_keys) min_cost= cost; best=nr; } + DBUG_ASSERT(best < MAX_KEY); } } } |