• unknown's avatar
    Applied InnoDB 5.1 snapshot ss787. · 0da158aa
    unknown authored
    Bugs fixed:
    - Bug #20791    valgrind errors in InnoDB
      Remove Valgrind warning of Bug #20791 : in new database
      creation, we read the doublewrite buffer magic number from
      uninitialized memory; the code worked because it was extremely
      unlikely that the memory would contain the magic number
    - Bug #21784    DROP TABLE crashes 5.1.12-pre if concurrent
      queries on the table
      remove update_thd() in ::store_lock()
    
    
    Also includes numerous coding style fixes, etc.  See file-level
    comments for details.
    
    
    sql/ha_innodb.cc:
      Applied InnoDB 5.1 snapshot ss787.
      
        r755:
        Merge a patch from MySQL AB (Mats Kindal):
      
        Lock and unlock prepare_commit_mutex under the same conditions.
      
        r782:
        Fix bug #21784 of a crash in DROP TABLE with concurrent queries on the table
    storage/innobase/Makefile.am:
      Applied InnoDB 5.1 snapshot ss787.
      
        r772:
        Merge changes from MySQL AB:
      
        ChangeSet
          2006/08/23 13:59:16-07:00 brian@zim.(none)
          This patch removes need for a innodb to have its own configure.
    storage/innobase/btr/btr0btr.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/btr/btr0cur.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r761:
        btr_cur_search_to_nth_level(): Document where cursor is left at in
        PAGE_CUR_LE searches.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/btr/btr0pcur.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/btr/btr0sea.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/buf/buf0buf.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/buf/buf0flu.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/buf/buf0lru.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
    storage/innobase/buf/buf0rea.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/data/data0data.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r743:
        dfield_print_raw(): Make static.  Print at most 1000 bytes to avoid
        excessive space usage of the error log.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/data/data0type.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/dict/dict0boot.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/dict/dict0crea.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/dict/dict0dict.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
      
        r767:
        Remove dict_col_t::aux, which was only used when copying an index definition
        to the data dictionary cache.
    storage/innobase/dict/dict0load.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/dict/dict0mem.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/eval/eval0eval.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/eval/eval0proc.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/fil/fil0fil.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/fsp/fsp0fsp.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/fut/fut0lst.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/ha/ha0ha.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/ibuf/ibuf0ibuf.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r735:
        Remove all traces of the obsolete concept of replicate spaces.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/include/btr0btr.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/btr0cur.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/btr0cur.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/btr0pcur.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/buf0buf.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/buf0buf.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/buf0flu.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/buf0rea.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/data0data.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r743:
        dfield_print_raw(): Make static.  Print at most 1000 bytes to avoid
        excessive space usage of the error log.
    storage/innobase/include/data0data.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/data0type.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/dict0boot.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/dict0dict.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/dict0mem.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r767:
        Remove dict_col_t::aux, which was only used when copying an index definition
        to the data dictionary cache.
    storage/innobase/include/eval0eval.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/fut0lst.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/ibuf0ibuf.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/lock0lock.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/log0log.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/log0recv.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r735:
        Remove all traces of the obsolete concept of replicate spaces.
    storage/innobase/include/mach0data.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/mem0mem.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/include/mtr0log.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/mtr0mtr.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/os0file.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/page0cur.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/page0page.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
    storage/innobase/include/que0que.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/read0read.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/rem0cmp.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/rem0rec.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/include/row0mysql.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0purge.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0row.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r777:
        Remove unused code.
      
        row_build(): Remove type==ROW_COPY_ALSO_EXTERNALS, because it is never
        passed.
    storage/innobase/include/row0row.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0sel.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0sel.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0undo.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/row0upd.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/sync0rw.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/sync0rw.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/sync0sync.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/sync0sync.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0rec.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0rseg.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/include/trx0sys.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/include/trx0trx.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0trx.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0undo.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0undo.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/trx0xa.h:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/univ.i:
      Applied InnoDB 5.1 snapshot ss787.
      
        r772:
        Merge changes from MySQL AB:
      
        ChangeSet
          2006/08/23 13:59:16-07:00 brian@zim.(none)·
          This patch removes need for a innodb to have its own configure.·
      
        univ.i: Replace ../ib_config.h with config.h.
      
        r777:
        Remove unused code.
      
        univ.i: Do not #define YYDEBUG, because it is only useful for debugging
        the grammar of the Bison-generated InnoDB SQL parser.
    storage/innobase/include/ut0byte.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/include/ut0rnd.ic:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/lock/lock0lock.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/log/log0log.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/log/log0recv.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r735:
        Remove all traces of the obsolete concept of replicate spaces.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/mem/mem0dbg.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/mem/mem0mem.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/mem/mem0pool.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/mtr/mtr0log.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/mtr/mtr0mtr.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/os/os0file.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/os/os0proc.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/os/os0sync.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/os/os0thread.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/page/page0cur.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/page/page0page.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r761:
        btr_cur_search_to_nth_level(): Document where cursor is left at in
        PAGE_CUR_LE searches.
      
        r762:
        page_validate(): Add missing space to error print, for real this time,
        following an error in r761.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/pars/pars0opt.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/pars/pars0pars.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/que/que0que.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/read/read0read.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/rem/rem0cmp.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/rem/rem0rec.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/row/row0ins.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/row/row0mysql.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/row/row0purge.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/row/row0row.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
      
        r777:
        Remove unused code.
      
        row_build(): Remove type==ROW_COPY_ALSO_EXTERNALS, because it is never
        passed.
    storage/innobase/row/row0sel.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/row/row0uins.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/row/row0umod.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/row/row0undo.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/row/row0upd.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/row/row0vers.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/srv/srv0srv.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r741:
        srv_master_thread(): Add OS_THREAD_DUMMY_RETURN to get rid of a compiler
        warning "no return value from a function returning non-void".
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
      
        r780:
        Add a warning comment above the place where we set srv_main_thread_op_info
        to "waiting for server activity" that mentions that this string should not
        be changed.
    storage/innobase/srv/srv0start.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/sync/sync0arr.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/sync/sync0rw.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/sync/sync0sync.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/thr/thr0loc.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/trx/trx0purge.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/trx/trx0rec.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r735:
        Remove all traces of the obsolete concept of replicate spaces.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/trx/trx0roll.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/trx/trx0rseg.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/trx/trx0sys.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/trx/trx0trx.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/trx/trx0undo.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/ut/ut0byte.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/ut/ut0dbg.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r764:
        Split lines before an opening parenthesis, not after one.
      
        Replace some printf(...) in debug builds with fprintf(stderr, ...).
    storage/innobase/ut/ut0mem.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/ut/ut0ut.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
      
        r765:
        Split lines before binary operators, not after them.
    storage/innobase/ut/ut0vec.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    storage/innobase/ut/ut0wqueue.c:
      Applied InnoDB 5.1 snapshot ss787.
      
        r763:
        Reindent the code base (except for ha_innodb.{cc,h} and generated parser
        and lexer files).
    0da158aa
