Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
5384fbc0
Commit
5384fbc0
authored
May 12, 2004
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Plain Diff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
parents
216c3a3b
7defcb47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
2 deletions
+48
-2
sql/sql_select.cc
sql/sql_select.cc
+1
-1
tests/client_test.c
tests/client_test.c
+47
-1
No files found.
sql/sql_select.cc
View file @
5384fbc0
...
...
@@ -367,7 +367,7 @@ JOIN::prepare(Item ***rref_pointer_array,
{
if
(
item
->
with_sum_func
)
flag
|=
1
;
else
if
(
!
(
flag
&
2
)
&&
!
item
->
const_
item
())
else
if
(
!
(
flag
&
2
)
&&
!
item
->
const_
during_execution
())
flag
|=
2
;
}
if
(
flag
==
3
)
...
...
tests/client_test.c
View file @
5384fbc0
...
...
@@ -9453,7 +9453,6 @@ select col1 FROM t1 where col1=2");
myquery
(
rc
);
}
/*
This tests for various mysql_send_long_data bugs described in #1664
*/
...
...
@@ -9595,6 +9594,51 @@ static void test_bug1664()
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
*/
...
...
@@ -9877,6 +9921,8 @@ int main(int argc, char **argv)
test_union2
();
/* repeatable execution of union (Bug #3577) */
test_bug1664
();
/* test for bugs in mysql_stmt_send_long_data()
call (Bug #1664) */
test_order_param
();
/* ORDER BY with parameters in select list
(Bug #3686 */
end_time
=
time
((
time_t
*
)
0
);
total_time
+=
difftime
(
end_time
,
start_time
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment