diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-18 23:47:11 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-18 23:47:11 +0300 |
| commit | 9d36f27bb021a3496e3b08c91f62a27daaad7664 (patch) | |
| tree | 62925f613305f153cac7b3281ddea83336002c0d /sql/sql_select.cc | |
| parent | dc72a9d59abc5291f68dc0e27a9852908d5bf064 (diff) | |
| download | mariadb-git-9d36f27bb021a3496e3b08c91f62a27daaad7664.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
BitKeeper/deleted/.del-have_default_master.inc~a54c86e65a6c4af:
Delete: mysql-test/include/have_default_master.inc
BitKeeper/deleted/.del-have_default_master.require~1465255ffdaf82f:
Delete: mysql-test/r/have_default_master.require
Docs/manual.texi:
Changelog for 3.23.38
acconfig.h:
Added test for PTHREAD_YIELD
acinclude.m4:
Added test for PTHREAD_YIELD
configure.in:
Added test for PTHREAD_YIELD
innobase/os/os0thread.c:
Added test for PTHREAD_YIELD
mysql-test/r/lock.result:
Added test of lock bug
mysql-test/t/lock.test:
Added test of lock bug
mysql-test/t/rpl000014.test:
Removed test of default master parameter
mysql-test/t/rpl000015.test:
Removed test of default master parameter
mysql-test/t/rpl000016.test:
Removed test of default master parameter
sql/ha_myisam.cc:
Don't lock locked tables in REPAIR
sql/sql_select.cc:
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 && |