diff options
| author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
| commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
| tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /sql/sp_head.cc | |
| parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
| download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz | |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 82f8e88d889..8de1b6e906a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -765,7 +765,7 @@ sp_head::reset_lex(THD *thd) thd->lex= sublex= new st_lex; /* Reset most stuff. The length arguments doesn't matter here. */ - mysql_init_query(thd,oldlex->buf, oldlex->end_of_query - oldlex->ptr, TRUE); + lex_start(thd, oldlex->buf, (ulong) (oldlex->end_of_query - oldlex->ptr)); /* We must reset ptr and end_of_query again */ sublex->ptr= oldlex->ptr; |