database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Add missing exit_cond() to lock_global_read_lock().

Browse Source 
Docs/manual.texi:
  Recommend gdb 5.1
sql/lock.cc:
  Add missing exit_cond when waiting to lock_global_read_lock()
sql/sql_select.cc:
  Cleanup
This commit is contained in:
unknown
2001-11-26 02:09:45 +02:00
parent 7fbb09f4bb
commit 2a1f1c7933
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_select.cc
View File

@@ -4116,22 +4116,16 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
if (error == -3)
error=0; /* select_limit used */
}
if (!table) /* If sending data to client */
if (error < 0)
join->result->send_error(0,NullS); /* purecov: inspected */
else
{
if (error < 0)
join->result->send_error(0,NullS); /* purecov: inspected */
else
if (!table) // If sending data to client
{
join_free(join); // Unlock all cursors
if (join->result->send_eof())
error= -1;
}
}
else if (error < 0)
join->result->send_error(0,NullS); /* purecov: inspected */
if (error >= 0)
{
DBUG_PRINT("info",("%ld records output",join->send_records));
}
if (table)
@@ -4226,10 +4220,8 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
info->file->unlock_row();
}
} while (!(error=info->read_record(info)));
if (error > 0) // Fatal error
return -1;
}
else if (error > 0)
if (error > 0) // Fatal error
return -1;
if (!found && on_expr)