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

treat parameter as constant in ORDER BY check of fields in SELECT list(Bug #3686)

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-05-10 13:29:02 +03:00
parent c745ae9503
commit a00117902f
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -367,7 +367,8 @@ JOIN::prepare(Item ***rref_pointer_array,
{ {
if (item->with_sum_func) if (item->with_sum_func)
flag|=1; flag|=1;
else if (!(flag & 2) && !item->const_item()) else if (!(flag & 2) &&
test(item->used_tables() & ~PARAM_TABLE_BIT))
flag|=2; flag|=2;
} }
if (flag == 3) if (flag == 3)

48
tests/client_test.c
View File

@ -9453,7 +9453,6 @@ select col1 FROM t1 where col1=2");
myquery(rc); myquery(rc);
} }
/* /*
This tests for various mysql_send_long_data bugs described in #1664 This tests for various mysql_send_long_data bugs described in #1664
*/ */
@ -9595,6 +9594,51 @@ static void test_bug1664()
myquery(rc); myquery(rc);
} }
static void test_order_param()
{
MYSQL_STMT *stmt;
int rc;
myheader("test_order_param");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
myquery(rc);
rc= mysql_query(mysql,"CREATE TABLE t1(a INT, b char(10))");
myquery(rc);
stmt= mysql_simple_prepare(mysql,
"select sum(a) + 200, 1 from t1 \
union distinct \
select sum(a) + 200, 1 from t1 \
group by b ");
check_stmt(stmt);
mysql_stmt_close(stmt);
stmt= mysql_simple_prepare(mysql,
"select sum(a) + 200, ? from t1 \
group by b \
union distinct \
select sum(a) + 200, 1 from t1 \
group by b ");
check_stmt(stmt);
stmt= mysql_simple_prepare(mysql,
"select sum(a) + 200, ? from t1 \
union distinct \
select sum(a) + 200, 1 from t1 \
group by b ");
check_stmt(stmt);
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP TABLE t1");
myquery(rc);
}
/* /*
Read and parse arguments and MySQL options from my.cnf Read and parse arguments and MySQL options from my.cnf
*/ */
@ -9877,6 +9921,8 @@ int main(int argc, char **argv)
test_union2(); /* repeatable execution of union (Bug #3577) */ test_union2(); /* repeatable execution of union (Bug #3577) */
test_bug1664(); /* test for bugs in mysql_stmt_send_long_data() test_bug1664(); /* test for bugs in mysql_stmt_send_long_data()
call (Bug #1664) */ call (Bug #1664) */
test_order_param(); /* ORDER BY with parameters in select list
(Bug #3686 */
end_time= time((time_t *)0); end_time= time((time_t *)0);
total_time+= difftime(end_time, start_time); total_time+= difftime(end_time, start_time);