diff options
| author | unknown <jimw@mysql.com> | 2005-07-06 16:49:04 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-06 16:49:04 -0700 |
| commit | 8a23dd867273d2dc1c54273ab37308560d47f86a (patch) | |
| tree | a8b80d8787143eca5e117b5eae0731a99f34dea2 /sql/sql_lex.cc | |
| parent | 348dfd416396cd6d7b541ddaef0d0ea71667fa67 (diff) | |
| parent | 2e70ec89f96c11001d0be2c5e7dbd527c01defeb (diff) | |
| download | mariadb-git-8a23dd867273d2dc1c54273ab37308560d47f86a.tar.gz | |
Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/sql/mysqld.dsp:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/item_strfunc.cc:
SCCS merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f0868b9aeaa..20f5092c5ce 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1780,12 +1780,13 @@ uint8 st_lex::get_effective_with_check(st_table_list *view) void st_select_lex_unit::set_limit(SELECT_LEX *sl) { - ulonglong select_limit_val; + ha_rows select_limit_val; DBUG_ASSERT(! thd->current_arena->is_stmt_prepare()); - select_limit_val= sl->select_limit ? sl->select_limit->val_uint() : - HA_POS_ERROR; - offset_limit_cnt= sl->offset_limit ? sl->offset_limit->val_uint() : ULL(0); + select_limit_val= (ha_rows)(sl->select_limit ? sl->select_limit->val_uint() : + HA_POS_ERROR); + offset_limit_cnt= (ha_rows)(sl->offset_limit ? sl->offset_limit->val_uint() : + ULL(0)); select_limit_cnt= select_limit_val + offset_limit_cnt; if (select_limit_cnt < select_limit_val) select_limit_cnt= HA_POS_ERROR; // no limit |