Commit 156823c8 authored by Sergey Glukhov's avatar Sergey Glukhov
Browse files

5.0-bugteam->5.1-bugteam merge(bug#39040)

parents 10b525d0 f3a4a186

mysql-test/r/view.result

+2 −0
Original line number Diff line number Diff line
@@ -3672,6 +3672,8 @@ DROP VIEW v1; 


# -- End of test case for Bug#35193.



CREATE VIEW v1 AS SELECT 1;

DROP VIEW v1;

# -----------------------------------------------------------------

# -- End of 5.0 tests.

# -----------------------------------------------------------------

mysql-test/t/view.test

+9 −0
Original line number Diff line number Diff line
@@ -3556,6 +3556,15 @@ DROP VIEW v1; 


###########################################################################



#

# Bug#39040: valgrind errors/crash when creating views with binlog logging 

# enabled

#

# Bug is visible only when running in valgrind with binary logging.

CREATE VIEW v1 AS SELECT 1;

DROP VIEW v1;





--echo # -----------------------------------------------------------------

--echo # -- End of 5.0 tests.

--echo # -----------------------------------------------------------------

sql/sql_view.cc

+21 −5
Original line number Diff line number Diff line
@@ -816,13 +816,24 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, 
  DBUG_PRINT("info", ("View: %s", view_query.ptr()));



  /* fill structure */

  view->select_stmt.str= view_query.c_ptr_safe();

  view->select_stmt.length= view_query.length();

  view->source= thd->lex->create_view_select;



  if (!thd->make_lex_string(&view->select_stmt, view_query.ptr(),

                            view_query.length(), false))

  {

    my_error(ER_OUT_OF_RESOURCES, MYF(0));

    error= -1;

    goto err;   

  }



  view->file_version= 1;

  view->calc_md5(md5);

  view->md5.str= md5;

  if (!(view->md5.str= (char*) thd->memdup(md5, 32)))

  {

    my_error(ER_OUT_OF_RESOURCES, MYF(0));

    error= -1;

    goto err;   

  }

  view->md5.length= 32;

  can_be_merged= lex->can_be_merged();

  if (lex->create_view_algorithm == VIEW_ALGORITHM_MERGE &&
@@ -949,8 +960,13 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, 
  lex_string_set(&view->view_connection_cl_name,

                 view->view_creation_ctx->get_connection_cl()->name);



  view->view_body_utf8.str= is_query.c_ptr_safe();

  view->view_body_utf8.length= is_query.length();

  if (!thd->make_lex_string(&view->view_body_utf8, is_query.ptr(),

                            is_query.length(), false))

  {

    my_error(ER_OUT_OF_RESOURCES, MYF(0));

    error= -1;

    goto err;   

  }



  /*

    Check that table of main select do not used in subqueries.