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

backport of guilhem@mysql.com-20100628140739-i9vy8ugxp1v5aspb

Browse Source 
from next-mr-bugfixing:
BUG#54682 "set sql_select_limit=0 does not work"; let SQL_SELECT_LIMIT=0
work like it does in 5.1.


mysql-test/suite/sys_vars/r/sql_select_limit_func.result:
  before the fix, the SET would emit a warning (0 being rounded up to 1)
  and SELECTs would return one row.
sql/sys_vars.cc:
  0 is allowed, it means an implicit LIMIT 0 (i.e. no rows returned)
This commit is contained in:
Guilhem Bichot
2010-07-08 14:36:10 +02:00
parent 31e46bae52
commit 18bde950e3
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sys_vars/r/sql_select_limit_func.result
View File

@ -62,6 +62,16 @@ a b a b
6 val6 6 val6 6 val6 6 val6
affected rows: 2 affected rows: 2
Expecting affected rows: 2 Expecting affected rows: 2
SET SESSION sql_select_limit = 0;
affected rows: 0
SELECT * FROM t1;
a b
affected rows: 0
Expecting affected rows: 0
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
a b a b
affected rows: 0
Expecting affected rows: 0
'#-----------------------------FN_DYNVARS_165_03---------------#' '#-----------------------------FN_DYNVARS_165_03---------------#'
SET SESSION sql_select_limit = 2; SET SESSION sql_select_limit = 2;
affected rows: 0 affected rows: 0

8
mysql-test/suite/sys_vars/t/sql_select_limit_func.test
View File

@ -86,6 +86,14 @@ SELECT * FROM t1;
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a; SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
--echo Expecting affected rows: 2 --echo Expecting affected rows: 2
SET SESSION sql_select_limit = 0;
SELECT * FROM t1;
--echo Expecting affected rows: 0
SELECT * FROM t1 INNER JOIN t2 ON t1.a = t2.a;
--echo Expecting affected rows: 0
--echo '#-----------------------------FN_DYNVARS_165_03---------------#' --echo '#-----------------------------FN_DYNVARS_165_03---------------#'
# #
# Small value with LIMIT Clause # Small value with LIMIT Clause

2
sql/sys_vars.cc
View File

@ -2379,7 +2379,7 @@ static Sys_var_harows Sys_select_limit(
"sql_select_limit", "sql_select_limit",
"The maximum number of rows to return from SELECT statements", "The maximum number of rows to return from SELECT statements",
SESSION_VAR(select_limit), NO_CMD_LINE, SESSION_VAR(select_limit), NO_CMD_LINE,
VALID_RANGE(1, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1)); VALID_RANGE(0, HA_POS_ERROR), DEFAULT(HA_POS_ERROR), BLOCK_SIZE(1));
static bool update_timestamp(THD *thd, set_var *var) static bool update_timestamp(THD *thd, set_var *var)
{ {