Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1863 05/07/01 15:50:32 konstantin@stripped +3 -0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-11172-new
sql/sql_select.cc
1.326 05/07/01 15:50:25 konstantin@stripped +0 -0
Auto merged
sql/sql_prepare.cc
1.130 05/07/01 15:50:24 konstantin@stripped +0 -0
Auto merged
sql/sql_class.cc
1.192 05/07/01 15:50:24 konstantin@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: konstantin
# Host: dragonfly.local
# Root: /opt/local/work/mysql-5.0-11172-new/RESYNC
--- 1.191/sql/sql_class.cc 2005-07-01 08:05:35 +04:00
+++ 1.192/sql/sql_class.cc 2005-07-01 15:50:24 +04:00
@@ -784,7 +784,10 @@
void *change_mem= alloc_root(runtime_memroot, sizeof(*change));
if (change_mem == 0)
{
- fatal_error();
+ /*
+ OOM, thd->fatal_error() is called by the error handler of the
+ memroot. Just return.
+ */
return;
}
change= new (change_mem) Item_change_record;
--- 1.325/sql/sql_select.cc 2005-07-01 08:05:36 +04:00
+++ 1.326/sql/sql_select.cc 2005-07-01 15:50:25 +04:00
@@ -1738,6 +1738,7 @@
lock= thd->lock;
query_id= thd->query_id;
free_list= thd->free_list;
+ change_list= thd->change_list;
reset_thd(thd);
/*
XXX: thd->locked_tables is not changed.
@@ -1754,6 +1755,7 @@
thd->open_tables= 0;
thd->lock= 0;
thd->free_list= 0;
+ thd->change_list.empty();
}
@@ -1827,6 +1829,7 @@
thd->open_tables= open_tables;
thd->lock= lock;
thd->query_id= query_id;
+ thd->change_list= change_list;
/* save references to memory, allocated during fetch */
thd->set_n_backup_item_arena(this, &backup_arena);
@@ -1843,10 +1846,8 @@
#ifdef USING_TRANSACTIONS
ha_release_temporary_latches(thd);
#endif
-
+ /* Grab free_list here to correctly free it in close */
thd->restore_backup_item_arena(this, &backup_arena);
- DBUG_ASSERT(thd->free_list == 0);
- reset_thd(thd);
if (error == NESTED_LOOP_CURSOR_LIMIT)
{
@@ -1854,10 +1855,12 @@
thd->server_status|= SERVER_STATUS_CURSOR_EXISTS;
::send_eof(thd);
thd->server_status&= ~SERVER_STATUS_CURSOR_EXISTS;
+ change_list= thd->change_list;
+ reset_thd(thd);
}
else
{
- close();
+ close(TRUE);
if (error == NESTED_LOOP_OK)
{
thd->server_status|= SERVER_STATUS_LAST_ROW_SENT;
@@ -1872,7 +1875,7 @@
void
-Cursor::close()
+Cursor::close(bool is_active)
{
THD *thd= join->thd;
DBUG_ENTER("Cursor::close");
@@ -1885,6 +1888,10 @@
(void) unit->cleanup();
else
(void) join->select_lex->cleanup();
+
+ if (is_active)
+ close_thread_tables(thd);
+ else
{
/* XXX: Another hack: closing tables used in the cursor */
DBUG_ASSERT(lock || open_tables || derived_tables);
@@ -1904,11 +1911,7 @@
join= 0;
unit= 0;
free_items();
- /*
- Must be last, as some memory might be allocated for free purposes,
- like in free_tmp_table() (TODO: fix this issue)
- */
- free_root(mem_root, MYF(0));
+ change_list.empty();
DBUG_VOID_RETURN;
}
@@ -1916,7 +1919,8 @@
Cursor::~Cursor()
{
if (is_open())
- close();
+ close(FALSE);
+ free_root(mem_root, MYF(0));
}
/*********************************************************************/
--- 1.129/sql/sql_prepare.cc 2005-07-01 08:05:36 +04:00
+++ 1.130/sql/sql_prepare.cc 2005-07-01 15:50:24 +04:00
@@ -2206,13 +2206,15 @@
ulong num_rows= uint4korr(packet+4);
Prepared_statement *stmt;
Statement stmt_backup;
+ Cursor *cursor;
DBUG_ENTER("mysql_stmt_fetch");
statistic_increment(thd->status_var.com_stmt_fetch, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_fetch")))
DBUG_VOID_RETURN;
- if (!stmt->cursor || !stmt->cursor->is_open())
+ cursor= stmt->cursor;
+ if (!cursor || !cursor->is_open())
{
my_error(ER_STMT_HAS_NO_OPEN_CURSOR, MYF(0), stmt_id);
DBUG_VOID_RETURN;
@@ -2225,22 +2227,27 @@
my_pthread_setprio(pthread_self(), QUERY_PRIOR);
thd->protocol= &thd->protocol_prep; // Switch to binary protocol
- stmt->cursor->fetch(num_rows);
+ cursor->fetch(num_rows);
thd->protocol= &thd->protocol_simple; // Use normal protocol
if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(), WAIT_PRIOR);
- thd->restore_backup_statement(stmt, &stmt_backup);
- thd->current_arena= thd;
-
- if (!stmt->cursor->is_open())
+ if (!cursor->is_open())
{
/* We're done with the fetch: reset PS for next execution */
cleanup_stmt_and_thd_after_use(stmt, thd);
reset_stmt_params(stmt);
+ /*
+ Must be the last, as some momory is still needed for
+ the previous calls.
+ */
+ free_root(cursor->mem_root, MYF(0));
}
+ thd->restore_backup_statement(stmt, &stmt_backup);
+ thd->current_arena= thd;
+
DBUG_VOID_RETURN;
}
@@ -2267,14 +2274,21 @@
/* There is always space for 4 bytes in buffer */
ulong stmt_id= uint4korr(packet);
Prepared_statement *stmt;
+ Cursor *cursor;
DBUG_ENTER("mysql_stmt_reset");
statistic_increment(thd->status_var.com_stmt_reset, &LOCK_status);
if (!(stmt= find_prepared_statement(thd, stmt_id, "mysql_stmt_reset")))
DBUG_VOID_RETURN;
- if (stmt->cursor && stmt->cursor->is_open())
- stmt->cursor->close();
+ cursor= stmt->cursor;
+ if (cursor && cursor->is_open())
+ {
+ thd->change_list= cursor->change_list;
+ cursor->close(FALSE);
+ cleanup_stmt_and_thd_after_use(stmt, thd);
+ free_root(cursor->mem_root, MYF(0));
+ }
stmt->state= Query_arena::PREPARED;
| Thread |
|---|
| • bk commit into 5.0 tree (konstantin:1.1863) | konstantin | 1 Jul |
