diff options
| author | unknown <gkodinov/kgeorge@macbook.local> | 2007-01-08 12:32:48 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.local> | 2007-01-08 12:32:48 +0200 |
| commit | cea66abf7b87581ade53b06df508b627d92c5151 (patch) | |
| tree | ec29d949a37f6bf2a4269e9c9e8ad3b20a8051e5 /sql/sql_lex.cc | |
| parent | d9ec5a4e83a0b94bc106bc17c8487b449dc03d38 (diff) | |
| parent | 42e31f7a45413b685c4332ced1d983ccfda29d25 (diff) | |
| download | mariadb-git-cea66abf7b87581ade53b06df508b627d92c5151.tar.gz | |
Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt
into macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/gis-rtree.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
sql/sql_udf.cc:
SCCS merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 18d30494701..ad098a55811 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1934,7 +1934,6 @@ 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() : |