An error occurred fetching the project authors.
  1. 27 Mar, 2008 1 commit
    • unknown's avatar
      Apply innodb-5.1-ss2360 snapshot · 9aaab69a
      unknown authored
      Fixes:
      - Bug #34920: auto_increment resets to 1 on foreign key creation
        We need to use/inherit the passed in autoinc counter for ALTER TABLE
        statements too.
      
      
      mysql-test/r/innodb.result:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      mysql-test/t/innodb.test:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/dict/dict0dict.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/handler/ha_innodb.cc:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
        
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/handler/ha_innodb.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0dict.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0mem.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/row0sel.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/univ.i:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/row/row0sel.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      9aaab69a
  2. 19 Feb, 2008 1 commit
    • unknown's avatar
      Applied InnoDB snapshot innodb-5.1-ss2298 · 4b25d5b1
      unknown authored
      Fixes the following bugs:
      
      - Bug #33349: possible race condition revolving around data dictionary and repartitioning
        Introduce retry/sleep logic as a workaround for a transient bug
        where ::open fails for partitioned tables randomly if we are using
        one file per table.
      
      - Bug #34053: normal users can enable innodb_monitor logging
        In CREATE TABLE and DROP TABLE check whether the table in question is one
        of the magic innodb_monitor tables and whether the user has enough rights
        to mess with it before doing anything else.
      
      - Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
      - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
      
      - Bug #30930: Add auxiliary function to retrieve THD::thread_id
        Add thd_get_thread_id() function.  Also make check_global_access() function
        visible to InnoDB under INNODB_COMPATIBILITY_HOOKS #define.
      
      
      include/mysql/plugin.h:
        Add thd_get_thread_id() accessor function
      mysql-test/r/innodb.result:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2261:
        branches/5.1: Merge a change from MySQL AB:
        
        ChangeSet@2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi
        
        Bug #29136 erred multi-delete on trans table does not rollback the statement
        
        innodb.test, innodb.result: trans table specific test added
      mysql-test/t/innodb.test:
        Applied InnoDB snapshot innodb-5.1-ss2298
      sql/mysql_priv.h:
        Make check_global_access() declaration available if when
        INNODB_COMPATIBILITY_HOOKS is defined.
      sql/sql_class.cc:
        Add thd_get_thread_id() accessor function.
        
        Add 'extern "C"' to definition for thd_get_xid().  Not strictly
        needed, but in keeping with our coding style.
      storage/innobase/btr/btr0cur.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2295:
        branches/5.1:
        
        Merge r2294 from branches/5.0:
        
        Fix typo and add comma in comment.
      storage/innobase/handler/ha_innodb.cc:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        - But remove the declaration of check_global_access() from ha_innodb.cc,
          because it is now visible in mysql_priv.h under INNODB_COMPATIBILITY_HOOKS
        
        Revision r2270:
        branches/5.1:
        
        Rename the user visible parameter innodb-use-adaptive-hash-indexes to
        innodb-adaptive-hash-index so that it is in sync with MySQL 5.0.
        
        Suggested by:	Heikki
        Approved by:	Heikki
        
        
        Revision r2236:
        branches/5.1: bug#33349
        
        Introduce retry/sleep logic as a workaround for a transient bug
        where ::open fails for partitioned tables randomly if we are using
        one file per table.
        
        
        Reviewed by: Heikki
        
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2246:
        branches/5.1:
        
        Fix formatting of the autoinc-lock-mode command line parameter.
        
        Old view (./mysqld --help --verbose):
        
          --innodb-autoinc-lock-mode=#
                              The AUTOINC lock modes supported by InnoDB:
          0 => Old
                              style AUTOINC locking (for backward compatibility)
          1 =>
                              New style AUTOINC locking
          2 => No AUTOINC locking
                              (unsafe for SBR)
        
        New view:
        
          --innodb-autoinc-lock-mode=#
                              The AUTOINC lock modes supported by InnoDB:
                              0 => Old style AUTOINC locking (for backward
                              compatibility)
                              1 => New style AUTOINC locking
                              2 => No AUTOINC locking (unsafe for SBR)
        
        Looks like these strings are "automatically" wrapped by MySQL in the
        following way:
        * newlines (\n) in the string are ignored
        * newline separator (\n) is inserted every 57 or so characters.
        * lots of white space is appended to each inserted new line.
        
        Approved by:	Heikki
      storage/innobase/include/os0sync.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/read0read.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2188:
        branches/5.1: Remove unused field can_be_too_old from read_view_struct.
      storage/innobase/include/row0mysql.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2272:
        branches/5.1:
        
        Fix typo in comment.
      storage/innobase/include/sync0arr.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0rw.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0rw.ic:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0sync.h:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/include/sync0sync.ic:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/os/os0sync.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/read/read0read.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2188:
        branches/5.1: Remove unused field can_be_too_old from read_view_struct.
      storage/innobase/row/row0mysql.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
        
        
        Revision r2272:
        branches/5.1:
        
        Fix typo in comment.
      storage/innobase/srv/srv0srv.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0arr.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0rw.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      storage/innobase/sync/sync0sync.c:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2268:
        branches/5.1: Port of r2267
        
        This is a combination of changes that forward port the scalability fix applied to 5.0
        through r1001.
        It reverts changes r149 and r122 (these were 5.1 specific changes made in lieu of
        scalability fix of 5.0)
        Then it applies r1001 to 5.0 which is the original scalability fix.
        Finally it applies r2082 which fixes an issue with the original fix.
        
        Reviewed by: Heikki
      mysql-test/r/innodb_bug34053.result:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
      mysql-test/t/innodb_bug34053.test:
        Applied InnoDB snapshot innodb-5.1-ss2298
        
        Revision r2282:
        branches/5.1:
        
        Fix Bug#34053:
        * In CREATE TABLE and DROP TABLE check whether the table in question is one
          of the magic innodb_monitor tables and whether the user has enough rights
          to mess with it before doing anything else.
        * Implement a mysql-test testcase.
        
        Approved by:	Heikki
      4b25d5b1
  3. 15 Jan, 2008 1 commit
    • unknown's avatar
      Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots. · d39f2048
      unknown authored
      Fixes:
      
      Bug #18942: DROP DATABASE does not drop an orphan FOREIGN KEY constraint
        Fix Bug#18942 by dropping all foreign key constraints at the end of
        DROP DATABASE. Usually, by then, there are no foreign constraints
        left because all of them are dropped when the relevant tables are
        dropped. This code is to ensure that any orphaned FKs are wiped too.
      
      Bug #29157: UPDATE, changed rows incorrect
        Return HA_ERR_RECORD_IS_THE_SAME from ha_innobase::update_row() if no
        columns were updated.
      
      Bug #32440: InnoDB free space info does not appear in SHOW TABLE STATUS or I_S
        Put information about the free space in a tablespace in
        INFORMATION_SCHEMA.TABLES.DATA_FREE. This information was previously
        available in INFORMATION_SCHEMA.TABLES.TABLE_COMMENT, but MySQL has
        removed it from there recently.
        The stored value is in kilobytes.
        This can be considered as a permanent workaround to
        http://bugs.mysql.com/32440. "Workaround" becasue that bug is about the
        data missing from TABLE_COMMENT and this is actually not solved.
      
      
      mysql-test/r/innodb.result:
        New tests for bugs fixed as part of snapshots innodb-5.1-ss2146 and innodb-5.1-ss2178
      mysql-test/r/partition_innodb.result:
        Update results - InnoDB now sets Data_length (show table status)
      mysql-test/t/innodb.test:
        New tests for bugs fixed as part of snapshots innodb-5.1-ss2146 and innodb-5.1-ss2178
      mysql-test/t/partition_innodb.test:
        Mask out Data_Free in show table status, because it varies depending on
        which tests have been run.
      storage/innobase/handler/ha_innodb.cc:
        Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
        
        
        Revision r2178:
        branches/5.1:
        
        Merge r2177 from trunk/:
        
        Fix Bug#29157 "UPDATE, changed rows incorrect":
        
        Return HA_ERR_RECORD_IS_THE_SAME from ha_innobase::update_row() if no
        columns were updated.
        
        
        Revision r2169:
        branches/5.1:
        
        Bug#32440:
        
        Put information about the free space in a tablespace in
        INFORMATION_SCHEMA.TABLES.DATA_FREE. This information was previously
        available in INFORMATION_SCHEMA.TABLES.TABLE_COMMENT, but MySQL has
        removed it from there recently.
        
        The stored value is in kilobytes.
        
        This can be considered as a permanent workaround to
        http://bugs.mysql.com/32440. "Workaround" becasue that bug is about the
        data missing from TABLE_COMMENT and this is actually not solved.
      storage/innobase/row/row0mysql.c:
        Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
        
        
        Revision r2161:
        branches/5.1:
        
        Merge r2160 from trunk/:
        
        Fix Bug#18942 by dropping all foreign key constraints at the end of
        DROP DATABASE. Usually, by then, there are no foreign constraints
        left because all of them are dropped when the relevant tables are
        dropped. This code is to ensure that any orphaned FKs are wiped too.
      storage/innobase/trx/trx0trx.c:
        Apply innodb-5.1-ss2146 and innodb-5.1-ss2178 snapshots.
      d39f2048
  4. 20 Nov, 2007 1 commit
    • unknown's avatar
      Applied InnoDB snapshot innodb-5.1-ss2093 · fcd89fcc
      unknown authored
      Fixes the following bug:
      
      - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
      
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
      
      
      storage/innobase/dict/dict0dict.c:
        Applied InnoDB snapshot innodb-5.1-ss2093
        
        Revision r2092:
        Remove the unused function innobase_convert_from_filename() that was
        inadvertently added in r590.
      storage/innobase/handler/ha_innodb.cc:
        Applied InnoDB snapshot innodb-5.1-ss2093
        
        Revision r2088:
        Fix Bug#32125 (http://bugs.mysql.com/32125)
        "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
        
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
        
        Approved by:	Heikki (via IM)
        
        
        
        Revision r2093:
        convert_search_mode_to_innobase(): Add the missing case label
        HA_READ_MBR_EQUAL that was forgotten in r2088.
        
        
        Revision r2089:
        Non-functional change: convert the switch in convert_search_mode_to_innobase()
        to the InnoDB coding style.
        
        
        Revision r2092:
        Remove the unused function innobase_convert_from_filename() that was
        inadvertently added in r590.
      storage/innobase/include/page0cur.h:
        Applied InnoDB snapshot innodb-5.1-ss2093
        
        Revision r2088:
        Fix Bug#32125 (http://bugs.mysql.com/32125)
        "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
        
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
        
        Approved by:	Heikki (via IM)
      fcd89fcc
  5. 07 Nov, 2007 1 commit
    • unknown's avatar
      Cast away compiler warning on Windows. · 8680f86e
      unknown authored
      storage/innobase/handler/ha_innodb.cc:
        Cast away a compiler warning; some functions return ulong or ulint for
        errors, and some use int.  Let's hope these all fit in an int.
      8680f86e
  6. 06 Nov, 2007 2 commits
    • unknown's avatar
      Apply snapshot innodb-5.1-ss2034 · bdffce05
      unknown authored
      The following bugs are fixed:
      
      Bug #31860: Server crashes after inserting into InnoDB table with auto_increment column
        In the Bug 16979 fix there was an erroneous assertion that
        autoincrement columns can't contain negative values. With the fix, the
        autoincrement table counter is set to 0 if the maximum value read from
        the autoinc column index is negative.
      
      
      mysql-test/r/innodb.result:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2034:
        Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
        autoincrement columns can't contain negative values. With the fix, the
        autoincrement table counter is set to 0 if the maximum value read from
        the autoinc column index is negative.
        
        Add test for the bug fix but the test is not really useful as the server
        needs to be restarted half way through the test. It has been added for 
        reference only.
      mysql-test/t/innodb.test:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2034:
        Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
        autoincrement columns can't contain negative values. With the fix, the
        autoincrement table counter is set to 0 if the maximum value read from
        the autoinc column index is negative.
        
        Add test for the bug fix but the test is not really useful as the server
        needs to be restarted half way through the test. It has been added for 
        reference only.
      storage/innobase/handler/ha_innodb.cc:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2017:
        Use "InnoDB:" prefix in error messages.
        
        
        Revision r2018:
        Remove ut_print_timestamp(), this should have been removed when the following
        changes were made by MySQL.
        
        	ChangeSet@1.1810.467.1  2005-08-11 19:19:20+03:00  jani@omakaista.fi
        
        Fix error message so that it conforms to "  InnoDB: Error: ...".
      storage/innobase/include/univ.i:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2015:
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Remove warnings on 64-bit systems.
      storage/innobase/row/row0sel.c:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2034:
        Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
        autoincrement columns can't contain negative values. With the fix, the
        autoincrement table counter is set to 0 if the maximum value read from
        the autoinc column index is negative.
        
        Add test for the bug fix but the test is not really useful as the server
        needs to be restarted half way through the test. It has been added for 
        reference only.
      storage/innobase/sync/sync0sync.c:
        Apply snapshot innodb-5.1-ss2034
        
        Revision r2017:
        Use "InnoDB:" prefix in error messages.
      bdffce05
    • unknown's avatar
      Apply snapshot innodb-5.1-ss1989 · e2513bf0
      unknown authored
      Fixes the following bugs:
      
      Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
        Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
      
      Bug #30888: Innodb table + stored procedure + row deletion = server crash
        While adding code for the low level read of the AUTOINC value from the index,
        the case for MEDIUM ints which are 3 bytes was missed triggering an
        assertion.
      
      Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
        We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
      
      Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
        ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
        trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
        DB_SUCCESS.  A timeout on LOCK TABLES would lead to an inconsistent state,
        which would cause trx_free() to print a warning.
      
      Bug #31494: innodb + 5.1 + read committed crash, assertion
        Set an error code when a deadlock occurs in semi-consistent read.
      
      
      mysql-test/r/innodb.result:
        Apply snapshot innodb-5.1-ss1989
        
        Also, a test is moved into the new innodb_autoinc_lock_mode_zero
        test, because it depends on a non-default setting for a read-only
        variable.
        
        Revision r1821:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2536.50.1  2007-08-02 12:45:56-07:00  igor@mysql.com
        
        Fixed bug#28404.
        This patch adds cost estimation for the queries with ORDER BY / GROUP BY
        and LIMIT.
        If there was a ref/range access to the table whose rows were required
        to be ordered in the result set the optimizer always employed this access
        though a scan by a different index that was compatible with the required
        order could be cheaper to produce the first L rows of the result set.
        Now for such queries the optimizer makes a choice between the cheapest
        ref/range accesses not compatible with the given order and index scans
        compatible with it.
        
        innodb.result: Adjusted results for test cases affected fy the fix for
        bug #28404.
        
        
        Revision r1781:
        Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
        The variable used in the tests below was introduced in r1735.
        
        
        Revision r1792:
        innodb.result: Revert r1655, which should have been reverted as part of r1781.
        
        
        Revision r1843:
        Add test for Bug# 21409, the actual bug was fixed in r1334.
      mysql-test/t/innodb.test:
        Apply snapshot innodb-5.1-ss1989
        
        Also, a test is moved into the new innodb_autoinc_lock_mode_zero
        test, because it depends on a non-default setting for a read-only
        variable.
        
        Revision r1781:
        Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
        The variable used in the tests below was introduced in r1735.
        
        
        Revision r1843:
        Add test for Bug# 21409, the actual bug was fixed in r1334.
      storage/innobase/buf/buf0lru.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/dict/dict0dict.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1894:
        Add debug lock checks to autoinc functions. Add lock guards around an
        invocation of dict_table_autoinc_initialize().
      storage/innobase/dict/dict0load.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
      storage/innobase/handler/ha_innodb.cc:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1887:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god
        
        Fix some Windows compiler warnings.
        
        dict0mem.c: Fix compiler warning with a cast.
        
        ha_innodb.cc: Change type to fix a compiler warning.
        
        
        Revision r1809:
        ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
        trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
        returns DB_SUCCESS.  A timeout on LOCK TABLES would lead to an
        inconsistent state, which would cause trx_free() to print a warning.
        
        This was later reported as Bug #31444.
        
        
        Revision r1833:
        Add /*== ... === */ decoration that was missing around some auto-inc functions.
        Add a missing comment, fix the length of a decoration.  Initialize the *value
        out parameter in ha_innobase::innobase_get_auto_increment().
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        
        Revision r1846:
        Add config option innodb_use_adaptive_hash_indexes to enable/disable
        adaptive hash indexes. It is enabled by default (no change in default
        behavior).
        
        Approved by:	Marko
        
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
        
        
        Revision r1829:
        Add assertion to enforce check of an implicit invariant and add comment about
        retry of autoinc read semantics. We always reread the table's autoinc counter
        after attempting to initialize it i.e., we want to guarantee that a read of
        autoinc valus that is returned to the caller is always covered by the
        AUTOINC locking mechanism.
        
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
        
        
        Revision r1888:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2528.115.30  2007-08-28 10:17:15-06:00  tsmith@hindu.god
        
        Fix another compiler warning on Windows in InnoDB.
        
        ha_innodb.cc:
        
        Fix compiler warning: ::get_auto_increment takes a ulonglong
        for nb_desired_values, but InnoDB's trx struct stores it as
        a ulint (unsigned long).  Probably harmless, as a single
        statement won't be asking for more than 2^32 rows.
        
        
        Revision r1987:
        Bug fix: The problem was that when write_row() attempted to update the max
        autoinc value, and if it was rolled back because of a deadlock, the 
        deadlock error (transaction rollback) was not being propagated back to MySQL.
        
        
        Revision r1889:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2560  2007-09-21 10:15:16+02:00  gkodinov@local
        
        ha_innodb.cc: fixed type conversion warnings revealed by bug 30639 
        
        
        Revision r1989:
        Suppress printing of deadlock errors while reading the autoinc value.
        DB_DEADLOCK errors are part of normal processing and excessive printing
        of these error messages could be disconcerting for users. 
        
        
        Revision r1828:
        Fix two bugs:
        
        Bug# 30907: We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
        
        Bug# 30888: While adding code for the low level read of the AUTOINC value
        from the index, the case for MEDIUM ints which are 3 bytes was missed
        triggering an assertion.
      storage/innobase/handler/ha_innodb.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1844:
        Remove the prototypes of some functions inside #if 0.
        The function definitions were removed in r1746.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1965:
        ibuf_insert_to_index_page(): Fix typos in diagnostic output.
      storage/innobase/include/db0err.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1974:
        Prevent loading of tables that have unsupported features most notably
        FTS indexes.
      storage/innobase/include/ha_prototypes.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
      storage/innobase/include/mach0data.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/include/mach0data.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/include/mem0dbg.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
      storage/innobase/include/mem0mem.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1937:
        mem_heap_free_top(): Remove a bogus Valgrind warning.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/include/rem0rec.ic:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1918:
        Improve Valgrind instrumentation.
        
        rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
        
        UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
        UNIV_MEM_ASSERT_AND_FREE().
      storage/innobase/include/row0mysql.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1783:
        Correct the function comments of row_create_table_for_mysql() and
        row_drop_table_for_mysql().
      storage/innobase/include/sync0rw.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1757:
        Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
        debug assertions.
      storage/innobase/include/univ.i:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1827:
        Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
        Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
        The memory area need not be initialized.
        This mistake was made in r1815.
        
        
        Revision r1918:
        Improve Valgrind instrumentation.
        
        rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
        
        UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
        UNIV_MEM_ASSERT_AND_FREE().
        
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
        
        
        Revision r1948:
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display also __FILE__ and __LINE__
        when these Valgrind checks fail.
      storage/innobase/include/ut0ut.h:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1862:
        Add ut_snprintf() function. On Windows this needs to be implemented
        using auxiliary functions because there is no snprintf-variant on
        Windows that behaves exactly as specified in the standard:
        
        * Always return the number of characters that would have been printed
          if the size were unlimited (not including the final `\0').
        * Always '\0'-terminate the result
        * Do not touch the buffer if size=0, only return the number of characters
          that would have been printed. Can be used to estimate the size needed
          and to allocate it dynamically.
        
        See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
        2 ap variables are used.
        
        Approved by:	Heikki
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
      storage/innobase/mem/mem0dbg.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1830:
        Improve memory debugging.  This is follow-up to r1819.
        
        mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
        defined.  Previously, this function was only compiled with UNIV_DEBUG.
        
        mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
        Valgrind.  Otherwise, Valgrind would complain on the second call of
        mem_heap_empty().
        
        UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
        for failed Valgrind checks.
        
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/mem/mem0mem.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1819:
        Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
        
        UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
        area is defined.
        
        UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
        
        UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
        writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
        in many places.
        
        mem_init_buf(): Check that the memory is writable, and declare it undefined.
        
        mem_erase_buf(): Check that the memory is writable, and declare it freed.
      storage/innobase/row/row0mysql.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1786:
        row_create_table_for_mysql(), row_truncate_table_for_mysql(),
        row_drop_table_for_mysql(): Do not mention innodb_force_recovery
        when newraw is set.
        
        
        Revision r1790:
        row_drop_table_for_mysql(): Before calling
        dict_table_remove_from_cache(table) and thus freeing the memory
        allocated for the table, copy the table name.  This avoids reading
        freed memory when name == table->name.
        
        Approved by Sunny.
        
        
        Revision r1783:
        Correct the function comments of row_create_table_for_mysql() and
        row_drop_table_for_mysql().
        
        
        Revision r1894:
        Add debug lock checks to autoinc functions. Add lock guards around an
        invocation of dict_table_autoinc_initialize().
      storage/innobase/row/row0sel.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1782:
        Add comment that the variable dest should be word aligned. After discussion
        on IM with Heikki.
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
        
        
        Revision r1820:
        Use the clustered index and not the one selected by the optimizer in the plan,
        when building a previous version of the row. This bug is triggered when
        running queries via InnoDB's internal SQL parser; when InnoDB's optimizer
        selects a secondary index for the plan.
        
        
        Revision r1828:
        Fix two bugs:
        
        Bug# 30907: We don't rely on *first_value to be 0 when checking whether
        get_auto_increment() has been invoked for the first time in a multi-row
        INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
        inside ha_innobase::start_stmt() too.
        
        Bug# 30888: While adding code for the low level read of the AUTOINC value
        from the index, the case for MEDIUM ints which are 3 bytes was missed
        triggering an assertion.
        
        
        Revision r1779:
        Fix a bug that handles the case where the host specific byte order matches
        the InnoDB storage byte order, which is big-endian.
      storage/innobase/sync/sync0rw.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1757:
        Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
        debug assertions.
      storage/innobase/ut/ut0ut.c:
        Apply snapshot innodb-5.1-ss1989
        
        Revision r1850:
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        Approved by:	Heikki
        
        
        
        Revision r1873:
        snprintf() should always return non-negative result. According to
        Microsoft documentation about _vscprintf():
        
          If format is a null pointer, the invalid parameter handler is invoked,
          as described in Parameter Validation. If execution is allowed to
          continue, the functions return -1 and set errno to EINVAL.
        
        The UNIX variant of snprintf() segfaults if format is a NULL pointer
        (similar to strlen(NULL) for example), so it is better to conform to
        this behavior and crash our custom Windows version instead of
        returning -1. Noone would expect -1 to be returned from snprintf().
        
        Cosmetic: Add a space after typecast.
        
        Approved by:	Marko
        
        
        Revision r1862:
        Add ut_snprintf() function. On Windows this needs to be implemented
        using auxiliary functions because there is no snprintf-variant on
        Windows that behaves exactly as specified in the standard:
        
        * Always return the number of characters that would have been printed
          if the size were unlimited (not including the final `\0').
        * Always '\0'-terminate the result
        * Do not touch the buffer if size=0, only return the number of characters
          that would have been printed. Can be used to estimate the size needed
          and to allocate it dynamically.
        
        See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
        2 ap variables are used.
        
        Approved by:	Heikki
        
        
        Revision r1866:
        Revert r1850 as MySQL did not approve the addition.
        
        log for r1850:
        
        Implement this feature request:
        http://bugs.mysql.com/30706
        
        * Add a function that returns the number of microseconds since
          epoch - ut_time_us().
        
        * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
        
        * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
          until a timeout elapses.
        
        * Using all of the above, handle the replication thread specially in
          srv_conc_enter_innodb().
        
        
        Revision r1787:
        Move the prototype of innobase_print_identifier() from ut0ut.c to
        ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
        #ifndef UNIV_HOTBACKUP.
        
        
        Revision r1789:
        ut_print_namel(): Do not assume that all '/' are separators between
        database and table names.
        
        Approved by Heikki.
        
        
        Revision r1936:
        ut_print_buf(): Add a Valgrind check that the buffer is wholly defined.
      mysql-test/r/innodb-semi-consistent.result:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/r/innodb_autoinc_lock_mode_zero.result:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      mysql-test/t/innodb-semi-consistent-master.opt:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/t/innodb-semi-consistent.test:
        Apply snapshot innodb-5.1-ss1989
        
        
        Revision r1988:
        Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
        
        innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
        Unfortunately, these will not trigger Bug #31494, because there merely
        occur lock wait timeouts, not deadlocks.
      mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      mysql-test/t/innodb_autoinc_lock_mode_zero.test:
        New test, using read-only setting --innodb-autoinc-lock-mode=0
      e2513bf0
  7. 21 Sep, 2007 1 commit
  8. 13 Sep, 2007 1 commit
    • unknown's avatar
      Changes for pushbuild test runs and VSC compile warnings · fa12674c
      unknown authored
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Fix test results for pushbuild
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        Fix test results for pushbuild
      mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
        Fix test results for pushbuild
      storage/innobase/handler/ha_innodb.cc:
        resolve a VSC++ typecast compile warning.
      fa12674c
  9. 12 Sep, 2007 1 commit
    • unknown's avatar
      undo unneccessary change to ha_innodb.cc · 23227604
      unknown authored
      remove 'drop database' from new tests.
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        remove "DROP DATABASE test"
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
        remove "DROP DATABASE test"
      mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
        remove "DROP DATABASE test"
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        remove "DROP DATABASE test"
      mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
        remove "DROP DATABASE test"
      mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
        remove "DROP DATABASE test"
      storage/innobase/handler/ha_innodb.cc:
        undo unneccessary edits.
      23227604
  10. 09 Sep, 2007 1 commit
    • unknown's avatar
      Bug#30919 · db1f9468
      unknown authored
        "Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0"
      
        Due to a previous bugfix which initializes a previously uninitialized
        variable, ha_partition::get_auto_increment() may fail to operate
        correctly when the storage engine reports that it is only reserving
        one value and one or more partitions have a different 'next-value'.
        Currently, only affects Innodb's new-style auto-increment code which
        reserves larger blocks of values and has less inter-thread contention.
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Fix results - previous results shows symptoms of Bug30919
      sql/ha_partition.cc:
        Bug30919
        
        ha_partition::write_row()
          Do not insert a row if a failure occurred while generating
          auto-increment value.
        
        ha_partition::get_auto_increment()
          If there is an empty 'intersection' of auto-increment values, perform
          a second pass before failing because partitions may have different
          auto-increment 'next-value' attributes.
      storage/innobase/handler/ha_innodb.cc:
        Bug30919
          Only set *first_value if it is less than autoinc value. This allows
          a higher value to be hinted when operating as a partitioned table.
      mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30919.result''
      mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt''
      mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919.test''
      db1f9468
  11. 08 Sep, 2007 1 commit
    • unknown's avatar
      Bug#30907 · bec076f4
      unknown authored
        "Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
      Bug#28430
        "Failure in replication of innodb partitioned tables on row/mixed format"
      Bug#30888
        "Innodb table + stored procedure + row deletion = server crash"
      
        Apply Oracle patch from Sunny
        Include tests cases by Omer
        Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
        No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
        it already performs same check.
        Make autoinc_lock_mode variable read-only for duration of running mysqld process.
      
      
      storage/innobase/handler/ha_innodb.cc:
        Bug30907/28430
          "Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
          "Failure in replication of innodb partitioned tables on row/mixed format"
          Apply Oracle patch from Sunny
          Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
          No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
          it already performs same check.
          Make autoinc_lock_mode variable read-only for duration of running mysqld process.
      storage/innobase/row/row0sel.c:
        Bug30888
          "Innodb table + stored procedure + row deletion = server crash"
        
          Remove endian-specific code.
          Fix function row_search_autoinc_read_column() to handle any integer size up to 8 bytes.
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug28430.result''
      mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
        New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30888.result''
      mysql-test/suite/rpl/t/rpl_innodb-master.opt:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb-master.opt''
      mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt''
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430.test''
      mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
        New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30888.test''
      bec076f4
  12. 28 Aug, 2007 2 commits
    • unknown's avatar
      Fix another compiler warning on Windows in InnoDB. · 41d33363
      unknown authored
      storage/innobase/handler/ha_innodb.cc:
        Fix compiler warning: ::get_auto_increment takes a ulonglong
        for nb_desired_values, but InnoDB's trx struct stores it as
        a ulint (unsigned long).  Probably harmless, as a single
        statement won't be asking for more than 2^32 rows.
      41d33363
    • unknown's avatar
      Fix some Windows compiler warnings. · 7ecf5c63
      unknown authored
      storage/innobase/dict/dict0mem.c:
        Fix compiler warning with a cast.
      storage/innobase/handler/ha_innodb.cc:
        Change type to fix a compiler warning.
      7ecf5c63
  13. 25 Aug, 2007 2 commits
    • unknown's avatar
      Apply InnoDB snapshot innodb-5.1-ss1751. · a859c594
      unknown authored
      Bug #16979: AUTO_INC lock in InnoDB works a table level lock
        Add a table level counter that tracks the number of AUTOINC locks that are
        pending and/or granted on a table. We peek at this value to determine whether
        a transaction doing a simple INSERT in innodb_autoinc_lock_mode = 1, needs to
        acquire the AUTOINC lock or not. This change is related to Bug# 16979.
      Bug #27950: Duplicate entry error in auto-inc after mysqld restart
        We check whether the AUTOINC sub-system has been initialized (first) by
        holding the AUTOINC mutex and if initialization is required then we
        initialize using our normal procedure.
      
      
      storage/innobase/dict/dict0boot.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/dict/dict0crea.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/dict/dict0load.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/dict/dict0mem.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1749:
        Add a table level counter that tracks the number of AUTOINC locks that are
        pending and/or granted on a table. We peek at this value to determine whether
        a transaction doing a simple INSERT in innodb_autoinc_lock_mode = 1, needs to
        acquire the AUTOINC lock or not. This change is related to Bug# 16979.
      storage/innobase/handler/ha_innodb.cc:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1735:
        Add variable "innodb_autoinc_lock_mode"  to control the behavior of the
        AUTOINC locking. There are three modes, 0 for backward compatibility, 1 for the
        new style locking (default, safe for statement-based replication) and
        2 for no AUTOINC locking (unsafe for statement-based replication).
        
        
        Revision r1750:
        We check whether the AUTOINC sub-system has been initialized (first) by
        holding the AUTOINC mutex and if initialization is required then we
        initialize using our normal procedure. This change is related to Bug#27950.
        
        
        Revision r1746:
        Remove some code from ha_innodb.cc that was already enclosed in #if 0.
        The code was related to replication and group commit, and it was
        unreachable already as of MySQL 5.0.
        
        Approved by Heikki
        
        
        Revision r1749:
        Add a table level counter that tracks the number of AUTOINC locks that are
        pending and/or granted on a table. We peek at this value to determine whether
        a transaction doing a simple INSERT in innodb_autoinc_lock_mode = 1, needs to
        acquire the AUTOINC lock or not. This change is related to Bug# 16979.
      storage/innobase/include/dict0mem.h:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1749:
        Add a table level counter that tracks the number of AUTOINC locks that are
        pending and/or granted on a table. We peek at this value to determine whether
        a transaction doing a simple INSERT in innodb_autoinc_lock_mode = 1, needs to
        acquire the AUTOINC lock or not. This change is related to Bug# 16979.
        
        
        
        Revision r1747:
        Correct an outdated comment about dict_table_t:col_names that should have
        been adjusted in r1719, or r1264 in branches/zip.
      storage/innobase/include/mem0mem.ic:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1744:
        Merge r1739 from branches/zip:
        
        mem_heap_free_heap_top(): Declare the memory freed with UNIV_MEM_FREE().
        Before this change, the memory freed by mem_heap_empty() was not completely
        flagged free in UNIV_DEBUG_VALGRIND builds.  After this change, Valgrind
        will hopefully catch all errors caught by UNIV_MEM_DEBUG.
      storage/innobase/include/sync0rw.ic:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1751:
        rw_lock_s_lock_func(): Correct a typo in a comment.
      storage/innobase/include/trx0trx.h:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1742:
        Remove some unused fields of trx_t: mysql_master_log_file_name,
        mysql_master_log_pos, repl_wait_binlog_name, repl_wait_binlog_pos.
        
        Approved by Heikki.
      storage/innobase/lock/lock0lock.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1749:
        Add a table level counter that tracks the number of AUTOINC locks that are
        pending and/or granted on a table. We peek at this value to determine whether
        a transaction doing a simple INSERT in innodb_autoinc_lock_mode = 1, needs to
        acquire the AUTOINC lock or not. This change is related to Bug# 16979.
      storage/innobase/mtr/mtr0log.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/pars/pars0pars.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/srv/srv0srv.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
      storage/innobase/trx/trx0sys.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1743:
        trx_sys_print_mysql_binlog_offset_from_page(): Enclose the definition
        in #ifdef UNIV_HOTBACKUP, to match the function declaration.
      storage/innobase/trx/trx0trx.c:
        Apply InnoDB snapshot innodb-5.1-ss1751.
        
        Revision r1742:
        Remove some unused fields of trx_t: mysql_master_log_file_name,
        mysql_master_log_pos, repl_wait_binlog_name, repl_wait_binlog_pos.
        
        Approved by Heikki.
      a859c594
    • unknown's avatar
      Apply InnoDB snapshot innodb-5.1-ss1726. · 6d4b3c58
      unknown authored
      Bug #16979: AUTO_INC lock in InnoDB works a table level lock
        - this is a major change in InnoDB auto-inc handling.
      Bug #27950: Duplicate entry error in auto-inc after mysqld restart
        - Init AUTOINC from delete_row().
      Bug #28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
        - Use value specified by MySQL, in update_row().
      
      
      mysql-test/r/innodb.result:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1655:
        Fix the innodb.test failure mentioned in r1654.
      storage/innobase/dict/dict0dict.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/dict/dict0mem.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/handler/ha_innodb.cc:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1718:
        Replace mysql_byte with uchar and remove the #define mysql_byte from
        ha_innodb.cc.  This cleanup was made possible as of r1550:
        
        
        Revision r1658:
        check_trx_exists(): Remove a redundant function call and assignment that
        was added by someone at MySQL.
        
        
        Revision r1656:
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
        
        
        Revision r1654:
        
        One test case in innodb.test fails because of auto-increment
        changes in r1562:1653:
        
        $diff innodb.result innodb.reject
        504c504
        < 3	test2		this will work
        ---
        > 4	test2		this will work
      storage/innobase/handler/ha_innodb.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1654:
        
        One test case in innodb.test fails because of auto-increment
        changes in r1562:1653:
        
        $diff innodb.result innodb.reject
        504c504
        < 3	test2		this will work
        ---
        > 4	test2		this will work
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1715:
        ibuf0ibuf.c: Remove the unused prototype for dict_index_print_low()
        that was inadvertently added in r832.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/dict0dict.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/dict0mem.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
        
        
        Revision r1719:
        Merge r1264 from branches/zip: Avoid memory fragmentation when
        adding column definitions to tables.
        
        dict_mem_table_add_col(): Add the parameter "heap" for temporary memory
        allocation.  Allow it and "name" to be NULL.  These parameters are NULL
        when creating dummy indexes.
        
        dict_add_col_name(): Remove calls to ut_malloc() and ut_free().
        
        dict_table_get_col_name(): Allow table->col_names to be NULL.
        
        dict_table_add_system_columns(), dict_table_add_to_cache():
        Add the parameter "heap".
        ---
        Additional changes that had to be merged from branches/zip:
        
        dict_table_add_system_columns(): New function, factored out from
        dict_table_add_to_cache().
        
        mlog_parse_index(): Add some consistency checks, and make use of
        dict_table_add_system_columns().
      storage/innobase/include/lock0lock.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1664:
        lock_number_of_rows_locked(): Fix a typo in comment, and make the comments
        in lock0lock.c and lock0lock.h identical.  The typo was incorrectly fixed in
        r1623.
      storage/innobase/include/row0mysql.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/row0sel.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/trx0trx.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/include/ut0mem.h:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1713:
        Fix typo in comment.
      storage/innobase/log/log0recv.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1657:
        recv_init_crash_recovery(): remove trailing white space
      storage/innobase/row/row0mysql.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/row/row0sel.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      storage/innobase/trx/trx0trx.c:
        Apply InnoDB snapshot innodb-5.1-ss1726.
        
        Revision r1645:
        Fix for bug# 16979, this is a major change in InnoDB auto-inc handling. There
        is one test that fails as of this commit. The updated test case should be
        part of the snapshot from MySQL shortly.
        
        Fix for bug# 27950 - Init AUTOINC from delete_row().
        
        Fix for bug# 28781 - Use value specified by MySQL, in update_row().
        
        Summary of structural changes:
        ==============================
        InnoDB needs to hold a table level lock for AUTOINC allocations to overcome
        the non-determinism inherent in MySQL SBR for INSERT ... SELECT. In this fix 
        for simple INSERT statements (including multi-value inserts), we try and avoid
        acquiring the special AUTOINC table level lock unless another transaction has
        already reserved the AUTOINC table level lock, in which case we fall back
        to the old behavior of acquiring the AUTOINC table level lock.
        
        The max AUTOINC value is now read directly using the low level interface
        of InnoDB.
      6d4b3c58
  14. 02 Aug, 2007 1 commit
    • unknown's avatar
      Post-merge fix. Update some test results, and add an InnoDB-only · c7419deb
      unknown authored
      compatibility hook, thd_mark_transaction_to_rollback().
      
      
      mysql-test/r/ps.result:
        Post-merge fix.   Changes for WL 3984 (Revise locking
        of mysql.general_log and mysql.slow_log) cause some test
        result differences.
      mysql-test/r/show_check.result:
        Post-merge fix.   Changes for WL 3984 (Revise locking
        of mysql.general_log and mysql.slow_log) cause some test
        result differences.
      sql/sql_class.cc:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      storage/innobase/handler/ha_innodb.cc:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      storage/innobase/handler/ha_innodb.h:
        Post-merge fix, add InnoDB compatibility hook (defined for
        InnoDB only), thd_mark_transaction_to_rollback().
      c7419deb
  15. 01 Aug, 2007 1 commit
    • unknown's avatar
      Remove some redundant or unused code from InnoDB (feedback from · 971050de
      unknown authored
      Marko after applying latest snapshot).
      
      
      storage/innobase/handler/ha_innodb.cc:
        Remove redundant assignment to thd_to_trx(thd); trx is
        declared as a reference to thd_to_trx(thd) at the top
        of the function, so this assignment isn't useful.
      storage/innobase/include/trx0trx.h:
        Remove two unused members from struct trx_struct.  allow_duplicates
        and replace_duplicates are not used; a single duplicates member is
        used instead to represent both flags.
      971050de
  16. 25 Jul, 2007 1 commit
    • unknown's avatar
      Apply snapshot innodb-51-ss1644 · c2f0c211
      unknown authored
      Fixes:
      - Bug #23710: crash_commit_before fails if innodb_file_per_table=1
      - Bug #28254: innodb crash if shutdown during innodb_table_monitor is running
      - Bug #28604: innodb_force_recovery restricts data dump
      - Bug #29097: fsp_get_available_space_in_free_extents() is capped at 4TB
      - Bug #29155: Innodb "Parallel recovery" is not prevented
      
      
      storage/innobase/Makefile.am:
        Apply snapshot innodb-51-ss1644
        
        Revision r1632:
        Add include/lock0priv.h to noinst_HEADERS in Makefile.am.
        
        
        
        Revision r1636:
        Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
        * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
        * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
        * Makefile.am: add lock0priv.ic to noinst_HEADERS
        * lock0priv.ic: introduce this new file containing the body of
          lock_get_type()
        
        This move is necessary in order to use lock_get_type() from other lock/
        source files (it's going to be used in lock/lock0iter.c).
        
        Approved by:	Heikki
        
        
        Revision r1638:
        Introduce a lock queue iterator for easy (and opaque) traversing of lock
        queues. Supports table and record lock queues via the same interface.
        
        There is only "get previous" method because currently there is no need
        for "get next" - it would be unused. Feel free to add one if needed.
        
        Approved by:	Heikki
      storage/innobase/buf/buf0buf.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1624:
        Fix change missed as part of Bug 15815. Use a function to check if a block
        needs to be made younger.
        
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/buf/buf0lru.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/fsp/fsp0fsp.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1605:
        Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
        by typecasting the variables before multiplying them, so that the result of
        the multiplication is of type "unsigned long long".
        
        I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
        use it without overwriting it with zeroes (by commenting the code that
        overwrites :newraw files).
        
        New type ullint is introduced with the sole purpose of shortening
        "unsigned long long", please do not define it to something else than
        "unsigned long long".
        
        Approved by:	Heikki
      storage/innobase/handler/ha_innodb.cc:
        Apply snapshot innodb-51-ss1644
        
        Revision r1605:
        Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
        by typecasting the variables before multiplying them, so that the result of
        the multiplication is of type "unsigned long long".
        
        I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
        use it without overwriting it with zeroes (by commenting the code that
        overwrites :newraw files).
        
        New type ullint is introduced with the sole purpose of shortening
        "unsigned long long", please do not define it to something else than
        "unsigned long long".
        
        Approved by:	Heikki
        
        
        Revision r1573:
        create_table_def(): Eliminate the inline function call to dict_table_is_comp()
        that was introduced in r1571.  Inlining is disabled in ha_innodb.cc.
        
        
        Revision r1574:
        innodb_check_for_record_too_big_error(): Divide the return value of
        page_get_free_space_of_empty_noninline() by 2.  Until r1571, that function
        did not return the same value as page_get_free_space_of_empty().
        
        
        Revision r1571:
        Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
        When creating an index containing a too long record, InnoDB would
        dereference a NULL pointer when trying to determine the maximum row length.
        
        innodb_check_for_record_too_big_error(): Replace the dict_table_t*
        parameter with a Boolean flag.  There is not always a dict_table_t object
        when this function is called.
        
        page_get_free_space_of_empty_noninline(): Move the definition and
        declaration from row0mysql (!) to page0page.  Make the signature
        identical with page_get_free_space_of_empty().
        
        create_clustered_index_when_no_primary(): Add the parameter "comp".
        Remove unnecessary casts.
      storage/innobase/include/buf0buf.ic:
        Apply snapshot innodb-51-ss1644
        
        Revision r1624:
        Fix change missed as part of Bug 15815. Use a function to check if a block
        needs to be made younger.
      storage/innobase/include/fsp0fsp.h:
        Apply snapshot innodb-51-ss1644
        
        Revision r1605:
        Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
        by typecasting the variables before multiplying them, so that the result of
        the multiplication is of type "unsigned long long".
        
        I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
        use it without overwriting it with zeroes (by commenting the code that
        overwrites :newraw files).
        
        New type ullint is introduced with the sole purpose of shortening
        "unsigned long long", please do not define it to something else than
        "unsigned long long".
        
        Approved by:	Heikki
      storage/innobase/include/lock0lock.h:
        Apply snapshot innodb-51-ss1644
        
        Revision r1623:
        Fix typo in comment.
        
        
        Revision r1628:
        lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
        in order to determine which lock is blocking which. Make it non-static
        and put its definition in include/lock0lock.h.
        
        Approved by:	Heikki (via IM)
      storage/innobase/include/mem0mem.ic:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/include/page0page.h:
        Apply snapshot innodb-51-ss1644
        
        Revision r1571:
        Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
        When creating an index containing a too long record, InnoDB would
        dereference a NULL pointer when trying to determine the maximum row length.
        
        innodb_check_for_record_too_big_error(): Replace the dict_table_t*
        parameter with a Boolean flag.  There is not always a dict_table_t object
        when this function is called.
        
        page_get_free_space_of_empty_noninline(): Move the definition and
        declaration from row0mysql (!) to page0page.  Make the signature
        identical with page_get_free_space_of_empty().
        
        create_clustered_index_when_no_primary(): Add the parameter "comp".
        Remove unnecessary casts.
      storage/innobase/include/row0mysql.h:
        Apply snapshot innodb-51-ss1644
        
        Revision r1571:
        Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
        When creating an index containing a too long record, InnoDB would
        dereference a NULL pointer when trying to determine the maximum row length.
        
        innodb_check_for_record_too_big_error(): Replace the dict_table_t*
        parameter with a Boolean flag.  There is not always a dict_table_t object
        when this function is called.
        
        page_get_free_space_of_empty_noninline(): Move the definition and
        declaration from row0mysql (!) to page0page.  Make the signature
        identical with page_get_free_space_of_empty().
        
        create_clustered_index_when_no_primary(): Add the parameter "comp".
        Remove unnecessary casts.
      storage/innobase/include/univ.i:
        Apply snapshot innodb-51-ss1644
        
        Revision r1605:
        Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
        by typecasting the variables before multiplying them, so that the result of
        the multiplication is of type "unsigned long long".
        
        I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
        use it without overwriting it with zeroes (by commenting the code that
        overwrites :newraw files).
        
        New type ullint is introduced with the sole purpose of shortening
        "unsigned long long", please do not define it to something else than
        "unsigned long long".
        
        Approved by:	Heikki
        
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/lock/lock0lock.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1631:
        Move lock_rec_find_set_bit() and lock_rec_get_prev() from
        lock/lock0lock.c to include/lock0priv.h and make them non-static.
        They will be used in lock/lock0iter.c.
        
        Approved by:	Heikki
        
        
        Revision r1636:
        Move lock_get_type() from lock/lock0lock.c to include/lock0priv.ic:
        * lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
        * lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
        * Makefile.am: add lock0priv.ic to noinst_HEADERS
        * lock0priv.ic: introduce this new file containing the body of
          lock_get_type()
        
        This move is necessary in order to use lock_get_type() from other lock/
        source files (it's going to be used in lock/lock0iter.c).
        
        Approved by:	Heikki
        
        
        Revision r1628:
        lock_has_to_wait() is needed in the INFORMATION_SCHEMA implementation
        in order to determine which lock is blocking which. Make it non-static
        and put its definition in include/lock0lock.h.
        
        Approved by:	Heikki (via IM)
        
        
        Revision r1629:
        Add "const" qualifiers to lock_get_type() and lock_get_mode().
        
        Approved by:	Sunny
        
        
        Revision r1626:
        Move lock_*struct structures from lock/lock0lock.c to include/lock0priv.h.
        
        This is needed in order to add more code to lock/ that uses members of
        these structures (internal to the lock module) but in a separate file,
        rather than lock0lock.c. lock0lock.c is a way too big already.
        
        Approved by:	Sunny
      storage/innobase/log/log0recv.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1607:
        Bug#23710
        
        At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.
        
        reviewed by: Heikki
      storage/innobase/mem/mem0mem.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/mem/mem0pool.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/os/os0file.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1613:
        Fix Bug#29155 by enabling file locking on FreeBSD.
        It has been disabled because InnoDB has refused to start on
        FreeBSD & LinuxThreads, but now it starts just fine.
        
        Approved by:	Heikki
      storage/innobase/page/page0page.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1571:
        Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
        When creating an index containing a too long record, InnoDB would
        dereference a NULL pointer when trying to determine the maximum row length.
        
        innodb_check_for_record_too_big_error(): Replace the dict_table_t*
        parameter with a Boolean flag.  There is not always a dict_table_t object
        when this function is called.
        
        page_get_free_space_of_empty_noninline(): Move the definition and
        declaration from row0mysql (!) to page0page.  Make the signature
        identical with page_get_free_space_of_empty().
        
        create_clustered_index_when_no_primary(): Add the parameter "comp".
        Remove unnecessary casts.
      storage/innobase/rem/rem0rec.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/row/row0mysql.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1571:
        Fix a severe bug that was introduced in r1422 when fixing Bug 21101.
        When creating an index containing a too long record, InnoDB would
        dereference a NULL pointer when trying to determine the maximum row length.
        
        innodb_check_for_record_too_big_error(): Replace the dict_table_t*
        parameter with a Boolean flag.  There is not always a dict_table_t object
        when this function is called.
        
        page_get_free_space_of_empty_noninline(): Move the definition and
        declaration from row0mysql (!) to page0page.  Make the signature
        identical with page_get_free_space_of_empty().
        
        create_clustered_index_when_no_primary(): Add the parameter "comp".
        Remove unnecessary casts.
      storage/innobase/sync/sync0rw.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1598:
        Add some comments.
        
        Approved by:	Heikki (via IM)
      storage/innobase/sync/sync0sync.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1598:
        Add some comments.
        
        Approved by:	Heikki (via IM)
      storage/innobase/trx/trx0sys.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      storage/innobase/trx/trx0trx.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1595:
        trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
        trx->sess or trx_dummy_sess is non-NULL.
      storage/innobase/ut/ut0mem.c:
        Apply snapshot innodb-51-ss1644
        
        Revision r1581:
        Port extra Valgrind instrumentation (UNIV_DEBUG_VALGRIND) from branches/zip.
      c2f0c211
  17. 10 Jul, 2007 1 commit
    • unknown's avatar
      Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. · 32b5fb73
      unknown authored
      After applying the snapshots, ensure that code conforms to the final version
      of WL 3914.
      
      It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER,
      and can be built as an independent storage engine plugin.
      
      Fixes:
      Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
      Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full'
      Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
      Bug#20352: Make ibuf_contract_for_n_pages tunable
      Bug#21101: Wrong error on exceeding max row size for InnoDB table
      Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries
      Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
      Bug#25078: Make the replication thread to ignore innodb_thread_concurrency
      Bug#25645: Assertion failure in file srv0srv.c
      Bug#28138: indexing column prefixes produces corruption in InnoDB
      
      
      BitKeeper/deleted/.del-Makefile.am~55504c43d99979e4:
        Delete: storage/innobase/buf/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~79bb55303929b560:
        Delete: storage/innobase/dict/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~7cd88e5f9a8d7ce8:
        Delete: storage/innobase/data/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~e19a1fb29b1fe527:
        Delete: storage/innobase/btr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~4ae65b009d41d1d:
        Delete: storage/innobase/eval/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~679131a02af3f6fb:
        Delete: storage/innobase/fsp/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~6acac9ae30eabdb3:
        Delete: storage/innobase/dyn/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~a5e6b4385717fcb7:
        Delete: storage/innobase/fil/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~11d601934b49c19:
        Delete: storage/innobase/fut/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~5aab37bf3b6c430:
        Delete: storage/innobase/ibuf/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~af2d719bb6e66986:
        Delete: storage/innobase/handler/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~f0dbbc7a78648e18:
        Delete: storage/innobase/ha/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~41684e54a5b0d26a:
        Delete: storage/innobase/log/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~edd95d7290ddeff3:
        Delete: storage/innobase/lock/Makefile.am
      BitKeeper/deleted/.del-Makefile.i:
        Delete: storage/innobase/include/Makefile.i
      BitKeeper/deleted/.del-Makefile.am~2a6ccdba41b591a3:
        Delete: storage/innobase/mach/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~2bd35bda856342:
        Delete: storage/innobase/os/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~8448688c5ab92132:
        Delete: storage/innobase/mem/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~b5a7a8cfa711b6de:
        Delete: storage/innobase/mtr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~2cee8a309eb8eee2:
        Delete: storage/innobase/page/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~3d0553f8aa9c456b:
        Delete: storage/innobase/read/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~7b0c4abae6684f8c:
        Delete: storage/innobase/pars/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~d0e0dd55cbd413f0:
        Delete: storage/innobase/que/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~20a219ccf7825d65:
        Delete: storage/innobase/row/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~37bdfb2973b2442b:
        Delete: storage/innobase/rem/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~557098c4e5c01ee2:
        Delete: storage/innobase/thr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~fdfe12f48c2499af:
        Delete: storage/innobase/sync/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~feb2280a52035d8d:
        Delete: storage/innobase/srv/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~456d34c4816dbda4:
        Delete: storage/innobase/ut/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~5ec2ef0d2c35e138:
        Delete: storage/innobase/usr/Makefile.am
      BitKeeper/deleted/.del-Makefile.am~d25c456e48393313:
        Delete: storage/innobase/trx/Makefile.am
      mysql-test/r/innodb.result:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1421:
        Fix the innodb test by shifting some of the contents of the .result file.
        
        Approved by:	Marko
        
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      mysql-test/t/innodb.test:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      storage/innobase/btr/btr0btr.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/data/data0data.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
      storage/innobase/data/data0type.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/dict/dict0crea.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/dict/dict0dict.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1529:
        Revert r799, which was supposed to prevent similar cases as Bug#21638.
        In reality, the patch breaks the handling of prefix indexes of
        variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
        is only a partial fix of Bug#28138.
        
        
        Revision r1535:
        Document that DICT_MAX_INDEX_COL_LEN must not be changed.
      storage/innobase/fsp/fsp0fsp.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1420:
        Output to the error log information about the limitations of
        UNIV_IBUF_DEBUG.
        
        innobase_start_or_create_for_mysql(): Note that crash recovery is broken
        when UNIV_IBUF_DEBUG is defined.
        
        ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
        anything from the heap.  Eliminate ibuf_counts_inited, as the array
        will be zero-filled by the runtime environment.
        
        ibuf_count_check(): New function, to print out an explanation before
        assertion failure.
        
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/db0err.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/include/dict0dict.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/dict0dict.ic:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      storage/innobase/include/dict0mem.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1535:
        Document that DICT_MAX_INDEX_COL_LEN must not be changed.
        
        
        Revision r1536:
        Change the comment to a more appropriate one. Discussed with Heikki on IM.
        
        Approved by:	Heikki
      storage/innobase/include/ha_prototypes.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      storage/innobase/include/os0file.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1431:
        Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      storage/innobase/include/rem0rec.ic:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1569:
        Fix some in:/out: comments.
        
        Approved by:	Marko
      storage/innobase/include/row0mysql.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
      storage/innobase/include/trx0trx.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1462:
        Fix typo in comment.
        
        
        Revision r1486:
        Improve the comment for trx_struct::undo_no.
        
        Suggested by:	Heikki
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      storage/innobase/include/trx0undo.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/include/ut0ut.h:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
      storage/innobase/lock/lock0lock.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1457:
        Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819)
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/log/log0log.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1521:
        Forward port r1520 from branches/5.0
        
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
        
        
        Revision r1524:
        Undo bad space formatting introduced in earlier commit r1521
        
        spotted by: Marko
        
        
        Revision r1533:
        logs_empty_and_mark_files_at_shutdown(): Remove trailing whitespace that
        was added in r1521.
      storage/innobase/os/os0file.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1431:
        Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      storage/innobase/rem/rem0rec.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1528:
        Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible.
        
        
        Revision r1531:
        rec_get_converted_size_new(): Simplify and move a debug assertion.
        
        
        Revision r1546:
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug#28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
        
        
        Revision r1555:
        rec_get_converted_size_new(): The total size of the infimum and supremum
        records in ROW_FORMAT=COMPACT is REC_N_NEW_EXTRA_BYTES + 8.  The
        REC_N_NEW_EXTRA_BYTES was accidentally omitted in r1546.  This function
        should never be called on those records, though.
        
        
        Revision r1569:
        Fix some in:/out: comments.
        
        Approved by:	Marko
      storage/innobase/row/row0ins.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1485:
        Minor cleanup.
        
        row_ins_check_foreign_constraint(), row_ins_scan_sec_index_for_duplicate():
        Make use of the predicates page_rec_is_infimum() and page_rec_is_supremum().
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/row/row0mysql.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
        
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/row/row0row.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1529:
        Revert r799, which was supposed to prevent similar cases as Bug#21638.
        In reality, the patch breaks the handling of prefix indexes of
        variable-length columns in ROW_FORMAT=COMPACT.  Reverting the patch
        is only a partial fix of Bug#28138.
      storage/innobase/row/row0sel.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1452:
        Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
        patch in the bug followup.
        
        Approved by:	Heikki
        
        
        
        Revision r1455:
        Reindent with tabs instead of spaces.
        
        Spotted by:	Marko
      storage/innobase/srv/srv0srv.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1424:
        Bug#20352. Added variable srv_insert_buffer_batch_size. We want to make
        this variable settable. Since the pluggable engine interface currently
        doesn't provide a usable mechanism, we will add the latter functionality
        once it's available.
        
        
        Revision r1426:
        Fix code indentation from r1424.
        
        
        Revision r1459:
        Fix typo in the comment.
        
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1487:
        Fix typo in comment.
        
        Spotted by:	Marko
        
        
        Revision r1521:
        Forward port r1520 from branches/5.0
        
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
        
        
        Revision r1532:
        srv_lock_timeout_and_monitor_thread(): Correct the indentation that was
        broken in r1521.
        
        
        Revision r1553:
        Fix Bug#20090 as suggested in the bug followup by Heikki.
        
        Approved by:	Heikki
      storage/innobase/srv/srv0start.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1420:
        Output to the error log information about the limitations of
        UNIV_IBUF_DEBUG.
        
        innobase_start_or_create_for_mysql(): Note that crash recovery is broken
        when UNIV_IBUF_DEBUG is defined.
        
        ibuf_counts[]: Make this a two-dimensional array.  No need to allocate
        anything from the heap.  Eliminate ibuf_counts_inited, as the array
        will be zero-filled by the runtime environment.
        
        ibuf_count_check(): New function, to print out an explanation before
        assertion failure.
      storage/innobase/sync/sync0arr.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
      storage/innobase/trx/trx0rec.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/trx/trx0trx.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1491:
        Fix typo in comment.
        
        
        Revision r1497:
        Add the number of locks acquired by a transaction to its weight when
        choosing the lightest transaction to kill when a deadlock occurs.
        This fixes Bug#21293 partially.
        
        Approved by:	Heikki
        
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1522:
        trx0trx.c: Add missing #include "ha_prototypes.h".
      storage/innobase/trx/trx0undo.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
      storage/innobase/ut/ut0ut.c:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1490:
        Add #include <ctype.h>.  Apparently, this header is no longer included by
        the common headers.  This may be related to WL#2936
        (pluggable storage engines).
      mysql-test/r/innodb_trx_weight.result:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1498:
        Add a test about the behavior introduced in r1497.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      mysql-test/include/innodb_trx_weight.inc:
        Apply the following innodb-5.1-* snapshots:  ss1489, ss1496, ss1550, ss1569.
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1556:
        mysql-test/innodb_trx_weight.inc: Add username root to the "connect" statement.
        The Unix user running mysql-test-run usually does not have any privileges
        on the MySQL test database.
      mysql-test/t/innodb_trx_weight.test:
        Fixes after merging InnoDB snapshots.
        
        Revision r1498:
        Add a test about the behavior introduced in r1497.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
      sql/sql_class.cc:
        Fixes after merging InnoDB snapshots.
      storage/innobase/Makefile.am:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      storage/innobase/handler/ha_innodb.cc:
        Fixes after merging InnoDB snapshots.
        
        Revision r1422:
        Fix for Bug#21101 - returns wrong error message when table column
        defs exceed the max row size.
        
        The fix returns a more appropriate error message. Add a test case to
        innodb.test and expected output to innodb.result.
        
        
        Revision r1423:
        Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out
        of UNDO slots in the rollback segment. This is a partial fix since the
        MySQL error code requested to properly report the error condition back
        to the client has not yet materialized. Currently we have #ifdef'd the
        error code translation in ha_innodb.cc. This will have to be changed
        as and when MySQl add the new requested code or an equivalent code
        that we can then use.
        
        Given the above, currently we will get the old behaviour, not the "fixed"
        and intended behaviour.
        
        
        
        Revision r1425:
        Fixed a missing function decoration that slipped into r1422.
        
        
        Revision r1434:
        Fix typo.
        
        
        Revision r1442:
        Potential fix for Bug#25645:
        
        "Move innobase_release_stat_resources(trx) outside the 'if' in
        ha_innobase::external_lock(). That would add more safety that whatever
        MySQL does at a query end, there would be no risk of a hang on the btr
        search latch."
        
        Also call innobase_release_temporary_latches() in the beginning of
        ha_innobase::close().
        
        Approved by:	Heikki
        
        
        Revision r1453:
        Bugfix: only call innobase_release_temporary_latches() in case of current_thd
        is not NULL, otherwise we get NULL pointer dereferencing.
        
        Approved by:	Heikki
        
        
        Revision r1474:
        Fix typo in comment: the exact prototype is in
        include/data0type.ic, not in data/data0type.ic
        
        
        
        Revision r1482:
        Fix Bug#25078 by always letting the replication thread on the slave
        server to enter InnoDB. This can be made further customizable by the
        user if we introduce a new config parameter. This will wait until
        config parameters can be easily added.
        
        Approved by:	Marko
        
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
        
        
        Revision r1489:
        thd_to_trx(), check_trx_exists(): Remove the handlerton parameter.  It is a
        singleton object whose address is stored into innodb_hton_ptr.
        
        
        Revision r1492:
        Convert innobase_buffer_pool_size and innobase_log_file_size types from
        longlong to long long because MYSQL_SYSVAR_LONGLONG marco expects long long
        type.
        
        Also change
        ((ulint)innobase_buffer_pool_size) / 1024
        to
        (ulint)(innobase_buffer_pool_size / 1024)
        and remove comment which is no longer true.
        
        Provided that innobase_buffer_pool_size is always 64bits these statements
        are equivalent if ulint is 64 bit (well it will screw up if
        innobase_buffer_pool_size is negative). And if ulint is 32 bit the later
        variant gives a little more chance that the value will fit.
        
        Approved by:	Heikki
        
        
        Revision r1493:
        ha_innodb.cc: Remove the declarations of some global InnoDB variables
        whose name starts with srv_.  These variables are declared in the header
        files that are covered by #include directives in ha_innodb.cc.
        
        
        Revision r1495:
        Introduce the function reset_template() for resetting some fields of
        row_prebuilt_t; currently prebuilt->read_just_key and
        prebuilt->keep_other_fields_on_keyread.
        
        
        Revision r1496:
        ha_innobase::extra(): Replace references to prebuilt->trx with
        thd_to_trx(ha_thd()), in order to avoid potential memory corruption.
        
        
        Revision r1501:
        Fix Bug#21293: Consider transactions that had edited non-transactional
        tables heavier than ones that had not. This helps killing the "right"
        transaction in case of a deadlock.
        
        Approved by:	Heikki
        
        
        Revision r1513:
        Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...].
        This makes it possible to see which expression was false by looking at the
        error message.
        
        Approved by:	Marko
        
        
        Revision r1527:
        Cleanup in ha_innodb.cc:
        
        thd_is_replication_slave_thread(), thd_has_edited_nontrans_tables():
        Remove blank line between the function comment and the function
        definition.  There should be exactly one line between the return
        type and the function comment, and this line should be one of
        '', 'static', 'UNIV_INLINE', and 'extern "C"'.
        
        
        Revision r1538:
        Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for 
        normal processing of the query by MySQL instead of generating an error.
        
        Reviewed by: Heikki
        
        
        
        Revision r1551:
        ha_innobase::innobase_read_and_init_auto_inc(): Remember and restore
        prebuilt->sql_stat_start.  In an ALTER TABLE statement in the innodb_gis
        test, an ut_ad() assertion failed, because no IX lock had been acquired
        on the table, because prebuilt->sql_stat_start was inadvertently reset
        to FALSE, by this function.  This function was called via
        ha_innobase::info() and mysql_prepare_alter_table().
      storage/innobase/plug.in:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      storage/innobase/handler/ha_innodb.h:
        Fixes after merging InnoDB snapshots.
        
        Revision r1488:
        Make InnoDB pluggable.  That is, merge the modifications from MySQL WL#2936
        and adapt some things.
        
        Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
        <mysql/plugin.h>.  Until the function is declared there, you can
        uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
        
        Remove storage/innobase/*/Makefile.am.  The whole compilation is driven by
        storage/innobase/Makefile.am and storage/innobase/plug.in.
        
        plug.in: Declare InnoDB as a dynamic plugin.
        
        ha_innodb.h: Remove the declarations of many global variables.  The variables
        are no longer directly referenced outside of storage/innobase.
        
        trx_t: Add the field trx->duplicates.
        
        trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
        
        innobase_query_is_update(): Remove.  Consult trx->duplicates instead.
      32b5fb73
  18. 04 Jul, 2007 1 commit
    • unknown's avatar
      WL#3914: Additonal accessors required to compile InnoDB as a plugin storage engine · bd8b9746
      unknown authored
      Add more accessors to MySQL internals in mysql/plugin.h, for storage
      engine plugins.
      
      Add some accessors specific to the InnoDB storage engine, to allow
      InnoDB to be compiled as a plugin (without MYSQL_SERVER).  InnoDB
      has additional requirements, due to its foreign key support, etc.
      
      
      include/m_string.h:
        Add structure tag to LEX_STRING definition, so that it can be referred
        to by forward declarations.  Allow struct st_mysql_lex_string to be
        defined here, or in mysql/plugin.h.
      include/my_global.h:
        Define INNODB_COMPATIBILITY_HOOKS unconditionally; it brackets
        some definitions needed for the InnoDB storage engine plugin
        which do not belong in our general plugin interface.
      include/mysql/plugin.h:
        Additional accessors for MySQL internals:
         
        - Full definition of MYSQL_LEX_STRING (identical to LEX_STRING from
          m_string.h)
        - Full definition of MYSQL_XID (binary compatible with XID from
          handler.h)
        - mysql_tmpfile(), creates a temporary file in mysqld's tmpdir
        - thd_killed(), to check killed state of connection
        - thd_alloc() and similar allocation functions
        - thd_get_xid(), to get XID of connection's transaction
        - mysql_query_cache_invalidate4, to invalidate a table's query cache entries
      sql/handler.h:
        Use MYSQL_XIDDATASIZE definition from mysql/plugin.h, to avoid redundant
        definitions
      sql/log.cc:
        Add definitions for two InnoDB compatibility hooks:
        - mysql_bin_log_file(), to get log filename
        - mysql_bin_log_file_pos, to get position in file
          
        These are defined only if INNODB_COMPATIBILITY_HOOKS is defined;
        they are needed by the InnoDB plugin, but aren't part of the general
        plugin interface.  They are declared in ha_innodb.h for InnoDB's
        use.
      sql/mysql_priv.h:
        Expose some server internals when INNODB_COMPATIBILITY_HOOKS is
        defined, so that InnoDB can be built as a plugin when MYSQL_SERVER
        is not defined.
          
        Move make_lex_string inside THD class.
      sql/sql_cache.cc:
        Add definiton of mysql_query_cache_invalidate4(), a part of the
        plugin API (mysql/plugin.h).
      sql/sql_class.cc:
        Add definitions for several accessor functions which form part
        of the plugin API (mysql/plugin.h):
        - mysql_tmpfile()
        - thd_alloc() and friends
        - thd_make_lex_string()
        - thd_get_xid()
         
        Add definitons for accessor functions which InnoDB requires,
        but which are not part of the plugin interface:
        - thd_charset()
        - thd_query()
        - thd_slave_thread()
        - thd_non_transactional_update()
        - thd_binlog_format()
         
        Move definition of make_lex_string() from sql_show.cc into THD class
      sql/sql_class.h:
        Remove LEX_STRING_make(), and move make_lex_string() from sql_show.cc inside THD
        class.
      sql/sql_parse.cc:
        Use thd->make_lex_string() instead of thd->LEX_STRING_make()
      sql/sql_show.cc:
        Move make_lex_string() inside THD class
      storage/innobase/handler/ha_innodb.cc:
        Call thd_make_lex_string() instead of make_lex_string().
      bd8b9746
  19. 22 Jun, 2007 2 commits
  20. 21 Jun, 2007 2 commits
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): · 08b43c99
      unknown authored
      Minor fixes to get proper detection of transaction isolation level when
      inside external_lock().
      
      
      mysql-test/t/disabled.def:
        Enabling innodb.test again.
      mysql-test/t/innodb.test:
        Fixing some error codes. Test currently requires MIXED or ROW mode since
        READ-COMMITTED and READ-UNCOMMITTED are not safe for STATEMENT mode, i.e.,
        when the binary log is enabled.
      storage/innobase/handler/ha_innodb.cc:
        Using tx_isolation since trx->isolation_level is not defined when
        inside external_lock().
      08b43c99
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): · ced76857
      unknown authored
      Moving error generating code from table_flags() to external_lock().
      
      
      include/my_base.h:
        Adding handler error code HA_ERR_LOGGING_IMPOSSIBLE
      storage/innobase/handler/ha_innodb.cc:
        Moving error generating code from table_flags() to external_lock().
      ced76857
  21. 14 Jun, 2007 1 commit
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): · dd3ff42c
      unknown authored
      Temporarily using thd_tx_isolation() until decision is made on how to
      get the isolation level.
      
      
      storage/innobase/handler/ha_innodb.cc:
        Using thd_tx_isolation() instead of direct access to variable.
      mysql-test/r/binlog_tx_isolation.result:
        New BitKeeper file ``mysql-test/r/binlog_tx_isolation.result''
      dd3ff42c
  22. 12 Jun, 2007 1 commit
    • unknown's avatar
      BUG#23051 (READ COMMITTED breaks mixed and statement-based · ccbada08
      unknown authored
      replication):
      
      Patch to add binlog format capabilities to the InnoDB storage engine.
      The engine will not allow statement format logging when in READ COMMITTED
      or READ UNCOMMITTED transaction isolation level.
      
      In addition, an error is generated when trying to use READ COMMITTED
      or READ UNCOMMITTED transaction isolation level in STATEMENT binlog
      mode.
      
      
      sql/handler.h:
        Adding declaration of already global arrays.
      sql/share/errmsg.txt:
        Adding error messages for invalid changes of transaction isolation level
        and binlog mode switch.  Removing messages that are not needed any more
        (this cset it pushed together with the cset that introduced these
        messages, so it is safe to remove the messages).
      sql/sql_base.cc:
        Some changes to error reporting code to get more informative messages.
      storage/innobase/handler/ha_innodb.cc:
        Adding capabilities to storage engine.
        
        Ha_innobase:table_flags() now compute flags on a per-statement basis
        and the statement capabilities flag is just set if the transaction
        isolation level is below READ COMMITTED.
        
        An informative message is printed in the event that the transaction
        isolation level is below READ COMMITTED and the binlog mode is STATEMENT.
      storage/innobase/handler/ha_innodb.h:
        Accomodating to changes in the server code that switched from ulong
        to Table_flags as type for the table flags.
      mysql-test/r/binlog_innodb.result:
        New BitKeeper file ``mysql-test/r/binlog_innodb.result''
      mysql-test/t/binlog_innodb.test:
        New BitKeeper file ``mysql-test/t/binlog_innodb.test''
      ccbada08
  23. 10 May, 2007 1 commit
    • unknown's avatar
      WL#3817: Simplify string / memory area types and make things more consistent (first part) · f252f924
      unknown authored
      The following type conversions was done:
      
      - Changed byte to uchar
      - Changed gptr to uchar*
      - Change my_string to char *
      - Change my_size_t to size_t
      - Change size_s to size_t
      
      Removed declaration of byte, gptr, my_string, my_size_t and size_s. 
      
      Following function parameter changes was done:
      - All string functions in mysys/strings was changed to use size_t
        instead of uint for string lengths.
      - All read()/write() functions changed to use size_t (including vio).
      - All protocoll functions changed to use size_t instead of uint
      - Functions that used a pointer to a string length was changed to use size_t*
      - Changed malloc(), free() and related functions from using gptr to use void *
        as this requires fewer casts in the code and is more in line with how the
        standard functions work.
      - Added extra length argument to dirname_part() to return the length of the
        created string.
      - Changed (at least) following functions to take uchar* as argument:
        - db_dump()
        - my_net_write()
        - net_write_command()
        - net_store_data()
        - DBUG_DUMP()
        - decimal2bin() & bin2decimal()
      - Changed my_compress() and my_uncompress() to use size_t. Changed one
        argument to my_uncompress() from a pointer to a value as we only return
        one value (makes function easier to use).
      - Changed type of 'pack_data' argument to packfrm() to avoid casts.
      - Changed in readfrm() and writefrom(), ha_discover and handler::discover()
        the type for argument 'frmdata' to uchar** to avoid casts.
      - Changed most Field functions to use uchar* instead of char* (reduced a lot of
        casts).
      - Changed field->val_xxx(xxx, new_ptr) to take const pointers.
      
      Other changes:
      - Removed a lot of not needed casts
      - Added a few new cast required by other changes
      - Added some cast to my_multi_malloc() arguments for safety (as string lengths
        needs to be uint, not size_t).
      - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
        explicitely as this conflict was often hided by casting the function to
        hash_get_key).
      - Changed some buffers to memory regions to uchar* to avoid casts.
      - Changed some string lengths from uint to size_t.
      - Changed field->ptr to be uchar* instead of char*. This allowed us to
        get rid of a lot of casts.
      - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
      - Include zlib.h in some files as we needed declaration of crc32()
      - Changed MY_FILE_ERROR to be (size_t) -1.
      - Changed many variables to hold the result of my_read() / my_write() to be
        size_t. This was needed to properly detect errors (which are
        returned as (size_t) -1).
      - Removed some very old VMS code
      - Changed packfrm()/unpackfrm() to not be depending on uint size
        (portability fix)
      - Removed windows specific code to restore cursor position as this
        causes slowdown on windows and we should not mix read() and pread()
        calls anyway as this is not thread safe. Updated function comment to
        reflect this. Changed function that depended on original behavior of
        my_pwrite() to itself restore the cursor position (one such case).
      - Added some missing checking of return value of malloc().
      - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
      - Changed type of table_def::m_size from my_size_t to ulong to reflect that
        m_size is the number of elements in the array, not a string/memory
        length.
      - Moved THD::max_row_length() to table.cc (as it's not depending on THD).
        Inlined max_row_length_blob() into this function.
      - More function comments
      - Fixed some compiler warnings when compiled without partitions.
      - Removed setting of LEX_STRING() arguments in declaration (portability fix).
      - Some trivial indentation/variable name changes.
      - Some trivial code simplifications:
        - Replaced some calls to alloc_root + memcpy to use
          strmake_root()/strdup_root().
        - Changed some calls from memdup() to strmake() (Safety fix)
        - Simpler loops in client-simple.c
      
      
      BitKeeper/etc/ignore:
        added libmysqld/ha_ndbcluster_cond.cc
        ---
        added debian/defs.mk debian/control
      client/completion_hash.cc:
        Remove not needed casts
      client/my_readline.h:
        Remove some old types
      client/mysql.cc:
        Simplify types
      client/mysql_upgrade.c:
        Remove some old types
        Update call to dirname_part
      client/mysqladmin.cc:
        Remove some old types
      client/mysqlbinlog.cc:
        Remove some old types
        Change some buffers to be uchar to avoid casts
      client/mysqlcheck.c:
        Remove some old types
      client/mysqldump.c:
        Remove some old types
        Remove some not needed casts
        Change some string lengths to size_t
      client/mysqlimport.c:
        Remove some old types
      client/mysqlshow.c:
        Remove some old types
      client/mysqlslap.c:
        Remove some old types
        Remove some not needed casts
      client/mysqltest.c:
        Removed some old types
        Removed some not needed casts
        Updated hash-get-key function arguments
        Updated parameters to dirname_part()
      client/readline.cc:
        Removed some old types
        Removed some not needed casts
        Changed some string lengths to use size_t
      client/sql_string.cc:
        Removed some old types
      dbug/dbug.c:
        Removed some old types
        Changed some string lengths to use size_t
        Changed some prototypes to avoid casts
      extra/comp_err.c:
        Removed some old types
      extra/innochecksum.c:
        Removed some old types
      extra/my_print_defaults.c:
        Removed some old types
      extra/mysql_waitpid.c:
        Removed some old types
      extra/perror.c:
        Removed some old types
      extra/replace.c:
        Removed some old types
        Updated parameters to dirname_part()
      extra/resolve_stack_dump.c:
        Removed some old types
      extra/resolveip.c:
        Removed some old types
      include/config-win.h:
        Removed some old types
      include/decimal.h:
        Changed binary strings to be uchar* instead of char*
      include/ft_global.h:
        Removed some old types
      include/hash.h:
        Removed some old types
      include/heap.h:
        Removed some old types
        Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable
      include/keycache.h:
        Removed some old types
      include/m_ctype.h:
        Removed some old types
        Changed some string lengths to use size_t
        Changed character length functions to return uint
        unsigned char -> uchar
      include/m_string.h:
        Removed some old types
        Changed some string lengths to use size_t
      include/my_alloc.h:
        Changed some string lengths to use size_t
      include/my_base.h:
        Removed some old types
      include/my_dbug.h:
        Removed some old types
        Changed some string lengths to use size_t
        Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage
      include/my_getopt.h:
        Removed some old types
      include/my_global.h:
        Removed old types:
        my_size_t -> size_t
        byte -> uchar
        gptr -> uchar *
      include/my_list.h:
        Removed some old types
      include/my_nosys.h:
        Removed some old types
      include/my_pthread.h:
        Removed some old types
      include/my_sys.h:
        Removed some old types
        Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read()
        Changed some string lengths to use size_t
        my_malloc() / my_free() now uses void *
        Updated parameters to dirname_part() & my_uncompress()
      include/my_tree.h:
        Removed some old types
      include/my_trie.h:
        Removed some old types
      include/my_user.h:
        Changed some string lengths to use size_t
      include/my_vle.h:
        Removed some old types
      include/my_xml.h:
        Removed some old types
        Changed some string lengths to use size_t
      include/myisam.h:
        Removed some old types
      include/myisammrg.h:
        Removed some old types
      include/mysql.h:
        Removed some old types
        Changed byte streams to use uchar* instead of char*
      include/mysql_com.h:
        Removed some old types
        Changed some string lengths to use size_t
        Changed some buffers to be uchar* to avoid casts
      include/queues.h:
        Removed some old types
      include/sql_common.h:
        Removed some old types
      include/sslopt-longopts.h:
        Removed some old types
      include/violite.h:
        Removed some old types
        Changed some string lengths to use size_t
      libmysql/client_settings.h:
        Removed some old types
      libmysql/libmysql.c:
        Removed some old types
      libmysql/manager.c:
        Removed some old types
      libmysqld/emb_qcache.cc:
        Removed some old types
      libmysqld/emb_qcache.h:
        Removed some old types
      libmysqld/lib_sql.cc:
        Removed some old types
        Removed some not needed casts
        Changed some buffers to be uchar* to avoid casts
        true -> TRUE, false -> FALSE
      mysys/array.c:
        Removed some old types
      mysys/charset.c:
        Changed some string lengths to use size_t
      mysys/checksum.c:
        Include zlib to get definition for crc32
        Removed some old types
      mysys/default.c:
        Removed some old types
        Changed some string lengths to use size_t
      mysys/default_modify.c:
        Changed some string lengths to use size_t
        Removed some not needed casts
      mysys/hash.c:
        Removed some old types
        Changed some string lengths to use size_t
        Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function.
        hash_element now takes 'ulong' as the index type (cleanup)
      mysys/list.c:
        Removed some old types
      mysys/mf_cache.c:
        Changed some string lengths to use size_t
      mysys/mf_dirname.c:
        Removed some old types
        Changed some string lengths to use size_t
        Added argument to dirname_part() to avoid calculation of length for 'to'
      mysys/mf_fn_ext.c:
        Removed some old types
        Updated parameters to dirname_part()
      mysys/mf_format.c:
        Removed some old types
        Changed some string lengths to use size_t
      mysys/mf_getdate.c:
        Removed some old types
      mysys/mf_iocache.c:
        Removed some old types
        Changed some string lengths to use size_t
        Changed calculation of 'max_length' to be done the same way in all functions
      mysys/mf_iocache2.c:
        Removed some old types
        Changed some string lengths to use size_t
        Clean up comments
        Removed not needed indentation
      mysys/mf_keycache.c:
        Removed some old types
      mysys/mf_keycaches.c:
        Removed some old types
      mysys/mf_loadpath.c:
        Removed some old types
      mysys/mf_pack.c:
        Removed some old types
        Changed some string lengths to use size_t
        Removed some not needed casts
        Removed very old VMS code
        Updated parameters to dirname_part()
        Use result of dirnam_part() to remove call to strcat()
      mysys/mf_path.c:
        Removed some old types
      mysys/mf_radix.c:
        Removed some old types
      mysys/mf_same.c:
        Removed some old types
      mysys/mf_sort.c:
        Removed some old types
      mysys/mf_soundex.c:
        Removed some old types
      mysys/mf_strip.c:
        Removed some old types
      mysys/mf_tempdir.c:
        Removed some old types
      mysys/mf_unixpath.c:
        Removed some old types
      mysys/mf_wfile.c:
        Removed some old types
      mysys/mulalloc.c:
        Removed some old types
      mysys/my_alloc.c:
        Removed some old types
        Changed some string lengths to use size_t
        Use void* as type for allocated memory area
        Removed some not needed casts
        Changed argument 'Size' to 'length' according coding guidelines
      mysys/my_chsize.c:
        Changed some buffers to be uchar* to avoid casts
      mysys/my_compress.c:
        More comments
        Removed some old types
        Changed string lengths to use size_t
        Changed arguments to my_uncompress() to make them easier to understand
        Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix)
        Changed type of 'pack_data' argument to packfrm() to avoid casts.
      mysys/my_conio.c:
        Changed some string lengths to use size_t
      mysys/my_create.c:
        Removed some old types
      mysys/my_div.c:
        Removed some old types
      mysys/my_error.c:
        Removed some old types
      mysys/my_fopen.c:
        Removed some old types
      mysys/my_fstream.c:
        Removed some old types
        Changed some string lengths to use size_t
        writen -> written
      mysys/my_getopt.c:
        Removed some old types
      mysys/my_getwd.c:
        Removed some old types
        More comments
      mysys/my_init.c:
        Removed some old types
      mysys/my_largepage.c:
        Removed some old types
        Changed some string lengths to use size_t
      mysys/my_lib.c:
        Removed some old types
      mysys/my_lockmem.c:
        Removed some old types
      mysys/my_malloc.c:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
        Changed all functions to use size_t
      mysys/my_memmem.c:
        Indentation cleanup
      mysys/my_once.c:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
      mysys/my_open.c:
        Removed some old types
      mysys/my_pread.c:
        Removed some old types
        Changed all functions to use size_t
        Added comment for how my_pread() / my_pwrite() are supposed to work.
        Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe.
        (If we ever would really need this, it should be enabled only with a flag argument)
      mysys/my_quick.c:
        Removed some old types
        Changed all functions to use size_t
      mysys/my_read.c:
        Removed some old types
        Changed all functions to use size_t
      mysys/my_realloc.c:
        Removed some old types
        Use void* as type for allocated memory area
        Changed all functions to use size_t
      mysys/my_static.c:
        Removed some old types
      mysys/my_static.h:
        Removed some old types
      mysys/my_vle.c:
        Removed some old types
      mysys/my_wincond.c:
        Removed some old types
      mysys/my_windac.c:
        Removed some old types
      mysys/my_write.c:
        Removed some old types
        Changed all functions to use size_t
      mysys/ptr_cmp.c:
        Removed some old types
        Changed all functions to use size_t
      mysys/queues.c:
        Removed some old types
      mysys/safemalloc.c:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
        Changed all functions to use size_t
      mysys/string.c:
        Removed some old types
        Changed all functions to use size_t
      mysys/testhash.c:
        Removed some old types
      mysys/thr_alarm.c:
        Removed some old types
      mysys/thr_lock.c:
        Removed some old types
      mysys/tree.c:
        Removed some old types
      mysys/trie.c:
        Removed some old types
      mysys/typelib.c:
        Removed some old types
      plugin/daemon_example/daemon_example.cc:
        Removed some old types
      regex/reginit.c:
        Removed some old types
      server-tools/instance-manager/buffer.cc:
        Changed some string lengths to use size_t
        Changed buffer to be of type uchar*
      server-tools/instance-manager/buffer.h:
        Changed some string lengths to use size_t
        Changed buffer to be of type uchar*
      server-tools/instance-manager/commands.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed buffer to be of type uchar*
      server-tools/instance-manager/instance_map.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed buffer to be of type uchar*
      server-tools/instance-manager/instance_options.cc:
        Changed buffer to be of type uchar*
        Replaced alloc_root + strcpy() with strdup_root()
      server-tools/instance-manager/mysql_connection.cc:
        Changed buffer to be of type uchar*
      server-tools/instance-manager/options.cc:
        Removed some old types
      server-tools/instance-manager/parse.cc:
        Changed some string lengths to use size_t
      server-tools/instance-manager/parse.h:
        Removed some old types
        Changed some string lengths to use size_t
      server-tools/instance-manager/protocol.cc:
        Changed some buffers to be uchar* to avoid casts
        Changed some string lengths to use size_t
      server-tools/instance-manager/protocol.h:
        Changed some string lengths to use size_t
      server-tools/instance-manager/user_map.cc:
        Removed some old types
        Changed some string lengths to use size_t
      sql/derror.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Changed some string lengths to use size_t
      sql/discover.cc:
        Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts
        Changed some string lengths to use size_t
        Changed some buffers to be uchar* to avoid casts
      sql/event_data_objects.cc:
        Removed some old types
        Added missing casts for alloc() and sprintf()
      sql/event_db_repository.cc:
        Changed some buffers to be uchar* to avoid casts
        Added missing casts for sprintf()
      sql/event_queue.cc:
        Removed some old types
      sql/field.cc:
        Removed some old types
        Changed memory buffers to be uchar*
        Changed some string lengths to use size_t
        Removed a lot of casts
        Safety fix in Field_blob::val_decimal() to not access zero pointer
      sql/field.h:
        Removed some old types
        Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). 
        Changed some string lengths to use size_t
        Removed some not needed casts
        Changed val_xxx(xxx, new_ptr) to take const pointers
      sql/field_conv.cc:
        Removed some old types
        Added casts required because memory area pointers are now uchar*
      sql/filesort.cc:
        Initalize variable that was used unitialized in error conditions
      sql/gen_lex_hash.cc:
        Removed some old types
        Changed memory buffers to be uchar*
        Changed some string lengths to use size_t
        Removed a lot of casts
        Safety fix in Field_blob::val_decimal() to not access zero pointer
      sql/gstream.h:
        Added required cast
      sql/ha_ndbcluster.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Changed some buffers to be uchar* to avoid casts
        Added required casts
        Removed some not needed casts
      sql/ha_ndbcluster.h:
        Removed some old types
      sql/ha_ndbcluster_binlog.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake()
        Changed some string lengths to use size_t
        Added missing casts for alloc() and sprintf()
      sql/ha_ndbcluster_binlog.h:
        Removed some old types
      sql/ha_ndbcluster_cond.cc:
        Removed some old types
        Removed some not needed casts
      sql/ha_ndbcluster_cond.h:
        Removed some old types
      sql/ha_partition.cc:
        Removed some old types
        Changed prototype for change_partition() to avoid casts
      sql/ha_partition.h:
        Removed some old types
      sql/handler.cc:
        Removed some old types
        Changed some string lengths to use size_t
      sql/handler.h:
        Removed some old types
        Changed some string lengths to use size_t
        Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts
      sql/hash_filo.h:
        Removed some old types
        Changed all functions to use size_t
      sql/hostname.cc:
        Removed some old types
      sql/item.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Use strmake() instead of memdup() to create a null terminated string.
        Updated calls to new Field()
      sql/item.h:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
        Changed some buffers to be uchar* to avoid casts
      sql/item_cmpfunc.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/item_cmpfunc.h:
        Removed some old types
      sql/item_create.cc:
        Removed some old types
      sql/item_func.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
        Added test for failing alloc() in init_result_field()
        Remove old confusing comment
        Fixed compiler warning
      sql/item_func.h:
        Removed some old types
      sql/item_row.cc:
        Removed some old types
      sql/item_row.h:
        Removed some old types
      sql/item_strfunc.cc:
        Include zlib (needed becasue we call crc32)
        Removed some old types
      sql/item_strfunc.h:
        Removed some old types
        Changed some types to match new function prototypes
      sql/item_subselect.cc:
        Removed some old types
      sql/item_subselect.h:
        Removed some old types
      sql/item_sum.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/item_sum.h:
        Removed some old types
      sql/item_timefunc.cc:
        Removed some old types
        Changed some string lengths to use size_t
      sql/item_timefunc.h:
        Removed some old types
      sql/item_xmlfunc.cc:
        Changed some string lengths to use size_t
      sql/item_xmlfunc.h:
        Removed some old types
      sql/key.cc:
        Removed some old types
        Removed some not needed casts
      sql/lock.cc:
        Removed some old types
        Added some cast to my_multi_malloc() arguments for safety
      sql/log.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed some buffers to be uchar* to avoid casts
        Changed usage of pwrite() to not assume it holds the cursor position for the file
        Made usage of my_read() safer
      sql/log_event.cc:
        Removed some old types
        Added checking of return value of malloc() in pack_info()
        Changed some buffers to be uchar* to avoid casts
        Removed some 'const' to avoid casts
        Added missing casts for alloc() and sprintf()
        Added required casts
        Removed some not needed casts
        Added some cast to my_multi_malloc() arguments for safety
      sql/log_event.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/log_event_old.cc:
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/log_event_old.h:
        Changed some buffers to be uchar* to avoid casts
      sql/mf_iocache.cc:
        Removed some old types
      sql/my_decimal.cc:
        Changed memory area to use uchar*
      sql/my_decimal.h:
        Changed memory area to use uchar*
      sql/mysql_priv.h:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
        Changed some string lengths to use size_t
        Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow
        Changed some buffers to be uchar* to avoid casts
      sql/mysqld.cc:
        Removed some old types
      sql/net_serv.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed some buffers to be uchar* to avoid casts
        Ensure that vio_read()/vio_write() return values are stored in a size_t variable
        Removed some not needed casts
      sql/opt_range.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/opt_range.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/opt_sum.cc:
        Removed some old types
        Removed some not needed casts
      sql/parse_file.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed alloc_root + memcpy + set end 0 -> strmake_root()
      sql/parse_file.h:
        Removed some old types
      sql/partition_info.cc:
        Removed some old types
        Added missing casts for alloc()
        Changed some buffers to be uchar* to avoid casts
      sql/partition_info.h:
        Changed some buffers to be uchar* to avoid casts
      sql/protocol.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/protocol.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Changed some string lengths to use size_t
      sql/records.cc:
        Removed some old types
      sql/repl_failsafe.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Added required casts
      sql/rpl_filter.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Changed some string lengths to use size_t
      sql/rpl_filter.h:
        Changed some string lengths to use size_t
      sql/rpl_injector.h:
        Removed some old types
      sql/rpl_record.cc:
        Removed some old types
        Removed some not needed casts
        Changed some buffers to be uchar* to avoid casts
      sql/rpl_record.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/rpl_record_old.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/rpl_record_old.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid cast
      sql/rpl_rli.cc:
        Removed some old types
      sql/rpl_tblmap.cc:
        Removed some old types
      sql/rpl_tblmap.h:
        Removed some old types
      sql/rpl_utility.cc:
        Removed some old types
      sql/rpl_utility.h:
        Removed some old types
        Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length
      sql/set_var.cc:
        Removed some old types
        Updated parameters to dirname_part()
      sql/set_var.h:
        Removed some old types
      sql/slave.cc:
        Removed some old types
        Changed some string lengths to use size_t
      sql/slave.h:
        Removed some old types
      sql/sp.cc:
        Removed some old types
        Added missing casts for printf()
      sql/sp.h:
        Removed some old types
        Updated hash-get-key function arguments
      sql/sp_cache.cc:
        Removed some old types
        Added missing casts for printf()
        Updated hash-get-key function arguments
      sql/sp_head.cc:
        Removed some old types
        Added missing casts for alloc() and printf()
        Added required casts
        Updated hash-get-key function arguments
      sql/sp_head.h:
        Removed some old types
      sql/sp_pcontext.cc:
        Removed some old types
      sql/sp_pcontext.h:
        Removed some old types
      sql/sql_acl.cc:
        Removed some old types
        Changed some string lengths to use size_t
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
        Added required casts
      sql/sql_analyse.cc:
        Changed some buffers to be uchar* to avoid casts
      sql/sql_analyse.h:
        Changed some buffers to be uchar* to avoid casts
      sql/sql_array.h:
        Removed some old types
      sql/sql_base.cc:
        Removed some old types
        Updated hash-get-key function arguments
      sql/sql_binlog.cc:
        Removed some old types
        Added missing casts for printf()
      sql/sql_cache.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Removed some not needed casts
        Changed some string lengths to use size_t
      sql/sql_cache.h:
        Removed some old types
        Removed reference to not existing function cache_key()
        Updated hash-get-key function arguments
      sql/sql_class.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Added missing casts for alloc()
        Updated hash-get-key function arguments
        Moved THD::max_row_length() to table.cc (as it's not depending on THD)
        Removed some not needed casts
      sql/sql_class.h:
        Removed some old types
        Changed malloc(), free() and related functions to use void *
        Removed some not needed casts
        Changed some string lengths to use size_t
        Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD
      sql/sql_connect.cc:
        Removed some old types
        Added required casts
      sql/sql_db.cc:
        Removed some old types
        Removed some not needed casts
        Added some cast to my_multi_malloc() arguments for safety
        Added missing casts for alloc()
      sql/sql_delete.cc:
        Removed some old types
      sql/sql_handler.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Added some cast to my_multi_malloc() arguments for safety
      sql/sql_help.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/sql_insert.cc:
        Removed some old types
        Added missing casts for alloc() and printf()
      sql/sql_lex.cc:
        Removed some old types
      sql/sql_lex.h:
        Removed some old types
        Removed some not needed casts
      sql/sql_list.h:
        Removed some old types
        Removed some not needed casts
      sql/sql_load.cc:
        Removed some old types
        Removed compiler warning
      sql/sql_manager.cc:
        Removed some old types
      sql/sql_map.cc:
        Removed some old types
      sql/sql_map.h:
        Removed some old types
      sql/sql_olap.cc:
        Removed some old types
      sql/sql_parse.cc:
        Removed some old types
        Trivial move of code lines to make things more readable
        Changed some string lengths to use size_t
        Added missing casts for alloc()
      sql/sql_partition.cc:
        Removed some old types
        Removed compiler warnings about not used functions
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/sql_partition.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/sql_plugin.cc:
        Removed some old types
        Added missing casts for alloc()
        Updated hash-get-key function arguments
      sql/sql_prepare.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Added missing casts for alloc() and printf()
      sql-common/client.c:
        Removed some old types
        Changed some memory areas to use uchar*
      sql-common/my_user.c:
        Changed some string lengths to use size_t
      sql-common/pack.c:
        Changed some buffers to be uchar* to avoid casts
      sql/sql_repl.cc:
        Added required casts
        Changed some buffers to be uchar* to avoid casts
        Changed some string lengths to use size_t
      sql/sql_select.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some old types
      sql/sql_select.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      sql/sql_servers.cc:
        Removed some old types
        Updated hash-get-key function arguments
      sql/sql_show.cc:
        Removed some old types
        Added missing casts for alloc()
        Removed some not needed casts
      sql/sql_string.cc:
        Removed some old types
        Added required casts
      sql/sql_table.cc:
        Removed some old types
        Removed compiler warning about not used variable
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
      sql/sql_test.cc:
        Removed some old types
      sql/sql_trigger.cc:
        Removed some old types
        Added missing casts for alloc()
      sql/sql_udf.cc:
        Removed some old types
        Updated hash-get-key function arguments
      sql/sql_union.cc:
        Removed some old types
      sql/sql_update.cc:
        Removed some old types
        Removed some not needed casts
      sql/sql_view.cc:
        Removed some old types
      sql/sql_yacc.yy:
        Removed some old types
        Changed some string lengths to use size_t
        Added missing casts for alloc()
      sql/stacktrace.c:
        Removed some old types
      sql/stacktrace.h:
        Removed some old types
      sql/structs.h:
        Removed some old types
      sql/table.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Changed some buffers to be uchar* to avoid casts
        Removed setting of LEX_STRING() arguments in declaration
        Added required casts
        More function comments
        Moved max_row_length() here from sql_class.cc/sql_class.h
      sql/table.h:
        Removed some old types
        Changed some string lengths to use size_t
      sql/thr_malloc.cc:
        Use void* as type for allocated memory area
        Changed all functions to use size_t
      sql/tzfile.h:
        Changed some buffers to be uchar* to avoid casts
      sql/tztime.cc:
        Changed some buffers to be uchar* to avoid casts
        Updated hash-get-key function arguments
        Added missing casts for alloc()
        Removed some not needed casts
      sql/uniques.cc:
        Removed some old types
        Removed some not needed casts
      sql/unireg.cc:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
        Removed some not needed casts
        Added missing casts for alloc()
      storage/archive/archive_reader.c:
        Removed some old types
      storage/archive/azio.c:
        Removed some old types
        Removed some not needed casts
      storage/archive/ha_archive.cc:
        Removed some old types
        Changed type for 'frmblob' in archive_discover() to match handler
        Updated hash-get-key function arguments
        Removed some not needed casts
      storage/archive/ha_archive.h:
        Removed some old types
      storage/blackhole/ha_blackhole.cc:
        Removed some old types
      storage/blackhole/ha_blackhole.h:
        Removed some old types
      storage/csv/ha_tina.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Changed some buffers to be uchar* to avoid casts
      storage/csv/ha_tina.h:
        Removed some old types
        Removed some not needed casts
      storage/csv/transparent_file.cc:
        Removed some old types
        Changed type of 'bytes_read' to be able to detect read errors
        Fixed indentation
      storage/csv/transparent_file.h:
        Removed some old types
      storage/example/ha_example.cc:
        Removed some old types
        Updated hash-get-key function arguments
      storage/example/ha_example.h:
        Removed some old types
      storage/federated/ha_federated.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Removed some not needed casts
      storage/federated/ha_federated.h:
        Removed some old types
      storage/heap/_check.c:
        Changed some buffers to be uchar* to avoid casts
      storage/heap/_rectest.c:
        Removed some old types
      storage/heap/ha_heap.cc:
        Removed some old types
      storage/heap/ha_heap.h:
        Removed some old types
      storage/heap/heapdef.h:
        Removed some old types
      storage/heap/hp_block.c:
        Removed some old types
        Changed some string lengths to use size_t
      storage/heap/hp_clear.c:
        Removed some old types
      storage/heap/hp_close.c:
        Removed some old types
      storage/heap/hp_create.c:
        Removed some old types
      storage/heap/hp_delete.c:
        Removed some old types
      storage/heap/hp_hash.c:
        Removed some old types
      storage/heap/hp_info.c:
        Removed some old types
      storage/heap/hp_open.c:
        Removed some old types
      storage/heap/hp_rfirst.c:
        Removed some old types
      storage/heap/hp_rkey.c:
        Removed some old types
      storage/heap/hp_rlast.c:
        Removed some old types
      storage/heap/hp_rnext.c:
        Removed some old types
      storage/heap/hp_rprev.c:
        Removed some old types
      storage/heap/hp_rrnd.c:
        Removed some old types
      storage/heap/hp_rsame.c:
        Removed some old types
      storage/heap/hp_scan.c:
        Removed some old types
      storage/heap/hp_test1.c:
        Removed some old types
      storage/heap/hp_test2.c:
        Removed some old types
      storage/heap/hp_update.c:
        Removed some old types
      storage/heap/hp_write.c:
        Removed some old types
        Changed some string lengths to use size_t
      storage/innobase/handler/ha_innodb.cc:
        Removed some old types
        Updated hash-get-key function arguments
        Added missing casts for alloc() and printf()
        Removed some not needed casts
      storage/innobase/handler/ha_innodb.h:
        Removed some old types
      storage/myisam/ft_boolean_search.c:
        Removed some old types
      storage/myisam/ft_nlq_search.c:
        Removed some old types
      storage/myisam/ft_parser.c:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      storage/myisam/ft_static.c:
        Removed some old types
      storage/myisam/ft_stopwords.c:
        Removed some old types
      storage/myisam/ft_update.c:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      storage/myisam/ftdefs.h:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      storage/myisam/fulltext.h:
        Removed some old types
      storage/myisam/ha_myisam.cc:
        Removed some old types
      storage/myisam/ha_myisam.h:
        Removed some old types
      storage/myisam/mi_cache.c:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      storage/myisam/mi_check.c:
        Removed some old types
      storage/myisam/mi_checksum.c:
        Removed some old types
      storage/myisam/mi_close.c:
        Removed some old types
      storage/myisam/mi_create.c:
        Removed some old types
      storage/myisam/mi_delete.c:
        Removed some old types
      storage/myisam/mi_delete_all.c:
        Removed some old types
      storage/myisam/mi_dynrec.c:
        Removed some old types
      storage/myisam/mi_extra.c:
        Removed some old types
      storage/myisam/mi_key.c:
        Removed some old types
      storage/myisam/mi_locking.c:
        Removed some old types
      storage/myisam/mi_log.c:
        Removed some old types
      storage/myisam/mi_open.c:
        Removed some old types
        Removed some not needed casts
        Check argument of my_write()/my_pwrite() in functions returning int
        Added casting of string lengths to size_t
      storage/myisam/mi_packrec.c:
        Removed some old types
        Changed some buffers to be uchar* to avoid casts
      storage/myisam/mi_page.c:
        Removed some old types
      storage/myisam/mi_preload.c:
        Removed some old types
      storage/myisam/mi_range.c:
        Removed some old types
      storage/myisam/mi_rfirst.c:
        Removed some old types
      storage/myisam/mi_rkey.c:
        Removed some old types
      storage/myisam/mi_rlast.c:
        Removed some old types
      storage/myisam/mi_rnext.c:
        Removed some old types
      storage/myisam/mi_rnext_same.c:
        Removed some old types
      storage/myisam/mi_rprev.c:
        Removed some old types
      storage/myisam/mi_rrnd.c:
        Removed some old types
      storage/myisam/mi_rsame.c:
        Removed some old types
      storage/myisam/mi_rsamepos.c:
        Removed some old types
      storage/myisam/mi_scan.c:
        Removed some old types
      storage/myisam/mi_search.c:
        Removed some old types
      storage/myisam/mi_static.c:
        Removed some old types
      storage/myisam/mi_statrec.c:
        Removed some old types
      storage/myisam/mi_test1.c:
        Removed some old types
      storage/myisam/mi_test2.c:
        Removed some old types
      storage/myisam/mi_test3.c:
        Removed some old types
      storage/myisam/mi_unique.c:
        Removed some old types
      storage/myisam/mi_update.c:
        Removed some old types
      storage/myisam/mi_write.c:
        Removed some old types
      storage/myisam/myisam_ftdump.c:
        Removed some old types
      storage/myisam/myisamchk.c:
        Removed some old types
      storage/myisam/myisamdef.h:
        Removed some old types
      storage/myisam/myisamlog.c:
        Removed some old types
        Indentation fix
      storage/myisam/myisampack.c:
        Removed some old types
      storage/myisam/rt_index.c:
        Removed some old types
      storage/myisam/rt_split.c:
        Removed some old types
      storage/myisam/sort.c:
        Removed some old types
      storage/myisam/sp_defs.h:
        Removed some old types
      storage/myisam/sp_key.c:
        Removed some old types
      storage/myisammrg/ha_myisammrg.cc:
        Removed some old types
      storage/myisammrg/ha_myisammrg.h:
        Removed some old types
      storage/myisammrg/myrg_close.c:
        Removed some old types
      storage/myisammrg/myrg_def.h:
        Removed some old types
      storage/myisammrg/myrg_delete.c:
        Removed some old types
      storage/myisammrg/myrg_open.c:
        Removed some old types
        Updated parameters to dirname_part()
      storage/myisammrg/myrg_queue.c:
        Removed some old types
      storage/myisammrg/myrg_rfirst.c:
        Removed some old types
      storage/myisammrg/myrg_rkey.c:
        Removed some old types
      storage/myisammrg/myrg_rlast.c:
        Removed some old types
      storage/myisammrg/myrg_rnext.c:
        Removed some old types
      storage/myisammrg/myrg_rnext_same.c:
        Removed some old types
      storage/myisammrg/myrg_rprev.c:
        Removed some old types
      storage/myisammrg/myrg_rrnd.c:
        Removed some old types
      storage/myisammrg/myrg_rsame.c:
        Removed some old types
      storage/myisammrg/myrg_update.c:
        Removed some old types
      storage/myisammrg/myrg_write.c:
        Removed some old types
      storage/ndb/include/util/ndb_opts.h:
        Removed some old types
      storage/ndb/src/cw/cpcd/main.cpp:
        Removed some old types
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Removed some old types
      storage/ndb/src/mgmclient/main.cpp:
        Removed some old types
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Removed some old types
        Removed old disabled code
      storage/ndb/src/mgmsrv/main.cpp:
        Removed some old types
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        Removed some old types
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        Removed not used variable
      storage/ndb/src/ndbapi/NdbOperationInt.cpp:
        Added required casts
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Added required casts
      storage/ndb/tools/delete_all.cpp:
        Removed some old types
      storage/ndb/tools/desc.cpp:
        Removed some old types
      storage/ndb/tools/drop_index.cpp:
        Removed some old types
      storage/ndb/tools/drop_tab.cpp:
        Removed some old types
      storage/ndb/tools/listTables.cpp:
        Removed some old types
      storage/ndb/tools/ndb_config.cpp:
        Removed some old types
      storage/ndb/tools/restore/consumer_restore.cpp:
        Changed some buffers to be uchar* to avoid casts with new defintion of packfrm()
      storage/ndb/tools/restore/restore_main.cpp:
        Removed some old types
      storage/ndb/tools/select_all.cpp:
        Removed some old types
      storage/ndb/tools/select_count.cpp:
        Removed some old types
      storage/ndb/tools/waiter.cpp:
        Removed some old types
      strings/bchange.c:
        Changed function to use uchar * and size_t
      strings/bcmp.c:
        Changed function to use uchar * and size_t
      strings/bmove512.c:
        Changed function to use uchar * and size_t
      strings/bmove_upp.c:
        Changed function to use uchar * and size_t
      strings/ctype-big5.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-bin.c:
        Changed functions to use size_t
      strings/ctype-cp932.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-czech.c:
        Fixed indentation
        Changed functions to use size_t
      strings/ctype-euc_kr.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-eucjpms.c:
        Changed functions to use size_t
        Changed character length functions to return uint
        unsigned char -> uchar
      strings/ctype-gb2312.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-gbk.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-latin1.c:
        Changed functions to use size_t
        Changed character length functions to return uint
        unsigned char -> uchar
      strings/ctype-mb.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-simple.c:
        Changed functions to use size_t
        Simpler loops for caseup/casedown
        unsigned int -> uint
        unsigned char -> uchar
      strings/ctype-sjis.c:
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-tis620.c:
        Changed functions to use size_t
        Changed character length functions to return uint
        unsigned char -> uchar
      strings/ctype-uca.c:
        Changed functions to use size_t
        unsigned char -> uchar
      strings/ctype-ucs2.c:
        Moved inclusion of stdarg.h to other includes
        usigned char -> uchar
        Changed functions to use size_t
        Changed character length functions to return uint
      strings/ctype-ujis.c:
        Changed functions to use size_t
        Changed character length functions to return uint
        unsigned char -> uchar
      strings/ctype-utf8.c:
        Changed functions to use size_t
        unsigned char -> uchar
        Indentation fixes
      strings/ctype-win1250ch.c:
        Indentation fixes
        Changed functions to use size_t
      strings/ctype.c:
        Changed functions to use size_t
      strings/decimal.c:
        Changed type for memory argument to uchar *
      strings/do_ctype.c:
        Indentation fixes
      strings/my_strtoll10.c:
        unsigned char -> uchar
      strings/my_vsnprintf.c:
        Changed functions to use size_t
      strings/r_strinstr.c:
        Removed some old types
        Changed functions to use size_t
      strings/str_test.c:
        Removed some old types
      strings/strappend.c:
        Changed functions to use size_t
      strings/strcont.c:
        Removed some old types
      strings/strfill.c:
        Removed some old types
      strings/strinstr.c:
        Changed functions to use size_t
      strings/strlen.c:
        Changed functions to use size_t
      strings/strmake.c:
        Changed functions to use size_t
      strings/strnlen.c:
        Changed functions to use size_t
      strings/strnmov.c:
        Changed functions to use size_t
      strings/strto.c:
        unsigned char -> uchar
      strings/strtod.c:
        Changed functions to use size_t
      strings/strxnmov.c:
        Changed functions to use size_t
      strings/xml.c:
        Changed functions to use size_t
        Indentation fixes
      tests/mysql_client_test.c:
        Removed some old types
      tests/thread_test.c:
        Removed some old types
      vio/test-ssl.c:
        Removed some old types
      vio/test-sslclient.c:
        Removed some old types
      vio/test-sslserver.c:
        Removed some old types
      vio/vio.c:
        Removed some old types
      vio/vio_priv.h:
        Removed some old types
        Changed vio_read()/vio_write() to work with size_t
      vio/viosocket.c:
        Changed vio_read()/vio_write() to work with size_t
        Indentation fixes
      vio/viossl.c:
        Changed vio_read()/vio_write() to work with size_t
        Indentation fixes
      vio/viosslfactories.c:
        Removed some old types
      vio/viotest-ssl.c:
        Removed some old types
      win/README:
        More explanations
      f252f924
  24. 01 May, 2007 1 commit
  25. 30 Apr, 2007 1 commit
    • unknown's avatar
      compilation/test fixes · 84c0830b
      unknown authored
      include/my_global.h:
        only use compile_time_assert on gcc
      mysql-test/mysql-test-run.pl:
        better --datadir for mysqld --help
      sql/mysql_priv.h:
        error-prone but concatenation-friendly IF_NETWARE()
      storage/innobase/handler/ha_innodb.cc:
        no preprocessor directives inside macro arguments
      84c0830b
  26. 29 Apr, 2007 1 commit
  27. 19 Apr, 2007 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss1404 snapshot · 619c11cb
      unknown authored
      Fixes:
      
      - Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
        Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
        this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
      - Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
      - Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
        Report the current value of the AUTO_INCREMENT counter to MySQL.
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      storage/innobase/handler/ha_innodb.cc:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      storage/innobase/handler/ha_innodb.h:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1404:
        Report the current value of the AUTO_INCREMENT counter to MySQL.
        (Bug #23313, Bug #21404)
        
        ha_innobase::update_create_info(): New function, to report
        the auto_increment_value.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1395:
        * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
        to set this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
        
        * Add support for skipping the OS caching on Solaris by calling directio()
        instead of fcntl().
        
        Approved by:	Heikki
        
        
        
        Revision r1391:
        Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
        into a generic function which is called from both os_file_handle_error() and
        os_file_handle_error_no_exit()
        
        Approved by:	Marko
      storage/innobase/plug.in:
        Applied innodb-5.1-ss1404 snapshot
        
        Revision r1395:
        * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
        to set this flag immediately after open(2)ing. This way an error caused by
        O_DIRECT not being supported can easily be ignored.
        
        * Add support for skipping the OS caching on Solaris by calling directio()
        instead of fcntl().
        
        Approved by:	Heikki
      619c11cb
  28. 16 Apr, 2007 1 commit
    • unknown's avatar
      wl#2936 post-merge fixes · dcef028f
      unknown authored
      client/mysqltest.c:
        warnings
      extra/comp_err.c:
        warnings
      sql/event_queue.cc:
        warnings
      sql/handler.h:
        warnings
      sql/opt_range.cc:
        warnings
      sql/opt_range.h:
        warnings
      sql/rpl_mi.cc:
        warnings
      sql/sql_class.cc:
        wl#2936 post-merge fixes, warnings
      dcef028f
  29. 15 Apr, 2007 1 commit
    • unknown's avatar
      more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone), · add37876
      unknown authored
      fixed an assert crash
      
      
      include/mysql/plugin.h:
        more wl#2936 fixes: no implicit ha_thd() calls
      mysql-test/mysql-test-run.pl:
        don't load system-wide plugins
      mysql-test/r/partition_innodb.result:
        fix the test
      mysql-test/t/partition_innodb.test:
        fix the test
      sql/handler.cc:
        more wl#2936 fixes: no implicit ha_thd() calls
      sql/handler.h:
        more wl#2936 fixes: no implicit ha_thd() calls
      sql/sql_class.cc:
        more wl#2936 fixes: no implicit ha_thd() calls
      sql/sql_plugin.cc:
        more wl#2936 fixes: assert crash
      storage/innobase/handler/ha_innodb.cc:
        more wl#2936 fixes: no implicit ha_thd() calls
      add37876
  30. 13 Apr, 2007 1 commit
    • unknown's avatar
      wl#2936 - fixing problems · bf2aaad9
      unknown authored
      include/mysql/plugin.h:
        warning. no int/realsize
      mysys/my_getopt.c:
        combination of prefixes (e.g. --loose-skip-) didn't work
      sql/event_queue.cc:
        warning
      sql/handler.cc:
        assert
      sql/handler.h:
        comment
      sql/item_create.cc:
        warnings
      sql/log.cc:
        warnings
      sql/mysqld.cc:
        wl#2936 - fixing problems (memory leak in load_defaults,
        garbage in opt_[slow_]logname
      sql/partition_element.h:
        warnings
      sql/rpl_utility.h:
        warnings
      sql/set_var.cc:
        comment
      sql/set_var.h:
        warnings
      sql/sql_class.cc:
        warnings
      sql/sql_parse.cc:
        warnings
      sql/sql_plugin.cc:
        wl#2936 - fixing problems: portability, coding style,
        reporting of spurious errors, crashes, incorrect help output
      storage/example/ha_example.cc:
        comment
      storage/innobase/handler/ha_innodb.cc:
        wl#2936 - fixing problems (crash)
      bf2aaad9
  31. 03 Apr, 2007 1 commit
    • unknown's avatar
      Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte · fe074a72
      unknown authored
      client/mysqldump.c:
        fixed typo
      include/mysql_com.h:
        added new constants SYSTEM_CHARSET_MBMAXLEN, NAME_CHAR_LEN, USERNAME_CHAR_LENGTH
        increased NAME_LEN, USERNAME_LENGTH
      mysql-test/r/create.result:
        result fix
      mysql-test/r/grant.result:
        result fix
      mysql-test/r/mysql.result:
        result fix
      mysql-test/r/sp.result:
        result fix
      mysql-test/t/create.test:
        test case
      mysql-test/t/grant.test:
        test case
      sql/events.cc:
        NAME_LEN is replaced with NAME_CHAR_LEN
      sql/item_strfunc.h:
        fixed calculation of max_length
      sql/mysql_priv.h:
        check_string_length function is replaced with check_string_byte_length
        added new function check_string_char_length
      sql/sp.cc:
        NAME_LEN is replaced with NAME_CHAR_LEN
      sql/sp_head.cc:
        NAME_LEN is replaced with NAME_CHAR_LEN
      sql/sp_head.h:
        changed parameter of 'check_routine_name' function
      sql/sql_class.cc:
        NAME_LEN is replaced with NAME_CHAR_LEN
      sql/share/errmsg.txt:
        increased argument lengths according to new constants
      sql/sql_parse.cc:
        removed unnecessary checks
        added function 'check_string_char_length'
      sql/sql_plugin.cc:
        check that name is not longer than NAME_CHAR_LEN symbols
      sql/sql_show.cc:
        NAME_LEN is replaced with NAME_CHAR_LEN
      sql/sql_table.cc:
        check that key name is not longer than NAME_LEN symbols
      sql/sql_udf.cc:
        check that udf name is not longer than NAME_CHAR_LEN symbols
      sql/sql_yacc.yy:
        check that user name is not longer than USERNAME_CHAR_LENGTH symbols
      sql/table.cc:
        check that db or table or column name is not longer than NAME_LEN symbols
      storage/innobase/handler/ha_innodb.cc:
        removed unnecessary multiplication
      tests/mysql_client_test.c:
        NAME_LEN is replaced with NAME_CHAR_LEN
      fe074a72
  32. 29 Mar, 2007 2 commits
    • unknown's avatar
      Applied innodb-5.1-ss1381 snapshot · f3009f3f
      unknown authored
      Bug #27381: InnoDB exits when attempting to rename table to non-existant database
        Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
        os_file_handle_error().
      
      
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1373:
        Port r1372 from branches/5.0: Merge a change from MySQL AB, and remove
        the innodb_gis test case.
        
        ChangeSet
          2007/02/19 13:57:06+03:00 kaa@polly.local
          Bug#18743: Several test cases fails if "classic" configuration in 5.0
          The problem happened because those tests were using "cp932" and "ucs2"
          without checking whether these character sets are available.
          This fix moves test parts to make character set specific parts be
          tested only if they are:
          - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
          - some parts were moved to the newly added tests "innodb-ucs2.test",
          "mysqlbinglog-cp932.test" and "sp-ucs2.test"
        
        mysql-test/t/innodb.test
          2007/02/19 13:57:02+03:00 kaa@polly.local +0 -222
          Moved ucs2-specific test cases to innodb-ucs2.test
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1353:
        Makefile.am: EXTRA_DIST: Add the grammar source files to the
        source distribution of MySQL.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1350:
        Lock the data dictionary during rollback.  This removes the rare
        debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
        dict_table_get_on_id() after the rollback following crash recovery.
      storage/innobase/handler/ha_innodb.cc:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1377:
        Add static qualifiers to some symbols in ha_innodb.cc that are not
        referenced from other modules.
        
        
        Revision r1380:
        Remove ha_innobase::last_query_id and references to thd->query_id.
        
        MySQL calls external_lock at the beginning and end of a statement
        when it is not calling start_stmt or commit or rollback.  Thus,
        statement boundaries can be (and are already) detected without
        monitoring thd->query_id.
        
        The function innobase_commit() seemingly lacks the call to
        innobase_release_stat_resources(), which should be called at
        the end of every SQL statement.  The call was replaced by
        equivalent statements by Vadim Tkachenko when he implemented
        innodb_commit_concurrency in MySQL 5.0:
        
        http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
        
        
        Revision r1355:
        class ha_innobase: Replace statistic_increment() with ha_statistic_increment().
        
        ha_innobase::change_active_index(): Do not call current_thd unless
        UNIV_DEBUG is defined.
        
        
        Revision r1369:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
        Bug #26598: Create variable to allow turning off of statistic gathering
        on metadata commands
        
        Add innodb_stats_on_metadata option, which enables gathering
        index statistics when processing metadata commands such as
        SHOW TABLE STATUS.  Default behavior of the server does not
        change (this option is enabled by default).
        
        
        Revision r1342:
        Minor cleanup in ha_innodb.cc.
        
        Remove the unused constants HA_INNOBASE_ROWS_IN_TABLE and
        HA_INNOBASE_RANGE_COUNT.  Declare innobase_active_counter static.
        
        
        Revision r1381:
        innobase_commit(): Correct the comments and formatting that were broken when
        innodb_commit_concurrency was implemented.
        
        
        Revision r1360:
        Minor cleanup.
        
        innobase_query_caching_of_table_permitted(): Make static.
        
        ha_innobase::register_query_cache_table(): Move the function
        definition from ha_innodb.h to ha_innodb.cc.  Add comments.
      storage/innobase/handler/ha_innodb.h:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1377:
        Add static qualifiers to some symbols in ha_innodb.cc that are not
        referenced from other modules.
        
        
        Revision r1380:
        Remove ha_innobase::last_query_id and references to thd->query_id.
        
        MySQL calls external_lock at the beginning and end of a statement
        when it is not calling start_stmt or commit or rollback.  Thus,
        statement boundaries can be (and are already) detected without
        monitoring thd->query_id.
        
        The function innobase_commit() seemingly lacks the call to
        innobase_release_stat_resources(), which should be called at
        the end of every SQL statement.  The call was replaced by
        equivalent statements by Vadim Tkachenko when he implemented
        innodb_commit_concurrency in MySQL 5.0:
        
        http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
        
        
        Revision r1369:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
        Bug #26598: Create variable to allow turning off of statistic gathering
        on metadata commands
        
        Add innodb_stats_on_metadata option, which enables gathering
        index statistics when processing metadata commands such as
        SHOW TABLE STATUS.  Default behavior of the server does not
        change (this option is enabled by default).
        
        
        Revision r1360:
        Minor cleanup.
        
        innobase_query_caching_of_table_permitted(): Make static.
        
        ha_innobase::register_query_cache_table(): Move the function
        definition from ha_innodb.h to ha_innodb.cc.  Add comments.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1344:
        Rename the Boolean field trx->type to trx->is_purge
        and remove the constants TRX_USER and TRX_PURGE.
        
        
        Revision r1343:
        trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
        and never tested.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1352:
        Fix typo in comment in os/os0file.c
        
        Approved by:	heikki
        
        
        
        Revision r1366:
        Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
        os_file_handle_error().
        
        Approved by:	Heikki
      storage/innobase/row/row0undo.c:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1350:
        Lock the data dictionary during rollback.  This removes the rare
        debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
        dict_table_get_on_id() after the rollback following crash recovery.
      storage/innobase/trx/trx0purge.c:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1344:
        Rename the Boolean field trx->type to trx->is_purge
        and remove the constants TRX_USER and TRX_PURGE.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss1381 snapshot
        
        Revision r1344:
        Rename the Boolean field trx->type to trx->is_purge
        and remove the constants TRX_USER and TRX_PURGE.
        
        
        Revision r1343:
        trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
        and never tested.
      f3009f3f
    • unknown's avatar
      WL#2936 · 212ba963
      unknown authored
        "Plugin Server Variables"
        Post review cleanups.
      
      
      include/mysql/plugin.h:
        WL2936
          post review clean up
          fix macros to ensure correct type declarations
      sql/ha_partition.cc:
        WL2936
          post review clean up
          add in missing my_afree()
      sql/handler.cc:
        WL2936
          post review clean up
          remove stray semicolon
      sql/sql_plugin.cc:
        WL2936
          post review clean up
          fixup comments and debug code
      storage/innobase/handler/ha_innodb.cc:
        WL2936
          Include some of Marko Mäkelä's patches
      storage/innobase/handler/ha_innodb.h:
        WL2936
          Include some of Marko Mäkelä's patches
      212ba963
  33. 22 Mar, 2007 1 commit
    • unknown's avatar
      Apply the following InnoDB snapshots: · 76de7d78
      unknown authored
      innodb-5.1-ss1318
      innodb-5.1-ss1330
      innodb-5.1-ss1332
      innodb-5.1-ss1340
      
      Fixes:
      - Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
        At low transaction isolation levels we let each consistent read set
        its own snapshot.
      
      - Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
        On Windows ut_usectime returns secs and usecs relative to the UNIX
        epoch (which is Jan, 1 1970).
      
      - Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.
      
      - Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.
      
      - Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
        The bug could be reproduced as follows:
      
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
      
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
      
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      
      
      mysql-test/r/innodb.result:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug 22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      mysql-test/t/innodb.test:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug 22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1283:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/22 18:42:52+02:00 monty@mysql.com 
          Give warnings for unused objects
          Changed error message to be compatible with old error file
          Added new error message for new DUP_ENTRY syntax
        
        mysql-test/t/innodb.test
          2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
          Changed to use new error message
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1329:
        Merge changes from MySQL AB to mysql-test directives.
        The results are not affected.
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      storage/innobase/buf/buf0buf.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/buf/buf0flu.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/buf/buf0lru.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/dict/dict0boot.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/dict/dict0crea.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/dict/dict0dict.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1316:
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.  (Bug #25927)
        
        dict_foreign_find_index(): Add paramettter check_null.
        
        dict_foreign_add_to_cache(): Do not allow ON DELETE SET NULL
        or ON UPDATE SET NULL if any of the referencing columns are declared NOT NULL.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/dict/dict0load.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug 24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug 20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/fil/fil0fil.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/fsp/fsp0fsp.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/ha/ha0ha.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/handler/ha_innodb.cc:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1204:
        Change this in ha_innobase:
        
         void*           innobase_prebuilt;
        
        to this:
        
         row_prebuilt_t* prebuilt;
        
        by introducing the typedef in ha_innodb.h, and remove all the now needless
        local variables and casts in ha_innodb.cc.
        
        Revision r1298:
        ha_innodb.cc: Remove all references to thd->ha_data[hton->slot].
        
        thd_to_trx(thd, hton): Accessor for getting the InnoDB trx object
        of a MySQL thread object and an InnoDB handlerton.
        
        
        Revision r1292:
        Remove the declarations of some global functions in ha_innodb.h and declare
        them static in ha_innodb.cc.  These functions are invoked via function
        pointers in handlerton.
        
        
        Revision r1300:
        ha_innodb.cc: Replace thd->tablespace_op with thd_tablespace_op(thd).
        Plugins must treat class THD as an opaque type.
        
        
        Revision r1198:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
          Many files:
            Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
            Adjusted year(s) in copyright header 
            Added GPL copyright text
        
        
        Revision r1271:
        Merge changes from MySQL AB:
        
        Rename some FIELD_TYPE_ constants to MYSQL_TYPE_.
        
        Change the scope of a type cast of two dividends.
        
        
        Revision r1299:
        ha_innodb.cc: Replace thd->in_lock_tables with thd_in_lock_tables(thd).
        Plugins must treat class THD as an opaque type.
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
        
        Revision r1322:
        ha_innodb.cc: Remove the unused innobase_repl_ variables.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
        
        
        Revision r1334:
        Fix for Bug# 21409. At low transaction isolation levels we let each 
        consistent read set its own snapshot
      storage/innobase/handler/ha_innodb.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1204:
        Change this in ha_innobase:
        
         void*           innobase_prebuilt;
        
        to this:
        
         row_prebuilt_t* prebuilt;
        
        by introducing the typedef in ha_innodb.h, and remove all the now needless
        local variables and casts in ha_innodb.cc.
        
        Revision r1292:
        Remove the declarations of some global functions in ha_innodb.h and declare
        them static in ha_innodb.cc.  These functions are invoked via function
        pointers in handlerton.
        
        
        Revision r1198:
        Merge a change from MySQL AB:
        
        ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
          Many files:
            Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
            Adjusted year(s) in copyright header 
            Added GPL copyright text
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
      storage/innobase/ibuf/ibuf0ibuf.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/buf0buf.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/buf0flu.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/dict0dict.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/ha0ha.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/lock0lock.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/log0log.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/mem0mem.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1241:
        Remove the unused function mem_strdupq().
      storage/innobase/include/mem0mem.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1241:
        Remove the unused function mem_strdupq().
      storage/innobase/include/rem0rec.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1338:
        rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
      storage/innobase/include/sync0rw.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/sync0sync.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/include/sync0sync.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1294:
        Fixed inline asm code, it didn't work with GCC > ver 3.x.
        
        
        Revision r1244:
        Add ut_ad() debug assertions.
        
        UT_LIST_ADD_FIRST(), UT_LIST_ADD_LAST(), UT_LIST_INSERT_AFTER():
        Assert against some trivial cases of cyclic lists.
        
        mutex_enter_func(): Assert that the current thread is not holding the mutex.
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/trx0sys.ic:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/include/univ.i:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1285:
        Merge a change from MySQL AB:
        
        ChangeSet
          2006/10/26 15:41:47-04:00 iggy@amd64. 
          Post Merge Cleanup
        
        storage/innobase/include/univ.i
          2006/10/26 15:38:50-04:00 iggy@amd64. +9 -0
          Post Merge Cleanup
      storage/innobase/include/ut0lst.h:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1244:
        Add ut_ad() debug assertions.
        
        UT_LIST_ADD_FIRST(), UT_LIST_ADD_LAST(), UT_LIST_INSERT_AFTER():
        Assert against some trivial cases of cyclic lists.
        
        mutex_enter_func(): Assert that the current thread is not holding the mutex.
      storage/innobase/lock/lock0lock.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1330:
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.  (Bug #25494)
        
        
        Revision r1332:
        lock_deadlock_recursive(): When aborting the search, display a note
        regardless of start->undo_no.  Otherwise, aborted searches may show
        up as genuine deadlocks.  This mistake was made in r1330.
      storage/innobase/log/log0log.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/log/log0recv.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/mem/mem0pool.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/pars/pars0pars.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/que/que0que.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/read/read0read.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/row/row0mysql.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1201:
        Apply patch from MySQL:
        
         ChangeSet@1.2353, 2006-12-19 16:57:51-07:00, tsmith@siva.hindu.god +13 -0
           Added innodb_rollback_on_timeout option to restore the 4.1 
           InnoDB timeout behavior (Bug 24200)
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/row/row0vers.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/srv/srv0que.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/srv/srv0srv.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1262:
        Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
        
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/sync/sync0rw.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/sync/sync0sync.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1247:
        Rename mutex_enter_nowait to mutex_enter_nowait_func and add macro
        mutex_enter_nowait that supplies the default __FILE__ and __LINE__
        arguments. Adjust callers.
      storage/innobase/thr/thr0loc.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0purge.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0roll.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0rseg.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0sys.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/trx/trx0trx.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
        
        
        Revision r1324:
        Merge changes from MySQL AB:
        
        ChangeSet@1.2452, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
          Fixed compiler warnings
          ...
          Fixed compiler warnings detected on windows64
      storage/innobase/trx/trx0undo.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/usr/usr0sess.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1242:
        Merge r1239 from
        branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.
      storage/innobase/ut/ut0ut.c:
        Apply the following InnoDB snapshots:
        innodb-5.1-ss1318
        innodb-5.1-ss1330
        innodb-5.1-ss1332
        innodb-5.1-ss1340
        
        Revision r1262:
        Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      76de7d78
  34. 16 Mar, 2007 1 commit
    • unknown's avatar
      wl#3700 - post-review fixes: · 7d383909
      unknown authored
      s/ulonglong/key_part_map/, comments
      
      
      include/heap.h:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      include/my_base.h:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      include/myisam.h:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      include/myisammrg.h:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      sql/event_db_repository.cc:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      sql/ha_partition.cc:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      sql/ha_partition.h:
        wl#3700 - post-review fixes:
        s/ulonglong/key_part_map/
      sql/sql_select.h:
        wl#3700 - post-review fixes:
        remove tab_to_keypart_map()
      7d383909