mariadb/include/os0file.h
marko e578585049 branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
  r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/btr/btr0sea.c
     M /branches/zip/buf/buf0buf.c
     M /branches/zip/dict/dict0dict.c
     M /branches/zip/fil/fil0fil.c
     M /branches/zip/ibuf/ibuf0ibuf.c
     M /branches/zip/include/btr0sea.h
     M /branches/zip/include/dict0dict.h
     M /branches/zip/include/fil0fil.h
     M /branches/zip/include/ibuf0ibuf.h
     M /branches/zip/include/lock0lock.h
     M /branches/zip/include/log0log.h
     M /branches/zip/include/log0recv.h
     M /branches/zip/include/mem0mem.h
     M /branches/zip/include/mem0pool.h
     M /branches/zip/include/os0file.h
     M /branches/zip/include/pars0pars.h
     M /branches/zip/include/srv0srv.h
     M /branches/zip/include/thr0loc.h
     M /branches/zip/include/trx0i_s.h
     M /branches/zip/include/trx0purge.h
     M /branches/zip/include/trx0rseg.h
     M /branches/zip/include/trx0sys.h
     M /branches/zip/include/trx0undo.h
     M /branches/zip/include/usr0sess.h
     M /branches/zip/lock/lock0lock.c
     M /branches/zip/log/log0log.c
     M /branches/zip/log/log0recv.c
     M /branches/zip/mem/mem0dbg.c
     M /branches/zip/mem/mem0pool.c
     M /branches/zip/os/os0file.c
     M /branches/zip/os/os0sync.c
     M /branches/zip/os/os0thread.c
     M /branches/zip/pars/lexyy.c
     M /branches/zip/pars/pars0lex.l
     M /branches/zip/que/que0que.c
     M /branches/zip/srv/srv0srv.c
     M /branches/zip/srv/srv0start.c
     M /branches/zip/sync/sync0arr.c
     M /branches/zip/sync/sync0sync.c
     M /branches/zip/thr/thr0loc.c
     M /branches/zip/trx/trx0i_s.c
     M /branches/zip/trx/trx0purge.c
     M /branches/zip/trx/trx0rseg.c
     M /branches/zip/trx/trx0sys.c
     M /branches/zip/trx/trx0undo.c
     M /branches/zip/usr/usr0sess.c
     M /branches/zip/ut/ut0mem.c

  branches/zip: Free all resources at shutdown. Set pointers to NULL, so
  that Valgrind will not complain about freed data structures that are
  reachable via pointers.  This addresses Bug #45992 and Bug #46656.

  This patch is mostly based on changes copied from branches/embedded-1.0,
  mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
  copied.  Some added cleanup code is specific to MySQL/InnoDB.

  rb://199 approved by Sunny Bains
  ------------------------------------------------------------------------
  r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc

  branches/zip: innobase_convert_identifier(): Convert table names with
  explain_filename() to address Bug #32430: 'show innodb status'
  causes errors Invalid (old?) table or database name in logs.

  rb://134 approved by Sunny Bains
  ------------------------------------------------------------------------
  r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
  Changed paths:
     M /branches/zip/dict/dict0dict.c

  branches/zip: dict_index_too_big_for_undo(): Correct a typo.
  ------------------------------------------------------------------------
  r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc

  branches/zip: Merge r6125:6152 from branches/5.1:

  (everything except the last white-space change was skipped as it is already
  in branches/zip)
    ------------------------------------------------------------------------
    r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
    Changed paths:
       M /branches/5.1/Makefile.am
       M /branches/5.1/mysql-test/innodb-autoinc.result
       M /branches/5.1/mysql-test/innodb-autoinc.test

    branches/5.1:

    Backport c6121 from branches/zip:
      ------------------------------------------------------------------------
      r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
      Changed paths:
         M /branches/zip/mysql-test/innodb-autoinc.result

      branches/zip: This test has been problematic for sometime now. The underlying
      bug is that the data dictionaries get out of sync. In the AUTOINC code we
      try and apply salve to the symptoms. In the past MySQL made some unrelated
      change and the dictionaries stopped getting out of sync and this test started
      to fail. Now, it seems they have reverted that changed and the test is
      passing again. I suspect this is not he last time that this test will change.
      ------------------------------------------------------------------------
    ------------------------------------------------------------------------
    r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
    Changed paths:
       M /branches/5.1/Makefile.am

    branches/5.1:

    Revert a change to Makefile.am that sneaked unnoticed in c6127.
    ------------------------------------------------------------------------
    r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/include/ha_prototypes.h
       M /branches/5.1/ut/ut0ut.c

    branches/5.1: Port r6134 from branches/zip:

      ------------------------------------------------------------------------
      r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines

      branches/zip: innobase_convert_identifier(): Convert table names with
      explain_filename() to address Bug #32430: 'show innodb status'
      causes errors Invalid (old?) table or database name in logs.

      rb://134 approved by Sunny Bains
      ------------------------------------------------------------------------

    innobase_print_identifier(): Replace with innobase_convert_name().

    innobase_convert_identifier(): New function, called by innobase_convert_name().
    ------------------------------------------------------------------------
    r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
    Changed paths:
       M /branches/5.1/CMakeLists.txt

    branches/5.1:

    Followup to r5700: Adjust the changes so they are the same as in the BZR
    repository.
    ------------------------------------------------------------------------
    r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc

    branches/5.1:

    Merge a part of r2911.5.5 from MySQL:
    (the other part of this was merged in c5700)

      ------------------------------------------------------------
      revno: 2911.5.5
      committer: Vladislav Vaintroub <vvaintroub@mysql.com>
      branch nick: 5.1-innodb_plugin
      timestamp: Wed 2009-06-10 10:59:49 +0200
      message:
        Backport WL#3653 to 5.1 to enable bundled innodb plugin.
        Remove custom DLL loader code from innodb plugin code, use
        symbols exported from mysqld.
      removed:
        storage/innodb_plugin/handler/handler0vars.h
        storage/innodb_plugin/handler/win_delay_loader.cc
      added:
        storage/mysql_storage_engine.cmake
        win/create_def_file.js
      modified:
        CMakeLists.txt
        include/m_ctype.h
        include/my_global.h
        include/my_sys.h
        include/mysql/plugin.h
        libmysqld/CMakeLists.txt
        mysql-test/mysql-test-run.pl
        mysql-test/t/plugin.test
        mysql-test/t/plugin_load-master.opt
        mysys/charset.c
        sql/CMakeLists.txt
        sql/handler.h
        sql/mysql_priv.h
        sql/mysqld.cc
        sql/sql_class.cc
        sql/sql_class.h
        sql/sql_list.h
        sql/sql_profile.h
        storage/Makefile.am
        storage/archive/CMakeLists.txt
        storage/blackhole/CMakeLists.txt
        storage/csv/CMakeLists.txt
        storage/example/CMakeLists.txt
        storage/federated/CMakeLists.txt
        storage/heap/CMakeLists.txt
        storage/innobase/CMakeLists.txt
        storage/innobase/handler/ha_innodb.cc
        storage/innodb_plugin/CMakeLists.txt
        storage/innodb_plugin/handler/ha_innodb.cc
        storage/innodb_plugin/handler/handler0alter.cc
        storage/innodb_plugin/handler/i_s.cc
        storage/innodb_plugin/plug.in
        storage/myisam/CMakeLists.txt
        storage/myisammrg/CMakeLists.txt
        win/Makefile.am
        win/configure.js
    ------------------------------------------------------------------------
    r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc

    branches/5.1:

    White space fixup.
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     A /branches/zip/mysql-test/innodb_bug47167.result
     A /branches/zip/mysql-test/innodb_bug47167.test
     M /branches/zip/mysql-test/innodb_file_format.result

  branches/zip: Fix an issue that a local variable defined
  in innodb_file_format_check_validate() is being referenced
  across function in innodb_file_format_check_update().
  In addition, fix "set global innodb_file_format_check =
  DEFAULT" call.
  Bug #47167: "set global innodb_file_format_check" cannot
  set value by User-Defined Variable."
  rb://169 approved by Sunny Bains and Marko.
  ------------------------------------------------------------------------
  r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/handler/ha_innodb.h

  branches/zip:

  Merge a change from MySQL:
  (this has been reviewed by Calvin and Marko, and Calvin says Luis has
  incorporated Marko's suggestions)

    ------------------------------------------------------------
    revno: 3092.5.1
    committer: Luis Soares <luis.soares@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2009-09-24 15:52:52 +0100
    message:
      BUG#42829: binlogging enabled for all schemas regardless of
      binlog-db-db / binlog-ignore-db

      InnoDB will return an error if statement based replication is used
      along with transaction isolation level READ-COMMITTED (or weaker),
      even if the statement in question is filtered out according to the
      binlog-do-db rules set. In this case, an error should not be printed.

      This patch addresses this issue by extending the existing check in
      external_lock to take into account the filter rules before deciding to
      print an error. Furthermore, it also changes decide_logging_format to
      take into consideration whether the statement is filtered out from
      binlog before decision is made.
    added:
      mysql-test/suite/binlog/r/binlog_stm_do_db.result
      mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
      mysql-test/suite/binlog/t/binlog_stm_do_db.test
    modified:
      sql/sql_base.cc
      sql/sql_class.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
  ------------------------------------------------------------------------
  r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
  Changed paths:
     M /branches/zip/include/os0file.h
     M /branches/zip/os/os0file.c

  branches/zip: Merge r6152:6159 from branches/5.1:

  (r6158 was skipped as an equivallent change has already been merged from MySQL)
    ------------------------------------------------------------------------
    r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
    Changed paths:
       M /branches/5.1/include/os0file.h
       M /branches/5.1/os/os0file.c

    branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
    after several selects on a large DB

    During stress environment, Windows AIO may fail with error code
    ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
    crashes. The cause of the error is unknown, but likely due to
    faulty hardware or driver.

    This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
    which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
    is detected during AIO, the InnoDB will issue a synchronous retry
    (read/write).

    This patch has been extensively tested by MySQL support.

    Approved by: Marko
    rb://196
    ------------------------------------------------------------------------
    r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/handler/ha_innodb.h

    branches/5.1:

    Merge a change from MySQL:
    (this has been reviewed by Calvin and Marko, and Calvin says Luis has
    incorporated Marko's suggestions)

      ------------------------------------------------------------
      revno: 3092.5.1
      committer: Luis Soares <luis.soares@sun.com>
      branch nick: mysql-5.1-bugteam
      timestamp: Thu 2009-09-24 15:52:52 +0100
      message:
        BUG#42829: binlogging enabled for all schemas regardless of
        binlog-db-db / binlog-ignore-db

        InnoDB will return an error if statement based replication is used
        along with transaction isolation level READ-COMMITTED (or weaker),
        even if the statement in question is filtered out according to the
        binlog-do-db rules set. In this case, an error should not be printed.

        This patch addresses this issue by extending the existing check in
        external_lock to take into account the filter rules before deciding to
        print an error. Furthermore, it also changes decide_logging_format to
        take into consideration whether the statement is filtered out from
        binlog before decision is made.
      added:
        mysql-test/suite/binlog/r/binlog_stm_do_db.result
        mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
        mysql-test/suite/binlog/t/binlog_stm_do_db.test
      modified:
        sql/sql_base.cc
        sql/sql_class.cc
        storage/innobase/handler/ha_innodb.cc
        storage/innobase/handler/ha_innodb.h
        storage/innodb_plugin/handler/ha_innodb.cc
        storage/innodb_plugin/handler/ha_innodb.h

    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Add changelog entry for r6160.
  ------------------------------------------------------------------------
  r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Add ChangeLog for r6157.
  ------------------------------------------------------------------------
  r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/handler/ha_innodb.h

  branches/zip: Exclude thd_binlog_filter_ok() when building
  with older version of MySQL.

  thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
  plugin can be built with MySQL prior to 5.1.41.

  Approved by Heikki (on IM).
  ------------------------------------------------------------------------
  r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
  Changed paths:
     A /branches/zip/mysql-test/innodb_bug46676.result
     A /branches/zip/mysql-test/innodb_bug46676.test

  branches/zip: add test case for bug#46676

  This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
  But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
  Add test case to catch future regression.
  ------------------------------------------------------------------------
  r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/include/db0err.h
     M /branches/zip/row/row0merge.c
     M /branches/zip/row/row0mysql.c

  branches/zip: Allow CREATE INDEX to be interrupted.  (Issue #354)

  rb://183 approved by Heikki Tuuri
  ------------------------------------------------------------------------
  r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Wrap line at 78th char in the ChangeLog
  ------------------------------------------------------------------------
  r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip: add an entry to ChangeLog for r6065
  ------------------------------------------------------------------------
  r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc

  branches/zip: ha_innobase::change_active_index(): When the history is
  missing, report it to the client, not to the error log.
  ------------------------------------------------------------------------
  r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
  Changed paths:
     M /branches/zip/mysql-test/innodb-index.test

  branches/zip:

  At the end of innodb-index.test: restore the environment as it was before
  the test was started to silence this warning:

    MTR's internal check of the test case 'main.innodb-index' failed.
    This means that the test case does not preserve the state that existed
    before the test case was executed.  Most likely the test case did not
    do a proper clean-up.
    This is the diff of the states of the servers before and after the
    test case was executed:
    mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
    mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
    mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
    mysqltest: ... Connected.
    mysqltest: Start processing test commands from './include/check-testcase.test' ...
    mysqltest: ... Done processing test commands.
    --- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result	2009-11-17 13:10:40.000000000 +0300
    +++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject	2009-11-17 13:10:54.000000000 +0300
    @@ -84,7 +84,7 @@
     INNODB_DOUBLEWRITE	ON
     INNODB_FAST_SHUTDOWN	1
     INNODB_FILE_FORMAT	Antelope
    -INNODB_FILE_FORMAT_CHECK	Antelope
    +INNODB_FILE_FORMAT_CHECK	Barracuda
     INNODB_FILE_PER_TABLE	OFF
     INNODB_FLUSH_LOG_AT_TRX_COMMIT	1
     INNODB_FLUSH_METHOD	

    mysqltest: Result content mismatch

    not ok
  ------------------------------------------------------------------------
  r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
  Changed paths:
     M /branches/zip/mysql-test/innodb-consistent-master.opt
     M /branches/zip/mysql-test/innodb-consistent.result
     M /branches/zip/mysql-test/innodb-consistent.test
     M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
     M /branches/zip/mysql-test/innodb-use-sys-malloc.result
     M /branches/zip/mysql-test/innodb-use-sys-malloc.test
     M /branches/zip/mysql-test/innodb_bug21704.result
     M /branches/zip/mysql-test/innodb_bug21704.test
     M /branches/zip/mysql-test/innodb_bug40360.test
     M /branches/zip/mysql-test/innodb_bug40565.result
     M /branches/zip/mysql-test/innodb_bug40565.test
     M /branches/zip/mysql-test/innodb_bug41904.result
     M /branches/zip/mysql-test/innodb_bug41904.test
     M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
     M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
     M /branches/zip/mysql-test/innodb_bug42101.result
     M /branches/zip/mysql-test/innodb_bug42101.test
     M /branches/zip/mysql-test/innodb_bug44032.result
     M /branches/zip/mysql-test/innodb_bug44032.test
     M /branches/zip/mysql-test/innodb_bug44369.result
     M /branches/zip/mysql-test/innodb_bug44369.test
     M /branches/zip/mysql-test/innodb_bug44571.result
     M /branches/zip/mysql-test/innodb_bug44571.test
     M /branches/zip/mysql-test/innodb_bug45357.test
     M /branches/zip/mysql-test/innodb_bug46000.result
     M /branches/zip/mysql-test/innodb_bug46000.test
     M /branches/zip/mysql-test/innodb_bug46676.result
     M /branches/zip/mysql-test/innodb_bug46676.test
     M /branches/zip/mysql-test/innodb_bug47167.result
     M /branches/zip/mysql-test/innodb_bug47167.test
     M /branches/zip/mysql-test/innodb_bug47777.result
     M /branches/zip/mysql-test/innodb_bug47777.test
     M /branches/zip/mysql-test/innodb_file_format.result
     M /branches/zip/mysql-test/innodb_file_format.test

  branches/zip: Set svn:eol-style on mysql-test files.
  ------------------------------------------------------------------------
  r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
  Changed paths:
     M /branches/zip/mysql-test/innodb-consistent-master.opt
     M /branches/zip/mysql-test/innodb-master.opt
     M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
     M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
     M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt

  branches/zip: Prepend loose_ to plugin-only mysql-test options.
  ------------------------------------------------------------------------
  r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
  Changed paths:
     M /branches/zip/mysql-test/innodb-index.result
     M /branches/zip/mysql-test/innodb-index.test

  branches/zip: innodb-index.test: Restore innodb_file_format_check.
  ------------------------------------------------------------------------
  r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/mysql-test/innodb.result
     M /branches/zip/mysql-test/innodb.test
     M /branches/zip/mysql-test/innodb_bug44369.result
     M /branches/zip/mysql-test/innodb_bug44369.test
     D /branches/zip/mysql-test/patches/innodb-index.diff
     M /branches/zip/row/row0mysql.c

  branches/zip: Report duplicate table names
  to the client connection, not to the error log.  This change will allow
  innodb-index.test to be re-enabled.  It was previously disabled, because
  mysql-test-run does not like output in the error log.

  row_create_table_for_mysql(): Do not output anything to the error log
  when reporting DB_DUPLICATE_KEY.  Let the caller report the error.
  Add a TODO comment that the dict_table_t object is apparently not freed
  when an error occurs.

  create_table_def(): Convert InnoDB table names to the character set
  of the client connection for reporting.  Use my_error(ER_WRONG_COLUMN_NAME)
  for reporting reserved column names.  Report my_error(ER_TABLE_EXISTS_ERROR)
  when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.

  rb://206
  ------------------------------------------------------------------------
  r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Add ChangeLog entry for r6185.
  ------------------------------------------------------------------------
  r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/handler0alter.cc

  branches/zip: ha_innobase::add_index(): When creating the primary key
  and the table is being locked by another transaction,
  do not attempt to drop the table. (Bug #48782)

  Approved by Sunny Bains over IM
  ------------------------------------------------------------------------
  r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
  Changed paths:
     M /branches/zip/include/univ.i

  branches/zip:

  Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
  by MySQL and we will soon release 1.0.6.
  ------------------------------------------------------------------------
  r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
  Changed paths:
     M /branches/zip/CMakeLists.txt

  branches/zip: merge the fix of bug#48317 (CMake file)

  Due to MySQL changes to the CMake, it is no longer able
  to build InnoDB plugin as a static library on Windows.
  The fix is proposed by Vlad of MySQL.
  ------------------------------------------------------------------------
  r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Add ChangeLog entry for r6197.
  ------------------------------------------------------------------------
  r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/btr/btr0btr.c
     M /branches/zip/data/data0type.c

  branches/zip: Merge r6159:6198 from branches/5.1:

    ------------------------------------------------------------------------
    r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
    Changed paths:
       M /branches/5.1/btr/btr0btr.c

    branches/5.1: Fix bug #48469 "when innodb tablespace is
    configured too small, crash and corruption!". Function
    btr_create() did not check the return status of fseg_create(),
    and continue the index creation even there is no sufficient
    space.

    rb://205 Approved by Marko
    ------------------------------------------------------------------------
    r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
    Changed paths:
       M /branches/5.1/data/data0type.c

    branches/5.1: Fix bug #48526 "Data type for float and
    double is incorrectly reported in InnoDB table monitor".
    Certain datatypes are not printed correctly in
    dtype_print().

    rb://204 Approved by Marko.
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
  Changed paths:
     M /branches/zip/handler/handler0alter.cc

  branches/zip: ha_innobase::add_index(): Clarify the comment
  on orphaned tables when creating a primary key.
  ------------------------------------------------------------------------
  r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
  Changed paths:
     M /branches/zip/btr/btr0btr.c

  branches/zip: Function fseg_free() is no longer defined
  in branches/zip. To port fix for bug #48469 to zip,
  we can use btr_free_root() which frees the page,
  and also does not require mini-transaction.

  Approved by Marko.
  ------------------------------------------------------------------------
  r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc

  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().
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip:

  Add ChangeLog entry for c6207.
  ------------------------------------------------------------------------
  r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
  Changed paths:
     M /branches/zip/trx/trx0i_s.c

  branches/zip:

  Whitespace fixup.
  ------------------------------------------------------------------------
  r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip: ChangeLog: Document r4922 that was forgotten.
  ------------------------------------------------------------------------
  r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/dict/dict0boot.c
     M /branches/zip/dict/dict0crea.c
     M /branches/zip/dict/dict0load.c
     M /branches/zip/dict/dict0mem.c
     M /branches/zip/fil/fil0fil.c
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/include/dict0mem.h
     M /branches/zip/row/row0mysql.c

  branches/zip: Suppress errors about non-found temporary tables.
  Write the is_temp flag to SYS_TABLES.MIX_LEN.

  dict_table_t:🎏 Add a flag for is_temporary, DICT_TF2_TEMPORARY.
  Unlike other flags, this will not be written to the tablespace flags
  or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.

  dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.

  dict_check_tablespaces_and_store_max_id(), dict_load_table():
  Suppress errors about temporary tables not being found.

  dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
  to SYS_TABLES.MIX_LEN.

  fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
  about space->flags.

  row_drop_table_for_mysql(): Do not complain about non-found temporary tables.

  rb://160 approved by Heikki Tuuri.  This addresses the second part of
  Bug #41609 Crash recovery does not work for InnoDB temporary tables.
  ------------------------------------------------------------------------
  r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
  Changed paths:
     M /branches/zip/include/univ.i

  branches/zip: Increment version number from 1.0.6 to 1.0.7

  1.0.6 has been released
  ------------------------------------------------------------------------
  r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
  Changed paths:
     M /branches/zip/ChangeLog

  branches/zip: Add ChangeLog entry for the release of 1.0.6.
  ------------------------------------------------------------------------
  r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
  Changed paths:
     M /branches/zip/srv/srv0start.c

  branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
  should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
  ------------------------------------------------------------------------
  r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
  Changed paths:
     M /branches/zip/srv/srv0start.c

  branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
  ------------------------------------------------------------------------
  r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/Makefile.am
     M /branches/zip/include/univ.i
     M /branches/zip/plug.in

  branches/zip: ChangeLog: Document that since r6270, the zlib version number
  will be displayed at start-up.
  ------------------------------------------------------------------------
  r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
  Changed paths:
     M /branches/zip/Makefile.am
     M /branches/zip/include/univ.i
     M /branches/zip/plug.in

  branches/zip: Revert changes that were accidentally committed in r6271.
  ------------------------------------------------------------------------
  r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
  Changed paths:
     M /branches/zip/dict/dict0dict.c

  branches/zip: dict_table_check_for_dup_indexes(): Assert that the
  data dictionary mutex is being held while table->indexes is accessed.
  This is already the case.

  Currently, only dict_table_get_next_index() and dict_table_get_first_index()
  are being invoked without holding dict_sys->mutex.
  ------------------------------------------------------------------------
  r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
  Changed paths:
     M /branches/zip/include/log0recv.h
     M /branches/zip/include/trx0sys.h
     M /branches/zip/log/log0recv.c
     M /branches/zip/trx/trx0sys.c

  branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
  defined to succeed:

  include/trx0sys.h: Allow Hot Backup build to see some
                     TRX_SYS_DOUBLEWRITE_... macros.
  trx/trx0sys.c:     Exclude trx_sys_close() function from Hot Backup build.
  log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.

  This change should not affect !UNIV_HOTBACKUP build.
  ------------------------------------------------------------------------
  r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
  Changed paths:
     M /branches/zip/fsp/fsp0fsp.c

  branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
  ------------------------------------------------------------------------
  r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
  Changed paths:
     M /branches/zip/row/row0sel.c

  branches/zip: row_sel_fetch_columns(): Remove redundant code that was
  accidentally added in r1591, which introduced dfield_t::ext in order
  to make the merge sort of fast index creation support externally
  stored columns,

  Initially, I tried to allocate the bit for dfield_t::ext from
  dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
  to something that would fit in it.  Then I decided that it would be
  too risky.  The redundant check was part of the mapping.  The
  condition may have been dfield_is_null() initially.

  This redundant code was noticed by Sergey Petrunya on the MySQL
  internals list.
  ------------------------------------------------------------------------
  r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
  Changed paths:
     M /branches/zip/row/row0upd.c

  branches/zip: row_upd_copy_columns(): Remove redundant code that was
  accidentally added in r1591, which introduced dfield_t::ext in order
  to make the merge sort of fast index creation support externally
  stored columns.

  Initially, I tried to allocate the bit for dfield_t::ext from
  dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
  to something that would fit in it.  Then I decided that it would be
  too risky.  The redundant check was part of the mapping.  The
  condition may have been dfield_is_null() initially.

  This is similar to the redundant code in row_sel_fetch_columns() that
  was noticed by Sergey Petrunya on the MySQL internals list and removed
  in r6285.  As far as I can tell, there are no redundant UNIV_SQL_NULL
  assignments remaining after this change.
  ------------------------------------------------------------------------
  r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
  Changed paths:
     M /branches/zip/row/row0umod.c

  branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
  const qualifier.
  ------------------------------------------------------------------------
  r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
  Changed paths:
     M /branches/zip/lock/lock0lock.c

  branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
  Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
  Reported by Sunny Bains.
  ------------------------------------------------------------------------
  r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
  Changed paths:
     M /branches/zip/fil/fil0fil.c

  branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
  assertion on mutex.magic_n.  InnoDB Hot Backup is a single-threaded
  program and does not contain mutexes.  This change allows InnoDB Hot
  Backup to be compiled with UNIV_DEBUG.

  Suggested by Michael Izioumtchenko.
  ------------------------------------------------------------------------
  r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
  Changed paths:
     M /branches/zip/row/row0merge.c

  branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
  transaction isolation level that was made unnecessary by r5826 (Issue #337).
  When this function is called, any active data dictionary transaction
  should have been rolled back.
  ------------------------------------------------------------------------
  r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
  Changed paths:
     M /branches/zip/log/log0recv.c

  branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
  debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).

  This change is only for readability, for Issue #428.  Another
  assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
  already ensured together with the old ut_ad(len > 0) that actually len
  must be at least OS_FILE_LOG_BLOCK_SIZE.
  ------------------------------------------------------------------------
  r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
  Changed paths:
     M /branches/zip/log/log0recv.c

  branches/zip: recv_recovery_from_checkpoint_finish():
  Revert a change that was accidentally committed in r6345.
  ------------------------------------------------------------------------
  r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/include/ha_prototypes.h
     M /branches/zip/include/trx0trx.h
     M /branches/zip/lock/lock0lock.c
     M /branches/zip/trx/trx0i_s.c
     M /branches/zip/trx/trx0trx.c

  branches/zip: Merge a change from MySQL:
  ------------------------------------------------------------
  revno: 3236
  committer: Satya B <satya.bn@sun.com>
  branch nick: mysql-5.1-bugteam
  timestamp: Tue 2009-12-01 17:48:57 +0530
  message:
    merge to mysql-5.1-bugteam
      ------------------------------------------------------------
      revno: 3234.1.1
      committer: Gleb Shchepa <gshchepa@mysql.com>
      branch nick: mysql-5.1-bugteam
      timestamp: Tue 2009-12-01 14:38:40 +0400
      message:
        Bug #38883 (reopened): thd_security_context is not thread safe, crashes?

        manual merge 5.0-->5.1, updating InnoDB plugin.
      ------------------------------------------------------------
      revno: 1810.3968.13
      committer: Gleb Shchepa <gshchepa@mysql.com>
      branch nick: mysql-5.0-bugteam
      timestamp: Tue 2009-12-01 14:24:44 +0400
      message:
        Bug #38883 (reopened): thd_security_context is not thread safe, crashes?

        The bug 38816 changed the lock that protects THD::query from
        LOCK_thread_count to LOCK_thd_data, but didn't update the associated
        InnoDB functions.

        1. The innobase_mysql_prepare_print_arbitrary_thd and the
        innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
        removed, since now we have a per-thread mutex: now we don't need to wrap
        several inter-thread access tries to THD::query with a single global
        LOCK_thread_count lock, so we can simplify the code.

        2. The innobase_mysql_print_thd function has been modified to lock
        LOCK_thd_data in direct way.
  ------------------------------------------------------------------------
  r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc

  branches/zip: Remove an obsolete declaration of LOCK_thread_count.
  ------------------------------------------------------------------------
  r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
  Changed paths:
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/include/lock0lock.h
     M /branches/zip/include/srv0srv.h
     M /branches/zip/lock/lock0lock.c
     M /branches/zip/log/log0log.c
     M /branches/zip/mysql-test/innodb-autoinc.result
     M /branches/zip/mysql-test/innodb-autoinc.test
     M /branches/zip/row/row0sel.c
     M /branches/zip/srv/srv0srv.c
     M /branches/zip/srv/srv0start.c

  branches/zip: Merge revisions 6206:6350 from branches/5.1,
  except r6347, r6349, r6350 which were committed separately
  to both branches, and r6310, which was backported from zip to 5.1.

    ------------------------------------------------------------------------
    r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc

    branches/5.1: Non-functional change, fix formatting.
    ------------------------------------------------------------------------
    r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb-autoinc.result

    branches/5.1: Fix autoinc failing test results.
    (this should be skipped when merging 5.1 into zip)
    ------------------------------------------------------------------------
    r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb-autoinc.result
       M /branches/5.1/mysql-test/innodb-autoinc.test
       M /branches/5.1/row/row0sel.c

    branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.

    We use the appropriate function to read the column value for non-integer
    autoinc column types, namely float and double.

    rb://208. Approved by Marko.
    ------------------------------------------------------------------------
    r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
    Changed paths:
       M /branches/5.1/row/row0sel.c

    branches/5.1: This is an interim fix, fix white space errors.
    ------------------------------------------------------------------------
    r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
    Changed paths:
       M /branches/5.1/include/mach0data.h
       M /branches/5.1/include/mach0data.ic
       M /branches/5.1/mysql-test/innodb-autoinc.result
       M /branches/5.1/mysql-test/innodb-autoinc.test
       M /branches/5.1/row/row0sel.c

    branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
    ------------------------------------------------------------------------
    r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
    Changed paths:
       M /branches/5.1/row/row0sel.c

    branches/5.1: This is an interim fix, fix whitepsace issues.
    ------------------------------------------------------------------------
    r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/mysql-test/innodb-autoinc.result
       M /branches/5.1/mysql-test/innodb-autoinc.test

    branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.

    This bug is similiar to the negative autoinc filter patch from earlier,
    with the additional handling of filtering out the negative column values
    set explicitly by the user.

    rb://184
    Approved by Heikki.
    ------------------------------------------------------------------------
    r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
    Changed paths:
       M /branches/5.1/export.sh

    branches/5.1:

    Minor changes to support plugin snapshots.
    ------------------------------------------------------------------------
    r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
    Changed paths:
       M /branches/5.1/mysql-test/innodb-autoinc.result
       M /branches/5.1/mysql-test/innodb-autoinc.test

    branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
    because of different case mode

    There is no change to the InnoDB code, only to fix test case by
    changing "T1" to "t1".
    ------------------------------------------------------------------------
    r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/include/lock0lock.h
       M /branches/5.1/include/srv0srv.h
       M /branches/5.1/lock/lock0lock.c
       M /branches/5.1/log/log0log.c
       M /branches/5.1/srv/srv0srv.c
       M /branches/5.1/srv/srv0start.c

    branches/5.1: Fix bug #47814 - Diagnostics are frequently not
    printed after a long lock wait in InnoDB. Separate out the
    lock wait timeout check thread from monitor information
    printing thread.

    rb://200 Approved by Marko.
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
  Changed paths:
     M /branches/zip/ibuf/ibuf0ibuf.c

  branches/zip: ibuf_bitmap_get_map_page():
  Define a wrapper macro that passes __FILE__, __LINE__ of the caller
  to buf_page_get_gen().
  This will ease the diagnosis of the likes of Issue #135.
  ------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00

828 lines
30 KiB
C
Raw Blame History

/*****************************************************************************
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
*****************************************************************************/
/***********************************************************************
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
Copyright (c) 2009, Percona Inc.
Portions of this file contain modifications contributed and copyrighted
by Percona Inc.. Those modifications are
gratefully acknowledged and are described briefly in the InnoDB
documentation. The contributions by Percona Inc. are incorporated with
their permission, and subject to the conditions contained in the file
COPYING.Percona.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***********************************************************************/
/**************************************************//**
@file include/os0file.h
The interface to the operating system file io
Created 10/21/1995 Heikki Tuuri
*******************************************************/
#ifndef os0file_h
#define os0file_h
#include "univ.i"
#ifndef __WIN__
#include <dirent.h>
#include <sys/stat.h>
#include <time.h>
#endif
/** File node of a tablespace or the log data space */
typedef struct fil_node_struct fil_node_t;
#ifdef UNIV_DO_FLUSH
extern ibool os_do_not_call_flush_at_each_write;
#endif /* UNIV_DO_FLUSH */
extern ibool os_has_said_disk_full;
/** Flag: enable debug printout for asynchronous i/o */
extern ibool os_aio_print_debug;
/** Number of pending os_file_pread() operations */
extern ulint os_file_n_pending_preads;
/** Number of pending os_file_pwrite() operations */
extern ulint os_file_n_pending_pwrites;
/** Number of pending read operations */
extern ulint os_n_pending_reads;
/** Number of pending write operations */
extern ulint os_n_pending_writes;
#ifdef __WIN__
/** We define always WIN_ASYNC_IO, and check at run-time whether
the OS actually supports it: Win 95 does not, NT does. */
#define WIN_ASYNC_IO
/** Use unbuffered I/O */
#define UNIV_NON_BUFFERED_IO
#endif
#ifdef __WIN__
/** File handle */
#define os_file_t HANDLE
/** Convert a C file descriptor to a native file handle
@param fd file descriptor
@return native file handle */
#define OS_FILE_FROM_FD(fd) (HANDLE) _get_osfhandle(fd)
#else
/** File handle */
typedef int os_file_t;
/** Convert a C file descriptor to a native file handle
@param fd file descriptor
@return native file handle */
#define OS_FILE_FROM_FD(fd) fd
#endif
/** Umask for creating files */
extern ulint os_innodb_umask;
/** The next value should be smaller or equal to the smallest sector size used
on any disk. A log block is required to be a portion of disk which is written
so that if the start and the end of a block get written to disk, then the
whole block gets written. This should be true even in most cases of a crash:
if this fails for a log block, then it is equivalent to a media failure in the
log. */
#define OS_FILE_LOG_BLOCK_SIZE 512
/** Options for file_create @{ */
#define OS_FILE_OPEN 51
#define OS_FILE_CREATE 52
#define OS_FILE_OVERWRITE 53
#define OS_FILE_OPEN_RAW 54
#define OS_FILE_CREATE_PATH 55
#define OS_FILE_OPEN_RETRY 56 /* for os_file_create() on
the first ibdata file */
#define OS_FILE_READ_ONLY 333
#define OS_FILE_READ_WRITE 444
#define OS_FILE_READ_ALLOW_DELETE 555 /* for ibbackup */
/* Options for file_create */
#define OS_FILE_AIO 61
#define OS_FILE_NORMAL 62
/* @} */
/** Types for file create @{ */
#define OS_DATA_FILE 100
#define OS_LOG_FILE 101
/* @} */
/** Error codes from os_file_get_last_error @{ */
#define OS_FILE_NOT_FOUND 71
#define OS_FILE_DISK_FULL 72
#define OS_FILE_ALREADY_EXISTS 73
#define OS_FILE_PATH_ERROR 74
#define OS_FILE_AIO_RESOURCES_RESERVED 75 /* wait for OS aio resources
to become available again */
#define OS_FILE_SHARING_VIOLATION 76
#define OS_FILE_ERROR_NOT_SPECIFIED 77
#define OS_FILE_INSUFFICIENT_RESOURCE 78
#define OS_FILE_AIO_INTERRUPTED 79
#define OS_FILE_OPERATION_ABORTED 80
/* @} */
/** Types for aio operations @{ */
#define OS_FILE_READ 10
#define OS_FILE_WRITE 11
#define OS_FILE_LOG 256 /* This can be ORed to type */
/* @} */
#define OS_AIO_N_PENDING_IOS_PER_THREAD 32 /*!< Win NT does not allow more
than 64 */
/** Modes for aio operations @{ */
#define OS_AIO_NORMAL 21 /*!< Normal asynchronous i/o not for ibuf
pages or ibuf bitmap pages */
#define OS_AIO_IBUF 22 /*!< Asynchronous i/o for ibuf pages or ibuf
bitmap pages */
#define OS_AIO_LOG 23 /*!< Asynchronous i/o for the log */
#define OS_AIO_SYNC 24 /*!< Asynchronous i/o where the calling thread
will itself wait for the i/o to complete,
doing also the job of the i/o-handler thread;
can be used for any pages, ibuf or non-ibuf.
This is used to save CPU time, as we can do
with fewer thread switches. Plain synchronous
i/o is not as good, because it must serialize
the file seek and read or write, causing a
bottleneck for parallelism. */
#define OS_AIO_SIMULATED_WAKE_LATER 512 /*!< This can be ORed to mode
in the call of os_aio(...),
if the caller wants to post several i/o
requests in a batch, and only after that
wake the i/o-handler thread; this has
effect only in simulated aio */
/* @} */
#define OS_WIN31 1 /*!< Microsoft Windows 3.x */
#define OS_WIN95 2 /*!< Microsoft Windows 95 */
#define OS_WINNT 3 /*!< Microsoft Windows NT 3.x */
#define OS_WIN2000 4 /*!< Microsoft Windows 2000 */
extern ulint os_n_file_reads;
extern ulint os_n_file_writes;
extern ulint os_n_fsyncs;
/* File types for directory entry data type */
enum os_file_type_enum{
OS_FILE_TYPE_UNKNOWN = 0,
OS_FILE_TYPE_FILE, /* regular file */
OS_FILE_TYPE_DIR, /* directory */
OS_FILE_TYPE_LINK /* symbolic link */
};
typedef enum os_file_type_enum os_file_type_t;
/* Maximum path string length in bytes when referring to tables with in the
'./databasename/tablename.ibd' path format; we can allocate at least 2 buffers
of this size from the thread stack; that is why this should not be made much
bigger than 4000 bytes */
#define OS_FILE_MAX_PATH 4000
/* Struct used in fetching information of a file in a directory */
struct os_file_stat_struct{
char name[OS_FILE_MAX_PATH]; /*!< path to a file */
os_file_type_t type; /*!< file type */
ib_int64_t size; /*!< file size */
time_t ctime; /*!< creation time */
time_t mtime; /*!< modification time */
time_t atime; /*!< access time */
};
typedef struct os_file_stat_struct os_file_stat_t;
#ifdef __WIN__
typedef HANDLE os_file_dir_t; /*!< directory stream */
#else
typedef DIR* os_file_dir_t; /*!< directory stream */
#endif
/***********************************************************************//**
Gets the operating system version. Currently works only on Windows.
@return OS_WIN95, OS_WIN31, OS_WINNT, or OS_WIN2000 */
UNIV_INTERN
ulint
os_get_os_version(void);
/*===================*/
#ifndef UNIV_HOTBACKUP
/****************************************************************//**
Creates the seek mutexes used in positioned reads and writes. */
UNIV_INTERN
void
os_io_init_simple(void);
/*===================*/
/***********************************************************************//**
Creates a temporary file. This function is like tmpfile(3), but
the temporary file is created in the MySQL temporary directory.
On Netware, this function is like tmpfile(3), because the C run-time
library of Netware does not expose the delete-on-close flag.
@return temporary file handle, or NULL on error */
FILE*
os_file_create_tmpfile(void);
/*========================*/
#endif /* !UNIV_HOTBACKUP */
/***********************************************************************//**
The os_file_opendir() function opens a directory stream corresponding to the
directory named by the dirname argument. The directory stream is positioned
at the first entry. In both Unix and Windows we automatically skip the '.'
and '..' items at the start of the directory listing.
@return directory stream, NULL if error */
UNIV_INTERN
os_file_dir_t
os_file_opendir(
/*============*/
const char* dirname, /*!< in: directory name; it must not
contain a trailing '\' or '/' */
ibool error_is_fatal);/*!< in: TRUE if we should treat an
error as a fatal error; if we try to
open symlinks then we do not wish a
fatal error if it happens not to be
a directory */
/***********************************************************************//**
Closes a directory stream.
@return 0 if success, -1 if failure */
UNIV_INTERN
int
os_file_closedir(
/*=============*/
os_file_dir_t dir); /*!< in: directory stream */
/***********************************************************************//**
This function returns information of the next file in the directory. We jump
over the '.' and '..' entries in the directory.
@return 0 if ok, -1 if error, 1 if at the end of the directory */
UNIV_INTERN
int
os_file_readdir_next_file(
/*======================*/
const char* dirname,/*!< in: directory name or path */
os_file_dir_t dir, /*!< in: directory stream */
os_file_stat_t* info); /*!< in/out: buffer where the info is returned */
/*****************************************************************//**
This function attempts to create a directory named pathname. The new directory
gets default permissions. On Unix, the permissions are (0770 & ~umask). If the
directory exists already, nothing is done and the call succeeds, unless the
fail_if_exists arguments is true.
@return TRUE if call succeeds, FALSE on error */
UNIV_INTERN
ibool
os_file_create_directory(
/*=====================*/
const char* pathname, /*!< in: directory name as
null-terminated string */
ibool fail_if_exists);/*!< in: if TRUE, pre-existing directory
is treated as an error. */
/****************************************************************//**
A simple function to open or create a file.
@return own: handle to the file, not defined if error, error number
can be retrieved with os_file_get_last_error */
UNIV_INTERN
os_file_t
os_file_create_simple(
/*==================*/
const char* name, /*!< in: name of the file or path as a
null-terminated string */
ulint create_mode,/*!< in: OS_FILE_OPEN if an existing file is
opened (if does not exist, error), or
OS_FILE_CREATE if a new file is created
(if exists, error), or
OS_FILE_CREATE_PATH if new file
(if exists, error) and subdirectories along
its path are created (if needed)*/
ulint access_type,/*!< in: OS_FILE_READ_ONLY or
OS_FILE_READ_WRITE */
ibool* success);/*!< out: TRUE if succeed, FALSE if error */
/****************************************************************//**
A simple function to open or create a file.
@return own: handle to the file, not defined if error, error number
can be retrieved with os_file_get_last_error */
UNIV_INTERN
os_file_t
os_file_create_simple_no_error_handling(
/*====================================*/
const char* name, /*!< in: name of the file or path as a
null-terminated string */
ulint create_mode,/*!< in: OS_FILE_OPEN if an existing file
is opened (if does not exist, error), or
OS_FILE_CREATE if a new file is created
(if exists, error) */
ulint access_type,/*!< in: OS_FILE_READ_ONLY,
OS_FILE_READ_WRITE, or
OS_FILE_READ_ALLOW_DELETE; the last option is
used by a backup program reading the file */
ibool* success);/*!< out: TRUE if succeed, FALSE if error */
/****************************************************************//**
Tries to disable OS caching on an opened file descriptor. */
UNIV_INTERN
void
os_file_set_nocache(
/*================*/
int fd, /*!< in: file descriptor to alter */
const char* file_name, /*!< in: file name, used in the
diagnostic message */
const char* operation_name);/*!< in: "open" or "create"; used in the
diagnostic message */
/****************************************************************//**
Opens an existing file or creates a new.
@return own: handle to the file, not defined if error, error number
can be retrieved with os_file_get_last_error */
UNIV_INTERN
os_file_t
os_file_create(
/*===========*/
const char* name, /*!< in: name of the file or path as a
null-terminated string */
ulint create_mode,/*!< in: OS_FILE_OPEN if an existing file
is opened (if does not exist, error), or
OS_FILE_CREATE if a new file is created
(if exists, error),
OS_FILE_OVERWRITE if a new file is created
or an old overwritten;
OS_FILE_OPEN_RAW, if a raw device or disk
partition should be opened */
ulint purpose,/*!< in: OS_FILE_AIO, if asynchronous,
non-buffered i/o is desired,
OS_FILE_NORMAL, if any normal file;
NOTE that it also depends on type, os_aio_..
and srv_.. variables whether we really use
async i/o or unbuffered i/o: look in the
function source code for the exact rules */
ulint type, /*!< in: OS_DATA_FILE or OS_LOG_FILE */
ibool* success);/*!< out: TRUE if succeed, FALSE if error */
/***********************************************************************//**
Deletes a file. The file has to be closed before calling this.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_delete(
/*===========*/
const char* name); /*!< in: file path as a null-terminated string */
/***********************************************************************//**
Deletes a file if it exists. The file has to be closed before calling this.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_delete_if_exists(
/*=====================*/
const char* name); /*!< in: file path as a null-terminated string */
/***********************************************************************//**
Renames a file (can also move it to another directory). It is safest that the
file is closed before calling this function.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_rename(
/*===========*/
const char* oldpath, /*!< in: old file path as a
null-terminated string */
const char* newpath); /*!< in: new file path */
/***********************************************************************//**
Closes a file handle. In case of error, error number can be retrieved with
os_file_get_last_error.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_close(
/*==========*/
os_file_t file); /*!< in, own: handle to a file */
#ifdef UNIV_HOTBACKUP
/***********************************************************************//**
Closes a file handle.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_close_no_error_handling(
/*============================*/
os_file_t file); /*!< in, own: handle to a file */
#endif /* UNIV_HOTBACKUP */
/***********************************************************************//**
Gets a file size.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_get_size(
/*=============*/
os_file_t file, /*!< in: handle to a file */
ulint* size, /*!< out: least significant 32 bits of file
size */
ulint* size_high);/*!< out: most significant 32 bits of size */
/***********************************************************************//**
Gets file size as a 64-bit integer ib_int64_t.
@return size in bytes, -1 if error */
UNIV_INTERN
ib_int64_t
os_file_get_size_as_iblonglong(
/*===========================*/
os_file_t file); /*!< in: handle to a file */
/***********************************************************************//**
Write the specified number of zeros to a newly created file.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_set_size(
/*=============*/
const char* name, /*!< in: name of the file or path as a
null-terminated string */
os_file_t file, /*!< in: handle to a file */
ulint size, /*!< in: least significant 32 bits of file
size */
ulint size_high);/*!< in: most significant 32 bits of size */
/***********************************************************************//**
Truncates a file at its current position.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_set_eof(
/*============*/
FILE* file); /*!< in: file to be truncated */
/***********************************************************************//**
Flushes the write buffers of a given file to the disk.
@return TRUE if success */
UNIV_INTERN
ibool
os_file_flush(
/*==========*/
os_file_t file); /*!< in, own: handle to a file */
/***********************************************************************//**
Retrieves the last error number if an error occurs in a file io function.
The number should be retrieved before any other OS calls (because they may
overwrite the error number). If the number is not known to this program,
the OS error number + 100 is returned.
@return error number, or OS error number + 100 */
UNIV_INTERN
ulint
os_file_get_last_error(
/*===================*/
ibool report_all_errors); /*!< in: TRUE if we want an error message
printed of all errors */
/*******************************************************************//**
Requests a synchronous read operation.
@return TRUE if request was successful, FALSE if fail */
UNIV_INTERN
ibool
os_file_read(
/*=========*/
os_file_t file, /*!< in: handle to a file */
void* buf, /*!< in: buffer where to read */
ulint offset, /*!< in: least significant 32 bits of file
offset where to read */
ulint offset_high,/*!< in: most significant 32 bits of
offset */
ulint n); /*!< in: number of bytes to read */
/*******************************************************************//**
Rewind file to its start, read at most size - 1 bytes from it to str, and
NUL-terminate str. All errors are silently ignored. This function is
mostly meant to be used with temporary files. */
UNIV_INTERN
void
os_file_read_string(
/*================*/
FILE* file, /*!< in: file to read from */
char* str, /*!< in: buffer where to read */
ulint size); /*!< in: size of buffer */
/*******************************************************************//**
Requests a synchronous positioned read operation. This function does not do
any error handling. In case of error it returns FALSE.
@return TRUE if request was successful, FALSE if fail */
UNIV_INTERN
ibool
os_file_read_no_error_handling(
/*===========================*/
os_file_t file, /*!< in: handle to a file */
void* buf, /*!< in: buffer where to read */
ulint offset, /*!< in: least significant 32 bits of file
offset where to read */
ulint offset_high,/*!< in: most significant 32 bits of
offset */
ulint n); /*!< in: number of bytes to read */
/*******************************************************************//**
Requests a synchronous write operation.
@return TRUE if request was successful, FALSE if fail */
UNIV_INTERN
ibool
os_file_write(
/*==========*/
const char* name, /*!< in: name of the file or path as a
null-terminated string */
os_file_t file, /*!< in: handle to a file */
const void* buf, /*!< in: buffer from which to write */
ulint offset, /*!< in: least significant 32 bits of file
offset where to write */
ulint offset_high,/*!< in: most significant 32 bits of
offset */
ulint n); /*!< in: number of bytes to write */
/*******************************************************************//**
Check the existence and type of the given file.
@return TRUE if call succeeded */
UNIV_INTERN
ibool
os_file_status(
/*===========*/
const char* path, /*!< in: pathname of the file */
ibool* exists, /*!< out: TRUE if file exists */
os_file_type_t* type); /*!< out: type of the file (if it exists) */
/****************************************************************//**
The function os_file_dirname returns a directory component of a
null-terminated pathname string. In the usual case, dirname returns
the string up to, but not including, the final '/', and basename
is the component following the final '/'. Trailing '/' charac<61>
ters are not counted as part of the pathname.
If path does not contain a slash, dirname returns the string ".".
Concatenating the string returned by dirname, a "/", and the basename
yields a complete pathname.
The return value is a copy of the directory component of the pathname.
The copy is allocated from heap. It is the caller responsibility
to free it after it is no longer needed.
The following list of examples (taken from SUSv2) shows the strings
returned by dirname and basename for different paths:
path dirname basename
"/usr/lib" "/usr" "lib"
"/usr/" "/" "usr"
"usr" "." "usr"
"/" "/" "/"
"." "." "."
".." "." ".."
@return own: directory component of the pathname */
UNIV_INTERN
char*
os_file_dirname(
/*============*/
const char* path); /*!< in: pathname */
/****************************************************************//**
Creates all missing subdirectories along the given path.
@return TRUE if call succeeded FALSE otherwise */
UNIV_INTERN
ibool
os_file_create_subdirs_if_needed(
/*=============================*/
const char* path); /*!< in: path name */
/***********************************************************************
Initializes the asynchronous io system. Creates one array each for ibuf
and log i/o. Also creates one array each for read and write where each
array is divided logically into n_read_segs and n_write_segs
respectively. The caller must create an i/o handler thread for each
segment in these arrays. This function also creates the sync array.
No i/o handler thread needs to be created for that */
UNIV_INTERN
ibool
os_aio_init(
/*========*/
ulint n_per_seg, /*<! in: maximum number of pending aio
operations allowed per segment */
ulint n_read_segs, /*<! in: number of reader threads */
ulint n_write_segs, /*<! in: number of writer threads */
ulint n_slots_sync); /*<! in: number of slots in the sync aio
array */
/***********************************************************************
Frees the asynchronous io system. */
UNIV_INTERN
void
os_aio_free(void);
/*=============*/
/*******************************************************************//**
Requests an asynchronous i/o operation.
@return TRUE if request was queued successfully, FALSE if fail */
UNIV_INTERN
ibool
os_aio(
/*===*/
ulint type, /*!< in: OS_FILE_READ or OS_FILE_WRITE */
ulint mode, /*!< in: OS_AIO_NORMAL, ..., possibly ORed
to OS_AIO_SIMULATED_WAKE_LATER: the
last flag advises this function not to wake
i/o-handler threads, but the caller will
do the waking explicitly later, in this
way the caller can post several requests in
a batch; NOTE that the batch must not be
so big that it exhausts the slots in aio
arrays! NOTE that a simulated batch
may introduce hidden chances of deadlocks,
because i/os are not actually handled until
all have been posted: use with great
caution! */
const char* name, /*!< in: name of the file or path as a
null-terminated string */
os_file_t file, /*!< in: handle to a file */
void* buf, /*!< in: buffer where to read or from which
to write */
ulint offset, /*!< in: least significant 32 bits of file
offset where to read or write */
ulint offset_high, /*!< in: most significant 32 bits of
offset */
ulint n, /*!< in: number of bytes to read or write */
fil_node_t* message1,/*!< in: message for the aio handler
(can be used to identify a completed
aio operation); ignored if mode is
OS_AIO_SYNC */
void* message2);/*!< in: message for the aio handler
(can be used to identify a completed
aio operation); ignored if mode is
OS_AIO_SYNC */
/************************************************************************//**
Wakes up all async i/o threads so that they know to exit themselves in
shutdown. */
UNIV_INTERN
void
os_aio_wake_all_threads_at_shutdown(void);
/*=====================================*/
/************************************************************************//**
Waits until there are no pending writes in os_aio_write_array. There can
be other, synchronous, pending writes. */
UNIV_INTERN
void
os_aio_wait_until_no_pending_writes(void);
/*=====================================*/
/**********************************************************************//**
Wakes up simulated aio i/o-handler threads if they have something to do. */
UNIV_INTERN
void
os_aio_simulated_wake_handler_threads(void);
/*=======================================*/
/**********************************************************************//**
This function can be called if one wants to post a batch of reads and
prefers an i/o-handler thread to handle them all at once later. You must
call os_aio_simulated_wake_handler_threads later to ensure the threads
are not left sleeping! */
UNIV_INTERN
void
os_aio_simulated_put_read_threads_to_sleep(void);
/*============================================*/
#ifdef WIN_ASYNC_IO
/**********************************************************************//**
This function is only used in Windows asynchronous i/o.
Waits for an aio operation to complete. This function is used to wait the
for completed requests. The aio array of pending requests is divided
into segments. The thread specifies which segment or slot it wants to wait
for. NOTE: this function will also take care of freeing the aio slot,
therefore no other thread is allowed to do the freeing!
@return TRUE if the aio operation succeeded */
UNIV_INTERN
ibool
os_aio_windows_handle(
/*==================*/
ulint segment, /*!< in: the number of the segment in the aio
arrays to wait for; segment 0 is the ibuf
i/o thread, segment 1 the log i/o thread,
then follow the non-ibuf read threads, and as
the last are the non-ibuf write threads; if
this is ULINT_UNDEFINED, then it means that
sync aio is used, and this parameter is
ignored */
ulint pos, /*!< this parameter is used only in sync aio:
wait for the aio slot at this position */
fil_node_t**message1, /*!< out: the messages passed with the aio
request; note that also in the case where
the aio operation failed, these output
parameters are valid and can be used to
restart the operation, for example */
void** message2,
ulint* type); /*!< out: OS_FILE_WRITE or ..._READ */
#endif
/**********************************************************************//**
Does simulated aio. This function should be called by an i/o-handler
thread.
@return TRUE if the aio operation succeeded */
UNIV_INTERN
ibool
os_aio_simulated_handle(
/*====================*/
ulint segment, /*!< in: the number of the segment in the aio
arrays to wait for; segment 0 is the ibuf
i/o thread, segment 1 the log i/o thread,
then follow the non-ibuf read threads, and as
the last are the non-ibuf write threads */
fil_node_t**message1, /*!< out: the messages passed with the aio
request; note that also in the case where
the aio operation failed, these output
parameters are valid and can be used to
restart the operation, for example */
void** message2,
ulint* type); /*!< out: OS_FILE_WRITE or ..._READ */
/**********************************************************************//**
Validates the consistency of the aio system.
@return TRUE if ok */
UNIV_INTERN
ibool
os_aio_validate(void);
/*=================*/
/**********************************************************************//**
Prints info of the aio arrays. */
UNIV_INTERN
void
os_aio_print(
/*=========*/
FILE* file); /*!< in: file where to print */
/**********************************************************************//**
Refreshes the statistics used to print per-second averages. */
UNIV_INTERN
void
os_aio_refresh_stats(void);
/*======================*/
#ifdef UNIV_DEBUG
/**********************************************************************//**
Checks that all slots in the system have been freed, that is, there are
no pending io operations. */
UNIV_INTERN
ibool
os_aio_all_slots_free(void);
/*=======================*/
#endif /* UNIV_DEBUG */
/*******************************************************************//**
This function returns information about the specified file
@return TRUE if stat information found */
UNIV_INTERN
ibool
os_file_get_status(
/*===============*/
const char* path, /*!< in: pathname of the file */
os_file_stat_t* stat_info); /*!< information of a file in a
directory */
#if !defined(UNIV_HOTBACKUP) && !defined(__NETWARE__)
/*********************************************************************//**
Creates a temporary file that will be deleted on close.
This function is defined in ha_innodb.cc.
@return temporary file descriptor, or < 0 on error */
UNIV_INTERN
int
innobase_mysql_tmpfile(void);
/*========================*/
#endif /* !UNIV_HOTBACKUP && !__NETWARE__ */
#if defined(LINUX_NATIVE_AIO)
/**************************************************************************
This function is only used in Linux native asynchronous i/o.
Waits for an aio operation to complete. This function is used to wait the
for completed requests. The aio array of pending requests is divided
into segments. The thread specifies which segment or slot it wants to wait
for. NOTE: this function will also take care of freeing the aio slot,
therefore no other thread is allowed to do the freeing!
@return TRUE if the IO was successful */
UNIV_INTERN
ibool
os_aio_linux_handle(
/*================*/
ulint global_seg, /*!< in: segment number in the aio array
to wait for; segment 0 is the ibuf
i/o thread, segment 1 is log i/o thread,
then follow the non-ibuf read threads,
and the last are the non-ibuf write
threads. */
fil_node_t**message1, /*!< out: the messages passed with the */
void** message2, /*!< aio request; note that in case the
aio operation failed, these output
parameters are valid and can be used to
restart the operation. */
ulint* type); /*!< out: OS_FILE_WRITE or ..._READ */
#endif /* LINUX_NATIVE_AIO */
#endif