~percona-dev/percona-xtradb/fix-bug547230-bug548442

diff -ruN innodb_plugin-1.0.6_orig/buf/buf0buf.c innodb_plugin-1.0.6_tmp/buf/buf0buf.c

@@ -51,6 +51,40 @@

 #include "dict0dict.h"

 #include "log0recv.h"

 }

 

diff -ruN innodb_plugin-1.0.6_orig/buf/buf0rea.c innodb_plugin-1.0.6_tmp/buf/buf0rea.c

@@ -75,7 +75,8 @@

                        treat the tablespace as dropped; this is a timestamp we

                        use to stop dangling page reads from a tablespace

        }

 

diff -ruN innodb_plugin-1.0.6_orig/fil/fil0fil.c innodb_plugin-1.0.6_tmp/fil/fil0fil.c

@@ -4199,7 +4199,7 @@

                                 node->name, node->handle, buf,

                                 offset_low, offset_high,

        ut_a(ret);

 

diff -ruN innodb_plugin-1.0.6_orig/handler/ha_innodb.cc innodb_plugin-1.0.6_tmp/handler/ha_innodb.cc

        trx->check_unique_secondary = !thd_test_options(

                thd, OPTION_RELAXED_UNIQUE_CHECKS);

 

        DBUG_VOID_RETURN;

 }

 

 }

 

 

 /*********************************************************************//**

 Construct ha_innobase handler. */

 UNIV_INTERN

        statement has ended */

 

        if (trx->n_mysql_tables_in_use == 0) {

                trx->mysql_n_tables_locked = 0;

                prebuilt->used_in_HANDLER = FALSE;

diff -ruN innodb_plugin-1.0.6_orig/handler/innodb_patch_info.h innodb_plugin-1.0.6_tmp/handler/innodb_patch_info.h

@@ -40,5 +40,6 @@

 {"innodb_purge_thread","Enable to use purge devoted thread","","http://www.percona.com/docs/wiki/percona-xtradb"},

 {"innodb_admin_command_base","XtraDB specific command interface through i_s","","http://www.percona.com/docs/wiki/percona-xtradb"},

 };

diff -ruN innodb_plugin-1.0.6_orig/include/buf0rea.h innodb_plugin-1.0.6_tmp/include/buf0rea.h

--- innodb_plugin-1.0.6_orig/include/buf0rea.h  2009-08-28 01:20:35.000000000 +0900

@@ -27,6 +27,7 @@

 #define buf0rea_h

 

 Issues read requests for pages which the ibuf module wants to read in, in

 order to contract the insert buffer tree. Technically, this function is like

diff -ruN innodb_plugin-1.0.6_orig/include/fil0fil.h innodb_plugin-1.0.6_tmp/include/fil0fil.h

@@ -611,9 +611,12 @@

 Reads or writes data. This operation is asynchronous (aio).

 @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do

 handler for completed requests. The aio array of pending requests is divided

diff -ruN innodb_plugin-1.0.6_orig/include/os0file.h innodb_plugin-1.0.6_tmp/include/os0file.h

--- innodb_plugin-1.0.6_orig/include/os0file.h  2009-11-11 22:33:49.000000000 +0900

@@ -53,6 +53,7 @@

 #define os0file_h

 

 Wakes up all async i/o threads so that they know to exit themselves in

 shutdown. */

diff -ruN innodb_plugin-1.0.6_orig/include/srv0srv.h innodb_plugin-1.0.6_tmp/include/srv0srv.h

@@ -80,6 +80,9 @@

 #define SRV_AUTO_EXTEND_INCREMENT      \

        (srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE))

 extern ibool   srv_lower_case_table_names;

 

diff -ruN innodb_plugin-1.0.6_orig/include/trx0trx.h innodb_plugin-1.0.6_tmp/include/trx0trx.h

