mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Unchecked changes, so that I could run mysql-test.
If I ruined anything, write your complaints to sasha@mysql.com sql/sql_delete.cc: Unchecked changes, so that I could run mysql-test sql/sql_lex.h: Unchecked changes, so that I could run mysql-test sql/sql_parse.cc: Unchecked changes, so that I could run mysql-test sql/sql_union.cc: Unchecked changes, so that I could run mysql-test sql/sql_yacc.yy: Unchecked changes, so that I could run mysql-test BitKeeper/etc/ignore: Added libmysqld/examples/link_sources to the ignore list
This commit is contained in:
@@ -2888,7 +2888,7 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result)
|
||||
*new_table_list=0; // end result list
|
||||
for (sl= &lex->select_lex; sl; sl=sl->next)
|
||||
{
|
||||
if (sl->order_list.first && sl->next)
|
||||
if (sl->order_list.first && sl->next && !sl->braces)
|
||||
{
|
||||
net_printf(&thd->net,ER_WRONG_USAGE,"UNION","ORDER BY");
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user