log0log.ic 9.72 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402
/******************************************************
Database log

(c) 1995 Innobase Oy

Created 12/9/1995 Heikki Tuuri
*******************************************************/

#include "os0file.h"
#include "mach0data.h"
#include "mtr0mtr.h"

/**********************************************************
Checks by parsing that the catenated log segment for a single mtr is
consistent. */

ibool
log_check_log_recs(
/*===============*/
	byte*	buf,		/* in: pointer to the start of the log segment
				in the log_sys->buf log buffer */
	ulint	len,		/* in: segment length in bytes */
	dulint	buf_start_lsn);	/* in: buffer start lsn */

/****************************************************************
Gets a log block flush bit. */
UNIV_INLINE
ibool
log_block_get_flush_bit(
/*====================*/
				/* out: TRUE if this block was the first
				to be written in a log flush */
	byte*	log_block)	/* in: log block */
{
	if (LOG_BLOCK_FLUSH_BIT_MASK
	    & mach_read_from_4(log_block + LOG_BLOCK_HDR_NO)) {

		return(TRUE);
	}

	return(FALSE);
}

/****************************************************************
Sets the log block flush bit. */
UNIV_INLINE
void
log_block_set_flush_bit(
/*====================*/
	byte*	log_block,	/* in: log block */
	ibool	val)		/* in: value to set */
{
	ulint	field;

	field = mach_read_from_4(log_block + LOG_BLOCK_HDR_NO);

	if (val) {
		field = field | LOG_BLOCK_FLUSH_BIT_MASK;
	} else {
		field = field & ~LOG_BLOCK_FLUSH_BIT_MASK;
	}

	mach_write_to_4(log_block + LOG_BLOCK_HDR_NO, field);
}

/****************************************************************
Gets a log block number stored in the header. */
UNIV_INLINE
ulint
log_block_get_hdr_no(
/*=================*/
				/* out: log block number stored in the block
				header */
	byte*	log_block)	/* in: log block */
{
	return(~LOG_BLOCK_FLUSH_BIT_MASK
	       & mach_read_from_4(log_block + LOG_BLOCK_HDR_NO));
}

