diff options
| author | igor@olga.mysql.com <> | 2007-01-09 10:26:28 -0800 |
|---|---|---|
| committer | igor@olga.mysql.com <> | 2007-01-09 10:26:28 -0800 |
| commit | 5cd4ba4e0bc6fb4de75f5ebba9752b3a8093994a (patch) | |
| tree | 3ef44670480dd97c145363fba05d5c1a9d5aa323 /sql/sql_lex.cc | |
| parent | 0fa12d249105c1e0a0026f8931e7efcbbfce30e0 (diff) | |
| parent | 8642d23b6a1ef75d9120ba0871de2c183feee7db (diff) | |
| download | mariadb-git-5cd4ba4e0bc6fb4de75f5ebba9752b3a8093994a.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
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() : |