database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge gleb.loc:/home/uchum/work/bk/5.0-opt

Browse Source 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
This commit is contained in:
gshchepa/uchum@gleb.loc
2007-07-27 13:38:11 +05:00
parent 1339cdb75a 3301955b6e
commit e6c7e7d630
4 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_select.cc
View File

@ -12313,7 +12313,6 @@ static int test_if_order_by_key(ORDER *order, TABLE *table, uint idx,
*/
if (!on_primary_key &&
(table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) &&
ha_legacy_type(table->s->db_type()) == DB_TYPE_INNODB &&
table->s->primary_key != MAX_KEY)
{
on_primary_key= TRUE;