/****************************************************************
Sets the log block number stored in the header; NOTE that this must be set
before the flush bit! */
UNIV_INLINE
void
log_block_set_hdr_no(
/*=================*/
	byte*	log_block,	/* in: log block */
	ulint	n)		/* in: log block number: must be > 0 and
				< LOG_BLOCK_FLUSH_BIT_MASK */
{
	ut_ad(n > 0);
	ut_ad(n < LOG_BLOCK_FLUSH_BIT_MASK);

	mach_write_to_4(log_block + LOG_BLOCK_HDR_NO, n);
}

/****************************************************************
Gets a log block data length. */
UNIV_INLINE
ulint
log_block_get_data_len(
/*===================*/
				/* out: log block data length measured as a
				byte offset from the block start */
	byte*	log_block)	/* in: log block */
{
	return(mach_read_from_2(log_block + LOG_BLOCK_HDR_DATA_LEN));
}

/****************************************************************
Sets the log block data length. */
UNIV_INLINE
void
log_block_set_data_len(
/*===================*/
	byte*	log_block,	/* in: log block */
	ulint	len)		/* in: data length */
{
	mach_write_to_2(log_block + LOG_BLOCK_HDR_DATA_LEN, len);
}

/****************************************************************
Gets a log block first mtr log record group offset. */
UNIV_INLINE
ulint
log_block_get_first_rec_group(
/*==========================*/
				/* out: first mtr log record group byte offset
				from the block start, 0 if none */
	byte*	log_block)	/* in: log block */
{
	return(mach_read_from_2(log_block + LOG_BLOCK_FIRST_REC_GROUP));
}

/****************************************************************
Sets the log block first mtr log record group offset. */
UNIV_INLINE
void
log_block_set_first_rec_group(
/*==========================*/
	byte*	log_block,	/* in: log block */
	ulint	offset)		/* in: offset, 0 if none */
{
	mach_write_to_2(log_block + LOG_BLOCK_FIRST_REC_GROUP, offset);
}

/****************************************************************
Gets a log block checkpoint number field (4 lowest bytes). */
UNIV_INLINE
ulint
log_block_get_checkpoint_no(
/*========================*/
				/* out: checkpoint no (4 lowest bytes) */
	byte*	log_block)	/* in: log block */
{
	return(mach_read_from_4(log_block + LOG_BLOCK_CHECKPOINT_NO));
}

/****************************************************************
Sets a log block checkpoint number field (4 lowest bytes). */
UNIV_INLINE
void
log_block_set_checkpoint_no(
/*========================*/
	byte*	log_block,	/* in: log block */
	dulint	no)		/* in: checkpoint no */
{
	mach_write_to_4(log_block + LOG_BLOCK_CHECKPOINT_NO,
			ut_dulint_get_low(no));
}

/****************************************************************
Converts a lsn to a log block number. */
UNIV_INLINE
ulint
log_block_convert_lsn_to_no(
/*========================*/
			/* out: log block number, it is > 0 and <= 1G */
	dulint	lsn)	/* in: lsn of a byte within the block */
{
	ulint	no;

	no = ut_dulint_get_low(lsn) / OS_FILE_LOG_BLOCK_SIZE;
	no += (ut_dulint_get_high(lsn) % OS_FILE_LOG_BLOCK_SIZE)
		* 2 * (0x80000000UL / OS_FILE_LOG_BLOCK_SIZE);

	no = no & 0x3FFFFFFFUL;

	return(no + 1);
}

/****************************************************************
Calculates the checksum for a log block. */
UNIV_INLINE
ulint
log_block_calc_checksum(
/*====================*/
			/* out: checksum */
	byte*	block)	/* in: log block */
{
	ulint	sum;
	ulint	sh;
	ulint	i;

	sum = 1;
	sh = 0;

	for (i = 0; i < OS_FILE_LOG_BLOCK_SIZE - LOG_BLOCK_TRL_SIZE; i++) {
		sum = sum & 0x7FFFFFFFUL;
		sum += (((ulint)(*(block + i))) << sh) + (ulint)(*(block + i));
		sh++;
		if (sh > 24) {
			sh = 0;
		}
	}

	return(sum);
}

/****************************************************************
Gets a log block checksum field value. */
UNIV_INLINE
ulint
log_block_get_checksum(
/*===================*/
				/* out: checksum */
	byte*	log_block)	/* in: log block */
{
	return(mach_read_from_4(log_block + OS_FILE_LOG_BLOCK_SIZE
				- LOG_BLOCK_CHECKSUM));
}

