bzr push into mysql-trunk-innodb branch (marko.makela:3560 to 3561)

[marko.makela]

 3561 Marko Mäkelä	2011-04-05
      Remove unused function declaration srv_purge_thread().
      It was replaced by srv_purge_coordinator_thread().

    modified:
      storage/innobase/include/srv0srv.h
      storage/innobase/srv/srv0srv.c
 3560 Vasil Dimov	2011-04-04
      Fix Bug 11933790 - INNODB ASSERTS TRX->IN_MYSQL_TRX_LIST IN ANALYZE WITH
      PERSISTENT STATS
      
      Use trx_rollback_to_savepoint() for internal transactions in persistent
      stats code instead of trx_rollback_for_mysql(). The assertion that a
      trx which is passed to trx_rollback_for_mysql() should be in mysql list
      was added recently.
      
      Reviewed by:	Marko (rb://638)

    added:
      mysql-test/suite/innodb/r/innodb_bug11933790.result
      mysql-test/suite/innodb/t/innodb_bug11933790.test
    modified:
      storage/innobase/dict/dict0stats.c
=== modified file 'storage/innobase/include/srv0srv.h'
--- a/storage/innobase/include/srv0srv.h	revid:vasil.dimov@stripped
+++ b/storage/innobase/include/srv0srv.h	revid:[e-mail]-20110405064810-ro2g0ihj2jfp5ko3
@@ -639,16 +639,6 @@ void
 srv_inc_activity_count(void);
 /*=========================*/
 
-/*********************************************************************//**
-Asynchronous purge thread.
-@return	a dummy parameter */
-UNIV_INTERN
-os_thread_ret_t
-srv_purge_thread(
-/*=============*/
-	void*	arg __attribute__((unused)));	/*!< in: a dummy parameter
-						required by os_thread_create */
-
 /**********************************************************************//**
 Enqueues a task to server task queue and releases a worker thread, if there
 is a suspended one. */

=== modified file 'storage/innobase/srv/srv0srv.c'
--- a/storage/innobase/srv/srv0srv.c	revid:vasil.dimov@stripped141929-zpz2aujcsqu25rua
+++ b/storage/innobase/srv/srv0srv.c	revid:marko.makela@stripped2jfp5ko3
@@ -558,7 +558,7 @@ happening in the server which requires i
 thread. Such situations may be, for example, when flushing of dirty
 blocks is needed in the buffer pool or old version of database rows
 have to be cleaned away (purged). The user can configure a separate
-dedicated purge thread(s) too, in which case the master thread doesn't
+dedicated purge thread(s) too, in which case the master thread does not
 do any purging.
 
 The threads which we call user threads serve the queries of the MySQL
@@ -640,16 +640,6 @@ UNIV_INTERN os_event_t	srv_monitor_event
 /** Event to signal the error thread */
 UNIV_INTERN os_event_t	srv_error_event;
 
-/*********************************************************************//**
-Asynchronous purge thread.
-@return	a dummy parameter */
-UNIV_INTERN
-os_thread_ret_t
-srv_purge_thread(
-/*=============*/
-	void*	arg __attribute__((unused)));	/*!< in: a dummy parameter
-						required by os_thread_create */
-
 /***********************************************************************
 Prints counters for work done by srv_master_thread. */
 static

Attachment: [text/bzr-bundle] bzr/[e-mail]