diff options
| author | unknown <igor@olga.mysql.com> | 2007-01-09 10:26:28 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-01-09 10:26:28 -0800 |
| commit | eca431f3f3f8498364239803c150f34569d6c473 (patch) | |
| tree | 3ef44670480dd97c145363fba05d5c1a9d5aa323 /sql/sql_lex.cc | |
| parent | 48451b86bd65bec251832e48270446edc3193e1d (diff) | |
| parent | cbd1bd90786025b98b9e510f770c5e3a0f3b23c6 (diff) | |
| download | mariadb-git-eca431f3f3f8498364239803c150f34569d6c473.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25027
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index d16f44987a2..45272645633 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1902,6 +1902,7 @@ void st_select_lex_unit::set_limit(SELECT_LEX *sl) { ha_rows select_limit_val; + DBUG_ASSERT(! thd->stmt_arena->is_stmt_prepare()); 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() : |