1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual merge

sql/sp_head.cc:
  Manual merge, bug#27876
sql/sql_lex.cc:
  Manual merge, bug#27876
sql/sql_lex.h:
  Manual merge, bug#27876
sql/sql_view.cc:
  Manual merge, bug#27876
tests/mysql_client_test.c:
  Manual merge, bug#27876
This commit is contained in:
unknown
2007-05-29 14:52:17 -06:00
parent 1b7acc5134
commit 5817bdffe7
5 changed files with 75 additions and 6 deletions

View File

@ -775,7 +775,7 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
view->query.length= str.length()-1; // we do not need last \0
view->source.str= thd->query + thd->lex->create_view_select_start;
endp= view->source.str;
endp= skip_rear_comments(endp, thd->query + thd->query_length);
endp= skip_rear_comments(thd->charset(), endp, thd->query + thd->query_length);
view->source.length= endp - view->source.str;
view->file_version= 1;
view->calc_md5(md5);