An error occurred fetching the project authors.
  1. 04 Jun, 2007 1 commit
    • unknown's avatar
      Bug #27716 multi-update did partially and has not binlogged · be99c5d3
      unknown authored
      manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.
      
      
      mysql-test/r/innodb.result:
        results changed because of some more queries are added
      mysql-test/r/multi_update.result:
        results changed
      mysql-test/r/rpl_row_basic_11bugs.result:
        results changed
      mysql-test/t/innodb.test:
        error code is diff in 5.0
      mysql-test/t/multi_update.test:
        making explicit comments and forcing execution in mixed (stmt) mode.
      mysql-test/t/rpl_row_basic_11bugs.test:
        checking how binlogging works when a query on non-ta table completed partly.
      sql/sql_update.cc:
        manual merge after authomatic one failed (semantic drift)
      be99c5d3
  2. 01 Jun, 2007 1 commit
    • unknown's avatar
      Bug #27716 multi-update did partially and has not binlogged · 6b94fc57
      unknown authored
      Implementation of mysql_multi_update did not call multi_update::send_error method in some cases 
      (see the test reported on bug page and test cases in changeset).
      
      Fixed with deploying the method, ::send_error() is refined to get binlogging code which works whenever 
      there is modified non-transactional table.
      thd->no_trans_update.stmt flag is set in to TRUE to ease testing though being the beginning of relative 
      bug#27417 fix (addresses a part of those issues).
      Eliminating two minor issues (small bugs) in multi_update methods.
      This patch for multi-update also addresses a part of the issues reported in bug#13270,bug#23333.
      
      
      mysql-test/r/innodb.result:
        result changed
      mysql-test/r/multi_update.result:
        results changed
      mysql-test/t/innodb.test:
        regression test for the bug combining transactional and non-transaction tables
      mysql-test/t/multi_update.test:
        regression tests added - erred query must be binlogged
      sql/sql_update.cc:
        making a call to multi_update::send_error when mysql_select return an error;
        deploying binlogging inside of ::send_error;
        refining multi_update::send_eof() to mark binlogging work done when its call to ::do_updates() errs
        and the query is binlogged with the error. ::send_error() will be called after all but
        do not do anything;
        thd->no_trans_update.stmt is corrected to be set to TRUE according to the existed code pattern. 
        Although this part relates to another bugs (bug#27417 etc) it is needed here for testing;
        Eliminating a separate issue in multi_update::do_updates where                
        either one of the class members trans_safe, transactional_tables was          
        set after the per-table loop whereas both should be calculated during         
        looping. 
        Eliminating a separate issue in ::send_eof() where thd->no_trans_update.all won't be set TRUE when
        amoung others there'd be at least one modified transactional table.
        Binlogging is done to satisfy to general character bug#13270,bug#23333 so that those won't have
        fixes specific for multi-update.
      6b94fc57
  3. 19 Apr, 2007 2 commits
    • 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
    • unknown's avatar
      Apply innodb-5.0-ss1405 snapshot · 726d27ee
      unknown authored
      NULL MERGE: this ChangeSet will be null merged into mysql-5.1
      
      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.
      
      
      innobase/configure.in:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1396:
        branches/5.0: Merge r1395 from trunk:
        
        * 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().
      innobase/os/os0file.c:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1394:
        branches/5.0: Merge r1391 from trunk:
        
        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()
        
        
        Revision r1396:
        branches/5.0: Merge r1395 from trunk:
        
        * 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().
      mysql-test/r/innodb.result:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        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:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        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.
      sql/ha_innodb.cc:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        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.
      sql/ha_innodb.h:
        Apply innodb-5.0-ss1405 snapshot
        
        Revision r1405:
        branches/5.0: Merge r1404 from trunk:
        
        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.
      726d27ee
  4. 29 Mar, 2007 1 commit
    • 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
  5. 22 Mar, 2007 2 commits
    • 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
    • unknown's avatar
      NULL MERGE this to 5.1 · 805c2d52
      unknown authored
      Apply the following InnoDB snapshots:
      innodb-5.0-ss1319
      innodb-5.0-ss1331
      innodb-5.0-ss1333
      innodb-5.0-ss1341
      
      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.
      
      
      innobase/dict/dict0dict.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1317:
        branches/5.0: Port r1316 from trunk:
        
        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.
      innobase/include/rem0rec.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1339:
        branches/5.0: Merge r1338 from trunk:
        
        rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
      innobase/include/sync0sync.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1293:
        branches/5.0: Fixed inline asm code, it didn't work with GCC > ver 3.x.
      innobase/lock/lock0lock.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1331:
        branches/5.0: Merge r1330 from trunk:
        
        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 r1333:
        branches/5.0: Merge r1332 from trunk:
        
        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.
      innobase/srv/srv0srv.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      innobase/ut/ut0ut.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      mysql-test/r/innodb.result:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        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.
        
        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:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        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.
        
        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.
      sql/ha_innodb.cc:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1280:
        branches/5.0: Merge a change from MySQL AB:
        
        ChangeSet
          2006/11/30 18:25:05+02:00 monty@mysql.com 
          Fixed portability issue in my_thr_init.c (was added in my last push)
          
          Fixed compiler warnings (detected by VC++):
          - Removed not used variables
          - Added casts
          - Fixed wrong assignments to bool
          - Fixed wrong calls with bool arguments
          - Added missing argument to store(longlong), which caused wrong store
          method to be called.
        
        sql/ha_innodb.cc
          2006/11/30 18:24:53+02:00 monty@mysql.com +0 -1
          Removed not used variable
        
        
        Revision r1260:
        branches/5.0: Fix for Bug# 21409. At low transaction isolation levels
        we let each consistent read set its own snapshot.
        
        
        Revision r1326:
        branches/5.0: Merge code from MySQL AB:
        
        ChangeSet@1.2417.3.1  2007-02-22 16:59:57+02:00  monty@mysql.fi
        
        Fixed compiler warnings (for linux and win32 and win64)
      805c2d52
  6. 19 Feb, 2007 1 commit
    • unknown's avatar
      Bug#18743: Several test cases fails if "classic" configuration in 5.0 · db36a2aa
      unknown authored
      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/r/ctype_cp932.result:
        Moved cp932-specific test case from mysql.test
      mysql-test/r/innodb.result:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/r/mysql.result:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/r/mysqlbinlog.result:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/r/sp.result:
        Moved ucs2-specific test case to sp-ucs2.test
      mysql-test/t/ctype_cp932.test:
        Moved cp932-specific test case from mysql.test
      mysql-test/t/ctype_ucs2_def-master.opt:
        Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server
      mysql-test/t/ctype_ucs2_def.test:
        Added requirement for ucs2 in the server
      mysql-test/t/innodb.test:
        Moved ucs2-specific test cases to innodb-ucs2.test
      mysql-test/t/mysql.test:
        Move cp932-specific test cases to ctype_cp932.test
      mysql-test/t/mysqlbinlog.test:
        Moved cp932-specific test case to mysqlbinlog-cp932.test
      mysql-test/t/sp.test:
        Moved ucs2-specific test case to sp-ucs2.test
      sql/mysqld.cc:
        Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
        mysqld --default-character-set=ucs2,latin1
        The first available character set will be chosen.
      mysql-test/r/innodb-ucs2.result:
        New BitKeeper file ``mysql-test/r/innodb-ucs2.result''
      mysql-test/r/mysqlbinlog-cp932.result:
        New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''
      mysql-test/r/sp-ucs2.result:
        New BitKeeper file ``mysql-test/r/sp-ucs2.result''
      mysql-test/t/innodb-ucs2.test:
        New BitKeeper file ``mysql-test/t/innodb-ucs2.test''
      mysql-test/t/mysqlbinlog-cp932.test:
        New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''
      mysql-test/t/sp-ucs2.test:
        New BitKeeper file ``mysql-test/t/sp-ucs2.test''
      db36a2aa
  7. 24 Jan, 2007 1 commit
    • unknown's avatar
      bug #22682 Test fails --without-geometry · f469aa00
      unknown authored
      geometry dependent parts moved to proper .test files
      
      
      mysql-test/r/gis.result:
        result fixed
      mysql-test/r/innodb.result:
        result fixed
      mysql-test/r/innodb_gis.result:
        result fixed
      mysql-test/r/view.result:
        result fixed
      mysql-test/t/gis.test:
        HAVE_GEOMETRY dependent part moved here from view.test
      mysql-test/t/innodb.test:
        HAVE_GEOMETRY dependent part moved to innodb_gis.test
      BitKeeper/etc/ignore:
        Added libmysqld/sql_servers.cc to the ignore list
      mysql-test/t/innodb_gis.test:
        HAVE_GEOMETRY dependent part moved here from innodb.test
      mysql-test/t/view.test:
        HAVE_GEOMETRY dependent part moved to gis.test
      f469aa00
  8. 22 Jan, 2007 2 commits
    • unknown's avatar
      Give warnings for unused objects · b4f80eed
      unknown authored
      Changed error message to be compatible with old error file
      Added new error message for new DUP_ENTRY syntax
      
      
      BUILD/SETUP.sh:
        Give warnings for unused objects
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Changed to use new error message
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_auto_increment.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_foreign_key.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_insert_id.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
        Changed to use new error message
      mysql-test/extra/rpl_tests/rpl_trig004.test:
        Changed to use new error message
      mysql-test/include/mix1.inc:
        Changed to use new error message
      mysql-test/include/mix2.inc:
        Changed to use new error message
      mysql-test/include/ps_modify.inc:
        Changed to use new error message
      mysql-test/include/query_cache.inc:
        Changed to use new error message
      mysql-test/include/varchar.inc:
        Changed to use new error message
      mysql-test/r/create.result:
        Changed to use new error message
      mysql-test/r/rpl_sp.result:
        Changed to use new error message
      mysql-test/r/sp.result:
        Changed to use new error message
      mysql-test/r/view.result:
        Changed to use new error message
      mysql-test/t/auto_increment.test:
        Changed to use new error message
      mysql-test/t/create.test:
        Changed to use new error message
      mysql-test/t/create_select_tmp.test:
        Changed to use new error message
      mysql-test/t/ctype_utf8.test:
        Changed to use new error message
      mysql-test/t/delayed.test:
        Changed to use new error message
      mysql-test/t/heap.test:
        Changed to use new error message
      mysql-test/t/heap_btree.test:
        Changed to use new error message
      mysql-test/t/heap_hash.test:
        Changed to use new error message
      mysql-test/t/innodb.test:
        Changed to use new error message
      mysql-test/t/insert_select.test:
        Changed to use new error message
      mysql-test/t/insert_update.test:
        Changed to use new error message
      mysql-test/t/join_outer.test:
        Changed to use new error message
      mysql-test/t/key.test:
        Changed to use new error message
      mysql-test/t/merge.test:
        Changed to use new error message
      mysql-test/t/myisam.test:
        Changed to use new error message
      mysql-test/t/ndb_charset.test:
        Changed to use new error message
      mysql-test/t/ndb_index_unique.test:
        Changed to use new error message
      mysql-test/t/ndb_insert.test:
        Changed to use new error message
      mysql-test/t/ndb_replace.test:
        Changed to use new error message
      mysql-test/t/ndb_update.test:
        Changed to use new error message
      mysql-test/t/replace.test:
        Changed to use new error message
      mysql-test/t/rpl_err_ignoredtable.test:
        Changed to use new error message
      mysql-test/t/rpl_row_create_table.test:
        Changed to use new error message
      mysql-test/t/rpl_skip_error-slave.opt:
        Changed to use new error message
      mysql-test/t/rpl_sp.test:
        Changed to use new error message
      mysql-test/t/show_check.test:
        Changed to use new error message
      mysql-test/t/sp-error.test:
        Changed to use new error message
      mysql-test/t/sp.test:
        Changed to use new error message
      mysql-test/t/sp_trans.test:
        Changed to use new error message
      mysql-test/t/temp_table.test:
        Changed to use new error message
      mysql-test/t/type_binary.test:
        Changed to use new error message
      mysql-test/t/type_bit.test:
        Changed to use new error message
      mysql-test/t/type_bit_innodb.test:
        Changed to use new error message
      mysql-test/t/type_blob.test:
        Changed to use new error message
      mysql-test/t/type_varchar.test:
        Changed to use new error message
      mysql-test/t/view.test:
        Changed to use new error message
      sql/handler.cc:
        ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
      sql/share/errmsg.txt:
        Changed error message to be compatible with old error file
        Added new error message for new DUP_ENTRY syntax
      sql/sql_table.cc:
        ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
      sql-bench/example:
        Example file for how to run tests
      b4f80eed
    • unknown's avatar
      Applied innodb-5.1-ss1186 · 8ca71550
      unknown authored
      Fixes bugs:
      - Bug #20877: InnoDB data dictionary memory footprint is too big
      - Bug #24741: existing cascade clauses disappear when adding foreign keys
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss1186
        
        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.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss1186
        
        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.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss1186
        
        Revision r1168:
        buf_flush_batch(): Remove the test page_count != ULINT_UNDEFINED.
        The variable is initialized to zero, and after that it is only added to.
        Maybe the one who introduced the variable srv_buf_pool_flushed overlooked
        that there is a separate return statement for returning ULINT_UNDEFINED?
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss1186
        
        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.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss1186
        
        Revision r1165:
        ut_2_power_up(): Add __attribute__((const)), because otherwise this function
        is repeatedly called in buf_flush_free_margin() due to the definitions
        of BUF_READ_AHEAD_AREA and other macros starting with BUF_READ_AHEAD_.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss1186
        
        Revision r1158:
        Modify que_fork_start_command() to do only one pass over the thread list
        instead of three.
      8ca71550
  9. 28 Dec, 2006 1 commit
  10. 20 Nov, 2006 1 commit
    • unknown's avatar
      Remove compiler warnings · 14decc4f
      unknown authored
      (Mostly in DBUG_PRINT() and unused arguments)
      Fixed bug in query cache when used with traceing (--with-debug)
      Fixed memory leak in mysqldump
      Removed warnings from mysqltest scripts (replaced -- with #)
      
      
      BitKeeper/etc/ignore:
        added mysql-test/r/*.warnings
      BUILD/SETUP.sh:
        Don't build with BDB as default
      client/client_priv.h:
        Added OPT_DEBUG_INFO
      client/mysqlbinlog.cc:
        Fixed compiler warning
      client/mysqldump.c:
        Removed compiler warnings
        Added option --debug-info to detect memory leaks
        Fixed memory leak
        Don't backup cluster replication tables (if used with 5.1)
      cmd-line-utils/readline/bind.c:
        Fixed compiler warning
      cmd-line-utils/readline/chardefs.h:
        Fixed compiler warning
      cmd-line-utils/readline/complete.c:
        Fixed compiler warning
      cmd-line-utils/readline/display.c:
        Fixed compiler warning
      cmd-line-utils/readline/histexpand.c:
        Fixed compiler warning
      cmd-line-utils/readline/input.c:
        Fixed compiler warning
      cmd-line-utils/readline/isearch.c:
        Fixed compiler warning
      cmd-line-utils/readline/kill.c:
        Fixed compiler warning
      cmd-line-utils/readline/macro.c:
        Fixed compiler warning
      cmd-line-utils/readline/misc.c:
        Fixed compiler warning
      cmd-line-utils/readline/nls.c:
        Fixed compiler warning
      cmd-line-utils/readline/readline.c:
        Fixed compiler warning
      cmd-line-utils/readline/rltty.c:
        Fixed compiler warning
      cmd-line-utils/readline/search.c:
        Fixed compiler warning
      cmd-line-utils/readline/terminal.c:
        Fixed compiler warning
      cmd-line-utils/readline/text.c:
        Fixed compiler warning
      cmd-line-utils/readline/tilde.c:
        Fixed compiler warning
      cmd-line-utils/readline/undo.c:
        Fixed compiler warning
      cmd-line-utils/readline/util.c:
        Fixed compiler warning
      cmd-line-utils/readline/vi_mode.c:
        Fixed compiler warning
      dbug/dbug_analyze.c:
        Fixed compiler warning
      extra/yassl/src/ssl.cpp:
        Fixed compiler warning
      extra/yassl/testsuite/testsuite.cpp:
        Fixed compiler warning
      heap/_check.c:
        Fixed compiler warning
      heap/hp_delete.c:
        Fixed compiler warning
      heap/hp_hash.c:
        Fixed compiler warning
      heap/hp_open.c:
        Fixed compiler warning
      heap/hp_rkey.c:
        Fixed compiler warning
      heap/hp_rrnd.c:
        Fixed compiler warning
      heap/hp_write.c:
        Fixed compiler warning
      libmysql/libmysql.c:
        Fixed compiler warning
      libmysqld/libmysqld.c:
        Fixed compiler warning
      myisam/mi_close.c:
        Fixed compiler warning
      myisam/mi_delete.c:
        Fixed compiler warning
      myisam/mi_dynrec.c:
        Fixed compiler warning
      myisam/mi_keycache.c:
        Fixed compiler warning
      myisam/mi_page.c:
        Fixed compiler warning
      myisam/mi_statrec.c:
        Fixed compiler warning
      myisam/mi_test2.c:
        Fixed compiler warning
      myisam/mi_write.c:
        Fixed compiler warning
      myisam/myisampack.c:
        Fixed compiler warning
      myisammrg/myrg_extra.c:
        Fixed compiler warning
      mysql-test/mysql-test-run.pl:
        Remove .reject, .progress, .log and .warnings flag at start
        cluster -> mysql database (for 5.1)
      mysql-test/include/federated.inc:
        Remove mysqltest warnings
      mysql-test/include/sp-vars.inc:
        Remove mysqltest warnings
      mysql-test/mysql-test-run.sh:
        Fix so that 'make test' works again
        Remove .reject, .progress .log and .warnings files at startup
      mysql-test/r/ctype_cp1250_ch.result:
        Drop used tables at startup
      mysql-test/t/create.test:
        Remove mysqltest warnings
      mysql-test/t/csv.test:
        Remove mysqltest warnings
      mysql-test/t/ctype_collate.test:
        Remove mysqltest warnings
      mysql-test/t/ctype_cp1250_ch.test:
        Drop used tables at startup
      mysql-test/t/ctype_ucs.test:
        Remove mysqltest warnings
      mysql-test/t/func_sapdb.test:
        Remove mysqltest warnings
      mysql-test/t/func_str.test:
        Remove mysqltest warnings
      mysql-test/t/grant.test:
        Remove mysqltest warnings
      mysql-test/t/greedy_optimizer.test:
        Remove mysqltest warnings
      mysql-test/t/group_min_max.test:
        Remove mysqltest warnings
      mysql-test/t/innodb.test:
        Remove mysqltest warnings
      mysql-test/t/join.test:
        Remove mysqltest warnings
      mysql-test/t/limit.test:
        Remove mysqltest warnings
      mysql-test/t/null.test:
        Remove mysqltest warnings
      mysql-test/t/select.test:
        Remove mysqltest warnings
      mysql-test/t/sp-prelocking.test:
        Remove mysqltest warnings
      mysql-test/t/strict.test:
        Remove mysqltest warnings
      mysql-test/t/subselect.test:
        Remove mysqltest warnings
      mysql-test/t/type_newdecimal.test:
        Remove mysqltest warnings
      mysql-test/t/view_grant.test:
        Remove mysqltest warnings
      mysys/default.c:
        Fixed compiler warning
      mysys/hash.c:
        Fixed compiler warning
      mysys/list.c:
        Fixed compiler warning
      mysys/mf_iocache.c:
        Fixed compiler warning
      mysys/mf_keycache.c:
        Fixed compiler warning
      mysys/mf_keycaches.c:
        Fixed compiler warning
      mysys/my_alloc.c:
        Fixed compiler warning
      mysys/my_dup.c:
        Fixed compiler warning
      mysys/my_fopen.c:
        Fixed compiler warning
      mysys/my_fstream.c:
        Fixed compiler warning
      mysys/my_getwd.c:
        Fixed compiler warning
      mysys/my_handler.c:
        Fixed compiler warning
        Added missing enums in switch
      mysys/my_lib.c:
        Fixed compiler warning
      mysys/my_lread.c:
        Fixed compiler warning
      mysys/my_lwrite.c:
        Fixed compiler warning
      mysys/my_malloc.c:
        Fixed compiler warning
      mysys/my_pread.c:
        Fixed compiler warning
      mysys/my_read.c:
        Fixed compiler warning
      mysys/my_realloc.c:
        Fixed compiler warning
      mysys/my_seek.c:
        Fixed compiler warning
      mysys/my_write.c:
        Fixed compiler warning
      mysys/safemalloc.c:
        Fixed compiler warning
      mysys/thr_lock.c:
        Fixed compiler warning
      mysys/tree.c:
        Fixed compiler warning
      mysys/typelib.c:
        Fixed compiler warning
      ndb/include/logger/LogHandler.hpp:
        Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
      ndb/include/ndb_global.h.in:
        Added LINT_SET_PTR macro to be able to remove some compiler warnings
      ndb/include/util/InputStream.hpp:
        Fixed compiler warning
      ndb/include/util/OutputStream.hpp:
        Fixed compiler warning
      ndb/include/util/SimpleProperties.hpp:
        Fixed compiler warning
      ndb/src/common/debugger/EventLogger.cpp:
        remove if on 'signal' as this is a function pointer and is always true
      ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Add missing enums
      ndb/src/common/logger/LogHandler.cpp:
        Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
      ndb/src/common/portlib/NdbMutex.c:
        Fixed compiler warning
      ndb/src/common/portlib/NdbThread.c:
        Fixed compiler warning
      ndb/src/common/transporter/Transporter.cpp:
        Swapped arguments to remove compiler warnings
      ndb/src/cw/cpcd/CPCD.hpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Added missing enums
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Fixed compiler warning
      ndb/src/kernel/error/ErrorReporter.cpp:
        Fixed compiler warning
      ndb/src/kernel/error/ErrorReporter.hpp:
        Fixed compiler warning
      ndb/src/kernel/error/ndbd_exit_codes.c:
        Fixed compiler warning
      ndb/src/kernel/vm/TransporterCallback.cpp:
        Fixed compiler warning
      ndb/src/mgmapi/mgmapi.cpp:
        Fixed compiler warning
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Fixed compiler warning
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Fixed compiler warning
      ndb/src/mgmsrv/Services.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/ClusterMgr.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/DictCache.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndb.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationInt.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbTransaction.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndbif.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndbinit.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Fixed compiler warning
      ndb/tools/drop_index.cpp:
        Fixed compiler warning
      ndb/tools/drop_tab.cpp:
        Fixed compiler warning
      ndb/tools/ndb_config.cpp:
        Fixed compiler warning
      regex/regexec.c:
        Fixed compiler warning
      server-tools/instance-manager/mysql_connection.cc:
        Fixed compiler warning
      sql/Makefile.am:
        Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse
      sql/filesort.cc:
        Fixed compiler warning
      sql/ha_archive.cc:
        Fixed compiler warning
      sql/ha_federated.cc:
        Fixed compiler warning
      sql/ha_federated.h:
        Fixed compiler warning
      sql/ha_innodb.cc:
        Fixed compiler warning
      sql/ha_myisam.cc:
        Fixed compiler warning
      sql/ha_myisammrg.cc:
        Fixed compiler warning
      sql/ha_ndbcluster.cc:
        Fixed compiler warning
      sql/handler.cc:
        Fixed compiler warning
      sql/item_cmpfunc.cc:
        Fixed compiler warning
      sql/item_subselect.cc:
        Fixed compiler warning
      sql/item_timefunc.cc:
        Fixed compiler warning
      sql/log_event.cc:
        Fixed compiler warning
      sql/mysqld.cc:
        Fixed compiler warning
      sql/net_serv.cc:
        Fixed compiler warning
      sql/opt_range.cc:
        Fixed compiler warning
        Formated DBUG statements to be as rest of code
      sql/slave.cc:
        Fixed compiler warning
      sql/sql_acl.cc:
        Fixed compiler warning
      sql/sql_cache.cc:
        Fixed compiler warning
        Fixed bug in query cache when used with DBUG traceing
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_class.h:
        Fixed compiler warning
      sql/sql_delete.cc:
        Fixed compiler warning
      sql/sql_parse.cc:
        Fixed compiler warning
        Hack to fix my_sprintf() strings with %b
      sql/sql_prepare.cc:
        Fixed compiler warning
        Hack to fix my_sprintf() strings with %b
      sql/sql_repl.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Fixed compiler warning
      sql/sql_update.cc:
        Fixed compiler warning
      sql/sql_view.cc:
        Fixed compiler warning
      sql/strfunc.cc:
        Fixed compiler warning
      sql-common/client.c:
        Fixed compiler warning
      sql-common/my_time.c:
        Fixed compiler warning
      sql/table.cc:
        Fixed compiler warning
      sql/tztime.cc:
        Fixed compiler warning
      sql/unireg.cc:
        Fixed compiler warning
      strings/decimal.c:
        Fixed compiler warning
      tests/mysql_client_test.c:
        Fixed compiler warning
      vio/viosocket.c:
        Fixed compiler warning
      vio/viossl.c:
        Fixed compiler warning
      vio/viosslfactories.c:
        Fixed compiler warning
      14decc4f
  11. 13 Nov, 2006 2 commits
    • unknown's avatar
      several fixes to make tests pass in embedded-server mode · ea1f7e4b
      unknown authored
      libmysqld/lib_sql.cc:
        check for bootstrap added
      mysql-test/include/federated.inc:
        disabled in embedded
      mysql-test/mysql-test-run.pl:
        we disable ssh in embedded server
      mysql-test/r/bdb.result:
        part moved to bdb_notembedded as it uses binlog
      mysql-test/r/flush_block_commit.result:
        part moved to flush_block_commit_notembedded
      mysql-test/r/insert.result:
        part moved to insert_notembedded as delayed works differently in embedded server
      mysql-test/r/insert_select.result:
        part moved to insert_notembedded as GRANTS usually disabled in embedded server
      mysql-test/r/join.result:
        access rights hidden in result
      mysql-test/t/backup.test:
        now available in embedded server
      mysql-test/t/bdb.test:
        part moved to bdb_notembedded as it uses binlog
      mysql-test/t/delayed.test:
        code trimmed
      mysql-test/t/execution_constants.test:
        skipped in embedded-server mode
      mysql-test/t/flush_block_commit.test:
        moved to flush_block_commit_notembedded
      mysql-test/t/information_schema_db.test:
        skipped in embedded-server
      mysql-test/t/innodb.test:
        directories replaced to be embedded-server compliant
      mysql-test/t/insert.test:
        part moved to insert_notembedded
      mysql-test/t/insert_select.test:
        part moved to insert_notembedded
      mysql-test/t/join.test:
        access rights hidden
      mysql-test/t/status.test:
        skipped in embedded server
      mysql-test/t/trigger.test:
        directories replaced to be embedded-server compliant
      sql/item_strfunc.cc:
        extra contexts not needed whan access checks disabled
      sql/share/errmsg.txt:
        bigger paths reserved to prevent test's fails
      mysql-test/r/bdb_notembedded.result:
        ***MISSING WEAVE***
      mysql-test/r/flush_block_commit_notembedded.result:
        added
      mysql-test/r/insert_notembedded.result:
        added
      mysql-test/t/bdb_notembedded.test:
        ***MISSING WEAVE***
      mysql-test/t/flush_block_commit_notembedded.test:
        added
      mysql-test/t/insert_notembedded.test:
        added
      ea1f7e4b
    • unknown's avatar
      embedded-mode tests fixed · 28f6e132
      unknown authored
      libmysqld/examples/test-run:
        mysql_embedded should be run here
      libmysqld/lib_sql.cc:
        thd->real_id setup added
        bootstrap check added
      mysql-test/t/innodb.test:
        paths can be different in embedded server - replace_result added
      sql/item_func.cc:
        we should compare real_id-s in embedded server
      28f6e132
  12. 14 Aug, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots. · 2606cb93
      unknown authored
      All but ss677 are against the mysql-5.1 tree only.
      
      Fixes the following bugs:
      - Bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
      - Bug #20213: DBT2 testing cause mysqld to core using Innodb
      - Bug #20493: on partition tables, select and show command casue server crash
      - Bug #21113: Duplicate printout in SHOW INNODB STATUS
      - Bug #21313: rsql_..._recover_innodb_tmp_table is redundant and broken
      - Bug #21467: Manual URL wrong in InnoDB "page corrupted" error report
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        innodb.result: Adjust Innodb_rows_inserted and Innodb_rows_updated
        to reflect the deleted statements in r420, which somehow reappeared
        in the MySQL tree.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ha_innobase::start_stmt(): patch from Heikki:
        Do not call read_view_close_for_mysql().  (Bug #19834)
        
        Fix Bug#20213 and its duplicates: stress test crashes of InnoDB-5.1
        
        Fix Bug #20493 : we must prepare prebuilt->trx to point to the trx of this thd before using it
        
        Add update_thd() to several places in ha_innodb.cc to make sure prebuilt->trx points to the right trx object; in other functions add assertions that prebuilt->trx is for this thd; when 5.1 stabilizes, we can change these assertions to ut_ad() debug version assertions
        
        Remove redundant check_trx_exists() and ut_a() from r701,
        as suggested by Marko
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug
        #21112.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/fsp/fsp0fsp.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ibuf_print(): Don't print redundant information. Fixes bug #21113.
        
        Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        btr_cur_get_page(): Remove buggy assertion.
      storage/innobase/include/buf0buf.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/include/ibuf0ibuf.ic:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Remove non-varying variable ibuf->meter and related constant IBUF_THRESHOLD.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Remove the special treatment of tables
        rsql_IDENTIFIER_recover_innodb_tmp_table, which is redundant and
        was broken with the introduction of the "safe" file name encoding of
        identifiers.  (Bug #21313)
        
        ChangeSet@1.2181.173.1  2006-08-02 17:57:06+02:00  ingo@local
        Bug#18775 - Temporary table from alter table visible to other threads
        Continued implementation of WL#1324 (table name to filename encoding)
        Changed back the encoded temp file prefix to #sql.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/row/row0vers.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        row_vers_build_for_semi_consistent_read(): rec_trx_id was uninitialized
        in a comparison.  Initialize it.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
        
        ut_dbg_assertion_failed(): Print space between timestamp and start of error
        message.
        
        After ut_print_timestamp(), always display "  InnoDB:" (note two spaces).
        
        Correct all URLs pointing to the MySQL manual. (Bug #21467)
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.
        All but ss677 are against the mysql-5.1 tree only.
      2606cb93
  13. 21 Jul, 2006 1 commit
    • unknown's avatar
      Fixed bug#12185: Data type aggregation may produce wrong result · 35209c68
      unknown authored
      The Item::tmp_table_field_from_field_type() function creates Field_datetime
      object instead of Field_timestamp object for timestamp field thus always
      changing data type is a tmp table is used.
      
      The Field_blob object constructor which is used in the 
      Item::tmp_table_field_from_field_type() is always setting packlength field of
      newly created blob to 4. This leads to changing fields data type for example
      from the blob to the longblob if a temporary table is used.
      
      The Item::make_string_field() function always converts Field_string objects 
      to Field_varstring objects. This leads to changing data type from the 
      char/binary to varchar/varbinary.
      
      Added appropriate Field_timestamp object constructor for using in the 
      Item::tmp_table_field_from_field_type() function.
      
      Added Field_blob object constructor which sets pack length according to
      max_length argument.
      
      The Item::tmp_table_field_from_field_type() function now creates
      Field_timestamp object for a timestamp field.
      
      The Item_type_holder::display_length() now returns correct NULL length NULL
      length. 
      
      The Item::make_string_field() function now doesn't change Field_string to
      Field_varstring in the case of Item_type_holder. 
      
      The Item::tmp_table_field_from_field_type() function now uses the Field_blob
      constructor which sets packlength according to max_length.
      
      
      mysql-test/t/union.test:
        Added test case for bug#12185: Data type aggregation may produce wrong result
        Corrected test case after fix for bug#12185
      mysql-test/t/innodb.test:
        Corrected test case after fix for bug#12185
      mysql-test/r/union.result:
        Added test case for bug#12185: Data type aggregation may produce wrong result
         Corrected test case after fix for bug#12185
      mysql-test/r/innodb.result:
        Corrected test case after fix for bug#12185
      mysql-test/r/create.result:
        Corrected the test case after fixing bug#12185
      sql/field.h:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added Field_blob object constructor which sets packlength according to
        max_length argument.
      sql/item.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        The Item::make_string_field() function now doesn't change Field_string to
        Field_varstring in the case of Item_type_holder.
        The Item::tmp_table_field_from_field_type() function now creates
        Field_timestamp object for a timestamp field.
        The Item::tmp_table_field_from_field_type() function now uses the Field_blob
        constructor which sets packlength according to max_length.
        The Item_type_holder::display_length() now returns correct NULL length NULL
        length.
      sql/field.cc:
        Fixed bug#12185: Data type aggregation may produce wrong result
        Added appropriate Field_timestamp object constructor for using in the 
        Item::tmp_table_field_from_field_type() function.
      35209c68
  14. 06 Jun, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.0-ss609 snapshot. · 9e3f90e5
      unknown authored
       Fixed BUG#19727 "InnoDB crashed server and crashed tables
       are not recoverable".
      
      
      innobase/row/row0mysql.c:
        Applied innodb-5.0-ss609 snapshot.
         Move trx_commit_for_mysql(trx) calls before calls to
         row_mysql_unlock_data_dictionary(trx).
      innobase/row/row0sel.c:
        Applied innodb-5.0-ss609 snapshot.
         row_sel_try_search_shortcut(): Do not return SEL_FOUND when
         the record was not found. This bug was introduced in
         InnoDB 5.0.3, but luckily it should nerver manifest itself,
         given that existing InnoDB SQL code never makes use of
         consistent reads.
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss609 snapshot.
         Add the big fat warning notice also to the bottom of
         innodb.test so that it will require more talent to
         ignore the change of policy.
      9e3f90e5
  15. 01 Jun, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss594 snapshot. · 2dca2a1a
      unknown authored
       Fixed BUG#19542 "InnoDB doesn't increase the Handler_read_prev couter".
       Fixed BUG#19609 "Case sensitivity of innodb_data_file_path gives stupid error".
       Fixed BUG#19727 "InnoDB crashed server and crashed tables are ot recoverable".
       Also:
       * Remove remnants of the obsolete concept of memoryfixing tables and indexes.
       * Remove unused dict_table_LRU_trim().
       * Remove unused 'trx' parameter from dict_table_get_on_id_low(),
         dict_table_get(), dict_table_get_and_increment_handle_count().
       * Add a normal linked list implementation.
       * Add a work queue implementation.
       * Add 'level' parameter to mutex_create() and rw_lock_create().
         Remove mutex_set_level() and rw_lock_set_level().
       * Rename SYNC_LEVEL_NONE to SYNC_LEVEL_VARYING.
       * Add support for bound ids in InnoDB's parser.
       * Define UNIV_BTR_DEBUG for enabling consistency checks of
         FIL_PAGE_NEXT and FIL_PAGE_PREV when accessing sibling
         pages of B-tree indexes.
         btr_validate_level(): Check the validity of the doubly linked
         list formed by FIL_PAGE_NEXT and FIL_PAGE_PREV.
       * Adapt InnoDB to the new tablename to filename encoding in MySQL 5.1.
         ut_print_name(), ut_print_name1(): Add parameter 'table_id' for
         distinguishing names of tables from other identifiers.
         New: innobase_convert_from_table_id(), innobase_convert_from_id(),
              innobase_convert_from_filename(), innobase_get_charset.
         dict_accept(), dict_scan_id(), dict_scan_col(), dict_scan_table_name(),
         dict_skip_word(), dict_create_foreign_constraints_low(): Add
         parameter 'cs' so that isspace() can be replaced with my_isspace(),
         whose operation depends on the connection character set.
         dict_scan_id(): Convert identifier to UTF-8.
         dict_str_starts_with_keyword(): New extern function, to replace
         dict_accept() in row_search_for_mysql().
         mysql_get_identifier_quote_char(): Replaced with innobase_print_identifier().
         ha_innobase::create(): Remove the thd->convert_strin() call. Pass the
         statement to InnoDB in the connection character set and let InnoDB
         convert the identifier to UTF-8.
       * Add max_row_size to dict_table_t.
       * btr0cur.c
         btr_copy_externally_stored_field(): Only set the 'offset' variable
         when needed.
       * buf0buf.c
         buf_page_io_complete(): Write to the error log if the page number or
         the space id o the disk do not match those in memory. Also write to
         the error log if a page was read from the doublewrite buffer. The
         doublewrite buffer should be only read by the lower-level function
         fil_io() at database startup.
       * dict0dict.c
         dict_scan_table_name(): Remove fallback to differently encoded name
         when the table is not found. The encoding is handled at a higher level.
       * ha_innodb.cc
         Increment statistic counter in ha_innobase::index_prev() (bug 19542).
         Add innobase_convert_string wrapper function and a new file
         ha_prototypes.h.
         innobase_print_identifier(): Remove TODO comment before calling
         get_quote_char_for_identifier(). That function apparently assumes
         the identifier to be encoded in UTF-8.
       * ibuf0ibuf.c|h
         ibuf_count_get(), ibuf_counts[], ibuf_count_inited(): Define these
         only #ifdef UNIV_IBUF_DEBUG. Previously, when compiled without
         UNIV_IBUF_DEBUG, invoking ibuf_count_get() would crash InnoDB.
         The function is only being called #ifdef UNIV_IBUF_DEBUG.
       * innodb.result
         Adjust the results for changes in the foreign key error messages.
       * mem0mem.c|h
         New: mem_heap_dup(), mem_heap_printf(), mem_heap_cat().
       * os0file.c
         Check the page trailers also after writing to disk. This improves
         chances of diagnosing bug 18886.
         os_file_check_page_trailers(): New function for checking that the
         two copies of the LSN stamped on the page match.
         os_aio_simulated_handle(): Call os_file_check_page_trailers()
         before and after os_file_write().
       * row0mysql.c
         Move trx_commit_for_mysql(trx) calls before calls to
         row_mysql_unlock_data_dictionary(trx) (bug 19727).
       * row0sel.c
         row_fetch_print(): Handle SQL NULL values without crashing.
         row_sel_store_mysql_rec(): Remove useless call to rec_get_nth_field
         when handling an externally stored column.
         Fetch externally stored fields when using InnoDB's internal SQL
         parser.
         Optimize BLOB selects by using prebuilt->blob_heap directly instead
         of first reading BLOB data to a temporary heap and then copying it
         to prebuilt->blob_heap.
       * srv0srv.c
         srv_master_thread(): Remove unreachable code.
       * srv0start.c
         srv_parse_data_file_paths_and_sizes(): Accept lower-case 'm' and
         'g' as abbreviations of megabyte and gigabyte (bug 19609).
         srv_parse_megabytes(): New fuction.
       * ut0dbg.c|h
         Implement InnoDB assertions (ut_a and ut_error) with abort() when
         the code is compiled with GCC 3 or later on other platforms than
         Windows or Netware. Also disable the variable ut_dbg_stop_threads
         and the function ut_dbg_stop_thread() i this case, unless
         UNIV_SYC_DEBUG is defined. This should allow the compiler to
         generate more compact code for assertions.
       * ut0list.c|h
         Add ib_list_create_heap().
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss594 snapshot.
      mysql-test/t/innodb.test:
        Copy the comment from the beginning of the file
         to the end because MySQL developers continue
         adding test cases to this file.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/CMakeLists.txt:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ha/hash0hash.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/data0type.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/fil0fil.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/fsp0fsp.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ibuf0ibuf.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/rem0rec.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/row0purge.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/row0undo.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/srv0srv.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/sync0rw.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/sync0sync.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0dbg.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/mem/mem0pool.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/os/os0thread.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0purge.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0row.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/thr/thr0loc.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0purge.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0rec.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0rseg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0sys.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/Makefile.am:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0ut.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ha_prototypes.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0list.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0list.ic:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/include/ut0wqueue.h:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0list.c:
        Applied innodb-5.1-ss594 snapshot.
      storage/innobase/ut/ut0wqueue.c:
        Applied innodb-5.1-ss594 snapshot.
      2dca2a1a
  16. 05 May, 2006 1 commit
    • unknown's avatar
      Don't use row level logging on optimize or repair table. · 3995b06b
      unknown authored
      (Fixes core dump in rpl_failed_optimize.test)
      Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      
      
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        Added extra test + drop of table at end of test
      mysql-test/lib/mtr_report.pl:
        Fail if mysqld asserts or prints stack
      mysql-test/mysql-test-run.sh:
        Fail if mysqld asserts or prints stack
      mysql-test/r/exampledb.result:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/r/innodb.result:
        Extra test to see that we can do an optimize table on an active transaction
      mysql-test/r/rpl_failed_optimize.result:
        Added extra test + drop of table at end of test
      mysql-test/t/exampledb.test:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/t/innodb.test:
        Extra test to see that we can do an optimize table on an active transaction
      sql/handler.cc:
        Don't use row level logging on optimize or repair table.
      sql/log.cc:
        Simplify code (no logic changes)
      sql/mysql_priv.h:
        Added prototype
      sql/sql_base.cc:
        Better name for define
      sql/sql_class.cc:
        Indentation fix
      sql/sql_parse.cc:
        Make end_active_trans() global
      sql/sql_table.cc:
        Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      3995b06b
  17. 03 May, 2006 1 commit
  18. 26 Apr, 2006 1 commit
    • unknown's avatar
      Files innodb.[test|result] are to be used by Innobase only. · a4c62dbb
      unknown authored
       Use files innodb_mysql.[test|result] instead.
      
      
      mysql-test/t/innodb.test:
        This file is to be used by Innobase only.
      mysql-test/r/innodb_mysql.result:
        New BitKeeper file ``mysql-test/r/innodb_mysql.result''
         Use this file instead of innodb.result.
      mysql-test/t/innodb_mysql.test:
        New BitKeeper file ``mysql-test/t/innodb_mysql.test''
         Use this file instead of innodb.test.
      a4c62dbb
  19. 23 Apr, 2006 2 commits
    • unknown's avatar
      Corrected merge mistake. · 9935dcc7
      unknown authored
      9935dcc7
    • unknown's avatar
      Applied innodb-5.1-ss475 snapshot. · ca9b46f7
      unknown authored
      * Fix BUG#15650: "DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for binlog"
      * Fix BUG#17134: "Partitions: uncommitted changes are visible"
      * Fix BUG#17992: "Partitions: InnoDB, somehow rotten table after UPDATE"
        row0ins.c: MySQL's partitioned table code does not set preduilt->sql_stat_start right
        if it does an insert in the same statement after doing a search first in the same
        partition table. We now write trx id always to the buffer, not just when flag
        sql_stat_start is on. This will waste CPU time very sightly.
      * Fix BUG#18077: "InnoDB uses full explicit table locks in stored FUNCTION"
      * Fix BUG#18238: "When locks exhaust the buffer pool, InnoDB does not roll back the trx"
      * Fix BUG#18252" "Disk space leak in updates of InnoDB BLOB rows in 5.0 and 5.1"
      * Fix BUG#18283: "When InnoDB returns error 'lock table full', MySQL can write to binlog too much"
      * Fix BUG#18350: "Use consistent read in CREATE ... SELECT ... if innodb_locks_unsafe_for_binlog"
      * Fix BUG#18384: "InnoDB memory leak on duplicate key errors in 5.0 if row has many columns"
      * Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID"
        Refuse tables that use reserved column names.
      * InnoDB's SQL parser:
        - Add support for UNSIGNED types, EXIT keyword, quoted identifiers, user-function callbacks
          for processing results of FETCH statements, bound literals, DATA_VARCHAR for bound literals.
        - Allow bound literals of type non-INTEGER to be of length 0.
        - Add make_flex.sh and update lexer/parser generation documentation.
        - Add comment clarifying the difference between 'alias' and 'indirection' fields in sym_node_t.
        - Remove never reached duplicate code in pars_set_dfield_type().
        - Rewrite pars_info datatypes and APIs, add a few helper functions.
        - Since the functions definitions in pars_info_t are accessed after pars_sql() returns
          in the query graph execution stage, we can't free pars_info_t in pars_sql(). Instead,
          make pars_sql() transfer ownership of pars_info_t to the created query graph, and
          make que_graph_free() free it if needed.
        - Allow access to system columns like DB_ROW_ID.
      * Use bound literals in row_truncate_table_for_mysql, row_drop_table_for_mysql,
        row_discard_tablespace_for_mysql, and row_rename_table_for_mysql.
      * Setting an isolation level of the transaction to read committed weakens the locks for
        this session similarly like the option innodb_locks_unsafe_for binlog. This patch removes
        alnost all gap locking (used in next-key locking) and makes MySQL to release the row locks
        on the rows which does not belong to result set. Additionally, nonlocking selects on
        INSERT INTO SELECT, UPDATE ... (SELECT ...), and CREATE ... SELECT ... use a nonlocking
        consistent read. If a binlog is used, then binlog format should be set to row based
        binloging to make the execution of the complex SQL statements.
      * Disable the statistic variables btr_search_n_hash_fail and n_hash_succ, n_hash_fail,
        n_patt_succ, and n_searches of btr_search_t in builds without #ifdef UNIV_SEARCH_PERF_STAT.
      * Make innodb.test faster. Group all consistent read test cases to a one test case and
        wait their lock timeout after all have been send to the server. Decrease amount of rows
        inserted in a certain test - this has no effect on the effectiveness of the test and
        reduces the running time by ~10 sec. Remove temporary work-arounds from innodb.result
        now that ALTER TABLE DROP FOREIGN KEY works once again.
      * Make innodb_unsafe_binlog.test faster. Grout all consistent read test cases to a one
        test case amd wait their lock timeout after all have been sent to the server. Remove
        unnecessary option --loose_innodb_lock_wait_timeout.
      * Print dictionary memory size in SHOW INNODB STATUS.
      * Fix memory leaks in row_create_table_for_mysql() in rare corner cases.
      * Remove code related to clustered tables. They were never implemented, and the
        implementation would be challenging with ROW_FORMAT=COMPACT. Remove the table types
        DICT_TABLE_CLUSTER_MEMBER and DICT_TABLE_CLUSTER and all related tests and functions.
        dict_table_t: Remove mix_id, mix_len, mix_id_len, mix_id_buf, and cluster_name.
        plan_t: Remove mixed_index.
        dict_create_sys_tables_tuple(): Set MIX_ID=0, MIX_LEN=0, CLUSTER_NAME=NULL when
        inserting into SYS_TABLES.
        dict_tree_check_search_tuple(): Enclose in #ifdef UNIV_DEBUG.
      * Move calling of thr_local_free() from trx_free_for_mysql() to
        innobase_close_connection().
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/r/innodb_unsafe_binlog.result:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb-master.opt:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb_unsafe_binlog-master.opt:
        Applied innodb-5.1-ss475 snapshot.
      mysql-test/t/innodb_unsafe_binlog.test:
        Applied innodb-5.1-ss475 snapshot.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss475 snapshot.
         Do not use inlined functions in ha_innodb.cc.
         Remove assertion ut_error which crashes the mysqld server
         if it prints a warning about the adaptive latch.
      storage/innobase/Makefile.am:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss475 snapshot.
         Fix compilation problem with non-C99 compilers.
      storage/innobase/buf/buf0lru.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/cmakelists.txt:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/configure.in:
        Applied innodb-5.1-ss475 snapshot.
         Add disabled-by-default logic to switch GCC to a strict C89-mode.
         Add -Werror-implicit-function_declaration to CFLAGS when using gcc.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss475 snapshot.
         dtype_print(): Recognize DATA_FIXBINARY and DATA_BLOB types.
         Print known flags from prtype. Use a switch statement instead
         of else-if chain.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss475 snapshot.
         Use bound literals in all SQL statements instead of elaborately
         constructing correctly allocated and quoted strings to pass the
         data in ASCII form.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/eval/eval0proc.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0cur.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/btr0sea.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/buf0lru.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss475 snapshot.
         Remove too strict assertions from some dict_table_t
         accessor functions.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/eval0proc.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/hash0hash.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/lock0lock.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/page0page.ic:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
      storage/innobase/include/pars0grm.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/que0que.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0mysql.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0sel.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/row0upd.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
         When using GCC, use __inline__ instead of inline.
      storage/innobase/include/ut0mem.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/os/os0sync.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/make_bison.sh:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0grm.y:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0opt.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss475 snapshot.
         Remove a memory leak when trying to insert a duplicate record to a
         clustered inedx comprising more than about 90 columns (Bug#18384).
         row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at
         func_exit if needed.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss475 snapshot.
         row_mysql_is_system_table(): Use strncmp, not memcmp, since we
         don't know how long the input string is.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss475 snapshot.
         Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
         row_sel_field_store_in_mysql_format(): Turn the assertions on
         mbminlen, mbmaxlen, and templ->type into debug assertions.
         fetch_step(): Print a more usefull error message when the cursor is closed.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss475 snapshot.
         row_upd_index_replace_new_col_vals_index_pos(): Add a parameter
         order_only for limiting the replacement to the ordering fields
         of the index.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss475 snapshot.
         Add (void*) cast when using the %p printf format specifier.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/Makefile.am:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/ut0mem.c:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/ut0vec.h:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/include/ut0vec.ic:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/pars/make_flex.sh:
        Applied innodb-5.1-ss475 snapshot.
      storage/innobase/ut/ut0vec.c:
        Applied innodb-5.1-ss475 snapshot.
      ca9b46f7
  20. 20 Apr, 2006 2 commits
    • unknown's avatar
      Restoring changes erroneously removed by applying · 43690501
      unknown authored
       the innodb-5.0-ss476 snapshot.
      
      
      43690501
    • unknown's avatar
      Applied innodb-5.0-ss476 snapshot. · 7ee05d7c
      unknown authored
       Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
       Also, fix memory leaks in row_create_table_for_mysql() in rare
       corner cases.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      innobase/dict/dict0load.c:
        Applied innodb-5.0-ss476 snapshot.
         dict_load_table(): Refuse to load tables with other TYPE
         than DICT_TABLE_ORDINARY.
      innobase/dict/dict0mem.c:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/include/dict0dict.h:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column name (Bug#18934).
      innobase/include/dict0mem.h:
        Applied innodb-5.0-ss476 snapshot.
         Add dict_mem_table_free(), use it instead of duplicating
         the code everywhere.
      innobase/include/univ.i:
        Applied innodb-5.0-ss476 snapshot.
      innobase/log/log0recv.c:
        Applied innodb-5.0-ss476 snapshot.
      innobase/row/row0mysql.c:
        Applied innodb-5.0-ss476 snapshot.
         Refuse tables that use reserved column names (Bug#18934).
      mysql-test/r/innodb.result:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Other changes are to be restored by the next cset).
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss476 snapshot.
         Fix result for test case for Bug#18934.
         (Removed test case for Bug#14360 is to be restored by the next cset).
      7ee05d7c
  21. 17 Apr, 2006 2 commits
  22. 14 Apr, 2006 1 commit
  23. 13 Apr, 2006 1 commit
  24. 12 Apr, 2006 1 commit
    • unknown's avatar
      bug #15860 (SPATIAL keys in INNODB) · f01b0ac2
      unknown authored
      mysql-test/r/innodb.result:
        result added
      mysql-test/t/innodb.test:
        testcase
      sql/ha_myisam.cc:
        HA_CAN_RTREEKEYS added to ha_myisam
      sql/handler.h:
        HA_CAN_RTREEKEYS defined
      sql/share/errmsg.txt:
        error message added
      sql/sql_table.cc:
        check that the handler allows SPATIAL keys
      f01b0ac2
  25. 11 Apr, 2006 1 commit
    • unknown's avatar
      Fix for bug #14360: Date Between Interval Broken. · 1ef73963
      unknown authored
                                         
      
      
      mysql-test/r/innodb.result:
        Fix for bug #14360: Date Between Interval Broken.                               
          - test case.
      mysql-test/t/innodb.test:
        Fix for bug #14360: Date Between Interval Broken.                               
          - test case.
      sql/item_timefunc.cc:
        Fix for bug #14360: Date Between Interval Broken.                               
          - Item_date_add_interval::eq() introduced.
      sql/item_timefunc.h:
        Fix for bug #14360: Date Between Interval Broken.                               
          - Item_date_add_interval::eq() introduced.
      1ef73963
  26. 30 Mar, 2006 1 commit
    • unknown's avatar
      Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE · 5569a87e
      unknown authored
      InnoDB requires a full table rebuild for foreign key changes.
      It was not possible in compare_tables() to detect such changes.
      
      On Heikkis proposal I added a new flag to the syntax parser
      where foreign key definition changes are done. I test for
      this flag in compare_tables() now.
      
      
      mysql-test/r/innodb.result:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Fixed an old test result.
        Added the new test result.
      mysql-test/t/innodb.test:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Added the new test case.
      sql/sql_lex.h:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Added a flag for foreign key definition changes.
      sql/sql_table.cc:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Check for foreign key definition changes in 
        compare_tables(). If present, a table rebuild is required.
      sql/sql_yacc.yy:
        Bug#18477 - MySQL/InnoDB Ignoring Foreign Keys in ALTER TABLE
        Marked foreign key definitions with the new flag.
        This flag is tested in ALTER TABLE only. It is
        ignored otherwise.
      5569a87e
  27. 29 Mar, 2006 3 commits
    • unknown's avatar
      Restoring changes erroneously removed by applying · 5dddbb4a
      unknown authored
       the innodb-5.0-ss368 snapshot.
      
      
      5dddbb4a
    • unknown's avatar
      Restoring changes erroneously removed by applying · 42769855
      unknown authored
       the innodb-5.0-ss368 snapshot.
      
      
      42769855
    • unknown's avatar
      Applied innodb-5.0-ss368 snapshot · fd6db50c
      unknown authored
        Fixed bugs:
        #16814: SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section
          dict_foreign_key_error_report(): Always print a newline after invoking
          dict_print_info_on_foreign_key_in_create_format().
        #16827: Better InnoDB error message if ibdata files omitted from my.cnf.
        #17126: CHECK TABLE on InnoDB causes a short hang during check of adaptive hash.
          CHECK TABLE blocking other queries, by releasing the btr_search_latch
          periodically during the adaptive hash table validation.
        #17405: Valgrind: conditional jump or move depends on uninitialised valuesw.
          buf_block_init(): Reset magic_n, buf_fix_count, and io_fix to avoid testing
          uninitialised variables.
        #18077: InnoDB uses full explicit table locks in stored FUNCTION.
        #18238: When locks exhaust the buffer pool, InnoDB does not roll back the trx.
          Check in pessimistic insert and update if the buffer pool is exhausted by locks.
        #18252: Disk space leaks in updates of InnoDB BLOB rows.
          btr_cur_pessimistic_update(): Invoke rec_get_offset() after rec_set_field_extern_bits().
          btr_store_big_rec_extern_fields(): Note that offsets will no longer be valid
          after calling this function.
        #18283: When InnoDB returns error 'lock table full', MySQL can write to binlog too much.
        #18384: InnoDB memory leak on duplicate key errors if row has many columns.
          row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at func_exit if needed.
        #18350: Use consistent read in CREATE ... SELECT .. if innodb_locks_unsafe_for_binlog is used.
      
      
      innobase/btr/btr0cur.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/btr/btr0sea.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/buf/buf0buf.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/buf/buf0lru.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/data/data0type.c:
        Applied innodb-5.0-ss368 snapshot
          dtype_print(): Fix printing of prtype.
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/fil/fil0fil.c:
        Applied innodb-5.0-ss368 snapshot
          fil_extend_space_to_desired_size(): in UNIV_HOTBACKUP builds,
          do not touch srv_data_file_sizes[] or srv_n_data_files.
      innobase/ha/ha0ha.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/include/btr0cur.h:
        Applied innodb-5.0-ss368 snapshot
      innobase/include/buf0lru.h:
        Applied innodb-5.0-ss368 snapshot
      innobase/include/ha0ha.h:
        Applied innodb-5.0-ss368 snapshot
      innobase/include/page0page.ic:
        Applied innodb-5.0-ss368 snapshot
          Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
      innobase/include/univ.i:
        Applied innodb-5.0-ss368 snapshot
          Remove UNIV_RELEASES_NOT_YET_STABLE and related checks.
      innobase/row/row0ins.c:
        Applied innodb-5.0-ss368 snapshot
      innobase/row/row0sel.c:
        Applied innodb-5.0-ss368 snapshot
          Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
          page_rec_is_comp(): Remove the bounds check.
          row_sel_field_store_in_mysql_format(): Turn the assertions
          on mbminlen, mbmaxlen, and templ->type into debug assertions.
      innobase/row/row0upd.c:
        Applied innodb-5.0-ss368 snapshot
      mysql-test/t/innodb.test:
        Applied innodb-5.0-ss368 snapshot
      sql/ha_innodb.cc:
        Applied innodb-5.0-ss368 snapshot
          Fix memory allocation bug (by changing MY_WME to MY_FAE) in get_share.
          Also partially fix coding style of the function.
      fd6db50c
  28. 10 Mar, 2006 1 commit
    • unknown's avatar
      Applied innodb-5.1-ss269 snapshot. · 050f14ac
      unknown authored
        Fixed BUGS:
        #3300: "UPDATE statement with no index column in where condition locks
          all rows"
          Implement semi-consistent read to reduce lock conflicts at the cost
          of breaking serializability.
          ha_innobase::unlock_row(): reset the "did semi consistent read" flag
          ha_innobase::was_semi_consistent_read(),
          ha_innobase::try_semi_consistent_read(): new methods
          row_prebuilt_t, row_create_prebuilt(): add field row_read_type for
          keeping track of semi-consistent reads
          row_vers_build_for_semi_consistent_read(),
          row_sel_build_committed_vers_for_mysql(): new functions
          row_search_for_mysql(): implement semi-consistent reads
      
        #9802: "Foreign key checks disallow alter table".
          Added test cases.
      
        #12456: "Cursor shows incorrect data - DML does not affect,
          probably caching"
          This patch implements a high-granularity read view to be used with
          cursors. In this high-granularity consistent read view modifications 
          done by the creating transaction after the cursor is created or 
         future transactions are not visible. But those modifications that 
         transaction did before the cursor was created are visible.
      
        #12701: "Support >4GB buffer pool and log files on 64-bit Windows"
          Do not call os_file_create_tmpfile() at runtime. Instead, create all
          tempfiles at startup and guard access to them with mutexes.
      
        #13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN KEYs".
          When FOREIGN_KEY_CHECKS=0 we still need to check that datatypes between
          foreign key references are compatible.
      
        #14189: "VARBINARY and BINARY variables: trailing space ignored with InnoDB"
          innobase_init(): Assert that
          DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
          dtype_get_pad_char(): Do not pad VARBINARY or BINARY columns.
          row_ins_cascade_calc_update_vec(): Refuse ON UPDATE CASCADE when trying
          to change the length of a VARBINARY column that refers to or is referenced
          by a BINARY column. BINARY columns are no longer padded on comparison,
          and thus they cannot be padded on storage either.
      
        #14747: "Race condition can cause btr_search_drop_page_hash_index() to crash"
          Note that buf_block_t::index should be protected by btr_search_latch
          or an s-latch or x-latch on the index page.
          btr_search_drop_page_hash_index(): Read block->index while holding
          btr_search_latch and use the cached value in the loop.  Remove some
          redundant assertions.
      
        #15108: "mysqld crashes when innodb_log_file_size is set > 4G"
      
        #15308: "Problem of Order with Enum Column in Primary Key"
      
        #15550: "mysqld crashes in printing a FOREIGN KEY error in InnoDB"
          row_ins_foreign_report_add_err(): When printing the parent record,
          use the index in the parent table rather than the index in the child table.
      
        #15653: "Slow inserts to InnoDB if many thousands of .ibd files"
          Keep track on unflushed modifications to file spaces.  When there are tens
          of thousands of file spaces, flushing all files in fil_flush_file_spaces()
          would be very slow.
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      
        #15991: "innodb-file-per-table + symlink database + rename = cr"
         os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
         to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
         This fixes the crash on RENAME TABLE when the .ibd file is a symbolic link
         to a different file system.
      
        #16157: "InnoDB crashes when main location settings are empty"
          This patch is from Heikki.
      
        #16298: "InnoDB segfaults in INSERTs in upgrade of 4.0 -> 5.0 tables
          with VARCHAR BINARY"
          dict_load_columns(): Set the charset-collation code
          DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
          that lack a charset-collation code, i.e., the tables were created
          with an older version of MySQL/InnoDB than 4.1.2.
      
        #16229: "MySQL/InnoDB uses full explicit table locks in trigger processing"
          Take a InnoDB table lock only if user has explicitly requested a table
          lock. Added some additional comments to store_lock() and external_lock().
      
        #16387: "InnoDB crash when dropping a foreign key <table>_ibfk_0"
          Do not mistake TABLENAME_ibfk_0 for auto-generated id.
          dict_table_get_highest_foreign_id(): Ignore foreign constraint
          identifiers starting with the pattern TABLENAME_ibfk_0.
      
        #16582: "InnoDB: Error in an adaptive hash index pointer to page"
          Account for a race condition when dropping the adaptive hash index
          for a B-tree page.
          btr_search_drop_page_hash_index(): Retry the operation if a hash index
          with different parameters was built meanwhile.  Add diagnostics for the
          case that hash node pointers to the page remain.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      
        #16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR
          section"
          Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW
          INNODB STATUS output.
          dict_foreign_error_report(): Always print a newline after invoking
          dict_print_info_on_foreign_key_in_create_format().
      
        #16827: "Better InnoDB error message if ibdata files omitted from my.cnf"
      
        #17126: "CHECK TABLE on InnoDB causes a short hang during check of adaptive
          hash"
          CHECK TABLE blocking other queries, by releasing the btr_search_latch
          periodically during the adaptive hash table validation.
      
        #17405: "Valgrind: conditional jump or move depends on unititialised values"
          buf_block_init(): Reset magic_n, buf_fix_count and io_fix to avoid
          testing uninitialized variables.
      
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss269 snapshot.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss269 snapshot.
      sql/ha_innodb.cc:
        Applied innodb-5.1-ss269 snapshot.
      sql/ha_innodb.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0btr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0cur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0pcur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/btr/btr0sea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0buf.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0lru.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/buf/buf0rea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/data/data0data.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/data/data0type.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0boot.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0crea.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0dict.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dict/dict0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/dyn/dyn0dyn.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/eval/eval0eval.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/eval/eval0proc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fil/fil0fil.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fsp/fsp0fsp.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/fut/fut0lst.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ha/ha0ha.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ha/hash0hash.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ibuf/ibuf0ibuf.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0btr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0btr.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0cur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0cur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0pcur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0pcur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0sea.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0sea.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/btr0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0buf.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0buf.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0flu.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0flu.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/buf0lru.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0data.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0data.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0type.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/data0type.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/db0err.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0boot.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0boot.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0crea.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0dict.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0dict.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0load.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dict0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dyn0dyn.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/dyn0dyn.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0eval.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0eval.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0proc.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/eval0proc.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fil0fil.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fsp0fsp.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/fut0lst.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ha0ha.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/hash0hash.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/hash0hash.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ibuf0ibuf.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ibuf0ibuf.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/lock0lock.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/lock0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0log.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0log.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/log0recv.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mach0data.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mach0data.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0dbg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0dbg.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0mem.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mem0pool.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0log.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0mtr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/mtr0mtr.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0file.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0proc.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0sync.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0sync.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/os0thread.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0cur.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0cur.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0page.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0page.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/page0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0grm.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0opt.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0pars.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0sym.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/pars0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0que.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0que.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/que0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/read0read.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/read0read.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0cmp.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0cmp.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0rec.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/rem0rec.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0ins.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0mysql.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0purge.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0row.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0row.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0sel.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0sel.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0uins.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0umod.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0undo.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0upd.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0upd.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/row0vers.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/srv0srv.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/srv0start.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0arr.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0rw.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0rw.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0sync.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/sync0sync.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0purge.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0purge.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rec.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0roll.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rseg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0rseg.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0sys.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0sys.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0trx.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0trx.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0undo.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0undo.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/trx0xa.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/univ.i:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/usr0sess.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/usr0types.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0byte.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0byte.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0dbg.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0lst.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0mem.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0mem.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0rnd.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0rnd.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0sort.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/include/ut0ut.ic:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/lock/lock0lock.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/log/log0log.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/log/log0recv.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mach/mach0data.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0dbg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mem/mem0pool.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mtr/mtr0log.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/mtr/mtr0mtr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0file.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0proc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0sync.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/os/os0thread.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/page/page0cur.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/page/page0page.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/lexyy.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.h:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0grm.y:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0lex.l:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0opt.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0pars.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/pars/pars0sym.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/read/read0read.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/rem/rem0cmp.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/rem/rem0rec.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0ins.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0mysql.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0purge.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0row.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0sel.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0uins.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0umod.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0undo.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0upd.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/row/row0vers.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0que.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0srv.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/srv/srv0start.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0arr.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0rw.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/sync/sync0sync.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/thr/thr0loc.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0purge.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0rec.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0roll.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0rseg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0sys.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0trx.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/trx/trx0undo.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/usr/usr0sess.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0byte.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0dbg.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0mem.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0rnd.c:
        Applied innodb-5.1-ss269 snapshot.
      storage/innobase/ut/ut0ut.c:
        Applied innodb-5.1-ss269 snapshot.
      mysql-test/r/innodb_unsafe_binlog.result:
        New BitKeeper file ``mysql-test/r/innodb_unsafe_binlog.result''
      mysql-test/t/innodb_unsafe_binlog-master.opt:
        New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog-master.opt''
      mysql-test/t/innodb_unsafe_binlog.test:
        New BitKeeper file ``mysql-test/t/innodb_unsafe_binlog.test''
      storage/innobase/pars/make_bison.sh:
        New BitKeeper file ``storage/innobase/pars/make_bison.sh''
      050f14ac
  29. 24 Feb, 2006 1 commit
    • unknown's avatar
      Fixes to embedded server to be able to run tests with it · 0afb6ff6
      unknown authored
      (Needed for "list of pushes" web page and autopush)
      
      
      include/mysql.h:
        Fix to embedded server to be able to run tests on it
      libmysql/libmysql.c:
        Fix to embedded server to be able to run tests on it
      libmysqld/emb_qcache.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/embedded_priv.h:
        Fix to embedded server to be able to run tests on it
      libmysqld/lib_sql.cc:
        Fix to embedded server to be able to run tests on it
      libmysqld/libmysqld.c:
        Fix to embedded server to be able to run tests on it
      mysql-test/mysql-test-run.sh:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/binlog.result:
        Updated test for embedded server
      mysql-test/r/ctype_cp932.result:
        Updated test for embedded server
      mysql-test/r/innodb.result:
        Updated test for embedded server
      mysql-test/r/mysqltest.result:
        Updated test for embedded server
      mysql-test/r/query_cache.result:
        Updated test for embedded server
      mysql-test/r/query_cache_notembedded.result:
        Updated test for embedded server
      mysql-test/r/sp-error.result:
        Updated test for embedded server
      mysql-test/r/sp.result:
        Updated test for embedded server
      mysql-test/r/subselect.result:
        Updated test for embedded server
      mysql-test/r/view.result:
        Updated test for embedded server
      mysql-test/r/view_grant.result:
        Updated test for embedded server
      mysql-test/t/backup.test:
        Updated test for embedded server
      mysql-test/t/binlog.test:
        Updated test for embedded server
      mysql-test/t/blackhole.test:
        Updated test for embedded server
      mysql-test/t/compress.test:
        Updated test for embedded server
      mysql-test/t/ctype_cp932.test:
        Updated test for embedded server
      mysql-test/t/delayed.test:
        Updated test for embedded server
      mysql-test/t/handler.test:
        Updated test for embedded server
      mysql-test/t/innodb.test:
        Updated test for embedded server
      mysql-test/t/mysql.test:
        Updated test for embedded server
      mysql-test/t/mysql_client_test.test:
        Updated test for embedded server
      mysql-test/t/mysqltest.test:
        Updated test for embedded server
      mysql-test/t/query_cache.test:
        Updated test for embedded server
      mysql-test/t/query_cache_notembedded.test:
        Updated test for embedded server
      mysql-test/t/read_only.test:
        Updated test for embedded server
      mysql-test/t/skip_grants.test:
        Updated test for embedded server
      mysql-test/t/sp-destruct.test:
        Updated test for embedded server
      mysql-test/t/sp-error.test:
        Updated test for embedded server
      mysql-test/t/sp-threads.test:
        Updated test for embedded server
      mysql-test/t/sp.test:
        Updated test for embedded server
      mysql-test/t/subselect.test:
        Updated test for embedded server
      mysql-test/t/temp_table.test:
        Updated test for embedded server
      mysql-test/t/view.test:
        Updated test for embedded server
      mysql-test/t/view_grant.test:
        Updated test for embedded server
      mysql-test/t/wait_timeout.test:
        Updated test for embedded server
      mysys/mf_dirname.c:
        Review fix: Don't access data outside of array
      mysys/my_bitmap.c:
        Remove compiler warnings
      scripts/mysql_fix_privilege_tables.sql:
        Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script
      sql-common/client.c:
        Updated test for embedded server
      sql/item.cc:
        Remove DBUG_PRINT statement that can cause crashes when running with --debug
      sql/mysqld.cc:
        Fix to embedded server to be able to run tests on it
      sql/protocol.cc:
        Fix to embedded server to be able to run tests on it
        (Trivial reconstruction of code)
      sql/protocol.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_base.cc:
        Better comment
      sql/sql_class.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_class.h:
        Fix to embedded server to be able to run tests on it
      sql/sql_cursor.cc:
        Fix to embedded server to be able to run tests on it
      sql/sql_parse.cc:
        Fix to embedded server to be able to run tests on it
        Don't crash for disabled commands when using embedded server
      sql/sql_prepare.cc:
        Fix to embedded server to be able to run tests on it
      mysql-test/r/ctype_cp932_notembedded.result:
        New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''
      mysql-test/r/innodb_notembedded.result:
        New BitKeeper file ``mysql-test/r/innodb_notembedded.result''
      mysql-test/r/sp.result.orig:
        New BitKeeper file ``mysql-test/r/sp.result.orig''
      mysql-test/r/sp_notembedded.result:
        New BitKeeper file ``mysql-test/r/sp_notembedded.result''
      mysql-test/r/subselect_notembedded.result:
        New BitKeeper file ``mysql-test/r/subselect_notembedded.result''
      mysql-test/t/ctype_cp932_notembedded.test:
        New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''
      mysql-test/t/innodb_notembedded.test:
        New BitKeeper file ``mysql-test/t/innodb_notembedded.test''
      mysql-test/t/sp.test.orig:
        New BitKeeper file ``mysql-test/t/sp.test.orig''
      mysql-test/t/sp_notembedded.test:
        New BitKeeper file ``mysql-test/t/sp_notembedded.test''
      mysql-test/t/subselect_notembedded.test:
        New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
      0afb6ff6
  30. 09 Feb, 2006 1 commit
  31. 31 Jan, 2006 1 commit
    • unknown's avatar
      Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. · 6a9a96dc
      unknown authored
        Applied innodb-5.0-ss149/162 snapshots.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-5.0-149/162 snapshots.
          Account for a race condition when dropping the adaptive hash
          index for a B-tree page (Bug #16582).
          btr_search_drop_page_hash_index(): Retry the operation if a
            hash index with different parameters was built meanwhile.
            Add diagnostics for the case that hash node pointers to
            the page remain. This fix is from Heikki.
          btr_search_info-update_hash(), btr_search_info_update_slow():
            Document the parameter "info" as in/out.
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-149/162 snapshots.
          Do not mistake TABLENAME_ibfk_0 for auto generated id (Bug #16387).
          dict_table_get_highest_foreign_id(): Ignore foreign constraint
            identifiers starting with the pattern TABLENAME_ibfk_0.
      innobase/dict/dict0load.c:
        Applied innodb-5.0-149/162 snapshots.
          dict_load_columns(): Set the charset-collation code
          DATA_MYSQL_BINARY_CHARSET_COLL for those binary string columns
          that lack a charset-collation code, i.e., the tables were created
          with an older version of MySQL/InnoDB than 4.1.2 (Bug #16298).
      innobase/fil/fil0fil.c:
        Applied innodb-5.0-149/162 snapshots.
          Keep track on unflushed modifications to file spaces. When there
          are tens of thousands of file spaces, flushing all files in
          fil_flush_file_spaces() would be very slow (Bug #15653).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/univ.i:
        Applied innodb-5.0-149/162 snapshots.
          Avoid breaking --with-debug builds on QNS and other systems
          whose compiler pretends to be GCC 2.
          Outside __WIN__ define UNIV_INLINE as static inline.
      innobase/os/os0sync.c:
        Applied innodb-5.0-149/162 snapshots.
          Replace goto in os_event_wait with a normal loop.
      innobase/srv/srv0start.c:
        Applied innodb-5.0-149/162 snapshots.
          Fix bug #16157, a crash when innodb_log_group_home_dir is set
          to an empty string. This patch is from Heikki.
      mysql-test/r/innodb.result:
        Applied innodb-5.0-149/162 snapshots.
          Fixed results for added test cases.
      mysql-test/t/innodb.test:
        Applied innodb-5.0-149/162 snapshots.
          Added test cases.
      sql/ha_innodb.cc:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
            variables of class ha_innobase.
          Added diagnostic code trx_print() to
            innobase_query_caching_of_table_permitted() to find reason
            why we are holding adaptive search latch.
          Fixed bug #16229 MySQL/InnoDB uses full explicit table locks
            in trigger processing. Take a InnoDB table lock only if user
            has explicitly requested a table lock. Added some additional
            comments to store_lock() and external_lock(). Fixed some
            code style errors.
          Remember to use noninlined versions of the functions on
            ha_innodb.cc !
      sql/ha_innodb.h:
        Applied innodb-5.0-149/162 snapshots.
          Remove some declarations of unused global variables and member
          variables of class ha_innobase.
      6a9a96dc