diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-12-02 21:20:25 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-12-02 21:20:25 +0200 |
| commit | 14193b6539034a1825c39fb244a4a8bc40102ff8 (patch) | |
| tree | 5340b8e84501c9a79870d98ea17a6a9e2e4a3387 /sql/sql_view.cc | |
| parent | 5e4470169fdbfd30318c87feb7d26497ce233d06 (diff) | |
| parent | d65c5f103b76e08a87bdd66b44f1f4fa82e52fef (diff) | |
| download | mariadb-git-14193b6539034a1825c39fb244a4a8bc40102ff8.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
sql/sp_head.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 31c5e5fed0a..4f62a80cfd4 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -650,10 +650,9 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, /* fill structure */ view->query.str= (char*)str.ptr(); view->query.length= str.length()-1; // we do not need last \0 - view->source.str= thd->lex->create_view_select_start; + view->source.str= thd->query + thd->lex->create_view_select_start; view->source.length= (thd->query_length - - (thd->lex->create_view_select_start - - thd->lex->create_view_start)); + thd->lex->create_view_select_start); view->file_version= 1; view->calc_md5(md5); view->md5.str= md5; |