diff options
| author | monty@donna.mysql.fi <> | 2001-04-18 23:47:11 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-04-18 23:47:11 +0300 |
| commit | bc6fd0acaaf59ae1c11b0079a45895b86ed3ff83 (patch) | |
| tree | 62925f613305f153cac7b3281ddea83336002c0d /sql/sql_select.cc | |
| parent | 5a5e2be98a36db13002f5de4628327acce05f6dd (diff) | |
| download | mariadb-git-bc6fd0acaaf59ae1c11b0079a45895b86ed3ff83.tar.gz | |
Added test for PTHREAD_YIELD
Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e726a9969ca..77cf20f813a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -528,9 +528,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, if (order && (join.const_tables == join.tables || test_if_skip_sort_order(&join.join_tab[join.const_tables], order, - (having || group || - join.const_tables != join.tables - 1) ? - HA_POS_ERROR : thd->select_limit))) + (group ? HA_POS_ERROR : thd->select_limit)))) order=0; select_describe(&join,need_tmp, (order != 0 && |