← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/ibuf0ibuf.ic

[patch 125/129] Merge patch for revision 1943 from InnoDB SVN:
revno: 1943
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6207
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6202
committer: vasil
timestamp: Fri 2009-11-20 08:19:14 +0000
message:
  branches/zip: Merge r6198:6206 from branches/5.1:
  
  (r6203 was skipped as it is already in branches/zip)
  
    ------------------------------------------------------------------------
    r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
    Changed paths:
       M /branches/5.1/btr/btr0btr.c
    
    branches/5.1:
    
    White space fixup - indent under the opening (
    
    ------------------------------------------------------------------------
    r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
    Changed paths:
       M /branches/5.1/btr/btr0btr.c
    
    branches/5.1: Use btr_free_root() instead of fseg_free() for
    the fix of bug #48469, because fseg_free() is not defined
    in the zip branch. And we could save one mini-trasaction started
    by fseg_free().
    
    Approved by Marko.
    
    
    ------------------------------------------------------------------------
    r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
    
    branches/5.1: Add a special case to handle the Duplicated Key error
    and return DB_ERROR instead. This is to avoid a possible SIGSEGV
    by mysql error handling re-entering the storage layer for dup key
    info without proper table handle.
    This is to prevent a server crash when error situation in bug
    #45961 "DDL on partitioned innodb tables leaves data dictionary
    in an inconsistent state" happens.
    
    rb://157 approved by Sunny Bains.
    
    
    ------------------------------------------------------------------------
    r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
    
    branches/5.1: Fix a minor code formating issue for 
    the parenthesis iplacement of the if condition in
    rename_table().
    
    
    ------------------------------------------------------------------------
modified:
  handler/ha_innodb.cc           2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
diff:
=== modified file 'handler/ha_innodb.cc'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/ibuf0ibuf.ic
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1997, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1997, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
46
46
        ulint           seg_size;       /*!< allocated pages of the file
47
47
                                        segment containing ibuf header and
48
48
                                        tree */
49
 
        ibool           empty;          /*!< Protected by the page
50
 
                                        latch of the root page of the
51
 
                                        insert buffer tree
52
 
                                        (FSP_IBUF_TREE_ROOT_PAGE_NO). TRUE
53
 
                                        if and only if the insert
54
 
                                        buffer tree is empty. */
 
49
        ibool           empty;          /*!< after an insert to the ibuf tree
 
50
                                        is performed, this is set to FALSE,
 
51
                                        and if a contract operation finds
 
52
                                        the tree empty, this is set to
 
53
                                        TRUE */
55
54
        ulint           free_list_len;  /*!< length of the free list */
56
55
        ulint           height;         /*!< tree height */
57
56
        dict_index_t*   index;          /*!< insert buffer index */
58
57
 
 
58
        ulint           n_inserts;      /*!< number of inserts made to
 
59
                                        the insert buffer */
59
60
        ulint           n_merges;       /*!< number of pages merged */
60
 
        ulint           n_merged_ops[IBUF_OP_COUNT];
61
 
                                        /*!< number of operations of each type
62
 
                                        merged to index pages */
63
 
        ulint           n_discarded_ops[IBUF_OP_COUNT];
64
 
                                        /*!< number of operations of each type
65
 
                                        discarded without merging due to the
66
 
                                        tablespace being deleted or the
67
 
                                        index being dropped */
 
61
        ulint           n_merged_recs;  /*!< number of records merged */
68
62
};
69
63
 
70
64
/************************************************************************//**
111
105
 
112
106
                if (ibuf_flush_count % 4 == 0) {
113
107
 
114
 
                        buf_LRU_try_free_flushed_blocks(NULL);
 
108
                        buf_LRU_try_free_flushed_blocks();
115
109
                }
116
110
 
117
111
                return(TRUE);