diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-18 16:23:37 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-18 16:23:37 +0200 |
| commit | 5b1020f73dddfbdb2f5199ed3520a639f27c87ad (patch) | |
| tree | f51caf0de5296e686cce5593e4a3e97b15666428 /sql | |
| parent | 67aede0163a156b21d16efc596bdb03df841ed21 (diff) | |
| download | mariadb-git-5b1020f73dddfbdb2f5199ed3520a639f27c87ad.tar.gz | |
some code clean-up and small bug fix.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5734b340744..d529cd318fa 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -967,11 +967,12 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u) my_error(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, MYF(0)); return 1; } + unit=u; while ((item=li++)) { ls= gl++; Item_func_set_user_var *xx = new Item_func_set_user_var(*ls,item); - xx->fix_fields(current_thd,(TABLE_LIST*) current_thd->lex.select_lex.table_list.first,&item); + xx->fix_fields(thd,(TABLE_LIST*) thd->lex.select_lex.table_list.first,&item); xx->fix_length_and_dec(); vars.push_back(xx); } @@ -983,6 +984,11 @@ bool select_dumpvar::send_data(List<Item> &items) Item_func_set_user_var *xx; DBUG_ENTER("send_data"); + if (unit->offset_limit_cnt) + { // Using limit offset,count + unit->offset_limit_cnt--; + DBUG_RETURN(0); + } if (row_count++) { my_error(ER_TOO_MANY_ROWS, MYF(0)); |