database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

Closing tables during SP execution the proper way.

Browse Source 
mysql-test/r/show_check.result:
  proc table now shows up in different places.
mysql-test/r/status.result:
  proc table now shows up in different places.
sql/sp.cc:
  Fixed closing of tables.
sql/sp_head.cc:
  Close tables after each sub statement.
sql/sql_class.cc:
  Removed closing of tables in various send_eof() methods again.
This commit is contained in:
unknown
2003-02-28 15:07:14 +01:00
parent aecc6a21bd
commit 1ff79b61a0
5 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_class.cc
View File

@@ -801,15 +801,6 @@ void select_export::send_error(uint errcode, const char *err)
bool select_export::send_eof()
{
/* This mimics select_send::send_eof(), which unlocks this way.
* It appears to be necessary, since tables aren't unlock after
* selects otherwise.
*/
if (thd->lock)
{
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
int error=test(end_io_cache(&cache));
if (my_close(file,MYF(MY_WME)))
error=1;
@@ -920,15 +911,6 @@ void select_dump::send_error(uint errcode,const char *err)
bool select_dump::send_eof()
{
/* This mimics select_send::send_eof(), which unlocks this way.
* It appears to be necessary, since tables aren't unlock after
* selects otherwise.
*/
if (thd->lock)
{
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
int error=test(end_io_cache(&cache));
if (my_close(file,MYF(MY_WME)))
error=1;
@@ -1061,15 +1043,6 @@ bool select_dumpvar::send_data(List<Item> &items)
bool select_dumpvar::send_eof()
{
/* This mimics select_send::send_eof(), which unlocks this way.
* It appears to be necessary, since tables aren't unlock after
* selects otherwise.
*/
if (thd->lock)
{
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
if (row_count)
{
::send_ok(thd,row_count);