mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Update of interface for BDB tables.
Fixed bug in SHOW CREATE TABLE Build-tools/mysql-copyright: Shorter error message Docs/manual.texi: Update of myisamchk stuff acinclude.m4: Force use of Berkeley DB 3.2.3 or newer include/m_string.h: Changed type of arguments to bmove() myisam/mi_check.c: Nicer error message mysql.proj: Updated sql/ha_berkeley.cc: Use new key compare interface sql/sql_select.cc: Call join_free() early to free all cursors sql/sql_show.cc: Fixed CREATE TABLE when used with auto_increment columns strings/bmove.c: Changed type of arguments to bmove()
This commit is contained in:
@@ -3905,12 +3905,16 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
|
||||
if (error == -3)
|
||||
error=0; /* select_limit used */
|
||||
}
|
||||
if (!table)
|
||||
if (!table) /* If sending data to client */
|
||||
{
|
||||
if (error < 0)
|
||||
join->result->send_error(0,NullS); /* purecov: inspected */
|
||||
else if (join->result->send_eof())
|
||||
error= -1;
|
||||
join->result->send_error(0,NullS); /* purecov: inspected */
|
||||
else
|
||||
{
|
||||
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 */
|
||||
|
||||
Reference in New Issue
Block a user