/****************************************************************
Sets a log block checksum field value. */
UNIV_INLINE
void
log_block_set_checksum(
/*===================*/
	byte*	log_block,	/* in: log block */
	ulint	checksum)	/* in: checksum */
{
	mach_write_to_4(log_block + OS_FILE_LOG_BLOCK_SIZE
			- LOG_BLOCK_CHECKSUM,
			checksum);
}

/****************************************************************
Initializes a log block in the log buffer. */
UNIV_INLINE
void
log_block_init(
/*===========*/
	byte*	log_block,	/* in: pointer to the log buffer */
	dulint	lsn)		/* in: lsn within the log block */
{
	ulint	no;

#ifdef UNIV_SYNC_DEBUG
	ut_ad(mutex_own(&(log_sys->mutex)));
#endif /* UNIV_SYNC_DEBUG */

	no = log_block_convert_lsn_to_no(lsn);

	log_block_set_hdr_no(log_block, no);

	log_block_set_data_len(log_block, LOG_BLOCK_HDR_SIZE);
	log_block_set_first_rec_group(log_block, 0);
}

/****************************************************************
Initializes a log block in the log buffer in the old format, where there
was no checksum yet. */
UNIV_INLINE
void
log_block_init_in_old_format(
/*=========================*/
	byte*	log_block,	/* in: pointer to the log buffer */
	dulint	lsn)		/* in: lsn within the log block */
{
	ulint	no;

#ifdef UNIV_SYNC_DEBUG
	ut_ad(mutex_own(&(log_sys->mutex)));
#endif /* UNIV_SYNC_DEBUG */

	no = log_block_convert_lsn_to_no(lsn);

	log_block_set_hdr_no(log_block, no);
	mach_write_to_4(log_block + OS_FILE_LOG_BLOCK_SIZE
			- LOG_BLOCK_CHECKSUM, no);
	log_block_set_data_len(log_block, LOG_BLOCK_HDR_SIZE);
	log_block_set_first_rec_group(log_block, 0);
}

/****************************************************************
Writes to the log the string given. The log must be released with
log_release. */
UNIV_INLINE
dulint
log_reserve_and_write_fast(
/*=======================*/
			/* out: end lsn of the log record, ut_dulint_zero if
			did not succeed */
	byte*	str,	/* in: string */
	ulint	len,	/* in: string length */
	dulint*	start_lsn,/* out: start lsn of the log record */
	ibool*	success)/* out: TRUE if success */
{
	log_t*	log	= log_sys;
	ulint	data_len;
	dulint	lsn;

	*success = TRUE;

	mutex_enter(&(log->mutex));

	data_len = len + log->buf_free % OS_FILE_LOG_BLOCK_SIZE;

	if (data_len >= OS_FILE_LOG_BLOCK_SIZE - LOG_BLOCK_TRL_SIZE) {

		/* The string does not fit within the current log block
		or the log block would become full */

		*success = FALSE;

		mutex_exit(&(log->mutex));

		return(ut_dulint_zero);
	}

	*start_lsn = log->lsn;

	ut_memcpy(log->buf + log->buf_free, str, len);

	log_block_set_data_len(ut_align_down(log->buf + log->buf_free,
					     OS_FILE_LOG_BLOCK_SIZE),
			       data_len);
#ifdef UNIV_LOG_DEBUG
	log->old_buf_free = log->buf_free;
	log->old_lsn = log->lsn;
#endif
	log->buf_free += len;

	ut_ad(log->buf_free <= log->buf_size);

	lsn = ut_dulint_add(log->lsn, len);

	log->lsn = lsn;

#ifdef UNIV_LOG_DEBUG
	log_check_log_recs(log->buf + log->old_buf_free,
			   log->buf_free - log->old_buf_free, log->old_lsn);
#endif
	return(lsn);
}

/***************************************************************************
Releases the log mutex. */
UNIV_INLINE
void
log_release(void)
/*=============*/
{
	mutex_exit(&(log_sys->mutex));
}

/****************************************************************
Gets the current lsn. */
UNIV_INLINE
dulint
log_get_lsn(void)
/*=============*/
			/* out: current lsn */
{
	dulint	lsn;

	mutex_enter(&(log_sys->mutex));

	lsn = log_sys->lsn;

	mutex_exit(&(log_sys->mutex));

	return(lsn);
}

/***************************************************************************
Checks if there is need for a log buffer flush or a new checkpoint, and does
this if yes. Any database operation should call this when it has modified
more than about 4 pages. NOTE that this function may only be called when the
OS thread owns no synchronization objects except the dictionary mutex. */
UNIV_INLINE
void
log_free_check(void)
/*================*/
{
	/* ut_ad(sync_thread_levels_empty()); */

	if (log_sys->check_flush_or_checkpoint) {

		log_check_margins();
	}
}