diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-31 12:09:59 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-31 12:09:59 +0500 |
| commit | 6312042ca7575ecbc2839cc07e6ba21a9c4ae56d (patch) | |
| tree | 945e9b5bc53933eaf05007cb042ff06b2ea86aaf /sql/sql_yacc.yy | |
| parent | 03adaa85c4a95480661688f3af251ef4fa05c83f (diff) | |
| parent | 33fc4ad4e124413ef617a1a073bb50135f6a12af (diff) | |
| download | mariadb-git-6312042ca7575ecbc2839cc07e6ba21a9c4ae56d.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/t/sp.test:
Merge with 5.0-opt.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 468c3305c57..5d665d5a6a2 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9505,7 +9505,8 @@ simple_ident: Item_splocal *splocal; splocal= new Item_splocal($1, spv->offset, spv->type, lip->get_tok_start_prev() - - lex->sphead->m_tmp_query); + lex->sphead->m_tmp_query, + lip->tok_end - lip->tok_start_prev); #ifndef DBUG_OFF if (splocal) splocal->m_sp= lex->sphead; |