@@ -729,6 +729,17 @@

        /*------------------------------*/

        char detailed_error[256];       /*!< detailed error message for last

 

 #define TRX_MAX_N_THREADS      32      /* maximum number of

diff -ruN innodb_plugin-1.0.6_orig/lock/lock0lock.c innodb_plugin-1.0.6_tmp/lock/lock0lock.c

@@ -1755,6 +1755,8 @@

 {

        lock_t* lock;

        trx->was_chosen_as_deadlock_victim = FALSE;

        trx->wait_started = time(NULL);

diff -ruN innodb_plugin-1.0.6_orig/os/os0file.c innodb_plugin-1.0.6_tmp/os/os0file.c

@@ -55,6 +55,8 @@

 #include "srv0start.h"

 #include "fil0fil.h"

 #include "buf0buf.h"

+#include "trx0sys.h"

+#include "trx0trx.h"

 #ifndef UNIV_HOTBACKUP

 # include "os0sync.h"

 /*******************************************************************//**

 Does a synchronous read operation in Posix.

 @return        number of bytes read, -1 if error */

 

        ut_a((offset & 0xFFFFFFFFUL) == offset);

 

 

        os_n_file_reads++;

 

 #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)

        os_mutex_enter(os_file_count_mutex);

        os_file_n_pending_preads++;

        os_n_pending_reads--;

        os_mutex_exit(os_file_count_mutex);

 

        return(n_bytes);

 #else

        {

                os_n_pending_reads--;

                os_mutex_exit(os_file_count_mutex);

 

                return(ret);

        }

 #endif

 @return        TRUE if request was successful, FALSE if fail */

 UNIV_INTERN

 ibool

 /*=========*/

        os_file_t       file,   /*!< in: handle to a file */

        void*           buf,    /*!< in: buffer where to read */

                                offset where to read */

        ulint           offset_high, /*!< in: most significant 32 bits of

                                offset */

 {

 #ifdef __WIN__

        BOOL            ret;

        os_bytes_read_since_printout += n;

 

 try_again:

 

        if ((ulint)ret == n) {

 

                                offset */

        ulint           offset_high, /*!< in: most significant 32 bits of

                                offset */

 {

        os_aio_slot_t*  slot;

 #ifdef WIN_ASYNC_IO

                                (can be used to identify a completed

                                aio operation); ignored if mode is

                                OS_AIO_SYNC */

 {

        os_aio_array_t* array;

        os_aio_slot_t*  slot;

                wait in the Windows case. */

 

                if (type == OS_FILE_READ) {

                }

 

                ut_a(type == OS_FILE_WRITE);

                ut_error;

        }

 

                if (os_aio_use_native_aio) {

 #ifdef WIN_ASYNC_IO

diff -ruN innodb_plugin-1.0.6_orig/srv/srv0srv.c innodb_plugin-1.0.6_tmp/srv/srv0srv.c

@@ -104,6 +104,9 @@

 #include "trx0i_s.h"

 #include "os0sync.h" /* for HAVE_ATOMIC_BUILTINS */

 /* This is set to TRUE if the MySQL user has set it in MySQL; currently

 affects only FOREIGN KEY definition parsing */

 UNIV_INTERN ibool      srv_lower_case_table_names      = FALSE;

        ibool                   has_slept = FALSE;

        srv_conc_slot_t*        slot      = NULL;

        ulint                   i;

 

        if (trx->mysql_thd != NULL

            && thd_is_replication_slave_thread(trx->mysql_thd)) {

                switches. */

                if (SRV_THREAD_SLEEP_DELAY > 0) {

                        os_thread_sleep(SRV_THREAD_SLEEP_DELAY);

                }

 

                trx->op_info = "";

        /* Go to wait for the event; when a thread leaves InnoDB it will

        release this thread */

 

 

        srv_conc_n_waiting_threads--;

diff -ruN innodb_plugin-1.0.6_orig/trx/trx0trx.c innodb_plugin-1.0.6_tmp/trx/trx0trx.c

@@ -178,6 +178,15 @@

        trx->global_read_view = NULL;

        trx->read_view = NULL;