Commit 51ebdc65 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
parents d471e9de 399caa6d

sql/sp_head.cc

+3 −1
Original line number Diff line number Diff line
@@ -1051,8 +1051,10 @@ int sp_head::execute(THD *thd) 
     original thd->db will then have been freed */

  if (dbchanged)

  {

    /* No access check when changing back to where we came from.

       (It would generate an error from mysql_change_db() when olddb=="") */

    if (! thd->killed)

      ret= mysql_change_db(thd, olddb, 0);

      ret= mysql_change_db(thd, olddb, 1);

  }

  m_flags&= ~IS_INVOKED;

  DBUG_RETURN(ret);