diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-05 16:12:11 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-05 16:12:11 +0200 |
| commit | 1a7c7d763cb34b52c723c526b2e8b38432e7dec1 (patch) | |
| tree | 6c0bbcd62c23403cbba10e59389fca1f47327072 | |
| parent | c66afc4d7c238cdb63cda9c06286afb4ac981de9 (diff) | |
| download | mariadb-git-1a7c7d763cb34b52c723c526b2e8b38432e7dec1.tar.gz | |
Fixes done in 4.0 repository. For comments see the corresponding ones
in 4.0.
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/select_found.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/select_found.test | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 465c1cfdaa2..33f08b42b17 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -726,6 +726,7 @@ start_master() --server-id=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ + --local-infile \ --exit-info=256 \ --core \ --datadir=$MASTER_MYDDIR \ @@ -745,6 +746,7 @@ start_master() --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR --init-rpl-role=master \ --port=$MASTER_MYPORT \ + --local-infile \ --datadir=$MASTER_MYDDIR \ --pid-file=$MASTER_MYPID \ --socket=$MASTER_MYSOCK \ diff --git a/mysql-test/r/select_found.result b/mysql-test/r/select_found.result index 3a84c3e52da..0e2cc108bb4 100644 --- a/mysql-test/r/select_found.result +++ b/mysql-test/r/select_found.result @@ -20,6 +20,12 @@ a b select found_rows(); FOUND_ROWS() 8 +select SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS * from t1 limit 1; +a b +1 2 +select found_rows(); +FOUND_ROWS() +8 select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1; a b 8 9 diff --git a/mysql-test/t/select_found.test b/mysql-test/t/select_found.test index 9b14ab1fcf0..d6b6284a88b 100644 --- a/mysql-test/t/select_found.test +++ b/mysql-test/t/select_found.test @@ -9,6 +9,8 @@ select SQL_CALC_FOUND_ROWS * from t1; select found_rows(); select SQL_CALC_FOUND_ROWS * from t1 limit 1; select found_rows(); +select SQL_BUFFER_RESULT SQL_CALC_FOUND_ROWS * from t1 limit 1; +select found_rows(); select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1; select found_rows(); select SQL_CALC_FOUND_ROWS distinct b from t1 limit 1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3135fe050dc..14feb12c769 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -187,7 +187,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, TABLE *tmp_table; int error, tmp_error; bool need_tmp,hidden_group_fields; - bool simple_order,simple_group,no_order, skip_sort_order; + bool simple_order,simple_group,no_order, skip_sort_order, buffer_result; Item::cond_result cond_value; SQL_SELECT *select; DYNAMIC_ARRAY keyuse; @@ -201,6 +201,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, /* Check that all tables, fields, conds and order are ok */ select_distinct=test(select_options & SELECT_DISTINCT); + buffer_result=test(select_options & OPTION_BUFFER_RESULT) && !test(select_options & OPTION_FOUND_ROWS); tmp_table=0; select=0; no_order=skip_sort_order=0; @@ -546,8 +547,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, need_tmp= (join.const_tables != join.tables && ((select_distinct || !simple_order || !simple_group) || - (group && order) || - test(select_options & OPTION_BUFFER_RESULT))); + (group && order) || buffer_result)); // No cache for MATCH make_join_readinfo(&join, |