diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2010-07-08 14:36:10 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2010-07-08 14:36:10 +0200 |
| commit | 18bde950e33b2fa7e54500b2a7994d88b3cc4bf1 (patch) | |
| tree | 5f9ac42249073c026a0a3e9bb275195c541cac2e /sql/sys_vars.cc | |
| parent | 31e46bae52e5037687b6110744ee26a3b3f7a91b (diff) | |
| download | mariadb-git-18bde950e33b2fa7e54500b2a7994d88b3cc4bf1.tar.gz | |
backport of guilhem@mysql.com-20100628140739-i9vy8ugxp1v5aspb
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)
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 6b7dd7a8a2e..eafb20cf0a3 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2379,7 +2379,7 @@ static Sys_var_harows Sys_select_limit( "sql_select_limit", "The maximum number of rows to return from SELECT statements", 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) { |