mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mydev/mysql-4.0

Browse source 
into mysql.com:/home/mydev/mysql-4.0-4000
This commit is contained in:
unknown 2005-01-26 09:07:25 +01:00
commit 360d32f201
4 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
innobase/include/univ.i
View file

@ -86,8 +86,10 @@ memory is read outside the allocated blocks. */
/* Make a non-inline debug version */
#ifdef DBUG_ON
# define UNIV_DEBUG
#endif /* DBUG_ON */
/*
#define UNIV_DEBUG
#define UNIV_SYNC_DEBUG
#define UNIV_MEM_DEBUG

17
mysql-test/r/order_by.result
View file

@ -554,3 +554,20 @@ explain select id,t from t1 force index (primary) order by id;
table type possible_keys key key_len ref rows Extra
t1 index NULL PRIMARY 4 NULL 1000
drop table t1;
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (2), (1), (1), (2), (1);
SELECT a FROM t1 ORDER BY a;
a
1
1
1
2
2
(SELECT a FROM t1) ORDER BY a;
a
1
1
1
2
2
DROP TABLE t1;

13
mysql-test/t/order_by.test
View file

@ -363,4 +363,15 @@ while ($1)
enable_query_log;
explain select id,t from t1 order by id;
explain select id,t from t1 force index (primary) order by id;
drop table t1;
drop table t1;
#
# Bug #7672 - a wrong result for a select query in braces followed by order by
#
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (2), (1), (1), (2), (1);
SELECT a FROM t1 ORDER BY a;
(SELECT a FROM t1) ORDER BY a;
DROP TABLE t1;

13
sql/sql_yacc.yy
View file

@ -4033,11 +4033,14 @@ optional_order_or_limit:
send_error(&lex->thd->net, ER_SYNTAX_ERROR);
YYABORT;
}
if (mysql_new_select(lex))
YYABORT;
mysql_init_select(lex);
lex->select->linkage=NOT_A_SELECT;
lex->select->select_limit=lex->thd->variables.select_limit;
if (lex->select != &lex->select_lex)
{
if (mysql_new_select(lex))
YYABORT;
mysql_init_select(lex);
lex->select->linkage=NOT_A_SELECT;
lex->select->select_limit=lex->thd->variables.select_limit;
}
}
opt_order_clause limit_clause
;