ChangeSet@1.2790, 2008-02-12 19:39:45-06:00, klewis@klewis-mysql. +2 -0
  This change was pushed to mysql-6.0-falcon-team as;
  ChangeSet@1.2813, 2008-02-12 16:37:27-08:00, acurtis@xiphis.org
  33688 "Falcon: replication fails on duplicate key error"
  I was able to reproduce this bug on InnoDB storage engine simply by
  removing table flag HA_BINLOG_STMT_CAPABLE.
  Bug affects any transactional storage engine which does not use statement
  based logs and is caused by thd->binlog_table_maps not being reset when
  rollback occurs.

  sql/log.cc@1.304, 2008-02-12 19:39:24-06:00, klewis@klewis-mysql. +5 -0
    33688 - When resetting binlog data, don't forget to reset
    the thd->binlog_table_maps member.

  sql/sql_class.h@1.408, 2008-02-12 19:39:29-06:00, klewis@klewis-mysql. +3 -0
    33688 - new method to reset binlog_table_maps member.

ChangeSet@1.2789, 2008-02-10 22:43:57-06:00, klewis@klewis-mysql. +7 -0
  Latest changes from mysql-6.0-falcon-team
  
  ChangeSet@1.2811, 2008-02-10 20:15:36-06:00, cpowers@xeno.mysql.com
    33634, Falcon queries starved for a long time
    Disabled assert in SRLUpdateRecords::chill.
  
  ChangeSet@1.2810, 2008-02-10 13:39:01-06:00, cpowers@xeno.mysql.com
    33634, Falcon queries are starved for a long time
  
    Until Falcon supports multiple system transactions, concurrent 
    access to the single system transaction must be serialized at 
    some points, primarily within create and delete table.
    - Added sync object to protect transaction savepoint lists.
    - Serialized system transaction access with an exclusive lock on 
      syncSysConnection in Statement::createTable and Table::dropTable.
    - Enabled oldesActiveSavepointId in Record::scavenge().
  
  Note that care must be taken to ensure that Database::syncTables 
  is acquired before Database::syncSysConnection

  storage/falcon/Database.cpp@1.33, 2008-02-10 22:43:01-06:00, klewis@klewis-mysql. +1 -1
    Use getSystemTransaction() instead of systemConnection->getTransaction()

  storage/falcon/RecordVersion.cpp@1.5, 2008-02-10 22:43:35-06:00, klewis@klewis-mysql. +3 -3
    Until now, RecordVersion::scavenge() ignored the 
    oldestActiveSavePointId parameter. However, there are
    two instances (Table::update 1&2) where the savePointId 
    is passed explicitly to scavenge(), so the 
    oldestActiveSavePointId parameter is now used in 
    place of RecordVersion::savePointId.

  storage/falcon/SRLUpdateRecords.cpp@1.7, 2008-02-10 22:43:37-06:00, klewis@klewis-mysql. +4 -2
    Disabled ASSERT(transaction->totalRecordData >= dataLength) in
    SRLUpdateRecords::chill. This assert should only be used when
    debugging the chill/thaw mechanism. Sometimes totalRecordData
    can be off by a few bytes, especially for transactions with
    thousands of records.

  storage/falcon/Statement.cpp@1.9, 2008-02-10 22:43:40-06:00, klewis@klewis-mysql. +3 -0
    Protect system transaction and Table::create within 
    exclusive lock of syncSysConnection.

  storage/falcon/Table.cpp@1.35, 2008-02-10 22:43:42-06:00, klewis@klewis-mysql. +2 -2
    Change syncSysConnection shared lock to exclusive lock in Table::Drop

  storage/falcon/Transaction.cpp@1.21, 2008-02-10 22:43:44-06:00, klewis@klewis-mysql. +54 -31
    Added syncSavepoints to allow concurrent access to savePoints and freeSavePoints.

  storage/falcon/Transaction.h@1.10, 2008-02-10 22:43:47-06:00, klewis@klewis-mysql. +4 -3
    Minor style change.

ChangeSet@1.2788, 2008-02-08 15:51:18-06:00, klewis@klewis-mysql. +19 -0
  Changes to mysql-6.0-falcon-team since 2008-02-01
  
  ChangeSet@1.2804.1.4, 2008-02-08 12:46:47-05:00, jas@rowvwade. +2 -0
    Create a separate method (Table::treeFetch) to fetch
    a record from the record tree only, i.e. don't go to
    the disk if the record isn't in the record tree.
  
  ChangeSet@1.2804.1.3, 2008-02-08 11:54:22-05:00, jas@rowvwade. +1 -0
    Handle insert backout in new record update validation
    mechanism.
  
  ChangeSet@1.2804.1.2, 2008-02-08 11:35:08-05:00, jas@rowvwade. +10 -0
    Moved record version update validation from
    Dbb::validateAndUpdateRecord to Section::updateRecord
    so a lock can be help between validation and the
    actual update.  Dbb::validateAndUdateRecord then
    became redundant and was removed.
  
  ChangeSet@1.2808, 2008-02-06 11:38:48-06:00, klewis@klewis-mysql. +2 -0
    Compiler warning about unused variables.
    34241 - Deleate the extra state field and use the
    existing stateNames array for displayed text.
    34331 - Convert -1 to 1 for boolean values sent by the
    server for a setting, specifically falcon_consistent_read.
  
  ChangeSet@1.2801.1.1, 2008-02-05 16:50:39-05:00, jas@rowvwade. +8 -0
    Fix transaction initialization races.  Also fix record number
    accounting problem blocking re-use of deleted record numbers.
  
  ChangeSet@1.2801, 2008-02-03 16:42:31-05:00, jas@rowvwade. +4 -0
    Fix undetected record update conflict in Table::deleteRecord.
  
  ChangeSet@1.2793.1.2, 2008-02-03 14:55:44-05:00, jas@rowvwade. +3 -0
    Fix memory leak when rolling back a failed delete.  Also added
    conditional support for table check and repair.
  
  ChangeSet@1.2790.1.2, 2008-02-03 13:49:30-05:00, jas@rowvwade. +2 -0
    Fixed "releaseDependency" bug (33759).
  
    The problem was failure to lock out new transaction dependencies
    while trying to drop existing dependencies.

  storage/falcon/Dbb.cpp@1.22, 2008-02-08 15:50:10-06:00, klewis@klewis-mysql. +0 -13
    Changes to Falcon since 2008-02-01

  storage/falcon/Dbb.h@1.8, 2008-02-08 15:50:17-06:00, klewis@klewis-mysql. +0 -1
    Changes to Falcon since 2008-02-01

  storage/falcon/Record.cpp@1.5, 2008-02-08 15:50:30-06:00, klewis@klewis-mysql. +5 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/Record.h@1.5, 2008-02-08 15:50:32-06:00, klewis@klewis-mysql. +1 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/RecordGroup.cpp@1.6, 2008-02-08 15:50:35-06:00, klewis@klewis-mysql. +3 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/RecordLeaf.cpp@1.5, 2008-02-08 15:50:37-06:00, klewis@klewis-mysql. +3 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/SRLUpdateRecords.cpp@1.6, 2008-02-08 15:50:40-06:00, klewis@klewis-mysql. +5 -2
    Changes to Falcon since 2008-02-01

  storage/falcon/Section.cpp@1.24, 2008-02-08 15:50:42-06:00, klewis@klewis-mysql. +55 -17
    Changes to Falcon since 2008-02-01

  storage/falcon/Section.h@1.5, 2008-02-08 15:50:44-06:00, klewis@klewis-mysql. +5 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/SerialLog.cpp@1.31, 2008-02-08 15:50:47-06:00, klewis@klewis-mysql. +1 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/SerialLog.h@1.13, 2008-02-08 15:50:49-06:00, klewis@klewis-mysql. +1 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/StorageConnection.cpp@1.4, 2008-02-08 15:50:51-06:00, klewis@klewis-mysql. +10 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/StorageConnection.h@1.3, 2008-02-08 15:50:54-06:00, klewis@klewis-mysql. +3 -15
    Changes to Falcon since 2008-02-01

  storage/falcon/Table.cpp@1.34, 2008-02-08 15:50:56-06:00, klewis@klewis-mysql. +77 -16
    Changes to Falcon since 2008-02-01

  storage/falcon/Table.h@1.10, 2008-02-08 15:50:59-06:00, klewis@klewis-mysql. +3 -0
    Changes to Falcon since 2008-02-01

  storage/falcon/Transaction.cpp@1.20, 2008-02-08 15:51:01-06:00, klewis@klewis-mysql. +58 -84
    Changes to Falcon since 2008-02-01

  storage/falcon/TransactionManager.cpp@1.12, 2008-02-08 15:51:03-06:00, klewis@klewis-mysql. +19 -9
    Changes to Falcon since 2008-02-01

  storage/falcon/ha_falcon.cpp@1.49, 2008-02-08 15:51:05-06:00, klewis@klewis-mysql. +31 -2
    Changes to Falcon since 2008-02-01

  storage/falcon/ha_falcon.h@1.13, 2008-02-08 15:51:08-06:00, klewis@klewis-mysql. +4 -0
    Changes to Falcon since 2008-02-01

ChangeSet@1.2787, 2008-02-01 00:30:23-06:00, klewis@klewis-mysql. +7 -0
  Changes for 34164 and 34086.

  storage/falcon/Dbb.cpp@1.21, 2008-02-01 00:29:58-06:00, klewis@klewis-mysql. +15 -5
    Changes for 34086.

  storage/falcon/IO.cpp@1.25, 2008-02-01 00:30:01-06:00, klewis@klewis-mysql. +5 -4
    Changes for 34086.

  storage/falcon/SQLException.h@1.10, 2008-02-01 00:30:04-06:00, klewis@klewis-mysql. +2 -1
    Changes for 34086.

  storage/falcon/StorageHandler.cpp@1.21, 2008-02-01 00:30:07-06:00, klewis@klewis-mysql. +16 -3
    Changes for 34086.

  storage/falcon/StorageHandler.h@1.13, 2008-02-01 00:30:09-06:00, klewis@klewis-mysql. +1 -0
    Changes for 34086.

  storage/falcon/StorageTableShare.cpp@1.12, 2008-02-01 00:30:11-06:00, klewis@klewis-mysql. +2 -0
    Changes for 34086.

  storage/falcon/ha_falcon.cpp@1.48, 2008-02-01 00:30:13-06:00, klewis@klewis-mysql. +12 -6
    Changes for 34164

ChangeSet@1.2786, 2008-01-31 11:23:44-06:00, klewis@klewis-mysql. +1 -0
  34164 - Added code to allow serializable mode and read-uncommitted
  mode to be automatically switched with the current version of repeatable read.
  That is, it looks at the current value of falcon_consistent_read and sets
  the the atctual isolation accordingly.

  storage/falcon/ha_falcon.cpp@1.47, 2008-01-31 11:23:34-06:00, klewis@klewis-mysql. +17 -7
    34164 - Added code to allow serializable mode and read-uncommitted
    mode to be automatically switched with the current version of repeatable read.
    That is, it looks at the current value of falcon_consistent_read and sets
    the the atctual isolation accordingly.

ChangeSet@1.2785, 2008-01-31 09:34:27-06:00, klewis@klewis-mysql. +2 -0
  Latest changes from falcon team tree

  storage/falcon/Section.cpp@1.23, 2008-01-31 09:34:05-06:00, klewis@klewis-mysql. +28 -3
    Latest changes from falcon team tree

  storage/falcon/Table.cpp@1.33, 2008-01-31 09:34:09-06:00, klewis@klewis-mysql. +7 -1
    Latest changes from falcon team tree

ChangeSet@1.2784, 2008-01-30 09:04:04-06:00, klewis@klewis-mysql. +1 -0
  Necessary file for new error code used in Falcon/

  sql/share/errmsg.txt@1.118, 2008-01-30 09:03:53-06:00, klewis@klewis-mysql. +3 -1
    Necessary file for new error code used in Falcon/

ChangeSet@1.2783, 2008-01-30 01:58:02-06:00, klewis@klewis-mysql. +12 -0
  Update Falcon test suite.
  New error code added to handler.cc and sql_tablespace
  used in current Falcon code.

  include/my_base.h@1.116, 2008-01-30 01:57:24-06:00, klewis@klewis-mysql. +2 -1
    New error code used in current Falcon code

  mysql-test/suite/falcon/r/falcon_bug_29511.result@1.3, 2008-01-30 01:57:27-06:00, klewis@klewis-mysql. +1 -1
    Update Falcon test suite

  mysql-test/suite/falcon/r/falcon_bug_33662.result@1.1, 2008-01-30 01:57:51-06:00, klewis@klewis-mysql. +19 -0
    Update Falcon test suite

  mysql-test/suite/falcon/r/falcon_bug_33662.result@1.0, 2008-01-30 01:57:51-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/r/falcon_deadlock_collection.result@1.1, 2008-01-30 01:57:52-06:00, klewis@klewis-mysql. +31 -0
    Update Falcon test suite

  mysql-test/suite/falcon/r/falcon_deadlock_collection.result@1.0, 2008-01-30 01:57:52-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/r/falcon_ts.result@1.8, 2008-01-30 01:57:30-06:00, klewis@klewis-mysql. +3 -1
    Update Falcon test suite

  mysql-test/suite/falcon/t/disabled.def@1.23, 2008-01-30 01:57:33-06:00, klewis@klewis-mysql. +8 -8
    Update Falcon test suite

  mysql-test/suite/falcon/t/falcon_bug_29511.test@1.5, 2008-01-30 01:57:35-06:00, klewis@klewis-mysql. +1 -1
    Update Falcon test suite

  mysql-test/suite/falcon/t/falcon_bug_33662.test@1.1, 2008-01-30 01:57:46-06:00, klewis@klewis-mysql. +32 -0
    Update Falcon test suite

  mysql-test/suite/falcon/t/falcon_bug_33662.test@1.0, 2008-01-30 01:57:46-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_deadlock_collection.test@1.1, 2008-01-30 01:57:49-06:00, klewis@klewis-mysql. +76 -0
    Update Falcon test suite

  mysql-test/suite/falcon/t/falcon_deadlock_collection.test@1.0, 2008-01-30 01:57:49-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_options.test@1.2, 2008-01-30 01:57:38-06:00, klewis@klewis-mysql. +4 -0
    Update Falcon test suite

  mysql-test/suite/falcon/t/falcon_ts.test@1.9, 2008-01-30 01:57:40-06:00, klewis@klewis-mysql. +9 -4
    Update Falcon test suite

  sql/sql_tablespace.cc@1.15, 2008-01-30 01:57:43-06:00, klewis@klewis-mysql. +3 -0
    New error code used in current Falcon code

ChangeSet@1.2782, 2008-01-30 01:37:19-06:00, klewis@klewis-mysql. +63 -0
  Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Applications.cpp@1.2, 2008-01-30 01:33:50-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/BDB.cpp@1.5, 2008-01-30 01:33:54-06:00, klewis@klewis-mysql. +0 -4
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Btn.cpp@1.2, 2008-01-30 01:33:56-06:00, klewis@klewis-mysql. +5 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Cache.cpp@1.46, 2008-01-30 01:33:59-06:00, klewis@klewis-mysql. +17 -5
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Cache.h@1.16, 2008-01-30 01:34:01-06:00, klewis@klewis-mysql. +3 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Configuration.cpp@1.17, 2008-01-30 01:34:03-06:00, klewis@klewis-mysql. +11 -3
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Configuration.h@1.8, 2008-01-30 01:34:05-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Database.cpp@1.32, 2008-01-30 01:34:08-06:00, klewis@klewis-mysql. +14 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Database.h@1.21, 2008-01-30 01:34:10-06:00, klewis@klewis-mysql. +4 -3
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Dbb.cpp@1.20, 2008-01-30 01:34:12-06:00, klewis@klewis-mysql. +14 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Dbb.h@1.7, 2008-01-30 01:34:14-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/DeferredIndex.cpp@1.5, 2008-01-30 01:34:17-06:00, klewis@klewis-mysql. +8 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/DeferredIndex.h@1.3, 2008-01-30 01:34:19-06:00, klewis@klewis-mysql. +2 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/EncodedDataStream.cpp@1.4, 2008-01-30 01:34:21-06:00, klewis@klewis-mysql. +22 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Engine.h@1.6, 2008-01-30 01:34:24-06:00, klewis@klewis-mysql. +2 -3
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/IO.cpp@1.24, 2008-01-30 01:34:26-06:00, klewis@klewis-mysql. +2 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/IOx.h@1.14, 2008-01-30 01:34:28-06:00, klewis@klewis-mysql. +0 -3
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Index.cpp@1.13, 2008-01-30 01:34:30-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/IndexKey.cpp@1.3, 2008-01-30 01:34:33-06:00, klewis@klewis-mysql. +5 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Interlock.h@1.3, 2008-01-30 01:34:35-06:00, klewis@klewis-mysql. +296 -77
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/MemMgr.cpp@1.15, 2008-01-30 01:34:37-06:00, klewis@klewis-mysql. +2 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/OpSys.cpp@1.2, 2008-01-30 01:34:40-06:00, klewis@klewis-mysql. +3 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/PageInventoryPage.cpp@1.5, 2008-01-30 01:34:42-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/PageType.h@1.2, 2008-01-30 01:34:44-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Record.cpp@1.4, 2008-01-30 01:34:46-06:00, klewis@klewis-mysql. +5 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Record.h@1.4, 2008-01-30 01:34:48-06:00, klewis@klewis-mysql. +6 -4
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/RecordLocatorPage.cpp@1.4, 2008-01-30 01:34:53-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/RecordVersion.cpp@1.4, 2008-01-30 01:34:56-06:00, klewis@klewis-mysql. +9 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/RecordVersion.h@1.4, 2008-01-30 01:34:58-06:00, klewis@klewis-mysql. +2 -2
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Registry.cpp@1.2, 2008-01-30 01:35:01-06:00, klewis@klewis-mysql. +1 -3
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/RepositoryVolume.cpp@1.8, 2008-01-30 01:35:03-06:00, klewis@klewis-mysql. +10 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLFreePage.cpp@1.2, 2008-01-30 01:35:06-06:00, klewis@klewis-mysql. +7 -6
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLOverflowPages.cpp@1.2, 2008-01-30 01:35:08-06:00, klewis@klewis-mysql. +4 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLSectionPage.cpp@1.6, 2008-01-30 01:35:10-06:00, klewis@klewis-mysql. +0 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLSession.cpp@1.3, 2008-01-30 01:35:12-06:00, klewis@klewis-mysql. +16 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLSession.h@1.2, 2008-01-30 01:35:14-06:00, klewis@klewis-mysql. +3 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLUpdateIndex.cpp@1.4, 2008-01-30 01:35:17-06:00, klewis@klewis-mysql. +2 -2
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SRLUpdateRecords.cpp@1.5, 2008-01-30 01:35:21-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Section.cpp@1.22, 2008-01-30 01:35:24-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Section.h@1.4, 2008-01-30 01:35:27-06:00, klewis@klewis-mysql. +2 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLog.cpp@1.30, 2008-01-30 01:35:29-06:00, klewis@klewis-mysql. +23 -12
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLog.h@1.12, 2008-01-30 01:35:32-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLogControl.cpp@1.10, 2008-01-30 01:35:35-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLogTransaction.h@1.2, 2008-01-30 01:35:38-06:00, klewis@klewis-mysql. +0 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLogWindow.cpp@1.5, 2008-01-30 01:35:42-06:00, klewis@klewis-mysql. +13 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SerialLogWindow.h@1.2, 2008-01-30 01:35:46-06:00, klewis@klewis-mysql. +5 -2
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Socket.h@1.2, 2008-01-30 01:35:49-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/StorageDatabase.cpp@1.10, 2008-01-30 01:35:58-06:00, klewis@klewis-mysql. +63 -19
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/StorageHandler.cpp@1.20, 2008-01-30 01:36:01-06:00, klewis@klewis-mysql. +18 -11
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/StorageTableShare.cpp@1.11, 2008-01-30 01:36:04-06:00, klewis@klewis-mysql. +13 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SyncObject.cpp@1.10, 2008-01-30 01:36:06-06:00, klewis@klewis-mysql. +6 -2
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/SyncObject.h@1.5, 2008-01-30 01:36:09-06:00, klewis@klewis-mysql. +4 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Synchronize.cpp@1.7, 2008-01-30 01:36:12-06:00, klewis@klewis-mysql. +33 -8
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Table.cpp@1.32, 2008-01-30 01:36:16-06:00, klewis@klewis-mysql. +80 -40
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Table.h@1.9, 2008-01-30 01:36:19-06:00, klewis@klewis-mysql. +7 -5
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Transaction.cpp@1.19, 2008-01-30 01:36:25-06:00, klewis@klewis-mysql. +35 -16
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Transaction.h@1.9, 2008-01-30 01:36:32-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/TransactionManager.cpp@1.11, 2008-01-30 01:36:37-06:00, klewis@klewis-mysql. +21 -19
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/TransactionManager.h@1.4, 2008-01-30 01:36:40-06:00, klewis@klewis-mysql. +2 -2
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/Value.cpp@1.4, 2008-01-30 01:36:42-06:00, klewis@klewis-mysql. +1 -1
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/ha_falcon.cpp@1.46, 2008-01-30 01:36:45-06:00, klewis@klewis-mysql. +52 -29
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/ha_falcon.h@1.12, 2008-01-30 01:36:47-06:00, klewis@klewis-mysql. +1 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

  storage/falcon/plug.in@1.6, 2008-01-30 01:36:50-06:00, klewis@klewis-mysql. +39 -0
    Collection of many changesets to make version 6.0.4 current to Falcon

ChangeSet@1.2781, 2008-01-11 11:22:52-06:00, klewis@klewis-mysql. +2 -0
  Bug#33480 - Two kinds of hangs / deadlocks are fixed here.
  
  1) In ha_partition.cc, prevent serialization into Falcon of 
  threads writing to autoincrement fields.  Only InnoDB needs 
  this.  It can cause deadlocks and timeouts in Falcon which 
  appear as 0% CPU utilization when all threads are hung.  
  When this happens for just a few threads, the serial log 
  can grow indefinitely.
    
  2) If a deadlock happens between threads which are checking 
  for duplicates, the code in Table::checkUniqueRecordVersion()
  was not handling the detected deadlock by throwing an exception.  
  Now it does.  This can cause 100% CPU utilization hangs between 
  threads.  One is waiting and the other is looping in 
  Table::checkUnigueIndexes().  This can also cause the serial log
  to grow indefinitely.

  sql/ha_partition.cc@1.119, 2008-01-11 11:22:43-06:00, klewis@klewis-mysql. +1 -1
    Bug#33480 - Prevent serialization into Falcon of threads writing 
    to autoincrement fields.  Only InnoDB needs this.  It can cause 
    deadlocks and timeouts in Falcon which appear as 0% CPU utilization
    when all threads are hung.  When this happens for just a few threads,
    the serial log can grow indefinitely

  storage/falcon/Table.cpp@1.31, 2008-01-11 11:22:46-06:00, klewis@klewis-mysql. +23 -15
    Bug#33480 - If a deadlock happens between threads which are checking 
    for duplicates, the code was not handling the detected deadlock by
    throwing an exception.  Now it does.  This can cause 100% CPU utilization
    hangs between threads.  One is waiting and the other is looping in 
    Table::checkUnigueIndexes().  This can also cause the serial log to 
    grow indefinitely.

ChangeSet@1.1810.3492.1, 2008-01-11 13:20:03+01:00, serg@janus.mylan +3 -0
  Bug#33814 - yassl problems

  extra/yassl/src/handshake.cpp@1.15.1.1, 2008-01-11 13:07:51+01:00, serg@janus.mylan +5 -0
    Bug#33814 - yassl problems

  extra/yassl/src/template_instnt.cpp@1.10.1.5, 2008-01-11 13:19:24+01:00, serg@janus.mylan +1 -0
    new template instantiation

  extra/yassl/src/yassl_imp.cpp@1.8.1.6, 2008-01-11 13:08:06+01:00, serg@janus.mylan +10 -1
    Bug#33814 - yassl problems

ChangeSet@1.2779, 2008-01-04 23:47:38-06:00, klewis@klewis-mysql. +5 -0
  33474 - Correct testcase

  mysql-test/suite/falcon/r/falcon_bug_29452.result@1.3, 2008-01-04 23:47:23-06:00, klewis@klewis-mysql. +9 -9
    33474 - Correct testcase

  mysql-test/suite/falcon/r/falcon_options.result@1.15, 2008-01-04 23:47:26-06:00, klewis@klewis-mysql. +2 -2
    33474 - Correct testcase

  mysql-test/suite/falcon/r/falcon_options2.result@1.14, 2008-01-04 23:47:28-06:00, klewis@klewis-mysql. +4 -4
    33474 - Correct testcase

  mysql-test/suite/falcon/t/falcon_bug_29452.test@1.3, 2008-01-04 23:47:30-06:00, klewis@klewis-mysql. +6 -6
    33474 - Correct testcase

  mysql-test/suite/falcon/t/falcon_options2.test@1.5, 2008-01-04 23:47:32-06:00, klewis@klewis-mysql. +1 -1
    33474 - Correct testcase

ChangeSet@1.2778, 2008-01-04 23:21:10-06:00, klewis@klewis-mysql. +15 -0
  Consolidated changeset for the following bugs;
  33072, 33080, 33175, 33517, 33191, 33474, 33661, 33484
  This is for the clone-off of mysql version 6.0.4

  storage/falcon/Bitmap.cpp@1.2, 2008-01-04 23:20:27-06:00, klewis@klewis-mysql. +1 -0
    Fix accounting problem in Bitmap class (wrong count).

  storage/falcon/Database.cpp@1.31, 2008-01-04 23:20:34-06:00, klewis@klewis-mysql. +19 -17
    Don't assume that a Falcon table is a Falcon view unless
    both the data and blob section ids are zero.  (This was
    a bug introduced by the Falcon tablespace implementation.)

  storage/falcon/IO.cpp@1.23, 2008-01-04 23:20:36-06:00, klewis@klewis-mysql. +39 -13
    33484 - Fixed the IO::getWriteMode() mechanism to work on all platforms
    and all of the various file types within Falcon.
    33484 - Add third open-for-write to support systems without O_SYNC, 
    in which case, do an fsync() after every write.

  storage/falcon/IOx.h@1.13, 2008-01-04 23:20:38-06:00, klewis@klewis-mysql. +1 -0
    33484 - Add third open-for-write to support systems without O_SYNC, 
    in which case, do an fsync() after every write.

  storage/falcon/IndexPage.cpp@1.2, 2008-01-04 23:20:40-06:00, klewis@klewis-mysql. +23 -2
    33080 - IndexPage::findLevel()
    - If findNodeInBranch() fails, try again with next index page.
    - Added indexId argument for error reporting

  storage/falcon/IndexPage.h@1.2, 2008-01-04 23:20:42-06:00, klewis@klewis-mysql. +1 -1
    33080 - Added indexId argument to findLevel()

  storage/falcon/IndexRootPage.cpp@1.8, 2008-01-04 23:20:44-06:00, klewis@klewis-mysql. +1 -2
    33080 - Added indexId argument to findLevel()

  storage/falcon/SRLUpdateIndex.cpp@1.3, 2008-01-04 23:20:46-06:00, klewis@klewis-mysql. +2 -1
    Changed exclusive lock on syncIndexes to shared lock in 
    SRLUpdateIndex::append() to allow for smoother interaction 
    with gopher threads.

  storage/falcon/Section.cpp@1.21, 2008-01-04 23:20:48-06:00, klewis@klewis-mysql. +3 -1
    Release data BDB before returning to avoid perpetual lock on BDB.

  storage/falcon/SerialLogFile.cpp@1.15, 2008-01-04 23:20:49-06:00, klewis@klewis-mysql. +8 -1
    33484 - Add third open-for-write to support systems without O_SYNC, 
    in which case, do an fsync() after every write.

  storage/falcon/SerialLogFile.h@1.3, 2008-01-04 23:20:51-06:00, klewis@klewis-mysql. +1 -0
    33484 - Add third open-for-write to support systems without O_SYNC, 
    in which case, do an fsync() after every write.

  storage/falcon/StorageDatabase.cpp@1.9, 2008-01-04 23:20:53-06:00, klewis@klewis-mysql. +10 -0
    33072 - Return timeout error in places where the deadlock error is returned.

  storage/falcon/StorageParameters.h@1.20, 2008-01-04 23:20:55-06:00, klewis@klewis-mysql. +9 -9
    33474 - Change falcon_lock_timeout to falcon_lock_wait_timeout 
    33072 - Set the default for falcon_lock_wait_timeout=50 seconds,
    like InnoDB.  Document the flags better.

  storage/falcon/Transaction.cpp@1.18, 2008-01-04 23:20:56-06:00, klewis@klewis-mysql. +2 -2
    33474 - Change falcon_lock_timeout to falcon_lock_wait_timeout 
    33474 - Change the setting from milliseconds to seconds.

  storage/falcon/ha_falcon.cpp@1.45, 2008-01-04 23:20:58-06:00, klewis@klewis-mysql. +18 -6
    33661 - Return the next autoincrement number to use to the server.
    Do better cleanup from failed table creation.
    33191 - Serialization of delete operations where trigers are involved 
    occured in the MySQL server.  StorageInterface::store_lock() was not 
    changing the lock_type to TL_WRITE_ALLOW_WRITE because the conditional 
    statement was incorrect.  This lower lock type allows multiple threads
    to do triggered deletes in Falcon concurrently.
    The condition is now like InnoDB except for allowing concurrent truncates,
    which Falcon can do.

ChangeSet@1.2777, 2007-12-23 19:42:58+01:00, dfischer@mysql.com +1 -0
  TCP_Transporter.cpp:
    socklen_t breaks on HP-UX without _XOPEN_SOURCE_EXTENDED defined, but defining it breaks other code in mysql that uses int

  storage/ndb/src/common/transporter/TCP_Transporter.cpp@1.20, 2007-12-23 19:42:48+01:00, dfischer@mysql.com +1 -1
    socklen_t breaks on HP-UX without _XOPEN_SOURCE_EXTENDED defined, but defining it breaks other code in mysql that uses int

ChangeSet@1.2776, 2007-12-23 19:26:48+01:00, mkindahl@dl145h.mysql.com +1 -0
  BUG#33055 ():
  
  Temporary fix to make tests pass. Will fix it good later.

  sql/log_event.cc@1.306, 2007-12-23 19:26:38+01:00, mkindahl@dl145h.mysql.com +11 -0
    Setting the read and write sets just before using them.

ChangeSet@1.2775, 2007-12-21 22:05:56+01:00, joerg@trift2. +1 -0
  support-files/mysql.spec.sh
      Remove the Instance Manager ("mysqlmanager") from the spec file.
      
      This fixes bug#33469 as far as Linux is concerned.

  support-files/mysql.spec.sh@1.199, 2007-12-21 22:05:51+01:00, joerg@trift2. +6 -7
    Remove the Instance Manager ("mysqlmanager") from the spec file.
    
    This fixes bug#33469 as far as Linux is concerned.

ChangeSet@1.2774, 2007-12-21 15:59:57+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Patch to make BUG#33055 and BUG#33375 work together.

  mysql-test/suite/rpl/t/disabled.def@1.30, 2007-12-21 15:59:44+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Enabling rpl_optimize.

  sql/log_event.cc@1.305, 2007-12-21 15:59:45+01:00, mats@kindahl-laptop.dnsalias.net +1 -9
    Removing call to use_all_columns() and corresponding call
    to default_column_bitmap() since they should not be there.

ChangeSet@1.2773, 2007-12-21 03:16:05+01:00, mysqldev@mysql.com +1 -0
  mysql_install_db.sh:
    Apply patch for bug #33192 into the 6.0.4 release clone

  scripts/mysql_install_db.sh@1.95, 2007-12-21 03:15:01+01:00, mysqldev@mysql.com +17 -3
    Apply patch for bug #33192 into the 6.0.4 release clone

ChangeSet@1.2772, 2007-12-20 11:54:16+01:00, df@pippilotta.erinye.com +1 -0
  fix compile failure on HP-UX

  client/mysql.cc@1.288, 2007-12-20 11:54:13+01:00, df@pippilotta.erinye.com +3 -3
    only try to use TIOCGWINSZ if it is in fact defined

ChangeSet@1.2771, 2007-12-20 11:30:08+01:00, df@pippilotta.erinye.com +1 -0
  Fix AIX VisualAge compiler failure

  sql/sp_head.cc@1.303, 2007-12-20 11:30:05+01:00, df@pippilotta.erinye.com +1 -1
    Add throw() to definition of sp_head::operator delete(). It was recently added to the declaration in sp_head.h only.

ChangeSet@1.2770, 2007-12-20 11:11:37+01:00, df@pippilotta.erinye.com +1 -0
  BUG#33243 transparent_union unhelpful on OS X PPC64 

  include/my_atomic.h@1.8, 2007-12-20 11:11:34+01:00, df@pippilotta.erinye.com +2 -1
    BUG#33243 transparent_union unhelpful on OS X PPC64 

ChangeSet@1.2769, 2007-12-20 00:56:49+01:00, tsmith@mysql.com +1 -0
  For the 6.0.4-release clone:
    Set version string back to 6.0.4 after merge from 6.0-falcon

  configure.in@1.405, 2007-12-20 00:55:34+01:00, jperkin@mysql.com +1 -1
    Set version string back to 6.0.4 after merge from 6.0-falcon

ChangeSet@1.2768, 2007-12-20 00:52:34+01:00, jperkin@mysql.com +2 -0
  handler.cc, log_event.cc:
    Apply patch for bug #33375 (from -ndb tree) into 6.0.4 release clone

  sql/handler.cc@1.259, 2007-12-20 00:51:45+01:00, jperkin@mysql.com +2 -0
    Apply patch for bug #33375 (from -ndb tree) into 6.0.4 release clone

  sql/log_event.cc@1.304, 2007-12-20 00:51:45+01:00, jperkin@mysql.com +12 -8
    Apply patch for bug #33375 (from -ndb tree) into 6.0.4 release clone

ChangeSet@1.2764.1.1, 2007-12-19 21:18:21+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Disabling test case because of already reported bug.

  mysql-test/suite/rpl/t/disabled.def@1.29, 2007-12-19 21:18:16+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Disabling test case due to already reported bug.

ChangeSet@1.2763.1.2, 2007-12-19 20:09:58+01:00, hakank@lu0011.(none) +2 -0
  Make sure that test is executed only when Falcon
  is compiled and for row based binlog.

  mysql-test/suite/bugs/r/rpl_bug33055.result@1.2, 2007-12-19 20:09:56+01:00, hakank@lu0011.(none) +10 -4
    Test case clean up.

  mysql-test/suite/bugs/t/rpl_bug33055.test@1.2, 2007-12-19 20:09:56+01:00, hakank@lu0011.(none) +15 -4
    Make sure that test is executed only when Falcon
    is compiled and for row based binlog.

ChangeSet@1.2763.1.1, 2007-12-19 19:55:35+01:00, hakank@lu0011.(none) +10 -0
  Fixed Bug#33306 Several tests fail if partition support is not built.

  mysql-test/suite/falcon/t/falcon_bug_22178.test@1.5, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +1 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_22939.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_26827.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_26828.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_28026.test@1.4, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +1 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_28042.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_29332.test@1.4, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +1 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_30826.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +1 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bug_32833.test@1.3, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

  mysql-test/suite/falcon/t/falcon_bugs.test@1.5, 2007-12-19 19:55:30+01:00, hakank@lu0011.(none) +2 -0
    Fix for Bug#33306.

ChangeSet@1.2764, 2007-12-19 18:42:11+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Disabling test case after reporting bug.

  mysql-test/suite/binlog/t/disabled.def@1.6, 2007-12-19 18:42:06+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Disabling binlog_row_ctype_cp932.

ChangeSet@1.2763, 2007-12-19 16:02:45+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
  BUG#33055 (Replication fails for UPDATE when using falcon Storage engine):
  
  Patch to fix some pushbuild failures.

  mysql-test/suite/bugs/r/rpl_bug33055.result@1.1, 2007-12-19 16:02:36+01:00, mats@kindahl-laptop.dnsalias.net +60 -0
    New BitKeeper file ``mysql-test/suite/bugs/r/rpl_bug33055.result''

  mysql-test/suite/bugs/r/rpl_bug33055.result@1.0, 2007-12-19 16:02:36+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/bugs/t/rpl_bug33055.test@1.1, 2007-12-19 16:02:37+01:00, mats@kindahl-laptop.dnsalias.net +44 -0
    New BitKeeper file ``mysql-test/suite/bugs/t/rpl_bug33055.test''

  mysql-test/suite/bugs/t/rpl_bug33055.test@1.0, 2007-12-19 16:02:37+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/disabled.def@1.28, 2007-12-19 16:02:36+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Disabling rpl_row_basic_7ndb.

  sql/log_event.cc@1.303, 2007-12-19 16:02:36+01:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Exiting early in do_add_row_data when length of row is zero.

  sql/rpl_record.cc@1.20, 2007-12-19 16:02:36+01:00, mats@kindahl-laptop.dnsalias.net +5 -3
    Adding casts to debug printouts to avoid compiler warnings.
    Adding cast to signed value to avoid compiler warning when
    comparing with unsigned value. The signed value is always
    positive. 

ChangeSet@1.2761, 2007-12-19 12:25:09+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#33055 ():
  
  Minor changes done for failing tests.

  mysql-test/t/rpl_mysqldump_slave.test@1.3, 2007-12-19 12:25:03+01:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Test was writing to the current directory, which might not be writable.
    Changed test to write the the var directory, which is writable.

  sql/log_event.cc@1.302, 2007-12-19 12:25:03+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Correcting assertion that was too strong. Now 0 bytes of row data
    can actually be written.

ChangeSet@1.2758.1.3, 2007-12-19 10:23:16+01:00, hakank@lu0011.(none) +1 -0
  Bumped internal version number.

  storage/falcon/StorageVersion.h@1.6, 2007-12-19 10:23:14+01:00, hakank@lu0011.(none) +2 -2
    Bumped internal version number.

ChangeSet@1.2758.1.2, 2007-12-19 10:20:56+01:00, hakank@lu0011.(none) +1 -0
  Disabled tests which are failing due to bug 32992.

  mysql-test/suite/falcon/t/disabled.def@1.22, 2007-12-19 10:20:50+01:00, hakank@lu0011.(none) +9 -9
    Disabled tests which are failing due to bug 32992.

ChangeSet@1.2760, 2007-12-19 09:27:29+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#33055 (Replication fails for UPDATE when using falcon Storage engine):
  
  Supplementory patch to allow the injector interface to work with the
  new row-based implementation that honor the read- and write-sets of
  the tables being written.
  
  With this patch, NDB can also replicate correctly with the new code.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.18, 2007-12-19 09:27:24+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Disabling some failing tests.

  sql/rpl_injector.cc@1.12, 2007-12-19 09:27:24+01:00, mats@kindahl-laptop.dnsalias.net +11 -7
    Using new THD::binlog_*_row() interface that does not have
    a cols parameter. In order to do that, the cols parameter
    passed to the injectors functions are written to the read-
    and write-set of the table, and then restored afterwards.

  sql/rpl_injector.h@1.13, 2007-12-19 09:27:25+01:00, mats@kindahl-laptop.dnsalias.net +21 -0
    Introducing helping class that will auto-restore read-
    and write-sets when destructed.

ChangeSet@1.2758.1.1, 2007-12-18 20:33:08-08:00, brian@zim.(none) +4 -0
  This patch includes the examples needed to add Dtrace probes to the Falcon
  engine. A close() and open() were added as examples.
  
  To further extend the core library itself, a second set will need to
  be created.
  
  These only work if the engine is linked as a share library. 
  
  Makefile.am:
    Updates to build probes file.
  falcon_probes.d:
    BitKeeper file /home/brian/mysql/mysql-6.0-falcon-team/storage/falcon/falcon_probes.d
    ---
    Two sample probes.
  falcon_probes.h:
    BitKeeper file /home/brian/mysql/mysql-6.0-falcon-team/storage/falcon/falcon_probes.h
  ha_falcon.cpp:
    Include logic for probes.

  storage/falcon/Makefile.am@1.10, 2007-12-18 20:32:03-08:00, brian@zim.(none) +18 -2
    Updates to build probes file.

  storage/falcon/falcon_probes.d@1.1, 2007-12-18 20:31:28-08:00, brian@zim.(none) +19 -0
    BitKeeper file /home/brian/mysql/mysql-6.0-falcon-team/storage/falcon/falcon_probes.d
    ---
    Two sample probes.

  storage/falcon/falcon_probes.d@1.0, 2007-12-18 20:31:28-08:00, brian@zim.(none) +0 -0

  storage/falcon/falcon_probes.h@1.1, 2007-12-18 20:31:30-08:00, brian@zim.(none) +45 -0
    BitKeeper file /home/brian/mysql/mysql-6.0-falcon-team/storage/falcon/falcon_probes.h

  storage/falcon/falcon_probes.h@1.0, 2007-12-18 20:31:30-08:00, brian@zim.(none) +0 -0

  storage/falcon/ha_falcon.cpp@1.44, 2007-12-18 20:31:53-08:00, brian@zim.(none) +5 -0
    Include logic for probes.

ChangeSet@1.2759, 2007-12-18 18:26:54+01:00, mats@kindahl-laptop.dnsalias.net +10 -0
  BUG#33055 (Replication fails for UPDATE when using falcon Storage engine):
  
  The read- and write-sets were not respected when deciding what fields to
  transfer to the slave, nor when writing the row to the handler on the sla-
  ve side.
  
  This patch adds code that only writes the columns actually needed to be 
  able to replicate row-based. This means that the columns in the write set
  of the table is used for ha_write_row(), the columns in the read set for
  ha_delete_row(), and for ha_update_row() the columns in the read set is
  used for the before image, and the columns of the write set for the after
  image.
  
  In addition, for cursor-based delete and update, the necessary bits are
  set to be able to get enough information to locate the affected row on
  the slave side, which means that it behaves as if HA_PRIMARY_KEY_REQUIRED_
  FOR_DELETE was set for the table when row-based logging is active.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.3, 2007-12-18 18:26:43+01:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  sql/handler.cc@1.258, 2007-12-18 18:26:44+01:00, mats@kindahl-laptop.dnsalias.net +6 -23
    The function binlog_row_logging_function() does not need column
    information any more: that information is fetched directly from
    the read- and write-sets of the table instead. Hence, an unused
    initialization of a bitmap is removed, as well as error handling
    code for that initialization.

  sql/log_event.cc@1.301, 2007-12-18 18:26:44+01:00, mats@kindahl-laptop.dnsalias.net +15 -25
    Passing columns to new unpack_current_row() function: it now
    takes a column bitmap with the columns to unpack. When preparing
    the record before filling it in, the column vector now has to be
    passed so that the function knows what columns to initialize.
    
    The constructors for Write_rows, Delete_rows, and Update_rows
    now use either the read- or write-set of the table when packing
    rows for transfer, so the column vector parameter was removed.
    As a consequence, an overloaded version of the Update_rows
    constructor was removed.

  sql/log_event.h@1.166, 2007-12-18 18:26:44+01:00, mats@kindahl-laptop.dnsalias.net +8 -21
    The function unpack_current_row() now takes an extra column
    vector giving the columns to unpack and passes that to
    ::unpack_row() instead of m_cols previously (it can now be
    either m_cols or m_cols_ai, depending on situation).
    
    Removing redundant column vector parameter from constructors
    for Write_rows, Delete_rows, and Update_rows and removing
    a redundant constructor.
    
    Removing column vector parameters to binlog_row_logging_
    function() since they are no longer needed.

  sql/log_event_old.h@1.9, 2007-12-18 18:26:45+01:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Removing redundant column vector parameter from constructors
    for Write_rows, Delete_rows, and Update_rows and removing
    a redundant constructor.

  sql/rpl_record.cc@1.19, 2007-12-18 18:26:45+01:00, mats@kindahl-laptop.dnsalias.net +55 -21
    Adding debug printouts to be able to debug packing and unpacking of rows.
    
    Adding column vector to prepare_record(). The function prepare_record()
    now initializes all fields of the record, not just the "extra" ones that
    could be present on a slave with more columns. The function still prints
    an error for extra fields that does not have a default value (in the same
    manner as the old function), but does not print anything for columns that
    are present on the master and the slave.

  sql/rpl_record.h@1.6, 2007-12-18 18:26:45+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding column vector parameter to prepare_record().

  sql/sql_class.cc@1.365, 2007-12-18 18:26:45+01:00, mats@kindahl-laptop.dnsalias.net +13 -24
    Columns bitmap and number of columns no longer needed for binlog_*_row().
    The correct columns are fetched from the read- and write-set of the table
    instead. Consequence: binlog_prepare_pending_rows_event() does not need
    this info either.
    
    The function pack_row() is called with either the read- or the write-set
    of the table.

  sql/sql_class.h@1.407, 2007-12-18 18:26:46+01:00, mats@kindahl-laptop.dnsalias.net +2 -7
    Columns bitmap and number of columns no longer needed for binlog_*_row().
    The correct columns are fetched from the read- and write-set of the table
    instead. Consequence: binlog_prepare_pending_rows_event() does not need
    this info either.

  sql/table.cc@1.318, 2007-12-18 18:26:46+01:00, mats@kindahl-laptop.dnsalias.net +12 -6
    Columns marked for delete are marked in the same way as if
    HA_PRIMARY_KEY_REQUIRED_FOR_DELETE when row-based replication
    is active since the primary key (or entire row) has to be
    transfered to the slave. There is no way that the slave can
    know what row the master's cursor is positioned on when del-
    eting a row. This is done for both DELETE and UPDATE.

ChangeSet@1.2756.1.1, 2007-12-16 11:45:44-08:00, jas@pendragon. +1 -0
  Disabled falcon_ts as 1) not very interesting, and 2) force
  a full pushbuild.

  mysql-test/suite/falcon/t/disabled.def@1.21, 2007-12-16 11:45:41-08:00, jas@pendragon. +1 -1
    Disabled falcon_ts as 1) not very interesting, and 2) force
    a full pushbuild.

ChangeSet@1.2757, 2007-12-15 00:03:27-06:00, klewis@klewis-mysql. +4 -0
  Bug#33141 - Get rid of DATABASE column in INFORMATION_SCHEMA talbes;
  FALCON_TRANSACTIONS, FALCON_TRANSACTION_SUMMARY & FALCON_SERIAL_LOG_INFO.
  In FALCON_TRANSACTIONS, add a 'State' column and don't show the 
  transaction objects that are empty and available for reuse.

  storage/falcon/SerialLog.cpp@1.29, 2007-12-14 23:58:56-06:00, klewis@klewis-mysql. +1 -1
    Bug#33141 - Get rid of DATABASE column in INFORMATION_SCHEMA.FALCON_SERIAL_LOG_INFO.

  storage/falcon/Transaction.cpp@1.17, 2007-12-14 23:58:59-06:00, klewis@klewis-mysql. +36 -21
    Bug#33141 - Get rid of DATABASE column in INFORMATION_SCHEMA.FALCON_TRANSACTIONS
    Add a 'State' column and don't show the transaction objects that are empty 
    and available for reuse.

  storage/falcon/TransactionManager.cpp@1.10, 2007-12-14 23:59:02-06:00, klewis@klewis-mysql. +1 -1
    Bug#33141 - Get rid of DATABASE column in INFORMATION_SCHEMA.FALCON_TRANSACTION_SUMMARY

  storage/falcon/ha_falcon.cpp@1.43, 2007-12-15 00:03:18-06:00, klewis@klewis-mysql. +3 -3
    Bug#33141 - Get rid of DATABASE column in INFORMATION_SCHEMA talbes;
    FALCON_TRANSACTIONS, FALCON_TRANSACTION_SUMMARY & FALCON_SERIAL_LOG_INFO.
    In FALCON_TRANSACTIONS, add a 'State' column.

ChangeSet@1.2753.1.1, 2007-12-14 14:42:17-05:00, jas@rowvwade. +2 -0
  Fix apparent double recovery problem -- don't force deletion of
  already deleted records.  Fix for bug 33068.

  storage/falcon/RecordLocatorPage.cpp@1.3, 2007-12-14 14:42:09-05:00, jas@rowvwade. +3 -0
    Don't try to fix space slots on empty pages.

  storage/falcon/Section.cpp@1.20, 2007-12-14 14:42:09-05:00, jas@rowvwade. +9 -5
    Fix apparent double recovery problem -- don't force deletion of
    already deleted records.  Fix for bug 33068.

ChangeSet@1.2755, 2007-12-14 10:16:11-06:00, chris@xeno.mysql.com +1 -0
  Bug#33080, "Falcon: Index page corruption during gopher thread update"
  - Increase the number of add node attempts in IndexRootPage::addIndexEntry to accommodate multiple gopher threads attempting updates to the same index.

  storage/falcon/IndexRootPage.cpp@1.7, 2007-12-14 10:16:09-06:00, chris@xeno.mysql.com +3 -1
    Increase the number of attempts to add a new node in addIndexEntry.

ChangeSet@1.2754, 2007-12-14 10:58:01-05:00, jas@fluffy.netfrastructure.com +1 -0
  Update expected test result for falcon_ts.

  mysql-test/suite/falcon/r/falcon_ts.result@1.7, 2007-12-14 10:57:58-05:00, jas@fluffy.netfrastructure.com +9 -9
    Update expected test result for falcon_ts.

ChangeSet@1.2732.1.14, 2007-12-14 16:18:03+01:00, jperkin@mysql.com +1 -0
  mysql.spec.sh:
    Note Falcon being enabled in the ChangeLog.

  support-files/mysql.spec.sh@1.198, 2007-12-14 16:16:41+01:00, jperkin@mysql.com +4 -0
    Note Falcon being enabled in the ChangeLog.

ChangeSet@1.2753, 2007-12-13 17:52:31-05:00, jas@rowvwade. +2 -0
  Re-arrange field in RecordVersion for memory efficiency.

  storage/falcon/DataPage.h@1.3, 2007-12-13 17:52:23-05:00, jas@rowvwade. +1 -1
    Stylistic edit for clarity.

  storage/falcon/RecordVersion.h@1.3, 2007-12-13 17:52:23-05:00, jas@rowvwade. +3 -3
    Re-arrange field in RecordVersion for memory efficiency.

ChangeSet@1.2752, 2007-12-13 13:06:22-05:00, jas@rowvwade. +2 -0
  Fix error calculating space used on data page exposed by
  addition of page number to command page header.

  storage/falcon/DataPage.cpp@1.2, 2007-12-13 13:06:11-05:00, jas@rowvwade. +24 -2
    Fix error calculating space used on data page exposed by
    addition of page number to command page header.

  storage/falcon/DataPage.h@1.2, 2007-12-13 13:06:11-05:00, jas@rowvwade. +1 -0
    Fix error calculating space used on data page exposed by
    addition of page number to command page header.

ChangeSet@1.2751, 2007-12-13 12:08:00-05:00, jas@fluffy.netfrastructure.com +1 -0
  Changed test falcon_test to do a "select *" from the
  Falcon information schema tables to give us a little
  more information for debugging.

  mysql-test/suite/falcon/t/falcon_ts.test@1.8, 2007-12-13 12:07:57-05:00, jas@fluffy.netfrastructure.com +3 -3
    Changed test falcon_test to do a "select *" from the
    Falcon information schema tables to give us a little
    more information for debugging.

ChangeSet@1.2746.1.6, 2007-12-12 21:38:54-06:00, klewis@klewis-mysql. +2 -0
  Bug#33064 - The order that should be followed is Database:syncTables, 
  followed by Table::syncObject, then Database::syncSysConnection

  storage/falcon/Database.cpp@1.30, 2007-12-12 21:38:28-06:00, klewis@klewis-mysql. +0 -2
    Bug#33064 - The order that should be followed is Database:syncTables, 
    followed by Table::syncObject, then Database::syncSysConnection

  storage/falcon/StorageDatabase.cpp@1.8, 2007-12-12 21:38:35-06:00, klewis@klewis-mysql. +3 -0
    Bug#33064 - The order that should be followed is Database:syncTables, 
    followed by Table::syncObject, then Database::syncSysConnection

ChangeSet@1.2746.1.5, 2007-12-12 18:21:54-05:00, jas@fluffy.netfrastructure.com +1 -0
  Re-enabled a bunch of tests that should pass.  With luck, this
  will cause sporadicly failing tests to start failing again.

  mysql-test/suite/falcon/t/disabled.def@1.20, 2007-12-12 18:21:52-05:00, jas@fluffy.netfrastructure.com +10 -10
    Re-enabled a bunch of tests that should pass.  With luck, this
    will cause sporadicly failing tests to start failing again.

ChangeSet@1.2746.1.4, 2007-12-12 18:03:04-05:00, jas@rowvwade. +1 -0
  Turn assertion in IndexRootPage::addIndexEntry into
  post to Falcon log and handle situation.

  storage/falcon/IndexRootPage.cpp@1.6, 2007-12-12 18:02:55-05:00, jas@rowvwade. +3 -3
    Turn assertion in IndexRootPage::addIndexEntry into
    post to Falcon log and handle situation.

ChangeSet@1.1810.3451.21, 2007-12-12 19:49:08+01:00, istruewing@stella.local +1 -0
  Dummy push to help pushbuild running again.
  Fixed case of comment.

  mysql-test/t/merge.test@1.37.1.16, 2007-12-12 19:49:07+01:00, istruewing@stella.local +1 -1
    Fixed case of comment.

ChangeSet@1.2744.1.13, 2007-12-12 11:46:17+01:00, istruewing@stella.local +4 -0
  WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
                         and PARAMETERS Views
  Post-merge fix. Embedded server does not display privileges.

  mysql-test/r/information_schema_parameters.result@1.2, 2007-12-12 11:46:15+01:00, istruewing@stella.local +294 -15
    WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
                           and PARAMETERS Views
    Post-merge fix. Embedded server does not display privileges.

  mysql-test/r/information_schema_routines.result@1.2, 2007-12-12 11:46:15+01:00, istruewing@stella.local +630 -31
    WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
                           and PARAMETERS Views
    Post-merge fix. Embedded server does not display privileges.

  mysql-test/t/information_schema_parameters.test@1.2, 2007-12-12 11:46:15+01:00, istruewing@stella.local +3 -1
    WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
                           and PARAMETERS Views
    Post-merge fix. Embedded server does not display privileges.

  mysql-test/t/information_schema_routines.test@1.2, 2007-12-12 11:46:15+01:00, istruewing@stella.local +3 -1
    WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
                           and PARAMETERS Views
    Post-merge fix. Embedded server does not display privileges.

ChangeSet@1.1810.3491.1, 2007-12-11 17:38:49+01:00, df@pippilotta.erinye.com +1 -0
  No we're still at 5.0.54.

  configure.in@1.245.1.220, 2007-12-11 17:38:47+01:00, df@pippilotta.erinye.com +2 -2
    No we're still at 5.0.54.

ChangeSet@1.2529.243.1, 2007-12-11 15:32:10+01:00, istruewing@stella.local +7 -0
  Bug#30273 - merge tables: Can't lock file (errno: 155)
  
  The patch for Bug 26379 (Combination of FLUSH TABLE and
  REPAIR TABLE corrupts a MERGE table) fixed this bug too.
  However it revealed a new bug that crashed the server.
  
  Flushing a merge table at the moment when it is between open
  and attach of children crashed the server.
  
  The flushing thread wants to abort locks on the flushed table.
  It calls ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
  on the TABLE object of the other thread.
  
  Changed ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
  to accept non-attached children. ha_myisammrg::lock_count() returns
  the number of MyISAM tables in the MERGE table so that the memory
  allocation done by get_lock_data() is done correctly, even if the
  children become attached before ha_myisammrg::store_lock() is
  called. ha_myisammrg::store_lock() will not return any lock if the
  children are not attached.
  
  This is however a change in the handler interface. lock_count()
  can now return a higher number than store_lock() stores locks.
  This is more safe than the reverse implementation would be.
  get_lock_data() in the SQL layer is adjusted accordingly. It sets
  MYSQL_LOCK::lock_count based on the number of locks returned by
  the handler::store_lock() calls, not based on the numbers returned
  by the handler::lock_count() calls. The latter are only used for
  allocation of memory now.
  
  No test case. The test suite cannot reliably run FLUSH between
  lock_count() and store_lock() of another thread. The bug report
  contains a program that can repeat the problem with some
  probability.

  include/myisammrg.h@1.22, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -0
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added mutex to struct st_myrg_info (MYRG_INFO).

  sql/handler.h@1.258.1.20, 2007-12-11 15:32:09+01:00, istruewing@stella.local +10 -1
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Extended comments for handler::lock_count() and
    handler::store_lock().

  sql/lock.cc@1.97.15.6, 2007-12-11 15:32:09+01:00, istruewing@stella.local +17 -3
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Changed get_lock_data() so that the final lock_count is taken
    from the number of locks returned from handler::store_lock()
    instead of from handler::lock_count().

  sql/sql_base.cc@1.374.63.1, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -1
    Fixed a purecov comment. (unrelated to the rest of the changeset)

  storage/myisammrg/ha_myisammrg.cc@1.124.1.2, 2007-12-11 15:32:09+01:00, istruewing@stella.local +29 -2
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Changed ha_myisammrg::lock_count() and ha_myisammrg::store_lock()
    to accept non-attached children.
    Protected ha_myisammrg::store_lock() by MYRG_INFO::mutex.

  storage/myisammrg/myrg_close.c@1.12, 2007-12-11 15:32:09+01:00, istruewing@stella.local +1 -0
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added MYRG_INFO::mutex destruction to myrg_parent_close().

  storage/myisammrg/myrg_open.c@1.38.1.2, 2007-12-11 15:32:09+01:00, istruewing@stella.local +16 -1
    Bug#30273 - merge tables: Can't lock file (errno: 155)
    Added MYRG_INFO::mutex initialization to myrg_parent_open().
    Protected myrg_attach_children() and myrg_detach_children()
    by MYRG_INFO::mutex.
    Fixed a purecov comment. (unrelated to the rest of the changeset)

ChangeSet@1.2744.1.9, 2007-12-11 11:39:14+01:00, df@pippilotta.erinye.com +1 -0
  fix test results

  mysql-test/r/func_encrypt_nossl.result@1.4, 2007-12-11 11:39:11+01:00, df@pippilotta.erinye.com +21 -21
    someone changed the error message...

ChangeSet@1.2744.1.8, 2007-12-11 11:36:28+01:00, df@pippilotta.erinye.com +1 -0
  windows portability fix

  extra/yassl/taocrypt/include/type_traits.hpp@1.8, 2007-12-11 11:36:24+01:00, df@pippilotta.erinye.com +3 -0
    on Windows, we #define bool BOOL, which is the same type as signed int, thus causing a collission

ChangeSet@1.2746.1.3, 2007-12-10 12:37:20+01:00, hakank@lu0011.(none) +1 -0
  Fixed two gcc warnings.

  storage/falcon/RepositoryVolume.cpp@1.7, 2007-12-10 12:37:18+01:00, hakank@lu0011.(none) +2 -2
    Fixed two gcc warnings.

ChangeSet@1.2529.1.105, 2007-12-10 12:21:02+01:00, df@pippilotta.erinye.com +1 -0
  after-merge fix

  scripts/mysql_install_db.sh@1.94, 2007-12-10 12:21:00+01:00, df@pippilotta.erinye.com +1 -1
    after-merge fix

ChangeSet@1.2746.1.2, 2007-12-10 11:58:37+01:00, hakank@lu0011.(none) +3 -0
  Added test case for Bug# 33081.

  mysql-test/suite/falcon/r/falcon_bug_33081.result@1.1, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +11 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_33081.result''

  mysql-test/suite/falcon/r/falcon_bug_33081.result@1.0, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/disabled.def@1.19, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +1 -0
    Bug# 33081 is currently failing.

  mysql-test/suite/falcon/t/falcon_bug_33081.test@1.1, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +34 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_33081.test''

  mysql-test/suite/falcon/t/falcon_bug_33081.test@1.0, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +0 -0

ChangeSet@1.2746.1.1, 2007-12-08 06:08:12-06:00, klewis@klewis-mysql. +1 -0
  Bug#29151 - The setting for falcon_consistent_read at startup
  as set by --falcon-consistent-read=OFF was not being applied
  when Falcon intitalized.  So only 
  SET GLOBAL FALCON_CONSISTENT_READ=OFF 
  was being applied.  And that only to new connections.

  storage/falcon/ha_falcon.cpp@1.42, 2007-12-08 06:07:48-06:00, klewis@klewis-mysql. +5 -2
    Bug#29151 - The setting for falcon_consistent_read at startup
    as set by --falcon-consistent-read=OFF was not being applied
    when Falcon intitalized.  So only 
    SET GLOBAL FALCON_CONSISTENT_READ=OFF 
    was being applied.  And that only to new connections.

ChangeSet@1.2744.4.2, 2007-12-07 22:57:35-05:00, cmiller@zippy.cornsilk.net +4 -0
  Further fix-ups for various platforms, and correct unfriendly idea
  in YaSSL code.

  extra/yassl/include/yassl_types.hpp@1.17, 2007-12-07 22:57:32-05:00, cmiller@zippy.cornsilk.net +2 -4
    Undo terrible, intrusive idea in exported header.

  extra/yassl/taocrypt/include/misc.hpp@1.19, 2007-12-07 22:57:32-05:00, cmiller@zippy.cornsilk.net +2 -4
    Undo terrible, intrusive idea in exported header.

  include/sha2.h@1.3, 2007-12-07 22:57:32-05:00, cmiller@zippy.cornsilk.net +5 -3
    Make SHA2 code only read headers if a SSL library is asserted to 
    exist.

  sql/item_strfunc.cc@1.333, 2007-12-07 22:57:32-05:00, cmiller@zippy.cornsilk.net +1 -2
    Reorder headers to be more sane.

ChangeSet@1.2529.240.2, 2007-12-07 19:27:45-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
  
  Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  mysql-test/r/events_scheduling.result@1.13, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +2 -2
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  mysql-test/t/disabled.def@1.243.44.1, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +0 -1
    Enable events_scheduling test

  mysql-test/t/events_scheduling.test@1.17, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +1 -1
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

  sql/event_data_objects.cc@1.112, 2007-12-07 19:27:36-05:00, dkatz@damien-katzs-computer.local +0 -2
    Bug#29830	Test case 'events_scheduling' fails on Mac OS X and Windows.
    
    Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

ChangeSet@1.2744.1.4, 2007-12-07 15:11:49-07:00, tsmith@ramayana.hindu.god +1 -0
  Explicitly ignore the 'skip-im' option, so it doesn't get passed
  through directly to mysqld.  WL#4085 "Discontinue the instance manager"

  mysql-test/mysql-test-run.pl@1.157, 2007-12-07 15:11:48-07:00, tsmith@ramayana.hindu.god +1 -1
    Explicitly ignore the 'skip-im' option, so it doesn't get passed
    through directly to mysqld.  WL#4085 "Discontinue the instance manager"

ChangeSet@1.1810.3451.15, 2007-12-07 14:43:31-07:00, tsmith@ramayana.hindu.god +1 -0
  Add a way to remove options which mysql-test-run.pl no longer uses.

  mysql-test/mysql-test-run.pl@1.30.49.111, 2007-12-07 14:43:29-07:00, tsmith@ramayana.hindu.god +25 -0
    Add a way to remove options which mysql-test-run.pl no longer uses.  Since
    mysql-test-run.pl passes unrecognized options through to mysqld directly,
    it is not possible to just remove an option.  Otherwise it would be given
    to mysqld, which probably will not recognize it and will fail to start.
    
    Instead, we now explicitly ignore the option, and print a warning to
    the user.

ChangeSet@1.2747, 2007-12-07 21:28:49+01:00, hakank@lu0011.(none) +8 -0
  Adjusted test cases to reflect falcon_consisten_read
  flag, which is a global setting.

  mysql-test/suite/falcon/r/falcon_bug_29151.result@1.4, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +11 -7
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.5, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +13 -12
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/r/falcon_bug_29151_B.result@1.4, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +13 -12
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/r/falcon_bug_29151_C.result@1.4, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +14 -13
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/t/falcon_bug_29151.test@1.6, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +21 -12
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.5, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +29 -23
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/t/falcon_bug_29151_B.test@1.4, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +29 -23
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.5, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +31 -25
    Adjusted test case to reflect falcon_consisten_read
    flag, which is a global setting.

ChangeSet@1.2744.4.1, 2007-12-07 15:17:34-05:00, cmiller@zippy.cornsilk.net +2 -0
  Fix build failures on sapsrv1 WRT openssl and size_t .

  include/sha2.h@1.2, 2007-12-07 15:17:31-05:00, cmiller@zippy.cornsilk.net +4 -0
    openssl may not include sufficient headers to find "size_t", which
    is in stddef.h .

  sql/mysqld.cc@1.679, 2007-12-07 15:17:31-05:00, cmiller@zippy.cornsilk.net +1 -3
    Always call end_ssl, the same way we always call init_ssl.  There's
    more to SSL than communication.

ChangeSet@1.2701.4.2, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
  Bug#13174: SHA2 function
  Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
  
  Implement SHA2 functions.
  
  Chad added code to make it work with YaSSL.  Also, he removed the 
  (probable) bug of embedded server never using SSL-dependent 
  functions.  (libmysqld/Makefile.am didn't read ANY autoconf defs.)
  
  Function specification:
    SHA2( string cleartext, integer hash_length ) 
      -> string hash, or NULL
  where hash_length is one of 224, 256, 384, or 512.  If either is 
  NULL or a length is unsupported, then the result is NULL.  The 
  resulting string is always the length of the hash_length parameter
  or is NULL.
  
  Include the canonical hash examples from the NIST in the test
  results.
  ---
  Polish and address concerns of reviewers.

  BitKeeper/etc/ignore@1.303.1.1, 2007-12-07 09:35:23-05:00, cmiller@zippy.cornsilk.net +1 -0
    Added libmysqld/sha2.cc to the ignore list

  client/mysql.cc@1.287, 2007-12-07 09:35:23-05:00, cmiller@zippy.cornsilk.net +3 -3
    Add condition to remove code for embedded server.

  client/mysqltest.c@1.319.2.1, 2007-12-07 09:35:23-05:00, cmiller@zippy.cornsilk.net +2 -2
    Add condition to remove code for embedded server.

  include/Makefile.am@1.89, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    New header file to header list.

  include/mysql_embed.h@1.15, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +0 -1
    Embedded servers can use SSL-library functions too!

  include/sha2.h@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +66 -0
    Compatibility layer to make YaSSL behave like OpenSSL.

  include/sha2.h@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  include/sslopt-case.h@1.17, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Remove SSL-communication parameters from command lines.

  include/sslopt-longopts.h@1.15, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Remove SSL-communication parameters from command lines.

  include/sslopt-vars.h@1.9, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Don't declare variables that are only used in SSL communication, if
    we are compiling the embedded server.

  include/violite.h@1.59, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +3 -0
    Don't even compile the SSL-communication function if we're in the
    embedded server.
    ---
    Remove CPP condition indentation.

  libmysqld/CMakeLists.txt@1.18, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Add new file to source list.

  libmysqld/Makefile.am@1.118.1.1, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +2 -0
    Include standard DEFS in embedded compilation.  It's an undiscovered
    but that it's not there.
    
    Add new file to source list.

  libmysqld/examples/Makefile.am@1.42, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Include autoconf DEFS.

  libmysqld/lib_sql.cc@1.148, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -0
    Initialize SSL-related variables in embedded server.

  mysql-test/include/have_ssl_communication.inc@1.7, 2007-12-07 09:34:26-05:00, cmiller@zippy.cornsilk.net +0 -0
    Rename: mysql-test/include/have_ssl.inc -> mysql-test/include/have_ssl_communication.inc

  mysql-test/include/have_ssl_crypto_functs.inc@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +8 -0
    Distinguish between communication and crypto.
    
    Use the tristate value of "have_ssl" variable to know whether to
    test or not for SSL-provided crypto functions.

  mysql-test/include/have_ssl_crypto_functs.inc@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/func_digest.result@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +1413 -0
    Test against the sample test vectors in the NIST Secure 
    Hash Standard (http://csrc.nist.gov/cryptval/shs.htm)

  mysql-test/r/func_digest.result@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/r/have_ssl_is_yes_or_disabled_only.require@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +2 -0
    Distinguish between communication and crypto.
    
    Use the tristate value of "have_ssl" variable to know whether to
    test or not for SSL-provided crypto functions.

  mysql-test/r/have_ssl_is_yes_or_disabled_only.require@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/suite/rpl/t/rpl_ssl.test@1.11.1.2, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Distinguish between communication and crypto.

  mysql-test/suite/rpl/t/rpl_ssl1.test@1.32, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Distinguish between communication and crypto.

  mysql-test/t/func_des_encrypt.test@1.4, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Distinguish between communication and crypto.

  mysql-test/t/func_digest.test@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +483 -0
    Test against the sample test vectors in the NIST Secure 
    Hash Standard (http://csrc.nist.gov/cryptval/shs.htm)
    
    Also, test that various parameters (legal and illegal) 
    do what we expect.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/func_digest.test@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/func_encrypt.test@1.9, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Distinguish between communication and crypto.

  mysql-test/t/openssl_1.test@1.25, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/ssl-big.test@1.2, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +3 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/ssl.test@1.5, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +3 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/ssl_8k_key.test@1.2, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +3 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/ssl_compress.test@1.5, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +4 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  mysql-test/t/ssl_connect.test@1.3, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +4 -1
    Don't test SSL communication if we're in the embedded server.
    ---
    Distinguish between communication and crypto.

  sql-common/client.c@1.147.2.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +16 -16
    SSL is useful for more functionality than just connecting.  Test
    for whether we are not embedded server also.

  sql/CMakeLists.txt@1.28, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Add new source file to source list so that we have access to SHA2
    functions.

  sql/Makefile.am@1.203, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    Add new source file to source list so that we have access to SHA2
    functions.

  sql/item_create.cc@1.93, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +23 -0
    Bootstrap the SHA2 function into the server.

  sql/item_strfunc.cc@1.330.1.1, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +147 -5
    Add new SHA2 Item class methods.
    
    Clean up two minor problems.
    ---
    Remove extraneous debugging.
    ---
    We must check nullness of a parameter only /after/ computing its
    value.

  sql/item_strfunc.h@1.138.1.1, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +12 -0
    Declare new SHA2 Item class.

  sql/mysqld.cc@1.673.1.2, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +15 -7
    For embedded server, don't refer to SSL-communications variables
    or values.
    ---
    Remove CPP condition indentation.

  sql/set_var.cc@1.243.1.9, 2007-12-07 09:35:24-05:00, cmiller@zippy.cornsilk.net +1 -1
    For embedded server, don't refer to SSL-communications variables
    or values.

  sql/sha2.cc@1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +68 -0
    Compatibility layer to make YaSSL behave like OpenSSL.
    ---
    Add comment for generated functions.

  sql/sha2.cc@1.0, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +0 -0

  sql/sql_acl.cc@1.256.2.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +2 -2
    For embedded server, don't refer to SSL-communications variables
    or values.

  sql/sql_connect.cc@1.26.1.1, 2007-12-07 09:35:25-05:00, cmiller@zippy.cornsilk.net +5 -5
    SSL is useful for more functionality than just connecting.  Test
    for whether we are not embedded server also.
    ---
    Remove redundant test conditions.

ChangeSet@1.2529.241.2, 2007-12-07 14:46:52+01:00, joerg@trift2. +1 -0
  Makefile.am
      Makefile syntax error, comment should precede the whole target.

  Makefile.am@1.144.2.2, 2007-12-07 14:46:47+01:00, joerg@trift2. +1 -1
    Makefile syntax error, comment should precede the whole target.

ChangeSet@1.2529.241.1, 2007-12-07 11:54:59+01:00, joerg@trift2. +1 -0
  Makefile.am
      In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.

  Makefile.am@1.144.2.1, 2007-12-07 11:54:55+01:00, joerg@trift2. +8 -1
    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
    
    Reason:
    For release builds, we run the tests in a tree that contains just a binary installation.
    So the Makefile is not in the test tree, and we explicitly address it in the build tree.
    This explicit path is not kept by "make", so it is missing in the sub-make.
    There seems to be no way to solve this with (portable!) "make" features -
    we could add a new variable and use it in the sub-make, but it is easier to duplicate these few lines.

ChangeSet@1.2529.240.1, 2007-12-07 14:44:03+04:00, svoj@mysql.com +3 -0
  BUG#32817 - though CSV is marked as supported create table is rejected
              with error 1005.
  
  CSV doesn't support nullable fields. Report descriptive error if create
  table with nullable field is requested.

  mysql-test/r/csv.result@1.25, 2007-12-07 14:44:01+04:00, svoj@mysql.com +8 -2
    A test case for BUG#32817.

  mysql-test/t/csv.test@1.30, 2007-12-07 14:44:01+04:00, svoj@mysql.com +9 -2
    A test case for BUG#32817.

  storage/csv/ha_tina.cc@1.84.1.3, 2007-12-07 14:44:01+04:00, svoj@mysql.com +4 -1
    CSV doesn't support nullable fields. Report descriptive error if create
    table with nullable field is requested.

ChangeSet@1.1810.3451.12, 2007-12-07 03:39:37-07:00, tsmith@ramayana.hindu.god +2 -0
  Make tests more robust (clean up better after grant.test)

  mysql-test/r/grant.result@1.37.15.1, 2007-12-07 03:39:36-07:00, tsmith@ramayana.hindu.god +2 -0
    Update test results to .test changes

  mysql-test/t/grant.test@1.41.10.1, 2007-12-07 03:39:36-07:00, tsmith@ramayana.hindu.god +2 -0
    Drop users when done with them, to avoid skewing results of later tests.
    
    For example, running some test which examines the cardinality of the
    mysql.user table would fail if run right after this test, due to the
    extra users. 

ChangeSet@1.2529.239.4, 2007-12-07 00:54:32-07:00, tsmith@ramayana.hindu.god +4 -0
  Move the test case for bug #20901 from create.test to grant.test, so
  testing embedded server works correctly.

  mysql-test/r/create.result@1.144.1.14, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +0 -38
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/r/grant.result@1.85.1.1, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +39 -0
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/t/create.test@1.107.1.1, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +0 -76
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

  mysql-test/t/grant.test@1.65, 2007-12-07 00:54:30-07:00, tsmith@ramayana.hindu.god +78 -0
    Move one test from create.test to grant.test, because it actually tests
    privileges (and thus doesn't work with embedded server).

ChangeSet@1.1810.3451.11, 2007-12-06 16:11:26-07:00, tsmith@ramayana.hindu.god +1 -0
  Fix compiler warning about wrong integer size (probably harmless)

  sql/sql_select.cc@1.312.1.241, 2007-12-06 16:11:24-07:00, tsmith@ramayana.hindu.god +1 -1
    Fix compiler warning (probably harmless, wrong integer size)

ChangeSet@1.1616.3120.2, 2007-12-06 15:05:24-07:00, tsmith@ramayana.hindu.god +1 -0
  ctype-simple.c: Backport quick fix to remove Windows compiler warnings

  strings/ctype-simple.c@1.57.1.13, 2007-12-06 15:05:23-07:00, tsmith@ramayana.hindu.god +2 -2
    Backport quick fix to remove Windows compiler warnings.

ChangeSet@1.2733.2.3, 2007-12-06 15:40:05-05:00, pcrews@pcrews-mac-local.local +2 -0
  Results files for WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES and PARAMETERS view

  mysql-test/r/information_schema_parameters.result@1.1, 2007-12-06 15:40:03-05:00, pcrews@pcrews-mac-local.local +185 -0
    Result file for testing creation of INFORMATION_SCHEMA.PARAMETERS view -
    WL#2003

  mysql-test/r/information_schema_parameters.result@1.0, 2007-12-06 15:40:03-05:00, pcrews@pcrews-mac-local.local +0 -0

  mysql-test/r/information_schema_routines.result@1.1, 2007-12-06 15:40:04-05:00, pcrews@pcrews-mac-local.local +198 -0
    Result file to test changes for WL#2822 - INFORMATION_SCHEMA.ROUTINES -- add missing columns

  mysql-test/r/information_schema_routines.result@1.0, 2007-12-06 15:40:04-05:00, pcrews@pcrews-mac-local.local +0 -0

ChangeSet@1.2529.1.100, 2007-12-06 18:26:50+01:00, mleich@five.local.lan +1 -0
  Fix for
     Bug#32856 testsuite parts: partition_basic_myisam fails 
                                in pushbuild
  Skip test if symlink support is missing.

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.5, 2007-12-06 18:26:46+01:00, mleich@five.local.lan +3 -0
    Skip test if running on a server with disabled symlinking.

ChangeSet@1.2732.1.12, 2007-12-06 17:50:44+01:00, jperkin@mysql.com +1 -0
  make_binary_distribution.sh:
    Copy mysqld-debug into the archive seperately, as
    it isn't handled by 'make install'.

  scripts/make_binary_distribution.sh@1.131.1.2, 2007-12-06 17:49:58+01:00, jperkin@mysql.com +6 -0
    Copy mysqld-debug into the archive seperately, as
    it isn't handled by 'make install'.

ChangeSet@1.2732.1.11, 2007-12-06 17:01:43+01:00, jperkin@mysql.com +1 -0
  mysql.spec.sh:
    Whitespace cleanup.
    Disable Falcon if not explicitly enabled.

  support-files/mysql.spec.sh@1.197, 2007-12-06 17:01:15+01:00, jperkin@mysql.com +6 -6
    Whitespace cleanup.

  support-files/mysql.spec.sh@1.196, 2007-12-06 17:00:02+01:00, jperkin@mysql.com +4 -0
    Disable Falcon if not explicitly enabled.

ChangeSet@1.2732.1.10, 2007-12-06 16:52:14+01:00, jperkin@mysql.com +1 -0
  mysql.spec.sh:
    Enable Falcon on i386 and x86_64.

  support-files/mysql.spec.sh@1.195, 2007-12-06 16:51:31+01:00, jperkin@mysql.com +6 -0
    Enable Falcon on i386 and x86_64.

ChangeSet@1.2732.1.9, 2007-12-06 16:37:01+01:00, jperkin@mysql.com +1 -0
  compile-dist:
    Add back --with-embedded-server, else the embedded manual
    pages get dropped during a 'make dist'.

  BUILD/compile-dist@1.21, 2007-12-06 16:36:19+01:00, jperkin@mysql.com +1 -0
    Add back --with-embedded-server, else the embedded manual
    pages get dropped during a 'make dist'.

ChangeSet@1.2733.2.2, 2007-12-06 09:55:01-05:00, pcrews@pcrews-mac-local.local +3 -0
  New test files for WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES and PARAMETERS Views

  BitKeeper/etc/ignore@1.304, 2007-12-06 09:54:59-05:00, pcrews@pcrews-mac-local.local +3 -0
    Added .DS_Store ylwrap mysql-test/.DS_Store to the ignore list

  mysql-test/t/information_schema_parameters.test@1.1, 2007-12-06 09:54:59-05:00, pcrews@pcrews-mac-local.local +248 -0
    Test file for WL#2003 - INFORMATION_SCHEMA.PARAMETERS View

  mysql-test/t/information_schema_parameters.test@1.0, 2007-12-06 09:54:59-05:00, pcrews@pcrews-mac-local.local +0 -0

  mysql-test/t/information_schema_routines.test@1.1, 2007-12-06 09:54:59-05:00, pcrews@pcrews-mac-local.local +244 -0
    Test file for WL#2822 INFORMATION_SCHEMA - Add missing columns to ROUTINES View

  mysql-test/t/information_schema_routines.test@1.0, 2007-12-06 09:54:59-05:00, pcrews@pcrews-mac-local.local +0 -0

ChangeSet@1.2529.169.73, 2007-12-06 14:43:06+01:00, mattiasj@witty.ndb.mysql.com +3 -0
  Bug#32948: FKs allowed to reference partitioned table
  
  Problem: when alter to partitioned table,
  it does not see it as change of engine.
  
  Solution: If alter includes partitioning, check if it is possible
  to change engines (eg. is the table referenced by a FK)

  mysql-test/r/partition_innodb.result@1.10, 2007-12-06 14:43:04+01:00, mattiasj@witty.ndb.mysql.com +12 -0
    Bug#32948: FKs allowed to reference partitioned table
    test result

  mysql-test/t/partition_innodb.test@1.9, 2007-12-06 14:43:04+01:00, mattiasj@witty.ndb.mysql.com +15 -0
    Bug#32948: FKs allowed to reference partitioned table
    test case

  sql/sql_table.cc@1.388.68.1, 2007-12-06 14:43:05+01:00, mattiasj@witty.ndb.mysql.com +2 -1
    Bug#32948: FKs allowed to reference partitioned table
    
    if alter to partitioning, it is the same as changing engine.

ChangeSet@1.2746, 2007-12-06 12:43:33+01:00, hakank@walldorf.(none) +1 -0
  Bumped internal Falcon version.

  storage/falcon/StorageVersion.h@1.5, 2007-12-06 12:43:32+01:00, hakank@walldorf.(none) +2 -2
    Bumped internal Falcon version.

ChangeSet@1.2732.3.2, 2007-12-05 23:52:35+01:00, hakank@lu0011.(none) +2 -0
  Get FreeBSD compile to work (again)!

  mysql-test/suite/falcon/t/falcon_bug_29151.test@1.5, 2007-12-05 23:52:31+01:00, hakank@lu0011.(none) +1 -1
    Fixed typo in comment.

  storage/falcon/Configuration.cpp@1.16, 2007-12-05 23:52:31+01:00, hakank@lu0011.(none) +2 -2
    Fixed typo to get FreeBSD build running.

ChangeSet@1.2529.239.2, 2007-12-05 13:54:11-07:00, tsmith@ramayana.hindu.god +1 -0
  Post-merge fix (reorder tests in ctype_ucs.test)

  mysql-test/t/ctype_ucs.test@1.39.4.11, 2007-12-05 13:54:08-07:00, tsmith@ramayana.hindu.god +8 -8
    Post-merge fix (fix order of tests to match results).

ChangeSet@1.2732.2.3, 2007-12-05 12:01:27-05:00, jas@rowvwade. +4 -0
  Handle pre-Falcon blob repositories.

  storage/falcon/Dbb.cpp@1.19, 2007-12-05 12:01:18-05:00, jas@rowvwade. +1 -1
    Be a little more careful about recognizing an pre-Falcon database.

  storage/falcon/RepositoryVolume.cpp@1.6, 2007-12-05 12:01:19-05:00, jas@rowvwade. +11 -6
    Handle pre-Falcon blob repository volumes.

  storage/falcon/Section.cpp@1.19, 2007-12-05 12:01:19-05:00, jas@rowvwade. +1 -1
    Don't be so picky about section pages having a zero page
    types.

  storage/falcon/TableSpace.cpp@1.6, 2007-12-05 12:01:20-05:00, jas@rowvwade. +7 -5
    Handle pre-Falcon blob repositories.

ChangeSet@1.2732.1.8, 2007-12-05 16:46:13+01:00, jperkin@mysql.com +1 -0
  Makefile.am:
    Pass current Makefile location to sub make process so that
    they can find it correctly.

  Makefile.am@1.144.1.3, 2007-12-05 16:40:55+01:00, jperkin@mysql.com +1 -1
    Pass current Makefile location to sub make process so that
    they can find it correctly.

ChangeSet@1.2742, 2007-12-05 14:58:07+03:00, anozdrin@station. +1 -0
  Manual merge.

  mysql-test/t/disabled.def@1.296, 2007-12-05 14:58:04+03:00, anozdrin@station. +2 -0
    Manual merge.

ChangeSet@1.2529.238.1, 2007-12-05 09:48:13-02:00, davi@mysql.com +2 -0
  Bug#32996 log_tables.test fails sporadically
  
  Only select entries from the general_log that were issued by the current
  connection.

  mysql-test/r/log_tables.result@1.30, 2007-12-05 09:48:11-02:00, davi@mysql.com +2 -1
    Update test result.

  mysql-test/t/log_tables.test@1.26, 2007-12-05 09:48:11-02:00, davi@mysql.com +2 -1
    Only select entries from the current thread.

ChangeSet@1.2732.1.7, 2007-12-05 12:19:45+01:00, jperkin@mysql.com +5 -0
  Rename PAGESIZE -> NDB_PAGESIZE to avoid clashing on systems which
  define their own PAGESIZE in system headers.

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp@1.16, 2007-12-05 12:17:19+01:00, jperkin@mysql.com +26 -26
    PAGESIZE -> NDB_PAGESIZE

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp@1.9, 2007-12-05 12:17:52+01:00, jperkin@mysql.com +1 -1
    PAGESIZE -> NDB_PAGESIZE

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp@1.11, 2007-12-05 12:18:18+01:00, jperkin@mysql.com +1 -1
    PAGESIZE -> NDB_PAGESIZE

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp@1.5, 2007-12-05 12:16:20+01:00, jperkin@mysql.com +14 -14
    PAGESIZE -> NDB_PAGESIZE

  storage/ndb/test/ndbapi/celloDb.cpp@1.6, 2007-12-05 12:15:17+01:00, jperkin@mysql.com +5 -5
    PAGESIZE -> NDB_PAGESIZE

ChangeSet@1.2732.1.6, 2007-12-05 11:56:21+01:00, jperkin@mysql.com +1 -0
  ndb_version.h.in:
    Block code, fix syntax errors with xlC.

  storage/ndb/include/ndb_version.h.in@1.25, 2007-12-05 11:54:53+01:00, jperkin@mysql.com +20 -20
    Block code, fix syntax errors with xlC.

ChangeSet@1.2732.1.5, 2007-12-05 11:32:44+01:00, jperkin@mysql.com +1 -0
  concurrency_test.c:
    Do not include getopt.h

  storage/archive/concurrency_test.c@1.2, 2007-12-05 11:32:21+01:00, jperkin@mysql.com +0 -1
    Do not include getopt.h

ChangeSet@1.2732.1.4, 2007-12-05 11:22:31+01:00, jperkin@mysql.com +1 -0
  mysqlslap.c:
    Remove extraneous "," from last element in enum.

  client/mysqlslap.c@1.76.1.1, 2007-12-05 11:20:09+01:00, jperkin@mysql.com +1 -1
    Remove extraneous "," from last element in enum.

ChangeSet@1.2732.1.3, 2007-12-05 11:17:35+01:00, jperkin@mysql.com +3 -0
  Rename Ndbd_mem_manager::log2 to Ndbd_mem_manager::ndb_log2 to
  avoid a namespace clash with the compat log2() macro provided
  in my_global.h

  storage/ndb/src/kernel/vm/NdbdSuperPool.cpp@1.3, 2007-12-05 11:14:26+01:00, jperkin@mysql.com +1 -1
    log2() -> ndb_log2()

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@1.18, 2007-12-05 11:14:51+01:00, jperkin@mysql.com +4 -4
    log2() -> ndb_log2()

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp@1.10, 2007-12-05 11:15:02+01:00, jperkin@mysql.com +1 -1
    log2() -> ndb_log2()

ChangeSet@1.2740, 2007-12-05 13:05:02+03:00, anozdrin@station. +2 -0
  Disable failing tests:
    - BUG#32992: falcon_read-committed.test causes a server crash
      occasionally;
    - BUG#32993: falcon_ts.test fails sporadically;
    - BUG#32994: subselect_sj fails sporadically (timeout).

  mysql-test/suite/falcon/t/disabled.def@1.18, 2007-12-05 13:04:59+03:00, anozdrin@station. +2 -0
    Disable failing tests.

  mysql-test/t/disabled.def@1.294, 2007-12-05 13:04:59+03:00, anozdrin@station. +1 -0
    Disable failing tests.

ChangeSet@1.2732.3.1, 2007-12-04 20:46:39-06:00, chris@xeno.mysql.com +2 -0
  Bug#32963, falcon_bug_22173a fails
  - Eliminated potential deadlock between scavenger and truncate operation

  storage/falcon/Database.cpp@1.27.1.1, 2007-12-04 20:46:37-06:00, chris@xeno.mysql.com +18 -12
    Database::truncateTable()
    - Reordered locking order and lock types:
        Table::syncScavenge (exclusive)
        Database::syncTables (shared)
        Table::syncObject (exclusive)
        Database::syncSysConnection (shared)
    
    Database::updateCardinalities()
    - Reveresd lock order of syncTables and sysConnection
     

  storage/falcon/Table.cpp@1.30, 2007-12-04 20:46:37-06:00, chris@xeno.mysql.com +12 -15
    Table::truncate()
    - Removed redundant exclusive lock
    - Moved system transaction acquisition back to Database
    - Update cardinality along with section ids in system.tables 

ChangeSet@1.2732.2.2, 2007-12-04 16:16:33-05:00, jas@rowvwade. +18 -0
  Integrate blob repository volumes with the Falcon table space
  management mechanisms.

  storage/falcon/BDB.cpp@1.4, 2007-12-04 16:16:19-05:00, jas@rowvwade. +3 -2
    Check for read-only table space file on Bdb::mark operation.

  storage/falcon/Cache.cpp@1.45, 2007-12-04 16:16:19-05:00, jas@rowvwade. +3 -2
    Don't mark trial reads on readonly tablespace page as dirty.

  storage/falcon/Database.cpp@1.28, 2007-12-04 16:16:20-05:00, jas@rowvwade. +1 -0
    Checkin with table space manager after recovery to close
    any blob repositories opened during recovery.

  storage/falcon/Dbb.cpp@1.18, 2007-12-04 16:16:20-05:00, jas@rowvwade. +0 -6
    Handle repositories as full blown Falcon table spaces.

  storage/falcon/EncodedDataStream.cpp@1.3, 2007-12-04 16:16:20-05:00, jas@rowvwade. +30 -16
    Support signed blob ids (necessary for blob repositories).

  storage/falcon/IO.cpp@1.22, 2007-12-04 16:16:21-05:00, jas@rowvwade. +6 -0
    Track read-only flag in IO object.

  storage/falcon/IOx.h@1.12, 2007-12-04 16:16:21-05:00, jas@rowvwade. +1 -0
    Track read-only flag in IO object.

  storage/falcon/RepositoryVolume.cpp@1.5, 2007-12-04 16:16:21-05:00, jas@rowvwade. +14 -4
    Switch repositories over to Falcon table space mechanism.

  storage/falcon/RepositoryVolume.h@1.3, 2007-12-04 16:16:22-05:00, jas@rowvwade. +2 -0
    Switch repositories over to Falcon table space mechanism.

  storage/falcon/SRLCreateIndex.cpp@1.2, 2007-12-04 16:16:22-05:00, jas@rowvwade. +5 -0
    Create indexes form index version 0 during recovery (support
    for blob repositories).

  storage/falcon/SRLCreateTableSpace.cpp@1.4, 2007-12-04 16:16:22-05:00, jas@rowvwade. +8 -1
    Track table space type in SRLCreateTableSpace.

  storage/falcon/SRLCreateTableSpace.h@1.3, 2007-12-04 16:16:23-05:00, jas@rowvwade. +1 -0
    Track table space type in SRLCreateTableSpace.

  storage/falcon/SRLVersion.h@1.2, 2007-12-04 16:16:23-05:00, jas@rowvwade. +2 -1
    Create new serial log version to track table space type.

  storage/falcon/Statement.cpp@1.8, 2007-12-04 16:16:23-05:00, jas@rowvwade. +1 -1
    Handle both Falcon table spaces and blob repository volumes
    in TableSpaceManager.

  storage/falcon/TableSpace.cpp@1.5, 2007-12-04 16:16:24-05:00, jas@rowvwade. +27 -5
    Handle both Falcon table spaces and blob repository volumes
    in TableSpaceManager.

  storage/falcon/TableSpace.h@1.5, 2007-12-04 16:16:24-05:00, jas@rowvwade. +6 -1
    Handle both Falcon table spaces and blob repository volumes
    in TableSpaceManager.

  storage/falcon/TableSpaceManager.cpp@1.13, 2007-12-04 16:16:24-05:00, jas@rowvwade. +39 -21
    Handle both Falcon table spaces and blob repository volumes
    in TableSpaceManager.

  storage/falcon/TableSpaceManager.h@1.8, 2007-12-04 16:16:25-05:00, jas@rowvwade. +3 -2
    Handle both Falcon table spaces and blob repository volumes
    in TableSpaceManager.

ChangeSet@1.2529.1.99, 2007-12-04 20:27:08+01:00, kent@mysql.com +1 -0
  configure.in:
    Removed the auto detection and use of Solaris "libmtmalloc", as it
    cause regression on bug#18322. The code removed also prevented
    a build without using this library. Users can still compile with
    "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"

  configure.in@1.330.80.58, 2007-12-04 20:23:19+01:00, kent@mysql.com +0 -1
    Removed the auto detection and use of Solaris "libmtmalloc", as it
    cause regression on bug#18322. The code removed also prevented
    a build without using this library. Users can still compile with
    "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"

ChangeSet@1.2529.229.13, 2007-12-04 18:52:43+03:00, anozdrin@station. +1 -0
  Bug#32966 main.status fails.
  Disable failing test case.

  mysql-test/t/disabled.def@1.243.41.25, 2007-12-04 18:52:40+03:00, anozdrin@station. +1 -0
    Disable main.status test case.

ChangeSet@1.2529.229.12, 2007-12-04 18:51:03+03:00, anozdrin@station. +1 -0
  Bug#32965 main.ctype_create fails.
  Disable failing test case.

  mysql-test/t/disabled.def@1.243.41.24, 2007-12-04 18:51:00+03:00, anozdrin@station. +1 -0
    Disable main.ctype_create test case.

ChangeSet@1.2656.20.1, 2007-12-04 10:38:41-05:00, jas@rowvwade. +7 -0
  Work in progress integrating repositories with Falcon 
  tablespaces.

  storage/falcon/Dbb.cpp@1.15.1.1, 2007-12-04 10:38:30-05:00, jas@rowvwade. +23 -3
    Added index version to create index to support repositories.

  storage/falcon/Dbb.h@1.6, 2007-12-04 10:38:30-05:00, jas@rowvwade. +1 -1
    Added index version to create index to support repositories.

  storage/falcon/Engine.vcproj@1.3, 2007-12-04 10:38:30-05:00, jas@rowvwade. +30 -0
    General update.

  storage/falcon/Index.cpp@1.9.1.1, 2007-12-04 10:38:31-05:00, jas@rowvwade. +2 -2
    Added index version to create index to support repositories.

  storage/falcon/RepositoryVolume.cpp@1.4, 2007-12-04 10:38:31-05:00, jas@rowvwade. +26 -9
    Work in progress integrating repositories with Falcon 
    tablespaces.

  storage/falcon/RepositoryVolume.h@1.2, 2007-12-04 10:38:32-05:00, jas@rowvwade. +4 -0
    Work in progress integrating repositories with Falcon 
    tablespaces.

  storage/falcon/Statement.cpp@1.5.1.1, 2007-12-04 10:38:32-05:00, jas@rowvwade. +5 -2
    Clean up repository DDL error messages.

ChangeSet@1.2739, 2007-12-04 18:27:44+03:00, kostja@bodhi.(none) +2 -0
  Fix a potential linking error with libmysql and libmysqld on Windows: 
  remove declarations of removed functions (Bug#31952)

  libmysql/libmysql.def@1.49, 2007-12-04 18:27:37+03:00, kostja@bodhi.(none) +0 -9
    Remove declarations of removed functions (Bug#31952)

  libmysqld/libmysqld.def@1.24, 2007-12-04 18:27:38+03:00, kostja@bodhi.(none) +0 -4
    Remove declarations of removed functions (Bug#31952)

ChangeSet@1.2738, 2007-12-04 17:37:33+03:00, anozdrin@station. +1 -0
  Disable falcon_bug_22173a (BUG#32963: falcon_bug_22173a fails).

  mysql-test/suite/falcon/t/disabled.def@1.17, 2007-12-04 17:37:30+03:00, anozdrin@station. +1 -1
    Disable falcon_bug_22173a.

ChangeSet@1.2737, 2007-12-04 17:22:53+03:00, anozdrin@station. +2 -0
  Additional patch for Bug#31954: Remove undocumented
  mysql_manager_* C API functions and mysqlmanager (old).
  
  manager.c should be also removed from Windows build.

  include/mysql_com.h@1.133, 2007-12-04 17:22:50+03:00, anozdrin@station. +0 -4
    Remove outdated comment.

  libmysql/CMakeLists.txt@1.13.1.2, 2007-12-04 17:22:50+03:00, anozdrin@station. +1 -1
    Remove manager.c from Windows build.

ChangeSet@1.2736, 2007-12-04 16:39:10+03:00, anozdrin@station. +1 -0
  Fix auto-merge.

  mysql-test/t/disabled.def@1.293, 2007-12-04 16:39:07+03:00, anozdrin@station. +0 -1
    Fix auto-merge.

ChangeSet@1.2732.1.2, 2007-12-04 12:13:00+01:00, jperkin@mysql.com +1 -0
  plug.in:
    Remove cpu check, it breaks any non Linux/Windows x86 OS.  Leave
    instead to --with-falcon configure option.

  storage/falcon/plug.in@1.5, 2007-12-04 12:08:50+01:00, jperkin@mysql.com +0 -15
    Remove cpu check, it breaks any non Linux/Windows x86 OS.  Leave
    instead to --with-falcon configure option.

ChangeSet@1.2529.237.1, 2007-12-03 18:19:35-07:00, tsmith@ramayana.hindu.god +2 -0
  Bug #32679: mysqld_safe looks for errmsg.sys in wrong path
  
  The fix for bug 28544 moved our package data from ./share/mysql
  to ./share.  mysqld_safe had the old directory hard-coded.  The
  fix is to use the @pkgdatadir@ and @prefix@ values, to adapt to
  different ways of building the package.

  scripts/make_binary_distribution.sh@1.109.1.54, 2007-12-03 18:19:34-07:00, tsmith@ramayana.hindu.god +2 -1
    Document that our build system explicitly overrides the @pkgfoo@ (e.g.,
    pkgdatadir, pkglibdir, etc.) variables when 'make' is called.

  scripts/mysqld_safe.sh@1.95.1.1, 2007-12-03 18:19:34-07:00, tsmith@ramayana.hindu.god +12 -3
    Replace hard-coded "./share/mysql" with something like
    echo @pkgdatadir@ | sed -e s/^@prefix@//.
    
    Since the fix for bug 28544, this has been broken for mysql 5.1+,
    where the package data dir is "./share" instead of "./share/mysql".

ChangeSet@1.2733, 2007-12-03 20:20:35+01:00, jperkin@mysql.com +1 -0
  Raise version number after cloning 6.0.4-alpha

  configure.in@1.398.1.3, 2007-12-03 20:20:16+01:00, jperkin@mysql.com +1 -1
    Raise version number after cloning 6.0.4-alpha

ChangeSet@1.2732, 2007-12-03 17:28:37+01:00, hakank@lu0011.(none) +1 -0
  StorageVersion.h:
    Bumped Falcon's internal version.
  TAG: clone-6.0.4-build

  storage/falcon/StorageVersion.h@1.4, 2007-12-03 17:07:29+01:00, hakank@lu0011.(none) +1 -1
    Bumped Falcon's internal version.

ChangeSet@1.2729.1.1, 2007-12-03 10:33:52-05:00, jas@rowvwade. +1 -0
  Removed a piece of debugging code.

  storage/falcon/SRLSectionPage.cpp@1.5, 2007-12-03 10:33:44-05:00, jas@rowvwade. +0 -5
    Removed a piece of debugging code.

ChangeSet@1.2729, 2007-12-03 10:22:09-05:00, jas@rowvwade. +1 -0
  Turn off post-recovery validation.

  storage/falcon/Database.cpp@1.27, 2007-12-03 10:22:00-05:00, jas@rowvwade. +1 -1
    Turn off post-recovery validation.

ChangeSet@1.2656.19.1, 2007-12-03 16:17:10+01:00, mattiasj@witty. +2 -0
  Bug#30480: Falcon: searches fail if LIKE and key partition
  (also fixes the bugs: 29320, 29493 and 30536)
  
  Problem: Partitioning did not handle unordered scans correctly
  for engines with unordered read order.
  
  Solution: do not stop scanning if a record is out of range, since
  there can be more records within the range afterwards.
  
  Note. this is the test case ONLY, the real patch is separate since it
  goes into 5.1 as well (for non mysql storage engines,
  since falcon is in 6.0)

  mysql-test/r/partition_falcon.result@1.1, 2007-12-03 16:17:08+01:00, mattiasj@witty. +18 -0
    Bug#30480: Falcon: searches fail if LIKE and key partition
    test result for falcon related partitioning

  mysql-test/r/partition_falcon.result@1.0, 2007-12-03 16:17:08+01:00, mattiasj@witty. +0 -0

  mysql-test/t/partition_falcon.test@1.1, 2007-12-03 16:17:08+01:00, mattiasj@witty. +25 -0
    Bug#30480: Falcon: searches fail if LIKE and key partition
    test case for falcon related partitioning

  mysql-test/t/partition_falcon.test@1.0, 2007-12-03 16:17:08+01:00, mattiasj@witty. +0 -0

ChangeSet@1.2529.169.71, 2007-12-03 16:12:25+01:00, mattiasj@witty. +1 -0
  Bug#30480: Falcon: searches fail if LIKE and key partition
  (also fixes the bugs: Bug#29320, Bug#29493 and Bug#30536)
  
  Problem: Partitioning did not handle unordered scans correctly
  for engines with unordered read order.
  
  Solution: do not stop scanning fi a recored is out of range, since
  there can be more records within the range afterwards.
  
  Note: this is the patch that fixes the bug, but since there are no
  storage engines shipped with mysql 5.1 (falcon comes in 6.0) there
  are no test cases (it is a separate patch that only goes into 6.0)

  sql/ha_partition.cc@1.98.1.12, 2007-12-03 16:12:22+01:00, mattiasj@witty. +4 -2
    Bug#30480: Falcon: searches fail if LIKE and key partition
    
    Problem was that partitioning did not handle unordered scans correctly
    for engines with unordered read order.
    
    Solution: do not stop if a recored is out of range, since it can come
    more records within the range afterwards

ChangeSet@1.2723.1.4, 2007-12-03 18:22:39+04:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/suite/falcon/r/falcon_bug_22972.result@1.2, 2007-12-03 18:22:36+04:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.2728, 2007-12-03 09:08:48-05:00, jas@rowvwade. +2 -0
  Tighten test to rebuild child section page.

  storage/falcon/SRLSectionPage.cpp@1.4, 2007-12-03 09:08:38-05:00, jas@rowvwade. +11 -3
    Don't redo section page is child page is not current.

  storage/falcon/Section.cpp@1.18, 2007-12-03 09:08:38-05:00, jas@rowvwade. +2 -1
    Tighten test to rebuild child section page.

ChangeSet@1.2718.2.2, 2007-12-03 08:27:39-05:00, harrison@hotspur. +1 -0
  Restore the check that there is only one two phase commit
  engine

  sql/handler.cc@1.254.14.1, 2007-12-03 08:27:24-05:00, harrison@hotspur. +4 -4
    Restore the check that there is only one two phase commit
    engine

ChangeSet@1.2727, 2007-12-03 08:02:22-05:00, jas@fluffy.netfrastructure.com +1 -0
  Avoid a possible internal deadlock.

  storage/falcon/Table.cpp@1.29, 2007-12-03 08:02:19-05:00, jas@fluffy.netfrastructure.com +1 -1
    Avoid a possible internal deadlock.

ChangeSet@1.2723.2.1, 2007-12-03 10:29:06+01:00, hakank@lu0011.(none) +4 -0
  Bumped internal Falcon storage version.
  Disabled tests.
  Added DROP TABLE and DROP TABLESPACE to
  beginning of falcon_ts.test

  mysql-test/suite/falcon/r/falcon_ts.result@1.6, 2007-12-03 10:29:02+01:00, hakank@lu0011.(none) +2 -0
    Added DROP TABLE and DROP TABLESPACE to the beginning
    of the test.

  mysql-test/suite/falcon/t/disabled.def@1.16, 2007-12-03 10:29:02+01:00, hakank@lu0011.(none) +4 -0
    Disabled falcon_page_size_xy tests due
    to Bug #32921.

  mysql-test/suite/falcon/t/falcon_ts.test@1.7, 2007-12-03 10:29:02+01:00, hakank@lu0011.(none) +8 -0
    Added DROP TABLE and DROP TABLESPACE to the beginning
    of the test.

  storage/falcon/StorageVersion.h@1.3, 2007-12-03 10:29:02+01:00, hakank@lu0011.(none) +2 -2
    Bumped internal Falcon storage version.

ChangeSet@1.2723.1.1, 2007-12-02 22:35:56-06:00, chris@xeno.mysql.com +2 -0
  Bug#32150, Replication fails with Falcon when 'Delete from table' is issued
  
  Replication requires a fully populated record in the binlog in order to replicate deletes and some updates.
  If the binlog is open, Falcon will return fully populated records to the server on DELETE and UPDATE operations.

  storage/falcon/ha_falcon.cpp@1.40, 2007-12-02 22:35:54-06:00, chris@xeno.mysql.com +28 -4
    Modified StorageInterface to allow for dynamic updates to the table flags:
    - Created default table flags constant, "default_table_flags"
    - Added StorageInterface::checkBinLog() for each statement. This method sets the HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
    table flag if the binlog is open. The table flag forces Falcon to fully populate records during delete and
    update operations, which is necessary for replication.

  storage/falcon/ha_falcon.h@1.11, 2007-12-02 22:35:54-06:00, chris@xeno.mysql.com +2 -0
    Added default table flags constant, "default_table_flags"
    Added StorageInterface::checkBinLog()

ChangeSet@1.2726, 2007-12-02 17:37:14-05:00, jas@rowvwade. +1 -0
  Make orphan page reports warnings, not fatal errors.

  storage/falcon/PageInventoryPage.cpp@1.4, 2007-12-02 17:37:06-05:00, jas@rowvwade. +8 -8
    Make orphan page reports warnings, not fatal errors.

ChangeSet@1.2725, 2007-12-02 17:13:55-05:00, jas@rowvwade. +2 -0
  Added non-fatal validation warnings.

  storage/falcon/Validation.cpp@1.3, 2007-12-02 17:13:47-05:00, jas@rowvwade. +16 -0
    Added non-fatal validation warnings.

  storage/falcon/Validation.h@1.3, 2007-12-02 17:13:48-05:00, jas@rowvwade. +9 -7
    Stylist cleanup.

ChangeSet@1.2724, 2007-12-02 17:06:27-05:00, jas@rowvwade. +4 -0
  Add (temporary) post recovery validation of database to
  track down double recovery fault in test system.

  storage/falcon/Connection.h@1.5, 2007-12-02 17:06:18-05:00, jas@rowvwade. +1 -0
    Add (temporary) post recovery validation of database to
    track down double recovery fault in test system.

  storage/falcon/Database.cpp@1.26, 2007-12-02 17:06:19-05:00, jas@rowvwade. +1 -1
    Add (temporary) post recovery validation of database to
    track down double recovery fault in test system.

  storage/falcon/Validation.cpp@1.2, 2007-12-02 17:06:19-05:00, jas@rowvwade. +5 -1
    Add (temporary) post recovery validation of database to
    track down double recovery fault in test system.

  storage/falcon/Validation.h@1.2, 2007-12-02 17:06:19-05:00, jas@rowvwade. +1 -0
    Add (temporary) post recovery validation of database to
    track down double recovery fault in test system.

ChangeSet@1.2718.3.1, 2007-12-02 15:11:59-06:00, chris@xeno.mysql.com +3 -0
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Enabled falcon_bug_22173a
  ---
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Added interlocked increment/decrement to keep StorageTableShare::truncateLockCount in sync
  with the state of syncTruncateLock. The lock count became out of sync during testcase falcon_bug_22173a
  run on a compile-amd64-max build.
  - Enabled testcase falcon_bug_22173a

  mysql-test/suite/falcon/t/disabled.def@1.13.1.1, 2007-12-02 15:11:57-06:00, chris@xeno.mysql.com +0 -1
    Enabled falcon_bug_22173a

  storage/falcon/StorageTableShare.cpp@1.10, 2007-12-02 15:11:57-06:00, chris@xeno.mysql.com +5 -4
    Use interlocked increment/decrement for truncateLockCount.

  storage/falcon/StorageTableShare.h@1.15, 2007-12-02 15:11:57-06:00, chris@xeno.mysql.com +2 -1
    Use interlocked increment/decrement for truncateLockCount.

ChangeSet@1.2722, 2007-12-02 16:10:06-05:00, jas@fluffy.netfrastructure.com +2 -0
  Update test result with Ann's new switch

  mysql-test/suite/falcon/r/falcon_options.result@1.14, 2007-12-02 16:10:03-05:00, jas@fluffy.netfrastructure.com +2 -2
    Update test result with Ann's new switch

  mysql-test/suite/falcon/r/falcon_options2.result@1.13, 2007-12-02 16:10:03-05:00, jas@fluffy.netfrastructure.com +1 -1
    Update test result with Ann's new switch

ChangeSet@1.2720, 2007-12-02 15:42:48-05:00, jas@rowvwade. +3 -0
  Debug in progress on intermittent recovery problem.

  storage/falcon/SRLRecordLocator.cpp@1.4, 2007-12-02 15:42:38-05:00, jas@rowvwade. +3 -0
    Made recovery pass1 and pass2 logging consistent.

  storage/falcon/SRLSectionPage.cpp@1.3, 2007-12-02 15:42:39-05:00, jas@rowvwade. +8 -1
    Made recovery pass1 and pass2 logging consistent.

  storage/falcon/Section.cpp@1.17, 2007-12-02 15:42:39-05:00, jas@rowvwade. +6 -4
    Check for wrong page type walking the second tree.  Also check
    for level overflow.

ChangeSet@1.2712.2.1, 2007-12-02 15:17:29-05:00, harrison@hotspur. +7 -0
  Check in the stuff that allows falcon to behave like InnoDB when
  used in replication.  Do not allow two 2PC engines in a single
  server.  Fix an uninitialized pointer in log.cc which will be
  needed to allow two 2PC engines in a transaction.

  sql/log.cc@1.303, 2007-12-02 15:17:08-05:00, harrison@hotspur. +1 -0
    Set up page pointer for storing XID values.

  storage/falcon/SRLPrepare.cpp@1.2, 2007-12-02 15:17:10-05:00, harrison@hotspur. +13 -0
    Handle commit and rollback calls for SRLPrepare log
    entries.  This really is all they need to do.

  storage/falcon/SRLPrepare.h@1.2, 2007-12-02 15:17:11-05:00, harrison@hotspur. +3 -0
    add commit and rollback calls for SRL prepare entries

  storage/falcon/StorageHandler.cpp@1.19, 2007-12-02 15:17:12-05:00, harrison@hotspur. +8 -2
    Make naming conventions consistent

  storage/falcon/StorageHandler.h@1.12, 2007-12-02 15:17:12-05:00, harrison@hotspur. +2 -2
    Make naming conventions consistent

  storage/falcon/StorageParameters.h@1.19, 2007-12-02 15:17:13-05:00, harrison@hotspur. +1 -1
    Change parameter name so it matches the equivalent in InnoDB

  storage/falcon/ha_falcon.cpp@1.36.1.1, 2007-12-02 15:17:14-05:00, harrison@hotspur. +3 -3
    Use the common naming convention <operation>ByXid rather
    than <operation>ByXID and use the new parameter for turning
    it off.

ChangeSet@1.2718.1.2, 2007-12-02 12:47:46-06:00, chris@xeno.mysql.com +1 -0
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Enabled falcon_bug_22173a

  mysql-test/suite/falcon/t/disabled.def@1.14, 2007-12-02 12:47:44-06:00, chris@xeno.mysql.com +0 -1
    Enabled falcon_bug_22173a

ChangeSet@1.2718.1.1, 2007-12-02 12:40:58-06:00, chris@xeno.mysql.com +1 -0
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Testcase 22173a triggered assert in SyncObject::unlock() because the lockstate was 0. Truncate
  locks are always Shared, so StorageTableShare::clearTruncateLock() now explicitly indicates the lock
  type to avoid the assert.

  storage/falcon/StorageTableShare.cpp@1.9, 2007-12-02 12:40:56-06:00, chris@xeno.mysql.com +1 -1
    Truncate locks are always Shared. Explicitly indicated shared lock in clearTruncateLock(). 

ChangeSet@1.2714.1.2, 2007-12-02 13:20:07-05:00, jas@rowvwade. +1 -0
  Make sure page header gets properly reset when redoing a section
  page promotion during recovery.

  storage/falcon/Section.cpp@1.16, 2007-12-02 13:19:59-05:00, jas@rowvwade. +1 -2
    Make sure page header gets properly reset when redoing a section
    page promotion during recovery.

ChangeSet@1.1810.3490.4, 2007-12-02 13:49:12+03:00, kaa@polly.(none) +3 -0
  Windows-specific fixes in floating point tests.

  mysql-test/t/insert.test@1.22.2.3, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +3 -0
    Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result

  mysql-test/t/variables.test@1.51.10.2, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +2 -0
    We need to do replace_result because variables are printed by another procedure.

  sql/field.cc@1.256.63.4, 2007-12-02 13:49:09+03:00, kaa@polly.(none) +4 -1
    Fixed the code to limit the precision to DBL_DIG.

ChangeSet@1.2714.1.1, 2007-12-01 13:31:50-05:00, jas@rowvwade. +1 -0
  Added call to clear truncate lock in StorageInterface::close().

  storage/falcon/ha_falcon.cpp@1.38, 2007-12-01 13:31:39-05:00, jas@rowvwade. +6 -2
    Added call to clear truncate lock in StorageInterface::close().

ChangeSet@1.2717, 2007-12-01 11:50:09-06:00, klewis@klewis-mysql. +2 -0
  Updated falcon_bug_32833 to use more records where the value 
  is incremented by 357

  mysql-test/suite/falcon/r/falcon_bug_32833.result@1.2, 2007-12-01 11:49:59-06:00, klewis@klewis-mysql. +9 -9
    Updated falcon_bug_32833 to use more records where the value 
    is incremented by 357

  mysql-test/suite/falcon/t/falcon_bug_32833.test@1.2, 2007-12-01 11:50:03-06:00, klewis@klewis-mysql. +17 -10
    Updated falcon_bug_32833 to use more records where the value 
    is incremented by 357

ChangeSet@1.2716, 2007-12-01 08:53:46-06:00, klewis@klewis-mysql. +2 -0
  Test for Bug#32833

  mysql-test/suite/falcon/r/falcon_bug_32833.result@1.1, 2007-12-01 08:53:37-06:00, klewis@klewis-mysql. +36 -0
    Test for Bug#32833

  mysql-test/suite/falcon/r/falcon_bug_32833.result@1.0, 2007-12-01 08:53:37-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_32833.test@1.1, 2007-12-01 08:53:40-06:00, klewis@klewis-mysql. +49 -0
    Test for Bug#32833

  mysql-test/suite/falcon/t/falcon_bug_32833.test@1.0, 2007-12-01 08:53:40-06:00, klewis@klewis-mysql. +0 -0

ChangeSet@1.2712.1.1, 2007-12-01 14:14:37+01:00, hakank@lu0011.(none) +1 -0
  falcon_ts passes now.

  mysql-test/suite/falcon/t/disabled.def@1.13, 2007-12-01 14:14:33+01:00, hakank@lu0011.(none) +0 -1
    falcon_ts passes now.

ChangeSet@1.1810.3490.3, 2007-12-01 15:25:24+03:00, kaa@polly.(none) +4 -0
  Fixed the floating point number tests on Windows.

  mysql-test/r/insert.result@1.22.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +12 -12
    Fixed the test cases.

  mysql-test/t/cast.test@1.31.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +2 -0
    We need to do replace_result because warnings are printed by another procedure.

  mysql-test/t/insert.test@1.22.2.2, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +3 -1
    Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.

  sql/field.cc@1.256.63.3, 2007-12-01 15:25:21+03:00, kaa@polly.(none) +1 -1
    Limit the precision to avoid garbage past the significant digits.

ChangeSet@1.1810.3490.2, 2007-12-01 12:46:25+03:00, kaa@polly.(none) +1 -0
  Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

  sql/field.cc@1.256.63.2, 2007-12-01 12:46:22+03:00, kaa@polly.(none) +2 -1
    Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.

ChangeSet@1.1810.3490.1, 2007-12-01 10:05:59+03:00, kaa@polly.(none) +6 -0
  Fix for bug #26788 "mysqld (debug) aborts when inserting specific
  numbers into char fields" and bug #12860 "Difference in zero padding of
  exponent between Unix and Windows"
  
  Rewrote the code that determines what 'precision' argument should be
  passed to sprintf() to fit the string representation of the input number
  into the field.
  We get finer control over conversion by pre-calculating the exponent, so
  we are able to determine which conversion format, 'e' or 'f', will be
  used by sprintf().
  We also remove the leading zero from the exponent on Windows to make it
  compatible with the sprintf() output on other platforms.

  mysql-test/r/insert.result@1.22.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +120 -0
    Added test cases for bug #26788 and bug #31152.

  mysql-test/t/cast.test@1.31.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -2
    Removed --replace_result, since the result is now correct on Windows.

  mysql-test/t/insert.test@1.22.2.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +81 -0
    Added test cases for bug #26788 and bug #31152.

  mysql-test/t/type_float.test@1.29.2.4, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -5
    Removed --replace_result, since the result is now correct on Windows.

  mysql-test/t/variables.test@1.51.10.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +0 -2
    Removed --replace_result, since the result is now correct on Windows.

  sql/field.cc@1.256.63.1, 2007-12-01 10:05:54+03:00, kaa@polly.(none) +60 -14
    Rewrote the code that determines what 'precision' argument should be
    passed to sprintf() to fit the string representation of the input number
    into the field.
    We get finer control over conversion by pre-calculating the exponent, so
    we are able to determine which conversion format, 'e' or 'f', will be
    used by sprintf().

ChangeSet@1.2706.1.8, 2007-11-30 17:46:05-05:00, jas@fluffy.netfrastructure.com +1 -0
  Clear any dangling truncate locks when handler object
  is deleted.

  storage/falcon/ha_falcon.cpp@1.33.9.3, 2007-11-30 17:46:03-05:00, jas@fluffy.netfrastructure.com +3 -0
    Clear any dangling truncate locks when handler object
    is deleted.

ChangeSet@1.2706.1.7, 2007-11-30 17:25:39-05:00, jas@rowvwade. +3 -0
  Try to track truncate locks across table renames and deletes.

  storage/falcon/StorageTable.cpp@1.15, 2007-11-30 17:25:27-05:00, jas@rowvwade. +2 -2
    Try to track truncate locks across table renames and deletes.

  storage/falcon/StorageTableShare.cpp@1.8, 2007-11-30 17:25:28-05:00, jas@rowvwade. +19 -0
    Try to track truncate locks across table renames and deletes.

  storage/falcon/StorageTableShare.h@1.14, 2007-11-30 17:25:28-05:00, jas@rowvwade. +3 -0
    Try to track truncate locks across table renames and deletes.

ChangeSet@1.2706.2.1, 2007-11-30 15:15:43-05:00, jas@rowvwade. +1 -0
  Delete syncTruncation rather than deleting syncObject twice.

  storage/falcon/StorageTableShare.cpp@1.7, 2007-11-30 15:15:35-05:00, jas@rowvwade. +1 -1
    Delete syncTruncation rather than deleting syncObject twice.

ChangeSet@1.2706.1.5, 2007-11-30 15:15:13-05:00, jas@fluffy.netfrastructure.com +1 -0
  Be very conservative about interlocking during table
  truncate operations.

  storage/falcon/Table.cpp@1.26.1.1, 2007-11-30 15:15:10-05:00, jas@fluffy.netfrastructure.com +3 -0
    Be very conservative about interlocking during table
    truncate operations.

ChangeSet@1.2706.1.4, 2007-11-30 15:07:11-05:00, jas@rowvwade. +4 -0
  Sort out proper state for table truncate lock between
  StorageTable and StorageTableShare.

  storage/falcon/StorageTable.h@1.9, 2007-11-30 15:07:03-05:00, jas@rowvwade. +4 -1
    Sort out proper state for table truncate lock between
    StorageTable and StorageTableShare.

  storage/falcon/StorageTableShare.cpp@1.6, 2007-11-30 15:07:03-05:00, jas@rowvwade. +1 -25
    Sort out proper state for table truncate lock between
    StorageTable and StorageTableShare.

  storage/falcon/StorageTableShare.h@1.13, 2007-11-30 15:07:04-05:00, jas@rowvwade. +0 -3
    Sort out proper state for table truncate lock between
    StorageTable and StorageTableShare.

  storage/falcon/ha_falcon.cpp@1.33.9.2, 2007-11-30 15:07:04-05:00, jas@rowvwade. +10 -10
    Sort out proper state for table truncate lock between
    StorageTable and StorageTableShare.

ChangeSet@1.2706.1.3, 2007-11-30 15:03:51-05:00, jas@rowvwade. +1 -0
  Try once more to get truncate lock state in the right
  places -- SyncObject on StorageTableShare, 
  haveTrancateLock in StorageTable.  sigh.

  storage/falcon/StorageTable.cpp@1.14, 2007-11-30 15:03:43-05:00, jas@rowvwade. +25 -0
    Try once more to get truncate lock state in the right
    places -- SyncObject on StorageTableShare, 
    haveTrancateLock in StorageTable.  sigh.

ChangeSet@1.2706.1.2, 2007-11-30 14:45:50-05:00, jas@rowvwade. +6 -0
  Move truncate lock from StorageTable to StorageTableShare where
  it can do some good.

  storage/falcon/Section.h@1.3, 2007-11-30 14:45:32-05:00, jas@rowvwade. +15 -15
    Aesthetic restructuring.

  storage/falcon/StorageTable.cpp@1.13, 2007-11-30 14:45:33-05:00, jas@rowvwade. +0 -29
    Move truncate lock from StorageTable to StorageTableShare where
    it can do some good.

  storage/falcon/StorageTable.h@1.8, 2007-11-30 14:45:33-05:00, jas@rowvwade. +1 -5
    Move truncate lock from StorageTable to StorageTableShare where
    it can do some good.

  storage/falcon/StorageTableShare.cpp@1.5, 2007-11-30 14:45:34-05:00, jas@rowvwade. +28 -0
    Move truncate lock from StorageTable to StorageTableShare where
    it can do some good.

  storage/falcon/StorageTableShare.h@1.12, 2007-11-30 14:45:34-05:00, jas@rowvwade. +4 -0
    Move truncate lock from StorageTable to StorageTableShare where
    it can do some good.

  storage/falcon/ha_falcon.cpp@1.33.9.1, 2007-11-30 14:45:34-05:00, jas@rowvwade. +10 -10
    Move truncate lock from StorageTable to StorageTableShare where
    it can do some good.

ChangeSet@1.2713, 2007-11-30 13:26:12-06:00, klewis@klewis-mysql. +1 -0
  Control the timing better in falcon_bug_22150

  mysql-test/suite/falcon/t/falcon_bug_22150.test@1.3, 2007-11-30 13:26:04-06:00, klewis@klewis-mysql. +2 -0
    Control the timing better.

ChangeSet@1.2706.1.1, 2007-11-30 13:19:43-05:00, jas@rowvwade. +3 -0
  Switch to interlocked instructions when updating the section
  use fector.

  storage/falcon/DenseArray.h@1.2, 2007-11-30 13:19:34-05:00, jas@rowvwade. +3 -3
    Fix DensaryArray to tolerate "volatile" members, though it itself
    is not interlocked.

  storage/falcon/SerialLog.cpp@1.26.1.1, 2007-11-30 13:19:34-05:00, jas@rowvwade. +2 -1
    Switch to interlocked instructions when updating the section
    use fector.

  storage/falcon/SerialLog.h@1.9.1.1, 2007-11-30 13:19:34-05:00, jas@rowvwade. +2 -2
    Switch to interlocked instructions when updating the section
    use fector.

ChangeSet@1.2712, 2007-11-30 11:50:05-06:00, klewis@klewis-mysql. +2 -0
  Bug#32862 - Fix possible assert in able::checkUniqueRecordVersion()
  when a record version has been chilled.

  storage/falcon/Configuration.cpp@1.15, 2007-11-30 11:49:35-06:00, klewis@klewis-mysql. +1 -3
    Cleanup

  storage/falcon/Table.cpp@1.27, 2007-11-30 11:49:57-06:00, klewis@klewis-mysql. +3 -0
    Bug#32862 - Normally, a record version that has been chilled is 
    thawed during the call to fetchVersion, which makes a call to 
    Record::getRecordData(). But in Table::checkUniqueRecordVersion(), 
    the all the various record versions for a record number must be 
    looked at, so there is NO call to fetchVersion(), and getRecordData() 
    is not called.
    
    I added a call to dup->getRecordData() just before checking
    dup->hasRecord() to see if the recordVersion is deleted.  This will
    keep the ASSERT reported in this bug from happening.

ChangeSet@1.1616.3118.6, 2007-11-30 18:06:28+01:00, mleich@four.local.lan +3 -0
  Fix for
     Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Note:
    This bug does not occur in MySQL 5.0 and up, because
    ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
    The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
    which is set by mysql-test-run.pl.
    mysql-test-run.pl in 4.1 does not set this variable.
    There are two alternatives:
    1) Backport the 5.0 fix for this test including modifications
       to mysql-test-run.pl and mysql-test-run-shell.
       This is a not acceptable impact on an old MySQL version.
    2) Fix the problem different than in 5.0 like in the current
       ChangeSet + do not apply these changes when upmerging to 5.0

  mysql-test/t/disabled.def@1.1.6.1, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +0 -1
    Enable rpl000015

  mysql-test/r/rpl000015.result@1.30.1.3, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/t/rpl000015.test@1.25.1.7, 2007-11-30 18:06:27+01:00, mleich@four.local.lan +1 -1
    Unify the MASTER_PORT number

ChangeSet@1.2711, 2007-11-30 17:44:15+01:00, hakank@lu0011.(none) +1 -0
  Bumped internal Falcon version number.

  storage/falcon/StorageVersion.h@1.2, 2007-11-30 17:44:11+01:00, hakank@lu0011.(none) +2 -2
    Bumped internal Falcon version number.

ChangeSet@1.2529.233.1, 2007-11-30 15:16:31+01:00, istruewing@stella.local +2 -0
  Bug#30491 - MERGE doesn't report error when one table is Innodb
  
  1. A bad error message was given when a MERGE table with an
     InnoDB child table was tried to use.
  
  2. After selecting from a correct MERGE table and then altering
     one of the children to InnoDB, incorrect results were returned.
  
  These bugs have been fixed with the patch for bug 26379 (Combination
  of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table).
  
  For verification, I added the test case from the bug report.

  mysql-test/r/merge_innodb.result@1.1, 2007-11-30 15:16:30+01:00, istruewing@stella.local +37 -0
    Bug#30491 - MERGE doesn't report error when one table is Innodb
    Added test result.

  mysql-test/r/merge_innodb.result@1.0, 2007-11-30 15:16:30+01:00, istruewing@stella.local +0 -0

  mysql-test/t/merge_innodb.test@1.1, 2007-11-30 15:16:30+01:00, istruewing@stella.local +41 -0
    Bug#30491 - MERGE doesn't report error when one table is Innodb
    Added test case.

  mysql-test/t/merge_innodb.test@1.0, 2007-11-30 15:16:30+01:00, istruewing@stella.local +0 -0

ChangeSet@1.2529.229.10, 2007-11-30 16:12:20+03:00, anozdrin@ibm. +2 -0
  A patch for BUG#32148: killing a query may be ineffective.
  
  The problem was that THD::killed was reset after a command was
  read from the socket, but before it was actually handled. That lead
  to a race: if another KILL statement was issued for this connection
  in the middle of reading from the socket and processing a command,
  THD::killed state would be cleaned.
  
  The fix is to move this cleanup into net_send_error() function.
  
  A sample test case exists in binlog_killed.test:
    - connection 1: start a new transaction on table t1;
    - connection 2: send query to the server (w/o waiting for the
      result) to update data in table t1 -- this query will be blocked
      since there is unfinished transaction;
    - connection 1: kill query in connection 2 and finish the transaction;
    - connection 2: get result of the previous query -- it should be
      the "query-killed" error.
  
  This test however contains race condition, which can not be fixed
  with the current protocol: there is no way to guarantee, that the
  server will receive and start processing the query in connection 2
  (which is intended to get blocked) before the KILL command (sent in
  the connection 1) will arrive. In other words, there is no way to
  ensure that the following sequence will not happen:
  
    - connection 1: start a new transaction on table t1;
    - connection 1: kill query in connection 2 and finish the transaction;
    - connection 2: send query to the server (w/o waiting for the
      result) to update data in table t1 -- this query will be blocked
      since there is unfinished transaction;
    - connection 2: get result of the previous query -- the query will
      succeed.
  
  So, there is no test case for this bug, since it's impossible
  to write a reliable test case under the current circumstances.

  sql/protocol.cc@1.129.1.5, 2007-11-30 16:12:18+03:00, anozdrin@ibm. +6 -0
    Move thd->killed cleanup from dispatch_command() to net_send_error().

  sql/sql_parse.cc@1.693.18.10, 2007-11-30 16:12:18+03:00, anozdrin@ibm. +1 -6
    Move thd->killed cleanup from dispatch_command() to net_send_error().

ChangeSet@1.2529.229.9, 2007-11-30 14:49:34+03:00, anozdrin@ibm. +1 -0
  BUG#32723 (grant3.test fails) can not be reproduced.
  Enabling the test case.

  mysql-test/t/disabled.def@1.243.41.23, 2007-11-30 14:49:31+03:00, anozdrin@ibm. +0 -1
    Enable grant3.test.

ChangeSet@1.2529.232.1, 2007-11-30 09:34:25-02:00, davi@mysql.com +3 -0
  Bug#22312 Syntax error in expression with INTERVAL()
  
  Parser rejects valid INTERVAL() expressions when associated with
  arithmetic operators. The problem is the way in which the expression
  and interval grammar rules were organized caused shift/reduce conflicts.
  
  The solution is to tweak the interval rules to avoid shift/reduce
  conflicts by removing the broken interval_expr rule and explicitly
  specify it's content where necessary.
  
  Original fix by Davi Arnaut, revised and improved rules by Marc Alff

  mysql-test/r/parser.result@1.7, 2007-11-30 09:34:22-02:00, davi@mysql.com +43 -0
    Add test case result for Bug#22312

  mysql-test/t/parser.test@1.7, 2007-11-30 09:34:22-02:00, davi@mysql.com +28 -0
    Add test case for Bug#22312

  sql/sql_yacc.yy@1.458.2.151, 2007-11-30 09:34:23-02:00, davi@mysql.com +30 -27
    Resolve shift/reduce conflicts by reorganizing the interval
    expression rules.

ChangeSet@1.2685.13.18, 2007-11-30 15:11:25+04:00, svoj@mysql.com +1 -0
  BUG#31311 - TABLESPACE identifiers do not support special characters
  After merge fix.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result@1.4, 2007-11-30 15:11:21+04:00, svoj@mysql.com +18 -18
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

ChangeSet@1.2529.231.3, 2007-11-30 15:00:15+04:00, svoj@mysql.com +1 -0
  BUG#32050 - table logging gone wrong.
  
  Reverted log tables alteration.

  scripts/mysql_system_tables_fix.sql@1.63.1.4, 2007-11-30 15:00:10+04:00, svoj@mysql.com +0 -16
    Altering log table is wrong, because
    - it is not possible to alter log table when it is in use;
    - log table may use MyISAM engine, which perfectly supports NULLs.
    
    Reverted log tables alteration.

ChangeSet@1.2529.229.8, 2007-11-30 12:14:07+03:00, anozdrin@ibm. +2 -0
  A test case for BUG#26676: VIEW using old table schema in a session.
  
  The following clarification should be made in The Manual:
  
  Standard SQL is quite clear that, if new columns are added
  to a table after a view on that table is created with
  "select *", the new columns will not become part of the view.
  In all cases, the view definition (view structure) is frozen
  at CREATE time, so changes to the underlying tables do not
  affect the view structure.

  mysql-test/r/view.result@1.218.6.11, 2007-11-30 12:14:00+03:00, anozdrin@ibm. +43 -0
    Update result file.

  mysql-test/t/view.test@1.210.1.1, 2007-11-30 12:14:00+03:00, anozdrin@ibm. +51 -0
    Add a test case for BUG#26676: VIEW using old table schema in a session.

ChangeSet@1.1810.3471.2, 2007-11-30 06:14:43+01:00, tsmith@mysql.com +3 -0
  Bug #32219: too many hosts in default grant tables 6.0.3
  
  Fix is to remove any references to the current hostname when running
  mysql_install_db --cross-bootstrap.  (The dist-hook make target makes
  this call, and the resulting data directory is included in the source
  distribution as win/data/*.)
  
  Also, a few other clean-ups to mysql_install_db while there.
  TAG: mysql-5.0.52

  Makefile.am@1.68.1.41, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +1 -1
    Adapt to clean-up in mysql_install_db (--windows becomes --cross-bootstrap)

  scripts/mysql_install_db.sh@1.64.5.1, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +37 -29
    Filter out references to the current hostname when performing
    a cross-bootstrap installation by removing any lines which
    contain the string "@current_hostname".
    
    Deprecate the old --windows option; use --cross-bootstrap
    instead, since it more accurately reflects the purpose.
    
    Other clean-up: the wrong syntax was being used to test the
    exit status of mysqld --bootstrap.  It mostly worked, as long
    as mysqld succeeded.  However, it was not robust.

  scripts/mysql_system_tables_data.sql@1.1.1.5, 2007-11-30 06:12:25+01:00, tsmith@mysql.com +8 -3
    Rename local @hostname variable to @current_hostname, which is a more
    unique label to search on.  mysql_install_db now filters out all
    lines which include "@current_hostname" during a --cross-bootstrap
    installation.

ChangeSet@1.2709, 2007-11-30 04:26:57+01:00, hakank@lu0011.(none) +6 -0
  Disabled Falcon I_S table, because Falcon is
  not compiled on all platforms.

  mysql-test/r/information_schema.result@1.182, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -5
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/r/information_schema_db.result@1.27, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +0 -1
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/r/mysqlshow.result@1.9, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +0 -2
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/information_schema-master.opt@1.2, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/information_schema_db-master.opt@1.2, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/mysqlshow-master.opt@1.2, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

ChangeSet@1.2708, 2007-11-30 01:49:59+01:00, hakank@lu0011.(none) +5 -0
  Added new Falcon I_S table and new Falcon parameter.

  mysql-test/r/information_schema.result@1.181, 2007-11-30 01:49:55+01:00, hakank@lu0011.(none) +5 -1
    Added new Falcon I_S table.

  mysql-test/r/information_schema_db.result@1.26, 2007-11-30 01:49:56+01:00, hakank@lu0011.(none) +1 -0
    Added new Falcon I_S table.

  mysql-test/r/mysqlshow.result@1.8, 2007-11-30 01:49:56+01:00, hakank@lu0011.(none) +2 -0
    Added new Falcon I_S table.

  mysql-test/suite/falcon/r/falcon_options.result@1.13, 2007-11-30 01:49:56+01:00, hakank@lu0011.(none) +2 -0
    Added new Falcon I_S table.

  mysql-test/suite/falcon/r/falcon_options2.result@1.12, 2007-11-30 01:49:56+01:00, hakank@lu0011.(none) +1 -0
    Added new Falcon I_S table.

ChangeSet@1.1616.3094.17, 2007-11-30 01:36:05+01:00, kent@mysql.com +1 -0
  my_global.h:
    Added 64 bit Mac OS X hard coded settings, for universal binaries

  include/my_global.h@1.47.1.70, 2007-11-30 01:35:56+01:00, kent@mysql.com +25 -30
    Added 64 bit Mac OS X hard coded settings, for universal binaries

ChangeSet@1.1616.3094.16, 2007-11-30 01:22:15+01:00, kent@mysql.com +1 -0
  Excluded verbose and bad change to Mac OS X universal binaries handling

  include/my_global.h@1.47.1.69, 2007-11-30 01:22:15+01:00, kent@mysql.com +0 -0
    Excluded verbose and bad change to Mac OS X universal binaries handling

ChangeSet@1.2685.24.1, 2007-11-29 17:37:48-05:00, harrison@hotspur. +13 -0
  Put in code to get a list of XIDs for prepared transactions.  Add
  a switch that determines whether Falcon is an XA participant.

  storage/falcon/Connection.cpp@1.4, 2007-11-29 17:30:25-05:00, harrison@hotspur. +8 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/Connection.h@1.4, 2007-11-29 17:30:26-05:00, harrison@hotspur. +1 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/Database.cpp@1.25, 2007-11-29 17:30:27-05:00, harrison@hotspur. +9 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/Database.h@1.20, 2007-11-29 17:30:27-05:00, harrison@hotspur. +2 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/Log.h@1.2.1.1, 2007-11-29 17:37:22-05:00, harrison@hotspur. +1 -0
    Add new log type for recovery

  storage/falcon/SerialLog.cpp@1.27, 2007-11-29 17:37:23-05:00, harrison@hotspur. +20 -0
    Add a routine that will return one XID of a stuck (limbo)
    transaction at a time.  Keep state in the SerialLog object.

  storage/falcon/SerialLog.h@1.10, 2007-11-29 17:37:23-05:00, harrison@hotspur. +3 -0
    Mechanism for getting XID of limbo transactions - return
    one at a time and let StorageInterface group them for the
    server

  storage/falcon/StorageHandler.cpp@1.15.2.1, 2007-11-29 17:37:24-05:00, harrison@hotspur. +11 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/StorageHandler.h@1.9.1.1, 2007-11-29 17:37:25-05:00, harrison@hotspur. +4 -0
    Pass along the call to get the XID of limbo transactions.

  storage/falcon/StorageParameters.h@1.18, 2007-11-29 17:37:25-05:00, harrison@hotspur. +3 -0
    Add a switch to make Falcon an XA participant or not

  storage/falcon/Transaction.cpp@1.14.1.1, 2007-11-29 17:37:26-05:00, harrison@hotspur. +41 -28
    Remove XA_ENABLED switch

  storage/falcon/ha_falcon.cpp@1.33.8.1, 2007-11-29 17:37:27-05:00, harrison@hotspur. +33 -5
    Make 2PC calls dependeint on the 2PC switch

  storage/falcon/ha_falcon.h@1.8.1.1, 2007-11-29 17:37:27-05:00, harrison@hotspur. +1 -1
    Add recover call

ChangeSet@1.2704.1.2, 2007-11-29 16:06:21-05:00, jas@rowvwade. +1 -0
  Added new file StorageVersion.h

  storage/falcon/StorageVersion.h@1.1, 2007-11-29 16:06:13-05:00, jas@rowvwade. +18 -0
    New BitKeeper file ``storage/falcon/StorageVersion.h''

  storage/falcon/StorageVersion.h@1.0, 2007-11-29 16:06:13-05:00, jas@rowvwade. +0 -0

ChangeSet@1.2704.1.1, 2007-11-29 16:01:06-05:00, jas@rowvwade. +6 -0
  Added information schema table FALCON_VERSION to display
  Falcon storage engine version information.

  storage/falcon/CMakeLists.txt@1.8, 2007-11-29 16:00:49-05:00, jas@rowvwade. +1 -0
    Added header file StorageVersion.h to track internal
    Falcon version number.

  storage/falcon/Makefile.am@1.9, 2007-11-29 16:00:49-05:00, jas@rowvwade. +1 -0
    Added header file StorageVersion.h to track internal
    Falcon version number.

  storage/falcon/StorageHandler.cpp@1.15.1.2, 2007-11-29 16:00:50-05:00, jas@rowvwade. +9 -0
    Added information schema table FALCON_VERSION to display
    Falcon storage engine version information.

  storage/falcon/StorageHandler.h@1.10, 2007-11-29 16:00:50-05:00, jas@rowvwade. +1 -0
    Added information schema table FALCON_VERSION to display
    Falcon storage engine version information.

  storage/falcon/ha_falcon.cpp@1.33.4.7, 2007-11-29 16:00:50-05:00, jas@rowvwade. +55 -0
    Added information schema table FALCON_VERSION to display
    Falcon storage engine version information.

  storage/falcon/ha_falcon.h@1.9, 2007-11-29 16:00:51-05:00, jas@rowvwade. +4 -0
    Added information schema table FALCON_VERSION to display
    Falcon storage engine version information.

ChangeSet@1.2685.23.1, 2007-11-29 13:53:20-05:00, harrison@hotspur. +2 -0
  Start adding the XA work - first fix Transaction.cpp so
  it doesn't have XA_ENABLED (which is going away) but instead
  forces work to disk on prepare, and checks in commit that
  the transaction is active (thus prepare has been skipped)
  before forcing work to disk.  Add logging for XA as well

  storage/falcon/Log.h@1.3, 2007-11-29 13:53:07-05:00, harrison@hotspur. +1 -0
    Add logging category for XA work

  storage/falcon/Transaction.cpp@1.15, 2007-11-29 13:53:07-05:00, harrison@hotspur. +41 -28
    Start adding the XA work - first fix Transaction.cpp so
    it doesn't have XA_ENABLED (which is going away) but instead
    forces work to disk on prepare, and checks in commit that
    the transaction is active (thus prepare has been skipped)
    before forcing work to disk.  Add logging for XA as well

ChangeSet@1.2529.169.66, 2007-11-29 22:32:34+04:00, ramil@mysql.com +1 -0
  after-merge fix:
    - result adjusted.

  mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result@1.7.1.3, 2007-11-29 22:32:32+04:00, ramil@mysql.com +74 -0
    after-merge fix:
      - result adjusted.

ChangeSet@1.2685.22.2, 2007-11-29 12:41:59-05:00, jas@rowvwade. +2 -0
  Get SyncObject declaration out of StorageTable.h to avoid
  potential compiler problems in StorageInterface.

  storage/falcon/StorageTable.cpp@1.12, 2007-11-29 12:41:45-05:00, jas@rowvwade. +6 -4
    Get SyncObject declaration out of StorageTable.h to avoid
    potential compiler problems in StorageInterface.

  storage/falcon/StorageTable.h@1.7, 2007-11-29 12:41:45-05:00, jas@rowvwade. +2 -2
    Get SyncObject declaration out of StorageTable.h to avoid
    potential compiler problems in StorageInterface.

ChangeSet@1.1810.3477.3, 2007-11-29 16:40:46+00:00, jonathan@chorlton.adsl.perkin.org.uk +1 -0
  Shell portability fix.

  scripts/mysql_install_db.sh@1.64.1.37, 2007-11-29 16:39:11+00:00, jonathan@chorlton.adsl.perkin.org.uk +3 -3
    Use "test !" instead of "! test", as the
    latter does not work on certain shells.

ChangeSet@1.2685.22.1, 2007-11-29 11:10:55-05:00, jas@rowvwade. +1 -0
  Simplify code to try to work around a gcc code generation bug.

  storage/falcon/ha_falcon.cpp@1.33.4.5, 2007-11-29 11:10:48-05:00, jas@rowvwade. +19 -18
    Simplify code to try to work around a gcc code generation bug.

ChangeSet@1.2529.229.7, 2007-11-29 09:42:26-02:00, davi@mysql.com +10 -0
  Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock
  
  This bug is actually two bugs in one, one of which is CREATE TRIGGER under
  LOCK TABLES and the other is CREATE TRIGGER under LOCK TABLES simultaneous
  to a FLUSH TABLES WITH READ LOCK (global read lock). Both situations could
  lead to a server crash or deadlock.
  
  The first problem arises from the fact that when under LOCK TABLES, if the
  table is in the set of locked tables, the table is already open and it doesn't
  need to be reopened (not a placeholder). Also in this case, if the table is
  not write locked, a exclusive lock can't be acquired because of a possible
  deadlock with another thread also holding a (read) lock on the table. The
  second issue arises from the fact that one should never wait for a global
  read lock if it's holding any locked tables, because the global read lock
  is waiting for these tables and this leads to a circular wait deadlock.
  
  The solution for the first case is to check if the table is write locked
  and upgraded the write lock to a exclusive lock and fail otherwise for non
  write locked tables. Grabbin the exclusive lock in this case also means
  to ensure that the table is opened only by the calling thread. The second
  issue is partly fixed by not waiting for the global read lock if the thread
  is holding any locked tables.
  
  The second issue is only partly addressed in this patch because it turned
  out to be much wider and also affects other DDL statements. Reported as
  Bug#32395

  mysql-test/r/trigger.result@1.75, 2007-11-29 09:42:23-02:00, davi@mysql.com +35 -0
    Add test case result for Bug#23713

  mysql-test/r/trigger_notembedded.result@1.5.1.10, 2007-11-29 09:42:23-02:00, davi@mysql.com +1 -0
    Add test case result for Bug#23713

  mysql-test/r/trigger_notembedded.result@1.5.1.9, 2007-11-29 09:37:30-02:00, davi@mysql.com +0 -0
    Rename: mysql-test/r/trigger-grant.result -> mysql-test/r/trigger_notembedded.result

  mysql-test/t/trigger.test@1.85, 2007-11-29 09:42:23-02:00, davi@mysql.com +47 -0
    Add test case for Bug#23713

  mysql-test/t/trigger_notembedded.test@1.7.1.10, 2007-11-29 09:42:23-02:00, davi@mysql.com +34 -0
    Add test case for Bug#23713

  mysql-test/t/trigger_notembedded.test@1.7.1.9, 2007-11-29 09:37:41-02:00, davi@mysql.com +0 -0
    Rename: mysql-test/t/trigger-grant.test -> mysql-test/t/trigger_notembedded.test

  sql/mysql_priv.h@1.505.17.31, 2007-11-29 09:42:23-02:00, davi@mysql.com +4 -2
    Locally export wait_while_table_is_used and name_lock_locked_table
    and add flag to mysql_ha_rm_tables to signal that LOCK_open is locked.

  sql/sql_base.cc@1.374.39.21, 2007-11-29 09:42:23-02:00, davi@mysql.com +40 -2
    Introduce name_lock_locked_table function and match
    close_old_data_files function declaration and definition.

  sql/sql_handler.cc@1.99.1.7, 2007-11-29 09:42:23-02:00, davi@mysql.com +3 -4
    Add flag to mysql_ha_rm_tables to signal that LOCK_open is locked.

  sql/sql_rename.cc@1.49, 2007-11-29 09:42:23-02:00, davi@mysql.com +1 -1
    Fix mysql_ha_rm_tables caller.

  sql/sql_table.cc@1.388.54.11, 2007-11-29 09:42:24-02:00, davi@mysql.com +7 -5
    Export wait_while_table_is_used and assert that LOCK_open is locked
    and fix mysql_ha_rm_tables caller.

  sql/sql_trigger.cc@1.46.1.62, 2007-11-29 09:42:24-02:00, davi@mysql.com +35 -33
    Upgrade write locked tables to a exclusive lock and fail if
    the table is not write locked. Also, don't wait for the global
    read lock if under LOCK TABLES.

ChangeSet@1.2685.20.4, 2007-11-29 15:17:05+04:00, ramil@mysql.com +2 -0
  after-merge fix:
    - result adjusted.

  mysql-test/r/ctype_utf16_uca.result@1.3, 2007-11-29 15:17:03+04:00, ramil@mysql.com +4 -0
    after-merge fix:
      - result adjusted.

  mysql-test/r/ctype_utf32_uca.result@1.3, 2007-11-29 15:17:03+04:00, ramil@mysql.com +4 -0
    after-merge fix:
      - result adjusted.

ChangeSet@1.2685.13.16, 2007-11-28 23:00:53-06:00, chris@xeno.mysql.com +1 -0
  Bug#32730, Concurrent TRUNCATEs crash Falcon engine
  - Explicitly unlock the StorageTable truncate sync object in the destructor, and when deleting a table. 

  storage/falcon/StorageTable.cpp@1.11, 2007-11-28 23:00:51-06:00, chris@xeno.mysql.com +4 -0
    Clear truncate lock in destructor and before deleting table.

ChangeSet@1.2685.13.15, 2007-11-28 16:39:38-05:00, jas@rowvwade. +1 -0
  Don't get a shared truncate lock when we're planning to do a truncate.

  storage/falcon/ha_falcon.cpp@1.33.4.4, 2007-11-28 16:39:21-05:00, jas@rowvwade. +8 -3
    Don't get a shared truncate lock when we're planning to do a truncate.

ChangeSet@1.2685.13.14, 2007-11-28 16:21:04-05:00, jas@rowvwade. +3 -0
  Set storage table truncate lock when starting a transaction and
  clear it when completing the transaction.

  storage/falcon/StorageTable.cpp@1.10, 2007-11-28 16:20:55-05:00, jas@rowvwade. +12 -4
    Add class boolean around truncate lock.  Also eliminated the
    lock type (Shared is the only possibility) and changed the
    names for clarity.

  storage/falcon/StorageTable.h@1.6, 2007-11-28 16:20:55-05:00, jas@rowvwade. +3 -2
    Add class boolean around truncate lock.  Also eliminated the
    lock type (Shared is the only possibility) and changed the
    names for clarity.

  storage/falcon/ha_falcon.cpp@1.33.4.3, 2007-11-28 16:20:55-05:00, jas@rowvwade. +20 -6
    Set storage table truncate lock when starting a transaction and
    clear it when completing the transaction.

ChangeSet@1.2685.13.13, 2007-11-28 15:28:40-05:00, harrison@hotspur. +1 -0
  Comment out the code that prevents the server from handling
  two engines that support two-phase commit.

  sql/handler.cc@1.254.13.1, 2007-11-28 15:28:23-05:00, harrison@hotspur. +4 -0
    Comment out the code that prevents the server from handling
    two engines that support two-phase commit.

ChangeSet@1.2685.19.1, 2007-11-28 14:59:25-05:00, harrison@hotspur. +1 -0
  Fix a potential race condition on startup - the serial
  log tried to wake up gopher without checking that they
  were completely started, resulting in an access violation
  that got caught in a general handler and resulted in an
  unnoticed failed initialization.  So, check that the 
  gopher has a thread before waking it.

  storage/falcon/SerialLog.cpp@1.26, 2007-11-28 14:59:07-05:00, harrison@hotspur. +2 -7
    Fix a possible race condition on startup - if the gopher
    exists but doesn't yet have a thread, don't wake it.

ChangeSet@1.2685.18.1, 2007-11-28 13:08:21-06:00, chris@xeno.mysql.com +6 -0
  Bug#32730 - Concurrent TRUNCATEs crash Falcon engine
  - Added TRUNCATE sync object to StorageTable
  - Fixed root page bug in Index::rebuildIndexes

  storage/falcon/Database.cpp@1.22.1.1, 2007-11-28 13:08:18-06:00, chris@xeno.mysql.com +17 -3
    Moved TRUNCATE sync locks from Table::truncate to Database::truncateTable.

  storage/falcon/Index.cpp@1.11, 2007-11-28 13:08:19-06:00, chris@xeno.mysql.com +2 -0
    Index::rebuildIndex() - Added getRootPage() because index was not updated with new root page.

  storage/falcon/StorageTable.cpp@1.7.1.1, 2007-11-28 13:08:19-06:00, chris@xeno.mysql.com +16 -0
    Added syncTruncate object and set/clear methods.

  storage/falcon/StorageTable.h@1.5, 2007-11-28 13:08:19-06:00, chris@xeno.mysql.com +5 -0
    Added syncTruncate object and set/clear methods.

  storage/falcon/Table.cpp@1.26, 2007-11-28 13:08:19-06:00, chris@xeno.mysql.com +7 -25
    Table::truncate()
    - Moved control of sync objects to Database::truncateTable()
    - Update data/blob section pointers

  storage/falcon/ha_falcon.cpp@1.33.5.1, 2007-11-28 13:08:19-06:00, chris@xeno.mysql.com +13 -1
    delete_all_rows() - Check current_thd->transaction.on instead of sql command
    execute_lock() - Added truncate synchronization.

ChangeSet@1.2699, 2007-11-28 19:46:31+01:00, df@pippilotta.erinye.com +7 -0
  include falcon test suite in makefile target and make it work without falcon compiled it

  Makefile.am@1.144.1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +2 -0
    add falcon test suite to makefile target

  mysql-test/suite/falcon/t/falcon_page_size_1-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

  mysql-test/suite/falcon/t/falcon_page_size_16-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

  mysql-test/suite/falcon/t/falcon_page_size_2-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

  mysql-test/suite/falcon/t/falcon_page_size_32-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

  mysql-test/suite/falcon/t/falcon_page_size_4-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

  mysql-test/suite/falcon/t/falcon_page_size_8-master.opt@1.2, 2007-11-28 19:46:26+01:00, df@pippilotta.erinye.com +1 -1
    rewrite this option so the test case can correctly be executed (and therefore skipped) without falcon

ChangeSet@1.2685.13.8, 2007-11-28 19:19:44+01:00, hakank@lu0011.(none) +1 -0
  Review fixes.
  Converted spaces to tabs.

  storage/falcon/Configuration.cpp@1.14, 2007-11-28 19:19:39+01:00, hakank@lu0011.(none) +21 -20
    Review fixes.
    Converted spaces to tabs.

ChangeSet@1.2685.11.2, 2007-11-28 12:21:03-05:00, jas@rowvwade. +10 -0
  Add recovery code for device full disk errors -- go into
  a retry loop with a 1 second timeout until either the
  server is shut down or the disk space becomes available.
  
  In the meantime, however, bounce all update requests so
  the poor users find out that their disk is full.

  storage/falcon/Cache.cpp@1.42.1.1, 2007-11-28 12:20:51-05:00, jas@rowvwade. +91 -2
    Add recovery code for device full disk errors -- go into
    a retry loop with a 1 second timeout until either the
    server is shut down or the disk space becomes available.
    
    In the meantime, however, bounce all update requests so
    the poor users find out that their disk is full.

  storage/falcon/Database.cpp@1.21.1.1, 2007-11-28 12:20:52-05:00, jas@rowvwade. +42 -17
    Add recovery code for device full disk errors -- go into
    a retry loop with a 1 second timeout until either the
    server is shut down or the disk space becomes available.
    
    In the meantime, however, bounce all update requests so
    the poor users find out that their disk is full.

  storage/falcon/Database.h@1.19, 2007-11-28 12:20:52-05:00, jas@rowvwade. +6 -0
    Add recovery code for device full disk errors -- go into
    a retry loop with a 1 second timeout until either the
    server is shut down or the disk space becomes available.
    
    In the meantime, however, bounce all update requests so
    the poor users find out that their disk is full.

  storage/falcon/IO.cpp@1.21, 2007-11-28 12:20:52-05:00, jas@rowvwade. +19 -1
    Add distinct error codes for "device full".

  storage/falcon/SQLException.h@1.9, 2007-11-28 12:20:53-05:00, jas@rowvwade. +2 -1
    Add distinct error codes for "device full".

  storage/falcon/SerialLogFile.cpp@1.14, 2007-11-28 12:20:53-05:00, jas@rowvwade. +13 -3
    Add distinct error codes for "device full".

  storage/falcon/SerialLogWindow.cpp@1.4, 2007-11-28 12:20:53-05:00, jas@rowvwade. +36 -1
    Add recovery code for device full disk errors -- go into
    a retry loop with a 1 second timeout until either the
    server is shut down or the disk space becomes available.
    
    In the meantime, however, bounce all update requests so
    the poor users find out that their disk is full.

  storage/falcon/StorageTable.cpp@1.8, 2007-11-28 12:20:54-05:00, jas@rowvwade. +4 -0
    Add distinct error codes for "device full".

  storage/falcon/StorageTableShare.h@1.11, 2007-11-28 12:20:54-05:00, jas@rowvwade. +2 -1
    Add distinct error codes for "device full".

  storage/falcon/ha_falcon.cpp@1.33.2.1, 2007-11-28 12:20:54-05:00, jas@rowvwade. +4 -0
    Add distinct error codes for "device full".

ChangeSet@1.2529.1.92, 2007-11-28 17:36:28+01:00, df@pippilotta.erinye.com +1 -0
  use --builddir option for mysql_install_db

  Makefile.am@1.144.1.1, 2007-11-28 17:36:26+01:00, df@pippilotta.erinye.com +1 -1
    use --builddir option for mysql_install_db

ChangeSet@1.2529.1.91, 2007-11-28 17:32:28+01:00, df@pippilotta.erinye.com +1 -0
  fix make distcheck in a different way

  scripts/mysql_install_db.sh@1.91, 2007-11-28 17:32:22+01:00, df@pippilotta.erinye.com +29 -20
    apply different patch for make distcheck failure

ChangeSet@1.2529.219.4, 2007-11-28 17:04:02+01:00, df@pippilotta.erinye.com +1 -0
  include data files for parts test suite in distribution

  mysql-test/Makefile.am@1.111.2.7, 2007-11-28 17:04:00+01:00, df@pippilotta.erinye.com +4 -0
    include data files for parts test suite in distribution

ChangeSet@1.2685.15.2, 2007-11-28 08:46:46-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  sql/sql_table.cc@1.412.9.2, 2007-11-28 08:46:40-07:00, malff@lambda.hsd1.co.comcast.net. +0 -3
    Manual merge

ChangeSet@1.2529.229.4, 2007-11-28 08:41:45-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  sql/sql_table.cc@1.388.67.2, 2007-11-28 08:41:35-07:00, malff@lambda.hsd1.co.comcast.net. +0 -3
    Manual merge

ChangeSet@1.2685.7.8, 2007-11-28 18:07:24+04:00, svoj@mysql.com +5 -0
  BUG#22972 - Falcon: Partitioned table with pending transaction leads to
              strange error
  
  Falcon cannot drop a table with pending transaction and error
  message is misleading.
  
  With this fix Falcon returns descriptive warning.

  include/my_base.h@1.111.1.1, 2007-11-28 18:07:22+04:00, svoj@mysql.com +2 -1
    Added error code for "Can't execute the given command because you have
    active locked tables or an active transaction" message.

  mysql-test/suite/falcon/r/falcon_bug_22972.result@1.1, 2007-11-28 18:07:22+04:00, svoj@mysql.com +10 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_22972.result''

  mysql-test/suite/falcon/r/falcon_bug_22972.result@1.0, 2007-11-28 18:07:22+04:00, svoj@mysql.com +0 -0

  mysql-test/suite/falcon/t/falcon_bug_22972.test@1.1, 2007-11-28 18:07:22+04:00, svoj@mysql.com +15 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_22972.test''

  mysql-test/suite/falcon/t/falcon_bug_22972.test@1.0, 2007-11-28 18:07:22+04:00, svoj@mysql.com +0 -0

  sql/handler.cc@1.254.12.1, 2007-11-28 18:07:22+04:00, svoj@mysql.com +5 -0
    Added handling of HA_ERR_LOCK_OR_ACTIVE_TRANSACTION error.

  storage/falcon/ha_falcon.cpp@1.33.1.5, 2007-11-28 18:07:22+04:00, svoj@mysql.com +1 -1
    Return descriptive error when storage has uncommitted updates.

ChangeSet@1.1810.3487.1, 2007-11-28 10:18:01-02:00, davi@mysql.com +3 -0
  Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
  
  Kill of a CREATE TABLE source_table LIKE statement waiting for a
  name-lock on the source table causes a bad lock interaction.
  
  The mysql_create_like_table() has a bug that if the connection is
  killed while waiting for the name-lock on the source table, it will
  jump to the wrong error path and try to unlock the source table and
  LOCK_open, but both weren't locked.
  
  The solution is to simple return when the name lock request is killed,
  it's safe to do so because no lock was acquired and no cleanup is needed.
  
  Original bug report also contains description of other problems
  related to this scenario but they either already fixed in 5.1 or
  will be addressed separately (see bug report for details).

  mysql-test/r/lock_multi.result@1.15.1.7, 2007-11-28 10:18:00-02:00, davi@mysql.com +11 -0
    Add test case result for Bug#31479

  mysql-test/t/lock_multi.test@1.13.1.10, 2007-11-28 10:18:00-02:00, davi@mysql.com +32 -0
    Add test case for Bug#31479

  sql/sql_table.cc@1.239.1.119, 2007-11-28 10:18:00-02:00, davi@mysql.com +1 -1
    Rerturn TRUE when the lock gets killed.

ChangeSet@1.2685.12.2, 2007-11-28 13:09:37+01:00, hakank@au0012. +1 -0
  Changed FreeBSD and Mac physical RAM size detection to work with
  RAM size > 2GB.

  storage/falcon/Configuration.cpp@1.13, 2007-11-28 13:09:32+01:00, hakank@au0012. +13 -3
    Changed FreeBSD and Mac physical RAM size detection to work with
    RAM size > 2GB.

ChangeSet@1.2685.13.4, 2007-11-28 10:29:45+01:00, istruewing@stella.local +1 -0
  Bug#28772 rpl_row_until fails in pushbuild
  Disabled the test case.

  mysql-test/suite/rpl/t/disabled.def@1.26, 2007-11-28 10:29:43+01:00, istruewing@stella.local +1 -0
    Bug#28772 rpl_row_until fails in pushbuild
    Disabled the test case.

ChangeSet@1.2685.13.3, 2007-11-28 10:19:14+01:00, istruewing@stella.local +1 -0
  Bug#32802 - Compiler warning in ctype-ucs2.c
  
  Compiler warned about possible use of uninitialized 'wc'.
  
  Added LINT_INIT(wc).

  strings/ctype-ucs2.c@1.77, 2007-11-28 10:19:13+01:00, istruewing@stella.local +1 -0
    Bug#32802 - Compiler warning in ctype-ucs2.c
    Added LINT_INIT(wc).

ChangeSet@1.2529.229.1, 2007-11-28 10:00:23+01:00, istruewing@stella.local +2 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Moved disabling to rpl suite.
  Bug#32801 wait_timeout.test fails randomly
  Disabled test case.

  mysql-test/suite/rpl/t/disabled.def@1.16.1.6, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.

  mysql-test/t/disabled.def@1.243.41.21, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -1
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.
    Bug#32801 wait_timeout.test fails randomly
    Disabled test case.

ChangeSet@1.1810.3395.57, 2007-11-28 09:48:06+01:00, istruewing@stella.local +1 -0
  Bug#29149 Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.2.4.35, 2007-11-28 09:48:04+01:00, istruewing@stella.local +1 -0
    Bug#29149 Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2529.216.9, 2007-11-28 09:03:21+01:00, thek@adventure.(none) +1 -0
  Error number increased; fixing broken number.

  mysql-test/r/grant.result@1.83.1.3, 2007-11-28 09:03:18+01:00, thek@adventure.(none) +1 -1
    Error number increased; fixing broken number.

ChangeSet@1.1810.3486.1, 2007-11-28 10:55:13+04:00, ramil@mysql.com +9 -0
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - fix for #31070 (missed during merging) applied for cp932 charset.
    - tests/results adjusted.

  mysql-test/t/ctype_cp932.test@1.8.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/include/ctype_common.inc@1.4, 2007-11-28 10:55:11+04:00, ramil@mysql.com +2 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_big5.result@1.11.1.5, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_euckr.result@1.2.2.3, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gb2312.result@1.2.1.3, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gbk.result@1.4.1.3, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_uca.result@1.18.4.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_cp932.result@1.6.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +74 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  strings/ctype-cp932.c@1.11.1.7, 2007-11-28 10:55:12+04:00, ramil@mysql.com +2 -2
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - fix for #31070 (missed during merging) applied for cp932.
     

ChangeSet@1.2529.1.89, 2007-11-27 17:38:21-07:00, tsmith@ramayana.hindu.god +1 -0
  Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686
  
  This change isn't correct, and the correct one will be pulled in from another
  repository.

  client/mysql.cc@1.269.8.2, 2007-11-27 17:38:16-07:00, tsmith@ramayana.hindu.god +0 -0
    Exclude

ChangeSet@1.2685.7.7, 2007-11-27 14:07:30-06:00, klewis@klewis-mysql. +13 -0
  Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/Collation.h@1.2, 2007-11-27 14:06:53-06:00, klewis@klewis-mysql. +1 -1
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/CollationCaseless.cpp@1.2, 2007-11-27 14:06:55-06:00, klewis@klewis-mysql. +1 -1
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/CollationCaseless.h@1.2, 2007-11-27 14:06:58-06:00, klewis@klewis-mysql. +1 -1
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/CollationUnknown.cpp@1.2, 2007-11-27 14:07:02-06:00, klewis@klewis-mysql. +2 -2
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/CollationUnknown.h@1.2, 2007-11-27 14:07:04-06:00, klewis@klewis-mysql. +1 -1
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/Database.cpp@1.22, 2007-11-27 14:07:06-06:00, klewis@klewis-mysql. +1 -1
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/Index.cpp@1.10, 2007-11-27 14:07:09-06:00, klewis@klewis-mysql. +4 -4
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/Index2Node.h@1.2, 2007-11-27 14:07:11-06:00, klewis@klewis-mysql. +2 -2
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/IndexKey.h@1.3, 2007-11-27 14:07:14-06:00, klewis@klewis-mysql. +4 -3
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/IndexNode.h@1.2, 2007-11-27 14:07:15-06:00, klewis@klewis-mysql. +2 -2
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/MySQLCollation.cpp@1.2, 2007-11-27 14:07:17-06:00, klewis@klewis-mysql. +7 -5
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/MySQLCollation.h@1.2, 2007-11-27 14:07:19-06:00, klewis@klewis-mysql. +2 -2
    Bug#32554 - Enforce maximum key length based on page size.

  storage/falcon/ha_falcon.cpp@1.33.1.4, 2007-11-27 14:07:21-06:00, klewis@klewis-mysql. +2 -2
    Bug#32554 - Enforce maximum key length based on page size.

ChangeSet@1.2685.12.1, 2007-11-27 19:28:12+01:00, hakank@au0012. +2 -0
  Fix for Bug#32201 Creating a table on a fresh Falcon installation leads to crash.
  
  Problem was that
      Configuration::getPhysicalMemory()
  
  was always returning 0 as physical memory size
  and thus letting
      MemControll::getPhysicalMemory()
  
  always returning false which caused an
  "record memory is exhausted" error.
      

  storage/falcon/Configuration.cpp@1.12, 2007-11-27 19:28:06+01:00, hakank@au0012. +20 -18
    Fix for Bug#32201 Creating a table on a fresh Falcon installation leads to crash.

  storage/falcon/MemMgr.cpp@1.11.1.1, 2007-11-27 19:28:07+01:00, hakank@au0012. +136 -138
    Fixed indentation of methods. While on it also fixed white space.

ChangeSet@1.2685.11.1, 2007-11-27 13:08:29-05:00, jas@rowvwade. +3 -0
  Rework blob garbage collection to use bitmap of blob ids
  to replace n-squared operation on lists of record versions.
  
  The is a fix for Falcon bug 32062.

  storage/falcon/Record.cpp@1.3, 2007-11-27 13:08:19-05:00, jas@rowvwade. +35 -30
    Split out Record::getRawValue (returns blob ids) from
    Record::getValue (returns blob objects) to give blob
    garbage collection quick, cheap access to blob ids.

  storage/falcon/Record.h@1.3, 2007-11-27 13:08:20-05:00, jas@rowvwade. +1 -0
    Split out Record::getRawValue (returns blob ids) from
    Record::getValue (returns blob objects) to give blob
    garbage collection quick, cheap access to blob ids.

  storage/falcon/Table.cpp@1.25, 2007-11-27 13:08:20-05:00, jas@rowvwade. +33 -0
    Rework blob garbage collection to use bitmap of blob ids
    to replace n-squared operation on lists of record versions.

ChangeSet@1.1810.3485.2, 2007-11-27 21:30:00+04:00, ramil@mysql.com +2 -0
  after-merge fixup: archive test/result adjusted.

  mysql-test/r/archive.result@1.13.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

  mysql-test/t/archive.test@1.14.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

ChangeSet@1.1810.3395.54, 2007-11-27 17:28:55+01:00, istruewing@stella.local +1 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Disabled the test case.

  mysql-test/t/disabled.def@1.2.4.34, 2007-11-27 17:28:54+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Disabled the test case.

ChangeSet@1.2685.10.3, 2007-11-27 19:55:24+04:00, ramil@mysql.com +2 -0
  after-merge fix:
    - test/result adjusted.

  mysql-test/r/archive_aio_posix.result@1.3, 2007-11-27 19:55:22+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - test/result adjusted.

  mysql-test/t/archive_aio_posix.test@1.3, 2007-11-27 19:55:22+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - test/result adjusted.

ChangeSet@1.2685.4.21, 2007-11-27 14:55:54+01:00, istruewing@stella.local +1 -0
  Bug#32771 events_bugs.test fails randomly
  Disabled the test case.

  mysql-test/t/disabled.def@1.284.3.9, 2007-11-27 14:55:53+01:00, istruewing@stella.local +1 -0
    Bug#32771 events_bugs.test fails randomly
    Disabled the test case.

ChangeSet@1.2693, 2007-11-27 14:55:36+01:00, hhunger@hh-nb.hhunger +5 -0
  post merge fix for bug 32496.

  mysql-test/suite/funcs_1/r/innodb_views.result@1.15, 2007-11-27 14:55:33+01:00, hhunger@hh-nb.hhunger +28 -24
    post merge fix for bug 32496.

  mysql-test/suite/funcs_1/r/memory_views.result@1.15, 2007-11-27 14:55:33+01:00, hhunger@hh-nb.hhunger +28 -24
    post merge fix for bug 32496.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.15, 2007-11-27 14:55:33+01:00, hhunger@hh-nb.hhunger +1197 -1188
    post merge fix for bug 32496.

  mysql-test/suite/funcs_1/r/ndb_views.result@1.10, 2007-11-27 14:55:33+01:00, hhunger@hh-nb.hhunger +29 -25
    post merge fix for bug 32496.

  mysql-test/suite/funcs_1/views/views_master.inc@1.16, 2007-11-27 14:55:33+01:00, hhunger@hh-nb.hhunger +297 -294
    post merge fix for bug 32496.

ChangeSet@1.2685.3.11, 2007-11-27 11:34:10+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling failing tests reported as bugs.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.16, 2007-11-27 11:34:07+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests reported as bugs.

ChangeSet@1.2685.10.2, 2007-11-27 14:12:28+04:00, ramil@mysql.com +1 -0
  after-merge fix:
    - test result adjusted.

  mysql-test/r/analyze.result@1.11, 2007-11-27 14:12:26+04:00, ramil@mysql.com +8 -0
    after-merge fix:
      - test result adjusted.

ChangeSet@1.2529.215.12, 2007-11-27 11:02:00+01:00, mkindahl@dl145h.mysql.com +3 -0
  Disabling several tests that fail and reported as errors.

  mysql-test/suite/ndb/t/disabled.def@1.3.2.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/disabled.def@1.16.1.4, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/rpl_ssl.test@1.11.1.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +6 -1
    Disabling part of test that fails.

ChangeSet@1.2529.228.1, 2007-11-27 14:01:11+04:00, svoj@mysql.com +2 -0
  BUG#32050 - table logging gone wrong.
  
  INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
  with NULL-able column results in server crash in debug builds.
  
  Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
  but it is still possible to get such table from older MySQL versions.
  
  Fixed by removing excessive DBUG_ASSERT().

  scripts/mysql_system_tables_fix.sql@1.63.1.3, 2007-11-27 14:01:02+04:00, svoj@mysql.com +16 -0
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns.
    Alter system CSV tables structure so that all columns are NOT NULL.

  storage/csv/ha_tina.cc@1.84.1.2, 2007-11-27 14:01:02+04:00, svoj@mysql.com +0 -8
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
    but it is still possible to get such table from older MySQL versions.
    
    Removed excessive DBUG_ASSERT().

ChangeSet@1.2685.4.20, 2007-11-27 10:36:58+01:00, istruewing@stella.local +2 -0
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
    
  One test case, new in 6.0, was missing cleanup at the end.
  
  Added cleanup (drop table).

  mysql-test/r/innodb_mrr.result@1.2, 2007-11-27 10:36:56+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test case.

  mysql-test/t/innodb_mrr.test@1.2, 2007-11-27 10:36:56+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added cleanup (drop table).

ChangeSet@1.2529.227.2, 2007-11-27 12:28:08+04:00, ramil@mysql.com +4 -0
  after-merge fix:
    - archive test/result adjusted.
    - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.

  mysql-test/r/archive.result@1.33.3.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/r/partition.result@1.68.10.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +10 -0
    after-merge fix:
      - test case added.

  mysql-test/t/archive.test@1.32.3.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/t/partition.test@1.62.12.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +15 -0
    after-merge fix:
      - test case added.

ChangeSet@1.2529.169.57, 2007-11-27 09:25:45+01:00, istruewing@stella.local +7 -0
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  
  Some test cases were missing preparation to deal with failed
  predecessor test cases.
  
  Added preparation (drop table if exists) to some test cases.

  mysql-test/include/innodb_rollback_on_timeout.inc@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/r/innodb-semi-consistent.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb-ucs2.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_mysql.result@1.24.28.5, 2007-11-27 09:25:44+01:00, istruewing@stella.local +3 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_timeout_rollback.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/t/innodb-semi-consistent.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/t/innodb-ucs2.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

ChangeSet@1.1810.3483.1, 2007-11-27 09:36:43+04:00, ramil@mysql.com +4 -0
  Fix for bug #32559: connection hangs on query with name_const
  
  Problem: passing a non-constant name to the NAME_CONST function results in a crash.
  
  Fix: check the NAME_CONST name argument; return fake item type if we got
  non-constant argument(s).

  mysql-test/r/func_misc.result@1.21.1.9, 2007-11-27 09:36:40+04:00, ramil@mysql.com +7 -0
    Fix for bug #32559: connection hangs on query with name_const
      - test result.

  mysql-test/t/func_misc.test@1.21.2.3, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - test case.

  sql/item.cc@1.113.1.179, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - Item_name_const::type() now returns NULL_ITEM if non-constant arguments 
        were used to create the item to avoid wrong type casting.

  sql/item.h@1.183.1.64, 2007-11-27 09:36:40+04:00, ramil@mysql.com +3 -1
    Fix for bug #32559: connection hangs on query with name_const
      - NAME_CONST name argument checked for invariability.

ChangeSet@1.2685.9.3, 2007-11-26 19:42:45-06:00, klewis@klewis-mysql. +1 -0
  New server code uses error 1656 instead of 1655

  mysql-test/suite/falcon/t/falcon_bug_29511.test@1.4, 2007-11-26 19:42:36-06:00, klewis@klewis-mysql. +1 -1
    New server code uses error 1656 instead of 1655

ChangeSet@1.2685.9.2, 2007-11-26 18:53:57-06:00, klewis@klewis-mysql. +5 -0
  Fix regression due to new error handling for tablespaces.
  Now returns appropriate error instead of 'Unknown error -103'
  Eliminate a compiler warning in cache.cpp
  The check for 10,000 inserts on a load or alter table is 
  expanded to include CREATE ... SELECT.
  Also, there was an untestable bug in which a new transaction 
  was started for every insert after the first 10,000.
  The performance of very large loads should improve a bit.

  mysql-test/suite/falcon/r/falcon_bug_29511.result@1.2, 2007-11-26 18:52:56-06:00, klewis@klewis-mysql. +3 -5
    Fix regression due to new error handling for tablespaces.
    Now returns appropriate error instead of 'Unknown error -103'

  mysql-test/suite/falcon/t/falcon_bug_29511.test@1.3, 2007-11-26 18:53:00-06:00, klewis@klewis-mysql. +3 -5
    Fix regression due to new error handling for tablespaces.
    Now returns appropriate error instead of 'Unknown error -103'

  storage/falcon/Cache.cpp@1.43, 2007-11-26 18:53:44-06:00, klewis@klewis-mysql. +0 -1
    Eliminate compiler warning

  storage/falcon/TableSpaceManager.cpp@1.12, 2007-11-26 18:53:46-06:00, klewis@klewis-mysql. +1 -1
    Fix regression due to new error handling for tablespaces.
    Now returns appropriate error instead of 'Unknown error -103'

  storage/falcon/ha_falcon.cpp@1.33.1.3, 2007-11-26 18:53:48-06:00, klewis@klewis-mysql. +2 -1
    The check for 10,000 inserts on a load or alter table is 
    expanded to include CREATE ... SELECT.
    Also, there was a bug in which a new transaction was started
    for every insert after the first 10,000

ChangeSet@1.2529.226.2, 2007-11-26 22:50:12+01:00, hhunger@hh-nb.hhunger +2 -0
  post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.8.2.2, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +1192 -1184
    post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/ndb_views.result@1.3.2.1, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +11 -4
    post merge fix for bug#32496.

ChangeSet@1.1810.3476.2, 2007-11-26 21:28:01+01:00, hhunger@hh-nb.hhunger +5 -0
  patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  BitKeeper/etc/ignore@1.210.1.45, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +2 -0
    Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.2, 2007-11-26 21:27:58+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +1158 -1150
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/views/views_master.inc@1.1.2.1, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +9 -0
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

ChangeSet@1.2529.215.11, 2007-11-26 20:05:52+01:00, msvensson@pilot.mysql.com +1 -0
  Remove disabling of testcases

  mysql-test/suite/rpl/t/disabled.def@1.16.1.3, 2007-11-26 20:05:50+01:00, msvensson@pilot.mysql.com +0 -2
    Remove disabling of testcases

ChangeSet@1.2685.4.18, 2007-11-26 19:52:46+01:00, istruewing@stella.local +1 -0
  Bug#32733 ndb_binlog_format.test fails randomly
  Disabled test case.

  mysql-test/suite/ndb/t/disabled.def@1.11, 2007-11-26 19:52:44+01:00, istruewing@stella.local +1 -0
    Bug#32733 ndb_binlog_format.test fails randomly
    Disabled test case.

ChangeSet@1.2529.215.10, 2007-11-26 19:50:43+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#25146 Some warnings/errors not shown when using --show-warnings
   - Additional patch to fix compiler warnings

  client/mysql.cc@1.269.1.9, 2007-11-26 19:50:40+01:00, msvensson@pilot.mysql.com +3 -2
    Initialize warnings to 0 to avid compiler warning
    Call 'print_warnings' also when error occured

  mysql-test/r/mysql.result@1.37.1.6, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

  mysql-test/t/mysql.test@1.47.1.5, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

ChangeSet@1.2603.38.4, 2007-11-26 19:44:49+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient
   - Case values has changed in 6.0

  sql-common/client.c@1.142.1.3, 2007-11-26 19:44:47+01:00, msvensson@pilot.mysql.com +2 -2
    Update case value in 6.0 since they have changed by removal of
    rpl_* functions

ChangeSet@1.2529.215.9, 2007-11-26 19:42:07+01:00, msvensson@pilot.mysql.com +1 -0
  Revert

  client/mysql.cc@1.269.1.8, 2007-11-26 19:42:05+01:00, msvensson@pilot.mysql.com +1 -1
    Revert

ChangeSet@1.2685.4.17, 2007-11-26 19:39:02+01:00, istruewing@stella.local +1 -0
  Bug#32731 falcon_bug_27951 fails randomly
  Disabled test case.

  mysql-test/suite/falcon/t/disabled.def@1.2.2.3, 2007-11-26 19:39:00+01:00, istruewing@stella.local +1 -0
    Bug#32731 falcon_bug_27951 fails randomly
    Disabled test case.

ChangeSet@1.2603.55.2, 2007-11-26 19:21:25+01:00, msvensson@pilot.mysql.com +3 -0
  Remove rpl_probe, enable_rpl_parse and disable_rpl_parse commands
  from mysqltest, the corresponding funtctions have been removed from
  MySQL C API

  BitKeeper/deleted/.del-rpl_redirect.result@1.22, 2007-11-26 19:19:49+01:00, msvensson@pilot.mysql.com +0 -0
    Rename: mysql-test/suite/rpl/r/rpl_redirect.result -> BitKeeper/deleted/.del-rpl_redirect.result

  BitKeeper/deleted/.del-rpl_redirect.test@1.20, 2007-11-26 19:19:49+01:00, msvensson@pilot.mysql.com +0 -0
    Rename: mysql-test/suite/rpl/t/rpl_redirect.test -> BitKeeper/deleted/.del-rpl_redirect.test

  client/mysqltest.c@1.320, 2007-11-26 19:21:23+01:00, msvensson@pilot.mysql.com +8 -53
    - Remove rpl_probe, enable_rpl_parse and disable_rpl_parse

ChangeSet@1.1810.3395.52, 2007-11-26 19:16:23+01:00, istruewing@stella.local +2 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  Fixed wrong variable assignment.

  mysql-test/r/delayed.result@1.12.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

  mysql-test/t/delayed.test@1.11.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

ChangeSet@1.2529.224.1, 2007-11-26 19:09:40+01:00, thek@adventure.(none) +4 -0
  Bug#16470 crash on grant if old grant tables
  
  Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
  This caused the server to crash on any attempt to store new grants because
  of uninitialized structures.
  
  This patch breaks up the grant loading function into two phases to allow
  for procs_priv table to fail with an warning instead of crashing the server.

  mysql-test/r/grant.result@1.81.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +19 -0
    Test case

  mysql-test/t/grant.test@1.62.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +20 -0
    Test case making sure that FLUSH PRIVILEGES doesn't crash the server if
    procs_priv is removed.

  sql/sql_acl.cc@1.243.4.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +202 -112
    - Refactored grant_reload into two phases: 1. open and lock tables_priv and 
      columns_priv tables, read the data, close tables. 2. open and lock
      procs_priv, read data, close table. Since the tables are independant of
      each other there will be no race conditions and it will be possible to
      handle situations where the procs_priv table isn't present.
    - Refactored the helper function grant_load into new grant_load (without
      procs_priv table) and grant_load_procs_priv.
      

  sql/sql_parse.cc@1.693.27.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +15 -16
    - Changed comment style to doxygen style.

ChangeSet@1.2603.55.1, 2007-11-26 19:03:23+01:00, msvensson@pilot.mysql.com +4 -0
  Bug#31952 Remove undocumented mysql_rpl_* functions.
   - Functions removed + variables in st_mysql and st_mysql_options renamed
     to "unusedn".
   - Code updated to work without those functions and variables 

  include/mysql.h@1.182.1.1, 2007-11-26 19:03:21+01:00, msvensson@pilot.mysql.com +6 -84
    - Remove "enum mysql_rpl_type"
    - Remove variables used for mysql_rpl_* from 
       "struct st_mysql_options" and "struct st_mysql"
    - Remove function prototypes for
        mysql_enable_rpl_parse, mysql_disable_rpl_parse, mysql_rpl_parse_enabled,
        mysql_enable_reads_from_master, mysql_disable_reads_from_master,
        mysql_reads_from_master_enabled, mysql_rpl_query_type, mysql_rpl_probe,
        mysql_set_master and mysql_add_slave
    - Remove duplicate define of mysql_reload

  libmysql/libmysql.c@1.299.4.1, 2007-11-26 19:03:21+01:00, msvensson@pilot.mysql.com +7 -384
    - Remove exported functions
       mysql_master_query, mysql_master_send_query,
       mysql_slave_query, mysql_slave_send_query, 
       mysql_enable_rpl_parse, mysql_disable_rpl_parse, mysql_rpl_parse_enabled,
       mysq_enable_reads_from_master, mysql_disable_reads_from_master,
        mysql_reads_from_master_enabled,
       mysql_rpl_probe, mysql_rpl_query_type, mysql_set_master, mysql_add_slave 
    - Remove helper functions
       spawn_init, expand_error, get_master, get_slaves_from_master,
    - Update code to work without mysql->last_used_con

  sql-common/client.c@1.142.1.1, 2007-11-26 19:03:21+01:00, msvensson@pilot.mysql.com +10 -104
    - Remove the possibility for libmysql to read "replication-probe",
      "enable-reads-from-master" and "repl-parse-query" from my.cnf
    - Renumber values in switch after removal of the above from list of
      values to read
    - Update code to work without mysql->last_used_con, mysql->option.rpl*,
       mysql->master, mysql->last_used_slave, mysql->next_slave and any other
       variable removed from st_mysql and st_mysql_options
    - Remove all code scheduled marked with TO_BE_DELETED 

  storage/federated/ha_federated.cc@1.114, 2007-11-26 19:03:21+01:00, msvensson@pilot.mysql.com +1 -1
    - Read insert_id directly from mysql, there is no such thing as last_used_con.
      Preferrably all code accessing specific variable in MYSQL should use the accessor functions.  

ChangeSet@1.2685.4.15, 2007-11-26 19:01:57+01:00, istruewing@stella.local +1 -0
  Bug#32217 rpl_ssl fails with different number of records
            on master and slave
  Disabled test case.

  mysql-test/suite/rpl/t/disabled.def@1.11.1.7, 2007-11-26 19:01:55+01:00, istruewing@stella.local +1 -0
    Bug#32217 rpl_ssl fails with different number of records
              on master and slave
    Disabled test case.

ChangeSet@1.2685.7.3, 2007-11-26 19:00:41+01:00, hakank@lu0011.(none) +1 -0
  Removed not needed line.

  mysql-test/suite/falcon/t/falcon_bug_32194.test@1.2, 2007-11-26 19:00:36+01:00, hakank@lu0011.(none) +0 -1
    Removed not needed line.

ChangeSet@1.2685.4.14, 2007-11-26 18:49:48+01:00, istruewing@stella.local +1 -0
  Bug#32621 falcon_ts.test fails
  Disabled test case.

  mysql-test/suite/falcon/t/disabled.def@1.2.2.2, 2007-11-26 18:49:47+01:00, istruewing@stella.local +1 -0
    Bug#32621 falcon_ts.test fails
    Disabled test case.

ChangeSet@1.2529.1.86, 2007-11-26 18:46:05+01:00, msvensson@pilot.mysql.com +1 -0
  Use myisam as default storage engine when running mysqld in --bootstrap
  mode

  scripts/mysql_install_db.sh@1.88.1.1, 2007-11-26 18:46:02+01:00, msvensson@pilot.mysql.com +1 -0
    Bug#31315 mysql_install_db fails if a default table type of NDB is set in my.cnf
     - Use myisam as default storage engine when running mysqld in --bootstrap
     mode

ChangeSet@1.2656.17.4, 2007-11-26 12:28:01-05:00, jas@fluffy.netfrastructure.com +1 -0
  Fix recently introduced gopher thread wakeup bug.

  storage/falcon/Synchronize.cpp@1.6, 2007-11-26 12:27:59-05:00, jas@fluffy.netfrastructure.com +2 -1
    Fix recently introduced gopher thread wakeup bug.

ChangeSet@1.2685.4.13, 2007-11-26 17:56:09+01:00, istruewing@stella.local +1 -0
  Bug#30751 rpl_ndb_multi missing row in output
  Disabled test case.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.11.1.2, 2007-11-26 17:56:08+01:00, istruewing@stella.local +2 -1
    Bug#30751 rpl_ndb_multi missing row in output
    Disabled test case.

ChangeSet@1.2685.4.12, 2007-11-26 17:50:47+01:00, istruewing@stella.local +5 -0
  Moved disabling of tests to the respective suites.

  mysql-test/suite/falcon/t/disabled.def@1.2.2.1, 2007-11-26 17:50:46+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/ndb/t/disabled.def@1.10, 2007-11-26 17:50:46+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/rpl/t/disabled.def@1.11.1.6, 2007-11-26 17:50:46+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.11.1.1, 2007-11-26 17:50:46+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/t/disabled.def@1.284.3.8, 2007-11-26 17:50:46+01:00, istruewing@stella.local +0 -5
    Moved disabling of tests to the respective suites.

ChangeSet@1.2529.169.55, 2007-11-26 17:31:53+01:00, istruewing@stella.local +4 -0
  Moved disabling of tests to the respective suites.

  mysql-test/suite/binlog/t/disabled.def@1.2.1.2, 2007-11-26 17:31:51+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/ndb/t/disabled.def@1.3.1.4, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/rpl/t/disabled.def@1.11.2.3, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/t/disabled.def@1.243.41.19, 2007-11-26 17:31:51+01:00, istruewing@stella.local +0 -6
    Moved disabling of tests to the respective suites.

ChangeSet@1.1810.3482.1, 2007-11-26 14:09:37-02:00, davi@mysql.com +5 -0
  Bug#29592 SQL Injection issue
  
  Remove the mysql_odbc_escape_string() function. The function
  has multi-byte character escaping issues, doesn't honor the
  NO_BACKSLASH_ESCAPES mode and is not used anymore by the
  Connector/ODBC as of 3.51.17.

  include/mysql.h@1.154.7.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -10
    Remove mysql_odbc_escape_string() prototype.

  include/mysql_h.ic@1.3.1.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +233 -235
    Update abi check file, mostly line changes and mysql_odbc_escape_string
    removal.

  libmysql/libmysql.c@1.233.1.16, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -72
    Remove mysql_odbc_escape_string() body.

  libmysql/libmysql.def@1.43.1.3, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

  libmysqld/libmysqld.def@1.14.1.4, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

ChangeSet@1.2529.215.8, 2007-11-26 16:45:58+01:00, msvensson@pilot.mysql.com +1 -0
  Fix warning about possibly uninitialized variable "warnings"

  client/mysql.cc@1.269.1.7, 2007-11-26 16:45:56+01:00, msvensson@pilot.mysql.com +1 -1
    Fix warning about possibly uninitialized variable "warnings"

ChangeSet@1.2529.215.6, 2007-11-26 16:31:35+01:00, msvensson@pilot.mysql.com +1 -0
  Add suppressions for expected warning messages that appears in
  slave's error log when running rpl_extraColmaster_*.test 

  mysql-test/lib/mtr_report.pl@1.54.10.2, 2007-11-26 16:31:33+01:00, msvensson@pilot.mysql.com +9 -1
    Add suppressions for expected warning messages that appears in
    slave's error log when running rpl_extraColmaster_*.test 

ChangeSet@1.2529.223.1, 2007-11-26 16:20:37+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling testcases that have warnings that PB cannot handle.

  mysql-test/suite/rpl/t/disabled.def@1.16.1.2, 2007-11-26 16:20:34+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling testcases that have warnings that PB cannot handle.

ChangeSet@1.2529.215.5, 2007-11-26 16:19:34+01:00, msvensson@pilot.mysql.com +1 -0
  Disable combinations processing until next version

  mysql-test/lib/mtr_cases.pl@1.70, 2007-11-26 16:19:31+01:00, msvensson@pilot.mysql.com +1 -1
    Disable combinations processing until next version

ChangeSet@1.2529.169.54, 2007-11-26 16:17:26+01:00, istruewing@stella.local +1 -0
  Bug#30751: rpl_ndb_multi missing row in output
  Disabled the test case.

  mysql-test/t/disabled.def@1.243.41.18, 2007-11-26 16:17:24+01:00, istruewing@stella.local +1 -0
    Bug#30751: rpl_ndb_multi missing row in output
    Disabled the test case.

ChangeSet@1.2529.169.53, 2007-11-26 16:12:14+01:00, istruewing@stella.local +1 -0
  Bug#32724: innodb_mysql.test fails randomly
  Disabled test case.

  mysql-test/t/disabled.def@1.243.41.17, 2007-11-26 16:12:13+01:00, istruewing@stella.local +1 -0
    Bug#32724: innodb_mysql.test fails randomly
    Disabled test case.

ChangeSet@1.2529.169.52, 2007-11-26 16:04:29+01:00, istruewing@stella.local +1 -0
  Bug#32723: grant3.test fails
  Disabled test case.

  mysql-test/t/disabled.def@1.243.41.16, 2007-11-26 16:04:27+01:00, istruewing@stella.local +1 -0
    Bug#32723: grant3.test fails
    Disabled test case.

ChangeSet@1.1810.3467.2, 2007-11-26 15:44:05+01:00, thek@adventure.(none) +1 -0
  Bug #32436 KILL QUERY completely deadlocks mysqld
  
  Sending several "KILL QUERY" statements to target a connection running
  "SELECT SLEEP" could freeze the server.
  
  The locking order in Item_func_sleep was wrong and this could lead to a
  dead lock.
  
  This patch solves the issue by resolving the locking order properly.

  sql/item_func.cc@1.270.82.1, 2007-11-26 15:44:04+01:00, thek@adventure.(none) +1 -2
    - Moved LOCK_user_locks critical region so that it doesn't share space with
      mysys_var->mutex region; this can lead to deadlock.

ChangeSet@1.2529.169.51, 2007-11-26 15:40:08+01:00, istruewing@stella.local +1 -0
  Bug#29149: Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.243.41.15, 2007-11-26 15:40:06+01:00, istruewing@stella.local +1 -0
    Bug#29149: Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2529.215.4, 2007-11-26 15:36:23+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling failing test that has been reported as bug.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.1.11, 2007-11-26 15:36:20+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing test.

ChangeSet@1.1810.3395.51, 2007-11-26 14:49:41+01:00, istruewing@stella.local +1 -0
  Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.33, 2007-11-26 14:49:40+01:00, istruewing@stella.local +1 -0
    Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
    Disabled test case

ChangeSet@1.1810.3395.50, 2007-11-26 14:48:49+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Another try to fix a compiler warning on win64.

  myisam/mi_packrec.c@1.30.19.1, 2007-11-26 14:48:48+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Another try to fix a compiler warning on win64.

ChangeSet@1.1810.3480.2, 2007-11-26 13:29:26+04:00, ramil@mysql.com +3 -0
  Fix for bug #32676: insert delayed crash with wrong column and function specified
  
  Problem: using wrong local lock type value in the mysql_insert() results in a crash. 
  
  Fix: use a proper value.

  mysql-test/r/delayed.result@1.12.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +5 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test result.

  mysql-test/t/delayed.test@1.11.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +9 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test case.

  sql/sql_insert.cc@1.146.66.5, 2007-11-26 13:29:25+04:00, ramil@mysql.com +2 -2
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - the local lock_type var assigment displaced just after the line 
        where the table_list->lock_type is filnally defined in the mysql_insert() 
        to avoid using its old value.

ChangeSet@1.2529.222.1, 2007-11-26 10:28:25+04:00, ramil@mysql.com +4 -0
  Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
  
  Problems: 
    1. looking for a matching partition we miss the fact that the maximum 
       allowed value is in the PARTITION p LESS THAN MAXVALUE.
    2. one can insert maximum value if numeric maximum value is the last range.
       (should only work if LESS THAN MAXVALUE).
    3. one cannot have both numeric maximum value and MAXVALUE string as ranges 
      (the same value, but different meanings).
  
  Fix: consider the maximum value as a supremum.

  mysql-test/r/partition.result@1.68.1.9, 2007-11-26 10:28:24+04:00, ramil@mysql.com +47 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test result.

  mysql-test/t/partition.test@1.62.1.8, 2007-11-26 10:28:24+04:00, ramil@mysql.com +39 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test case.

  sql/partition_info.cc@1.41.1.1, 2007-11-26 10:28:24+04:00, ramil@mysql.com +7 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

  sql/sql_partition.cc@1.96.20.7, 2007-11-26 10:28:24+04:00, ramil@mysql.com +9 -3
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

ChangeSet@1.2685.4.6, 2007-11-25 13:50:58+01:00, istruewing@stella.local +1 -0
  Bug#31284 - rpl_ndb_blob fails on powermacg5: incorrect BLOB contents
  Disabled test case

  mysql-test/t/disabled.def@1.284.3.4, 2007-11-25 13:50:56+01:00, istruewing@stella.local +1 -0
    Bug#31284 - rpl_ndb_blob fails on powermacg5: incorrect BLOB contents
    Disabled test case

ChangeSet@1.2685.4.5, 2007-11-25 12:56:15+01:00, istruewing@stella.local +1 -0
  Bug#32697 - falcon_bug_26433.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.284.3.3, 2007-11-25 12:56:13+01:00, istruewing@stella.local +1 -0
    Bug#32697 - falcon_bug_26433.test fails randomly
    Disabled test case

ChangeSet@1.2685.4.4, 2007-11-25 12:40:57+01:00, istruewing@stella.local +1 -0
  Bug#32696 - index_merge_falcon.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.284.3.2, 2007-11-25 12:40:55+01:00, istruewing@stella.local +1 -0
    Bug#32696 - index_merge_falcon.test fails
    Disabled test case

ChangeSet@1.2656.17.3, 2007-11-24 15:10:33-05:00, jas@fluffy.netfrastructure.com +9 -0
  Track page numbers in the page header.

  storage/falcon/BDB.cpp@1.3, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +14 -0
    Track page numbers in the page header.

  storage/falcon/BDB.h@1.7, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +1 -0
    Track page numbers in the page header.

  storage/falcon/Cache.cpp@1.42, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +1 -1
    Track page numbers in the page header.

  storage/falcon/Dbb.cpp@1.16, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +3 -3
    Track page numbers in the page header.

  storage/falcon/Index2RootPage.cpp@1.4, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +1 -1
    Track page numbers in the page header.

  storage/falcon/IndexRootPage.cpp@1.5, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +2 -1
    Track page numbers in the page header.

  storage/falcon/Page.cpp@1.5, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +0 -9
    Track page numbers in the page header.

  storage/falcon/Page.h@1.5, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +0 -2
    Track page numbers in the page header.

  storage/falcon/Section.cpp@1.15, 2007-11-24 15:10:30-05:00, jas@fluffy.netfrastructure.com +5 -4
    Track page numbers in the page header.

ChangeSet@1.2656.17.2, 2007-11-23 18:02:41-05:00, jas@rowvwade. +9 -0
  Add distinctive SQL codes for various flavors of table space
  operation failures, and propogate such specific flavors back
  to the storage interface.

  storage/falcon/Page.h@1.4, 2007-11-23 18:02:28-05:00, jas@rowvwade. +1 -0
    Add 32 generous bits of unused space to the Falcon page header.

  storage/falcon/SQLException.h@1.8, 2007-11-23 18:02:29-05:00, jas@rowvwade. +3 -1
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

  storage/falcon/Statement.cpp@1.6, 2007-11-23 18:02:29-05:00, jas@rowvwade. +3 -3
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

  storage/falcon/StorageHandler.cpp@1.15.1.1, 2007-11-23 18:02:29-05:00, jas@rowvwade. +14 -2
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

  storage/falcon/StorageTableShare.h@1.10, 2007-11-23 18:02:30-05:00, jas@rowvwade. +3 -1
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

  storage/falcon/Synchronize.cpp@1.5, 2007-11-23 18:02:31-05:00, jas@rowvwade. +1 -1
    Find Windows specific bug where a "sleep" was keeping the "sleeping"
    bit set.

  storage/falcon/TableSpaceManager.cpp@1.11, 2007-11-23 18:02:31-05:00, jas@rowvwade. +10 -0
    Remove table space under deletion from table space name hash
    table for the duration.

  storage/falcon/ha_falcon.cpp@1.33.1.1, 2007-11-23 18:02:31-05:00, jas@rowvwade. +62 -33
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

  storage/falcon/ha_falcon.h@1.8, 2007-11-23 18:02:32-05:00, jas@rowvwade. +3 -1
    Add distinctive SQL codes for various flavors of table space
    operation failures, and propogate such specific flavors back
    to the storage interface.

ChangeSet@1.2529.169.46, 2007-11-23 23:21:37+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  The initialization to zero via LINT_INIT made mysql.test fail.
  print_warnings() was suppressed where it should not.
  
  Fixed initialization so that it fakes warnings.

  client/mysql.cc@1.269.5.8, 2007-11-23 23:21:35+01:00, istruewing@stella.local +2 -2
    Bug#32661 - Compiler warning in client/mysql.cc
    Fixed initialization so that it fakes warnings.

ChangeSet@1.2685.3.5, 2007-11-23 22:04:51+01:00, mkindahl@dl145h.mysql.com +4 -0
  Disabling several tests that fail in pushbuild.

  mysql-test/suite/falcon/t/disabled.def@1.2.1.1, 2007-11-23 22:04:47+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling tests.

  mysql-test/suite/rpl/t/disabled.def@1.20, 2007-11-23 22:04:47+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling tests.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.14, 2007-11-23 22:04:47+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling tests.

  mysql-test/t/disabled.def@1.286, 2007-11-23 22:04:48+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling tests.

ChangeSet@1.2529.169.45, 2007-11-23 18:27:05+01:00, istruewing@stella.local +1 -0
  Bug#32668 rpl_row_charset_innodb.test fails
  Re-enabled test case after fix

  mysql-test/t/disabled.def@1.243.41.12, 2007-11-23 18:27:04+01:00, istruewing@stella.local +0 -1
    Bug#32668 rpl_row_charset_innodb.test fails
    Re-enabled test case after fix

ChangeSet@1.2685.4.3, 2007-11-23 18:25:54+01:00, istruewing@stella.local +1 -0
  Bug#32673 - rpl_row_sp002_innodb.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.284.3.1, 2007-11-23 18:25:53+01:00, istruewing@stella.local +1 -0
    Bug#32673 - rpl_row_sp002_innodb.test fails randomly
    Disabled test case

ChangeSet@1.2529.169.44, 2007-11-23 18:05:45+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  
  The test case fails on "vanilla" and "no_innodb" builds.
  These builds do not include InnoDB.
  The test case requires InnoDB.
  
  Added requirement for InnoDB into the test case, so that
  it does not start on those builds.

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.2, 2007-11-23 18:05:43+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Added requirement for InnoDB.

ChangeSet@1.2529.169.43, 2007-11-23 17:54:19+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.243.41.11, 2007-11-23 17:54:18+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Disabled test case

ChangeSet@1.2529.169.42, 2007-11-23 17:47:22+01:00, istruewing@stella.local +1 -0
  Bug#32667 lowercase_table3.test reports to error log
  Disabled test case

  mysql-test/t/disabled.def@1.243.41.10, 2007-11-23 17:47:20+01:00, istruewing@stella.local +1 -0
    Bug#32667 lowercase_table3.test reports to error log
    Disabled test case

ChangeSet@1.2529.169.41, 2007-11-23 17:05:16+01:00, istruewing@stella.local +1 -0
  Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
  Disabled the test case

  mysql-test/t/disabled.def@1.243.41.9, 2007-11-23 17:05:14+01:00, istruewing@stella.local +1 -0
    Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
    Disabled the test case

ChangeSet@1.2529.169.40, 2007-11-23 16:53:31+01:00, istruewing@stella.local +1 -0
  Bug#32664 - events.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.243.41.8, 2007-11-23 16:53:29+01:00, istruewing@stella.local +1 -0
    Bug#32664 - events.test fails randomly
    Disabled test case

ChangeSet@1.2529.169.39, 2007-11-23 16:32:51+01:00, istruewing@stella.local +1 -0
  Bug#32663 binlog_multi_engine.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.243.41.7, 2007-11-23 16:32:50+01:00, istruewing@stella.local +2 -1
    Bug#32663 binlog_multi_engine.test fails randomly
    Disabled test case

ChangeSet@1.2529.169.38, 2007-11-23 16:02:51+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  Compiler warned about possible use of uninitialized variable
  'warnings' in com_go().
  
  Added LINT_INIT for 'warnings'.

  client/mysql.cc@1.269.5.7, 2007-11-23 16:02:49+01:00, istruewing@stella.local +1 -0
    Bug#32661 - Compiler warning in client/mysql.cc
    Added LINT_INIT for 'warnings'.

ChangeSet@1.2529.169.37, 2007-11-23 15:30:04+01:00, istruewing@stella.local +1 -0
  Bug#32659 - ndb_dd_backuprestore.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.243.41.6, 2007-11-23 15:30:02+01:00, istruewing@stella.local +1 -0
    Bug#32659 - ndb_dd_backuprestore.test fails randomly
    Disabled test case

ChangeSet@1.2529.221.1, 2007-11-23 17:51:12+04:00, svoj@mysql.com +3 -0
  BUG#31833 - ORDER BY leads to wrong result when ARCHIVE, BLOB and
              table cache is full
  
  After reading last record from freshly opened archive table
  (e.g. after flush table, or if there is no room in table cache),
  the table is reported as crashed.
  
  The problem was that azio wrongly invalidated azio_stream when it
  meets EOF.

  mysql-test/r/archive.result@1.33.1.4, 2007-11-23 17:50:36+04:00, svoj@mysql.com +7 -0
    A test case for BUG#31833.

  mysql-test/t/archive.test@1.32.1.4, 2007-11-23 17:50:36+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31833.

  storage/archive/azio.c@1.21.1.2, 2007-11-23 17:50:36+04:00, svoj@mysql.com +1 -1
    After azread() successfuly read and inflated data, it calls
    check_header() function. According to the comment it is done
    to detect concatenated .az files.
    
    When we read last record, there are no more bytes left at the
    current offset, all further my_read() calls will return 0. In
    this case check_header() wrongly sets s->z_err to Z_ERRNO,
    indicating that azio_stream is broken.
    
    Following is original condition from gzio:
    len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
    if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
    
    As fread() returns 0 on both EOF and error, the condition states:
    Invalidate gzio_stream if we got an error from last fread().
    
    Applied the same logic to azio.
    
    Note that a test case contains FLUSH TABLE t1 prior to SELECT. It is
    needed because azio doesn't flush buffers immediately. Thus we may
    azread() last record from in-memory buffer. When we read from
    in-memory buffer, EOF is detected by different branch of code in
    azread() and we never enter check_header() in this case.

ChangeSet@1.2685.3.4, 2007-11-23 14:14:43+01:00, mkindahl@dl145h.mysql.com +1 -0
  Post-merge fixes.

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.19, 2007-11-23 14:14:38+01:00, mkindahl@dl145h.mysql.com +2 -2
    Result change.

ChangeSet@1.2529.219.3, 2007-11-23 13:38:59+01:00, df@pippilotta.erinye.com +1 -0
  Fix make distcheck.

  scripts/mysql_install_db.sh@1.89, 2007-11-23 13:38:54+01:00, df@pippilotta.erinye.com +19 -15
    Give precedence to basedir if both basedir and srcdir are specified, but set mysqld_opt, pkgdatadir and scriptdir always from srcdir if it is specified. This is to unbreak out-of-directory builds like make distcheck does, where we don't have binaries in srcdir.

ChangeSet@1.1810.3480.1, 2007-11-23 16:30:06+04:00, ramil@mysql.com +3 -0
  Fix for bug #32560: crash with interval function and count(*)
  
  Problem: INTERVAL function implementation doesn't handle NULL range values.
  
  Fix: skip NULL ranges looking for a proper one.

  mysql-test/r/func_set.result@1.15.1.1, 2007-11-23 16:30:04+04:00, ramil@mysql.com +30 -0
    Fix for bug #32560: crash with interval function and count(*)
      - test result.

  mysql-test/t/func_set.test@1.15, 2007-11-23 16:30:04+04:00, ramil@mysql.com +18 -1
    Fix for bug #32560: crash with interval function and count(*)
      - test case.

  sql/item_cmpfunc.cc@1.187.46.3, 2007-11-23 16:30:04+04:00, ramil@mysql.com +25 -12
    Fix for bug #32560: crash with interval function and count(*)
      - skip NULL ranges calculating INTERVAL(...).

ChangeSet@1.1810.3479.3, 2007-11-23 13:03:38+01:00, istruewing@stella.local +1 -0
  Bug#32654: rpl_view.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.32, 2007-11-23 13:03:37+01:00, istruewing@stella.local +1 -0
    Bug#32654: rpl_view.test fails randomly
    Disabled test case

ChangeSet@1.1810.3479.2, 2007-11-23 12:54:05+01:00, istruewing@stella.local +1 -0
  Bug#32653 - rpl_log.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.31, 2007-11-23 12:54:04+01:00, istruewing@stella.local +1 -0
    Bug#32653 - rpl_log.test fails randomly
    Disabled test case

ChangeSet@1.1810.3479.1, 2007-11-23 12:52:29+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64. Backport from 5.1.

  myisam/mi_packrec.c@1.30.18.1, 2007-11-23 12:52:28+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64. Backport from 5.1.

ChangeSet@1.2529.215.3, 2007-11-23 12:51:14+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge fixes.

  mysql-test/r/innodb.result@1.165.15.10, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.3, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +6 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.1.4, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.1.4, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.16.1.1, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +0 -3
    Enabling some tests.

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.3, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding missing master-slave.inc, causing previous tests to pollute
    the binary log.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.1.10, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +3 -5
    Enabling some tests.

ChangeSet@1.1810.3478.2, 2007-11-23 12:28:36+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64

  myisam/mi_packrec.c@1.30.17.1, 2007-11-23 12:28:34+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64

ChangeSet@1.1810.3478.1, 2007-11-23 12:06:55+01:00, istruewing@stella.local +1 -0
  Bug#32651 - grant_cache.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.30, 2007-11-23 12:06:53+01:00, istruewing@stella.local +1 -0
    Bug#32651 - grant_cache.test fails
    Disabled test case

ChangeSet@1.2529.1.84, 2007-11-23 10:15:55+01:00, kent@mysql.com +4 -0
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.1 of the manual

  Docs/INSTALL-BINARY@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-WIN-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  support-files/MacOSX/ReadMe.txt@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

ChangeSet@1.2683.5.1, 2007-11-23 09:44:55+01:00, istruewing@stella.local +5 -0
  Bug#32646 - subselect.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
  
  Replaced '--' comments by '#' comments or '--echo'.

  mysql-test/r/subselect.result@1.193, 2007-11-23 09:44:54+01:00, istruewing@stella.local +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_mat.result@1.4, 2007-11-23 09:44:54+01:00, istruewing@stella.local +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_opts.result@1.8, 2007-11-23 09:44:54+01:00, istruewing@stella.local +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_semijoin.result@1.8, 2007-11-23 09:44:54+01:00, istruewing@stella.local +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/t/subselect.test@1.164.1.1, 2007-11-23 09:44:54+01:00, istruewing@stella.local +4 -4
    Bug#32646 - subselect.test produces warnings files
    Replaced '--' comments by '#' comments or '--echo'.

ChangeSet@1.2529.191.13, 2007-11-22 21:39:28+01:00, istruewing@stella.local +1 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix. The merge test failed on Windows.
  The MoveFile() function returned the error code
  ERROR_ACCESS_DENIED.
  
  The fix is to use a different name for the file to be
  deleted. This is the same trick as we use for the error
  code ERROR_ALREADY_EXISTS.
  
  Added ERROR_ACCESS_DENIED to the list of error codes that
  require to change the name of the file to be deleted.

  mysys/my_delete.c@1.8, 2007-11-22 21:39:27+01:00, istruewing@stella.local +7 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added ERROR_ACCESS_DENIED to the list of error codes that
    require to change the name of the file to be deleted.

ChangeSet@1.2685.2.2, 2007-11-22 19:43:31+01:00, serg@janus.mylan +1 -0
  after merge fix

  storage/falcon/ha_falcon.cpp@1.3.5.1, 2007-11-22 19:43:28+01:00, serg@janus.mylan +1 -1
    after merge fix

ChangeSet@1.1810.3476.1, 2007-11-22 17:48:40+01:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Include "manual.chm" in source TAR if it exists

  Docs/Makefile.am@1.57.1.13, 2007-11-22 17:48:11+01:00, kent@mysql.com +1 -1
    Include "manual.chm" in source TAR if it exists

  configure.in@1.245.104.1, 2007-11-22 17:46:40+01:00, kent@mysql.com +5 -0
    Include "manual.chm" in source TAR if it exists

ChangeSet@1.2685, 2007-11-22 17:35:37+01:00, mleich@five.local.lan +2 -0
  Fix for
     Bug#32233 NULL "state" field of SHOW PROCESSLIST makes tests fail

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.4, 2007-11-22 17:35:36+01:00, mleich@five.local.lan +84 -84
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.4, 2007-11-22 17:35:36+01:00, mleich@five.local.lan +84 -84
    Updated results

ChangeSet@1.2656.2.30, 2007-11-22 18:46:54+04:00, svoj@mysql.com +14 -0
  BUG#31311 - TABLESPACE identifiers do not support special characters
  
  CREATE TABLESPACE statement fails if tablespace name identifier
  contains some non-alnum characters (e.g. spaces).
  
  Fixed by quoting internal falcon queries. Also fixed that SHOW CREATE
  TABLE didn't quote tablespace name identifier.
  
  Note that it is still not possible to create tablespace with quotes
  in tablespace name identifier, which is subject of:
  BUG32620 - Falcon doesn't support quotes as field name and tablespace
             name identifiers

  mysql-test/suite/falcon/r/falcon_ts.result@1.5, 2007-11-22 18:46:51+04:00, svoj@mysql.com +11 -2
    A test case for BUG#31311.

  mysql-test/suite/falcon/t/falcon_ts.test@1.4.1.1, 2007-11-22 18:46:51+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31311.

  mysql-test/suite/ndb/r/ndb_column_properties.result@1.14.1.2, 2007-11-22 18:46:51+04:00, svoj@mysql.com +9 -9
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_alter.result@1.16.1.2, 2007-11-22 18:46:51+04:00, svoj@mysql.com +8 -8
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_backuprestore.result@1.14, 2007-11-22 18:46:51+04:00, svoj@mysql.com +6 -6
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.27.1.4, 2007-11-22 18:46:51+04:00, svoj@mysql.com +1 -1
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_disk2memory.result@1.14, 2007-11-22 18:46:51+04:00, svoj@mysql.com +3 -3
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_dump.result@1.8, 2007-11-22 18:46:51+04:00, svoj@mysql.com +1 -1
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_restore_compat.result@1.4, 2007-11-22 18:46:51+04:00, svoj@mysql.com +1 -1
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/ndb/r/ndb_dd_sql_features.result@1.6, 2007-11-22 18:46:51+04:00, svoj@mysql.com +4 -4
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result@1.17, 2007-11-22 18:46:51+04:00, svoj@mysql.com +6 -6
    Updated a test case according to fix for BUG#31311. With this fix
    SHOW CREATE TABLE returns quoted tablespace name identifier.

  sql/sql_show.cc@1.442.3.1, 2007-11-22 18:46:51+04:00, svoj@mysql.com +3 -3
    SHOW CREATE TABLE must quote tablespace name identifier to return
    valid CREATE TABLE statement in case tablespace name contains tricky
    characters.

  storage/falcon/StorageHandler.cpp@1.16, 2007-11-22 18:46:51+04:00, svoj@mysql.com +2 -2
    Quote tablespace name identifier to support tricky characters.

  storage/falcon/ha_falcon.cpp@1.34, 2007-11-22 18:46:51+04:00, svoj@mysql.com +1 -1
    Quote tablespace name identifier to support tricky characters.

ChangeSet@1.1810.3436.12, 2007-11-22 10:18:19-02:00, davi@endora.local +3 -0
  Bug#32528 Global read lock with a low priority write lock causes a server crash
  
  FLUSH TABLES WITH READ LOCK fails to properly detect write locked
  tables when running under low priority updates.
  
  The problem is that when trying to aspire a global read lock, the
  reload_acl_and_cache() function fails to properly check if the thread
  has a low priority write lock, which later my cause a server crash or
  deadlock.
  
  The solution is to simple check if the thread has any type of the
  possible exclusive write locks.

  mysql-test/r/flush.result@1.16.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +17 -0
    Add test case result for Bug#32528

  mysql-test/t/flush.test@1.22.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +31 -0
    Add test case for Bug#32528

  sql/sql_parse.cc@1.426.164.3, 2007-11-22 10:18:18-02:00, davi@endora.local +1 -1
    Although it should not matter under LOCK TABLES, use TL_WRITE_ALLOW_WRITE
    to emphasize that it should fail in case of any write lock.

ChangeSet@1.2529.202.7, 2007-11-22 14:48:03+03:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#29817. The bug was fixed by the patch for
  Bug#28318.

  mysql-test/r/skip_grants.result@1.12.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

  mysql-test/t/skip_grants.test@1.13.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

ChangeSet@1.2656.14.9, 2007-11-22 04:11:32+03:00, kostja@bodhi.(none) +2 -0
  WL#441: Add automatic testing of libevent in 'test-pr', 'test' and 
  'test-bt' rules.

  Makefile.am@1.146, 2007-11-22 04:11:30+03:00, kostja@bodhi.(none) +3 -3
    Add automatic testing of libevent in 'test-pr', 'test' and 'test-bt' rules.

  config/ac-macros/libevent.m4@1.3, 2007-11-22 04:11:30+03:00, kostja@bodhi.(none) +2 -0
    Export a variable that facilitates testing of libevent from pushbuild.

ChangeSet@1.2529.202.6, 2007-11-22 03:48:51+03:00, kostja@bodhi.(none) +2 -0
  Update the failing kill test in the team tree.

  mysql-test/r/kill.result@1.20.1.2, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Update the broken result (kill.test fails in the team tree).

  mysql-test/t/kill.test@1.28.1.2, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Fix the broken test (team tree)

ChangeSet@1.2656.16.1, 2007-11-21 17:10:31-05:00, jas@rowvwade. +8 -0
  Made incompatible change to page header to record page number
  on page for error detection and, maybe, double writes.
  
  Also simplified serial log version tracking.

  storage/falcon/Cache.cpp@1.41, 2007-11-21 17:10:18-05:00, jas@rowvwade. +3 -1
    Check page number when reading page.

  storage/falcon/Page.cpp@1.4, 2007-11-21 17:10:19-05:00, jas@rowvwade. +4 -1
    Set page number on database pages.

  storage/falcon/Page.h@1.3, 2007-11-21 17:10:19-05:00, jas@rowvwade. +5 -4
    Make Page::pageNumber conditional on storage engine builds for 
    backwards compatibility.

  storage/falcon/SRLVersion.cpp@1.2, 2007-11-21 17:10:19-05:00, jas@rowvwade. +1 -1
    Phase out SRLVersion in favor of version number in the
    serial log block header.

  storage/falcon/SerialLog.cpp@1.25, 2007-11-21 17:10:20-05:00, jas@rowvwade. +1 -0
    Track current version in serial log block.

  storage/falcon/SerialLog.h@1.9, 2007-11-21 17:10:20-05:00, jas@rowvwade. +1 -0
    Add version to serial log block header.

  storage/falcon/SerialLogControl.cpp@1.9, 2007-11-21 17:10:20-05:00, jas@rowvwade. +4 -1
    Give up on SRLVersion (but keep the class).

  storage/falcon/SerialLogControl.h@1.5, 2007-11-21 17:10:21-05:00, jas@rowvwade. +1 -1
    Get rid of obsolete serial log verion tracking mechanism.

ChangeSet@1.1810.3473.2, 2007-11-21 19:41:13+01:00, df@pippilotta.erinye.com +1 -0
  add wrong warning to suppression file

  support-files/compiler_warnings.supp@1.2.1.9, 2007-11-21 19:41:11+01:00, df@pippilotta.erinye.com +1 -0
    we want that.

ChangeSet@1.1810.3473.1, 2007-11-21 18:11:08+01:00, df@pippilotta.erinye.com +1 -0
  ignore readline warnings

  support-files/compiler_warnings.supp@1.2.1.8, 2007-11-21 18:11:04+01:00, df@pippilotta.erinye.com +5 -0
    readline is not maintained by us

ChangeSet@1.1810.3472.1, 2007-11-21 20:53:44+04:00, ramil@mysql.com +3 -0
  Fix for bug #32558: group by null-returning expression with rollup causes crash
  
  Problem: setting Item_func_rollup_const::null_value property to argument's null_value
  before (without) the argument evaluation may result in a crash due to wrong null_value.
  
  Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
  the argument if necessary and returns a proper value.

  mysql-test/r/olap.result@1.33.1.8, 2007-11-21 20:53:42+04:00, ramil@mysql.com +8 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test result.

  mysql-test/t/olap.test@1.30, 2007-11-21 20:53:42+04:00, ramil@mysql.com +9 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test case.

  sql/item_func.h@1.136.2.41, 2007-11-21 20:53:42+04:00, ramil@mysql.com +1 -1
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - use args[0]->is_null() to obtain Item_func_rollup_const::null_value 
        instead of args[0]->null_value as it's not set in advance in case of 
        constant functions.

ChangeSet@1.2656.14.6, 2007-11-21 16:51:27+03:00, kostja@bodhi.(none) +2 -0
  WL#4085 "Discontinue the instance manager": update the build scripts.

  scripts/make_binary_distribution.sh@1.132, 2007-11-21 16:51:24+03:00, kostja@bodhi.(none) +0 -1
    Remove mysqlmanager.

  scripts/make_win_bin_dist@1.25, 2007-11-21 16:51:25+03:00, kostja@bodhi.(none) +0 -4
    Remove mysqlmanager.

ChangeSet@1.1810.3471.1, 2007-11-21 14:27:35+01:00, jperkin@mysql.com +1 -0
  configure.in:
    Revert version back to 5.0.52 for release build

  configure.in@1.245.1.218, 2007-11-21 14:26:36+01:00, jperkin@mysql.com +2 -2
    Revert version back to 5.0.52 for release build

ChangeSet@1.1810.3395.42, 2007-11-21 13:50:17+01:00, mleich@five.local.lan +6 -0
  This changeset fixes
     Bug#31567 "datadict" tests (all engines) fail:
               Reference protocol is non-standard build
     Bug#30418 "datadict" tests (all engines) fail:
               Dependency on the host name for ordering   
  Modifications:
     1. The standard builds (build team) do not contain
        the collation 'utf8_general_cs'.
        The common developer builds (compuile-....-max)
        contain this collation.
        Solution fitting to both build variants:
           Exclude the collation 'utf8_general_cs' from
           result sets.
     2. Use mysqltest builtin sorting of result set for
        the statement where the hostname affects the
        row order.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.3, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +7 -5
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.1.2.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -1
    Use mysqltest builtin sorting of result set.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.1.1.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -2
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

ChangeSet@1.2529.213.1, 2007-11-21 16:00:09+04:00, ramil@mysql.com +3 -0
  Fix for bug #32557: order by updatexml causes assertion in filesort
  
  Problem: even if an Item_xml_str_func successor returns NULL, it doesn't have 
  a corresponding property (maybe_null) set, that leads to a failed assertion.
  
  Fix: set nullability property of Item_xml_str_func.

  mysql-test/r/xml.result@1.30, 2007-11-21 16:00:05+04:00, ramil@mysql.com +7 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test result.

  mysql-test/t/xml.test@1.24, 2007-11-21 16:00:06+04:00, ramil@mysql.com +8 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test case.

  sql/item_xmlfunc.h@1.10, 2007-11-21 16:00:06+04:00, ramil@mysql.com +10 -2
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - set Item_xml_str_func::maybe_null.

ChangeSet@1.1810.3463.3, 2007-11-21 11:11:22+04:00, ramil@mysql.com +3 -0
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
  
  Problem: we have CHECK TABLE options allowed (by accident?) for
  ANALYZE/OPTIMIZE TABLE.
  
  Fix: disable them.
  
  Note: it might require additional fixes in 5.1/6.0

  mysql-test/r/analyze.result@1.7.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +8 -0
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test result.

  mysql-test/t/analyze.test@1.10.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +13 -1
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test case.

  sql/sql_yacc.yy@1.371.1.169, 2007-11-21 11:11:20+04:00, ramil@mysql.com +2 -2
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize: 

ChangeSet@1.2656.2.29, 2007-11-20 23:41:11-06:00, klewis@klewis-mysql. +1 -0
  Cleanup

  mysql-test/suite/falcon/r/falcon_bug_22185.result@1.3, 2007-11-20 23:40:58-06:00, klewis@klewis-mysql. +1 -1
    Cleanup

ChangeSet@1.2656.2.28, 2007-11-20 23:38:55-06:00, klewis@klewis-mysql. +12 -0
  Adjust tests to explicitly set falcon_consistent_read

  mysql-test/suite/falcon/r/falcon_bug_22160.result@1.3, 2007-11-20 23:37:47-06:00, klewis@klewis-mysql. +3 -1
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/r/falcon_bug_22185.result@1.2, 2007-11-20 23:38:28-06:00, klewis@klewis-mysql. +18 -3
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/r/falcon_bug_22211.result@1.3, 2007-11-20 23:38:31-06:00, klewis@klewis-mysql. +4 -1
    Adjust test #3 to explicitly use falcon_consistent_read = OFF

  mysql-test/suite/falcon/r/falcon_bug_22212.result@1.2, 2007-11-20 23:38:33-06:00, klewis@klewis-mysql. +5 -1
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/r/falcon_bug_22852.result@1.2, 2007-11-20 23:38:34-06:00, klewis@klewis-mysql. +6 -2
    Adjust test to explicitly use falcon_consistent_read = OFF

  mysql-test/suite/falcon/r/falcon_bug_27722.result@1.2, 2007-11-20 23:38:36-06:00, klewis@klewis-mysql. +12 -9
    Adjust test to explicitly use falcon_consistent_read = OFF

  mysql-test/suite/falcon/t/falcon_bug_22160.test@1.4, 2007-11-20 23:38:38-06:00, klewis@klewis-mysql. +6 -0
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/t/falcon_bug_22185.test@1.3, 2007-11-20 23:38:40-06:00, klewis@klewis-mysql. +10 -2
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/t/falcon_bug_22211.test@1.4, 2007-11-20 23:38:42-06:00, klewis@klewis-mysql. +6 -1
    Adjust test #3 to explicitly use falcon_consistent_read = OFF

  mysql-test/suite/falcon/t/falcon_bug_22212.test@1.2, 2007-11-20 23:38:43-06:00, klewis@klewis-mysql. +12 -6
    Adjust test to explicitly use falcon_consistent_read = ON

  mysql-test/suite/falcon/t/falcon_bug_22852.test@1.3, 2007-11-20 23:38:45-06:00, klewis@klewis-mysql. +9 -2
    Adjust test to explicitly use falcon_consistent_read = OFF

  mysql-test/suite/falcon/t/falcon_bug_27722.test@1.3, 2007-11-20 23:38:47-06:00, klewis@klewis-mysql. +10 -8
    Adjust test to explicitly use falcon_consistent_read = OFF

ChangeSet@1.2529.187.18, 2007-11-21 08:01:00+04:00, ramil@mysql.com +4 -0
  Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
    
  Problem: caching 00000000-00000099 dates as integer values we're 
  improperly shifting them up twice in the get_datetime_value().
    
  Fix: don't shift cached DATETIME values up for the second time.

  mysql-test/r/type_date.result@1.25.1.2, 2007-11-21 08:00:58+04:00, ramil@mysql.com +7 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test result.

  mysql-test/t/type_date.test@1.24, 2007-11-21 08:00:58+04:00, ramil@mysql.com +10 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test case.

  sql/item.h@1.190.1.80, 2007-11-21 08:00:58+04:00, ramil@mysql.com +16 -1
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - Item_cache::field_type() method added.
      - new Item_cache(enum_field_types) and Item_cache_int(enum_field_types) 
        constructors added.

  sql/item_cmpfunc.cc@1.285.5.3, 2007-11-21 08:00:58+04:00, ramil@mysql.com +6 -3
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - don't shift cached DATETIME values for the second time in the
        get_datetime_value():
          creating new Item_cache_int set DATETIME filed type,
          check the type before shifting.

ChangeSet@1.2529.211.1, 2007-11-20 17:03:56-07:00, tsmith@ramayana.hindu.god +3 -0
  Bug #25146: Some warnings/errors not shown when using --show-warnings
  
  In several cases, an error when processing the query would cause mysql to
  return to the top level without printing warnings.  Fix is to always
  print any available warnings before returning to the top level.

  client/mysql.cc@1.269.7.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +29 -23
    In com_go(), ensure that warnings are printed even if an error
    occurred when processing the query.  Before this patch, an error
    in several places would return to the top level without printing
    associated warnings.
    
    Attempt to avoid printing the warning, though, if it's a duplicate
    of mysql_error() for the connection handle.

  mysql-test/r/mysql.result@1.37.2.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +7 -0
    Add test for bug 25146

  mysql-test/t/mysql.test@1.47.2.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +18 -0
    Add test for bug 25146

ChangeSet@1.2656.14.3, 2007-11-20 15:40:15-05:00, dkatz@damien-katzs-computer.local +1 -0
  Moved lex_start() call into login_connection(), so that it need not be explicity called by different thread_handlings.

  sql/sql_connect.cc@1.22.1.3, 2007-11-20 15:40:10-05:00, dkatz@damien-katzs-computer.local +2 -1
    Moved lex_start() call into login_connection(), so that it need not be explicity called by different thread_handlings.

ChangeSet@1.2529.169.29, 2007-11-20 12:51:36-07:00, tsmith@ramayana.hindu.god +1 -0
  Minor update to allowed errors list in mysql-test's mtr_report.pl

  mysql-test/lib/mtr_report.pl@1.54.10.1, 2007-11-20 12:51:34-07:00, tsmith@ramayana.hindu.god +1 -1
    Update 'allowed errors' list to match re-formatted InnoDB error message.

ChangeSet@1.2529.210.2, 2007-11-20 17:45:49-02:00, davi@endora.local +1 -0
  This issue was fixed in Bug 30904 which includes a similar test case.

  mysql-test/t/sp_notembedded.test@1.10, 2007-11-20 17:45:47-02:00, davi@endora.local +1 -22
    Remove test case, it's not needed any more.

ChangeSet@1.2529.169.28, 2007-11-20 12:23:18-07:00, tsmith@ramayana.hindu.god +3 -0
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Fixes the following bug:
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  storage/innobase/dict/dict0dict.c@1.109, 2007-11-20 12:02:16-07:00, tsmith@ramayana.hindu.god +0 -10
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/handler/ha_innodb.cc@1.257.55.10, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +66 -47
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)
    
    
    
    Revision r2093:
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.
    
    
    Revision r2089:
    Non-functional change: convert the switch in convert_search_mode_to_innobase()
    to the InnoDB coding style.
    
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/include/page0cur.h@1.12, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)

ChangeSet@1.1810.3395.41, 2007-11-20 10:53:19-07:00, tsmith@ramayana.hindu.god +12 -0
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Fixes the following bugs:
  
  - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
  
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  sql/ha_innodb.cc@1.202.55.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +37 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki
    
    
    Revision r2095:
    branches/5.0: Merge r2093 from trunk:
    
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.

  innobase/include/db0err.h@1.10.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +12 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/os0sync.h@1.14.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +32 -6
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/page0cur.h@1.6.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/sync0rw.h@1.11.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +11 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0rw.ic@1.9.6.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +6 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0sync.ic@1.18.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/os/os0sync.c@1.24.7.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +48 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/srv/srv0srv.c@1.87.13.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +8 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0arr.c@1.20.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +60 -11
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0rw.c@1.19.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +17 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0sync.c@1.34.6.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +35 -5
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

ChangeSet@1.2529.210.1, 2007-11-20 15:17:53-02:00, davi@endora.local +9 -0
  Bug#31397 Inconsistent drop table behavior of handler tables.
  
  The problem is that DROP TABLE and other DDL statements failed to
  automatically close handlers associated with tables that were marked
  for reopen (FLUSH TABLES).
  
  The current implementation fails to properly discard handlers of
  dropped tables (that were marked for reopen) because it searches
  on the open handler tables list and using the current alias of the
  table being dropped. The problem is that it must not use the open
  handler tables list to search because the table might have been
  closed (marked for reopen) by a flush tables command and also it
  must not use the current table alias at all since multiple different
  aliases may be associated with a single table. This is specially
  visible when a user has two open handlers (using alias) of a same
  table and a flush tables command is issued before the table is
  dropped (see test case). Scanning the handler table list is also
  useless for dropping handlers associated with temporary tables,
  because temporary tables are not kept in the THD::handler_tables
  list.
  
  The solution is to simple scan the handlers hash table searching
  for, and deleting all handlers with matching table names if the
  reopen flag is not passed to the flush function, indicating that
  the handlers should be deleted. All matching handlers are deleted
  even if the associated the table is not open.

  mysql-test/include/handler.inc@1.41, 2007-11-20 15:17:51-02:00, davi@endora.local +94 -0
    Add test case for Bug#31397

  mysql-test/r/handler_innodb.result@1.23, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  mysql-test/r/handler_myisam.result@1.36, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  sql/mysql_priv.h@1.505.35.1, 2007-11-20 15:17:51-02:00, davi@endora.local +3 -6
    Rename flush functions to better match the intent of the caller and
    update functions prototypes and remove unused flags.

  sql/sql_base.cc@1.374.60.1, 2007-11-20 15:17:51-02:00, davi@endora.local +4 -4
    Rename flush functions to better match the intent of the caller.

  sql/sql_class.cc@1.346.7.1, 2007-11-20 15:17:51-02:00, davi@endora.local +1 -3
    Rename the flush functions to better match the intent of the caller.
    The hash_free function is moved to the cleanup.

  sql/sql_handler.cc@1.99.1.6, 2007-11-20 15:17:52-02:00, davi@endora.local +107 -138
    When dropping tables for a final close, scan the handler's hash table since
    the table might not be in the handlers open table list because the table was
    marked for reopen or because it's a temporary table.

  sql/sql_rename.cc@1.48, 2007-11-20 15:17:52-02:00, davi@endora.local +2 -0
    Drop handlers associated with tables that are being renamed.

  sql/sql_table.cc@1.388.65.1, 2007-11-20 15:17:52-02:00, davi@endora.local +6 -12
    Now that temporary tables are properly removed even when opened
    by a SQL HANDLER, enable the assert since this branch can't be taken
    outside of SF/trigger/prelocked mode.

ChangeSet@1.2529.169.25, 2007-11-20 16:04:07+01:00, mleich@five.local.lan +121 -0
  Fixes for the bugs
         Bug#31610 Remove outdated and redundant tests:
                   partition_02myisam partition_03ndb
         Bug#32405 testsuite parts: partition_char_myisam wrong content
  and cleanup of testsuite
     - remove/correct wrong comments
     - remove workarounds for fixed bugs
     - replace error numbers with error names
     - exclude subtests from execution which fail now because of
       new limitations for partitioning functions
     - remove code for the no more intended dual use
       fast test in regression tests/slow test in testsuite
     - analyze and fix problems with partition_char_innodb
     - fix problems caused by last change of error numbers
     - Introduce error name to error number mapping which makes
       maintenance after next error renumbering easier

  BitKeeper/deleted/.del-partition_02myisam.result@1.9, 2007-11-20 16:01:44+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result

  BitKeeper/deleted/.del-partition_02myisam.test@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test

  BitKeeper/deleted/.del-partition_03ndb.result@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result

  BitKeeper/deleted/.del-partition_03ndb.test@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test

  BitKeeper/deleted/.del-partition_1.inc@1.5, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc

  BitKeeper/deleted/.del-partition_char_myisam.result@1.3, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result

  mysql-test/suite/parts/inc/methods1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -47
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc@1.8, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition.pre@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +98 -59
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_10.inc -> mysql-test/suite/parts/inc/partition_10.inc

  mysql-test/suite/parts/inc/partition_11.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_11.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_11.inc -> mysql-test/suite/parts/inc/partition_11.inc

  mysql-test/suite/parts/inc/partition_12.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_12.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_12.inc -> mysql-test/suite/parts/inc/partition_12.inc

  mysql-test/suite/parts/inc/partition_20.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -10
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -41
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter2.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -72
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter3.inc@1.6, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +19 -21
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter4.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -22
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_11.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_13.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_41.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +6 -14
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_basic.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_binary.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +9 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_bit.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_blob.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_char.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +47 -92
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_drop.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read1.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read2.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_cleanup.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_directory.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_engine.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -16
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_enum.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +7 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.4, 2007-11-20 16:01:43+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_layout.inc -> mysql-test/suite/parts/inc/partition_layout.inc

  mysql-test/suite/parts/inc/partition_layout_check1.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout_check2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods1.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_set.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -67
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +12 -20
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -11
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_text.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg1.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -5
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg2.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg3.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_value.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varbinary.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varchar.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +336 -341
    Updated result

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +128 -133
    Updated result

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +480 -485
    Updated result

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +288 -293
    Updated result

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -7
    Updated result

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -5
    Updated result

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +144 -149
    Updated result

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +176 -181
    Updated result

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +205 -210
    Updated result

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +161 -166
    Updated result

  mysql-test/suite/parts/r/partition_bit_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_char_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +674 -1543
    Updated result

  mysql-test/suite/parts/r/partition_char_myisam.result@1.1, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1340 -0
    Updated result
    bk rm + new file is caused by bk complaining about filetype

  mysql-test/suite/parts/r/partition_char_myisam.result@1.0, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/parts/r/partition_datetime_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_decimal_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_float_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -292
    Updated result

  mysql-test/suite/parts/r/partition_float_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_int_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_special_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +4 -4
    Updated result

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/t/disabled.def@1.7, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_innodb.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_myisam.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +4 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -10
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +15 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +5 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

ChangeSet@1.2676, 2007-11-20 13:04:21+01:00, joerg@trift2. +1 -0
  Fix bug#32513 "Falcon test checks for InnoDB presence", it was a typing error.

  mysql-test/suite/funcs_1/t/falcon_storedproc_10.test@1.2, 2007-11-20 13:04:16+01:00, joerg@trift2. +1 -1
    Correct a typing error: We want to check for Falcon presence, not InnoDB.
    
    This fixes bug#32513 "Falcon test checks for InnoDB presence"

ChangeSet@1.1810.3468.1, 2007-11-20 11:26:16+01:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.52

  configure.in@1.245.1.217, 2007-11-20 11:26:09+01:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.52

ChangeSet@1.2529.208.1, 2007-11-20 11:21:00+01:00, mattiasj@mattias-jonssons-macbook.local +5 -0
  Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
  
  Problem was for LINEAR HASH/KEY. Crashes because of wrong partition id
  returned when creating the new altered partitions. (because of wrong
  linear hash mask)
  
  Solution: Update the linear hash mask before using it for the new
  altered table.

  mysql-test/r/partition_hash.result@1.10, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +12 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    test result

  mysql-test/t/partition_hash.test@1.12, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +16 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentatition fault
    
    test case

  sql/ha_partition.cc@1.98.10.1, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +8 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    Updating the linear hash mask before using it.

  sql/sql_partition.cc@1.96.24.2, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -1
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

  sql/sql_partition.h@1.16, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

ChangeSet@1.1810.3451.4, 2007-11-20 10:25:07+01:00, guilhem@gbichot4.local +1 -0
  BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER":
  this has already been closed by a note in the manual, now we
  complete this by a note in "mysqldump --help"

  client/mysqldump.c@1.214.31.1, 2007-11-20 10:25:04+01:00, guilhem@gbichot4.local +6 -2
    mention, in "mysqldump --help", of limitations reported as BUG#27850
    "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER"
    The new text is inspired from what the "mysqldump" section of the
    manual now says about --single-transaction:
    http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html

ChangeSet@1.2529.169.23, 2007-11-19 21:24:36+01:00, joerg@trift2. +7 -0
  The error number for ER_ILLEGAL_HA_CREATE_OPTION changed from 1477 to 1478,
  this must be reflected in the test result files.

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.2.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.3.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.2.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.2.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.3.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.2.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.2.1.3, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

ChangeSet@1.2669.1.1, 2007-11-19 20:37:29+01:00, joerg@trift2. +4 -0
  mysql-test/suite/funcs_1/r/*_storedproc_08.result:
  
  Use the proper replacement string for varying date/time values.
  
  The replacement comment should match the column name,
  "created" and "modified" should not be exchanged.

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.6, 2007-11-19 20:37:23+01:00, joerg@trift2. +24 -24
    Use the proper replacement string for varying date/time values.

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.6, 2007-11-19 20:37:23+01:00, joerg@trift2. +24 -24
    Use the proper replacement string for varying date/time values.

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.6, 2007-11-19 20:37:24+01:00, joerg@trift2. +24 -24
    Use the proper replacement string for varying date/time values.
    

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.7, 2007-11-19 20:37:24+01:00, joerg@trift2. +24 -24
    Use the proper replacement string for varying date/time values.

ChangeSet@1.1810.3467.1, 2007-11-19 17:59:44+01:00, thek@adventure.(none) +7 -0
  Bug #31153 calling stored procedure crashes server if available memory is low
  
  When the server was out of memory it crashed because of invalid memory access.
  
  This patch adds detection for failed memory allocations and make the server
  output a proper error message.

  sql/mysqld.cc@1.439.132.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +12 -2
    Don't try to push_warning from within push_warning. It will cause a recursion
    until the stack is consumed.
    
    If my_net_init fails (for example: because of OOM) the temporary vio object 
    might have been attached to the thd object already. This will cause a double
    free on the vio object when the thd object is deleted later on and the server
    will crash.

  sql/sp_head.cc@1.200.23.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +30 -8
    Added check for out-of-memory on a 'new' operation.
    Refactored reset_lex method to return a error state code instead of void.
    Initialize the mem-root with init_sql_alloc to get a basic error handler for
    memory allocation problems. This alone won't prevent the server from crashing,
    NULL pointers have to be accounted for as well.

  sql/sp_head.h@1.79.6.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -3
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_base.cc@1.235.115.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -2
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_lex.h@1.175.1.79, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -2
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_prepare.cc@1.142.1.66, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -1
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_yacc.yy@1.371.129.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +118 -31
    Check for memory allocation failures where it matters.

ChangeSet@1.1810.3465.1, 2007-11-19 14:38:08+01:00, df@pippilotta.erinye.com +43 -0
  Update readline to version 5.2. This fixes bug#18431.

  cmd-line-utils/readline/INSTALL@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +15 -1
    update readline to version 5.2

  cmd-line-utils/readline/README@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +16 -2
    update readline to version 5.2

  cmd-line-utils/readline/bind.c@1.15.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +201 -109
    update readline to version 5.2

  cmd-line-utils/readline/callback.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +118 -14
    update readline to version 5.2

  cmd-line-utils/readline/chardefs.h@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +2 -4
    update readline to version 5.2

  cmd-line-utils/readline/compat.c@1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/complete.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +82 -58
    update readline to version 5.2

  cmd-line-utils/readline/configure.in@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +90 -9
    update readline to version 5.2

  cmd-line-utils/readline/display.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +340 -188
    update readline to version 5.2

  cmd-line-utils/readline/funmap.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/histexpand.c@1.14, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +29 -25
    update readline to version 5.2

  cmd-line-utils/readline/histfile.c@1.9.1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +10 -6
    update readline to version 5.2

  cmd-line-utils/readline/history.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +95 -18
    update readline to version 5.2

  cmd-line-utils/readline/histsearch.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/input.c@1.15, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +35 -10
    update readline to version 5.2

  cmd-line-utils/readline/isearch.c@1.12, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +447 -337
    update readline to version 5.2

  cmd-line-utils/readline/keymaps.c@1.8, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/kill.c@1.11, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +22 -14
    update readline to version 5.2

  cmd-line-utils/readline/macro.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +18 -5
    update readline to version 5.2

  cmd-line-utils/readline/mbutil.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +34 -14
    update readline to version 5.2

  cmd-line-utils/readline/misc.c@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +203 -99
    update readline to version 5.2

  cmd-line-utils/readline/nls.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -2
    update readline to version 5.2

  cmd-line-utils/readline/parens.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/readline.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +299 -85
    update readline to version 5.2

  cmd-line-utils/readline/readline.h@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +41 -24
    update readline to version 5.2

  cmd-line-utils/readline/rlconf.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/rldefs.h@1.7, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +6 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlmbutil.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +36 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlprivate.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +139 -2
    update readline to version 5.2

  cmd-line-utils/readline/rltty.c@1.11.1.1, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +79 -10
    update readline to version 5.2

  cmd-line-utils/readline/savestring.c@1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -2
    update readline to version 5.2

  cmd-line-utils/readline/search.c@1.11, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +208 -108
    update readline to version 5.2

  cmd-line-utils/readline/shell.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +25 -15
    update readline to version 5.2

  cmd-line-utils/readline/signals.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +71 -7
    update readline to version 5.2

  cmd-line-utils/readline/terminal.c@1.17, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +108 -33
    update readline to version 5.2

  cmd-line-utils/readline/text.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +240 -133
    update readline to version 5.2

  cmd-line-utils/readline/tilde.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +53 -9
    update readline to version 5.2

  cmd-line-utils/readline/tilde.h@1.6, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -0
    update readline to version 5.2

  cmd-line-utils/readline/undo.c@1.10.1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +80 -11
    update readline to version 5.2

  cmd-line-utils/readline/util.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +28 -6
    update readline to version 5.2

  cmd-line-utils/readline/vi_keymap.c@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -1
    update readline to version 5.2

  cmd-line-utils/readline/vi_mode.c@1.15, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +403 -131
    update readline to version 5.2

  cmd-line-utils/readline/xmalloc.c@1.8.1.2, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +7 -4
    update readline to version 5.2

ChangeSet@1.2529.205.1, 2007-11-18 20:28:37+01:00, istruewing@stella.local +3 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix for a Valgrind warning.

  mysql-test/r/merge.result@1.63.3.4, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/merge.test@1.58, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed unnecessary statements from test.

  sql/sql_trigger.cc@1.46.1.61, 2007-11-18 20:28:35+01:00, istruewing@stella.local +5 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed usage of db and table_name for
    close_data_files_and_morph_locks().

ChangeSet@1.2529.204.2, 2007-11-17 19:42:16+01:00, tnurnberg@mysql.com +2 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  post-merge fixes: some things work differently in 5.1

  mysql-test/r/type_newdecimal.result@1.63, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: 5.1 throws different warning here

  sql/sql_select.cc@1.541.40.2, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: signature has changed in 5.1

ChangeSet@1.1810.3464.1, 2007-11-17 19:05:31+01:00, tnurnberg@mysql.com +3 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  Server failed in assert() when we tried to create a DECIMAL() temp field
  with a scale of more than the allowed 30. Now we limit the scale to the
  allowed maximum. A truncation warning is thrown as necessary.

  mysql-test/r/type_newdecimal.result@1.36.1.15, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -0
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  mysql-test/t/type_newdecimal.test@1.33.1.16, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -1
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  sql/sql_select.cc@1.312.179.1, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +36 -2
    When creating DECIMAL() temp field, ascertain we stay within allowed
    limits. If not, truncate and warn.

ChangeSet@1.2529.191.11, 2007-11-17 11:20:50+04:00, ramil@mysql.com +3 -0
  Fix for bug #32260: User variables in query cause server crash
    
  Problem: there's no guarantee that the user variable item's result_field
  is assigned when we're adjusting its table read map.
    
  Fix: check the result_field before using it.

  mysql-test/r/user_var.result@1.49, 2007-11-17 11:20:48+04:00, ramil@mysql.com +11 -0
    Fix for bug #32260: User variables in query cause server crash
      - test result.

  mysql-test/t/user_var.test@1.45, 2007-11-17 11:20:48+04:00, ramil@mysql.com +21 -0
    Fix for bug #32260: User variables in query cause server crash
      - test case.

  sql/item_func.cc@1.353.54.1, 2007-11-17 11:20:48+04:00, ramil@mysql.com +2 -1
    Fix for bug #32260: User variables in query cause server crash
      - using the result_field ensure it is set.

ChangeSet@1.1810.3424.14, 2007-11-16 14:56:37-07:00, tsmith@ramayana.hindu.god +1 -0
  Eliminate 'unused variable' warnings when compiling non-debug build

  mysys/default.c@1.72.1.20, 2007-11-16 14:56:35-07:00, tsmith@ramayana.hindu.god +12 -3
    Eliminate 'unused variable' warnings when compiling non-debug build

ChangeSet@1.2656.8.4, 2007-11-16 22:34:02+01:00, mkindahl@dl145h.mysql.com +6 -0
  Post-merge changes.

  mysql-test/r/ctype_uca.result@1.23, 2007-11-16 22:33:56+01:00, mkindahl@dl145h.mysql.com +45 -46
    Result change.

  mysql-test/r/join.result@1.53, 2007-11-16 22:33:57+01:00, mkindahl@dl145h.mysql.com +70 -3
    Result change.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.11, 2007-11-16 22:33:57+01:00, mkindahl@dl145h.mysql.com +3 -3
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.18, 2007-11-16 22:33:57+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling test cases.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.9, 2007-11-16 22:33:57+01:00, mkindahl@dl145h.mysql.com +1 -2
    Using standard show_slave_status include file.

  mysql-test/t/join.test@1.45, 2007-11-16 22:33:57+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding query_vertical to long output.

ChangeSet@1.2529.187.15, 2007-11-16 18:05:30+01:00, istruewing@stella.local +2 -0
  Bug#32443 - trigger.test produces warnings files
  
  Wrong syntax for mysqltest commands was used in test file.
  
  Fixed test.

  mysql-test/r/trigger.result@1.74, 2007-11-16 18:05:28+01:00, istruewing@stella.local +0 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test result

  mysql-test/t/trigger.test@1.84, 2007-11-16 18:05:28+01:00, istruewing@stella.local +2 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test

ChangeSet@1.1810.3395.37, 2007-11-16 17:36:13+01:00, joerg@trift2. +1 -0
  In the "spec" file for RPM builds, handle the debug server tests different from the standard server.

  support-files/mysql.spec.sh@1.99.1.75, 2007-11-16 17:36:11+01:00, joerg@trift2. +5 -1
    Don't use the "test-bt" target to run the tests on the debug server,
    rather use "test-bt-debug".
    
    There are two reasons for this:
    1) Consistency with the "tar.gz" builds.
    2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
       or else it will fail when it generates the test status summary.

ChangeSet@1.2656.15.1, 2007-11-16 19:13:26+03:00, kostja@bodhi.(none) +5 -0
  WL#4085 "Discontinue the instance manager".
  Remove the instance manager from the build scripts. The sources and tests
  will be removed in a separate changeset.

  CMakeLists.txt@1.35.1.1, 2007-11-16 19:13:23+03:00, kostja@bodhi.(none) +0 -1
    Remove the instance manager.

  Makefile.am@1.145, 2007-11-16 19:13:23+03:00, kostja@bodhi.(none) +2 -2
    Remove the instance manager.

  configure.in@1.393.1.2, 2007-11-16 19:13:24+03:00, kostja@bodhi.(none) +0 -14
    Remove the instance manager.

  mysql-test/dump.txt@1.1, 2007-11-16 19:13:24+03:00, kostja@bodhi.(none) +7 -0
    Remove the instance manager.

  mysql-test/dump.txt@1.0, 2007-11-16 19:13:24+03:00, kostja@bodhi.(none) +0 -0

  mysql-test/mysql-test-run.pl@1.150.5.1, 2007-11-16 19:13:24+03:00, kostja@bodhi.(none) +4 -308
    Remove the instance manager.

ChangeSet@1.2529.203.1, 2007-11-16 15:55:22+01:00, mkindahl@dl145h.mysql.com +4 -0
  Bug#32435:
  DROP DATABASE statement writes changes to mysql.proc table under RBR
  
  When replicating a DROP DATABASE statement with a database holding
  stored procedures, the changes to the mysql.proc table was recorded
  in the binary log under row-based replication.
  
  With this patch, the thread uses statement-logging format for the
  duration of the DROP DATABASE statement. The logging format is
  (already) reset at the end of the statement, so no additional code
  for resetting the logging format is necessary.

  mysql-test/extra/binlog_tests/database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +15 -0
    New BitKeeper file ``mysql-test/extra/binlog_tests/database.test''

  mysql-test/extra/binlog_tests/database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_database.result@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +56 -0
    New BitKeeper file ``mysql-test/suite/binlog/r/binlog_database.result''

  mysql-test/suite/binlog/r/binlog_database.result@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/t/binlog_database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +12 -0
    New BitKeeper file ``mysql-test/suite/binlog/t/binlog_database.test''

  mysql-test/suite/binlog/t/binlog_database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  sql/sql_db.cc@1.160.1.4, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +7 -0
    Clearing the row-based statement flag for the DROP DATABASE statement
    since it should always be replicated as a statement.

ChangeSet@1.1810.3462.1, 2007-11-16 10:43:59+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient

  sql-common/client.c@1.83.19.1, 2007-11-16 10:43:58+01:00, msvensson@pilot.mysql.com +5 -0
    Store ssl_cipher setting read from my.cnf into "option->ssl_cipher"

ChangeSet@1.2656.2.27, 2007-11-16 00:17:11-06:00, klewis@klewis-mysql. +5 -0
  Bug#32301 - If a transaction is started though the storageHandler, 
  like it is when start_consistent_snapshot() is called, then make
  sure connection->startTransaction is called so that a transaction
  object is created with a transactionID.
  
  Do not allow a transaction's isolation level to change after it
  has been instantiated.
  Set the internal default isolation level to consistent read.

  storage/falcon/StorageConnection.cpp@1.3, 2007-11-16 00:16:40-06:00, klewis@klewis-mysql. +3 -3
    Do not allow a transaction's isolation level to change after it
    has been instantiated.

  storage/falcon/StorageHandler.cpp@1.15, 2007-11-16 00:16:56-06:00, klewis@klewis-mysql. +9 -5
    Bug#32301 - If a transaction is started though the storageHandler, 
    like it is when start_consistent_snapshot() is called, then make
    sure connection->startTransaction is called so that a transaction
    object is created with a transactionID.

  storage/falcon/StorageParameters.h@1.17, 2007-11-16 00:16:58-06:00, klewis@klewis-mysql. +11 -0
    Add comments to explain flags used

  storage/falcon/StorageTableShare.h@1.9, 2007-11-16 00:17:00-06:00, klewis@klewis-mysql. +1 -1
    cleanup

  storage/falcon/ha_falcon.cpp@1.33, 2007-11-16 00:17:03-06:00, klewis@klewis-mysql. +1 -1
    Set the internal default isolation level to consistent read.

ChangeSet@1.2656.2.26, 2007-11-15 19:00:05-06:00, chris@xeno.mysql.com +1 -0
  Bug#32413: Disabled falcon_bug_32413 for now. Conflicts with other pushbuild tests.

  mysql-test/suite/falcon/t/disabled.def@1.11, 2007-11-15 19:00:03-06:00, chris@xeno.mysql.com +1 -0
    Disabled falcon_bug_32413 for now. Conflicts with other pushbuild tests.

ChangeSet@1.2656.2.25, 2007-11-15 18:46:54-06:00, chris@xeno.mysql.com +5 -0
  Bug#22173, "TRUNCATE does not reset auto_increment counter"
  
  - Added multiclient testcase, falcon_bug_22173a.
  - Disabled falcon_bug_22173a until concurrency issues with TRUNCATE are resolved.
  - Enabled simple TRUNCATE testcase, falcon_bug_22173
  - Table::retireRecords() - ensure 'records' is non-null after acquiring scavenger lock

  mysql-test/suite/falcon/r/falcon_bug_22173a.result@1.1, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +43 -0
    New multi-client TRUNCATE testcase

  mysql-test/suite/falcon/r/falcon_bug_22173a.result@1.0, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +0 -0

  mysql-test/suite/falcon/t/disabled.def@1.10, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +1 -1
    Enable falcon_bug_22173
    Disable falcon_bug_22173a until concurrency issues resolved with TRUNCATE

  mysql-test/suite/falcon/t/falcon_bug_22173a.test@1.1, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +78 -0
    New multi-client TRUNCATE testcase

  mysql-test/suite/falcon/t/falcon_bug_22173a.test@1.0, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +0 -0

  storage/falcon/Table.cpp@1.24, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +4 -1
    - Use "system.tables" instead of "Tables" for updates to system tables.
    - Check that Table::records is non-null after acquiring scavenger lock in Table::retireRecords()

  storage/falcon/ha_falcon.cpp@1.32, 2007-11-15 18:46:52-06:00, chris@xeno.mysql.com +0 -1
    StorageInterface::delete_all_rows(): Remove compile warning 

ChangeSet@1.2656.2.24, 2007-11-15 16:42:01-06:00, chris@xeno.mysql.com +4 -0
  Bug#32413, "Memory usage not constrained by falcon_record_memory_max, assertion failure"
  
  - Added testcase to exercise falcon_record_memory_max and out-of-memory condition
  - Added out-of-memory exception handling to Table::databaseFetch()

  mysql-test/suite/falcon/r/falcon_bug_32413.result@1.1, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +56 -0
    New testcase for falcon_record_memory_max

  mysql-test/suite/falcon/r/falcon_bug_32413.result@1.0, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +0 -0

  mysql-test/suite/falcon/t/falcon_bug_32413.test@1.1, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +86 -0
    New testcase for falcon_record_memory_max

  mysql-test/suite/falcon/t/falcon_bug_32413.test@1.0, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +0 -0

  storage/falcon/MemMgr.cpp@1.13, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +1 -2
    Minor formatting

  storage/falcon/Table.cpp@1.23, 2007-11-15 16:41:59-06:00, chris@xeno.mysql.com +7 -0
    Handle out of memory exception in Table::databaseFetch()

ChangeSet@1.2656.13.1, 2007-11-15 16:06:20-05:00, dkatz@damien-katzs-computer.local +15 -0
  WL#441: Use a thread pool to serve user requests
  - use a list instead of pipe when adding THD for libevent processing
  - now we reset THD::mysys_var when we disassociate THD from physical thread to avoid problems with other threads when killing threads waiting for I/O
  - changed how threads are killed: use single pipe for awaking libevent instead of using one pipe for each THD
  ---
  Fix for broken SESSION DEBUG variables with pool-of-threads. This is achieved by saving connection specific debug variable value in newly introduced thd_scheduler::dbug_explain_buf member when we disassociate THD from real thread and restoring it later then then we associate THD with thread back. This is temporary solution which should be replaced in following patches.
  ---
  Bug#32156: fix libevent to statically link with mysqld.

  BUILD/SETUP.sh@1.81, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +1 -4
    Bug#32156: fix libevent to statically link with mysqld.

  config/ac-macros/libevent.m4@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +1 -1
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/Makefile.am@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +6 -11
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/devpoll.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/epoll.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/epoll_sub.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +8 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/evport.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/kqueue.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/poll.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  extra/libevent/select.c@1.2, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug#32156: fix libevent to statically link with mysqld.

  libmysqld/Makefile.am@1.119, 2007-11-15 16:06:15-05:00, dkatz@damien-katzs-computer.local +0 -5
    Bug#32156: fix libevent to statically link with mysqld.

  mysql-test/r/crash_commit_before.result@1.4, 2007-11-15 16:06:16-05:00, dkatz@damien-katzs-computer.local +1 -1
    Reverted a test to once again use a SESSION Debug variable. The test was previously changed to use GLOBAL debug variables because session debug variables were broken with pool-of-threads.

  mysql-test/t/crash_commit_before.test@1.8, 2007-11-15 16:06:16-05:00, dkatz@damien-katzs-computer.local +1 -1
    Reverted a test to once again use a SESSION Debug variable. The test was previously changed to use GLOBAL debug variables because session debug variables were broken with pool-of-threads.

  sql/scheduler.cc@1.4, 2007-11-15 16:06:16-05:00, dkatz@damien-katzs-computer.local +274 -149
    WL#441: Use a thread pool to serve user requests
    - use a list instead of pipe when adding THD for libevent processing
    - now we reset THD::mysys_var when we disassociate THD from physical thread to avoid problems with other threads when killing threads waiting for I/O
    - changed how threads are killed: use single pipe for awaking libevent instead of using one pipe for each THD
    ---
    Fix for broken SESSION DEBUG variables with pool-of-threads. This is achieved by saving connection specific debug variable value in newly introduced thd_scheduler::dbug_explain_buf member when we disassociate THD from real thread and restoring it later then then we associate THD with thread back. This is temporary solution which should be replaced in following patches.

  sql/scheduler.h@1.3, 2007-11-15 16:06:16-05:00, dkatz@damien-katzs-computer.local +9 -8
    WL#441: Use a thread pool to serve user requests
    - use a list instead of pipe when adding THD for libevent processing
    - now we reset THD::mysys_var when we disassociate THD from physical thread to avoid problems with other threads when killing threads waiting for I/O
    - changed how threads are killed: use single pipe for awaking libevent instead of using one pipe for each THD
    ---
    Fix for broken SESSION DEBUG variables with pool-of-threads. This is achieved by saving connection specific debug variable value in newly introduced thd_scheduler::dbug_explain_buf member when we disassociate THD from real thread and restoring it later then then we associate THD with thread back. This is temporary solution which should be replaced in following patches.

ChangeSet@1.2656.12.3, 2007-11-15 23:36:06+03:00, sergefp@mysql.com +3 -0
  BUG#32229: Range optimizer crashes for 'range checked for each record' query
  The problem:
  New code in sel_arg_range_sext() function didn't take into account that 
  SEL_ARG tree may contain objects of type SEL_ARG::MAYBE_KEY which do not
  represent intervals but just signal about possibility to use the "range
  checked for each record" optimization. Attempt to get min/max bounds from
  those objects caused the crash
  Fix:
  Make sel_arg_range_seq_next ignore SEL_ARG objects that have type other 
  than SEL_ARG::KEY_RANGE.
  [re-committing to push into the build clone]

  mysql-test/r/range.result@1.63.1.2, 2007-11-15 23:36:00+03:00, sergefp@mysql.com +8 -0
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - testcase

  mysql-test/t/range.test@1.49.1.2, 2007-11-15 23:36:00+03:00, sergefp@mysql.com +11 -0
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - testcase

  sql/opt_range.cc@1.290.1.3, 2007-11-15 23:36:00+03:00, sergefp@mysql.com +2 -1
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - Make sel_arg_range_seq_next ignore SEL_ARG objects that have type 
      other than KEY_RANGE.

ChangeSet@1.2656.12.2, 2007-11-15 23:31:40+03:00, sergefp@mysql.com +2 -0
  BUG#32191: Memory overrun when using join buffering for falcon table with a blob:
  The problem: Falcon didn't follow the established convention that
    "If a blob column has NULL value, then its length and blob data 
     pointer must be set to 0".
  The fix:
  - Made falcon follow the convention
  - Documented it
  There is no testcase as this is buffer overrun and small repeatable testcase
  cannot be made.
  [re-committing this to push into build tree]

  sql/handler.h@1.275.1.1, 2007-11-15 23:31:32+03:00, sergefp@mysql.com +43 -0
    BUG#32191: Memory overrun when using join buffering for falcon table with a blob
    - Added a comment about TableRecordFormat convention. The part that 
      actually relates to this bug is that Falcon didn't follow the 
      "If a blob column has NULL value, then its length and blob data 
       pointer must be set to 0" convention.

  storage/falcon/ha_falcon.cpp@1.3.3.1, 2007-11-15 23:31:32+03:00, sergefp@mysql.com +4 -0
    BUG#32191: Memory overrun when using join buffering for falcon table with a blob
    - Make Falcon, like all other engines, bzero blob length/pointer when 
      returning NULL blob value

ChangeSet@1.2656.5.12, 2007-11-15 21:19:05+01:00, istruewing@stella.local +2 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Post-merge fix

  sql/sql_select.cc@1.569.2.2, 2007-11-15 21:19:03+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Post-merge fix

  sql/sql_show.cc@1.442.2.1, 2007-11-15 21:19:03+01:00, istruewing@stella.local +2 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Post-merge fix

ChangeSet@1.2656.12.1, 2007-11-15 23:18:38+03:00, sergefp@mysql.com +3 -0
  Merging Gleb's fix:
  Fixed bug #32262: crash with decimal column.
  
  The server crashed on optimization of queries
  with a comparison of an indexed decimal column with
  a string value.

  mysql-test/r/range.result@1.63.1.1, 2007-11-15 23:18:27+03:00, sergefp@mysql.com +14 -0
    Gleb's fix: Added test case for bug #32262.

  mysql-test/t/range.test@1.49.1.1, 2007-11-15 23:18:27+03:00, sergefp@mysql.com +10 -0
    Gleb's fix: Added test case for bug #32262.

  sql/opt_range.cc@1.290.1.2, 2007-11-15 23:18:27+03:00, sergefp@mysql.com +2 -0
    Gleb's fix:
    Fixed bug #32262.
    The check_quick_select function has been changed to
    check input parameter for NULL value.

ChangeSet@1.2656.2.23, 2007-11-15 13:30:13-06:00, chris@xeno.mysql.com +4 -0
  Bug#32413, "Memory usage not constrained by falcon_record_memory_max, assertion failure"
  
  - Changed MemRecordMgrSetMaxRecordMember() to allow dynamic changes to falcon_record_memory_max.
  - Correct thawed byte accounting.

  storage/falcon/MemMgr.cpp@1.12, 2007-11-15 13:30:11-06:00, chris@xeno.mysql.com +2 -1
    Modified MemMgrSetMaxRecordMember() to accept post-initialization updates to 
    falcon_record_memory_max.

  storage/falcon/SRLUpdateRecords.cpp@1.4, 2007-11-15 13:30:11-06:00, chris@xeno.mysql.com +5 -1
    Corrected thawed byte count. SRLUpdateRecords::thaw() returned a byte count
    for records that have already been thawed, throwing off the count. 

  storage/falcon/SRLUpdateRecords.h@1.2, 2007-11-15 13:30:11-06:00, chris@xeno.mysql.com +1 -1
    Added "thawed" boolean argument to thaw().

  storage/falcon/Transaction.cpp@1.14, 2007-11-15 13:30:11-06:00, chris@xeno.mysql.com +5 -6
    Corrected thawed byte count. SRLUpdateRecords::thaw() returned a byte count
    for records that have already been thawed, throwing off the count.
    Transaction::thaw() now checks the byte count and a 'thawed' boolean before
    updating the accumulated totals.

ChangeSet@1.2529.191.10, 2007-11-15 20:25:43+01:00, istruewing@stella.local +35 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  Bug 25038 - Waiting TRUNCATE
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  Bug 19627 - temporary merge table locking
  Bug 27660 - Falcon: merge table possible
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
  The problems were:
  
  Bug 26379 - Combination of FLUSH TABLE and REPAIR TABLE
                  corrupts a MERGE table
  
    1. A thread trying to lock a MERGE table performs busy waiting while
       REPAIR TABLE or a similar table administration task is ongoing on
       one or more of its MyISAM tables.
    
    2. A thread trying to lock a MERGE table performs busy waiting until all
       threads that did REPAIR TABLE or similar table administration tasks
       on one or more of its MyISAM tables in LOCK TABLES segments do UNLOCK
       TABLES. The difference against problem #1 is that the busy waiting
       takes place *after* the administration task. It is terminated by
       UNLOCK TABLES only.
    
    3. Two FLUSH TABLES within a LOCK TABLES segment can invalidate the
       lock. This does *not* require a MERGE table. The first FLUSH TABLES
       can be replaced by any statement that requires other threads to
       reopen the table. In 5.0 and 5.1 a single FLUSH TABLES can provoke
       the problem.
  
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  
    Trying DML on a MERGE table, which has a child locked and
    repaired by another thread, made an infinite loop in the server.
  
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  
    Locking a MERGE table and its children in parent-child order
    and flushing the child deadlocked the server.
  
  Bug 25038 - Waiting TRUNCATE
  
    Truncating a MERGE child, while the MERGE table was in use,
    let the truncate fail instead of waiting for the table to
    become free.
  
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  
    Repairing a child of an open MERGE table corrupted the child.
    It was necessary to FLUSH the child first.
  
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  
    Flushing and optimizing locked MERGE children crashed the server.
  
  Bug 19627 - temporary merge table locking
  
    Use of a temporary MERGE table with non-temporary children
    could corrupt the children.
  
    Temporary tables are never locked. So we do now prohibit
    non-temporary chidlren of a temporary MERGE table.
  
  Bug 27660 - Falcon: merge table possible
  
    It was possible to create a MERGE table with non-MyISAM children.
  
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
    This was a Windows-only bug. Table administration statements
    sometimes failed with "Can't lock file (errno: 155)".
  
  These bugs are fixed by a new implementation of MERGE table open.
  
  When opening a MERGE table in open_tables() we do now add the
  child tables to the list of tables to be opened by open_tables()
  (the "query_list"). The children are not opened in the handler at
  this stage.
  
  After opening the parent, open_tables() opens each child from the
  now extended query_list. When the last child is opened, we remove
  the children from the query_list again and attach the children to
  the parent. This behaves similar to the old open. However it does
  not open the MyISAM tables directly, but grabs them from the already
  open children.
  
  When closing a MERGE table in close_thread_table() we detach the
  children only. Closing of the children is done implicitly because
  they are in thd->open_tables.
  
  For more detail see the comment at the top of ha_myisammrg.cc.
  
  Changed from open_ltable() to open_and_lock_tables() in all places
  that can be relevant for MERGE tables. The latter can handle tables
  added to the list on the fly. When open_ltable() was used in a loop
  over a list of tables, the list must be temporarily terminated
  after every table for open_and_lock_tables().
  table_list->required_type is set to FRMTYPE_TABLE to avoid open of
  special tables. Handling of derived tables is suppressed.
  These details are handled by the new function
  open_n_lock_single_table(), which has nearly the same signature as
  open_ltable() and can replace it in most cases.
  
  In reopen_tables() some of the tables open by a thread can be
  closed and reopened. When a MERGE child is affected, the parent
  must be closed and reopened too. Closing of the parent is forced
  before the first child is closed. Reopen happens in the order of
  thd->open_tables. MERGE parents do not attach their children
  automatically at open. This is done after all tables are reopened.
  So all children are open when attaching them.
  
  Special lock handling like mysql_lock_abort() or mysql_lock_remove()
  needs to be suppressed for MERGE children or forwarded to the parent.
  This depends on the situation. In loops over all open tables one
  suppresses child lock handling. When a single table is touched,
  forwarding is done.
  
  Behavioral changes:
  ===================
  
  This patch changes the behavior of temporary MERGE tables.
  Temporary MERGE must have temporary children.
  The old behavior was wrong. A temporary table is not locked. Hence
  even non-temporary children were not locked. See
  Bug 19627 - temporary merge table locking.
  
  You cannot change the union list of a non-temporary MERGE table
  when LOCK TABLES is in effect. The following does *not* work:
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ...;
  LOCK TABLES t1 WRITE, t2 WRITE, m1 WRITE;
  ALTER TABLE m1 ... UNION=(t1,t2) ...;
  However, you can do this with a temporary MERGE table.
  
  You cannot create a MERGE table with CREATE ... SELECT, neither
  as a temporary MERGE table, nor as a non-temporary MERGE table.
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ... SELECT ...;
  Gives error message: table is not BASE TABLE.

  include/my_base.h@1.101.8.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +7 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN.

  include/myisammrg.h@1.21, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added element 'children_attached' to MYRG_INFO.
    Added declarations for myrg_parent_open(),
    myrg_attach_children() and myrg_detach_children()
    for the new MERGE table open approach.

  mysql-test/extra/binlog_tests/blackhole.test@1.23, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Preliminarily added new error message with a comment.

  mysql-test/r/create.result@1.144.7.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/r/delayed.result@1.17, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result from here to merge.result.

  mysql-test/r/merge-big.result@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +77 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test result

  mysql-test/r/merge-big.result@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/r/merge.result@1.63.3.3, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1080 -14
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed/added test result.

  mysql-test/r/myisam.result@1.108.3.5, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -18
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result for bug 8306 from here to merge.result.

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.20.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/create.test@1.105.1.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed error number.

  mysql-test/t/delayed.test@1.22, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test from here to merge.test.

  mysql-test/t/merge-big.test@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +150 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test case

  mysql-test/t/merge-big.test@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/t/merge.test@1.57, 2007-11-15 20:25:40+01:00, istruewing@stella.local +841 -6
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test for new temporary MERGE table behavior.
    Exchanged error numbers by symbolic codes.
    Added tests. Included are tests for bugs
    8306 (moved from myisam.test), 26379, 19627, 25038, 25700, 26377,
    26867, 27660, 30275, and 30273.
    Fixed changes resulting from disabled CREATE...SELECT.
    Integrated tests moved from delayed.test and myisam.test to here.

  mysql-test/t/myisam.test@1.87.2.5, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -26
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test for bug 8306 from here to merge.test.

  mysys/thr_lock.c@1.62, 2007-11-15 20:25:40+01:00, istruewing@stella.local +23 -10
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code to let the owner of a high priority lock (TL_WRITE_ONLY)
    to bypass its own lock.

  sql/ha_ndbcluster_binlog.cc@1.90.27.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/handler.cc@1.215.102.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +6 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/mysql_priv.h@1.505.17.27, 2007-11-15 20:25:41+01:00, istruewing@stella.local +20 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed declaration of check_merge_table_access(). It is now static
    in sql_parse.cc.
    Added declaration for fix_merge_after_open().
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'.
    Added inline functions simple_open_n_lock_tables() and
    open_and_lock_tables(), which call open_and_lock_tables_derived()
    and add the argument for 'derived'.
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Added 'thd' argument to init_tmp_table_share().

  sql/slave.cc@1.301.16.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +6 -0
    ug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added comment.

  sql/sql_base.cc@1.374.59.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +984 -88
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Defined new functions add_merge_table_list(),
    attach_merge_children(), detach_merge_children(), and
    fix_merge_after_open() for the new MERGE table open approach.
    
    Added calls of the new functions to
    close_handle_and_leave_table_as_lock(), close_thread_tables(),
    close_thread_table(), unlink_open_table(), reopen_name_locked_table(),
    reopen_table(), drop_locked_tables(), close_temporary_table(),
    and open_tables() respectively.
    
    Prevented special lock handling of merge children (like
    mysql_lock_remove, mysql_lock_merge or mysql_lock_abort)
    at many places. Some of these calls are forwarded to the
    parent table instead.
    
    Added code to set thd->some_tables_deleted for every thread that has
    a table open that we are flushing.
    Added code for MERGE tables to unlink_open_table().
    Added MERGE children to the list of unusable tables in open_table().
    Added MERGE table handling to reopen_table().
    Added lock handling and closing of a parent before the children
    in close_data_files_and_morph_locks().
    Added code for re-attaching children in reopen_tables().
    Added MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN to the locking flags and
    error reporting after mysql_lock_tables() in reopen_tables().
    Added lock handling and closing of a parent before the children
    in close_old_data_files().
    Added lock handling and detaching in drop_locked_tables().
    Added code for removing the children list from the statement list
    to prepare for a repetition in open_tables().
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Disabled use of open_ltable() for MERGE tables.
    Removed function simple_open_n_lock_tables(). It is now inline
    declared in mysql_priv.h.
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'. open_and_lock_tables() is now
    inline declared in mysql_priv.h.
    Added a check for end-of-list in two loops in lock_tables().
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_insert.cc@1.282.18.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +12 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Changed from open_ltable() to open_n_lock_single_table() in
    handle_delayed_insert().
    Reestablished LEX settings after lex initialization.
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_parse.cc@1.693.19.10, 2007-11-15 20:25:41+01:00, istruewing@stella.local +53 -20
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Made check_merge_table_access() a static function.
    Disabled use of CREATE...SELECT for MERGE tables.

  sql/sql_partition.cc@1.96.24.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed comment typo.

  sql/sql_select.cc@1.541.39.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_table.cc@1.388.62.6, 2007-11-15 20:25:41+01:00, istruewing@stella.local +75 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Optimized use of mysql_ha_flush() in mysql_rm_table_part2().
    Disabled the use of MERGE tables with prepare_for_restore() and
    prepare_for_repair().
    Changed from open_ltable() to open_n_lock_single_table() in
    mysql_alter_table() and mysql_checksum_table().
    Disabled change of child list under LOCK TABLES.
    Initialized table_list->table in mysql_recreate_table().

  sql/sql_trigger.cc@1.46.1.60, 2007-11-15 20:25:41+01:00, istruewing@stella.local +39 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code for allowing CREATE TRIGGER under LOCK TABLE, to be able
    to test it with MERGE tables.

  sql/table.cc@1.288.20.4, 2007-11-15 20:25:41+01:00, istruewing@stella.local +27 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().
    Setting table_map_id from query_id in init_tmp_table_share().
    Added member function TABLE::is_children_attached().

  sql/table.h@1.174.6.8, 2007-11-15 20:25:41+01:00, istruewing@stella.local +33 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added access method get_table_def_version() to TABLE_SHARE.
    Added elements for MERGE tables to TABLE and TABLE_LIST.

  storage/myisam/ha_myisam.cc@1.217.1.16, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added an unrelated comment to the function comment of table2myisam().

  storage/myisam/ha_myisam.h@1.84.3.4, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added new member function MI_INFO::file_ptr().

  storage/myisammrg/ha_myisammrg.cc@1.124.1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +580 -90
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added callback functions to support parent open and children attach
    of MERGE tables.
    Changed ha_myisammrg::open() to initialize storage engine structures
    and create a list of child tables only. Child tables are not opened.
    Added ha_myisammrg::attach_children(), which does now the main part
    of MERGE open.
    Added ha_myisammrg::detach_children().
    Added calls to ::attach_children() and ::detach_children() to
    ::extra() on HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN
    respectively.
    Added a check for matching TEMPORARY type for children against
    parent.
    Added a check for table def version.
    Added support for thd->open_options to attach_children().
    Changed child path name generation for temporary tables so that
    it does nothing special for temporary tables.

  storage/myisammrg/ha_myisammrg.h@1.57, 2007-11-15 20:25:41+01:00, istruewing@stella.local +8 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added elements to class ha_myisammrg to support the new
    open approach.
    Changed empty destructor definition to a declaration.
    Implemented in ha_myisammrg.cc.
    Added declaration for methods attach_children() and
    detach_children().
    Added definition for method table_ptr() for use with
    callback functions.

  storage/myisammrg/myrg_close.c@1.11, 2007-11-15 20:25:41+01:00, istruewing@stella.local +31 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added a check to avoid closing of MyISAM tables when the
    child tables are not attached.
    Added freeing of rec_per_key_part when the child tables
    are not attached.

  storage/myisammrg/myrg_extra.c@1.19, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Some ::extra() functions and ::reset() can be called when
    children are detached.

  storage/myisammrg/myrg_open.c@1.38.1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +326 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Kept old myrg_open() for MERGE use independent from MySQL.
    Removed an always true condition in myrg_open().
    Set children_attached for independent MERGE use in myrg_open().
    
    Added myrg_parent_open(), myrg_attach_children(), and
    myrg_detach_children() for the new MERGE table open approach.

ChangeSet@1.2529.172.7, 2007-11-15 15:35:35+03:00, anozdrin@station. +3 -0
  A patch for BUG#19723: kill of active connection yields
  different error code depending on platform.
  
  On Mac OS X, KILL statement issued to kill the current
  connection would return a different error code and message than on
  other platforms ('MySQL server has gone away' instead of 'Shutdown
  in progress').
  
  The reason for this difference was that on Mac OS X we have macro
  SIGNAL_WITH_VIO_CLOSE defined. This macro forces KILL
  implementation to close the communication socket of the thread
  that is being killed. SIGNAL_WITH_VIO_CLOSE macro is defined on
  platforms where just sending a signal is not a reliable mechanism
  to interrupt the thread from sleeping on a blocking system call.
  In a nutshell, closing the socket is a hack to work around an
  operating system bug and awake the blocked thread no matter what.
  
  However, if the thread that is being killed is the same
  thread that issued KILL statement, closing the socket leads to a
  prematurely lost connection. At the same time it is not necessary
  to close the socket in this case, since the thread in question
  is not inside a blocking system call.
  
  The fix, therefore, is to not close the socket if the thread that
  is being killed is the same that issued KILL statement, even with
  defined SIGNAL_WITH_VIO_CLOSE.

  mysql-test/r/kill.result@1.20.1.1, 2007-11-15 15:35:32+03:00, anozdrin@station. +9 -0
    Update result file.

  mysql-test/t/kill.test@1.28.1.1, 2007-11-15 15:35:32+03:00, anozdrin@station. +16 -0
    Added a test case for BUG#19723: kill of active connection yields
    different error code depending on platform.

  sql/sql_class.cc@1.346.6.1, 2007-11-15 15:35:32+03:00, anozdrin@station. +14 -1
    Call close_active_vio() only if we're killing another thread.

ChangeSet@1.2529.201.1, 2007-11-15 12:30:35+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  tests adjusted for Windows

  mysql-test/r/log_tables.result@1.27.1.1, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +12 -12
    Be more conservative in tests (for Windows)

  mysql-test/t/log_tables.test@1.25, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +3 -3
    Be more conservative in tests (for Windows)

ChangeSet@1.2529.191.9, 2007-11-15 11:36:50+01:00, istruewing@stella.local +2 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  Post-pushbuild fix
  Added test case for better coverage.

  mysql-test/r/partition.result@1.68.9.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +7 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test result

  mysql-test/t/partition.test@1.62.10.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +10 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test case

ChangeSet@1.2656.9.9, 2007-11-15 14:20:00+04:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/suite/falcon/r/ps_8falcon.result@1.3, 2007-11-15 14:19:58+04:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/suite/falcon/t/falcon_ts.test@1.5, 2007-11-15 14:19:58+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.2656.9.8, 2007-11-15 13:23:55+04:00, gluh@mysql.com +1 -0
  updated result file(bacause of wrong merge)

  mysql-test/r/select.result@1.176, 2007-11-15 13:23:53+04:00, gluh@mysql.com +39 -39
    updated result file(bacause of wrong merge)

ChangeSet@1.2656.9.6, 2007-11-15 12:13:19+04:00, gluh@mysql.com +3 -0
  updated result file(Bug#30081)

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.19, 2007-11-15 12:13:16+04:00, gluh@mysql.com +18 -18
    updated result file(Bug#30081)

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.19, 2007-11-15 12:13:16+04:00, gluh@mysql.com +18 -18
    updated result file(Bug#30081)

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.19, 2007-11-15 12:13:16+04:00, gluh@mysql.com +18 -18
    updated result file(Bug#30081)

ChangeSet@1.2603.21.44, 2007-11-15 09:07:56+01:00, tnurnberg@mysql.com +2 -0
  Bug#31800: Date comparison fails with timezone and slashes for greater than comparison
  
  fix test and results for falcon

  mysql-test/suite/falcon/r/falcon_select.result@1.4, 2007-11-15 09:07:55+01:00, tnurnberg@mysql.com +7 -7
    '3a' is now '3 plus garbage we ignore', rather than 'something > 30'.
    fix test results to reflect this.

  mysql-test/suite/falcon/t/falcon_select.test@1.3, 2007-11-15 09:07:55+01:00, tnurnberg@mysql.com +6 -6
    Establish order for results

ChangeSet@1.2656.9.4, 2007-11-15 12:07:01+04:00, gluh@mysql.com +12 -0
  after merge fix

  mysql-test/r/subselect_no_mat.result@1.3, 2007-11-15 12:06:58+04:00, gluh@mysql.com +49 -0
    udated result file

  mysql-test/r/subselect_no_opts.result@1.7, 2007-11-15 12:06:58+04:00, gluh@mysql.com +49 -0
    udated result file

  mysql-test/r/subselect_no_semijoin.result@1.7, 2007-11-15 12:06:58+04:00, gluh@mysql.com +49 -0
    udated result file

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.17, 2007-11-15 12:06:58+04:00, gluh@mysql.com +9 -9
    udated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.17, 2007-11-15 12:06:58+04:00, gluh@mysql.com +9 -9
    udated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.17, 2007-11-15 12:06:58+04:00, gluh@mysql.com +9 -9
    udated result file

  mysql-test/suite/funcs_1/t/disabled.def@1.6.1.1, 2007-11-15 12:06:58+04:00, gluh@mysql.com +0 -4
    after merge fix

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.18, 2007-11-15 12:06:58+04:00, gluh@mysql.com +404 -101
    udated result file

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@1.7, 2007-11-15 12:06:58+04:00, gluh@mysql.com +85 -2
    udated result file

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.30, 2007-11-15 12:06:58+04:00, gluh@mysql.com +3 -7
    udated result file

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.19.1.1, 2007-11-15 12:06:58+04:00, gluh@mysql.com +3 -3
    after merge fix

  sql/sql_show.cc@1.442.1.3, 2007-11-15 12:06:58+04:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.2529.200.5, 2007-11-15 11:58:42+04:00, gluh@mysql.com +3 -0
  updated result file

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.10.3.3, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.10.3.3, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.10.3.3, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

ChangeSet@1.2529.172.5, 2007-11-14 16:12:46-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug#28785 thread-handling not displayed properly in SHOW VARIABLES

  mysql-test/r/no-threads.result@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -0
    Test that we are in the 'no-threads' thread_handling mode.

  mysql-test/t/no-threads.test@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -0
    Test that we are in the 'no-threads' thread_handling mode.

  sql/mysqld.cc@1.636.37.1, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -2
    Changes to make global_system_variables.thread_handling be zero based, instead of 1
    based.

  sql/scheduler.h@1.1.1.1, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the enum to start at 0, to match the array elements in thread_handling_names
    in mysqld.cc

ChangeSet@1.2656.10.2, 2007-11-14 21:47:14+01:00, hakank@au0012. +2 -0
  After merge fix.

  storage/falcon/SQLException.h@1.4.1.2, 2007-11-14 21:47:08+01:00, hakank@au0012. +1 -1
    After merge fix.

  storage/falcon/StorageTableShare.h@1.5.1.2, 2007-11-14 21:47:09+01:00, hakank@au0012. +1 -1
    After merge fix.

ChangeSet@1.2656.2.21, 2007-11-14 15:25:30-05:00, jas@rowvwade. +4 -0
  Fix table truncation.

  storage/falcon/StorageTable.cpp@1.7, 2007-11-14 15:25:20-05:00, jas@rowvwade. +1 -0
    Clear the current record when truncating a table, just in
    case.

  storage/falcon/Table.cpp@1.22, 2007-11-14 15:25:20-05:00, jas@rowvwade. +1 -1
    Make sure tables with data section ids of zero can be deleted.

  storage/falcon/ha_falcon.cpp@1.30, 2007-11-14 15:25:21-05:00, jas@rowvwade. +9 -3
    Reject call to delete_all_row() unless the operation is
    a truncate.

  storage/falcon/ha_falcon.h@1.7, 2007-11-14 15:25:21-05:00, jas@rowvwade. +2 -0
    Enable table truncation.

ChangeSet@1.2656.5.9, 2007-11-14 21:11:50+01:00, istruewing@stella.local +1 -0
  Bug#32355 - loadxml.test fails in embedded server
  
  Test case failed because the mysql dump tool tried to connect
  to the server. But an embedded server does not provide a
  connect port.
  
  Disabled test case for embedded server.

  mysql-test/t/loadxml.test@1.4, 2007-11-14 21:11:48+01:00, istruewing@stella.local +3 -0
    Bug#32355 - loadxml.test fails in embedded server
    Disabled test case for embedded server

ChangeSet@1.2529.198.3, 2007-11-14 21:08:59+01:00, mkindahl@dl145h.mysql.com +1 -0
  Post-merge fixes.

  sql/sql_delete.cc@1.204.17.8, 2007-11-14 21:08:55+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting merge error.

ChangeSet@1.2603.21.41, 2007-11-14 22:55:11+03:00, sergefp@mysql.com +3 -0
  BUG#32229: Range optimizer crashes for 'range checked for each record' query
  The problem:
  New code in sel_arg_range_sext() function didn't take into account that 
  SEL_ARG tree may contain objects of type SEL_ARG::MAYBE_KEY which do not
  represent intervals but just signal about possibility to use the "range
  checked for each record" optimization. Attempt to get min/max bounds from
  those objects caused the crash
  Fix:
  Make sel_arg_range_seq_next ignore SEL_ARG objects that have type other 
  than SEL_ARG::KEY_RANGE.

  mysql-test/r/range.result@1.65, 2007-11-14 22:55:06+03:00, sergefp@mysql.com +8 -0
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - testcase

  mysql-test/t/range.test@1.51, 2007-11-14 22:55:06+03:00, sergefp@mysql.com +11 -0
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - testcase

  sql/opt_range.cc@1.293.1.1, 2007-11-14 22:55:06+03:00, sergefp@mysql.com +2 -1
    BUG#32229: Range optimizer crashes for 'range checked for each record' query
    - Make sel_arg_range_seq_next ignore SEL_ARG objects that have type 
      other than KEY_RANGE.

ChangeSet@1.2603.21.40, 2007-11-14 21:55:26+03:00, sergefp@mysql.com +2 -0
  BUG#32191: Memory overrun when using join buffering for falcon table with a blob:
  The problem: Falcon didn't follow the established convention that
    "If a blob column has NULL value, then its length and blob data 
     pointer must be set to 0".
  The fix:
  - Made falcon follow the convention
  - Documented it
  There is no testcase as this is buffer overrun and small repeatable testcase
  cannot be made.

  sql/handler.h@1.276, 2007-11-14 21:55:21+03:00, sergefp@mysql.com +43 -0
    BUG#32191: Memory overrun when using join buffering for falcon table with a blob
    - Added a comment about TableRecordFormat convention. The part that 
      actually relates to this bug is that Falcon didn't follow the 
      "If a blob column has NULL value, then its length and blob data 
       pointer must be set to 0" convention.

  storage/falcon/ha_falcon.cpp@1.3.2.1, 2007-11-14 21:55:21+03:00, sergefp@mysql.com +4 -0
    BUG#32191: Memory overrun when using join buffering for falcon table with a blob
    - Make Falcon, like all other engines, bzero blob length/pointer when 
      returning NULL blob value

ChangeSet@1.2529.200.4, 2007-11-14 20:40:07+04:00, gluh@mysql.com +1 -0
  updated result file

  mysql-test/suite/ndb/r/ps_7ndb.result@1.64.1.1, 2007-11-14 20:40:05+04:00, gluh@mysql.com +1 -1
    updated result file

ChangeSet@1.1810.3395.34, 2007-11-14 18:56:14+04:00, gluh@mysql.com +1 -0
  after merge fix
  TAG: clone-5.0.52-build

  mysql-test/t/select.test@1.102.1.34, 2007-11-14 18:56:12+04:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.2529.198.2, 2007-11-14 14:04:33+01:00, mkindahl@dl145h.mysql.com +1 -0
  Reverting changes to debug printouts to ha_ndbcluster.cc.

  sql/ha_ndbcluster.cc@1.408.1.64, 2007-11-14 14:04:28+01:00, mkindahl@dl145h.mysql.com +55 -55
    Reverting previous changes done to DBUG_ENTER strings.

ChangeSet@1.1810.3461.1, 2007-11-14 12:02:20+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Post-pushbuild fix
  
  Added a purecov comment and a test for coverage of parallel
  enable keys.

  mysql-test/r/myisam.result@1.71.13.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +8 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +6 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test for coverage of parallel enable keys.

  myisam/mi_check.c@1.129.30.1, 2007-11-14 12:02:18+01:00, istruewing@stella.local +1 -1
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added purecov comment.

ChangeSet@1.2529.197.3, 2007-11-14 13:48:21+04:00, gshchepa@gleb.loc +4 -0
  Fixed bug #32034: On 64bit platforms assigning values of
  storage engine system variables was not validated and
  unexpected value was assigned.
  
  The check_func_enum function used subtraction from the uint
  value with the probably negative result. That result of
  type uint was compared with 0 after casting to signed long
  type. On architectures where long type is longer than int
  type the result of comparison was unexpected.

  mysql-test/r/plugin.result@1.4, 2007-11-14 13:48:18+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32034.

  mysql-test/t/plugin.test@1.3, 2007-11-14 13:48:17+04:00, gshchepa@gleb.loc +15 -0
    Added test case for bug #32034.

  sql/sql_plugin.cc@1.75.3.1, 2007-11-14 13:48:16+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #32034.
    The check_func_enum function used subtraction from the uint
    value with the probably negative result. That result of
    type uint was compared with 0 after casting to signed long
    type. On architectures where long type is longer than int
    type the result of comparison was unexpected.
    
    uint value has been casted to long type before subtraction.

  storage/example/ha_example.cc@1.62, 2007-11-14 13:48:15+04:00, gshchepa@gleb.loc +29 -1
    Fixed bug #32034.
    Sample system variable example_enum_var has been added to the
    EXAMPLE storage to test ENUM variables.

ChangeSet@1.2656.2.20, 2007-11-14 00:36:24-06:00, klewis@klewis-mysql. +4 -0
  A consistent snapshot needs CONSISTENT_READ isolation.
  Do not crash if a call to removeFromDIHash happens when 
  the DIHashTable == NULL.  It should not happen, but it did!

  storage/falcon/Index.cpp@1.9, 2007-11-14 00:31:17-06:00, klewis@klewis-mysql. +3 -0
    Do not crash if this happens, even though it should not.
    But Jim found a call to removeFromDIHash when the DIHashTable == NULL

  storage/falcon/SQLException.h@1.6, 2007-11-14 00:35:57-06:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/StorageHandler.cpp@1.13, 2007-11-14 00:35:59-06:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/ha_falcon.cpp@1.29, 2007-11-14 00:36:02-06:00, klewis@klewis-mysql. +1 -1
    A consistent snapshot needs CONSISTENT_READ isolation, duh.

ChangeSet@1.2656.2.19, 2007-11-13 16:09:39-06:00, chris@xeno.mysql.com +20 -0
  Bug#22173, "TRUNCATE does not reset auto_increment counter"
  - Implemented fast truncate via delete_all_rows() interface.
  - Added recreate sequence capability to reset auto_increment counters.

  storage/falcon/Database.cpp@1.21, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +25 -2
    Added truncateTable()

  storage/falcon/Database.h@1.18, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/Sequence.cpp@1.2, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +5 -0
    Added recreate()

  storage/falcon/Sequence.h@1.2, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added recreate()

  storage/falcon/SequenceManager.cpp@1.3, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +9 -0
    Added recreateSequence()

  storage/falcon/SequenceManager.h@1.2, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added recreateSequence()

  storage/falcon/StorageDatabase.cpp@1.7, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +36 -1
    Added truncateTable()

  storage/falcon/StorageDatabase.h@1.2, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/StorageTable.cpp@1.6, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +7 -0
    Added truncateTable()

  storage/falcon/StorageTable.h@1.4, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/StorageTableShare.cpp@1.4, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +7 -0
    Added truncateTable()

  storage/falcon/StorageTableShare.h@1.7, 2007-11-13 16:09:36-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/Table.cpp@1.21, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +66 -2
    Added truncate()
    Added 'force' option to rebuildIndexes()

  storage/falcon/Table.h@1.8, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +2 -1
    Added truncate()
    Added 'force' option to rebuildIndexes()

  storage/falcon/Transaction.cpp@1.13, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +16 -0
    Added truncateTable()

  storage/falcon/Transaction.h@1.8, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/TransactionManager.cpp@1.9, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +11 -0
    Added truncateTable()

  storage/falcon/TransactionManager.h@1.3, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +1 -0
    Added truncateTable()

  storage/falcon/ha_falcon.cpp@1.28, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +30 -3
    Implemented delete_all_rows() interface for TRUNCATE operations.

  storage/falcon/ha_falcon.h@1.6, 2007-11-13 16:09:37-06:00, chris@xeno.mysql.com +3 -1
    Added delete_all_rows()

ChangeSet@1.2656.2.18, 2007-11-13 14:08:16-06:00, klewis@klewis-mysql. +2 -0
  Added falcon_bug_32194

  mysql-test/suite/falcon/r/falcon_bug_32194.result@1.1, 2007-11-13 14:08:08-06:00, klewis@klewis-mysql. +19 -0
    Added falcon_bug_32194

  mysql-test/suite/falcon/r/falcon_bug_32194.result@1.0, 2007-11-13 14:08:08-06:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_32194.test@1.1, 2007-11-13 14:08:11-06:00, klewis@klewis-mysql. +28 -0
    Added falcon_bug_32194

  mysql-test/suite/falcon/t/falcon_bug_32194.test@1.0, 2007-11-13 14:08:11-06:00, klewis@klewis-mysql. +0 -0

ChangeSet@1.2656.2.17, 2007-11-13 13:34:35-06:00, klewis@klewis-mysql. +1 -0
  Bug#32194 - Incorrect count of changed NULL autoincreement fields.
  mysql_update() was expecting the storage engine to initialize all
  the meaningless bytes of a null field in order to determine if
  an autoincrement field should be updated.  The compare routine in
  the server should use only the null flag, if the field is null.
  In the mean time, Falcon noe calls field->reset() in decodeRecord().

  storage/falcon/ha_falcon.cpp@1.27, 2007-11-13 13:34:26-06:00, klewis@klewis-mysql. +3 -0
    Bug#32194 - Incorrect count of changed NULL autoincreement fields.
    mysql_update() was expecting the storage engine to initialize all
    the meaningless bytes of a null field in order to determine if
    an autoincrement field should be updated.  The compare routine in
    the server should use only the null flag, if the field is null.
    In the mean time, Falcon noe calls field->reset() in decodeRecord().

ChangeSet@1.2529.120.53, 2007-11-13 19:32:12+02:00, gkodinov@magare.gmz +1 -0
  merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

  mysql-test/r/lowercase_view.result@1.14, 2007-11-13 19:32:11+02:00, gkodinov@magare.gmz +2 -2
    merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

ChangeSet@1.2656.5.6, 2007-11-13 15:15:50+01:00, istruewing@stella.local +2 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  Post-merge fix. Privileges are now in column 32.

  mysql-test/r/join.result@1.51, 2007-11-13 15:15:48+01:00, istruewing@stella.local +2 -2
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Post-merge fix. Privileges are now in column 32.

  mysql-test/t/join.test@1.44, 2007-11-13 15:15:48+01:00, istruewing@stella.local +1 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Post-merge fix. Privileges are now in column 32.

ChangeSet@1.2529.196.1, 2007-11-13 13:24:48+00:00, evgen@moonbone.local +17 -0
  Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
  command and reported to a client.
  
  The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
  by the SHOW COMMAND and reported to a client through connectors. This led to
  problems in the ODBC connector and might lead to a user confusion.
  
  A new filed flag called ON_UPDATE_NOW_FLAG is added. 
  Constructors of the Field_timestamp set it when a field should be set to NOW
  on UPDATE.
  
  The get_schema_column_record function now reports whether a timestamp field
  will be set to NOW on UPDATE.

  client/mysql.cc@1.269.6.1, 2007-11-13 13:24:10+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The fieldflag2str function is adjusted to print the ON_UPDATE_NOW_FLAG.

  include/mysql_com.h@1.122.2.3, 2007-11-13 13:24:09+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    A new filed flag called ON_UPDATE_NOW_FLAG  is added.

  mysql-test/r/grant.result@1.83.1.1, 2007-11-13 13:23:34+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/information_schema.result@1.156.5.1, 2007-11-13 13:22:58+00:00, evgen@moonbone.local +4 -2
    A test case adjusted after fixing the bug#30081.

  mysql-test/r/log_tables.result@1.26.1.1, 2007-11-13 13:22:57+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/metadata.result@1.19, 2007-11-13 13:22:56+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_2myisam.result@1.61.2.1, 2007-11-13 13:22:41+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_3innodb.result@1.66.2.1, 2007-11-13 13:22:40+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_4heap.result@1.62.2.1, 2007-11-13 13:22:39+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_5merge.result@1.63.2.1, 2007-11-13 13:22:38+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/show_check.result@1.111.1.22, 2007-11-13 13:22:37+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_ranges.result@1.45.1.3, 2007-11-13 13:22:36+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_timestamp.result@1.37.1.2, 2007-11-13 13:22:29+00:00, evgen@moonbone.local +4 -4
    Adjusted a test case after fixing bug#30081.

  mysql-test/t/information_schema.test@1.100.5.1, 2007-11-13 13:21:58+00:00, evgen@moonbone.local +2 -1
    A test case adjusted after fixing the bug#30081.

  sql/field.cc@1.402.26.1, 2007-11-13 13:24:07+00:00, evgen@moonbone.local +4 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    Constructors of the Field_timestamp set the ON_UPDATE_NOW_FLAG on a field when
    it should be set to NOW on UPDATE.

  sql/sql_show.cc@1.415.20.1, 2007-11-13 13:24:02+00:00, evgen@moonbone.local +6 -3
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The get_schema_column_record function now reports whether a timestamp field
    will be set to NOW on UPDATE.

  tests/mysql_client_test.c@1.245.13.1, 2007-11-13 13:23:36+00:00, evgen@moonbone.local +1 -1
    A test case adjusted after fixing the bug#30081.

ChangeSet@1.2529.191.5, 2007-11-13 11:12:53+01:00, istruewing@stella.local +3 -0
  Bug#32091: Security breach via directory changes
  
  Post pushbuild fix
  
  Disabled test on windows due to bug#30459
  (DATA/INDEX DIR for partitions not working on windows)
  
  Patch from Mattias Jonsson.

  mysql-test/r/partition_mgm.result@1.14, 2007-11-13 11:12:51+01:00, istruewing@stella.local +0 -10
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_mgm.test@1.13, 2007-11-13 11:12:51+01:00, istruewing@stella.local +10 -9
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_symlink.test@1.2, 2007-11-13 11:12:51+01:00, istruewing@stella.local +2 -0
    Bug#32091: Security breach via directory changes
    
    Added no_windows, since it is affected of bug#30459

ChangeSet@1.2656.2.16, 2007-11-13 13:59:36+04:00, svoj@mysql.com +3 -0
  BUG#31296 - falcon does not remove associated tablespace file.
  
  When dropping a tablespace, falcon doesn't clean-up data files and
  in-memory data structures.

  mysql-test/suite/falcon/r/falcon_ts.result@1.3, 2007-11-13 13:59:34+04:00, svoj@mysql.com +4 -0
    A test case for BUG#31296.

  mysql-test/suite/falcon/t/falcon_ts.test@1.3, 2007-11-13 13:59:34+04:00, svoj@mysql.com +8 -0
    A test case for BUG#31296.

  storage/falcon/SRLDropTableSpace.cpp@1.1.1.1, 2007-11-13 13:59:34+04:00, svoj@mysql.com +1 -0
    When dropping a tablespace, foreground thread only removes a tablespace
    entry from system tables and adds appropriate event to the serial log.
    Tablespace data file is removed during commitSystemTransaction phase by
    TableSpaceManager::expungeTableSpace() function.
    
    When we enter SRLDropTableSpace::append, there is no SerialLogTransaction
    entry in the SerialLogTransaction hash for the SystemTransaction.
    
    During the commit phase, we also add an UpdateRecords event to the serial
    log. This is needed for the system table update described above. When
    the update record event is added to the serial log,
    SRLUpdateRecords::append() gets SerialLogTransaction element for current
    transaction from the SerialLogTransaction hash. As there is no element
    for current transaction, it creates new one and informs SerialLog that
    log for current transaction starts at the current offset, leaving
    SRLDropTableSpace event behind.
    
    As SRLDropTableSpace event is the first event written to the serial log
    during drop tablespace statement, inform serial log that transaction
    is started by calling log->getTransaction().

ChangeSet@1.2656.2.15, 2007-11-13 13:56:56+04:00, svoj@mysql.com +10 -0
  BUG#31114 - falcon : creating tablespace with same name twice returns
              Unknown error -103
  
  When creating a tablespace that already exists, falcon returns
  non-informative error message.

  mysql-test/suite/falcon/r/falcon_ts.result@1.2, 2007-11-13 13:56:54+04:00, svoj@mysql.com +4 -0
    A test case for BUG#31114.

  mysql-test/suite/falcon/t/falcon_ts.test@1.2, 2007-11-13 13:56:54+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31114.

  include/my_base.h@1.109.1.1, 2007-11-13 13:56:54+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  sql/share/errmsg.txt@1.113.2.1, 2007-11-13 13:56:54+04:00, svoj@mysql.com +2 -0
    Added "tablespace already exist" message.

  sql/sql_tablespace.cc@1.11.1.2, 2007-11-13 13:56:54+04:00, svoj@mysql.com +11 -11
    Added handling of HA_ERR_TABLESPACE_EXIST error.

  storage/falcon/SQLException.h@1.5, 2007-11-13 13:56:54+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  storage/falcon/Statement.cpp@1.4, 2007-11-13 13:56:54+04:00, svoj@mysql.com +1 -1
    Throw "tablespace already exists" error using appropriate error code.

  storage/falcon/StorageHandler.cpp@1.12, 2007-11-13 13:56:54+04:00, svoj@mysql.com +3 -1
    Check if TableSpaceManager got "tablespace already exists" error and
    return appropriate error code in this case.

  storage/falcon/StorageTableShare.h@1.6, 2007-11-13 13:56:54+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  storage/falcon/ha_falcon.cpp@1.26, 2007-11-13 13:56:54+04:00, svoj@mysql.com +2 -0
    Check if StorageHandler got "tablespace already exists" error and
    return appropriate error code in this case.

ChangeSet@1.1810.3459.1, 2007-11-13 11:39:52+02:00, gkodinov@magare.gmz +5 -0
  Bug #31562: HAVING and lower case
  
  The columns in HAVING can reference the GROUP BY and 
  SELECT columns. There can be "table" prefixes when
  referencing these columns. And these "table" prefixes
  in HAVING use the table alias if available.
  This means that table aliases are subject to the same
  storage rules as table names and are dependent on 
  lower_case_table_names in the same way as the table 
  names are.
  Fixed by :
  1. Treating table aliases as table names
  and make them lowercase when printing out the SQL
  statement for view persistence.
  2. Using case insensitive comparison for table 
  aliases when requested by lower_case_table_names

  mysql-test/r/lowercase_view.result@1.11.1.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +19 -2
    Bug #31562: test case

  mysql-test/t/lowercase_view.test@1.8, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +23 -0
    Bug #31562: test case

  sql/item.cc@1.113.102.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +1 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in GROUP BY

  sql/sql_base.cc@1.235.1.161, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +2 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in SELECT

  sql/sql_select.cc@1.312.178.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +14 -1
    Bug #31562: treat table aliases as table names
    and make them lowercase when printing

ChangeSet@1.2656.2.14, 2007-11-13 13:38:29+04:00, svoj@mysql.com +5 -0
  BUG#31110 - falcon: missing engine check while dropping tablespace
  
  Creating a tablespace with engine that doesn't support tablespaces
  reports a warning and succeedes doing nothing.
  
  With this fix such statement returns and error instead.
  
  Note that this problem is not actually related to falcon, but is
  generic server issue.

  mysql-test/suite/falcon/r/falcon_ts.result@1.1, 2007-11-13 13:38:27+04:00, svoj@mysql.com +2 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/r/falcon_ts.result@1.0, 2007-11-13 13:38:27+04:00, svoj@mysql.com +0 -0

  mysql-test/suite/falcon/t/falcon_ts.test@1.1, 2007-11-13 13:38:27+04:00, svoj@mysql.com +7 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/t/falcon_ts.test@1.0, 2007-11-13 13:38:27+04:00, svoj@mysql.com +0 -0

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.27.3.1, 2007-11-13 13:38:27+04:00, svoj@mysql.com +3 -7
    Modified a test case according to fix for BUG#31110.

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.18.1.1, 2007-11-13 13:38:27+04:00, svoj@mysql.com +3 -0
    Modified a test case according to fix for BUG#31110.

  sql/sql_tablespace.cc@1.11.1.1, 2007-11-13 13:38:27+04:00, svoj@mysql.com +4 -5
    Return an error (instead of warning) when engine doesn't support
    tablespaces.

ChangeSet@1.2529.193.2, 2007-11-13 10:25:22+01:00, istruewing@stella.local +1 -0
  Bug#32078 - Excessive warnings: One can only use the --user switch
              if running as root
  
  Every start of a server in the test suite raised that warning.
  
  The cause was an unconditionla add of the --user option to the
  server command line. Only the "root" user (effective user id == 0)
  must use that option.
  
  Added check for effective user id == 0 before adding --user.
  
  Thanks to Magnus Svensson for the patch.

  mysql-test/mysql-test-run.pl@1.122.102.3, 2007-11-13 10:25:20+01:00, istruewing@stella.local +3 -1
    Bug#32078 - Excessive warnings: One can only use the --user switch
                if running as root
    Added check for effective user id == 0 before adding --user
    in mysqld_arguments().

ChangeSet@1.2646.2.10, 2007-11-13 10:13:08+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  Post-merge fix

  sql/sql_parse.cc@1.708.4.1, 2007-11-13 10:13:06+01:00, istruewing@stella.local +0 -2
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Post-merge fix
    Removal of #ifndef NO_EMBEDDED_ACCESS_CHECKS missed in merge to 6.0.

ChangeSet@1.1810.3427.7, 2007-11-13 09:43:29+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Elimination of warning for unused function code_name() in non-debug mode.

  sql/log_event.cc@1.174.1.69, 2007-11-13 09:43:25+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Elimination of warning for unused function code_name() in non-debug mode.

ChangeSet@1.1810.3427.6, 2007-11-13 09:01:42+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixes to eliminate warnings.

  sql/log_event.cc@1.174.1.68, 2007-11-13 09:01:39+01:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Fixes to eliminate warnings.

ChangeSet@1.2529.120.50, 2007-11-13 09:41:59+04:00, holyfoot@mysql.com +2 -0
  test fixed

  mysql-test/r/partition_innodb.result@1.9, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +4 -3
    result fixed

  mysql-test/t/partition_innodb.test@1.8, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +3 -2
    number of subpartitions fixed

ChangeSet@1.2656.2.13, 2007-11-12 18:52:19-05:00, jas@rowvwade. +1 -0
  Change UINT to uint.  Boring.

  storage/falcon/ha_falcon.cpp@1.25, 2007-11-12 18:52:12-05:00, jas@rowvwade. +1 -1
    Change UINT to uint.  Boring.

ChangeSet@1.2656.2.12, 2007-11-12 18:12:58-05:00, jas@rowvwade. +5 -0
  Made configuration parameter "falcon_debug_mask" dynamically
  settable.

  storage/falcon/StorageHandler.cpp@1.11, 2007-11-12 18:12:49-05:00, jas@rowvwade. +4 -0
    Made configuration parameter "falcon_debug_mask" dynamically
    settable.

  storage/falcon/StorageHandler.h@1.9, 2007-11-12 18:12:49-05:00, jas@rowvwade. +1 -0
    Made configuration parameter "falcon_debug_mask" dynamically
    settable.

  storage/falcon/StorageParameters.h@1.16, 2007-11-12 18:12:50-05:00, jas@rowvwade. +1 -1
    Made configuration parameter "falcon_debug_mask" dynamically
    settable.

  storage/falcon/ha_falcon.cpp@1.24, 2007-11-12 18:12:50-05:00, jas@rowvwade. +10 -2
    Made configuration parameter "falcon_debug_mask" dynamically
    settable.

  storage/falcon/ha_falcon.h@1.5, 2007-11-12 18:12:50-05:00, jas@rowvwade. +1 -0
    Made configuration parameter "falcon_debug_mask" dynamically
    settable.

ChangeSet@1.1810.3427.5, 2007-11-12 22:02:12+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31793 (log event corruption causes crash):
  
  Corrections to get_str_len_and_pointer().

  sql/log_event.cc@1.174.1.67, 2007-11-12 22:02:05+01:00, mats@kindahl-laptop.dnsalias.net +37 -10
    Adding missing return at end of get_str_len_and_pointer()
    and correcting computation of missing bytes.

ChangeSet@1.2656.2.10, 2007-11-12 15:27:32-05:00, jas@rowvwade. +1 -0
  Don't continue after a failed initialize of the storage
  handler!

  storage/falcon/StorageHandler.cpp@1.10, 2007-11-12 15:27:24-05:00, jas@rowvwade. +16 -1
    Don't continue after a failed initialize of the storage
    handler!

ChangeSet@1.2603.54.1, 2007-11-12 23:00:43+04:00, gshchepa@gleb.loc +2 -0
  falcon_bugs.result, falcon_bugs.test:
    Updated test case (bug #27695).

  mysql-test/suite/falcon/r/falcon_bugs.result@1.2.1.1, 2007-11-12 23:00:09+04:00, gshchepa@gleb.loc +1 -3
    Updated test case (bug #27695).

  mysql-test/suite/falcon/t/falcon_bugs.test@1.2.1.1, 2007-11-12 22:58:52+04:00, gshchepa@gleb.loc +1 -3
    Updated test case (bug #27695).

ChangeSet@1.1616.3118.3, 2007-11-12 21:52:30+04:00, svoj@mysql.com +2 -0
  symlink.test, symlink.result:
    Use proper variable for test.

  mysql-test/r/symlink.result@1.11.1.17, 2007-11-12 21:51:47+04:00, svoj@mysql.com +3 -3
    Use proper variable for test.

  mysql-test/t/symlink.test@1.11.1.10, 2007-11-12 21:51:28+04:00, svoj@mysql.com +4 -4
    Use proper variable for test.

ChangeSet@1.2529.194.1, 2007-11-12 21:11:31+04:00, holyfoot@mysql.com +3 -0
  Bug #32067 Partitions: crash with timestamp column.
  
  Partition handler fails updating tables with partitioning
  based on timestamp field, as it calculates the timestamp field
  AFTER it calculates the number of partition of a record.
  
  Fixed by adding timestamp_field->set_time() call and disabling
  such consequent calls

  mysql-test/r/partition.result@1.68.8.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +5 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test result

  mysql-test/t/partition.test@1.62.9.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +21 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test case

  sql/ha_partition.cc@1.98.9.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +22 -6
    Bug #32067 Partitions: crash with timestamp column.
    
    do timestamp_field->set_time() in the ha_partition::update_row()

ChangeSet@1.2656.7.1, 2007-11-12 11:28:34-05:00, jas@fluffy.netfrastructure.com +1 -0
  Remove superfluous but erroneous assertion.

  storage/falcon/MemMgr.cpp@1.9.1.1, 2007-11-12 11:28:32-05:00, jas@fluffy.netfrastructure.com +0 -1
    Remove superfluous but erroneous assertion.

ChangeSet@1.2656.2.9, 2007-11-12 11:17:30-05:00, jas@rowvwade. +1 -0
  Remove superfluous but erroneous assertion.

  storage/falcon/MemMgr.cpp@1.10, 2007-11-12 11:17:22-05:00, jas@rowvwade. +0 -1
    Remove superfluous but erroneous assertion.

ChangeSet@1.2603.21.38, 2007-11-12 19:52:48+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32262: crash with decimal column.
  
  The server crashed on optimization of queries
  with a comparison of an indexed decimal column with
  a string value.

  mysql-test/r/range.result@1.64, 2007-11-12 19:47:15+04:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #32262.

  mysql-test/t/range.test@1.50, 2007-11-12 19:47:04+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32262.

  sql/opt_range.cc@1.293, 2007-11-12 19:46:56+04:00, gshchepa@gleb.loc +2 -0
    Fixed bug #32262.
    The check_quick_select function has been changed to
    check input parameter for NULL value.

ChangeSet@1.2529.172.3, 2007-11-12 17:26:32+03:00, anozdrin@station. +1 -0
  A patch for BUG#32172: information_schema test fails with
  wait_condition timeout.
  
  The problem was that the event thread didn't manage to execute
  the event in 30 seconds on highly-loaded box. The fix is to
  increase timeout.
  
  This is a fix for the test suite.

  mysql-test/t/information_schema.test@1.100.4.1, 2007-11-12 17:26:29+03:00, anozdrin@station. +1 -0
    Provide more time to execute an event.

ChangeSet@1.2529.162.3, 2007-11-12 14:51:14+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#31705 Partitions: crash if varchar length > 65530
  
  Buffer overflow due to wrong key length in partitioning
  
  Changed to the correct key_length function.

  mysql-test/r/partition_datatype.result@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +282 -0
    Bug#31705 Partitions: crash if varchar length > 65530
    New test-result case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length use)

  mysql-test/r/partition_datatype.result@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_datatype.test@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +213 -0
    Bug#31705 Partitions: crash if varchar length > 65530 
    New test case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length used)
    

  mysql-test/t/partition_datatype.test@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  sql/opt_range.cc@1.274.6.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +4 -6
    Bug#31705 Partitions: crash if varchar length > 65530
    Problem: buffer overflow due to wrong key-length
    
    Fix: Using correct key_length function

ChangeSet@1.2529.181.4, 2007-11-12 13:23:45+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#32091: Security breach via directory changes
  
  Merge fix
  
  partition_mgm did not require have_symlink.
  
  Moved the test case to partition_symlink, which
  require have_symlink, and should work on both *nix and
  Windows

  mysql-test/r/partition_mgm.result@1.13, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -82
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/r/partition_symlink.result@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +83 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/r/partition_symlink.result@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_mgm.test@1.12, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +2 -112
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/t/partition_symlink.test@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +119 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/t/partition_symlink.test@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

ChangeSet@1.2529.192.1, 2007-11-12 13:07:54+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                  partitioned table
      
  Post-pushbuild fix
      
  Pushbuild detected yet another need for lex initialization in
  embedded server.

  libmysqld/lib_sql.cc@1.136.2.2, 2007-11-12 13:07:52+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1616.3097.2, 2007-11-12 12:52:03+01:00, kent@mysql.com +2 -0
  bigint.test, bigint.result:
    Test case for Bug#30069

  mysql-test/r/bigint.result@1.23.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +6 -0
    Test case for Bug#30069

  mysql-test/t/bigint.test@1.22.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +9 -0
    Test case for Bug#30069

ChangeSet@1.2529.172.2, 2007-11-12 14:44:17+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31898: 16M memory allocations for user variables
  in stored procedure.
  
  The problem was that MySQL used unnecessarily large amounts of
  memory if user variables were used as an argument to CONCAT or
  CONCAT_WS -- 16M per each user variable used.
  
  Technically, it happened because MySQL used the following
  allocation strategy for string functions to avoid multiple
  realloc() calls: in the virtual operation fix_length_and_dec()
  the attribute max_length was calculated as a sum of max_length
  values for each argument.
  
  Although this approach worked well for small (or fixed) data types,
  there could be a problem if there as a user variable among
  the arguments of a string function -- max_length of the function
  would be 16M (as the max_length of a user variable is 16M).
  
  Both CONCAT() and CONCAT_WS() functions suffer from this problem.
  
  The fix is to do not use meta-data for allocating memory.
  The following strategy is proposed instead: allocate the exact
  length of the result string at the first record, double the amount
  of memory allocated when it is required.
  
  No test case for this bug because there is no way to test memory
  consumption in a robust way with our test suite.

  sql/item_strfunc.cc@1.325.1.6, 2007-11-12 14:44:15+03:00, anozdrin@station. +55 -5
    Implement memory-wise allocation strategy.

ChangeSet@1.1616.3118.2, 2007-11-12 15:15:16+04:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/r/symlink.result@1.11.1.16, 2007-11-12 15:15:15+04:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.2529.191.1, 2007-11-12 11:29:55+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding missing drop of user created for test case.

  mysql-test/r/mysqlbinlog.result@1.39, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.53, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Dropping user that was added earlier in the test.

ChangeSet@1.2529.190.1, 2007-11-12 14:26:09+04:00, holyfoot@mysql.com +4 -0
  'no innodb engine' test failure fixed

  mysql-test/r/partition.result@1.68.6.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -14
    test result fixed

  mysql-test/r/partition_innodb.result@1.8, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +12 -0
    test result fixed

  mysql-test/t/partition.test@1.62.8.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -11
    test moved to partition_innodb

  mysql-test/t/partition_innodb.test@1.7, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +11 -0
    test moved from partition.test

ChangeSet@1.1616.3117.1, 2007-11-12 13:00:22+04:00, holyfoot@mysql.com +4 -0
  Bug #31305 myisam tables crash when they are near capacity.
  
  When we insert a record into MYISAM table which is almost 'full',
  we first write record data in the free space inside a file, and then
  check if we have enough space after the end of the file.
  So if we don't have the space, table will left corrupted.
  Similar error also happens when we updata MYISAM tables.
  
  Fixed by modifying write_dynamic_record and update_dynamic_record functions
  to check for free space before writing parts of a record

  BitKeeper/etc/ignore@1.153.1.89, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +2 -0
    Added libmysql_r/client_settings.h libmysqld/ha_blackhole.cc to the ignore list

  mysql-test/r/almost_full.result@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/almost_full.result''

  mysql-test/r/almost_full.result@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  mysql-test/t/almost_full.test@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +41 -0
    New BitKeeper file ``mysql-test/t/almost_full.test''

  mysql-test/t/almost_full.test@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  myisam/mi_dynrec.c@1.36.3.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +68 -0
    Bug #31305 myisam tables crash when they are near capacity.
    
    now we check space left in table in write_dynamic_record
    and update_dynamic_record functions.
    If we don't have enough room for the new (updated) record, return with the
    error.

ChangeSet@1.2529.188.1, 2007-11-11 22:30:01+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
  Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash.
  
  Post-pushbuild fix
  
  Pushbuild genereted valgrind warnings.
  
  Changed function to safer variant.

  sql/sql_partition.cc@1.96.20.4, 2007-11-11 22:29:56+01:00, mattiasj@mattiasj-laptop.(none) +1 -1
    Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
        causes the Server to crash.
    
    Fix for valgrind warning in pushbuild.
    String.c_prt fcn is not as safe as comment says.
    (gives valgrind errors in this case)

ChangeSet@1.2529.171.8, 2007-11-11 20:38:28+01:00, istruewing@stella.local +3 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    
  Post-pushbuild fix
    
  Pushbuild detected a new need for lex initialization in
  embedded server.
  
  Fixed test for INSERT DELAYED in partitions_hash.test so that
  it works with embedded server.

  libmysqld/lib_sql.cc@1.136.2.1, 2007-11-11 20:38:26+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Initialized lex for later use in open_table().

  mysql-test/r/partition_hash.result@1.9, 2007-11-11 20:38:26+01:00, istruewing@stella.local +0 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test result for embedded server.

  mysql-test/t/partition_hash.test@1.11, 2007-11-11 20:38:26+01:00, istruewing@stella.local +3 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test for embedded server.

ChangeSet@1.2529.1.77, 2007-11-10 22:41:43+01:00, serg@janus.mylan +1 -0
  bad merge fixed

  sql/sql_class.h@1.384.15.1, 2007-11-10 22:41:40+01:00, serg@janus.mylan +0 -2
    bad merge fixed

ChangeSet@1.2529.185.2, 2007-11-10 21:51:47+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  add 5.1-specific test showing that 'const' access increments 'examined'
  counter in slow query log.

  mysql-test/r/log_tables.result@1.27, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +28 -0
    5.1-only test showing that 'const' access increments counters

  mysql-test/t/log_tables.test@1.24, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +31 -0
    5.1-only test showing that 'const' access increments counters

ChangeSet@1.2529.181.3, 2007-11-10 21:29:39+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  Changed test case from GRANT to CREATE USER

  mysql-test/r/partition_mgm.result@1.12, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.11, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    Changed test case from GRANT to CREATE USER

ChangeSet@1.1810.3453.1, 2007-11-10 23:44:48+04:00, gshchepa@gleb.loc +9 -0
  Fixed bug #28076: inconsistent binary/varbinary comparison.
  
  After adding an index the <VARBINARY> IN (SELECT <BINARY> ...)
  clause returned a wrong result: the VARBINARY value was illegally padded
  with zero bytes to the length of the BINARY column for the index search.
  (<VARBINARY>, ...) IN (SELECT <BINARY>, ... ) clauses are affected too.

  mysql-test/r/subselect.result@1.134.1.63, 2007-11-10 23:44:29+04:00, gshchepa@gleb.loc +49 -0
    Added test case for bug #28076.

  mysql-test/t/subselect.test@1.129.12.2, 2007-11-10 23:44:16+04:00, gshchepa@gleb.loc +42 -0
    Added test case for bug #28076.

  sql/item.cc@1.113.1.177, 2007-11-10 23:44:09+04:00, gshchepa@gleb.loc +12 -4
    Fixed bug #28076.
    The Item_cache_str::save_in_field method has been overloaded
    to check cached values for an illegal padding before the saving
    into a field.

  sql/item.h@1.183.1.63, 2007-11-10 23:44:11+04:00, gshchepa@gleb.loc +11 -3
    Fixed bug #28076.
    The Item_cache_str::is_varbinary flag has been added and the
    Item_cache_str::save_in_field method has been overloaded to prevent
    cached values from an illegal padding when saving in fields.
    The signature of the Item_cache::get_cache method has been
    changed to accept pointers to Item instead of Item_result
    values.

  sql/item_cmpfunc.cc@1.187.47.1, 2007-11-10 23:44:12+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The Item_in_optimizer::fix_left method has been modified to
    to call Item_cache::get_cache in a new manner.

  sql/item_subselect.cc@1.113.1.48, 2007-11-10 23:44:13+04:00, gshchepa@gleb.loc +12 -1
    Fixed bug #28076.
    The subselect_indexsubquery_engine::exec method has been
    modified to take into account field conversion errors
    (copy&paste from subselect_uniquesubquery_engine::exec).

  sql/sp_rcontext.cc@1.44.1.2, 2007-11-10 23:44:14+04:00, gshchepa@gleb.loc +3 -3
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method has been
    modified to call Item_cache::get_cache in a new manner.

  sql/sp_rcontext.h@1.36, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method signature
    has been modified to pass Item pointers to the
    Item_cache::get_cache method.

  sql/sql_class.cc@1.223.1.57, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The select_max_min_finder_subselect::send_data method has been
    modified to call Item_cache::get_cache in a new manner.

ChangeSet@1.2656.2.8, 2007-11-10 14:30:00-05:00, jas@rowvwade. +1 -0
  Use falcon_debug_mask when adding the handler log listener.

  storage/falcon/ha_falcon.cpp@1.23, 2007-11-10 14:29:52-05:00, jas@rowvwade. +1 -2
    Use falcon_debug_mask when adding the handler log listener.

ChangeSet@1.2656.2.7, 2007-11-10 14:20:31-05:00, jas@rowvwade. +1 -0
  Fix typo.

  storage/falcon/Log.cpp@1.3, 2007-11-10 14:20:24-05:00, jas@rowvwade. +8 -6
    Fix typo.

ChangeSet@1.2656.2.6, 2007-11-10 14:13:02-05:00, jas@rowvwade. +6 -0
  Don't generate status reports if no log listener is going to
  report them.  And don't format any messages unless there is a log
  listener that wants them.

  storage/falcon/Cache.cpp@1.40, 2007-11-10 14:12:52-05:00, jas@rowvwade. +8 -4
    Don't generate status reports if no log listener is going to
    report them.

  storage/falcon/Dbb.cpp@1.15, 2007-11-10 14:12:52-05:00, jas@rowvwade. +3 -0
    Don't generate status reports if no log listener is going to
    report them.

  storage/falcon/Log.cpp@1.2, 2007-11-10 14:12:52-05:00, jas@rowvwade. +34 -4
    Don't even format log messages if no listener is interested
    in hearing about them.

  storage/falcon/Log.h@1.2, 2007-11-10 14:12:53-05:00, jas@rowvwade. +3 -2
    Add method to determine whether there is an interested log
    listener or not.

  storage/falcon/SerialLog.cpp@1.24, 2007-11-10 14:12:53-05:00, jas@rowvwade. +8 -1
    Don't generate status reports if no log listener is going to
    report them.

  storage/falcon/TransactionManager.cpp@1.8, 2007-11-10 14:12:54-05:00, jas@rowvwade. +1 -5
    Don't generate status reports if no log listener is going to
    report them.

ChangeSet@1.1810.3451.2, 2007-11-10 21:39:30+04:00, ramil@mysql.com +2 -0
  compiler warnings fixed.

  sql/unireg.cc@1.53.11.3, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

  sql/ha_myisam.cc@1.147.25.1, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

ChangeSet@1.1810.3452.1, 2007-11-10 18:29:13+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  UNIQUE (eq-ref) lookups result in table being considered as a "constant" table.
  Queries that consist of only constant tables are processed in do_select() in a
  special way that doesn't invoke evaluate_join_record(), and therefore doesn't
  increase the counters join->examined_rows and join->thd->row_count.
  
  The patch increases these counters in this special case.
  
  NOTICE:
  This behavior seems to contradict what the documentation says in Sect. 5.11.4:
  "Queries handled by the query cache are not added to the slow query log, nor
  are queries that would not benefit from the presence of an index because the
  table has zero rows or one row."
  
  No test case in 5.0 as issue shows only in slow query log, and other counters
  can give subtly different values (with regard to counting in create_sort_index(),
  synthetic rows in ROLLUP, etc.).

  sql/sql_class.h@1.230.1.118, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +19 -4
    add documentation for some variables

  sql/sql_select.cc@1.312.176.1, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +9 -0
    Don't forget const tables when counting read records!

ChangeSet@1.2529.103.24, 2007-11-10 18:57:09+04:00, ramil@mysql.com +1 -0
  manual merge.

  mysql-test/r/ps.result@1.119.1.2, 2007-11-10 18:57:06+04:00, ramil@mysql.com +5 -0
    manual merge.

ChangeSet@1.1810.3430.3, 2007-11-10 18:27:57+04:00, ramil@mysql.com +3 -0
  manual merge.

  mysql-test/r/ps.result@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +5 -0
    manual merge.

  mysql-test/t/ps.test@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +10 -0
    manual merge.

  sql/item_timefunc.cc@1.100.36.2, 2007-11-10 18:27:56+04:00, ramil@mysql.com +26 -22
    manual merge.

ChangeSet@1.2529.181.2, 2007-11-10 14:56:21+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  small fix of test case (when running make test after
  merge, it did not substitute MYSQLTEST_VARDIR in
  the error)

  mysql-test/r/partition_mgm.result@1.11, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test result

  mysql-test/t/partition_mgm.test@1.10, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test case

ChangeSet@1.2529.171.7, 2007-11-10 14:36:25+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Post-merge fix
  
  A new need for lex initialization arose.

  sql/ha_ndbcluster.cc@1.408.64.3, 2007-11-10 14:36:23+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1810.3450.1, 2007-11-10 13:33:42+01:00, tnurnberg@mysql.com +4 -0
  Bug#31800: Date comparison fails with timezone and slashes for greater than comparison
  
  BETWEEN was more lenient with regard to what it accepted as a DATE/DATETIME
  in comparisons than greater-than and less-than were. ChangeSet makes < >
  comparisons similarly robust with regard to trailing garbage (" GMT-1")
  and "missing" leading zeros. Now all three comparators behave similarly
  in that they throw a warning for "junk" at the end of the data, but then
  proceed anyway if possible. Before < > fell back on a string- (rather than
  date-) comparison when a warning-condition was raised in the string-to-date
  conversion. Now the fallback only happens on actual errors, while warning-
  conditions still result in a warning being to delivered to the client.

  mysql-test/r/select.result@1.121.16.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +153 -7
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.
    Adjust older result as "2005-09-3a" is now correctly seen as
    "2005-09-3" + trailing garbage, rather than as "2005-09-30".

  mysql-test/t/select.test@1.102.14.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +72 -6
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.

  sql-common/my_time.c@1.19.17.4, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +16 -16
    correct/clarify date-related comments, particulary for check_date().
    doxygenize comment while at it.

  sql/item_cmpfunc.cc@1.187.46.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +38 -25
    get_date_from_str() no longer signals an error when all we had
    was a warning-condition -- and one we already gave the user a
    warning for at that. Preamble doxygenized.

ChangeSet@1.2529.183.1, 2007-11-10 13:09:18+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#29368: Modified error messages
  
  Problem: there was no standard syntax error when
           creating partitions with syntax error in
           the partitioning clause.
  
  Solution: added "Syntax error: " to the error message

  mysql-test/r/partition.result@1.68.7.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result update

  mysql-test/r/partition_error.result@1.16, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +12 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result

  mysql-test/t/partition_error.test@1.18, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +13 -0
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test case

  sql/share/errmsg.txt@1.80.69.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +3 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    Modified error messages

ChangeSet@1.1810.3435.5, 2007-11-09 18:27:20-07:00, tsmith@ramayana.hindu.god +2 -0
  Fix Windows build problems.

  libmysql/CMakeLists.txt@1.1.6.1, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mysys/mf_arr_appstr.c source file

  mysys/default.c@1.72.1.19, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +7 -7
    Fix some bad code that caused warnings on Windows

ChangeSet@1.2529.181.1, 2007-11-09 23:22:00+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#32091: Security breach via directory changes
  
  Problem: the table's INDEX and DATA DIR was taken
    directly from the table's first partition.
    This allowed rename attack similar to
    bug#32111 when ALTER TABLE REMOVE PARTITIONING
  
  Solution: Silently ignore the INDEX/DATA DIR
    for the table. (Like some other storage engines
    do). 
    Partitioned tables do not support DATA/INDEX
    DIR on the table level, only on its partitions.

  mysql-test/r/partition_mgm.result@1.10, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +81 -0
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.9, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +111 -2
    Bug#32091: Security breach via directory changes
    test case

  sql/ha_partition.cc@1.98.1.10, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
    Bug#32091: Security breach via directory changes
    
    Do not use the first partition's DATA/INDEX DIR
    as the table's DATA/INDEX DIR.
    (A partitioned table do not have support for DATA/
    INDEX DIR, only its partitions do)

ChangeSet@1.2656.1.3, 2007-11-09 22:09:25+01:00, mleich@five.local.lan +2 -0
  Post merge fix for
     ChangeSet@1.2529.112.11, 2007-11-09
     (fixing Bug 32153 Status output differs - scheduling ?)
  The modifications here
  - conform to the differences in PROCESSLIST content found
    by comparison between r/sp-threads.result in 5.1 and 6.0
  - fix
    Bug#32233 NULL "state" field of SHOW PROCESSLIST makes tests fail

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.3, 2007-11-09 22:09:24+01:00, mleich@five.local.lan +6 -6
    Updates results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.3, 2007-11-09 22:09:24+01:00, mleich@five.local.lan +6 -6
    Updates results

ChangeSet@1.1810.3437.4, 2007-11-09 19:12:12+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32202: ORDER BY not working with GROUP BY
  
  The bug is a regression introduced by the fix for bug30596. The problem
  was that in cases when groups in GROUP BY correspond to only one row,
  and there is ORDER BY, the GROUP BY was removed and the ORDER BY
  rewritten to ORDER BY <group_by_columns> without checking if the
  columns in GROUP BY and ORDER BY are compatible. This led to
  incorrect ordering of the result set as it was sorted using the
  GROUP BY columns. Additionaly, the code discarded ASC/DESC modifiers
  from ORDER BY even if its columns were compatible with the GROUP BY
  ones.
  
  This patch fixes the regression by checking if ORDER BY columns form a
  prefix of the GROUP BY ones, and rewriting ORDER BY only in that case,
  preserving the ASC/DESC modifiers. That check is sufficient, since the
  GROUP BY columns contain a unique index.

  mysql-test/r/group_by.result@1.69.1.12, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +65 -0
    Added a test case for bug #32202.

  mysql-test/t/group_by.test@1.59.1.7, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +35 -0
    Added a test case for bug #32202.

  sql/sql_select.cc@1.312.175.1, 2007-11-09 19:12:10+03:00, kaa@polly.(none) +12 -3
    In cases when groups in GROUP BY correspond to only one row and there
    is ORDER BY, rewrite the query to ORDER BY <group_by_columns> only if
    the columns in ORDER BY and GROUP BY are compatible, i.e. either one
    forms a prefix for another.

ChangeSet@1.2656.2.3, 2007-11-09 09:06:30-06:00, klewis@klewis-mysql. +9 -0
  Move the rest of the UINT and BOOL settings to StorageParameter.h
  Add a hndlerton interface for consistent snapshot
  which is used by the backup code.
  Set default for falcon_serial_log_buffers to 20.
  Falcon_debug_server if OFF by default.

  mysql-test/suite/falcon/r/falcon_options.result@1.12, 2007-11-09 09:05:55-06:00, klewis@klewis-mysql. +3 -3
    Set default for falcon_serial_log_buffers to 20.

  mysql-test/suite/falcon/r/falcon_options2.result@1.11, 2007-11-09 09:05:59-06:00, klewis@klewis-mysql. +4 -4
    Set default for falcon_serial_log_buffers to 20.
    Falcon_debug_server if OFF by default.

  storage/falcon/Configuration.cpp@1.11, 2007-11-09 09:06:01-06:00, klewis@klewis-mysql. +8 -11
    Move the rest of the UINT and BOOL settings to StorageParameter.h

  storage/falcon/StorageHandler.cpp@1.9, 2007-11-09 09:06:03-06:00, klewis@klewis-mysql. +16 -0
    Add a hndlerton interface for consistent snapshot
    which is used by the backup code.

  storage/falcon/StorageHandler.h@1.8, 2007-11-09 09:06:05-06:00, klewis@klewis-mysql. +1 -0
    Add a hndlerton interface for consistent snapshot
    which is used by the backup code.

  storage/falcon/StorageParameters.h@1.15, 2007-11-09 09:06:07-06:00, klewis@klewis-mysql. +14 -4
    Move the rest of the UINT and BOOL settings to StorageParameter.h

  storage/falcon/Thread.h@1.5, 2007-11-09 09:06:09-06:00, klewis@klewis-mysql. +2 -1
    Cleanup

  storage/falcon/ha_falcon.cpp@1.22, 2007-11-09 09:06:11-06:00, klewis@klewis-mysql. +19 -72
    Move the rest of the UINT and BOOL settings to StorageParameter.h
    Add a hndlerton interface for consistent snapshot
    which is used by the backup code.

  storage/falcon/ha_falcon.h@1.4, 2007-11-09 09:06:13-06:00, klewis@klewis-mysql. +1 -0
    Add a hndlerton interface for consistent snapshot
    which is used by the backup code.

ChangeSet@1.2529.157.11, 2007-11-09 14:08:12+01:00, mleich@five.local.lan +3 -0
  Fix for
     Bug#32153 Status output differs - scheduling ?
  Modifications:
  1. Introduce additional poll routines + adjust queries 
     as fixes for Bug#32153 and another non reported bug
     found during stability testing
  2. Replace builtin poll routines by wait_condition.inc.
  3. Update the comments

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +54 -69
    Fixes, details are in changeset comment

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

ChangeSet@1.1810.3427.3, 2007-11-09 13:43:09+01:00, mats@capulet.net +4 -0
  BUG#31793 (log event corruption causes crash):
  
  When running mysqlbinlog on a 64-bit machine with a corrupt relay log,
  it causes mysqlbinlog to crash. In this case, the crash is caused
  because a request for 18446744073709534806U bytes is issued, which
  apparantly can be served on a 64-bit machine (speculatively, I assume)
  but this causes the memcpy() issued later to copy the data to segfault.
  
  The request for the number of bytes is caused by a computation
  of data_len - server_vars_len where server_vars_len is corrupt in such
  a sense that it is > data_len. This causes a wrap-around, with the
  the data_len given above.
  
  This patch adds a check that if server_vars_len is greater than
  data_len before the substraction, and aborts reading the event in
  that case marking the event as invalid. It also adds checks to see
  that reading the server variables does not go outside the bounds
  of the available space, giving a limited amount of integrity check.

  mysql-test/r/mysqlbinlog.result@1.25.1.12, 2007-11-09 13:43:07+01:00, mats@capulet.net +1 -0
    Result change.

  mysql-test/std_data/corrupt-relay-bin.000624@1.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +2033 -0
    BitKeeper file /home/mats/devel/b31793-mysql-5.0-rpl/mysql-test/std_data/corrupt-relay-bin.000624

  mysql-test/std_data/corrupt-relay-bin.000624@1.0, 2007-11-09 13:43:07+01:00, mats@capulet.net +0 -0

  mysql-test/t/mysqlbinlog.test@1.21.1.30, 2007-11-09 13:43:07+01:00, mats@capulet.net +4 -0
    Adding test that it fails gracefully for a corrupt relay log.

  sql/log_event.cc@1.174.21.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +84 -11
    Adding check that status var length does not cause wrap-around
    when performing subtraction. Extending get_str_len_and_pointer() to
    check that the string can actually be read without reading outside
    bounds. Adding checks when reading server variables from the Query-
    log_event so that the variable can really be read. Abort reading
    and mark the event as invalid otherwise.

ChangeSet@1.1616.3094.10, 2007-11-09 16:05:01+04:00, svoj@mysql.com +3 -0
  BUG#29083 - test suite times out on OS X 64bit - also in older releases
  
  The "mysql client in mysqld"(which is used by
  replication and federated) should use alarms instead of setting
  socket timeout value if the rest of the server uses alarm. By
  always calling 'my_net_set_write_timeout'
  or 'net_set_read_timeout' when changing the timeout value(s), the
  selection whether to use alarms or timeouts will be handled by
  ifdef's in those two functions.
  
  This is minimal backport of patch for BUG#26664, which was pushed
  to 5.0 and up.
  
  Affects 4.1 only.

  include/mysql_com.h@1.67.1.43, 2007-11-09 16:05:01+04:00, svoj@mysql.com +5 -0
    Move the net_set_*_timeout function declarations to mysql_com.h

  sql-common/client.c@1.46.9.2, 2007-11-09 16:05:01+04:00, svoj@mysql.com +2 -4
     Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql/mysql_priv.h@1.186.91.64, 2007-11-09 16:05:01+04:00, svoj@mysql.com +0 -3
    Move the net_set_*_timeout function declarations to mysql_com.h

ChangeSet@1.1810.3448.1, 2007-11-09 13:29:43+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32020: loading udfs while --skip-grant-tables is enabled
  causes out of memory errors
  
  The code in mysql_create_function() and mysql_drop_function() assumed
  that the only reason for UDFs being uninitialized at that point is an
  out-of-memory error during initialization. However, another possible 
  reason for that is the --skip-grant-tables option in which case UDF 
  initialization is skipped and UDFs are unavailable.
  
  The solution is to check whether mysqld is running with
  --skip-grant-tables and issue a proper error in such a case.

  mysql-test/r/skip_grants.result@1.10.1.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +5 -0
    Added a test case for bug #32020.

  mysql-test/t/skip_grants.test@1.6.1.7, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +12 -0
    Added a test case for bug #32020.

  sql/sql_udf.cc@1.45.7.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +10 -2
    Issue a proper error when a user tries to CREATE/DROP a UDF 
    on a server running with the --skip-grant-tables option.

ChangeSet@1.2529.103.22, 2007-11-09 11:16:47+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32217 rpl_ssl fails with different number of records on master and slave
   - Add debug queries

  mysql-test/suite/rpl/t/rpl_ssl.test@1.12, 2007-11-09 11:16:44+01:00, msvensson@pilot.mysql.com +10 -0
    Add additional queries to run when we detect that the number of queries between slave and master differs

ChangeSet@1.2529.133.17, 2007-11-09 11:02:51+01:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#31552 (Replication breaks when deleting rows from out-of-sync table without PK):
  
  Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.8, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +31 -5
    Adding test to see that no error is given on slave when deleting
    rows that don't exist on table without primary key.

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.6, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

ChangeSet@1.2529.133.16, 2007-11-09 09:13:47+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing some tests to make the replication team tree green.

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +17 -12
    Result change.

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +15 -10
    Adding ORDER BY to avoid order dependencies.
    Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
    Dropping procedures that polluted later test results.

ChangeSet@1.2529.180.1, 2007-11-09 10:10:15+02:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #31170 rpl_innodb_bug28430 fails: varying timing, ports, and log use
  
  Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
  by means of using the standard include-macro.
  
  The masked-out parameters are not needed by the logics of the original
  tests. What is need to demonstre that replication is not stopped remains.
  

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.3.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +8 -8
    results changed

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.3.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +1 -2
    using the standard macro that takes care of masking out env specific values
     

ChangeSet@1.2529.179.1, 2007-11-08 13:43:40+01:00, jperkin@production.mysql.com +1 -0
  Remove the --source-install option and instead make use of --srcdir
  to install system tables directly from the source tree (useful for
  testing purposes).  This helps clean the script up a lot and clarify
  the three possible ways the script can be called (using compiled-in
  paths, passing --basedir pointing to alternative install location,
  or --srcdir).  Include further tidying as well.
    
  This fixes bug#30759.

  scripts/mysql_install_db.sh@1.88, 2007-11-08 13:42:01+01:00, jperkin@production.mysql.com +69 -69
    Re-order the logic in printing messages at the end of the
    script, to make it clearer which paths are taken depending
    on tests or outcome of command status.  Tidy some output.

  scripts/mysql_install_db.sh@1.87, 2007-11-07 18:38:36+01:00, jperkin@production.mysql.com +59 -108
    Remove the --source-install argument and re-implement similar
    functionality by expanding the --srcdir option
      - rename missing_in_basedir to cannot_find_file and use it
        to report on missing files in --srcdir too
      - merge --windows configuration into --srcdir where it is
        better placed.  All --windows usage uses --srcdir
        anyway, so effectively a nop.
      - use cannot_find_file for more file tests

  scripts/mysql_install_db.sh@1.86, 2007-11-07 15:50:02+01:00, jperkin@production.mysql.com +4 -4
    Update and clarify some comments.

  scripts/mysql_install_db.sh@1.85, 2007-11-07 14:58:11+01:00, jperkin@production.mysql.com +2 -2
    Use consistent test style throughout the script.

  scripts/mysql_install_db.sh@1.84, 2007-11-07 14:55:10+01:00, jperkin@production.mysql.com +1 -7
    Initialise $ldata early, reduce code.

ChangeSet@1.2529.133.14, 2007-11-08 09:25:03+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixing test case to not print warnings causing a result mismatch for rpl_trigger.

  mysql-test/suite/rpl/t/rpl_trigger.test@1.14, 2007-11-08 09:24:52+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
    Disabling warnings to prevent different result files for
    MIXED and STATEMENT mode.

ChangeSet@1.2603.37.32, 2007-11-07 23:33:35-06:00, klewis@klewis-mysql. +3 -0
  Turn off default use of Deferred Index Hash.  
  It still has random crashes on Pushbuild.

  mysql-test/suite/falcon/r/falcon_options.result@1.11, 2007-11-07 23:33:06-06:00, klewis@klewis-mysql. +2 -2
    Turn off default use of Deferred Index Hash.  
    It still has random crashes on Pushbuild.

  mysql-test/suite/falcon/r/falcon_options2.result@1.10, 2007-11-07 23:33:27-06:00, klewis@klewis-mysql. +2 -2
    Turn off default use of Deferred Index Hash.  
    It still has random crashes on Pushbuild.

  storage/falcon/StorageParameters.h@1.14, 2007-11-07 23:33:29-06:00, klewis@klewis-mysql. +1 -1
    Turn off default use of Deferred Index Hash.  
    It still has random crashes on Pushbuild.

ChangeSet@1.1810.3447.1, 2007-11-08 06:08:44+01:00, tnurnberg@mysql.com +4 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
  This happened because DATE-cast object did not overload get_time() method
  in superclass Item. The default method was inappropriate here and
  misinterpreted the data.
  
  Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
  on NULL input, 0 otherwise. This coincides with the way DATE-columns
  behave.

  mysql-test/r/cast.result@1.39.1.14, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +24 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/t/cast.test@1.31.1.7, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +22 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  sql/item_timefunc.cc@1.100.35.1, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-cast object to overload
    the method in Item superclass that would return spurious
    results. Return zero-result; flag NULL if input was NULL.

  sql/item_timefunc.h@1.63.5.5, 2007-11-08 06:08:43+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.1810.3446.1, 2007-11-07 15:23:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Bug #20748: Configuration files should not be read more than once
  
  A user could not override system-wide settings in their ~/.my.cnf,
  because the DEFAULT_SYSCONFDIR was being searched last.  Also, in
  some configurations (especially when the --sysconfdir compile-time
  option is set to /etc or /etc/mysql), the system-wide my.cnf file
  was read multiple times, causing confusion and potential problems.
  
  Rearrange default directories to conform to the manual and logic.
  Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
  directory to the middle of the list.  $HOME/.my.cnf should be last,
  so the user is able to override the system-wide settings.
  
  Change init_default_directories() to remove duplicates from the
  list.

  include/my_sys.h@1.178.15.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +2 -0
    Add array_append_string_unique(), from mf_arr_appstr.c

  libmysql/Makefile.shared@1.68.2.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.lo object

  mysys/CMakeLists.txt@1.1.6.3, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/Makefile.am@1.62.1.15, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/default.c@1.72.1.18, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +129 -63
    Change order in which defaults files are added to default_directories,
    in order to conform to the manual (and to common sense).  This fixes
    a particularly bad problem on Unix, where ~/.my.cnf was read before
    /usr/local/etc/my.cnf.
    
    Also, don't add duplicate entries; move the existing entry to the
    end of the list instead.
    
    
    Here is a comparison of the order of defaults files, BEFORE and AFTER
    this patch.
    
    On Windows:
    
    BEFORE:  C:\, GetWindowsDirectory(), GetSystemWindowsDirectory(),
             $MYSQL_HOME, defaults-extra-file, INSTALLDIR
    
    AFTER:  GetSystemWindowsDirectory(), GetWindowsDirectory(), C:\,
            INSTALLDIR, $MYSQL_HOME, defaults-extra-file
    
    GetSystemWindowsDirectory() is moved before GetWindowsDirectory() because
    the former is shared by all Terminal Services users, while the latter is
    private for each user.
    
    
    On Netware (no change):
    
    BEFORE:  sys:/etc/, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  sys:/etc, $MYSQL_HOME, defaults-extra-file
    
    
    On OS/2:
    
    BEFORE:  $ETC, /etc, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  /etc, $ETC, $MYSQL_HOME, defaults-extra-file
    
    
    On everything else (general Unix):
    
    BEFORE:  /etc, $MYSQL_HOME, defaults-extra-file, ~/, --sysconfdir
    
    AFTER:  /etc/, --sysconfdir, $MYSQL_HOME, defaults-extra-file, ~/
    
    The BEFORE code added --sysconfdir on all systems, but only the
    Unix build system actually defined a value for it.

  mysys/mf_arr_appstr.c@1.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +61 -0
    BitKeeper file /home/tsmith/m/bk/build/50-b20748/mysys/mf_arr_appstr.c

  mysys/mf_arr_appstr.c@1.0, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +0 -0

ChangeSet@1.2603.37.31, 2007-11-07 16:13:56-06:00, klewis@klewis-mysql. +4 -0
  Add new option and if there are no entries in the DIHash, check the DIs

  mysql-test/suite/falcon/r/falcon_options.result@1.10, 2007-11-07 16:13:43-06:00, klewis@klewis-mysql. +2 -0
    Add new option

  mysql-test/suite/falcon/r/falcon_options2.result@1.9, 2007-11-07 16:13:46-06:00, klewis@klewis-mysql. +4 -0
    Add new option

  mysql-test/suite/falcon/t/falcon_options2.test@1.4, 2007-11-07 16:13:48-06:00, klewis@klewis-mysql. +1 -0
    Add new option

  storage/falcon/Index.cpp@1.8, 2007-11-07 16:13:50-06:00, klewis@klewis-mysql. +3 -1
    If there are no entries in the DIHash, check the DIs

ChangeSet@1.2529.177.1, 2007-11-07 12:59:22-07:00, tsmith@ramayana.hindu.god +1 -0
  Cast away compiler warning on Windows.

  storage/innobase/handler/ha_innodb.cc@1.257.55.8, 2007-11-07 12:59:20-07:00, tsmith@ramayana.hindu.god +1 -1
    Cast away a compiler warning; some functions return ulong or ulint for
    errors, and some use int.  Let's hope these all fit in an int.

ChangeSet@1.2529.133.13, 2007-11-07 18:12:21+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Second attempt at getting rid of warnings in replication tree.

  sql/log_event.cc@1.271.45.5, 2007-11-07 18:12:13+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Second attempt at getting rid of warnings in replication tree.

ChangeSet@1.2603.53.1, 2007-11-07 17:17:58+01:00, hakank@au0012. +1 -0
  Fixed a gcc warning.

  storage/falcon/Cache.cpp@1.39, 2007-11-07 17:17:53+01:00, hakank@au0012. +1 -1
    Fixed a gcc warning.

ChangeSet@1.2603.37.30, 2007-11-07 10:13:04-06:00, klewis@klewis-mysql. +7 -0
  Add parameter to turn on or off the use of DIHash.  Turn it on.
  Also, make sure the syncDIHash is always locked before the
  DeferredIndex::syncObject

  storage/falcon/Configuration.cpp@1.10, 2007-11-07 10:11:06-06:00, klewis@klewis-mysql. +11 -4
    Add parameter to turn on or off the use of DIHash

  storage/falcon/Configuration.h@1.7, 2007-11-07 10:11:19-06:00, klewis@klewis-mysql. +1 -0
    Add parameter to turn on or off the use of DIHash

  storage/falcon/DeferredIndex.cpp@1.2.1.1, 2007-11-07 10:11:30-06:00, klewis@klewis-mysql. +18 -7
    Add parameter to turn on or off the use of DIHash.
    Also, make sure the syncDIHash is always locked before the
    DeferredIndex::syncObject

  storage/falcon/Index.cpp@1.7, 2007-11-07 10:11:42-06:00, klewis@klewis-mysql. +9 -10
    Add parameter to turn on or off the use of DIHash

  storage/falcon/StorageParameters.h@1.13, 2007-11-07 10:11:51-06:00, klewis@klewis-mysql. +10 -9
    Add parameter to turn on or off the use of DIHash

  storage/falcon/Thread.h@1.1.1.1, 2007-11-07 10:12:00-06:00, klewis@klewis-mysql. +1 -1
    Add parameter to turn on or off the use of DIHash

  storage/falcon/ha_falcon.cpp@1.21, 2007-11-07 10:12:10-06:00, klewis@klewis-mysql. +20 -15
    Add parameter to turn on or off the use of DIHash

ChangeSet@1.2529.176.1, 2007-11-07 19:59:58+04:00, ramil@mysql.com +6 -0
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
  
  Problems: 
    1. ALTER TABLE ... ORDER BY... doesn't make sence if there's a 
       user-defined clustered index in the table.
    2. using a secondary index is slower than using a clustered one 
       for a table scan.
  
  Fixes:
    1. raise a warning.
    2. use the clustered index.

  mysql-test/include/mix1.inc@1.56.3.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +8 -0
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - test case.

  mysql-test/r/innodb.result@1.165.20.1, 2007-11-07 19:59:56+04:00, ramil@mysql.com +15 -15
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/innodb_mysql.result@1.24.30.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +13 -8
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/join_outer_innodb.result@1.2.1.1, 2007-11-07 19:59:56+04:00, ramil@mysql.com +2 -2
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  sql/sql_select.cc@1.541.1.28, 2007-11-07 19:59:56+04:00, ramil@mysql.com +9 -1
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - use the clustered index for a table scan (if any) as it's faster than
        using a secondary index.

  sql/sql_table.cc@1.388.61.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +28 -16
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - ALTER TABLE ... ORDER BY doesn't make sence if there's a 
        user-defined clustered index in the table. Ignore it in such cases
        and raise a warning.

ChangeSet@1.1616.3116.1, 2007-11-07 18:45:04+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32103: optimizer crash when join on int and mediumint with
  variable in where clause.
  
  Problem: the new_item() method of Item_uint used an incorrect
  constructor. "new Item_uint(name, max_length)" calls
  Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
  first argument to be the string representation of the value, not the
  item's name. This could result in either a server crash or incorrect
  results depending on usage scenarios.
  
  Fixed by using the correct constructor in new_item():
  Item_uint::Item_uint(const char *str_arg, longlong i, uint length).

  mysql-test/r/select.result@1.34.3.42, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +8 -0
    Added a test case for bug #32103.

  mysql-test/t/select.test@1.28.4.17, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +21 -0
    Added a test case for bug #32103.

  sql/item.h@1.56.1.142, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +1 -1
    Use the correct constructor for Item_uint in Item_uint::new_item().

ChangeSet@1.2529.133.11, 2007-11-07 15:23:57+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Adding return value, which is not used, and wrapped debug function in
  DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

  sql/log_event.cc@1.271.45.4, 2007-11-07 15:23:49+01:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding return value, which is not used, and wrapped debug function in
    DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

ChangeSet@1.2603.21.30, 2007-11-07 15:10:06+02:00, timour@linux-h5lp.site +1 -0
  WL#1110: Subquery optimization: materialization

  mysql-test/r/subselect_no_mat.result@1.2, 2007-11-07 15:09:57+02:00, timour@linux-h5lp.site +11 -0
    Post-merge correction.

ChangeSet@1.2603.51.1, 2007-11-07 15:12:56+03:00, kaa@polly.(none) +2 -0
  6.0 version of the fix for bug #25421: MySQL threads don't respond to 
  the kill command.
  
  Calculating the estimated number of records for a range scan may take a
  significant time, and it was impossible for a user to interrupt that
  process by killing the connection or the query.
  
  Fixed by checking the thread's 'killed' status in 
  handler::multi_range_read_info_const() and interrupting the calculation 
  process if it is set to a non-zero value. The same must also be done in
  every derived class that overrides multi_range_read_info_const().

  sql/ha_ndbcluster.cc@1.506.1.1, 2007-11-07 15:12:52+03:00, kaa@polly.(none) +7 -0
    Added a check for thd->killed to ha_ndbcluster::multi_range_read_info_const().

  sql/handler.cc@1.251.1.3, 2007-11-07 15:12:53+03:00, kaa@polly.(none) +10 -0
    Added a check for thd->killed to handler::multi_range_read_info_const().

ChangeSet@1.2529.175.1, 2007-11-07 15:08:50+03:00, kaa@polly.(none) +1 -0
  Fix for bug #25421: MySQL threads don't respond to the kill command
  
  Calculating the estimated number of records for a range scan may take a
  significant time, and it was impossible for a user to interrupt that
  process by killing the connection or the query.
  
  Fixed by checking the thread's 'killed' status in check_quick_keys() and
  interrupting the calculation process if it is set to a non-zero value.

  sql/opt_range.cc@1.274.5.1, 2007-11-07 15:08:44+03:00, kaa@polly.(none) +3 -0
    Check the thread's 'killed' status in check_quick_keys() and
    interrupt the calculation process if it is set to a non-zero value.

ChangeSet@1.1810.3418.2, 2007-11-07 14:00:45+03:00, kaa@polly.(none) +3 -0
  Fix for bug #30666: Incorrect order when using range conditions on 2
  tables or more
  
  The problem was that the optimizer used the join buffer in cases when
  the result set is ordered by filesort. This resulted in the ORDER BY
  clause being ignored, and the records being returned in the order
  determined by the order of matching records in the last table in join.
  
  Fixed by relaxing the condition in make_join_readinfo() to take
  filesort-ordered result sets into account, not only index-ordered ones.

  mysql-test/r/select.result@1.121.14.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +39 -0
    Added a test case for bug #30666.

  mysql-test/t/select.test@1.102.12.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +36 -0
    Added a test case for bug #30666.

  sql/sql_select.cc@1.312.174.1, 2007-11-07 14:00:42+03:00, kaa@polly.(none) +3 -4
    Relaxed the condition to determine when the join buffer usage must be
    disabled. The condition is now true for cases when the result set is
    ordered by filesort, that is when 'join->order &&
    !join->skip_sort_order' is true.

ChangeSet@1.2603.50.1, 2007-11-07 12:43:41+02:00, timour@lamia.mysql.com +9 -0
  WL#1110: Subquery optimization: materialization
  
  Additional tests for materialized subqueries.
  Tests that cover the truth table of the IN predicate.

  BitKeeper/etc/ignore@1.296.2.1, 2007-11-07 12:43:37+02:00, timour@lamia.mysql.com +7 -0
    Added storage/archive/archive_performance storage/archive/concurrency_test libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc mysql-test/dump.txt to the ignore list

  mysql-test/r/subselect.result@1.189.1.1, 2007-11-07 12:43:36+02:00, timour@lamia.mysql.com +196 -0
    Added tests that cover the complete truth table for IN
    both when it is top-level or not.

  mysql-test/r/subselect_mat.result@1.7, 2007-11-07 12:43:36+02:00, timour@lamia.mysql.com +592 -143
    Added many new tests for WL#1110.

  mysql-test/r/subselect_no_mat.result@1.1, 2007-11-07 12:38:17+02:00, timour@lamia.mysql.com +4366 -0
    BitKeeper file /home/tkatchaounov/mysql/src/6.0-1110/mysql-test/r/subselect_no_mat.result

  mysql-test/r/subselect_no_mat.result@1.0, 2007-11-07 12:38:17+02:00, timour@lamia.mysql.com +0 -0

  mysql-test/r/subselect_no_opts.result@1.4.1.1, 2007-11-07 12:43:36+02:00, timour@lamia.mysql.com +196 -0
    Added tests that cover the complete truth table for IN
    both when it is top-level or not.

  mysql-test/r/subselect_no_semijoin.result@1.4.1.1, 2007-11-07 12:43:36+02:00, timour@lamia.mysql.com +196 -0
    Added tests that cover the complete truth table for IN
    both when it is top-level or not.

  mysql-test/t/subselect.test@1.160.2.1, 2007-11-07 12:43:36+02:00, timour@lamia.mysql.com +177 -0
    Added tests that cover the complete truth table for IN
    both when it is top-level or not.

  mysql-test/t/subselect_mat.test@1.7, 2007-11-07 12:43:37+02:00, timour@lamia.mysql.com +295 -113
    Added many new tests for WL#1110.

  mysql-test/t/subselect_no_mat.test@1.1, 2007-11-07 12:38:07+02:00, timour@lamia.mysql.com +11 -0
    BitKeeper file /home/tkatchaounov/mysql/src/6.0-1110/mysql-test/t/subselect_no_mat.test

  mysql-test/t/subselect_no_mat.test@1.0, 2007-11-07 12:38:07+02:00, timour@lamia.mysql.com +0 -0

ChangeSet@1.1616.3115.1, 2007-11-07 12:55:28+04:00, svoj@mysql.com +7 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  
  With certain data sets (when compressed record length gets bigger than
  uncompressed) myisamchk --unpack may corrupt data file.
  
  Fixed that record length was wrongly restored from compressed table.

  mysql-test/mysql-test-run.pl@1.8.20.16, 2007-11-07 12:55:27+04:00, svoj@mysql.com +15 -0
    Environment variables to execute myisamchk and myisampack.

  mysql-test/r/myisampack.result@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/myisampack.result''

  mysql-test/r/myisampack.result@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  mysql-test/t/myisampack.test@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +33 -0
    New BitKeeper file ``mysql-test/t/myisampack.test''

  mysql-test/t/myisampack.test@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  myisam/mi_check.c@1.105.1.59, 2007-11-07 12:55:27+04:00, svoj@mysql.com +21 -18
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.
    
    Still, it is not doable with parallel repair, as it allocates needed
    record buffers at once. For parellel repair added better record length
    calculation.

  myisam/mi_open.c@1.80.2.13, 2007-11-07 12:55:27+04:00, svoj@mysql.com +5 -2
    When calculating record buffer size, take into account that compressed
    record length may be bigger than uncompressed.

  myisam/mi_packrec.c@1.25.1.9, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -1
    With certain data set share->max_pack_length (compressed record length)
    may be bigger than share->base.pack_reclength (packed record length).
    
    set_if_bigger(pack_reclength, max_pack_length) in this case causes
    myisamchk --unpack to write extra garbage, whereas pack_reclength
    remains the same in new index file. As a result we get unreadable
    table.

  myisam/myisamchk.c@1.92.6.2, 2007-11-07 12:55:27+04:00, svoj@mysql.com +4 -3
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.

ChangeSet@1.1616.3110.2, 2007-11-07 12:47:19+04:00, ramil@mysql.com +3 -0
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
  
  Problem: calling non-constant argument's val_xxx() methods 
  in the ::fix_length_and_dec() is inadmissible.
  
  Fix: call the method only for constant arguments.

  mysql-test/r/ps.result@1.31.1.26, 2007-11-07 12:47:18+04:00, ramil@mysql.com +5 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test result.

  mysql-test/t/ps.test@1.27.1.33, 2007-11-07 12:47:18+04:00, ramil@mysql.com +9 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test case.

  sql/item_timefunc.cc@1.51.6.10, 2007-11-07 12:47:18+04:00, ramil@mysql.com +26 -23
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - call argument's val_str() only for constant items in the 
        Item_func_str_to_date::fix_length_and_dec().

ChangeSet@1.2529.174.1, 2007-11-07 09:30:41+01:00, istruewing@stella.local +1 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  
  handler::index_next_same() did not take into account that the
  internally called function key_cmp_if_same() uses the fixed
  buffer table->record[0] for key comparison instead of the
  buffer provided by the caller of handler::index_next_same().
  
  Added code to temporarily redirect table->record[0] and the fields
  used for the key to the record buffer provided by the caller of
  handler::index_next_same().
  
  The test case is in partition.test already.

  sql/handler.cc@1.215.101.1, 2007-11-07 09:30:38+01:00, istruewing@stella.local +42 -1
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added code to temporarily redirect table->record[0] and the fields
    used for the key to the record buffer provided by the caller of
    handler::index_next_same().

ChangeSet@1.2656, 2007-11-07 01:10:49-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed trailing tab in sql_yacc.yy

  sql/sql_yacc.yy@1.505.1.4, 2007-11-07 01:10:47-07:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed trailing tab

ChangeSet@1.2654, 2007-11-06 22:44:18-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Removed --with-libevent from -max builds

  BUILD/SETUP.sh@1.80, 2007-11-06 22:44:11-07:00, malff@lambda.hsd1.co.comcast.net. +4 -1
    Removed --with-libevent from -max builds

ChangeSet@1.2653, 2007-11-06 22:15:48-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed incorrect manual merge

  sql/sql_parse.cc@1.708.1.6, 2007-11-06 22:15:40-07:00, malff@lambda.hsd1.co.comcast.net. +2 -4
    Fixed incorrect manual merge

ChangeSet@1.2529.157.7, 2007-11-06 16:40:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Apply snapshot innodb-5.1-ss2034
  
  The following bugs are fixed:
  
  Bug #31860: Server crashes after inserting into InnoDB table with auto_increment column
    In the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.

  mysql-test/r/innodb.result@1.165.19.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  mysql-test/t/innodb.test@1.129.21.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +19 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/handler/ha_innodb.cc@1.257.55.7, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +15 -18
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.
    
    
    Revision r2018:
    Remove ut_print_timestamp(), this should have been removed when the following
    changes were made by MySQL.
    
    	ChangeSet@1.1810.467.1  2005-08-11 19:19:20+03:00  jani@omakaista.fi
    
    Fix error message so that it conforms to "  InnoDB: Error: ...".

  storage/innobase/include/univ.i@1.65, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2015:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Remove warnings on 64-bit systems.

  storage/innobase/row/row0sel.c@1.116.1.7, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +5 -2
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/sync/sync0sync.c@1.50, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.

ChangeSet@1.2529.157.6, 2007-11-06 15:42:58-07:00, tsmith@ramayana.hindu.god +31 -0
  Apply snapshot innodb-5.1-ss1989
  
  Fixes the following bugs:
  
  Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
    Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
  
  Bug #30888: Innodb table + stored procedure + row deletion = server crash
    While adding code for the low level read of the AUTOINC value from the index,
    the case for MEDIUM ints which are 3 bytes was missed triggering an
    assertion.
  
  Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
    We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
  
  Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
    DB_SUCCESS.  A timeout on LOCK TABLES would lead to an inconsistent state,
    which would cause trx_free() to print a warning.
  
  Bug #31494: innodb + 5.1 + read committed crash, assertion
    Set an error code when a deadlock occurs in semi-consistent read.

  mysql-test/r/innodb-semi-consistent.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +36 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/r/innodb-semi-consistent.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/r/innodb.result@1.165.19.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +36 -40
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1821:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2536.50.1  2007-08-02 12:45:56-07:00  igor@mysql.com
    
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT.
    If there was a ref/range access to the table whose rows were required
    to be ordered in the result set the optimizer always employed this access
    though a scan by a different index that was compatible with the required
    order could be cheaper to produce the first L rows of the result set.
    Now for such queries the optimizer makes a choice between the cheapest
    ref/range accesses not compatible with the given order and index scans
    compatible with it.
    
    innodb.result: Adjusted results for test cases affected fy the fix for
    bug #28404.
    
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1792:
    innodb.result: Revert r1655, which should have been reverted as part of r1781.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +39 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +46 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb.test@1.129.21.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +42 -33
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +44 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/buf/buf0lru.c@1.38, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/dict/dict0dict.c@1.108, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/dict/dict0load.c@1.57, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +46 -32
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/handler/ha_innodb.cc@1.257.55.6, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +67 -31
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1887:
    Merge changes from MySQL AB:
    
    ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god
    
    Fix some Windows compiler warnings.
    
    dict0mem.c: Fix compiler warning with a cast.
    
    ha_innodb.cc: Change type to fix a compiler warning.
    
    
    Revision r1809:
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
    returns DB_SUCCESS.  A timeout on LOCK TABLES would lead to an
    inconsistent state, which would cause trx_free() to print a warning.
    
    This was later reported as Bug #31444.
    
    
    Revision r1833:
    Add /*== ... === */ decoration that was missing around some auto-inc functions.
    Add a missing comment, fix the length of a decoration.  Initialize the *value
    out parameter in ha_innobase::innobase_get_auto_increment().
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1846:
    Add config option innodb_use_adaptive_hash_indexes to enable/disable
    adaptive hash indexes. It is enabled by default (no change in default
    behavior).
    
    Approved by:	Marko
    
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.
    
    
    Revision r1829:
    Add assertion to enforce check of an implicit invariant and add comment about
    retry of autoinc read semantics. We always reread the table's autoinc counter
    after attempting to initialize it i.e., we want to guarantee that a read of
    autoinc valus that is returned to the caller is always covered by the
    AUTOINC locking mechanism.
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1888:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2528.115.30  2007-08-28 10:17:15-06:00  tsmith@hindu.god
    
    Fix another compiler warning on Windows in InnoDB.
    
    ha_innodb.cc:
    
    Fix compiler warning: ::get_auto_increment takes a ulonglong
    for nb_desired_values, but InnoDB's trx struct stores it as
    a ulint (unsigned long).  Probably harmless, as a single
    statement won't be asking for more than 2^32 rows.
    
    
    Revision r1987:
    Bug fix: The problem was that when write_row() attempted to update the max
    autoinc value, and if it was rolled back because of a deadlock, the 
    deadlock error (transaction rollback) was not being propagated back to MySQL.
    
    
    Revision r1889:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2560  2007-09-21 10:15:16+02:00  gkodinov@local
    
    ha_innodb.cc: fixed type conversion warnings revealed by bug 30639 
    
    
    Revision r1989:
    Suppress printing of deadlock errors while reading the autoinc value.
    DB_DEADLOCK errors are part of normal processing and excessive printing
    of these error messages could be disconcerting for users. 
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.

  storage/innobase/handler/ha_innodb.h@1.141.1.6, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +0 -14
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1844:
    Remove the prototypes of some functions inside #if 0.
    The function definitions were removed in r1746.

  storage/innobase/ibuf/ibuf0ibuf.c@1.55, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +2 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1965:
    ibuf_insert_to_index_page(): Fix typos in diagnostic output.

  storage/innobase/include/db0err.h@1.15, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/include/ha_prototypes.h@1.3, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.

  storage/innobase/include/mach0data.h@1.7, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +11 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mach0data.ic@1.11, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +37 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mem0dbg.h@1.10, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.

  storage/innobase/include/mem0mem.ic@1.21, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +9 -7
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1937:
    mem_heap_free_top(): Remove a bogus Valgrind warning.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/include/rem0rec.ic@1.31, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().

  storage/innobase/include/row0mysql.h@1.50.1.4, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -5
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().

  storage/innobase/include/sync0rw.h@1.22, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +2 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/include/univ.i@1.64, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +28 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1827:
    Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
    Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
    The memory area need not be initialized.
    This mistake was made in r1815.
    
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().
    
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.
    
    
    Revision r1948:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display also __FILE__ and __LINE__
    when these Valgrind checks fail.

  storage/innobase/include/ut0ut.h@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +18 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().

  storage/innobase/mem/mem0dbg.c@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +24 -16
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/mem/mem0mem.c@1.20, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/row/row0mysql.c@1.144, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +38 -44
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1786:
    row_create_table_for_mysql(), row_truncate_table_for_mysql(),
    row_drop_table_for_mysql(): Do not mention innodb_force_recovery
    when newraw is set.
    
    
    Revision r1790:
    row_drop_table_for_mysql(): Before calling
    dict_table_remove_from_cache(table) and thus freeing the memory
    allocated for the table, copy the table name.  This avoids reading
    freed memory when name == table->name.
    
    Approved by Sunny.
    
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().
    
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/row/row0sel.c@1.116.1.6, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +48 -27
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1782:
    Add comment that the variable dest should be word aligned. After discussion
    on IM with Heikki.
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.
    
    
    Revision r1820:
    Use the clustered index and not the one selected by the optimizer in the plan,
    when building a previous version of the row. This bug is triggered when
    running queries via InnoDB's internal SQL parser; when InnoDB's optimizer
    selects a secondary index for the plan.
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.
    
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/sync/sync0rw.c@1.34, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/ut/ut0ut.c@1.42, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +51 -20
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1873:
    snprintf() should always return non-negative result. According to
    Microsoft documentation about _vscprintf():
    
      If format is a null pointer, the invalid parameter handler is invoked,
      as described in Parameter Validation. If execution is allowed to
      continue, the functions return -1 and set errno to EINVAL.
    
    The UNIX variant of snprintf() segfaults if format is a NULL pointer
    (similar to strlen(NULL) for example), so it is better to conform to
    this behavior and crash our custom Windows version instead of
    returning -1. Noone would expect -1 to be returned from snprintf().
    
    Cosmetic: Add a space after typecast.
    
    Approved by:	Marko
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1789:
    ut_print_namel(): Do not assume that all '/' are separators between
    database and table names.
    
    Approved by Heikki.
    
    
    Revision r1936:
    ut_print_buf(): Add a Valgrind check that the buffer is wholly defined.

ChangeSet@1.2603.21.28, 2007-11-07 01:17:29+04:00, gshchepa@gleb.loc +1 -0
  ha_archive.cc:
    Warning removal fix.

  storage/archive/ha_archive.cc@1.152, 2007-11-07 01:16:12+04:00, gshchepa@gleb.loc +1 -1
    Warning removal fix.

ChangeSet@1.2529.120.34, 2007-11-06 21:57:51+03:00, sergefp@mysql.com +1 -0
  Better comments

  sql/opt_range.h@1.78.1.3, 2007-11-06 21:57:39+03:00, sergefp@mysql.com +7 -2
    Better comments

ChangeSet@1.1810.3445.5, 2007-11-06 20:31:40+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  refining non-deterministic tests.
  The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
   

  mysql-test/r/binlog_killed.result@1.6.3.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.4.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +15 -0
    refining the tests as killing is inherently non-deterministic;
    leaving todos.

ChangeSet@1.2529.144.13, 2007-11-06 20:09:45+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  tests fixing: refreshing the results file.

  mysql-test/suite/binlog/r/binlog_killed.result@1.13, 2007-11-06 20:09:40+02:00, aelkin@koti.dsl.inet.fi +8 -0
    results changed

ChangeSet@1.2603.1.69, 2007-11-06 12:56:09-05:00, jas@rowvwade. +1 -0
  Add FILE_FLAG_WRITE_THROUGH to SerialLog::open so serial log
  blocks will actually get written on Windows.

  storage/falcon/SerialLogFile.cpp@1.12, 2007-11-06 12:56:02-05:00, jas@rowvwade. +1 -1
    Add FILE_FLAG_WRITE_THROUGH to SerialLog::open so serial log
    blocks will actually get written on Windows.

ChangeSet@1.2529.173.1, 2007-11-06 17:51:32+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#12092 (FOUND_ROWS() not replicated):
  
  In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
  works only in mixed mode under 5.1. There is a workaround that
  can be used in statement-based mode either under 5.0 or 5.1
  where the result of FOUND_ROWS() is stored into a user vari-
  able and used that way instead. This will replicate correctly
  even under statement-based replication, since it will write
  a User_var entry to the binary log. For some other cases, the
  value has to be passed explicitly.
  
  This patch adds tests to demonstrate that the workarounds docu-
  mented for statement-based replication works as advertised, and
  does more extensive tests for cases that does not work under sta-
  tement-based replication actually work under mixed mode by switch-
  ing to row-based replication.

  mysql-test/include/reset_master_and_slave.inc@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +10 -0
    New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''

  mysql-test/include/reset_master_and_slave.inc@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +228 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +251 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

ChangeSet@1.2529.144.12, 2007-11-06 16:32:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
  results from 5.0 is not needed

  BitKeeper/deleted/.del-binlog_killed_simulate.result@1.2, 2007-11-06 16:29:04+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/r/binlog_killed_simulate.result

ChangeSet@1.1810.3445.4, 2007-11-06 16:25:32+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  fixing tests

  mysql-test/r/binlog_killed_simulate.result@1.1, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +33 -0
    the new tests' result

  mysql-test/r/binlog_killed_simulate.result@1.0, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +0 -0

ChangeSet@1.1346.896.1, 2007-11-06 18:09:33+04:00, svoj@mysql.com +3 -0
  BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
  
  RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
  the file to which the symlink points.
  
  This is security issue, because it is possible to create a table with
  some name in some non-system database and set DATA/INDEX DIRECTORY
  to mysql system database. Renaming this table to one of mysql system
  tables (e.g. user, host) would overwrite the system table.
  
  Return an error when the file to which the symlink points exist.

  mysql-test/r/symlink.result@1.4.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +6 -0
    A test case for BUG#32111.

  mysql-test/t/symlink.test@1.3.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +12 -0
    A test case for BUG#32111.

  mysys/my_symlink2.c@1.6.1.1, 2007-11-06 18:09:32+04:00, svoj@mysql.com +10 -1
    Return an error when the file to which the symlink points exist.

ChangeSet@1.2529.171.3, 2007-11-06 14:47:15+01:00, istruewing@stella.local +2 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Post-merge fix. Moved test into 5.0 section.

  mysql-test/r/myisam.result@1.108.3.3, 2007-11-06 14:47:14+01:00, istruewing@stella.local +25 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

  mysql-test/t/myisam.test@1.87.2.3, 2007-11-06 14:47:14+01:00, istruewing@stella.local +26 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

ChangeSet@1.2529.155.10, 2007-11-06 15:29:55+02:00, gkodinov@magare.gmz +2 -0
  Bug #31974: additional commit (test case updates)
   loose index scan enabled for subqueries

  mysql-test/r/group_min_max.result@1.33.1.4, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +2 -2
    Bug #31974: test case updates
     loose index scan enabled for subqueries

  mysql-test/r/index_merge_myisam.result@1.5.1.5, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +1 -1
    Bug #31974: test case updates
     loose index scan enabled for subqueries

ChangeSet@1.2603.21.27, 2007-11-06 17:17:27+04:00, gluh@mysql.com +12 -0
  Bug#31509: funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing(for 6.0)
  - enabled datadict_show_table_design.inc for 'parameters' in
    datadict_master.inc and added columns to comment.
  - removed the test trap from datadict_tables.inc
  - added 'parameters' table to datadict_tables_error_[0-9]+.inc

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.9, 2007-11-06 17:17:24+04:00, gluh@mysql.com +24 -15
    Bug#31509: enabled datadict_show_table_design.inc for 'parameters' in
    datadict_master.inc and added columns to comment.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.5, 2007-11-06 17:17:24+04:00, gluh@mysql.com +2 -4
    Bug#31509:
    - 'routines' table has more columns and it was needed to remove date-specific
      data in columns 23 & 24 rather than 16 & 17
    - removed the test trap

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +4 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +2 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +2 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +2 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +2 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.4, 2007-11-06 17:17:25+04:00, gluh@mysql.com +2 -0
    Bug#31509: added 'parameters' table

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.12.1.2, 2007-11-06 17:17:25+04:00, gluh@mysql.com +3691 -3477
    Bug#31509: new result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.12.1.2, 2007-11-06 17:17:25+04:00, gluh@mysql.com +3631 -3417
    Bug#31509: new result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.12.1.2, 2007-11-06 17:17:25+04:00, gluh@mysql.com +3775 -3561
    Bug#31509: new result file

  mysql-test/suite/funcs_1/t/suite.opt@1.2, 2007-11-06 17:17:25+04:00, gluh@mysql.com +11 -1
    Bug#31509: added options which makes Falcone I_S tables disabled

ChangeSet@1.1810.3445.3, 2007-11-06 15:11:59+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  removing extra tests (on 5.1 that's been already done)

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.1.1.1, 2007-11-06 15:09:37+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.1.1.1, 2007-11-06 15:09:42+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

ChangeSet@1.2529.120.33, 2007-11-06 16:53:02+04:00, gluh@mysql.com +2 -0
  fix for pushbuild 'powermacg5' failure

  mysql-test/r/information_schema.result@1.156.2.15, 2007-11-06 16:53:01+04:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/t/information_schema.test@1.100.1.15, 2007-11-06 16:53:01+04:00, gluh@mysql.com +1 -1
    test fix

ChangeSet@1.1810.3436.7, 2007-11-06 13:41:32+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.13.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.28.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +167 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.2603.49.1, 2007-11-06 15:53:27+04:00, gluh@mysql.com +9 -0
  WL#3732 Information schema optimization(addon)
  fill_schema_table_from_frm():
  1. remove open_table_from_share() call
  2. I_S TRIGGERS, open TRG file only
  3. I_S VIEWS fields(except IS_UPDATABLE) use OPEN_FRM_ONLY method

  mysql-test/r/trigger-compat.result@1.8, 2007-11-06 15:53:24+04:00, gluh@mysql.com +0 -2
    result fix

  mysql-test/r/trigger-grant.result@1.14, 2007-11-06 15:53:24+04:00, gluh@mysql.com +0 -4
    result fix

  sql/mysql_priv.h@1.534, 2007-11-06 15:53:25+04:00, gluh@mysql.com +4 -0
    open_new_frm() decalaration

  sql/sql_base.cc@1.403, 2007-11-06 15:53:25+04:00, gluh@mysql.com +1 -5
    changed open_new_frm() to global

  sql/sql_parse.cc@1.711, 2007-11-06 15:53:25+04:00, gluh@mysql.com +1 -1
    tables->table->s can be 0, I_S.TRIGGERS, added check

  sql/sql_show.cc@1.440.4.1, 2007-11-06 15:53:25+04:00, gluh@mysql.com +150 -103
    fill_schema_table_from_frm():
    1. remove open_table_from_share() call
    2. I_S TRIGGERS, open TRG file only
    3. I_S VIEWS fields(except IS_UPDATABLE) use OPEN_FRM_ONLY method

  sql/sql_trigger.cc@1.68, 2007-11-06 15:53:25+04:00, gluh@mysql.com +11 -11
    skip warning if thd->no_warnings_for_error is enabled

  sql/sql_view.cc@1.130.1.1, 2007-11-06 15:53:25+04:00, gluh@mysql.com +10 -7
    view definition context is initialized before exit
    (if view is parsed with OPEN_VIEW_NO_PARSE flag)

  sql/unireg.h@1.63.1.1, 2007-11-06 15:53:25+04:00, gluh@mysql.com +5 -0
    added new flag

ChangeSet@1.1810.3445.2, 2007-11-06 13:53:26+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571
  
  commit is specific for 5.0 to eliminated non-deterministic tests.
  Those tests run only in 5.1 env where there is a necessary devices such
  as processlist table of info_schema.

  mysql-test/r/binlog_killed.result@1.6.2.1, 2007-11-06 13:53:23+02:00, aelkin@koti.dsl.inet.fi +5 -71
    results changed

  mysql-test/t/binlog_killed.test@1.6.3.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +13 -105
    removing non-deterministic part of the test

  mysql-test/t/binlog_killed_simulate.test@1.1.1.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +1 -0
    adding the guard same as for 5.1 version

ChangeSet@1.2529.144.9, 2007-11-06 13:08:37+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  non-deterministic tests refining.
  This particular patch tested on two archs.

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.5, 2007-11-06 13:08:34+02:00, aelkin@koti.dsl.inet.fi +9 -2
    deploying synchronization of killing with reaching the explected state
    of the prey's connection.

ChangeSet@1.2529.144.8, 2007-11-06 11:53:47+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571 
  
  non-deterministic tests execution on some platforms.

  mysql-test/suite/binlog/r/binlog_killed.result@1.11, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +4 -1
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.4, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +5 -3
    correcting the prev test's cleanup;
    increasing time to wait by to be killed query;
    adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query

ChangeSet@1.2649, 2007-11-05 19:00:43-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  compiler warning filter: added libevent, removed bdb

  support-files/compiler_warnings.supp@1.14, 2007-11-05 19:00:37-07:00, malff@lambda.hsd1.co.comcast.net. +13 -9
    
    added libevent, removed bdb

ChangeSet@1.2529.169.3, 2007-11-05 16:52:04-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  fixed coding style

  sql/sql_yacc.yy@1.458.147.3, 2007-11-05 16:51:58-07:00, malff@lambda.hsd1.co.comcast.net. +4 -3
    Fixed coding style (tabs)

ChangeSet@1.2603.1.68, 2007-11-05 18:47:44-05:00, jas@fluffy.netfrastructure.com +1 -0
  Fix statement unwind problem re savepoint cleanup.  May be
  a bug, may be a symptom on another bug.

  storage/falcon/Statement.cpp@1.3, 2007-11-05 18:47:41-05:00, jas@fluffy.netfrastructure.com +2 -2
    Fix statement unwind problem re savepoint cleanup.  May be
    a bug, may be a symptom on another bug.

ChangeSet@1.2603.48.2, 2007-11-06 00:00:28+01:00, hakank@au0012.efendi.com +2 -0
  After review fixes.

  storage/falcon/Thread.cpp@1.3, 2007-11-06 00:00:23+01:00, hakank@au0012.efendi.com +1 -1
    Elminated superfluous casting.

  storage/falcon/Thread.h@1.3, 2007-11-06 00:00:23+01:00, hakank@au0012.efendi.com +1 -6
    Use already defined THREAD_ID macro.

ChangeSet@1.2603.1.67, 2007-11-05 16:17:23-05:00, jas@fluffy.netfrastructure.com +1 -0
  Handle Ethernet devices > eth2.

  storage/falcon/MACAddress.cpp@1.2.1.1, 2007-11-05 16:17:21-05:00, jas@fluffy.netfrastructure.com +8 -2
    Check more ethernet devices for MAC address.

ChangeSet@1.2603.37.29, 2007-11-05 15:13:31-05:00, jas@rowvwade. +2 -0
  Get a little more detail on page consolidation tracing.

  storage/falcon/Cache.cpp@1.38, 2007-11-05 15:13:24-05:00, jas@rowvwade. +4 -3
    Get a little more detail on page consolidation tracing.

  storage/falcon/Cache.h@1.15, 2007-11-05 15:13:24-05:00, jas@rowvwade. +6 -6
    Get a little more detail on page consolidation tracing.

ChangeSet@1.2529.144.7, 2007-11-05 22:10:25+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
  
  refining tests as they appear to be non-deterministic.

  mysql-test/suite/binlog/r/binlog_killed.result@1.10, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +32 -23
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.3, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +31 -19
    restructuring the test to deliver more deterministic outcome.
    order-by for update and delete did not guaratee the order of scanning.
    --error are masked with zero in order to catch more info if killing
    really will happen to be non-deterministic on some platform (witnessed
    something like that on dl145j)

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.4, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +1 -0
    important guard added

ChangeSet@1.2603.37.28, 2007-11-05 15:00:51-05:00, jas@rowvwade. +1 -0
  Turn off automatic logging of page consolidation data.

  storage/falcon/Cache.cpp@1.37, 2007-11-05 15:00:44-05:00, jas@rowvwade. +1 -1
    Turn off automatic logging of page consolidation data.

ChangeSet@1.2603.48.1, 2007-11-05 20:49:06+01:00, hakank@au0012.efendi.com +13 -0
  Fix for Solaris/x86. With great help of Alexey Stroganov.
  
  Open issue noted by Alexey:
  - on Solaris dirent structure differs from Linux one so we may want 
    change test for directory on Solaris with following code:
  
    struct stat *s;
    stat(dir, s);
    if (s->st_mode & S_IFDIR) 
      return true;

  storage/falcon/DeferredIndex.cpp@1.3, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/Hdr.cpp@1.2, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/Index2RootPage.cpp@1.1.1.1, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/IndexRootPage.cpp@1.2.1.1, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/MACAddress.cpp@1.3, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +7 -0
    Fix for Solaris/x86.

  storage/falcon/MemMgr.cpp@1.9, 2007-11-05 20:49:00+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/SRLCreateTableSpace.cpp@1.1.1.1, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/ScanDir.cpp@1.4, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +5 -3
    Fix for Solaris/x86.

  storage/falcon/SerialLogFile.cpp@1.1.1.1, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/SerialPipe.cpp@1.3, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/Table.cpp@1.15.3.1, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +1 -0
    Fix for Solaris/x86.

  storage/falcon/Thread.cpp@1.2, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +1 -1
    Fix for Solaris/x86.

  storage/falcon/Thread.h@1.2, 2007-11-05 20:49:01+01:00, hakank@au0012.efendi.com +4 -0
    Fix for Solaris/x86.

ChangeSet@1.2603.37.27, 2007-11-05 14:48:23-05:00, jas@rowvwade. +4 -0
  Add diagnostic code for page consolidation analysis.

  storage/falcon/Cache.cpp@1.36, 2007-11-05 14:48:14-05:00, jas@rowvwade. +73 -0
    Add diagnostic code for page consolidation analysis.

  storage/falcon/Cache.h@1.14, 2007-11-05 14:48:15-05:00, jas@rowvwade. +4 -0
    Add diagnostic code for page consolidation analysis.

  storage/falcon/IO.cpp@1.20, 2007-11-05 14:48:15-05:00, jas@rowvwade. +1 -1
    Change name of trace file.

  storage/falcon/SerialLog.cpp@1.23, 2007-11-05 14:48:15-05:00, jas@rowvwade. +3 -6
    Shut down all gopher threads, not just the first.

ChangeSet@1.1810.3435.3, 2007-11-05 17:48:11+01:00, jperkin@production.mysql.com +1 -0
  Provide better feedback to the user when unable to find MySQL files
  usually caused by a bad basedir setting.

  support-files/mysql.server.sh@1.49.1.9, 2007-11-05 17:46:23+01:00, jperkin@production.mysql.com +1 -1
    Be more verbose in error message.

ChangeSet@1.2603.47.1, 2007-11-05 11:03:38-05:00, jas@fluffy.netfrastructure.com +1 -0
  Be less stupid about starting gopher threads.  For example,
  don't start threads that are already running.  Also, don't
  start more than one.  Duh.

  storage/falcon/SerialLog.cpp@1.22, 2007-11-05 11:03:35-05:00, jas@fluffy.netfrastructure.com +5 -1
    Be less stupid about starting gopher threads.  For example,
    don't start threads that are already running.  Also, don't
    start more than one.  Duh.

ChangeSet@1.2529.25.7, 2007-11-05 16:25:40+01:00, istruewing@stella.local +17 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Trying INSERT DELAYED on a partitioned table, that has not been
  used right before, crashes the server. When a table is used for
  select or update, it is kept open for some time. This period I
  mean with "right before".
  
  Information about partitioning of a table is stored in form of
  a string in the .frm file. Parsing of this string requires a
  correctly set up lexical analyzer (lex). The partitioning code
  uses a new temporary instance of a lex. But it does still refer
  to the previously active lex. The delayd insert thread does not
  initialize its lex though...
  
  Added initialization for thd->lex before open table in the delayed
  thread and at all other places where it is necessary to call
  lex_start() if all tables would be partitioned and need to parse
  the .frm file.

  mysql-test/r/partition_hash.result@1.8, 2007-11-05 16:25:38+01:00, istruewing@stella.local +4 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test result

  mysql-test/t/partition_hash.test@1.10, 2007-11-05 16:25:38+01:00, istruewing@stella.local +8 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test

  sql/event_scheduler.cc@1.27.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/events.cc@1.84.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/ha_ndbcluster_binlog.cc@1.90.26.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/slave.cc@1.301.15.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_acl.cc@1.243.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_base.cc@1.374.57.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table().

  sql/sql_connect.cc@1.9.4.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_insert.cc@1.282.16.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +6 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added initialization for thd->lex before open table.

  sql/sql_lex.cc@1.250.18.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_lex.h@1.284.10.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_plugin.cc@1.75.2.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_servers.cc@1.14.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_udf.cc@1.80.2.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/table.cc@1.288.22.1, 2007-11-05 16:25:39+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table_from_share().

  sql/tztime.cc@1.59, 2007-11-05 16:25:39+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1810.3442.1, 2007-11-05 17:20:10+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #28597 Replication doesn't start after upgrading to 5.1.18
  
  Since bug@20166, which replaced the binlog file name generating to base
  on pidfile_name instead of the previous glob_hostname, the binlog file
  name suddenly started to be stored solely in the absolute path format,
  including a case when --log-bin option meant a relative path.
  What's more serious, the path for binlog file can lead unrequestedly 
  to pid-file directory so that after any proper fix for this bug
  there might be similar to the bug report consequences for one who
  upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.
  
  Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
  off its directory part. This restores the original logics of storing
  the names in compatible with --log-bin option format and with the
  requirement for --log-bin ralative path to corresond to the data directory.
  Side effects for this fix:
  
  effective fixing bug@27070, refining its test;
  ensuring no overrun for buff can happen anymore (Bug#31836 
  insufficient space reserved for the suffix of relay log file name);
  bug#31837  --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
  in rpl_temporary.test;
  fixes Bug@28603  Invalid log-bin default location;

  mysql-test/t/rpl_dual_pos_advance.test@1.2.1.1, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +0 -6
    After correcting the logics of log file name composing workaround for
    
      Bug #27070 server logs are created unrequested and in wrong directory
    
    is removed.

  mysql-test/t/rpl_temporary.test@1.15.1.10, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +2 -0
    remaining temp file of the test removed

  sql/log.cc@1.158.1.63, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +4 -7
    stripping off the directory part of `pidfile_name' for binlog name
    generating (which fixes two more bugs on wrong binlog file location);
    ensuring no overrun for buff can happen anymore (Bug #31836 
    insufficient space reserved for the suffix of relay log file name);

ChangeSet@1.2529.168.2, 2007-11-05 18:43:13+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.149, 2007-11-05 18:43:11+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.2639.6.1, 2007-11-05 15:34:36+01:00, hhunger@hh-nb.hhunger +50 -0
  new wrapper for falcon and some modifications in include file, also due to falcon bugs.

  BitKeeper/etc/ignore@1.296.1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +9 -0
    Added storage/archive/archive_performance storage/archive/concurrency_test libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc mysql-test/suite/funcs_1/r/falcon_subquery2.result mysql-test/suite/funcs_1/r/falcon_subquery3.result mysql-test/suite/funcs_1/r/falcon_subquery4.result to the ignore list

  mysql-test/suite/funcs_1/include/falcon_tb1.inc@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +69 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/include/falcon_tb1.inc@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/include/falcon_tb2.inc@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +61 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/include/falcon_tb2.inc@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/include/falcon_tb3.inc@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +68 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/include/falcon_tb3.inc@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/include/falcon_tb4.inc@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +68 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/include/falcon_tb4.inc@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon__load.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +1 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon__load.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_bitdata.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +67 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_bitdata.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_cursors.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +81 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_cursors.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_func_view.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +6804 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_func_view.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +19304 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +1395 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_03.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +490 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_03.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_06.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +402 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_06.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_07.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +172 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_07.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_08.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +829 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_08.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_storedproc_10.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +323 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_storedproc_10.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_0102.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +369 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_0102.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_03.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +716 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_03.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_03e.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +1637 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_03e.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_0407.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +480 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_0407.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_08.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +507 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_08.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_09.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +267 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_09.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +399 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_1011ext.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_trig_frkey.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +139 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_trig_frkey.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/r/falcon_views.result@1.1, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +11440 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/r/falcon_views.result@1.0, 2007-11-05 15:34:31+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.3.1.1, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +1 -1
    modifications for ps-protocol

  mysql-test/suite/funcs_1/t/disabled.def@1.7, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +2 -5
    modifications due to falcon.

  mysql-test/suite/funcs_1/t/falcon__load.test@1.1, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +48 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon__load.test@1.0, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_bitdata.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_bitdata.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_cursors.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_cursors.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_func_view.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +17 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_func_view.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +7 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_02.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_02.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_03.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_03.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_06.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_06.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_07.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_07.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_08.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_08.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_storedproc_10.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +10 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_storedproc_10.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_0102.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_0102.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_03.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_03.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_03e.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +42 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_03e.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_0407.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_0407.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_08.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_08.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_09.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_09.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_1011ext.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_1011ext.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_trig_frkey.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +35 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_trig_frkey.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/t/falcon_views.test@1.1, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +47 -0
    new wrapper for falcon.

  mysql-test/suite/funcs_1/t/falcon_views.test@1.0, 2007-11-05 15:34:30+01:00, hhunger@hh-nb.hhunger +0 -0

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.4, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +2 -1
    modofocation due to falcon bug.

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.5, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +3 -2
    modofocations due to falcon bug.

  mysql-test/suite/funcs_1/views/views_master.inc@1.10.1.1, 2007-11-05 15:34:29+01:00, hhunger@hh-nb.hhunger +292 -295
    modifications due to falcon bug.

ChangeSet@1.1810.3441.2, 2007-11-05 18:23:55+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.110.1.29, 2007-11-05 18:23:54+04:00, holyfoot@mysql.com +3 -3
    merging

ChangeSet@1.1810.3436.6, 2007-11-05 14:44:38+01:00, istruewing@stella.local +1 -0
  Bug#32108 - subselect.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/subselect.test@1.129.13.1, 2007-11-05 14:44:37+01:00, istruewing@stella.local +1 -1
    Bug#32108 - subselect.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.1810.3436.5, 2007-11-05 14:37:00+01:00, istruewing@stella.local +1 -0
  Bug#32107 - ctype_uca.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/ctype_uca.test@1.16.4.1, 2007-11-05 14:36:59+01:00, istruewing@stella.local +1 -1
    Bug#32107 - ctype_uca.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2528.237.3, 2007-11-05 14:24:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Incremental patch to remove redundant, but benign, my_error() call.

  sql/sql_binlog.cc@1.13.1.2, 2007-11-05 14:24:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing redundant error reporting.

ChangeSet@1.2529.1.75, 2007-11-05 13:33:20+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  workaround for case insensitive filesystems

  mysql-test/suite/ndb/r/ndb_multi.result@1.18, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    workaround for case insensitive filesystems

  mysql-test/suite/ndb/t/ndb_multi.test@1.24.1.2, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    workaround for case insensitive filesystems

ChangeSet@1.2529.155.9, 2007-11-05 13:19:56+02:00, gkodinov@magare.gmz +3 -0
  Bug #31974: Wrong EXPLAIN output
  
  The fix for bug 31148 is not correct. It does not
  have a relation to the problem described in this bug.
  And removing the fix will not make the bug to re-appear.
  Fixed the bug #31974 by removing the fix for bug 31148
  and adding a test case.

  mysql-test/r/key.result@1.45.1.3, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +14 -0
    Bug #31974: test case

  mysql-test/t/key.test@1.37.1.2, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +17 -0
    Bug #31974: test case

  sql/sql_select.cc@1.541.29.6, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +0 -7
    Bug #31974: revert the fix for bug 31148

ChangeSet@1.1810.3437.2, 2007-11-05 13:30:31+03:00, kaa@polly.(none) +1 -0
  Fixed code that parses the DELIMITER command to correctly calculate 
  the length of the remaining input string.
  
  This is to fix mysqldump test failure in PB introduced by the patch
  for bug #26215.

  client/mysql.cc@1.199.30.2, 2007-11-05 13:30:28+03:00, kaa@polly.(none) +3 -4
    Fixed code that parses the DELIMITER command to correctly calculate 
    the length of the remaining input string.

ChangeSet@1.2529.163.6, 2007-11-05 10:57:52+01:00, istruewing@stella.local +1 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Fixed absurd compiler warnings of a Suse 10.1 system.

  storage/myisam/mi_check.c@1.163.1.2, 2007-11-05 10:57:50+01:00, istruewing@stella.local +2 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Fixed absurd compiler warnings of a Suse 10.1 system.

ChangeSet@1.2603.37.25, 2007-11-04 11:36:20-06:00, klewis@klewis-mysql. +2 -0
  Make sure the setting is result to default so that
  falcon_options.test will work correctly

  mysql-test/suite/falcon/r/falcon_bug_29151_C.result@1.3, 2007-11-04 11:35:55-06:00, klewis@klewis-mysql. +1 -0
    Make sure the setting is result to default so that
    falcon_options.test will work correctly

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.4, 2007-11-04 11:35:58-06:00, klewis@klewis-mysql. +1 -0
    Make sure the setting is result to default so that
    falcon_options.test will work correctly

ChangeSet@1.2603.37.24, 2007-11-03 10:01:26-05:00, klewis@klewis-mysql. +4 -0
  Update options

  mysql-test/suite/falcon/r/falcon_options.result@1.9, 2007-11-03 10:01:12-05:00, klewis@klewis-mysql. +2 -2
    Update options

  mysql-test/suite/falcon/r/falcon_options2.result@1.8, 2007-11-03 10:01:15-05:00, klewis@klewis-mysql. +4 -4
    Update options

  mysql-test/suite/falcon/t/falcon_options2.test@1.3, 2007-11-03 10:01:17-05:00, klewis@klewis-mysql. +1 -1
    Update options

  storage/falcon/Index.cpp@1.6, 2007-11-03 10:01:19-05:00, klewis@klewis-mysql. +1 -1
    DIHash by itself still causes crashes

ChangeSet@1.2603.37.23, 2007-11-03 00:43:34-05:00, klewis@klewis-mysql. +1 -0
  Try DIHash exclusively

  storage/falcon/Index.cpp@1.5, 2007-11-03 00:43:27-05:00, klewis@klewis-mysql. +1 -1
    Try DIHash exclusively

ChangeSet@1.2603.37.22, 2007-11-03 00:36:36-05:00, klewis@klewis-mysql. +1 -0
  RLSession::append should use srlSession instead of srlCheckpoint

  storage/falcon/SRLSession.cpp@1.2, 2007-11-03 00:36:29-05:00, klewis@klewis-mysql. +1 -1
    RLSession::append should use srlSession instead of srlCheckpoint

ChangeSet@1.2603.37.21, 2007-11-03 00:34:24-05:00, klewis@klewis-mysql. +19 -0
  Rename INNODB_COMPATIBILITY to CONSISTENT_READ and change the 
  default to CONSISTENT_READ.  Update testcases accordingly

  mysql-test/suite/falcon/r/falcon_bug_29151.result@1.3, 2007-11-03 00:33:20-05:00, klewis@klewis-mysql. +2 -0
    Update testcases

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.4, 2007-11-03 00:33:22-05:00, klewis@klewis-mysql. +1 -1
    Update testcases

  mysql-test/suite/falcon/r/falcon_bug_29151_B.result@1.3, 2007-11-03 00:33:24-05:00, klewis@klewis-mysql. +1 -1
    Update testcases

  mysql-test/suite/falcon/r/falcon_bug_29151_C.result@1.2, 2007-11-03 00:33:26-05:00, klewis@klewis-mysql. +9 -1
    Update testcases

  mysql-test/suite/falcon/r/falcon_bug_29452.result@1.2, 2007-11-03 00:33:28-05:00, klewis@klewis-mysql. +5 -0
    Update testcases

  mysql-test/suite/falcon/t/falcon_bug_29151.test@1.4, 2007-11-03 00:33:31-05:00, klewis@klewis-mysql. +2 -0
    Update testcases

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.4, 2007-11-03 00:33:33-05:00, klewis@klewis-mysql. +1 -1
    Update testcases

  mysql-test/suite/falcon/t/falcon_bug_29151_B.test@1.3, 2007-11-03 00:33:35-05:00, klewis@klewis-mysql. +1 -1
    Update testcases

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.3, 2007-11-03 00:33:44-05:00, klewis@klewis-mysql. +7 -5
    Update testcases

  mysql-test/suite/falcon/t/falcon_bug_29452.test@1.2, 2007-11-03 00:33:46-05:00, klewis@klewis-mysql. +3 -0
    Update testcases

  storage/falcon/Cache.cpp@1.35, 2007-11-03 00:33:48-05:00, klewis@klewis-mysql. +0 -1
    compiler warning

  storage/falcon/IO.cpp@1.19, 2007-11-03 00:33:50-05:00, klewis@klewis-mysql. +1 -1
    compiler warning

  storage/falcon/SQLException.h@1.4, 2007-11-03 00:33:52-05:00, klewis@klewis-mysql. +1 -2
    Get rid of the RETRY_AFTER_WATE error

  storage/falcon/StorageDatabase.cpp@1.6, 2007-11-03 00:33:55-05:00, klewis@klewis-mysql. +0 -2
    Get rid of the RETRY_AFTER_WATE error

  storage/falcon/StorageTable.cpp@1.5, 2007-11-03 00:33:56-05:00, klewis@klewis-mysql. +1 -17
    Get rid of the RETRY_AFTER_WATE error

  storage/falcon/StorageTableShare.h@1.5, 2007-11-03 00:33:58-05:00, klewis@klewis-mysql. +0 -1
    Get rid of the RETRY_AFTER_WATE error

  storage/falcon/Table.cpp@1.15.1.7, 2007-11-03 00:34:00-05:00, klewis@klewis-mysql. +0 -15
    Get rid of the RETRY_AFTER_WATE error

  storage/falcon/ha_falcon.cpp@1.20, 2007-11-03 00:34:02-05:00, klewis@klewis-mysql. +9 -9
    Rename INNODB_COMPATIBILITY to CONSISTENT_READ and change the 
    default to CONSISTENT_READ 

  storage/falcon/ha_falcon.h@1.3, 2007-11-03 00:34:04-05:00, klewis@klewis-mysql. +1 -1
    Rename INNODB_COMPATIBILITY to CONSISTENT_READ 

ChangeSet@1.2528.237.1, 2007-11-03 01:33:48+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding check that the user executing a BINLOG statement has SUPER
  privileges and aborting execution of the statement with an error
  otherwise.

  mysql-test/r/mysqlbinlog.result@1.38, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +22 -0
    Result change.

  mysql-test/t/mysqlbinlog.test@1.52, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +27 -0
    Adding test that generates a BINLOG command for inserting data into a
    table and feed the BINLOG statement into the database as an untrusted
    user. Also checking that insertion into the table fails for that user
    and that the table only contain a single line: the original one inserted.

  sql/sql_binlog.cc@1.13.1.1, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +6 -0
    Adding a check that the executor of the BINLOG command has
    SUPER privileges and give an error and abort execution if not.

ChangeSet@1.2603.46.3, 2007-11-02 17:34:23-05:00, chris@xeno.mysql.com +3 -0
  Bug #22564, "auto_increment column gets automatically incremented"
  - Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

  mysql-test/suite/falcon/r/falcon_bug_31490.result@1.3, 2007-11-02 17:34:21-05:00, chris@xeno.mysql.com +0 -1
    Removed extra blank line

  mysql-test/suite/falcon/r/falcon_bugs.result@1.3, 2007-11-02 17:34:21-05:00, chris@xeno.mysql.com +8 -8
    Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

  mysql-test/suite/falcon/t/falcon_bugs.test@1.3, 2007-11-02 17:34:21-05:00, chris@xeno.mysql.com +7 -7
    Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

ChangeSet@1.2603.37.19, 2007-11-02 18:20:49-04:00, jas@fluffy.netfrastructure.com +1 -0
  Get O_DIRECT "automatic transmission" working.

  storage/falcon/SerialLogFile.cpp@1.11, 2007-11-02 18:20:46-04:00, jas@fluffy.netfrastructure.com +10 -4
    Get O_DIRECT "automatic transmission" working.

ChangeSet@1.2603.37.18, 2007-11-02 18:11:54-04:00, jas@fluffy.netfrastructure.com +2 -0
  Got PriorityScheduler basically working.

  storage/falcon/PriorityScheduler.cpp@1.2, 2007-11-02 18:11:51-04:00, jas@fluffy.netfrastructure.com +8 -4
    Got PriorityScheduler basically working.

  storage/falcon/Table.cpp@1.15.1.6, 2007-11-02 18:11:51-04:00, jas@fluffy.netfrastructure.com +2 -0
    Disabled part of Kevin's recent patch to get dbt2 working again.

ChangeSet@1.2603.37.16, 2007-11-02 17:51:38-04:00, jas@rowvwade. +3 -0
  Implement automatic transmission to revert to O_SYNC is
  open with O_DIRECT fails.

  storage/falcon/IO.cpp@1.18, 2007-11-02 17:51:30-04:00, jas@rowvwade. +11 -4
    Implement automatic transmission to revert to O_SYNC is
    open with O_DIRECT fails.

  storage/falcon/IOx.h@1.11, 2007-11-02 17:51:30-04:00, jas@rowvwade. +1 -1
    Implement automatic transmission to revert to O_SYNC is
    open with O_DIRECT fails.

  storage/falcon/StorageParameters.h@1.12, 2007-11-02 17:51:31-04:00, jas@rowvwade. +1 -1
    Implement automatic transmission to revert to O_SYNC is
    open with O_DIRECT fails.

ChangeSet@1.2529.167.1, 2007-11-03 00:32:17+03:00, skozlov@mysql.com +2 -0
  WL#3949. Added an option for support "combinations" of mysqld arguments for a suite

  mysql-test/lib/mtr_cases.pl@1.69, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +99 -0
    updated mtr_cases.pl

  mysql-test/mysql-test-run.pl@1.122.104.1, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +5 -0
    updated mtr

ChangeSet@1.2529.162.2, 2007-11-02 14:25:48-07:00, antony@pcg5ppc.xiphis.org +1 -0
  fix for 2.4.6 bug should be properly enclosed to not break other versions.

  sql/CMakeLists.txt@1.17.3.1, 2007-11-02 14:25:45-07:00, antony@pcg5ppc.xiphis.org +2 -0
    fix for 2.4.6 bug should be properly enclosed to not break other versions.

ChangeSet@1.2603.46.2, 2007-11-02 16:12:40-05:00, chris@xeno.mysql.com +2 -0
  Bug #22564, "auto_increment column gets automatically incremented"
  - Adjusted testcase falcon_bug_28052.test to conform to the restriction that 
    autoincrement columns must be the first part of a multi-part key.

  mysql-test/suite/falcon/r/falcon_bug_28052.result@1.2, 2007-11-02 16:12:38-05:00, chris@xeno.mysql.com +7 -7
    Reordered columns in key definition so that autoincrement column is first.

  mysql-test/suite/falcon/t/falcon_bug_28052.test@1.3, 2007-11-02 16:12:38-05:00, chris@xeno.mysql.com +6 -6
    Reordered columns in key definition so that autoincrement column is first.

ChangeSet@1.2603.46.1, 2007-11-02 16:06:52-05:00, chris@xeno.mysql.com +2 -0
  Bug#29211, "Falcon: information_schema has a falcon_tables view"
  -Added INTERNAL_NAME column to Information_Schema.falcon_tables.

  storage/falcon/StorageHandler.cpp@1.8, 2007-11-02 16:06:50-05:00, chris@xeno.mysql.com +1 -0
    StorageHandler::getTablesInfo(): Added INTERNAL_NAME column.

  storage/falcon/ha_falcon.cpp@1.19, 2007-11-02 16:06:50-05:00, chris@xeno.mysql.com +1 -0
    tablesFieldInfo: Added INTERNAL_NAME column to falcon_tables view.

ChangeSet@1.2639.4.1, 2007-11-02 15:39:06-04:00, dkatz@damien-katzs-computer.local +2 -0
  wl441: Enable building the thread-pooling code by default on unix platforms.

  BUILD/SETUP.sh@1.79, 2007-11-02 15:39:00-04:00, dkatz@damien-katzs-computer.local +1 -1
    Added --with-libevent to max builds, to allow for the --thread_handling=pool-of-threads command line option.

  sql/scheduler.cc@1.3, 2007-11-02 15:39:00-04:00, dkatz@damien-katzs-computer.local +1 -1
    better comment

ChangeSet@1.2529.157.4, 2007-11-02 15:30:39-04:00, iggy@alf.(none) +1 -0
  Bug#31217 C1033 compilation error on Windows
  - This workaround is no longer necessary with cmake 2.4.7.

  sql/CMakeLists.txt@1.17.1.3, 2007-11-02 15:30:37-04:00, iggy@alf.(none) +0 -7
    Bug#31217 C1033 compilation error on Windows
    - Remove workaround no longer needed.

ChangeSet@1.1810.3435.2, 2007-11-02 15:16:45-04:00, iggy@alf.(none) +1 -0
  Bug#31319 CMake build does not check for minimum required version
  - Add check

  CMakeLists.txt@1.1.27.5, 2007-11-02 15:16:44-04:00, iggy@alf.(none) +2 -0
    Bug#31319 CMake build does not check for minimum required version
    - Add check

ChangeSet@1.2603.37.15, 2007-11-02 12:54:48-04:00, jas@rowvwade. +10 -0
  Add support for priority scheduler to manage I/O operations.

  storage/falcon/CMakeLists.txt@1.7, 2007-11-02 12:54:36-04:00, jas@rowvwade. +4 -0
    Added new classes PriorityScheduler and Priority.

  storage/falcon/Cache.cpp@1.34, 2007-11-02 12:54:37-04:00, jas@rowvwade. +12 -5
    Add support for priority scheduler to manage I/O operations.

  storage/falcon/Database.cpp@1.15.1.14, 2007-11-02 12:54:37-04:00, jas@rowvwade. +4 -4
    Add support for priority scheduler to manage I/O operations.

  storage/falcon/Database.h@1.17, 2007-11-02 12:54:37-04:00, jas@rowvwade. +43 -42
    Add support for priority scheduler to manage I/O operations.

  storage/falcon/Makefile.am@1.8, 2007-11-02 12:54:38-04:00, jas@rowvwade. +6 -1
    Added new classes PriorityScheduler and Priority.

  storage/falcon/Priority.cpp@1.1, 2007-11-02 12:54:39-04:00, jas@rowvwade. +42 -0
    New BitKeeper file ``storage/falcon/Priority.cpp''

  storage/falcon/Priority.cpp@1.0, 2007-11-02 12:54:39-04:00, jas@rowvwade. +0 -0

  storage/falcon/Priority.h@1.1, 2007-11-02 12:54:39-04:00, jas@rowvwade. +39 -0
    New BitKeeper file ``storage/falcon/Priority.h''

  storage/falcon/Priority.h@1.0, 2007-11-02 12:54:39-04:00, jas@rowvwade. +0 -0

  storage/falcon/PriorityScheduler.cpp@1.1, 2007-11-02 12:54:39-04:00, jas@rowvwade. +89 -0
    New BitKeeper file ``storage/falcon/PriorityScheduler.cpp''

  storage/falcon/PriorityScheduler.cpp@1.0, 2007-11-02 12:54:39-04:00, jas@rowvwade. +0 -0

  storage/falcon/PriorityScheduler.h@1.1, 2007-11-02 12:54:39-04:00, jas@rowvwade. +39 -0
    New BitKeeper file ``storage/falcon/PriorityScheduler.h''

  storage/falcon/PriorityScheduler.h@1.0, 2007-11-02 12:54:39-04:00, jas@rowvwade. +0 -0

  storage/falcon/SerialLogFile.cpp@1.10, 2007-11-02 12:54:38-04:00, jas@rowvwade. +9 -4
    Add support for priority scheduler to manage I/O operations.

ChangeSet@1.2603.21.22, 2007-11-02 16:10:16+02:00, gkodinov@magare.gmz +2 -0
  merge 5.1-opt -> 6.0-opt

  mysql-test/r/subselect_no_opts.result@1.5, 2007-11-02 16:10:15+02:00, gkodinov@magare.gmz +11 -0
    merge 5.1-opt -> 6.0-opt

  mysql-test/r/subselect_no_semijoin.result@1.5, 2007-11-02 16:10:15+02:00, gkodinov@magare.gmz +11 -0
    merge 5.1-opt -> 6.0-opt

ChangeSet@1.2529.164.2, 2007-11-02 16:40:08+03:00, kaa@polly.(none) +3 -0
  5.1-specific changes for bug #26215 after merging the patch from 5.0:
  
  - Added trigger tests back.
  - Fixed test cases to match the extended output format of SHOW CREATE ...
  - Replaced 'gptr' with 'uchar *'.

  client/mysql.cc@1.269.4.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +1 -1
    Replaced 'gptr' with 'uchar *'.

  mysql-test/r/mysql_comments.result@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +32 -20
    Fixed test cases to match the extended output format of SHOW CREATE ...
    Added trigger tests back.

  mysql-test/t/mysql_comments.sql@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +43 -2
    Added trigger tests back.

ChangeSet@1.1810.3438.4, 2007-11-02 13:16:23+01:00, kent@mysql.com +2 -0
  Makefile.am:
    Removed place holder for 'manual.chm'
  .del-manual.chm:
    Delete: Docs/manual.chm

  BitKeeper/deleted/.del-manual.chm@1.2, 2007-11-02 13:07:52+01:00, kent@mysql.com +0 -0
    Delete: Docs/manual.chm

  Docs/Makefile.am@1.57.1.12, 2007-11-02 13:15:42+01:00, kent@mysql.com +1 -1
    Removed place holder for 'manual.chm'

ChangeSet@1.1346.895.3, 2007-11-02 13:12:19+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Don't install INSTALL-BINARY, handled by build scripts

  Docs/Makefile.am@1.38.1.20, 2007-11-02 13:11:55+01:00, kent@mysql.com +1 -2
    Don't install INSTALL-BINARY, handled by build scripts

ChangeSet@1.2529.165.1, 2007-11-02 14:00:38+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #31554  	rpl.rpl_truncate_2myisam test failure: wrong master binlog file name
  
  Actually, the failure happened with 3innodb as well. Most probably
  the reason is in failing to delete a binlog file on __NT__ so that
  that master increments the index of the binlog file.
  The test results hide valueable warning that windows could generate
  about that.
  
  The scope of this fix is to make sure we have such warning and
  to lessen chances for binlog file being held at time of closing.
  The dump thread is getting a good chance to leave and 
  release the file for its successful deletion.
  
  We shall watch over the two tests as regression is not excluded.
  In that case we would have an extra info possibly explaining why
  __NT__ env can not close/delete the file.
  However, regardless of that reason, there is alwasy workaround to mask out
  non-deterministic binlog index number.
  

  mysql-test/extra/rpl_tests/rpl_truncate_helper.test@1.7, 2007-11-02 14:00:34+02:00, aelkin@koti.dsl.inet.fi +8 -6
    enable warnings for other than DROP queries;
    wait for slave's full stop which ensures io thread left and that
    will be regarded by dump thread to leave and close the binlog file;
    relocating reset master to the end of the test so that the caller of
    this helper should start with the binlog name which has not yet been
    affected/reset since its creation.

  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

ChangeSet@1.1810.3438.2, 2007-11-02 12:59:45+01:00, kent@mysql.com +5 -0
  Makefile.am:
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.0 of the manual

  Docs/INSTALL-BINARY@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  Docs/Makefile.am@1.57.1.10, 2007-11-02 12:58:49+01:00, kent@mysql.com +2 -4
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.

  INSTALL-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  INSTALL-WIN-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  support-files/MacOSX/ReadMe.txt@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

ChangeSet@1.2529.155.8, 2007-11-02 14:47:18+03:00, kostja@bodhi.(none) +2 -0
  Cleanup the test case for Bug#32030 "DELETE does not return an error and
   deletes rows if error evaluating WHERE"

  mysql-test/r/ps.result@1.121, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +0 -3
    Disable warnings.

  mysql-test/t/ps.test@1.123, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +2 -1
    Disable warnings.

ChangeSet@1.1616.3114.2, 2007-11-02 12:36:44+01:00, kent@mysql.com +1 -0
  INSTALL-WIN-SOURCE:
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.1, 2007-11-02 12:36:29+01:00, kent@mysql.com +9 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.0, 2007-11-02 12:36:29+01:00, kent@mysql.com +0 -0

ChangeSet@1.1346.895.2, 2007-11-02 12:29:13+01:00, kent@mysql.com +6 -0
  mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:
    Let place holders for real documentation have text that
    makes sense to the user (Bug#25205)

  BitKeeper/deleted/.del-generate-text-files.pl@1.4.2.1, 2007-11-02 01:13:38+01:00, kent@mysql.com +0 -0
    Delete: Docs/Support/generate-text-files.pl

  Docs/INSTALL-BINARY@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY

  Docs/INSTALL-BINARY@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  Docs/Makefile.am@1.38.1.19, 2007-11-02 01:32:35+01:00, kent@mysql.com +3 -26
    Don't generate text files from the documentation

  Docs/mysql.info@1.2, 2007-11-02 01:31:55+01:00, kent@mysql.com +3 -26
    More of a end-user text

  INSTALL-SOURCE@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE

  INSTALL-SOURCE@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  support-files/MacOSX/ReadMe.txt@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt

  support-files/MacOSX/ReadMe.txt@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

ChangeSet@1.1810.3437.1, 2007-11-02 13:40:34+03:00, kaa@polly.(none) +4 -0
  Fix for:
    bug #26215: mysql command line client should not strip comments
                from SQL statements
  and
    bug #11230: Keeping comments when storing stored procedures
  
  With the introduction of multiline comments support in the command line
  client (mysql) in MySQL 4.1, it became impossible to preserve
  client-side comments within single SQL statements or stored routines.
  This feature was useful for monitoring tools and maintenance.
  
  The patch adds a new option to the command line client
  ('--enable-comments', '-c') which allows to preserve SQL comments and
  send them to the server for single SQL statements, and to keep comments
  in the code for stored procedures / functions / triggers.
  
  The patch is a modification of the contributed patch from bug #11230
  with the following changes:
  - code style changes to conform to the coding guidelines
  - changed is_prefix() to my_strnncoll() to detect the DELIMITER
  command, since the first one is case-sensitive and not charset-aware
  - renamed t/comments-51.* to t/mysql_comments.*
  - removed tests for comments in triggers since 5.0 does not have SHOW
  CREATE TRIGGER (those tests will be added back in 5.1).
  
  The test cases are only for bug #11230. No automated test case for bug
  #26215 is possible due to the test suite deficiencies (though the cases
  from the bug report were tested manually).

  client/mysql.cc@1.199.30.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +125 -43
    Applied the contributed patch from bug11230 with the following changes:
    - code style changes to conform to the coding guidelines
    - changed is_prefix() to my_strnncoll() to detect the DELIMITER
    command, since the first one is case-sensitive and not charset-aware
    
    The patch adds a new option to the command line client which allows to
    preserve SQL comments and send them to the server to ensure better
    error reporting and to, keep comments in the code for stored procedures
    / functions / triggers.

  mysql-test/r/mysql_comments.result@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +50 -0
    Added test cases for bug11230.

  mysql-test/r/mysql_comments.result@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.sql@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +177 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.sql@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.test@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +37 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.test@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

ChangeSet@1.2603.16.12, 2007-11-02 14:13:47+04:00, svoj@mysql.com +2 -0
  BUG#31295 - NULL alter table operation causes falcon table to lose it's
              tablespace assoc.
  
  Added a test case to document that the problem is not repeatable
  anymore.

  mysql-test/suite/falcon/r/falcon_ts.result@1.4, 2007-11-02 14:13:45+04:00, svoj@mysql.com +15 -0
    A test case for BUG#31295.

  mysql-test/suite/falcon/t/falcon_ts.test@1.4, 2007-11-02 14:13:45+04:00, svoj@mysql.com +14 -0
    A test case for BUG#31295.

ChangeSet@1.1616.3094.8, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
  Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Preliminarily disabled test case

  mysql-test/t/disabled.def@1.1.5.1, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
    Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
    Preliminarily disabled test case

ChangeSet@1.2529.147.4, 2007-11-02 09:58:29+01:00, istruewing@stella.local +2 -0
  Bug#32048 - innodb_mysql.test produces warnings files
  
  Typo --#echo at line begin in test files lead to warnings
  from mysqltest.
    
  Changed to --echo #.

  mysql-test/include/mix1.inc@1.56.5.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -1
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed comment sign

  mysql-test/r/innodb_mysql.result@1.24.31.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -0
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed test result

ChangeSet@1.2529.161.2, 2007-11-02 12:39:14+04:00, gluh@mysql.com +3 -0
  Bug#31630 debug assert with explain extended select ... from i_s
  added 'in_rows' column value for 'describe extended' for the case 
  when 'describe' handles I_S table

  mysql-test/r/information_schema.result@1.156.2.14, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/information_schema.test@1.100.1.14, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test case

  sql/sql_select.cc@1.541.34.1, 2007-11-02 12:39:12+04:00, gluh@mysql.com +4 -0
    added 'in_rows' column value for 'describe extended' for the case 
    when 'describe' handles I_S table

ChangeSet@1.2529.161.1, 2007-11-02 12:24:45+04:00, gluh@mysql.com +3 -0
  Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names
  db name should be quoted. this code does communication with the server.
  it's always ok to quote names in this case.

  client/mysqldump.c@1.275.15.14, 2007-11-02 12:24:43+04:00, gluh@mysql.com +3 -1
    db name should be quoted. this code does communication with the server.
    it's always ok to quote names in this case.

  mysql-test/r/mysqldump.result@1.152.5.4, 2007-11-02 12:24:43+04:00, gluh@mysql.com +19 -0
    test result

  mysql-test/t/mysqldump.test@1.136.6.4, 2007-11-02 12:24:44+04:00, gluh@mysql.com +12 -0
    test case

ChangeSet@1.2603.35.10, 2007-11-02 01:38:30-05:00, chris@xeno.mysql.com +2 -0
  Bug#31967, "Falcon: hang changing falcon_record_memory_max"
  
  Enforce upper limit of falcon_record_memory_max to that of physical memory.

  storage/falcon/Configuration.cpp@1.6.1.1, 2007-11-02 01:38:28-05:00, chris@xeno.mysql.com +24 -8
    Configuration::setRecordMemoryMax() imposes upper limit of
    falcon_record_memory_max to that of physical system memory.

  storage/falcon/Configuration.h@1.3.1.1, 2007-11-02 01:38:28-05:00, chris@xeno.mysql.com +1 -1
    Configuration::setRecordMemoryMax() imposes upper limit of
    falcon_record_memory_max to that of physical system memory.

ChangeSet@1.2603.37.13, 2007-11-02 00:18:36-05:00, klewis@klewis-mysql. +2 -0
  Test case for Bug#29452 which is fixed now that Jim has added
  a wait lock timeout.

  mysql-test/suite/falcon/r/falcon_bug_29452.result@1.1, 2007-11-02 00:18:28-05:00, klewis@klewis-mysql. +34 -0
    Test case for Bug#29452 which is fixed now that Jim has added
    a wait lock timeout.

  mysql-test/suite/falcon/r/falcon_bug_29452.result@1.0, 2007-11-02 00:18:28-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_29452.test@1.1, 2007-11-02 00:18:31-05:00, klewis@klewis-mysql. +42 -0
    Test case for Bug#29452 which is fixed now that Jim has added
    a wait lock timeout.

  mysql-test/suite/falcon/t/falcon_bug_29452.test@1.0, 2007-11-02 00:18:31-05:00, klewis@klewis-mysql. +0 -0

ChangeSet@1.2603.37.12, 2007-11-02 00:16:09-05:00, klewis@klewis-mysql. +3 -0
  Update falcon_options and falcon_options2 to reflect new
  and deleted variables

  mysql-test/suite/falcon/r/falcon_options.result@1.8, 2007-11-02 00:15:56-05:00, klewis@klewis-mysql. +6 -2
    Update falcon_options and falcon_options2 to reflect new
    and deleted variables

  mysql-test/suite/falcon/r/falcon_options2.result@1.7, 2007-11-02 00:15:59-05:00, klewis@klewis-mysql. +75 -19
    Update falcon_options and falcon_options2 to reflect new
    and deleted variables

  mysql-test/suite/falcon/t/falcon_options2.test@1.2, 2007-11-02 00:16:03-05:00, klewis@klewis-mysql. +24 -17
    Update falcon_options and falcon_options2 to reflect new
    and deleted variables

ChangeSet@1.2603.37.11, 2007-11-02 00:09:58-05:00, klewis@klewis-mysql. +1 -0
  Interpret non-zero error codes in rename_table

  storage/falcon/ha_falcon.cpp@1.18, 2007-11-02 00:09:46-05:00, klewis@klewis-mysql. +6 -3
    Interpret non-zero error codes in rename_table

ChangeSet@1.2529.160.1, 2007-11-02 02:36:12+03:00, kostja@bodhi.(none) +5 -0
  A fix for Bug#32030 "DELETE does not return an error and deletes rows if 
  error evaluating WHERE"
  
  DELETE with a subquery in WHERE clause would sometimes ignore subquery
  evaluation error and proceed with deletion.
  
  The fix is to check for an error after evaluation of the WHERE clause
  in DELETE.
  
  Addressed review comments.

  mysql-test/r/group_min_max.result@1.33.1.3, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -2
    Update the test results to reflect the fix for Bug#32030.

  mysql-test/r/ps.result@1.120, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +20 -0
    Update test results (Bug#32030)

  mysql-test/t/group_min_max.test@1.33, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -0
    Update the test case to reflect the fix for Bug#32030

  mysql-test/t/ps.test@1.122, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +33 -0
    Add a test case for Bug#32030

  sql/sql_delete.cc@1.204.18.3, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +9 -2
    Check for an error before calling send_ok(). Two different places are
    covered because the subquery code has slightly different execution
    paths depending on ps-protocol/old-protocol

ChangeSet@1.2529.159.1, 2007-11-01 18:52:56-02:00, davi@endora.local +15 -0
  Bug#30882 Dropping a temporary table inside a stored function may cause a server crash
  
  If a stored function that contains a drop temporary table statement
  is invoked by a create temporary table of the same name may cause
  a server crash. The problem is that when dropping a table no check
  is done to ensure that table is not being used by some outer query
  (or outer statement), potentially leaving the outer query with a
  reference to a stale (freed) table.
  
  The solution is when dropping a temporary table, always check if
  the table is being used by some outer statement as a temporary
  table can be dropped inside stored procedures.
  
  The check is performed by looking at the TABLE::query_id value for
  temporary tables. To simplify this check and to solve a bug related
  to handling of temporary tables in prelocked mode, this patch changes
  the way in which this member is used to track the fact that table is
  used/unused. Now we ensure that TABLE::query_id is zero for unused
  temporary tables (which means that all temporary tables which were
  used by a statement should be marked as free for reuse after it's
  execution has been completed).

  mysql-test/include/handler.inc@1.40, 2007-11-01 18:52:50-02:00, davi@endora.local +32 -0
    Add test case for side effect of Bug#30882

  mysql-test/r/handler_innodb.result@1.22, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/handler_myisam.result@1.35, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/sp-error.result@1.125.1.9, 2007-11-01 18:52:50-02:00, davi@endora.local +49 -3
    Add test case result for Bug#30882

  mysql-test/t/sp-error.test@1.122.1.7, 2007-11-01 18:52:50-02:00, davi@endora.local +69 -5
    Add test case for Bug#30882

  sql/event_db_repository.cc@1.38, 2007-11-01 18:52:50-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values.

  sql/mysql_priv.h@1.505.17.25, 2007-11-01 18:52:51-02:00, davi@endora.local +2 -2
    Remove implicit default parameters values of the close_thread_tables
    function as no callers are using it.

  sql/slave.cc@1.301.11.3, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sp_head.cc@1.279.10.7, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sql_base.cc@1.374.55.4, 2007-11-01 18:52:51-02:00, davi@endora.local +89 -52
    Changed the approach to distinguishing currently unused temporary tables.
    Now we ensure that such tables always have TABLE::query_id set to 0 and
    use this fact to perform checks during opening and dropping of temporary
    tables. This means that we have to call close_thread_tables() even for
    statements which use only temporary tables. To make this call cheaper,
    we re-factored close_thread_tables() to not take LOCK_open unless there
    are open base tables.

  sql/sql_handler.cc@1.99.1.5, 2007-11-01 18:52:52-02:00, davi@endora.local +14 -0
    Properly close temporary tables associated with a handler.

  sql/sql_insert.cc@1.282.15.2, 2007-11-01 18:52:52-02:00, davi@endora.local +1 -1
    close_temporary_table is now merged into drop_temporary_table.

  sql/sql_parse.cc@1.693.19.8, 2007-11-01 18:52:52-02:00, davi@endora.local +6 -9
    Now the condition doesn't cover all cases because close_thread_tables()
    must be called even for statements that use only temporary tables.

  sql/sql_table.cc@1.388.64.1, 2007-11-01 18:52:52-02:00, davi@endora.local +22 -6
    Use drop_temporary_table which perform checks to verify if
    the table is not being used. Error path problem is due to
    a handler tables issue and is going to be addressed in bug
    31397.

  sql/table.h@1.174.6.7, 2007-11-01 18:52:52-02:00, davi@endora.local +20 -2
    Rename previously unused clear_query_id and document the usage of
    query_id and open_by_handler.

ChangeSet@1.2603.36.2, 2007-11-01 15:43:39-05:00, chris@xeno.mysql.com +4 -0
  Bug#22564, "auto_increment column gets automatically incremented"
  
  Removed HA_AUTO_PART_KEY from StorageInterface::table_flags().
  This will allow autoincrement columns to be defined in multipart
  indexes, but only as the first column of the index.

  mysql-test/suite/falcon/r/falcon_bug_22564.result@1.2, 2007-11-01 15:43:37-05:00, chris@xeno.mysql.com +26 -8
    Added passing and failing tests

  mysql-test/suite/falcon/t/disabled.def@1.5.1.1, 2007-11-01 15:43:37-05:00, chris@xeno.mysql.com +1 -2
    Enabled 22564

  mysql-test/suite/falcon/t/falcon_bug_22564.test@1.3, 2007-11-01 15:43:37-05:00, chris@xeno.mysql.com +25 -3
    Added passing and failing tests

  storage/falcon/ha_falcon.cpp@1.13.2.2, 2007-11-01 15:43:37-05:00, chris@xeno.mysql.com +1 -1
    Removed HA_AUTO_PART_KEY from StorageInterface::table_flags().
    Autoincrement columns are still allowed in multipart indexes,
    but only as the first column of the index.

ChangeSet@1.2603.42.1, 2007-11-01 16:28:51-04:00, jas@rowvwade. +7 -0
  Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
  srlSmallBlob, respectively, to reduce (but not eliminate)
  confusion.

  storage/falcon/Dbb.cpp@1.14, 2007-11-01 16:28:42-04:00, jas@rowvwade. +1 -1
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/SRLBlobUpdate.cpp@1.2, 2007-11-01 16:28:42-04:00, jas@rowvwade. +1 -1
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/SRLUpdateBlob.cpp@1.3, 2007-11-01 16:28:43-04:00, jas@rowvwade. +1 -1
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/Section.cpp@1.12.1.1, 2007-11-01 16:28:43-04:00, jas@rowvwade. +2 -2
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/SerialLogControl.cpp@1.8, 2007-11-01 16:28:43-04:00, jas@rowvwade. +4 -4
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/SerialLogControl.h@1.4, 2007-11-01 16:28:44-04:00, jas@rowvwade. +2 -2
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

  storage/falcon/SerialLogRecord.h@1.5, 2007-11-01 16:28:44-04:00, jas@rowvwade. +2 -2
    Rename srlBlobUpdate and srlUpdateBlob to srlLargeBlob and
    srlSmallBlob, respectively, to reduce (but not eliminate)
    confusion.

ChangeSet@1.2603.37.7, 2007-11-01 16:23:10-04:00, jas@fluffy.netfrastructure.com +3 -0
  Make record locator space slot validation a conditional
  macro to make it easier to turn it on for debugging.

  storage/falcon/Section.cpp@1.13, 2007-11-01 16:23:07-04:00, jas@fluffy.netfrastructure.com +26 -6
    Make record locator space slot validation a conditional
    macro to make it easier to turn it on for debugging.

  storage/falcon/SerialLogFile.cpp@1.9, 2007-11-01 16:23:07-04:00, jas@fluffy.netfrastructure.com +3 -0
    Added "stat" for serial log files to get device segment
    size.  Unfortunately, "stat" lies.  Never the less, the
    code is there for reference.

  storage/falcon/StorageDatabase.cpp@1.5, 2007-11-01 16:23:07-04:00, jas@fluffy.netfrastructure.com +3 -2
    Move lock on the system transactions for rename table to
    include index renaming as well as the table proper.

ChangeSet@1.2529.122.7, 2007-11-01 12:30:03-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30671
    "ALTER SERVER can cause server to crash"
    While retrieving values, it would erronously set the socket value
    to NULL and attempt to use it in strcmp().
    Ensure it is correctly set to "" so that strcmp may not crash.

  mysql-test/r/federated_server.result@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +9 -1
    results for bug30671
    fix inconsistent result

  mysql-test/t/federated_server.test@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +13 -1
    surplus semicolon
    test for bug30671

  sql/sql_servers.cc@1.15, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +2 -2
    bug30671
    inside function get_server_from_table_to_cache()
      server->socket was being set to NULL instead of empty string

ChangeSet@1.2529.158.1, 2007-11-01 17:29:20-02:00, davi@endora.local +2 -0
  Bug#31850 Test crashes in "embedded" server
  
  The mysql_change_user command fails to properly update the database pointer
  when no database is selected, leading to "use after free" errors. The same
  happens on the user privilege pointer in the thread security context.
  
  The solution is to properly reset and update the database name. Also update
  the user_priv pointer so that it doesn't point to freed memory.

  sql/sql_connect.cc@1.9.3.1, 2007-11-01 17:29:17-02:00, davi@endora.local +9 -14
    After a successful call to check_user() without specifying a new
    database name, the previous database thd->db) is freed but the
    pointer is not updated to NULL.

  sql/sql_parse.cc@1.693.24.1, 2007-11-01 17:29:17-02:00, davi@endora.local +3 -2
    Update the security_ctx->priv_user pointer as it is a alias for
    the user security_ctx->user pointer. Also remove unneeded cast,
    the x_free macro casts the argument.

ChangeSet@1.1810.3287.46, 2007-11-01 19:40:27+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41 & 5.0.45 on Mac OS X Server 10.5

  mysql-test/mysql-test-run.pl@1.30.49.109, 2007-11-01 19:40:25+01:00, msvensson@pilot.mysql.com +10 -0
    Also check for euid == 0

ChangeSet@1.2603.41.1, 2007-11-01 14:37:56-04:00, dkatz@damien-katzs-computer.local +43 -0
  WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  config/ac-macros/libevent.m4@1.1, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +304 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  config/ac-macros/libevent.m4@1.0, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +0 -0

  configure.in@1.382.4.1, 2007-11-01 14:37:47-04:00, dkatz@damien-katzs-computer.local +2 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/Makefile.am@1.47, 2007-11-01 14:37:47-04:00, dkatz@damien-katzs-computer.local +2 -2
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/Makefile.am@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +20 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/Makefile.am@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/README@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +53 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/README@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/buffer.c@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +460 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/buffer.c@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/compat/sys/_time.h@1.1, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +163 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/compat/sys/_time.h@1.0, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/compat/sys/queue.h@1.1, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +488 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/compat/sys/queue.h@1.0, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/compat/sys/tree.h@1.1, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +677 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/compat/sys/tree.h@1.0, 2007-11-01 14:37:51-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/devpoll.c@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +419 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/devpoll.c@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/epoll.c@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +366 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/epoll.c@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/epoll_sub.c@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +52 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/epoll_sub.c@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evbuffer.c@1.1, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +413 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evbuffer.c@1.0, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evdns.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +3116 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evdns.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evdns.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +367 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evdns.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/event-internal.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +61 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/event-internal.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/event.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +928 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/event.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/event.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +340 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/event.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/event_tagging.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +372 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/event_tagging.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evhttp.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +221 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evhttp.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evport.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +531 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evport.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/evsignal.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +44 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/evsignal.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/http-internal.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +122 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/http-internal.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/http.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +2368 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/http.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/kqueue.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +419 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/kqueue.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/log.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +219 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/log.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/log.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +43 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/log.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/poll.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +391 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/poll.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/select.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +373 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/select.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/signal.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +195 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/signal.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/strlcpy-internal.h@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +23 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/strlcpy-internal.h@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  extra/libevent/strlcpy.c@1.1, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +76 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  extra/libevent/strlcpy.c@1.0, 2007-11-01 14:37:50-04:00, dkatz@damien-katzs-computer.local +0 -0

  libmysqld/Makefile.am@1.118, 2007-11-01 14:37:47-04:00, dkatz@damien-katzs-computer.local +5 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  mysql-test/r/crash_commit_before.result@1.3, 2007-11-01 14:37:47-04:00, dkatz@damien-katzs-computer.local +1 -1
    Fix a test case that fails by setting the global debug variable instead of the session debug variable.
    
    "SET SESSION debug" sets a value that is actually stored in a OS thread variable, instead of the session (THD) object. The libevent work breaks this because each request is likely handled by a different OS thread.

  mysql-test/r/sp-threads.result@1.10, 2007-11-01 14:37:47-04:00, dkatz@damien-katzs-computer.local +2 -2
    Changed code that populates the process table to uniformally output blank status as NULL, instead of sometimes NULL/sometimes emptry string.

  mysql-test/t/crash_commit_before.test@1.7, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +1 -1
    Fix a test case that fails by setting the global debug variable instead of the session debug variable.
    
    "SET SESSION debug" sets a value that is actually stored in a OS thread variable, instead of the session (THD) object. The libevent work breaks this because each request is likely handled by a different OS thread.

  sql/Makefile.am@1.200, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +3 -2
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  sql/mysql_priv.h@1.529.2.1, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +1 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  sql/scheduler.cc@1.2, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +515 -3
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  sql/scheduler.h@1.2, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +26 -0
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  sql/sql_connect.cc@1.14.1.1, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +1 -1
    WL441: Work to integrate libevent and support the --thread_handling=pool-of-threads runtime option.

  sql/sql_show.cc@1.435.1.3, 2007-11-01 14:37:48-04:00, dkatz@damien-katzs-computer.local +2 -2
    Changed code that populates the process table to uniformally output blank status as NULL, instead of sometimes NULL/sometimes emptry string.

  storage/myisammrg/myrg_open.c@1.39, 2007-11-01 14:37:49-04:00, dkatz@damien-katzs-computer.local +2 -0
    Merge table uses my_errno to indicate error conditions. If it's already set, it will cause spurious failures. Therefore, we clear the error ahead of time.

ChangeSet@1.2603.37.6, 2007-11-01 12:50:25-04:00, jas@rowvwade. +5 -0
  Fix stupid cut and paste bug in SRLUpdateBlob.

  storage/falcon/SRLIndexDelete.cpp@1.4, 2007-11-01 12:50:16-04:00, jas@rowvwade. +1 -2
    Remove debugging code.

  storage/falcon/SRLRecordLocator.cpp@1.3, 2007-11-01 12:50:16-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

  storage/falcon/SRLUpdateBlob.cpp@1.2, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Fix stupid cut and paste error.  Bad Jim!  Bad Jim!

  storage/falcon/SerialLogControl.cpp@1.7, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

  storage/falcon/SerialLogRecord.h@1.4, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

ChangeSet@1.1810.3395.17, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #31794: no syntax error on SELECT id FROM t HAVING count(*)>2
  
  The HAVING clause is subject to the same rules as the SELECT list
  about using aggregated and non-aggregated columns.
  But this was not enforced when processing implicit grouping from
  using aggregate functions.
  Fixed by performing the same checks for HAVING as for SELECT.

  mysql-test/r/func_group.result@1.49.1.15, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +15 -0
    Bug #31794: test case

  mysql-test/t/func_group.test@1.48.1.11, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +19 -0
    Bug #31794: test case

  sql/sql_select.cc@1.312.173.2, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +10 -2
    Bug #31794: Check HAVING in addition to SELECT list

ChangeSet@1.2529.1.73, 2007-11-01 17:24:21+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  disable test

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.6.2, 2007-11-01 17:24:18+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    disable test

ChangeSet@1.2603.35.8, 2007-11-01 11:08:00-05:00, klewis@klewis-mysql. +1 -0
  Missed a spot where spaces were used intead of tabs

  mysql-test/suite/falcon/r/falcon_options.result@1.7, 2007-11-01 11:07:18-05:00, klewis@klewis-mysql. +2 -2
    Missed a spot where spaces were used intead of tabs

ChangeSet@1.2603.37.5, 2007-11-01 11:59:25-04:00, jas@rowvwade. +3 -0
  Enable record locator page space management validation to
  catch bug.

  storage/falcon/RecordLocatorPage.cpp@1.2, 2007-11-01 11:59:17-04:00, jas@rowvwade. +9 -18
    Recover from space management structure corruption on the
    record locator page if necessary.

  storage/falcon/SRLIndexDelete.cpp@1.3, 2007-11-01 11:59:17-04:00, jas@rowvwade. +2 -0
    Validate index version number to catch bug.

  storage/falcon/Section.cpp@1.12, 2007-11-01 11:59:18-04:00, jas@rowvwade. +7 -4
    Enable record locator page space management validation to
    catch bug.

ChangeSet@1.2529.155.4, 2007-11-01 18:33:51+03:00, kostja@bodhi.(none) +1 -0
  Cleanup execute_ddl_log_recovery() to not generate an error if 
  there is nothing to recover.
  
  Discovered while working on Bug#12713

  sql/sql_table.cc@1.388.62.4, 2007-11-01 18:33:49+03:00, kostja@bodhi.(none) +1 -1
    Use MYF(0) in my_open() in read_ddl_log_header() called from
    execute_ddl_log_recovery() called during the server start up to not
    generate an error if no ddl log exists. This is not an erroneous situation,
    in fact it's the case in any server statrtup. The error was lost
    anyway, since it was pushed into the stack of the artificial thd.

ChangeSet@1.2529.50.40, 2007-11-01 18:06:46+03:00, kostja@bodhi.(none) +1 -0
  Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
  error in mysql_create_frm instead of
  direct access to my_error() members.
  
  This is a pre-requisite for the patch for Bug#12713.

  sql/unireg.cc@1.103.3.1, 2007-11-01 18:06:44+03:00, kostja@bodhi.(none) +42 -6
    Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
    error in mysql_create_frm instead of
    direct access to my_error() members.

ChangeSet@1.2529.50.39, 2007-11-01 17:08:02+03:00, kostja@bodhi.(none) +1 -0
  Use thd->is_error() instead of direct access to thd->net.report_error
  in evaluate_join_record().
  
  A minor cleanup required for the fix for Bug#12713.

  sql/sql_select.cc@1.541.29.5, 2007-11-01 17:07:59+03:00, kostja@bodhi.(none) +5 -6
    Use thd->is_error() instead of direct access to thd->net.report_error
    in evaluate_join_record()

ChangeSet@1.1810.3434.2, 2007-11-01 15:04:23+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.51.9.1, 2007-11-01 15:04:22+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1810.3434.1, 2007-11-01 15:03:09+01:00, istruewing@stella.local +1 -0
  Bug#31909 - New gis.test creates warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
  
  Changed -- to #.

  mysql-test/include/gis_keys.inc@1.2, 2007-11-01 15:03:08+01:00, istruewing@stella.local +8 -8
    Bug#31909 - New gis.test creates warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2529.50.38, 2007-11-01 17:00:24+03:00, kostja@bodhi.(none) +1 -0
  Fix a compilation warning.

  sql/sql_connect.cc@1.9.1.7, 2007-11-01 17:00:22+03:00, kostja@bodhi.(none) +0 -1
    Fix a compilation warning (unused variable).

ChangeSet@1.2529.156.1, 2007-11-01 14:42:14+02:00, gkodinov@magare.gmz +3 -0
  Bug #31866: MySQL Server crashes on SHOW CREATE TRIGGER statement
  
  SHOW CREATE TRIGGER was not checking for detected errors 
  opening/reading the trigger file. 
  Fixed to return the already generated error.

  mysql-test/r/trigger.result@1.73, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +6 -0
    Bug #31866: test case

  mysql-test/t/trigger.test@1.83, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +12 -0
    Bug #31866: test case

  sql/sql_show.cc@1.415.19.1, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +3 -0
    Bug #31866: test for error and return it.

ChangeSet@1.1810.3413.3, 2007-11-01 16:27:01+04:00, svoj@mysql.com +1 -0
  BUG#31950 - repair table hangs while processing multicolumn utf8
              fulltext index
  
  Having a table with broken multibyte characters may cause fulltext
  parser dead-loop.
  
  Since normally it is not possible to insert broken multibyte sequence
  into a table, this problem may arise only if table is damaged.
  
  Affected statements are:
  - CHECK/REPAIR against damaged table with fulltext index;
  - boolean mode phrase search against damaged table with or
    without fulltext inex;
  - boolean mode searches without index;
  - nlq searches.
  
  No test case for this fix. Affects 5.0 only.

  myisam/ft_parser.c@1.46.6.1, 2007-11-01 16:27:00+04:00, svoj@mysql.com +1 -1
    When skipping leading spaces, skip broken characters as well (broken
    characters a identified by mbl == 0).

ChangeSet@1.2603.40.3, 2007-11-01 15:27:58+04:00, svoj@mysql.com +3 -0
  BUG#31296 - falcon does not remove associated tablespace file.
  
  When dropping a tablespace, falcon doesn't clean-up data files and
  in-memory data structures.

  mysql-test/suite/falcon/r/falcon_ts.result@1.3, 2007-11-01 15:27:55+04:00, svoj@mysql.com +4 -0
    A test case for BUG#31296.

  mysql-test/suite/falcon/t/falcon_ts.test@1.3, 2007-11-01 15:27:55+04:00, svoj@mysql.com +8 -0
    A test case for BUG#31296.

  storage/falcon/SRLDropTableSpace.cpp@1.2, 2007-11-01 15:27:55+04:00, svoj@mysql.com +1 -0
    When dropping a tablespace, foreground thread only removes a tablespace
    entry from system tables and adds appropriate event to the serial log.
    Tablespace data file is removed during commitSystemTransaction phase by
    TableSpaceManager::expungeTableSpace() function.
    
    When we enter SRLDropTableSpace::append, there is no SerialLogTransaction
    entry in the SerialLogTransaction hash for the SystemTransaction.
    
    During the commit phase, we also add an UpdateRecords event to the serial
    log. This is needed for the system table update described above. When
    the update record event is added to the serial log,
    SRLUpdateRecords::append() gets SerialLogTransaction element for current
    transaction from the SerialLogTransaction hash. As there is no element
    for current transaction, it creates new one and informs SerialLog that
    log for current transaction starts at the current offset, leaving
    SRLDropTableSpace event behind.
    
    As SRLDropTableSpace event is the first event written to the serial log
    during drop tablespace statement, inform serial log that transaction
    is started by calling log->getTransaction().

ChangeSet@1.2643, 2007-11-01 12:12:10+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  disable test

  BitKeeper/etc/ignore@1.298, 2007-11-01 12:12:07+01:00, tomas@whalegate.ndb.mysql.com +5 -0
    Added storage/archive/archive_performance storage/archive/concurrency_test libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list

  mysql-test/suite/rpl_ndb/t/disabled.def@1.10, 2007-11-01 12:12:07+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    disable test

ChangeSet@1.2529.1.72, 2007-11-01 12:02:41+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  disable tests

  BitKeeper/etc/ignore@1.276.13.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Added libmysql_r/client_settings.h to the ignore list

  mysql-test/suite/rpl/t/disabled.def@1.11.2.2, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.6.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

ChangeSet@1.1810.3404.2, 2007-11-01 11:33:35+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#32023 ndb_mgmd is slow to repsond when no nodes are up

  ndb/src/mgmsrv/Services.cpp@1.45.43.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +1 -1
    Only call 'updateStatus'(and forcing HB) once before printing
    node status 

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.16.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +4 -1
    Only wait for reply to forced API_REGREQ if any signals
    has been sent

ChangeSet@1.1810.3433.2, 2007-11-01 11:02:28+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
   - Fix problem in first implementation

  mysql-test/lib/mtr_cases.pl@1.12.1.31, 2007-11-01 11:02:27+01:00, msvensson@pilot.mysql.com +4 -6
    Prepend a ^ to the regex only if _all_ charactersin the pattern are normal

ChangeSet@1.1810.3433.1, 2007-11-01 11:01:05+01:00, msvensson@pilot.mysql.com +1 -0
  Fix comment

  client/mysqltest.c@1.155.9.119, 2007-11-01 11:01:01+01:00, msvensson@pilot.mysql.com +1 -1
    Fix comment

ChangeSet@1.2603.40.2, 2007-11-01 11:52:19+04:00, svoj@mysql.com +10 -0
  BUG#31114 - falcon : creating tablespace with same name twice returns
              Unknown error -103
  
  When creating a tablespace that already exists, falcon returns
  non-informative error message.

  include/my_base.h@1.110, 2007-11-01 11:52:16+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  mysql-test/suite/falcon/r/falcon_ts.result@1.2, 2007-11-01 11:52:16+04:00, svoj@mysql.com +4 -0
    A test case for BUG#31114.

  mysql-test/suite/falcon/t/falcon_ts.test@1.2, 2007-11-01 11:52:16+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31114.

  sql/share/errmsg.txt@1.113.1.1, 2007-11-01 11:52:16+04:00, svoj@mysql.com +2 -0
     Added "tablespace already exist" message.

  sql/sql_tablespace.cc@1.13, 2007-11-01 11:52:16+04:00, svoj@mysql.com +11 -11
    Added handling of HA_ERR_TABLESPACE_EXIST error.

  storage/falcon/SQLException.h@1.1.1.1, 2007-11-01 11:52:17+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  storage/falcon/Statement.cpp@1.1.1.1, 2007-11-01 11:52:17+04:00, svoj@mysql.com +1 -1
    Throw "tablespace already exists" error using appropriate error code.

  storage/falcon/StorageHandler.cpp@1.1.1.1, 2007-11-01 11:52:17+04:00, svoj@mysql.com +3 -1
    Check if TableSpaceManager got "tablespace already exists" error and
    return appropriate error code in this case.

  storage/falcon/StorageTableShare.h@1.1.1.1, 2007-11-01 11:52:17+04:00, svoj@mysql.com +2 -1
    Added error code for "tablespace already exist" error.

  storage/falcon/ha_falcon.cpp@1.3.1.6, 2007-11-01 11:52:17+04:00, svoj@mysql.com +2 -0
    Check if StorageHandler got "tablespace already exists" error and
    return appropriate error code in this case.

ChangeSet@1.1810.3202.21, 2007-11-01 07:59:55+01:00, knielsen@ymer.(none) +1 -0
  Bug #31848: Test failure: Cluster has problems on insert with auto-increment
  
  Fix uninitialized variable causing failures for some interpreted update
  operations on gcc 4.2.1.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.13.1, 2007-11-01 07:59:52+01:00, knielsen@ymer.(none) +2 -1
    Fix uninitialized variable causing failures for some interpreted update
    operations on gcc 4.2.1.

ChangeSet@1.2603.40.1, 2007-11-01 10:20:17+04:00, svoj@mysql.com +5 -0
  BUG#31110 - falcon: missing engine check while dropping tablespace
  
  Creating a tablespace with engine that doesn't support tablespaces
  reports a warning and succeedes doing nothing.
  
  With this fix such statement returns and error instead.
  
  Note that this problem is not actually related to falcon, but is
  generic server issue.

  mysql-test/suite/falcon/r/falcon_ts.result@1.1, 2007-11-01 10:20:14+04:00, svoj@mysql.com +2 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/r/falcon_ts.result@1.0, 2007-11-01 10:20:14+04:00, svoj@mysql.com +0 -0

  mysql-test/suite/falcon/t/falcon_ts.test@1.1, 2007-11-01 10:20:14+04:00, svoj@mysql.com +7 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/t/falcon_ts.test@1.0, 2007-11-01 10:20:14+04:00, svoj@mysql.com +0 -0

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.27.2.1, 2007-11-01 10:20:14+04:00, svoj@mysql.com +3 -7
    Modified a test case according to fix for BUG#31110.

  mysql-test/suite/ndb/t/ndb_dd_basic.test@1.19, 2007-11-01 10:20:14+04:00, svoj@mysql.com +3 -0
    Modified a test case according to fix for BUG#31110.

  sql/sql_tablespace.cc@1.12, 2007-11-01 10:20:14+04:00, svoj@mysql.com +4 -5
    Return an error (instead of warning) when engine doesn't support
    tablespaces.

ChangeSet@1.2603.35.7, 2007-11-01 00:35:02-05:00, klewis@klewis-mysql. +2 -0
  For falcon_bug_26433.test, pushbuild hits a timeout with 1500 loops. Use only 500

  mysql-test/suite/falcon/r/falcon_bug_26433.result@1.2, 2007-11-01 00:34:46-05:00, klewis@klewis-mysql. +1 -1
    For falcon_bug_26433.test, pushbuild hits a timeout with 1500 loops. Use only 500

  mysql-test/suite/falcon/t/falcon_bug_26433.test@1.3, 2007-11-01 00:34:49-05:00, klewis@klewis-mysql. +1 -1
    For falcon_bug_26433.test, pushbuild hits a timeout with 1500 loops. Use only 500

ChangeSet@1.2603.35.6, 2007-11-01 00:25:40-05:00, klewis@klewis-mysql. +3 -0
  falcon_bug_29151_A is now working

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.3, 2007-11-01 00:25:15-05:00, klewis@klewis-mysql. +8 -3
    falcon_bug_29151_A is now working

  mysql-test/suite/falcon/t/disabled.def@1.8, 2007-11-01 00:25:18-05:00, klewis@klewis-mysql. +0 -1
    falcon_bug_29151_A is now working

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.3, 2007-11-01 00:25:33-05:00, klewis@klewis-mysql. +9 -9
    falcon_bug_29151_A is now working

ChangeSet@1.2603.39.1, 2007-10-31 22:25:38-05:00, klewis@klewis-mysql. +2 -0
  Clean up testcase.  Use tab not spaces.

  mysql-test/suite/falcon/r/falcon_options.result@1.6, 2007-10-31 22:25:25-05:00, klewis@klewis-mysql. +2 -2
    Clean up testcase.  Use tab not spaces.

  mysql-test/suite/falcon/r/falcon_options2.result@1.6, 2007-10-31 22:25:31-05:00, klewis@klewis-mysql. +2 -2
    Clean up testcase.  Use tab not spaces.

ChangeSet@1.2529.50.36, 2007-11-01 00:55:25+03:00, kostja@bodhi.(none) +1 -0
  Another attempt to fix the Windows compilation failre.

  sql-common/client.c@1.146, 2007-11-01 00:55:23+03:00, kostja@bodhi.(none) +3 -3
    Another attempt to fix the Windows compilation failre.

ChangeSet@1.2529.153.1, 2007-10-31 22:37:10+01:00, jmiller@mysql.com +3 -0
  Adding dbutil to ndb test lib

  storage/ndb/test/include/dbutil.hpp@1.1, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +97 -0
    Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/include/dbutil.hpp@1.0, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +0 -0

  storage/ndb/test/src/Makefile.am@1.13.1.1, 2007-10-31 22:36:40+01:00, jmiller@mysql.com +1 -1
    Updated to include dbutil

  storage/ndb/test/src/dbutil.cpp@1.1, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +176 -0
    Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/src/dbutil.cpp@1.0, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +0 -0

ChangeSet@1.2529.50.35, 2007-11-01 00:31:57+03:00, kostja@bodhi.(none) +3 -0
  A fix for Bug#32007 select udf_function() doesn't return an error if error
  during udf initialization. The bug is spotted while working on Bug 12713.
  
  If a user-defined function was used in a SELECT statement, and an
  error would occur during UDF initialization, this error would not terminate
  execution of the SELECT, but rather would be converted to a warning.
  
  The fix is to use a stack buffer to store the message from udf_init instead
  of private my_error() buffer.

  mysql-test/r/udf.result@1.26.1.1, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the result to reflect the fix for Bug#32007 select udf_function() 
    doesn't return an error if error during udf initialization

  mysql-test/t/udf.test@1.24.1.1, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the test to reflect the fix for Bug #32007 select udf_function() 
    doesn't return an error if error during udf initialization

  sql/item_func.cc@1.353.2.71, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +3 -2
    A fix for Bug#32007.
    
    net.last_error buffer was used to store the temporary message from udf_init.
    Then, when my_error() was called, net.last_error was not empty so 
    my_error() would conclude that there is already an error in the error stack, 
    and not "overwrite" it.
    However, thd->net.report_error was not set, so the the 
    SELECT was not aborted.
    
    The fix is to use a stack buffer instead of thd->net.last_error
    to store the message from udf_init. The message will end up in
    thd->net.last_error anyway after a call to my_error.

ChangeSet@1.2529.152.1, 2007-11-01 00:10:58+03:00, kostja@bodhi.(none) +6 -0
  Remove net_printf_error(). Do not talk to network directly in
  check_user()/check_connection()/check_for_max_user_connections().
  
  This is a pre-requisite patch for the fix for Bug#12713 "Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem"
  
  Implement review comments.

  sql/mysql_priv.h@1.505.17.24, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    check_for_max_user_connections() is used in one place only, make it static.

  sql/mysqld.cc@1.636.5.37, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +5 -1
    Remove net_printf_error(): a consolidation of error reporting facilities
    is necessary to simplify maintenance of the query cache, the 
    client-server protocol, stored procedure continue handlers. 
    Rewrite the only place where its use is somewhat justified 
    (my_error() can not be used since we need to report an error for the thread 
    that does not exist) with my_snprintf()/net_send_error().

  sql/protocol.cc@1.129.1.4, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +1 -119
    Remove net_printf_error().

  sql/protocol.h@1.39.3.1, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    Remove net_printf_error().

  sql/sql_connect.cc@1.9.1.6, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +104 -83
    Remove net_printf_error(). In check_connection()/check_user()/
    check_for_max_user_connections() do not write directly to the network,
    but use the standard my_error() mechanism to record an error in THD.
    It will be sent to the client by the caller. This was the last place
    in the server that would attempt to send an error directly, mainly left 
    untouched by 5.0 refactoring because it is executed only during 
    thread startup.

  sql/sql_parse.cc@1.693.23.1, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -5
    In the old code, when res was greater than 0, it contained an exact 
    error code, e.g. ER_OUT_OF_RESOURCES or NO SUCH DATABASE, 
    or ER_HANDSHAKE_ERROR. I don't know the reason why this error code was 
    ignored, and instead a generic  ER_UNKNOWN_COM_ERROR was pushed into the
    error stack, but knowing the relaxed attitude towards preserving the error
    codes in the old code, I'm inclinded to think that it was a bug.
    
    After this patch, the most specific error message is already pushed,
    so calling my_message() again is useless.
    
    If res is < 0, the error used to be already sent. This is not done
    by the new code, but will be done later, in the end
    of dispatch_command(). When this is done, clear_error() will be called 
    for us - it is in the first lines of do_command.
    
    To sum up, this change is to remove COM_CHANGE_USER specific error handling
    in favor of the standard one employed for all other COM_* commands.

ChangeSet@1.2529.151.1, 2007-10-31 23:48:41+03:00, kostja@bodhi.(none) +1 -0
  Try to fix a Windows compilation warning.

  sql-common/client.c@1.145, 2007-10-31 23:48:37+03:00, kostja@bodhi.(none) +70 -55
    Move a block of auxiliary functions to the beginning of the file,
    to avoid compilation warnings on Windows.
    Add comments, albeit trivial, while we're at it.

ChangeSet@1.2529.150.1, 2007-10-31 21:09:52+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#28086 (SBR of USER() becomes corrupted on slave):
  
  Marking statements containing USER() or CURRENT_USER() as unsafe, causing
  them to switch to using row-based logging in MIXED mode and generate a
  warning in STATEMENT mode.

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.24.1.1, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +68 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.19, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +36 -0
    Adding test to check that USER() and CURRENT_USER() cause a switch
    to row-based logging.

  sql/sql_yacc.yy@1.458.2.145, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Setting statements containing USER() or CURRENT_USER() to be unsafe.

ChangeSet@1.2603.37.4, 2007-10-31 16:06:07-04:00, jas@rowvwade. +3 -0
  Put is some debugging code to isolate an apparent gcc bug.

  storage/falcon/Sync.cpp@1.5, 2007-10-31 16:05:59-04:00, jas@rowvwade. +11 -0
    Put is some debugging code to isolate an apparent gcc bug.

  storage/falcon/Sync.h@1.3, 2007-10-31 16:05:59-04:00, jas@rowvwade. +11 -8
    Put is some debugging code to isolate an apparent gcc bug.

  storage/falcon/Table.cpp@1.15.1.5, 2007-10-31 16:06:00-04:00, jas@rowvwade. +36 -3
    Stylistic edit for consistency.

ChangeSet@1.2529.144.3, 2007-10-31 14:01:01-05:00, jmiller@mysql.com +1 -0
  rpl_extraSlave_Col.test:
    Corrected issues found in preparing to push code

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.6, 2007-10-31 14:00:09-05:00, jmiller@mysql.com +3 -0
    Corrected issues found in preparing to push code

ChangeSet@1.2603.38.1, 2007-10-31 18:17:54+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#31954 Remove undocumented mysql_manager_* C API functions and mysqlmanager (old)
   - Remove the mysql_manager* functions, struct and defines
   - Remove libmysql/manager.c where the above functions were implemented

  BitKeeper/deleted/.del-manager.c@1.19, 2007-10-31 17:17:15+01:00, msvensson@pilot.mysql.com +0 -0
    Delete: libmysql/manager.c

  include/mysql.h@1.183, 2007-10-31 18:17:47+01:00, msvensson@pilot.mysql.com +0 -35
    Remove undocumented and unsupported mysql_manager* functions, the struct used with those
    functions and the related defines.

  libmysql/Makefile.shared@1.72.1.1, 2007-10-31 18:17:47+01:00, msvensson@pilot.mysql.com +1 -1
    Remove file manager.c to be build and included in libmysql and libmysql_r

ChangeSet@1.2603.37.2, 2007-10-31 13:10:46-04:00, jas@rowvwade. +1 -0
  Work around deadlock between Database::updateCardinalities
  and Database::renameTable.

  storage/falcon/Database.cpp@1.15.1.13, 2007-10-31 13:10:39-04:00, jas@rowvwade. +3 -6
    Work around deadlock between Database::updateCardinalities
    and Database::renameTable.

ChangeSet@1.2603.37.1, 2007-10-31 13:05:28-04:00, jas@rowvwade. +14 -0
  Make write mode (O_SYNC vs. O_DIRECT) controllabe from
  the configuration file (falcon_direct_io).
  
  Also make serial log block size a configuration parameter.

  storage/falcon/Configuration.cpp@1.8, 2007-10-31 13:05:10-04:00, jas@rowvwade. +3 -2
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Configuration.h@1.5, 2007-10-31 13:05:10-04:00, jas@rowvwade. +1 -0
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Database.cpp@1.15.1.12, 2007-10-31 13:05:10-04:00, jas@rowvwade. +3 -3
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Database.h@1.16, 2007-10-31 13:05:11-04:00, jas@rowvwade. +2 -3
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Dbb.cpp@1.13, 2007-10-31 13:05:11-04:00, jas@rowvwade. +12 -1
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Dbb.h@1.5, 2007-10-31 13:05:12-04:00, jas@rowvwade. +1 -0
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/Hdr.h@1.2, 2007-10-31 13:05:12-04:00, jas@rowvwade. +1 -0
    Make serial log block size a configurable parameter
    (falcon_serial_log_block_size).  Once database is
    created, however, track the serial block size from
    the database header.

  storage/falcon/IO.cpp@1.17, 2007-10-31 13:05:12-04:00, jas@rowvwade. +15 -7
    Make write mode (O_SYNC vs. O_DIRECT) controllabe from
    the configuration file (falcon_direct_io).

  storage/falcon/IOx.h@1.10, 2007-10-31 13:05:13-04:00, jas@rowvwade. +1 -0
    Make write mode (O_SYNC vs. O_DIRECT) controllabe from
    the configuration file (falcon_direct_io).

  storage/falcon/SerialLog.cpp@1.20, 2007-10-31 13:05:13-04:00, jas@rowvwade. +5 -0
    Track serial log block size.

  storage/falcon/SerialLog.h@1.8, 2007-10-31 13:05:13-04:00, jas@rowvwade. +1 -0
    Track serial log block size.

  storage/falcon/SerialLogFile.cpp@1.8, 2007-10-31 13:05:14-04:00, jas@rowvwade. +6 -13
    Make write mode (O_SYNC vs. O_DIRECT) controllabe from
    the configuration file (falcon_direct_io).

  storage/falcon/SerialLogWindow.cpp@1.3, 2007-10-31 13:05:14-04:00, jas@rowvwade. +11 -2
    Handle screwed up log files more gracefully (mostly a
    debugging transition to be removed later).

  storage/falcon/StorageParameters.h@1.11, 2007-10-31 13:05:14-04:00, jas@rowvwade. +2 -0
    Add two new configuration parameter:  falcon_direct_io (write
    mode for database and serial log writes) and 
    falcon_serial_log_block_size (override default device sector
    size, if known).

ChangeSet@1.1810.3432.1, 2007-10-31 17:40:29+01:00, mleich@four.local.lan +1 -0
  Fix for
     Bug#29290 type_datetime.test failure in 5.1

  mysql-test/t/type_datetime.test@1.18.8.4, 2007-10-31 17:39:53+01:00, mleich@four.local.lan +16 -3
    - If we are too close to midnight sleep till we reach 
      at least midnight + 1 second.
    - Replace error numbers with error names.

ChangeSet@1.2529.141.2, 2007-10-31 13:54:53-02:00, davi@endora.local +1 -0
  Post merge fix for bug 31669.

  tests/mysql_client_test.c@1.245.12.4, 2007-10-31 13:54:51-02:00, davi@endora.local +8 -8
    Macro name changed in 5.1

ChangeSet@1.2603.35.3, 2007-10-31 10:54:21-05:00, klewis@klewis-mysql. +6 -0
  Cleanup new testcases

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.2, 2007-10-31 10:54:01-05:00, klewis@klewis-mysql. +0 -1
    Cleanup new testcases

  mysql-test/suite/falcon/r/falcon_bug_29151_B.result@1.2, 2007-10-31 10:54:04-05:00, klewis@klewis-mysql. +1 -3
    Cleanup new testcases

  mysql-test/suite/falcon/t/disabled.def@1.7, 2007-10-31 10:54:06-05:00, klewis@klewis-mysql. +1 -0
    Cleanup new testcases  29151_A is not ready yet.

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.2, 2007-10-31 10:54:09-05:00, klewis@klewis-mysql. +4 -2
    Cleanup new testcases

  mysql-test/suite/falcon/t/falcon_bug_29151_B.test@1.2, 2007-10-31 10:54:11-05:00, klewis@klewis-mysql. +4 -2
    Cleanup new testcases

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.2, 2007-10-31 10:54:13-05:00, klewis@klewis-mysql. +2 -1
    Cleanup new testcases

ChangeSet@1.2529.50.32, 2007-10-31 18:33:13+03:00, kostja@bodhi.(none) +3 -0
  Cleanup: rename select_send::status to select_send::is_result_set_started.
  Add select_send::cleanup.
  Fix a compilation warning.
  Issues spotted while working on the fix for Bug#12713.

  sql-common/client.c@1.144, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +0 -1
    Fix a warning.

  sql/sql_class.cc@1.346.2.9, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +22 -8
    Give a variable a more specific name. Rewrite an incorrect comment.
    Add a cleanup for select_send. The only case now this cleanup can be
    necessary is when we have a prepared statement inside a stored procedure, 
    and a continue handler. At first execution, the statement is killed
    after having executed select_send::send_fields. At the second execution
    it is killed after having executed select_send::send_fields.

  sql/sql_class.h@1.384.14.4, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +8 -2
    Rename a member. Add comments.

ChangeSet@1.2603.1.63, 2007-10-31 10:50:37-04:00, jas@rowvwade. +1 -0
  Add backwards compatibility for some assertions.

  storage/falcon/Section.cpp@1.11, 2007-10-31 10:50:30-04:00, jas@rowvwade. +4 -4
    Add backwards compatibility for some assertions.

ChangeSet@1.2529.149.1, 2007-10-31 17:16:53+03:00, kostja@bodhi.(none) +4 -0
  Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.
  No functionality added or changed.
  This is a pre-requisite for the fix for Bug#12713 Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem
  
  Address post-review comments.

  include/sql_common.h@1.21, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +4 -2
    Declare auxiliary functions to manipulate mysql.net.last_er* and 
    mysql_stmt.last_er*

  libmysql/libmysql.c@1.296.2.1, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -86
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  libmysqld/lib_sql.cc@1.136.1.5, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +8 -14
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  sql-common/client.c@1.143, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -82
    Use helper functions to set an error in MYSQL or MYSQL_STMT

ChangeSet@1.2603.35.2, 2007-10-31 08:40:53-05:00, klewis@klewis-mysql. +5 -0
  Change falcon_bug_22211 to reflect the new behavior of
  repeatable read transactions in InnoDB Compatibility mode.
  As of the fix for Bug#29151, vestigial records no longer 
  block these transactions.
  Also fix some compiler warnings.

  mysql-test/suite/falcon/r/falcon_bug_22211.result@1.2, 2007-10-31 08:40:38-05:00, klewis@klewis-mysql. +4 -12
    As of the fix for Bug#29151, vestigial records no longer block 
    repeatable read transactions in InnoDB Compatibility mode.

  mysql-test/suite/falcon/t/falcon_bug_22211.test@1.3, 2007-10-31 08:40:41-05:00, klewis@klewis-mysql. +3 -10
    As of the fix for Bug#29151, vestigial records no longer block 
    repeatable read transactions in InnoDB Compatibility mode.

  storage/falcon/SerialLog.cpp@1.16.1.1, 2007-10-31 08:40:42-05:00, klewis@klewis-mysql. +1 -1
    compiler warning

  storage/falcon/SyncObject.cpp@1.9, 2007-10-31 08:40:44-05:00, klewis@klewis-mysql. +1 -1
    Compiler warning

  storage/falcon/Table.cpp@1.15.2.2, 2007-10-31 08:40:46-05:00, klewis@klewis-mysql. +4 -3
    Compiler warning

ChangeSet@1.2529.145.1, 2007-10-31 16:01:29+04:00, holyfoot@mysql.com +3 -0
  Bug #31893 Partitions: crash if subpartitions and engine change.
  
  The new default database engine for altered table was reassigned to
  the old one. That's wrong thing by itself, and (as the engine
  for a subpartition gets that new value) leads to DBUG_ASSERTION
  in mysql_unpack_partition()

  mysql-test/r/partition.result@1.68.6.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +14 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test result

  mysql-test/t/partition.test@1.62.8.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +11 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test case

  sql/sql_partition.cc@1.96.23.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +4 -1
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    Don't change part_info->default_engine_type if it's already set

ChangeSet@1.1810.3409.2, 2007-10-31 12:25:18+01:00, thek@adventure.(none) +1 -0
  Bug#31347 Increase in memory usage after many DROP USER statements
  
  Dropping users causes huge increase in memory usage because field values were
  allocated on the server memory root for temporary usage but never deallocated.
  
  This patch changes the target memory root to be that of the thread handler
  instead since this root is cleared between each statement.

  sql/sql_acl.cc@1.128.48.1, 2007-10-31 12:25:17+01:00, thek@adventure.(none) +13 -11
    Changed memory root from server life time memory to thread life time memory.

ChangeSet@1.2529.144.1, 2007-10-31 11:48:49+02:00, aelkin@koti.dsl.inet.fi +7 -0
  bug#27571 merging. Fixing offsets and moving tests to the corrent
  destination. Removing wrong (local temp) tests.

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.2, 2007-10-31 11:44:30+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.2, 2007-10-31 11:44:23+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

  mysql-test/suite/binlog/r/binlog_killed.result@1.9, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +7 -6
    results changed

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.1, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +33 -0
    new results file

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.0, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.2, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +6 -4
    binlog offset made 5.1 specific

  mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt@1.2, 2007-10-31 11:32:05+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.3, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +5 -2
    binlog offset + guard to run the test with stmt/mixed format

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.2, 2007-10-31 11:31:45+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate.test -> mysql-test/suite/binlog/t/binlog_killed_simulate.test

ChangeSet@1.2529.133.7, 2007-10-31 10:45:31+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes to handle some test failures.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.2.1, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result file change.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.2.1, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Include file show_slave_status.inc should be used for portable SHOW SLAVE STATUS.

ChangeSet@1.1810.3430.1, 2007-10-31 10:34:26+01:00, knielsen@loke.(none) +4 -0
  BUG#31799: Scrambled number output due to integer overflow
  
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.

  strings/ctype-simple.c@1.75.4.2, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/ctype-ucs2.c@1.50.1.18, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/int2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +10 -6
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/longlong2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +18 -14
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

ChangeSet@1.2529.50.29, 2007-10-31 12:04:19+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31649: events.test fails: NULL "state" field of
  SHOW PROCESSLIST.
  
  The problem was a race condition: if the Event Scheduler was not
  quick enough, the following scenario happens:
    - The Event Scheduler picks up the created event;
    - The event is executed;
    - event_scheduler_thread->proc_info is set to NULL;
    - The client issues SELECT FROM I_S.
  
  The fix is to wait for the Event Scheduler to reach 'Waiting
  for next activation' state. 

  mysql-test/t/events.test@1.54, 2007-10-31 12:04:17+03:00, anozdrin@station. +2 -1
    Wait for the Event Scheduler to start waiting for the activation.

ChangeSet@1.2603.36.1, 2007-10-31 02:06:53-05:00, chris@xeno.mysql.com +2 -0
  Bug#29211 "Falcon: information_schema has a falcon_tables view"
  - Put table and partition in separate columns

  storage/falcon/StorageHandler.cpp@1.4.1.1, 2007-10-31 02:06:51-05:00, chris@xeno.mysql.com +33 -2
    StorageHandler::getTablesInfo()
    - Put table and partition name and put in separate columns

  storage/falcon/ha_falcon.cpp@1.13.2.1, 2007-10-31 02:06:51-05:00, chris@xeno.mysql.com +1 -0
    Added PARTITION column to Information_Schema.falcon_tables.

ChangeSet@1.2529.50.28, 2007-10-31 09:53:58+03:00, anozdrin@station. +2 -0
  Fix result files after patch for BUG#31035.

  mysql-test/r/group_min_max.result@1.33.1.2, 2007-10-31 09:53:56+03:00, anozdrin@station. +2 -2
    Update result file.

  mysql-test/r/index_merge_myisam.result@1.5.1.4, 2007-10-31 09:53:56+03:00, anozdrin@station. +1 -1
    Update result file.

ChangeSet@1.2603.35.1, 2007-10-31 01:41:53-05:00, klewis@klewis-mysql. +30 -0
  Bug#29151 - Added CONSISTENT_READ to the 'InnoDB compatible
  WRITE_COMMITTED isolation mode.  Made a new parameter to select
  which of these two modes is done for REPEATABLE_READ isolation.
  Implemented the ability to finish an INSERT, UPDATE, and DELETE
  after waiting on a pending transaction during WRITE_COMMITTED
  and READ_COMMITTED transactions.  Added the ability of an
  INSERT to wait when the pending transaction gives it an opportunity
  to succeed, either by committing or aborting.

  mysql-test/suite/falcon/r/falcon_bug_22847.result@1.2, 2007-10-31 01:40:43-05:00, klewis@klewis-mysql. +10 -3
    Bug#29151 - Inserts should wait on transactions that may provide 
    an opportunity for the insert to succeed.  In this test, the
    insert failed immediately.  Now, inserts wait if ther is an 
    opportunity for the insert to succeed.  So the test is changed 
    accordingly.

  mysql-test/suite/falcon/r/falcon_bug_29151.result@1.2, 2007-10-31 01:40:46-05:00, klewis@klewis-mysql. +3 -0
    Bug#29151 - Added an extra select.

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.1, 2007-10-31 01:41:40-05:00, klewis@klewis-mysql. +80 -0
    Bug#29151 - New test for CONSISTENT_READ behavior when the pending
    transaction commits.

  mysql-test/suite/falcon/r/falcon_bug_29151_A.result@1.0, 2007-10-31 01:41:40-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/r/falcon_bug_29151_B.result@1.1, 2007-10-31 01:41:41-05:00, klewis@klewis-mysql. +85 -0
    Bug#29151 - New test for CONSISTENT_READ behavior when the pending
    transaction aborts.

  mysql-test/suite/falcon/r/falcon_bug_29151_B.result@1.0, 2007-10-31 01:41:41-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/r/falcon_bug_29151_C.result@1.1, 2007-10-31 01:41:42-05:00, klewis@klewis-mysql. +83 -0
    Bug#29151 - New more thorough test for WRITE_COMMITTED behavior.

  mysql-test/suite/falcon/r/falcon_bug_29151_C.result@1.0, 2007-10-31 01:41:42-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/r/falcon_options.result@1.5, 2007-10-31 01:40:48-05:00, klewis@klewis-mysql. +6 -0
    Bug#29151 - Added 3 new parameters

  mysql-test/suite/falcon/r/falcon_options2.result@1.5, 2007-10-31 01:40:50-05:00, klewis@klewis-mysql. +3 -0
    Bug#29151 - Added 3 new parameters

  mysql-test/suite/falcon/t/disabled.def@1.6, 2007-10-31 01:40:52-05:00, klewis@klewis-mysql. +0 -1
    Bug#29151 - now works

  mysql-test/suite/falcon/t/falcon_bug_22847.test@1.3, 2007-10-31 01:40:54-05:00, klewis@klewis-mysql. +11 -5
    Bug#29151 - Inserts should wait on transactions that may provide 
    an opportunity for the insert to succeed.  In this test, the
    insert failed immediately.  Now, inserts wait if ther is an 
    opportunity for the insert to succeed.  So the test is changed 
    accordingly.

  mysql-test/suite/falcon/t/falcon_bug_29151.test@1.3, 2007-10-31 01:40:56-05:00, klewis@klewis-mysql. +2 -0
    Bug#29151 - Added an extra select and a wait before the commit
    so that the timing is more likely to work.

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.1, 2007-10-31 01:41:32-05:00, klewis@klewis-mysql. +126 -0
    Bug#29151 - New test for CONSISTENT_READ behavior when the pending
    transaction commits.

  mysql-test/suite/falcon/t/falcon_bug_29151_A.test@1.0, 2007-10-31 01:41:32-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_29151_B.test@1.1, 2007-10-31 01:41:37-05:00, klewis@klewis-mysql. +122 -0
    Bug#29151 - New test for CONSISTENT_READ behavior when the pending
    transaction aborts.

  mysql-test/suite/falcon/t/falcon_bug_29151_B.test@1.0, 2007-10-31 01:41:37-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.1, 2007-10-31 01:41:38-05:00, klewis@klewis-mysql. +122 -0
    Bug#29151 - New more thorough test for WRITE_COMMITTED behavior.

  mysql-test/suite/falcon/t/falcon_bug_29151_C.test@1.0, 2007-10-31 01:41:38-05:00, klewis@klewis-mysql. +0 -0

  mysql-test/suite/falcon/t/falcon_page_size_1.test@1.3, 2007-10-31 01:40:58-05:00, klewis@klewis-mysql. +1 -1
    Added a missing semicolon.

  storage/falcon/Connection.cpp@1.1.1.1, 2007-10-31 01:41:00-05:00, klewis@klewis-mysql. +1 -1
    Bug#29151 - Make consistent read the default internal isolation level.

  storage/falcon/Connection.h@1.1.1.1, 2007-10-31 01:41:02-05:00, klewis@klewis-mysql. +19 -1
    Bug#29151 - Defined two ways of doing REPEATABLE_READ;
    CONSISTENT_READ (Falcon default) and CONSISTENT_READ
    (the InnoDB method).  Also defined macros to find these.

  storage/falcon/Index.cpp@1.4, 2007-10-31 01:41:03-05:00, klewis@klewis-mysql. +1 -1
    Bug#29151 - Changed Transaction::visible() to return CommittedVisible
    instead of CommittedInvisible when the isolation level is WRITE_COMMITTED
    and the function is called with FOR_UPDATE flag.

  storage/falcon/RecordVersion.cpp@1.3, 2007-10-31 01:41:05-05:00, klewis@klewis-mysql. +3 -3
    Bug#29151 - Use new macros for isolation levels and call visible()
    with the FOR_READING flag from fetchVersion().

  storage/falcon/SQLException.h@1.3, 2007-10-31 01:41:07-05:00, klewis@klewis-mysql. +2 -1
    Bug#29151 - New error code used internally to loop when 
    traversing an index. If a wait state occurs for WRITE_COMMITTED
    or READ_COMMITTED, the index must be scanned again.

  storage/falcon/StorageConnection.cpp@1.2, 2007-10-31 01:41:11-05:00, klewis@klewis-mysql. +2 -9
    Bug#29151 - Moved isolation level translaation to StorageInterface.

  storage/falcon/StorageDatabase.cpp@1.4, 2007-10-31 01:41:13-05:00, klewis@klewis-mysql. +5 -3
    Bug#29151 - Added a flag to fetchForUpdate to control whether the
    new error code is used, which is only for a index based cursor.

  storage/falcon/StorageTable.cpp@1.4, 2007-10-31 01:41:15-05:00, klewis@klewis-mysql. +22 -40
    Bug#29151 - Added the ability to re-scan the index if there was a wait
    and newly committed records can be seen.  Also cleaned up old code.

  storage/falcon/StorageTable.h@1.3, 2007-10-31 01:41:17-05:00, klewis@klewis-mysql. +2 -0
    Bug#29151 - Put a limit on the number of times we retry after a wait.

  storage/falcon/StorageTableShare.h@1.2.1.1, 2007-10-31 01:41:18-05:00, klewis@klewis-mysql. +1 -0
    Bug#29151 - New error code for re-scanning an index after a wait.

  storage/falcon/Table.cpp@1.15.2.1, 2007-10-31 01:41:20-05:00, klewis@klewis-mysql. +242 -206
    Bug#29151 - Retructured checkUniqueIndexes into three levels on functions.
    Made it handle the new error code after a wait and distinguish between 
    the two versions of repeatable read.
    Fixed fetchForUpdate to do consistent read again.  Also made it return
    the new RETRY_AFTER_WAIT internal error code.
    Also deleted old code.

  storage/falcon/Table.h@1.7, 2007-10-31 01:41:22-05:00, klewis@klewis-mysql. +7 -1
    Bug#29151 - flags for new function checkUniqueRecordVersion(), which
    used to be embedded in checkUniqueIndexes().

  storage/falcon/Transaction.cpp@1.12, 2007-10-31 01:41:24-05:00, klewis@klewis-mysql. +28 -15
    Bug#29151 - Modified Transaction::visible to implement WRITE_COMMITTED,
    which returns true for new records when writing, but false for new records
    when reading.

  storage/falcon/Transaction.h@1.7, 2007-10-31 01:41:26-05:00, klewis@klewis-mysql. +6 -3
    Bug#29151 - Renamed committed states for accurate meaning.
    Modified Transaction::visible to implement WRITE_COMMITTED, which 
    returns true for new records when writing, but false for new records
    when reading.

  storage/falcon/ha_falcon.cpp@1.13.1.1, 2007-10-31 01:41:28-05:00, klewis@klewis-mysql. +26 -4
    Bug#29151 - Moved isolation level translation to here.
    Added InnodbCompatibility setting.  It can be set at any time.

  storage/falcon/ha_falcon.h@1.2, 2007-10-31 01:41:30-05:00, klewis@klewis-mysql. +9 -3
    Bug#29151 - Moved isolation level translation to here.
    Added InnodbCompatibility setting.

ChangeSet@1.2529.140.1, 2007-10-30 20:51:04-02:00, davi@endora.local +5 -0
  Bug#30904 SET PASSWORD statement is non-transactional
  
  The SET PASSWORD statement is non-transactional (no explicit transaction
  boundaries) in nature and hence is forbidden inside stored functions and
  triggers, but it weren't being effectively forbidden.
  
  The implemented fix is to issue a implicit commit with every SET PASSWORD
  statement, effectively prohibiting these statements in stored functions
  and triggers. 

  mysql-test/r/sp-error.result@1.125.1.8, 2007-10-30 20:51:01-02:00, davi@endora.local +10 -0
    Add test case result for Bug#30904

  mysql-test/t/sp-error.test@1.122.1.6, 2007-10-30 20:51:01-02:00, davi@endora.local +19 -0
    Add test case for Bug#30904

  sql/sql_lex.h@1.284.2.17, 2007-10-30 20:51:01-02:00, davi@endora.local +1 -1
    Add variable to set that a statement with SET PASSWORD causes a implicit
    commit.

  sql/sql_parse.cc@1.693.19.6, 2007-10-30 20:51:02-02:00, davi@endora.local +4 -0
    End active transaction in SET PASSWORD.

  sql/sql_yacc.yy@1.458.147.2, 2007-10-30 20:51:02-02:00, davi@endora.local +8 -0
    Set the correct flag on SET PASSWORD if inside a SP, thus effectively
    prohibiting SET PASSWORD statements in stored functions and triggers.

ChangeSet@1.2603.1.62, 2007-10-30 18:10:20-04:00, jas@rowvwade. +1 -0
  Change order of lock acquisition in Databaes::updateCardinalities
  to avoid deadlock (take II).

  storage/falcon/Database.cpp@1.15.1.11, 2007-10-30 18:10:13-04:00, jas@rowvwade. +2 -2
    Change order of lock acquisition in Databaes::updateCardinalities
    to avoid deadlock (take II).

ChangeSet@1.2603.1.61, 2007-10-30 17:25:13-04:00, jas@rowvwade. +6 -0
  Don't delete imperfect table aliases.

  storage/falcon/StorageHandler.cpp@1.6, 2007-10-30 17:24:58-04:00, jas@rowvwade. +45 -9
    Don't delete imperfect table aliases.

  storage/falcon/StorageHandler.h@1.7, 2007-10-30 17:24:58-04:00, jas@rowvwade. +2 -1
    Don't delete imperfect table aliases.

  storage/falcon/StorageTableShare.cpp@1.3, 2007-10-30 17:24:58-04:00, jas@rowvwade. +12 -5
    Don't delete imperfect table aliases.

  storage/falcon/StorageTableShare.h@1.3, 2007-10-30 17:24:59-04:00, jas@rowvwade. +1 -1
    Don't delete imperfect table aliases.

  storage/falcon/Table.cpp@1.15.1.3, 2007-10-30 17:24:59-04:00, jas@rowvwade. +2 -0
    Fix potential deadlock between Database::rename and 
    Database::updateCardinalities.

  storage/falcon/ha_falcon.cpp@1.15, 2007-10-30 17:24:59-04:00, jas@rowvwade. +3 -2
    Don't delete imperfect table aliases.

ChangeSet@1.2603.34.8, 2007-10-30 21:28:37+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result file

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.15.1.3, 2007-10-30 21:28:35+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct result file

ChangeSet@1.2529.139.1, 2007-10-30 21:17:19+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#19958 (RBR idempotency issue for UPDATE and DELETE):
  
  The rpl_trigger test case indicated a problem with idempotency support when run
  under row-based replication, which this patch fixes.
  
  However, despite this, the test is not designed for execution under row-based
  replication and hence rpl_trigger.test is not executed under row-based
  replication.
  
  The problem is that the test expects triggers to be executed when the slave
  updates rows on the slave, and this is (deliberately) not done with row-based
  replication.

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +71 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_idempotency.result''

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +79 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_idempotency.test''

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/log_event.cc@1.271.47.1, 2007-10-30 21:17:13+01:00, mats@kindahl-laptop.dnsalias.net +67 -4
    Adding function to print symbolic name of handler errors for debug purposes.
    Ignoring some more error messages to provide full idempotency support for
    update and delete operations.

ChangeSet@1.1810.3424.5, 2007-10-30 20:54:31+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

  cmd-line-utils/libedit/Makefile.am@1.16.1.1, 2007-10-30 20:37:12+01:00, kent@mysql.com +9 -3
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

ChangeSet@1.2529.50.25, 2007-10-30 22:35:14+03:00, kostja@bodhi.(none) +7 -0
  In ha_delete_table, use a standard mechanism to intercept the error message
  and convert it to a warning instead of direct manipulation with the
  thread error stack.
  Fix a bug in handler::print_erorr when a garbled message was
  printed for HA_ERR_NO_SUCH_TABLE.
  This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
  function called from a SELECT doesn't cause ROLLBACK of statem

  sql/handler.cc@1.215.97.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +45 -25
    Use a standard mechanism to intercept the error message, instead
    of direct manipulation with thread error stack. 
    Fix a bug when for HA_ERR_NO_SUCH_TABLE handler::print_error() would
    print a garbled message.

  sql/log.cc@1.297.1.4, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/mysqld.cc@1.636.5.36, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_base.cc@1.374.55.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_class.cc@1.346.2.8, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -2
    Extend internal error handler interface to carry the message text.

  sql/sql_class.h@1.384.14.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_error.cc@1.47, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

ChangeSet@1.2537.22.45, 2007-10-30 20:11:55+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  minor restructure of code to break out pk update code

  sql/ha_ndbcluster.cc@1.480.5.10, 2007-10-30 20:11:52+01:00, tomas@whalegate.ndb.mysql.com +60 -61
    minor restructure of code to break out pk update code

  sql/ha_ndbcluster.h@1.186.5.2, 2007-10-30 20:11:52+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    minor restructure of code to break out pk update code

ChangeSet@1.2529.1.68, 2007-10-30 20:06:49+01:00, joerg@trift2. +2 -0
  Minor Makefile fixes:
  
  1) Add a new top level "Makefile.am" target "make embedded-test".
  
  2) Fix a syntax error (bad merge) in "netware/Makefile.am".

  Makefile.am@1.144, 2007-10-30 20:06:46+01:00, joerg@trift2. +11 -6
    Add a new "make" target "embedded-test" so that it is easier 
    to test the "embedded server" ("libmyslqd").
    Make it "phony".
    
    Use it via a sub-make within "test-bt" to avoid code duplication.

  netware/Makefile.am@1.33.1.2, 2007-10-30 20:06:46+01:00, joerg@trift2. +0 -3
    Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

ChangeSet@1.2529.138.1, 2007-10-30 20:08:16+03:00, kostja@bodhi.(none) +20 -0
  Use an inline getter method (thd->is_error()) to query if there is an error 
  in THD.
  In future the error may be stored elsewhere (not in net.report_error) and 
  it's important to start using an opaque getter to simplify merges.

  sql/filesort.cc@1.134.1.2, 2007-10-30 20:08:10+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/ha_ndbcluster_binlog.cc@1.90.12.27, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/item_func.cc@1.353.2.70, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/item_subselect.cc@1.158.2.5, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/set_var.cc@1.231.26.5, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp.cc@1.167.1.6, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp_head.cc@1.279.10.6, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_base.cc@1.374.55.2, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +5 -5
    net.report_error -> is_error()

  sql/sql_class.cc@1.346.2.7, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/sql_class.h@1.384.14.2, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +15 -1
    net.report_error -> is_error()

  sql/sql_connect.cc@1.9.2.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_delete.cc@1.204.18.2, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +4 -4
    net.report_error -> is_error()

  sql/sql_insert.cc@1.282.15.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +6 -6
    net.report_error -> is_error()

  sql/sql_parse.cc@1.693.19.5, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +11 -11
    net.report_error -> is_error()

  sql/sql_prepare.cc@1.228.1.7, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_select.cc@1.541.29.4, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +15 -15
    net.report_error -> is_error()

  sql/sql_union.cc@1.151.2.3, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_update.cc@1.215.23.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_view.cc@1.116.1.40, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_yacc.yy@1.458.147.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

ChangeSet@1.2537.1.99, 2007-10-30 17:57:09+01:00, tomas@whalegate.ndb.mysql.com +13 -0
  correct result files

  mysql-test/r/information_schema.result@1.156.1.7, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct result files

  mysql-test/r/innodb_mysql.result@1.24.1.36, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +97 -0
    correct result files

  mysql-test/suite/ndb/r/ndb_alter_table.result@1.43.1.9, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@1.2.2.2, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct result files

  mysql-test/suite/ndb/r/ndb_binlog_basic.result@1.9.1.2, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

  mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@1.20.1.2, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

  mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@1.4.1.2, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

  mysql-test/suite/ndb/r/ndb_blob.result@1.24.1.3, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct result files

  mysql-test/suite/ndb/r/ndb_column_properties.result@1.5.1.4, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +9 -9
    correct result files

  mysql-test/suite/ndb/r/ndb_dd_alter.result@1.8.1.5, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +7 -7
    correct result files

  mysql-test/suite/ndb/r/ndb_gis.result@1.25.1.4, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct result files

  mysql-test/suite/ndb/r/ndb_row_format.result@1.4.1.9, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result@1.14.1.7, 2007-10-30 17:57:06+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct result files

ChangeSet@1.2537.22.44, 2007-10-30 17:55:32+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  .del-rpl_ndb_extraColMaster.test:
    Delete: mysql-test/suite/rpl/t/rpl_ndb_extraColMaster.test
  .del-rpl_ndb_extraColMaster.result:
    Delete: mysql-test/suite/rpl/r/rpl_ndb_extraColMaster.result

  BitKeeper/deleted/.del-rpl_ndb_extraColMaster.result@1.2.2.1, 2007-10-30 17:50:41+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_ndb_extraColMaster.result

  BitKeeper/deleted/.del-rpl_ndb_extraColMaster.test@1.1.1.1, 2007-10-30 17:50:29+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_ndb_extraColMaster.test

ChangeSet@1.2603.1.60, 2007-10-30 12:28:06-04:00, jas@rowvwade. +2 -0
  Interlock serial log reads with database I/O along as well as
  serial log writes.

  storage/falcon/Engine.h@1.5, 2007-10-30 12:27:59-04:00, jas@rowvwade. +1 -1
    Fix new ALIGN macro to work on 64 bit gcc.

  storage/falcon/SerialLogFile.cpp@1.7, 2007-10-30 12:27:59-04:00, jas@rowvwade. +5 -1
    Interlock serial log reads with database I/O along as well as
    serial log writes.

ChangeSet@1.2603.1.59, 2007-10-30 11:38:16-04:00, jas@rowvwade. +2 -0
  Re-instate serial log file zap to avoid recovery confusion
  (don't accidentally pick up old files).

  storage/falcon/Engine.h@1.4, 2007-10-30 11:38:09-04:00, jas@rowvwade. +2 -1
    Define macro to compute alignment within a buffer.

  storage/falcon/SerialLogFile.cpp@1.6, 2007-10-30 11:38:09-04:00, jas@rowvwade. +5 -3
    Re-instate serial log file zap to avoid recovery confusion
    (don't accidentally pick up old files).

ChangeSet@1.2537.32.29, 2007-10-30 16:22:06+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  bug#19227
  - small correction to harmonize code

  sql/ha_ndbcluster.h@1.186.3.5, 2007-10-30 16:22:03+01:00, tomas@whalegate.ndb.mysql.com +11 -5
    bug#19227
    - small correction to harmonize code

ChangeSet@1.2603.1.58, 2007-10-30 11:08:50-04:00, jas@rowvwade. +1 -0
  Fix IO::readHeader to match constraints of direct I/O.

  storage/falcon/IO.cpp@1.16, 2007-10-30 11:08:44-04:00, jas@rowvwade. +7 -2
    Fix IO::readHeader to match constraints of direct I/O.

ChangeSet@1.2603.1.57, 2007-10-30 10:36:55-04:00, jas@rowvwade. +14 -0
  Make configuration option to interlock serial log writes
  with database flush writes.  Also eliminated fsync diable
  configuration parameter and associated baggage.

  storage/falcon/Configuration.cpp@1.7, 2007-10-30 10:36:43-04:00, jas@rowvwade. +0 -3
    Get rid of configuration option to disable fsync.

  storage/falcon/Configuration.h@1.4, 2007-10-30 10:36:43-04:00, jas@rowvwade. +0 -1
    Get rid of configuration option to disable fsync.

  storage/falcon/Connection.cpp@1.2, 2007-10-30 10:36:43-04:00, jas@rowvwade. +0 -6
    Get rid of configuration option to disable fsync.

  storage/falcon/Connection.h@1.2, 2007-10-30 10:36:44-04:00, jas@rowvwade. +0 -1
    Get rid of configuration option to disable fsync.

  storage/falcon/Database.cpp@1.15.1.10, 2007-10-30 10:36:44-04:00, jas@rowvwade. +5 -14
    Get rid of configuration option to disable fsync.

  storage/falcon/Database.h@1.15, 2007-10-30 10:36:44-04:00, jas@rowvwade. +1 -2
    Get rid of configuration option to disable fsync.

  storage/falcon/SerialLog.cpp@1.19, 2007-10-30 10:36:45-04:00, jas@rowvwade. +1 -1
    Get rid of configuration option to disable fsync.

  storage/falcon/SerialLogFile.cpp@1.5, 2007-10-30 10:36:45-04:00, jas@rowvwade. +4 -1
    Make configuration option to interlock serial log writes
    with database flush writes.

  storage/falcon/StorageHandler.cpp@1.5, 2007-10-30 10:36:45-04:00, jas@rowvwade. +0 -6
    Get rid of configuration option to disable fsync.

  storage/falcon/StorageHandler.h@1.6, 2007-10-30 10:36:46-04:00, jas@rowvwade. +0 -1
    Get rid of configuration option to disable fsync.

  storage/falcon/StorageParameters.h@1.10, 2007-10-30 10:36:46-04:00, jas@rowvwade. +1 -0
    Make configuration option to interlock serial log writes
    with database flush writes.

  storage/falcon/TableSpaceManager.cpp@1.10, 2007-10-30 10:36:46-04:00, jas@rowvwade. +2 -3
    Get rid of configuration option to disable fsync.

  storage/falcon/TableSpaceManager.h@1.7, 2007-10-30 10:36:47-04:00, jas@rowvwade. +1 -1
    Get rid of configuration option to disable fsync.

  storage/falcon/ha_falcon.cpp@1.14, 2007-10-30 10:36:47-04:00, jas@rowvwade. +0 -16
    Get rid of configuration option to disable fsync.

ChangeSet@1.1810.3400.3, 2007-10-30 15:22:52+01:00, df@pippilotta.erinye.com +1 -0
  bug#30630

  mysql-test/mysql-test-run.pl@1.30.95.1, 2007-10-30 15:22:49+01:00, df@pippilotta.erinye.com +7 -0
    bug#30630

ChangeSet@1.2537.1.94, 2007-10-30 15:02:10+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct manual merge

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.1.5, 2007-10-30 15:02:07+01:00, tomas@whalegate.ndb.mysql.com +15 -15
    correct manual merge

ChangeSet@1.2529.135.3, 2007-10-30 14:52:12+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.2, 2007-10-30 14:52:09+01:00, tomas@whalegate.ndb.mysql.com +8 -8
    correct result file

ChangeSet@1.2603.33.3, 2007-10-30 17:44:48+04:00, bar@mysql.com +4 -0
  After merge fix

  mysql-test/r/ctype_utf16.result@1.2, 2007-10-30 17:44:45+04:00, bar@mysql.com +5 -15
    After merge fix

  mysql-test/r/ctype_utf32.result@1.2, 2007-10-30 17:44:45+04:00, bar@mysql.com +10 -18
    After merge fix

  mysql-test/t/ctype_utf16.test@1.2, 2007-10-30 17:44:45+04:00, bar@mysql.com +5 -0
    After merge fix

  mysql-test/t/ctype_utf32.test@1.2, 2007-10-30 17:44:45+04:00, bar@mysql.com +6 -2
    After merge fix

ChangeSet@1.2529.133.5, 2007-10-30 14:08:37+01:00, aelkin@dl145j.mysql.com +4 -0
  manual merge

  BitKeeper/deleted/.del-rpl_slave_skip-slave.opt@1.2, 2007-10-30 13:56:11+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip-slave.opt

  BitKeeper/deleted/.del-rpl_slave_skip.result@1.2, 2007-10-30 13:58:30+01:00, aelkin@dl145j.mysql.com +0 -0
    Delete: mysql-test/r/rpl_slave_skip.result

  BitKeeper/deleted/.del-rpl_slave_skip.test@1.2, 2007-10-30 13:56:12+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip.test

  sql/slave.cc@1.301.1.23, 2007-10-30 14:07:16+01:00, aelkin@dl145j.mysql.com +8 -105
    manual merge

ChangeSet@1.2529.135.2, 2007-10-30 14:04:41+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.1.2, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.1.2, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

ChangeSet@1.2529.50.23, 2007-10-30 15:39:50+03:00, kostja@bodhi.(none) +1 -0
  Fix failing init_connect.test (5.1-runtime).

  sql/sql_connect.cc@1.9.1.4, 2007-10-30 15:39:47+03:00, kostja@bodhi.(none) +11 -1
    Fix failing init_connect.test (5.1-runtime). Add comments for the unjustified use
    of thd->is_slave_error.

ChangeSet@1.1810.3429.1, 2007-10-30 14:27:21+02:00, gkodinov@magare.gmz +3 -0
  Bug #31884: Assertion + crash in subquery in the SELECT clause.
  
  Item_in_subselect's only externally callable method is val_bool().
  However the nullability in the wrapper class (Item_in_optimizer) is 
  established by calling the "forbidden" method val_int().
  
  Fixed to use the correct method (val_bool() ) to establish nullability 
  of Item_in_subselect in Item_in_optimizer.

  mysql-test/r/subselect.result@1.134.1.62, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +11 -0
    Bug #31884: test case

  mysql-test/t/subselect.test@1.129.12.1, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +15 -0
    Bug #31884: test case

  sql/item_subselect.h@1.77.1.14, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +1 -0
    Bug #31884: Use the correct method to establish nullability

ChangeSet@1.2529.50.22, 2007-10-30 15:25:39+03:00, kostja@bodhi.(none) +1 -0
  Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
  This is important for a development environment where not all source files
  are checked out.

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.3.1, 2007-10-30 15:25:36+03:00, kostja@bodhi.(none) +1 -1
    Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
    This is important for a development environment where not all source files
    are checked out.

ChangeSet@1.2537.32.28, 2007-10-30 12:58:10+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31690  	Online Upgrading to CGE 6.2.6/7 and 6.3.4 failing
  - 6.1->6.2 part

  storage/ndb/src/common/util/version.c@1.32.1.4, 2007-10-30 12:58:05+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31690  	Online Upgrading to CGE 6.2.6/7 and 6.3.4 failing
    - 6.1->6.2 part

ChangeSet@1.2537.32.27, 2007-10-30 12:54:01+01:00, tomas@whalegate.ndb.mysql.com +12 -0
  bug#19227
  - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result@1.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +26 -26
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result@1.5, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +24 -24
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.5.1, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +0 -2
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt@1.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt@1.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt@1.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt@1.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  sql/ha_ndbcluster.cc@1.480.7.6, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +35 -15
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  sql/ha_ndbcluster.h@1.186.3.4, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +15 -0
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  sql/ha_ndbcluster_binlog.cc@1.90.1.55, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +64 -18
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  sql/ha_ndbcluster_binlog.h@1.34.2.3, 2007-10-30 12:53:56+01:00, tomas@whalegate.ndb.mysql.com +9 -7
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

  sql/mysqld.cc@1.646.2.2, 2007-10-30 12:53:57+01:00, tomas@whalegate.ndb.mysql.com +18 -0
    bug#19227
    - enable logging of full rows and update as updates to make binlog compatible with other engines

ChangeSet@1.2529.133.4, 2007-10-30 13:49:42+02:00, aelkin@koti.dsl.inet.fi +6 -0
  Manual merge 5.0-rpl -> 5.1-rpl.
  
  involved bug#12691, bug#27571

  mysql-test/suite/rpl/r/rpl_sp_effects.result@1.9, 2007-10-30 13:49:34+02:00, aelkin@koti.dsl.inet.fi +41 -0
    results changed

  sql/slave.cc@1.301.1.22, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +9 -70
    pended manual merge done (mats)

  sql/sql_delete.cc@1.204.17.6, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +2 -23
    manual merge

  sql/sql_insert.cc@1.282.1.20, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +1 -25
    manual merge

  sql/sql_load.cc@1.128.1.5, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +5 -44
    manual merge

  sql/sql_update.cc@1.215.1.45, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +13 -132
    manual merge.

ChangeSet@1.2529.122.5, 2007-10-30 12:03:44+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.74.2.1, 2007-10-30 12:03:43+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1616.3109.2, 2007-10-30 14:46:43+04:00, svoj@mysql.com +3 -0
  BUG#11392 - fulltext search bug
  
  Fulltext boolean mode phrase search may crash server on platforms
  where size of pointer is not equal to size of unsigned integer
  (in other words some 64-bit platforms).
  
  The problem was integer overflow.
  
  Affects 4.1 only.

  mysql-test/r/fulltext.result@1.65.1.15, 2007-10-30 14:46:42+04:00, svoj@mysql.com +6 -0
    A test case for BUG#11392.

  mysql-test/t/fulltext.test@1.71.1.8, 2007-10-30 14:46:42+04:00, svoj@mysql.com +8 -0
    A test case for BUG#11392.

  myisam/ft_boolean_search.c@1.84.1.6, 2007-10-30 14:46:42+04:00, svoj@mysql.com +2 -1
    my_match_t::beg is unsigned int, that means type of expression
    (m[0].beg - 1) has unsigned type too. It may happen that instr()
    finds substring in the beggining of passed string, returning
    m[0].beg equal to 0. In this case value of expression (m[0].beg - 1)
    is equal to MAX_UINT.
    
    This is not a problem on platforms where sizeof(pointer) equals to
    sizeof(uint). That means ptr[(uint)-1] = ptr[(uint)MAX_UINT] = ptr - 1.
    
    On some 64-bit platforms where sizeof(pointer) is 8 and sizeof(uint)
    is 4, wrong address gets accessed. In other words ptr[(uint)-1] is
    equal to ptr + MAX_UINT.

ChangeSet@1.1810.3428.1, 2007-10-30 12:51:57+04:00, ramil@mysql.com +3 -0
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
  
  Problem: mysqlcheck doesn't escape backtick characters in the table names.
  
  Fix: escape them.

  client/mysqlcheck.c@1.55.1.5, 2007-10-30 12:51:55+04:00, ramil@mysql.com +38 -14
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - escape backtick characters in the table names.

  mysql-test/r/mysqlcheck.result@1.1.1.3, 2007-10-30 12:51:55+04:00, ramil@mysql.com +6 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test result.

  mysql-test/t/mysqlcheck.test@1.1.1.3, 2007-10-30 12:51:56+04:00, ramil@mysql.com +10 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test case.

ChangeSet@1.1616.3112.1, 2007-10-30 12:35:03+04:00, holyfoot@mysql.com +3 -0
  Bug #31758 inet_ntoa, oct crashes server with null+filesort
  
  Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
  argument, which is wrong.
  Both can be NULL with notnull arguments, so that's fixed.

  mysql-test/r/func_str.result@1.70.1.35, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +15 -3
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test case

  mysql-test/t/func_str.test@1.64.1.23, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +13 -0
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test result

  sql/item_strfunc.h@1.73.2.21, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +2 -1
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    missing maybe_null flags set for Item_func_inet_ntoa and Item_func_conv

ChangeSet@1.2529.1.64, 2007-10-29 22:48:58+01:00, kent@mysql.com +1 -0
  autorun.sh:
    After review changes

  BUILD/autorun.sh@1.13, 2007-10-29 22:48:18+01:00, kent@mysql.com +4 -4
    After review changes

ChangeSet@1.2603.1.56, 2007-10-29 17:48:10-04:00, jas@rowvwade. +5 -0
  Put in mechanism to block cache flush writes while a serial
  log write is pending.  This gives priority, more or less,
  to the serial log.

  storage/falcon/Cache.cpp@1.33, 2007-10-29 17:48:01-04:00, jas@rowvwade. +3 -0
    Put in mechanism to block cache flush writes while a serial
    log write is pending.  This gives priority, more or less,
    to the serial log.

  storage/falcon/Database.cpp@1.15.1.9, 2007-10-29 17:48:02-04:00, jas@rowvwade. +1 -2
    Put in mechanism to block cache flush writes while a serial
    log write is pending.  This gives priority, more or less,
    to the serial log.

  storage/falcon/Database.h@1.14, 2007-10-29 17:48:02-04:00, jas@rowvwade. +1 -0
    Put in mechanism to block cache flush writes while a serial
    log write is pending.  This gives priority, more or less,
    to the serial log.

  storage/falcon/SerialLog.cpp@1.18, 2007-10-29 17:48:02-04:00, jas@rowvwade. +0 -2
    Remove recently dead code.

  storage/falcon/SerialLogFile.cpp@1.4, 2007-10-29 17:48:03-04:00, jas@rowvwade. +4 -1
    Put in mechanism to block cache flush writes while a serial
    log write is pending.  This gives priority, more or less,
    to the serial log.

ChangeSet@1.2603.1.55, 2007-10-29 17:24:46-04:00, jas@fluffy.netfrastructure.com +3 -0
  Got serial log I/O working with direct I/O on Linux.

  storage/falcon/SerialLog.cpp@1.17, 2007-10-29 17:24:42-04:00, jas@fluffy.netfrastructure.com +5 -4
    Fix problem with serial log window alignment (never actually worked).

  storage/falcon/SerialLogFile.cpp@1.3, 2007-10-29 17:24:42-04:00, jas@fluffy.netfrastructure.com +14 -4
    Added code to print duration of very long serial log writes.

  storage/falcon/SerialLogFile.h@1.2, 2007-10-29 17:24:42-04:00, jas@fluffy.netfrastructure.com +3 -1
    Added code to print duration of very long serial log writes.

ChangeSet@1.2529.1.63, 2007-10-29 20:12:44+01:00, kent@mysql.com +2 -0
  autorun.sh:
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/autorun.sh@1.12, 2007-10-29 20:10:53+01:00, kent@mysql.com +16 -7
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/compile-dist@1.18.1.1, 2007-10-29 20:12:28+01:00, kent@mysql.com +3 -8

ChangeSet@1.2529.134.3, 2007-10-29 20:00:36+01:00, joerg@trift2. +1 -0
  5.1 has been promoted to "rc" status.

  configure.in@1.330.122.2, 2007-10-29 20:00:27+01:00, joerg@trift2. +1 -1
    5.1 has been promoted to "rc" status.

ChangeSet@1.2529.103.16, 2007-10-29 20:31:03+04:00, ramil@mysql.com +4 -0
  after-merge fix-up.

  mysql-test/include/mix1.inc@1.56.3.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +9 -0
    after-merge fix-up.

  mysql-test/r/innodb_mysql.result@1.24.30.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +15 -0
    after-merge fix-up.

  mysql-test/r/key.result@1.45.2.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +45 -0
    after-merge fix-up.

  mysql-test/t/key.test@1.37.2.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +20 -0
    after-merge fix-up.

ChangeSet@1.2603.1.54, 2007-10-29 11:40:05-04:00, jas@rowvwade. +3 -0
  Initial crack at conditionalizing serial log i/o to use
  positional I/O and, optionally, direct i/o.

  storage/falcon/Cache.cpp@1.32, 2007-10-29 11:39:58-04:00, jas@rowvwade. +6 -2
    Bound the number of buffers Cache::continueWrite must
    consider.

  storage/falcon/IO.cpp@1.15, 2007-10-29 11:39:58-04:00, jas@rowvwade. +8 -36
    Simplify conditionalization in IO.cpp to make it easier to
    experiment with direct i/o.

  storage/falcon/SerialLogFile.cpp@1.2, 2007-10-29 11:39:58-04:00, jas@rowvwade. +37 -16
    Initial crack at conditionalizing serial log i/o to use
    positional I/O and, optionally, direct i/o.

ChangeSet@1.1810.3425.1, 2007-10-29 15:20:59+02:00, aelkin@koti.dsl.inet.fi +12 -0
  Bug #27571 asynchronousity in setting mysql_`query`::error and
             Query_log_event::error_code
  
  A query can perform completely having the local var error of mysql_$query
  zero, where $query in insert, update, delete, load,
  and be  binlogged with error_code e.g KILLED_QUERY while there is no
  reason do to so.
  That can happen because Query_log_event consults thd->killed flag to
  evaluate error_code.
  
  Fixed with implementing a scheme suggested and partly implemented at
  time of bug@22725 work-on. error_status is cached immediatly after the
  control leaves the main rows-loop and that instance always corresponds
  to `error' the local of mysql_$query functions. The cached value
  is passed to Query_log_event constructor, not the default thd->killed
  which can be changed in between of the caching and the constructing.

  mysql-test/t/binlog_killed_bug27571-master.opt@1.1, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
    post rows-loop killing simulation's options

  mysql-test/t/binlog_killed_bug27571-master.opt@1.0, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_bug27571.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +68 -0
    Checking that if killing happens inbetween of the end of rows loop and
    recording into binlog that will not lead to recording any error incl
    the killed error.

  mysql-test/t/binlog_killed_bug27571.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/r/binlog_killed.result@1.6.1.1, 2007-10-29 15:20:53+02:00, aelkin@koti.dsl.inet.fi +106 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.2.1, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +170 -125
    Demonstrating that effective killing during rows-loop execution leads to the speficied actions:
    binlogging with the error for a query modified a not-transactional table or
    rolling back effects for transactional table;
    
    fixing possible non-determinism with ID when query_log_enabled;
    
    leave commented out tests for multi-update,delete due to another bug;
    
    removing an obsolete tests template;
    
    changing system rm to --remove_file.

  mysql-test/t/binlog_killed_simulate-master.opt@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +1 -0
    simulation options

  mysql-test/t/binlog_killed_simulate-master.opt@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_simulate.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +65 -0
    tests for 
    a query (update is choosen) being killed after the row-loop;
    load data killed within the loop - effective killed error in the event is gained.
    

  mysql-test/t/binlog_killed_simulate.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.1.65, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -5
    adding killed status arg

  sql/log_event.h@1.122.1.14, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -4
    added killed status arg

  sql/sql_delete.cc@1.144.1.58, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +11 -7
    deploying the update part patch for delete, multi-delete

  sql/sql_insert.cc@1.146.1.106, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +2 -1
    deploying the update-part patch for insert..select

  sql/sql_load.cc@1.78.1.40, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +20 -6
    deploying the update-part patch for load data.
    simulation added.

  sql/sql_update.cc@1.154.2.71, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +34 -36
    Impementing the fix as described in the comments left by bug@22725.
    Also simulation of killing after the loop that would affect binlogging in the old code.

ChangeSet@1.2529.109.4, 2007-10-29 15:42:49+03:00, anozdrin@station. +3 -0
  Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
  rebuild the table.
  
  The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
  table reconstruction.
  
  The fix is to rebuild a table if ROW_FORMAT is specified.

  mysql-test/include/mix1.inc@1.56.2.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +49 -0
    Add a test case for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
    rebuild the table.

  mysql-test/r/innodb_mysql.result@1.24.29.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +34 -0
    Update result file.

  sql/sql_table.cc@1.388.63.3, 2007-10-29 15:42:47+03:00, anozdrin@station. +1 -0
    Rebuild a table if ROW_FORMAT was specified in ALTER TABLE.

ChangeSet@1.2603.21.19, 2007-10-29 16:12:38+04:00, gluh@mysql.com +5 -0
  Bug#31544: funcs_1: <engine>_storedproc_08 broken, adjustment to 5.2 properties missing
  
  - Changed columns where date is removed.
  - re-run of the test case shows as only difference added columns in table 
    'routines', for each of memory, myisam, innodb, ndb.

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.5, 2007-10-29 16:12:36+04:00, gluh@mysql.com +84 -0
    Bug#31544: New columns of table 'routines' participate in result.

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.5, 2007-10-29 16:12:36+04:00, gluh@mysql.com +84 -0
    Bug#31544: New columns of table 'routines' participate in result.

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.5, 2007-10-29 16:12:36+04:00, gluh@mysql.com +84 -0
    Bug#31544: New columns of table 'routines' participate in result.

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.5, 2007-10-29 16:12:36+04:00, gluh@mysql.com +84 -0
    Bug#31544: New columns of table 'routines' participate in result.

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.4, 2007-10-29 16:12:36+04:00, gluh@mysql.com +1 -1
    Bug#31544: The columns that need date specific info removed are now 23 & 24.

ChangeSet@1.2529.120.20, 2007-10-29 15:49:56+04:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/r/type_decimal.result@1.49.1.4, 2007-10-29 15:49:54+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3395.15, 2007-10-29 15:39:56+04:00, gluh@mysql.com +4 -0
  Bug#30889: filesort and order by with float/numeric crashes server
  
  There are two problems with ROUND(X, D) on an exact numeric 
  (DECIMAL, NUMERIC type) field of a table:
  1) The implementation of the ROUND function would change the number of decimal
  places regardless of the value decided upon in fix_length_and_dec. When the
  number of decimal places is not constant, this would cause an inconsistent
  state where the number of digits was less than the number of decimal places,
  which crashes filesort.
  
  Fixed by not allowing the ROUND operation to add any more decimal places than
  was decided in fix_length_and_dec.
  
  2) fix_length_and_dec would allow the number of decimals to be greater than
  the maximium configured value for constant values of D. This led to the same 
  crash as in (1).
  
  Fixed by not allowing the above in fix_length_and_dec.

  mysql-test/r/type_decimal.result@1.38.1.10, 2007-10-29 15:39:54+04:00, gluh@mysql.com +67 -0
    Bug#30889: Test result

  mysql-test/t/type_decimal.test@1.35.1.3, 2007-10-29 15:39:54+04:00, gluh@mysql.com +38 -1
    Bug#30889: Test case

  sql/item_func.cc@1.270.80.1, 2007-10-29 15:39:54+04:00, gluh@mysql.com +2 -1
    Bug#30889: 
    - Avoid setting number of digits after decimal point (scale) higher than its 
      maximum value.
    - Avoid increasing the number of decimal places in ::decimal_op

  sql/item_func.h@1.136.2.40, 2007-10-29 15:39:54+04:00, gluh@mysql.com +31 -0
    Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op
    family of methods.

ChangeSet@1.1810.3395.14, 2007-10-29 14:53:10+04:00, gluh@mysql.com +3 -0
  Bug#30897 GROUP_CONCAT returns extra comma on empty fields
  The fix is a copy of Martin Friebe's suggestion.
  added testing for no_appended which will be false if anything,
  including the empty string is in result

  mysql-test/r/func_gconcat.result@1.52.1.21, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test result

  mysql-test/t/func_gconcat.test@1.44.1.16, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test case

  sql/item_sum.cc@1.170.1.46, 2007-10-29 14:53:09+04:00, gluh@mysql.com +1 -1
    added testing for no_appended which will be False if anything,
    including the empty string is in result

ChangeSet@1.1810.3395.13, 2007-10-29 14:45:35+04:00, gluh@mysql.com +2 -0
  backported test case from 5.1

  mysql-test/r/information_schema.result@1.87.1.41, 2007-10-29 14:45:33+04:00, gluh@mysql.com +32 -0
    backported test case from 5.1

  mysql-test/t/information_schema.test@1.65.1.32, 2007-10-29 14:45:33+04:00, gluh@mysql.com +20 -0
    backported test case from 5.1

ChangeSet@1.1810.3395.12, 2007-10-29 11:52:44+03:00, kaa@polly.(none) +1 -0
  Fixed compile warnings introduced by the patch for bug #29131.

  sql/mysqld.cc@1.439.131.2, 2007-10-29 11:52:39+03:00, kaa@polly.(none) +2 -1
    Fixed compile warnings introduced by the patch for bug #29131.

ChangeSet@1.2529.1.62, 2007-10-29 09:31:13+01:00, mleich@four.local.lan +3 -0
  Fix for
    Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
    
  Reason for the changes is:
    WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.2, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -1
    1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
    2. Add missing subtest with ALTER DATABASE ... UPGRADE ...

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

ChangeSet@1.1810.3422.1, 2007-10-29 12:20:21+04:00, ramil@mysql.com +4 -0
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
  
  Problem: improper maximum length calculation of the CASE function leads to 
  decimal value truncation (storing/retrieving decimal field values).
  
  Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
  of the CASE function.

  mysql-test/r/case.result@1.24.2.5, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -1
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test result.

  mysql-test/t/case.test@1.18.1.4, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -2
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test case.

  sql/item_cmpfunc.cc@1.187.45.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +30 -6
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

  sql/item_cmpfunc.h@1.122.24.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +2 -0
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

ChangeSet@1.2529.120.12, 2007-10-28 11:30:36+04:00, gshchepa@gleb.loc +3 -0
  Many files:
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.15.1.9, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2529.120.11, 2007-10-28 02:09:24+04:00, gshchepa@gleb.loc +3 -0
  rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:
    Error message numbers.

  mysql-test/r/sp.result@1.270.16.12, 2007-10-28 02:09:11+04:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.4, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +26 -26
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.18.1.9, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2529.120.10, 2007-10-28 02:33:18+05:00, gshchepa@gleb.loc +1 -0
  ha_archive.cc:
    Post-merge fix.

  storage/archive/ha_archive.cc@1.142.1.2, 2007-10-28 02:29:15+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.2603.21.7, 2007-10-28 01:13:17+05:00, gshchepa@gleb.loc +14 -0
  Many files:
    Error message numbers.

  mysql-test/r/locktrans_myisam.result@1.10, 2007-10-28 01:12:42+05:00, gshchepa@gleb.loc +19 -19
    Error message numbers.

  mysql-test/r/rpl_locktrans_myisam.result@1.10, 2007-10-28 01:12:42+05:00, gshchepa@gleb.loc +19 -19
    Error message numbers.

  mysql-test/r/sp.result@1.302, 2007-10-28 01:12:42+05:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_alter_table.result@1.54, 2007-10-28 01:12:42+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.16, 2007-10-28 01:12:42+05:00, gshchepa@gleb.loc +8 -8
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@1.5, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_binlog_basic.result@1.14, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@1.25, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@1.9, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_blob.result@1.30, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_column_properties.result@1.15, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +9 -9
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_alter.result@1.17, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +7 -7
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_gis.result@1.34, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.17, 2007-10-28 01:12:43+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

ChangeSet@1.2603.1.53, 2007-10-27 14:37:04-04:00, jas@rowvwade. +3 -0
  Changed page consolidation code to write clean pages to
  reduce the number of physical I/Os.

  storage/falcon/Cache.cpp@1.31, 2007-10-27 14:36:56-04:00, jas@rowvwade. +28 -48
    Changed page consolidation code to write clean pages to
    reduce the number of physical I/Os.

  storage/falcon/Cache.h@1.13, 2007-10-27 14:36:57-04:00, jas@rowvwade. +2 -7
    Changed page consolidation code to write clean pages to
    reduce the number of physical I/Os.

  storage/falcon/Sync.cpp@1.4, 2007-10-27 14:36:57-04:00, jas@rowvwade. +0 -5
    Took pointless code of the Sync destructor.

ChangeSet@1.2588.35.36, 2007-10-26 17:42:32-04:00, jas@rowvwade. +9 -0
  Replaced recursive record fetch with an iterative record
  fetch in Table::fetch.

  storage/falcon/Dbb.cpp@1.12, 2007-10-26 17:42:16-04:00, jas@rowvwade. +0 -2
    Dead code elimination.

  storage/falcon/RecordGroup.cpp@1.5, 2007-10-26 17:42:17-04:00, jas@rowvwade. +1 -2
    Replaced recursive record fetch with an iterative record
    fetch in Table::fetch.

  storage/falcon/RecordGroup.h@1.3, 2007-10-26 17:42:17-04:00, jas@rowvwade. +1 -1
    Replaced recursive record fetch with an iterative record
    fetch in Table::fetch.

  storage/falcon/RecordLeaf.cpp@1.4, 2007-10-26 17:42:17-04:00, jas@rowvwade. +1 -0
    Replaced recursive record fetch with an iterative record
    fetch in Table::fetch.

  storage/falcon/RecordSection.h@1.3, 2007-10-26 17:42:18-04:00, jas@rowvwade. +2 -0
    Replaced recursive record fetch with an iterative record
    fetch in Table::fetch.

  storage/falcon/SerialLog.cpp@1.16, 2007-10-26 17:42:18-04:00, jas@rowvwade. +0 -62
    Dead code elimination.

  storage/falcon/SerialLog.h@1.7, 2007-10-26 17:42:18-04:00, jas@rowvwade. +0 -5
    Dead method elimination.

  storage/falcon/SyncObject.cpp@1.8, 2007-10-26 17:42:19-04:00, jas@rowvwade. +3 -27
    Reduced number and complexity of assertions in SyncObject::unlock.

  storage/falcon/Table.cpp@1.15.1.2, 2007-10-26 17:42:19-04:00, jas@rowvwade. +24 -4
    Replaced recursive record fetch with an iterative record
    fetch in Table::fetch.

ChangeSet@1.2529.131.2, 2007-10-27 01:40:48+05:00, gshchepa@gleb.loc +14 -0
  Many files:
    Error message numbers.

  mysql-test/r/binlog_unsafe.result@1.6, 2007-10-27 04:37:17+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/r/events_bugs.result@1.42.1.1, 2007-10-27 05:03:12+05:00, gshchepa@gleb.loc +8 -8
    Error message numbers.

  mysql-test/r/events_trans.result@1.6, 2007-10-27 05:04:18+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/r/sp_gis.result@1.11, 2007-10-27 05:07:10+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/r/xml.result@1.29, 2007-10-27 05:08:29+05:00, gshchepa@gleb.loc +9 -9
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.16.5.2, 2007-10-27 05:52:59+05:00, gshchepa@gleb.loc +3 -3
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.21, 2007-10-27 06:02:36+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_gis.result@1.25.2.2, 2007-10-27 06:02:47+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.2.1.7, 2007-10-27 06:02:54+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.15, 2007-10-27 06:02:55+05:00, gshchepa@gleb.loc +5 -5
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_incident.result@1.13, 2007-10-27 05:09:44+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.8, 2007-10-27 05:10:36+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_udf.result@1.8.1.4, 2007-10-27 05:11:26+05:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.13.1.1, 2007-10-27 05:40:31+05:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

ChangeSet@1.2588.35.35, 2007-10-26 16:12:48-04:00, jas@rowvwade. +2 -0
  Change UINT to uint for platform indepedence.

  extra/yassl/yassl.vcproj@1.8, 2007-10-26 16:12:41-04:00, jas@rowvwade. +215 -117
    n

  storage/falcon/Transaction.cpp@1.11, 2007-10-26 16:12:41-04:00, jas@rowvwade. +1 -1
    Change UINT to uint for platform indepedence.

ChangeSet@1.2588.35.34, 2007-10-26 15:55:40-04:00, jas@rowvwade. +14 -0
  Added optional lock with timout to SynchronizationObject,
  SyncObject, and Sync.  It also is defined on Mutex, but the
  only lock that can actually time out is SyncObject.

  storage/falcon/Cache.cpp@1.28.1.6, 2007-10-26 15:55:28-04:00, jas@rowvwade. +2 -2
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/Mutex.cpp@1.2, 2007-10-26 15:55:28-04:00, jas@rowvwade. +1 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/Mutex.h@1.2, 2007-10-26 15:55:28-04:00, jas@rowvwade. +1 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/SQLException.h@1.2, 2007-10-26 15:55:29-04:00, jas@rowvwade. +2 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/StorageParameters.h@1.9, 2007-10-26 15:55:29-04:00, jas@rowvwade. +1 -0
    Defined new configuration parameter "falcon_lock_timeout" to
    give the timeout value (in milliseconds).

  storage/falcon/StorageTable.cpp@1.3, 2007-10-26 15:55:29-04:00, jas@rowvwade. +4 -0
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/StorageTableShare.h@1.2, 2007-10-26 15:55:30-04:00, jas@rowvwade. +2 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/Sync.cpp@1.3, 2007-10-26 15:55:30-04:00, jas@rowvwade. +11 -3
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/Sync.h@1.2, 2007-10-26 15:55:30-04:00, jas@rowvwade. +2 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/SyncObject.cpp@1.7, 2007-10-26 15:55:31-04:00, jas@rowvwade. +34 -3
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/SyncObject.h@1.4, 2007-10-26 15:55:31-04:00, jas@rowvwade. +2 -2
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/SynchronizationObject.h@1.2, 2007-10-26 15:55:31-04:00, jas@rowvwade. +1 -1
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/Transaction.cpp@1.10, 2007-10-26 15:55:32-04:00, jas@rowvwade. +3 -3
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

  storage/falcon/ha_falcon.cpp@1.10.1.2, 2007-10-26 15:55:32-04:00, jas@rowvwade. +4 -5
    Added optional lock with timout to SynchronizationObject,
    SyncObject, and Sync.  It also is defined on Mutex, but the
    only lock that can actually time out is SyncObject.

ChangeSet@1.1810.3421.1, 2007-10-26 18:52:58+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
    
  Adding code to keep skipping events while inside a transaction. Execution
  will start just after the transaction has been skipped.

  mysql-test/t/rpl_slave_skip-slave.opt@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip-slave.opt''

  mysql-test/t/rpl_slave_skip-slave.opt@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/r/rpl_slave_skip.result@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +144 -0
    New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''

  mysql-test/r/rpl_slave_skip.result@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_slave_skip.test@1.1, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +203 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''

  mysql-test/t/rpl_slave_skip.test@1.0, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.241.23.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +53 -3
    Adding code to set the thd->options flag for the slave SQL thread
    even when BEGIN, ROLLBACK, COMMIT, and XID events are being skipped.
        
    Adding code to not decrease the slave skip counter from 1 to 0 if we
    are inside a transaction. This will keep the counter at 1, and keep
    skipping events, until a transaction terminator is read. At that point,
    the slave skip counter will be decreased to 0, and events will be read
    and executed instead of read and skipped.

ChangeSet@1.2529.132.1, 2007-10-26 21:26:06+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31036: Using order by with archive table crashes server.
  
  1. Memory overrun have been fixed.
  2. Server failure on assertion has been fixed.

  mysql-test/r/archive.result@1.33.2.1, 2007-10-26 20:55:06+05:00, gshchepa@gleb.loc +4 -0
    Added test case for bug #31036.

  mysql-test/t/archive.test@1.32.2.1, 2007-10-26 20:54:55+05:00, gshchepa@gleb.loc +22 -0
    Added test case for bug #31036.

  storage/archive/azio.c@1.20.3.1, 2007-10-26 20:54:40+05:00, gshchepa@gleb.loc +5 -5
    Fixed bug #31036.
    The ha_archive::rnd_pos function has been modified to take
    into account the result of the azseek function and
    to return HA_ERR_CRASHED_ON_USAGE in case of seek error.

  storage/archive/ha_archive.cc@1.142.1.1, 2007-10-26 20:54:49+05:00, gshchepa@gleb.loc +2 -2
    Fixed bug #31036.
    1. Memory overrun has been fixed: maximal sizes of azio_stream::inbuf
       and azio_stream::outbuf was mixed.
    2. Zero value of the output parameter of the azread function was
       incorrectly interpreted by the azseek function: after the first
       successful read attempt the execution of the azseek loop was
       interrupted and negative value was returned.
       (See ha_archive::rnd_pos: that negative value was silently ignored,
       and an incomplete data was used, for example, as a size of a packed
       record, and server failed with the assertion:
       "row_len <= record_buffer->length".)

ChangeSet@1.2588.35.33, 2007-10-26 11:36:28-04:00, jas@rowvwade. +1 -0
  Set default number of gopher threads to 5.

  storage/falcon/StorageParameters.h@1.8, 2007-10-26 11:36:21-04:00, jas@rowvwade. +1 -1
    Set default number of gopher threads to 5.

ChangeSet@1.2529.1.61, 2007-10-26 17:36:22+02:00, mleich@four.local.lan +4 -0
  Fix for
     Bug#31408 funcs_1: <engine>_trig_03e test fail
  Modification:
     The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
     Therefore after REVOKE TRIGGER privilege the 
     - SHOW TRIGGERS
     - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
     result sets are now empty.

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.2.1.2, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

ChangeSet@1.2603.1.51, 2007-10-26 10:23:31-05:00, chris@xeno.mysql.com +2 -0
  Bug#31490 "The funcs_1 test falcon_func_view fails due to differences in a datetime col"
  
  Added DATETIME test to Falcon suite.

  mysql-test/suite/falcon/r/falcon_bug_31490.result@1.2, 2007-10-26 10:23:29-05:00, chris@xeno.mysql.com +1 -0
    DATETIME test results

  mysql-test/suite/falcon/t/falcon_bug_31490.test@1.1, 2007-10-26 10:23:29-05:00, chris@xeno.mysql.com +33 -0
    Added DATETIME test cases to Falcon suite.

  mysql-test/suite/falcon/t/falcon_bug_31490.test@1.0, 2007-10-26 10:23:29-05:00, chris@xeno.mysql.com +0 -0

ChangeSet@1.2603.1.50, 2007-10-26 10:21:08-05:00, chris@xeno.mysql.com +1 -0
  Bug#31490 "The funcs_1 test falcon_func_view fails due to differences in a datetime col"
  
  Added DATETIME testcase to Falcon suite.

  mysql-test/suite/falcon/r/falcon_bug_31490.result@1.1, 2007-10-26 10:20:58-05:00, chris@xeno.mysql.com +53 -0
    DATETIME test case results

  mysql-test/suite/falcon/r/falcon_bug_31490.result@1.0, 2007-10-26 10:20:58-05:00, chris@xeno.mysql.com +0 -0

ChangeSet@1.2588.35.32, 2007-10-26 11:16:37-04:00, jas@fluffy.netfrastructure.com +2 -0
  Remove "sleep" turn interlocked compare and swap backoff when
  releasing a SyncObject.

  storage/falcon/SyncObject.cpp@1.6, 2007-10-26 11:16:33-04:00, jas@fluffy.netfrastructure.com +4 -0
    Remove "sleep" turn interlocked compare and swap backoff when
    releasing a SyncObject.

  storage/falcon/snapshot/Snapshot.cpp@1.3, 2007-10-26 11:16:33-04:00, jas@fluffy.netfrastructure.com +3 -0
    Add the gopher thread and deferred index hash to
    thread snapshot tool.

ChangeSet@1.2529.107.3, 2007-10-26 16:11:20+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#28772 rpl_row_until fails in pushbuild

  mysql-test/suite/rpl/t/rpl_row_until.test@1.2.1.7, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

  mysql-test/suite/rpl/t/rpl_stm_until.test@1.25.1.6, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

ChangeSet@1.1810.3303.16, 2007-10-26 15:29:06+02:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.1.30, 2007-10-26 15:29:05+02:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.1.27, 2007-10-26 15:29:05+02:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.27.1, 2007-10-26 15:29:05+02:00, istruewing@stella.local +165 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.2537.32.25, 2007-10-26 14:11:57+02:00, mskold@mysql.com +1 -0
  Post-merge fix

  sql/ha_ndbcluster.h@1.186.3.2, 2007-10-26 14:11:40+02:00, mskold@mysql.com +1 -0
    Post-merge fix

ChangeSet@1.2537.38.1, 2007-10-26 13:09:35+02:00, knielsen@ymer.(none) +4 -0
  Bug #31874: Failure for NDB update/delete with combined range and equality constraints
  
  In update/delete with read_multi_range, when mixing pk lookups and range
  scans, sometimes update/delete did not correctly distinguish whether
  the current row was from pk lookup or from scan. This caused query
  failure (or potentially memory corruption and crash).
  
  Fix by setting proper flags in the read_multi_range_next() method.

  mysql-test/suite/ndb/r/ndb_read_multi_range.result@1.19, 2007-10-26 13:09:30+02:00, knielsen@ymer.(none) +15 -0
    Add test case.

  mysql-test/suite/ndb/t/ndb_read_multi_range.test@1.23, 2007-10-26 13:09:30+02:00, knielsen@ymer.(none) +15 -0
    Add test case.

  sql/ha_ndbcluster.cc@1.480.8.1, 2007-10-26 13:09:31+02:00, knielsen@ymer.(none) +29 -5
    Fix missing setting of flag to distinguish between pk lookups and range
    scans in read_multi_range.

  sql/ha_ndbcluster.h@1.186.4.1, 2007-10-26 13:09:31+02:00, knielsen@ymer.(none) +1 -0
    Fix missing setting of flag to distinguish between pk lookups and range
    scans in read_multi_range.

ChangeSet@1.1810.3287.41, 2007-10-26 15:37:38+05:00, ramil@mysql.com +7 -0
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
  
  Problem: if a partial unique key followed by a non-partial one we declare
  the second one as a primary key.
  
  Fix: sort non-partial unique keys before partial ones.

  include/my_base.h@1.70.1.17, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  mysql-test/t/innodb_mysql.test@1.3.50.1, 2007-10-26 15:37:37+05:00, ramil@mysql.com +9 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  mysql-test/r/innodb_mysql.result@1.3.22.6, 2007-10-26 15:37:37+05:00, ramil@mysql.com +15 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/r/key.result@1.28.1.12, 2007-10-26 15:37:37+05:00, ramil@mysql.com +44 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/t/key.test@1.24.1.7, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  sql/sql_table.cc@1.239.66.2, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -8
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  sql/structs.h@1.53.3.3, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

ChangeSet@1.2529.11.19, 2007-10-26 11:43:05+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct unused code

  sql/sql_update.cc@1.215.21.1, 2007-10-26 11:43:02+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct unused code

ChangeSet@1.2529.11.18, 2007-10-26 11:42:33+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  commit of WL#3686 test case already in 5.1 to get regression testing, no code committed

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +75 -0
    New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +79 -0
    New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.1810.3419.1, 2007-10-26 09:01:29+02:00, tnurnberg@mysql.com +2 -0
  Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump
  
  SHOW FIELDS FROM a view with no valid definer was possible (since fix
  for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
  of such views being successful, but loading such a dump with the client
  failing. Patch allows SHOW FIELDS to give data-type of field in underlying
  table.

  mysql-test/r/information_schema_db.result@1.1.1.12, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -3
    Fix test results: SHOW FIELDS FROM a view with no valid DEFINER
    gives us the field-type of the underlying table now rather than NULL.

  sql/sql_base.cc@1.235.114.1, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -1
    In the case of SHOW FIELDS FROM <view>, do not require a valid
    DEFINER for determining underlying data-type like we usually do.
    This is needed for mysqldump.

ChangeSet@1.2603.1.49, 2007-10-26 00:15:02-05:00, chris@xeno.mysql.com +4 -0
  Bug#22125 "Falcon: Double precision searches fail if index exists"
  
  Force DOUBLE values of -0 to 0.

  mysql-test/suite/falcon/r/falcon_bug_22125.result@1.2, 2007-10-26 00:15:00-05:00, chris@xeno.mysql.com +2 -2
    Changed -0 DOUBLEs to 0

  mysql-test/suite/falcon/t/disabled.def@1.5, 2007-10-26 00:15:00-05:00, chris@xeno.mysql.com +0 -1
    Enabled 22125

  storage/falcon/EncodedDataStream.cpp@1.2, 2007-10-26 00:15:00-05:00, chris@xeno.mysql.com +4 -1
    Force DOUBLE -0 to 0

  storage/falcon/Value.cpp@1.3, 2007-10-26 00:15:00-05:00, chris@xeno.mysql.com +1 -1
    Force DOUBLE -0 to 0

ChangeSet@1.2529.128.1, 2007-10-25 21:19:28-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30296
    "Dynamic plugins fail to load on FreeBSD"
    ELF executables need to be linked using the -export-dynamic option to
    ld(1) for symbols defined in the executable to become visible to dlsym().
    Also, do not build plugins on an all-static build.

  config/ac-macros/plugins.m4@1.22, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +11 -0
    Do not build plugins when building all-static

  configure.in@1.330.80.53, 2007-10-25 21:19:19-07:00, antony@pcg5ppc.xiphis.org +12 -1
    Bug#30296
      Use "-export-dynamic" when building executable for use with plugins.
      Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
      affect any other binary.

  sql/sql_yacc.yy@1.458.145.1, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +1 -1
    build fix - surplus semicolon

ChangeSet@1.1810.3413.2, 2007-10-25 17:23:12-07:00, antony@pcg5ppc.xiphis.org +2 -0
  protect bug31473 from regressing into 5.0

  mysql-test/r/csv.result@1.4.1.5, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +42 -0
    protect bug31473 from regressing into 5.0

  mysql-test/t/csv.test@1.5.1.7, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +33 -0
    protect bug31473 from regressing into 5.0

ChangeSet@1.2588.35.31, 2007-10-25 18:06:53-04:00, jas@rowvwade. +5 -0
  Cleaned up handling of update blocker for multiple gopher threads.

  storage/falcon/Cache.cpp@1.28.1.5, 2007-10-25 18:06:45-04:00, jas@rowvwade. +2 -0
    Disabled checksum/page number hack.

  storage/falcon/Gopher.cpp@1.3, 2007-10-25 18:06:45-04:00, jas@rowvwade. +2 -11
    Cleaned up handling of update blocker for multiple gopher threads.

  storage/falcon/Page.cpp@1.3, 2007-10-25 18:06:45-04:00, jas@rowvwade. +1 -1
    Disabled checksum/page number hack.

  storage/falcon/SerialLog.cpp@1.15, 2007-10-25 18:06:46-04:00, jas@rowvwade. +28 -0
    Cleaned up handling of update blocker for multiple gopher threads.

  storage/falcon/SerialLog.h@1.6, 2007-10-25 18:06:46-04:00, jas@rowvwade. +2 -0
    Cleaned up handling of update blocker for multiple gopher threads.

ChangeSet@1.2588.40.1, 2007-10-25 16:52:17-04:00, jas@fluffy.netfrastructure.com +1 -0
  Pick up new class, SRLSession.

  storage/falcon/Makefile.am@1.7, 2007-10-25 16:52:15-04:00, jas@fluffy.netfrastructure.com +2 -0
    Pick up new class, SRLSession.

ChangeSet@1.2588.35.29, 2007-10-25 16:52:13-04:00, jas@rowvwade. +3 -0
  Make another pass to unscramble last flush block, last block written, 
  etc.

  storage/falcon/Database.cpp@1.15.1.7, 2007-10-25 16:52:02-04:00, jas@rowvwade. +1 -0
    Initiate checkpoint after database creation.  Probably redundant,
    but certainly not harmful.

  storage/falcon/SerialLog.cpp@1.14, 2007-10-25 16:52:03-04:00, jas@rowvwade. +8 -5
    Make another pass to unscramble last flush block, last block written, 
    etc.

  storage/falcon/SerialLog.h@1.5, 2007-10-25 16:52:03-04:00, jas@rowvwade. +1 -1
    Make another pass to unscramble last flush block, last block written, 
    etc.

ChangeSet@1.2588.35.28, 2007-10-25 15:11:13-04:00, jas@rowvwade. +2 -0
  Fine tune recovery (i.e. make it work).

  storage/falcon/SRLDataPage.cpp@1.3, 2007-10-25 15:11:06-04:00, jas@rowvwade. +6 -2
    During recovery, remove subsequently re-used data pages
    from active locator pages in SRLDataPage to avoid subsequent
    trouble.

  storage/falcon/SRLSectionLine.cpp@1.2, 2007-10-25 15:11:06-04:00, jas@rowvwade. +9 -4
    Change debug logging for more convenient breakpoints.

ChangeSet@1.2588.35.27, 2007-10-25 14:10:34-04:00, jas@rowvwade. +18 -0
  First crack at a "herd of gophers" -- multiple gopher threads.

  storage/falcon/CMakeLists.txt@1.6, 2007-10-25 14:10:18-04:00, jas@rowvwade. +2 -0
    Added new class SRLSession to mark start of new session
    (i.e. end of recovery).

  storage/falcon/Cache.cpp@1.28.1.4, 2007-10-25 14:10:19-04:00, jas@rowvwade. +5 -3
    Fix deadlock between manual flush and asynchronous flush.

  storage/falcon/Gopher.cpp@1.2, 2007-10-25 14:10:19-04:00, jas@rowvwade. +15 -6
    First crack at a "herd of gophers" -- multiple gopher threads.

  storage/falcon/Gopher.h@1.2, 2007-10-25 14:10:19-04:00, jas@rowvwade. +8 -6
    First crack at a "herd of gophers" -- multiple gopher threads.

  storage/falcon/SRLCheckpoint.cpp@1.2, 2007-10-25 14:10:20-04:00, jas@rowvwade. +1 -1
    Implement recovery logging messages.

  storage/falcon/SRLRecordLocator.cpp@1.2, 2007-10-25 14:10:20-04:00, jas@rowvwade. +1 -1
    Implement recovery logging messages.

  storage/falcon/SRLSectionPage.cpp@1.2, 2007-10-25 14:10:21-04:00, jas@rowvwade. +2 -2
    Implement recovery logging messages.

  storage/falcon/SRLSession.cpp@1.1, 2007-10-25 14:10:25-04:00, jas@rowvwade. +44 -0
    New BitKeeper file ``storage/falcon/SRLSession.cpp''

  storage/falcon/SRLSession.cpp@1.0, 2007-10-25 14:10:25-04:00, jas@rowvwade. +0 -0

  storage/falcon/SRLSession.h@1.1, 2007-10-25 14:10:25-04:00, jas@rowvwade. +35 -0
    New BitKeeper file ``storage/falcon/SRLSession.h''

  storage/falcon/SRLSession.h@1.0, 2007-10-25 14:10:25-04:00, jas@rowvwade. +0 -0

  storage/falcon/Section.cpp@1.10, 2007-10-25 14:10:21-04:00, jas@rowvwade. +2 -2
    Build in debugging mechanism to conditionally stop on specific
    sections.

  storage/falcon/SerialLog.cpp@1.13, 2007-10-25 14:10:21-04:00, jas@rowvwade. +49 -7
    First crack at a "herd of gophers" -- multiple gopher threads.
    Also added support for SRLSession to mark recovery points.

  storage/falcon/SerialLog.h@1.4, 2007-10-25 14:10:22-04:00, jas@rowvwade. +7 -3
    First crack at a "herd of gophers" -- multiple gopher threads.
    Also added support for SRLSession to mark recovery points.

  storage/falcon/SerialLogControl.cpp@1.6, 2007-10-25 14:10:22-04:00, jas@rowvwade. +3 -0
    Added serial log session start record.

  storage/falcon/SerialLogControl.h@1.3, 2007-10-25 14:10:23-04:00, jas@rowvwade. +2 -0
    Added serial log session start record.

  storage/falcon/SerialLogRecord.h@1.3, 2007-10-25 14:10:23-04:00, jas@rowvwade. +2 -1
    Added serial log session start record.

  storage/falcon/StorageParameters.h@1.7, 2007-10-25 14:10:24-04:00, jas@rowvwade. +1 -0
    Set default number of gopher threads to one until code is
    thoroughly debugged.

  storage/falcon/TableSpace.cpp@1.2.1.2, 2007-10-25 14:10:24-04:00, jas@rowvwade. +1 -1
    Changed table space "save" operation to do "replace" rather
    than "insert" to avoid a myriad of possible problems.

  storage/falcon/Transaction.h@1.6, 2007-10-25 14:10:24-04:00, jas@rowvwade. +1 -2
    Minor cleanup.

ChangeSet@1.2588.35.26, 2007-10-25 12:32:28-04:00, jas@rowvwade. +10 -0
  Fix recovery bug with page size of 32K.  Also cleaned up debugging
  messages during recovery.

  storage/falcon/Database.cpp@1.15.1.6, 2007-10-25 12:32:17-04:00, jas@rowvwade. +2 -1
    Shutdown serial log before shutting down I/O system
    during database shutdown.

  storage/falcon/SRLCreateTableSpace.cpp@1.2, 2007-10-25 12:32:17-04:00, jas@rowvwade. +8 -1
    Cleanup recovery debug logging.

  storage/falcon/SRLCreateTableSpace.h@1.2, 2007-10-25 12:32:17-04:00, jas@rowvwade. +7 -8
    Edit for consistency and clarity.

  storage/falcon/SRLDataPage.cpp@1.2, 2007-10-25 12:32:18-04:00, jas@rowvwade. +5 -2
    Cleanup recovery debug logging.

  storage/falcon/SRLUpdateRecords.cpp@1.3, 2007-10-25 12:32:18-04:00, jas@rowvwade. +4 -3
    Cleanup recovery debug logging.

  storage/falcon/Section.cpp@1.9, 2007-10-25 12:32:19-04:00, jas@rowvwade. +16 -1
    Put in provision for stop sections for debugging.

  storage/falcon/TableSpace.cpp@1.2.1.1, 2007-10-25 12:32:19-04:00, jas@rowvwade. +14 -0
    Added redo for table space creation.

  storage/falcon/TableSpace.h@1.2.1.1, 2007-10-25 12:32:19-04:00, jas@rowvwade. +3 -1
    Added redo for table space creation.

  storage/falcon/TableSpaceManager.cpp@1.6.1.2, 2007-10-25 12:32:20-04:00, jas@rowvwade. +48 -10
    Added redo for table space creation.

  storage/falcon/TableSpaceManager.h@1.4.1.1, 2007-10-25 12:32:20-04:00, jas@rowvwade. +2 -0
    Added redo for table space creation.

ChangeSet@1.2537.32.23, 2007-10-25 15:03:16+02:00, knielsen@ymer.(none) +1 -0
  Fix bad merge.

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.46, 2007-10-25 15:03:13+02:00, knielsen@ymer.(none) +1 -1
    Fix bad merge.

ChangeSet@1.2603.26.1, 2007-10-25 15:58:57+03:00, timour@linux-h5lp.site +8 -0
  BUG#31639: Wrong plan for uncorrelated subquery when loose scan
             is applicable.
  
  There were two distinct problems in this bug:
  1. At execution time the subquery under an IN predicate was optimized with
     the global memeber thd->lex->current_select pointing to the outer select.
     This caused the subquery to be optimized differently when
     JOIN::optimize needed to analyze current_select.
  
     Fixed by setting the correct current_select for the optimization
     and execution (materialization) of the subquery.
  2. When running EXPLAIN, optimization took a different path because
     - Item_exists_subselect::fix_length_and_dec sets the subquery
       LIMIT to 1, then
     - mysql_explain_union(), which is called only for EXPLAIN called
       unit->set_limit(unit->global_parameters), which resets
       join->unit->select_limit_cnt to 1, this in turn
     - affected make_join_select to call sel->test_quick_select, which
       deleted the quick_select access method.
     Fixed by setting the limit correctly when IN is executed via
     materialization.

  mysql-test/r/group_min_max.result@1.37, 2007-10-25 15:58:34+03:00, timour@linux-h5lp.site +1 -1
    Adjusted test result.

  mysql-test/r/subselect.result@1.189, 2007-10-25 15:58:34+03:00, timour@linux-h5lp.site +1 -1
    Adjusted test result.

  mysql-test/r/subselect_mat.result@1.6, 2007-10-25 15:58:35+03:00, timour@linux-h5lp.site +61 -5
    Test for BUG#31639.

  mysql-test/r/subselect_no_opts.result@1.4, 2007-10-25 15:58:36+03:00, timour@linux-h5lp.site +1 -1
    Adjusted test result.

  mysql-test/r/subselect_no_semijoin.result@1.4, 2007-10-25 15:58:37+03:00, timour@linux-h5lp.site +1 -1
    Adjusted test result.

  mysql-test/t/subselect_mat.test@1.6, 2007-10-25 15:58:38+03:00, timour@linux-h5lp.site +42 -4
    Test for BUG#31639.

  sql/item_subselect.cc@1.168, 2007-10-25 15:58:39+03:00, timour@linux-h5lp.site +28 -5
    - reset the LIMIT for the subquery to inifinity if it will be materialized.
    - set and restore the correct thd->lex->current_select around the optimization
      and materialization of the subquery. 

  sql/sql_lex.cc@1.266.2.2, 2007-10-25 15:58:40+03:00, timour@linux-h5lp.site +20 -8
    Update the ASSERT to reflect that with materialization we set the LIMIT
    to infinity.

ChangeSet@1.1616.3111.1, 2007-10-25 13:28:12+02:00, df@pippilotta.erinye.com +1 -0
  add new trigger to prevent certain naming clashes

  BitKeeper/triggers/pre-commit.check-case.pl@1.1, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +26 -0
    catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

  BitKeeper/triggers/pre-commit.check-case.pl@1.0, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +0 -0

ChangeSet@1.2529.126.1, 2007-10-25 13:17:44+02:00, joerg@trift2. +1 -0
  Mimic a rename which Daniel already did in 6.0,
  to get rid of a name clash among *deleted* files on case-insignificant file systems.

  BitKeeper/deleted/.del-changelog-bleh@1.6.1.1, 2007-10-25 13:13:48+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

ChangeSet@1.2529.125.1, 2007-10-25 14:03:24+04:00, kaa@polly.(none) +3 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
    
  This is a 5.1 version of the patch.
    
  Problem:
    
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
    
  Solution:
  
  Since as of MySQL 5.1.12 one can enable or disable the general query log
  or the slow query log at runtime by changing values of
  general_log/slow_query_log, make 'log' and 'log_slow_queries" to be 
  synonyms for 'general_log' and 'slow_query_log' respectively.  This 
  makes expressions using the '@@var' syntax backward compatible with 
  5.0 and SHOW VARIABLES output to be consistent with the SET statement.

  mysql-test/r/log_state.result@1.7.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +63 -0
    Added a test case for bug #29131.

  mysql-test/t/log_state.test@1.9.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +36 -0
    Added a test case for bug #29131.

  sql/set_var.cc@1.231.28.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +6 -2
    Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.

ChangeSet@1.1810.3418.1, 2007-10-25 14:02:27+04:00, kaa@polly.(none) +6 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
  
  This is a 5.0 version of the patch, it will be null-merged to 5.1
  
  Problem:
  
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
  
  Solution:
  
  Make 'log' and 'log_slow_queries' read-only dynamic variables to make 
  them available for use in expressions, and produce a correct error 
  about the variable being read-only when used in the SET statement.

  mysql-test/r/variables.result@1.76.9.1, 2007-10-25 14:02:22+04:00, kaa@polly.(none) +16 -0
    Added a test case for bug #29131.

  mysql-test/t/variables.test@1.51.8.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #29131.

  sql/mysql_priv.h@1.290.124.2, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/mysqld.cc@1.439.130.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/set_var.cc@1.125.35.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +6 -2
    Made 'log' and 'log_slow_queries' to be read-only dynamic system 
    variable, i.e. available for use in expressions with the @@var syntax.

  sql/set_var.h@1.68.6.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +22 -0
    Added a new system variable class representing a read-only boolean
    variable.

ChangeSet@1.2603.21.3, 2007-10-25 15:00:18+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/suite/falcon/r/ps_8falcon.result@1.2, 2007-10-25 15:00:15+05:00, gluh@mysql.com +2 -1
    result fix

ChangeSet@1.2529.34.18, 2007-10-25 11:58:18+02:00, sven@murkla.(none) +3 -0
  WL#4078:  Document binary format of binlog entries
  Documented some binlog events using doxygen. More will be done later.
  Also fixed typos in other comments and added remarks about dubious code.
  Only comments are affected, there is no change to the actual code.

  sql/log_event.cc@1.271.41.8, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +27 -2
    Fixed typos in some comments.
    Added remarks (as comments) about questionable code.

  sql/log_event.h@1.161.1.4, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +866 -127
    Documented the binary format of following binlog events:
    Log_event
    Query_log_event
    Muted_query_log_event
    Slave_log_event (partial)
    Load_log_event
    Intvar_log_event
    Rand_log_event
    Rotate_log_event (partial)

  sql/sql_class.h@1.384.1.19, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +7 -5
    Fixed typo in comment.

ChangeSet@1.2537.32.21, 2007-10-25 10:45:11+02:00, knielsen@loke.(none) +1 -0
  after-merge fix.

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.45, 2007-10-25 10:45:10+02:00, knielsen@loke.(none) +2 -1
    after-merge fix.

ChangeSet@1.1810.3417.1, 2007-10-25 08:40:42+02:00, knielsen@loke.(none) +1 -0
  BUG#31810: Potential infinite loop with autoincrement failures in ndb
  
  Fix extra semicolon causing if-statement to be disabled.

  sql/ha_ndbcluster.cc@1.175.87.1, 2007-10-25 08:35:35+02:00, knielsen@loke.(none) +2 -2
    Fix extra semicolon causing if-statement to be disabled.

ChangeSet@1.1810.2128.71, 2007-10-25 07:57:18+02:00, knielsen@loke.(none) +5 -0
  BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc
  
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.

  ndb/include/kernel/AttributeHeader.hpp@1.7.2.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -5
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.11.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +3 -2
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.16.4.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -6
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbutil/DbUtil.cpp@1.11.3.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +2 -3
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.6.1, 2007-10-25 07:56:56+02:00, knielsen@loke.(none) +6 -9
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

ChangeSet@1.1810.3416.1, 2007-10-25 10:32:52+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #27695: View should not be allowed to have empty or
  all space column names.
  
  The parser has been modified to check VIEW column names
  with the check_column_name function and to report an error
  on empty and all space column names (same as for TABLE
  column names).

  mysql-test/r/select.result@1.121.13.1, 2007-10-25 10:32:36+05:00, gshchepa@gleb.loc +12 -14
    Updated test case for bug #27695.

  mysql-test/t/select.test@1.102.11.1, 2007-10-25 10:32:35+05:00, gshchepa@gleb.loc +15 -8
    Updated test case for bug #27695.

  sql/sql_yacc.yy@1.371.1.168, 2007-10-25 10:32:33+05:00, gshchepa@gleb.loc +6 -0
    Fixed bug #27695.
    The parser has been modified to check VIEW column aliases
    with the check_column_name function and to report an error
    on empty columns and all space columns (same as for TABLE
    column names).

ChangeSet@1.1810.3287.40, 2007-10-25 08:19:57+04:00, kaa@polly.(none) +1 -0
  Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

  mysys/my_write.c@1.15.1.2, 2007-10-25 08:19:52+04:00, kaa@polly.(none) +1 -1
    Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

ChangeSet@1.2529.109.3, 2007-10-24 19:01:08-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
  
  The root cause of this defect is that a call to my_error() is using a
  'LEX_STRING' parameter instead of a 'char*'
  
  This patch fixes the failing calls to my_error(), as well as similar calls
  found during investigation.
  
  This is a compiling bug (see the instrumentation in the bug report), no test cases provided.

  sql/sql_base.cc@1.374.53.1, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fix broken calls to "..." (va_args) functions.

  sql/sql_table.cc@1.388.63.2, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +5 -4
    Fix broken calls to "..." (va_args) functions.

ChangeSet@1.2588.35.25, 2007-10-24 15:31:59-04:00, jas@rowvwade. +4 -0
  Force flush of default table space during table space
  creation.

  storage/falcon/PageInventoryPage.cpp@1.3, 2007-10-24 15:31:51-04:00, jas@rowvwade. +12 -11
    Report section id's on orphan page reports during
    validation.

  storage/falcon/SRLCreateSection.cpp@1.2, 2007-10-24 15:31:51-04:00, jas@rowvwade. +1 -1
    Standardize recovering logging message.

  storage/falcon/SRLSequence.cpp@1.2, 2007-10-24 15:31:51-04:00, jas@rowvwade. +1 -1
    Standardize recovering logging message.

  storage/falcon/TableSpaceManager.cpp@1.6.1.1, 2007-10-24 15:31:52-04:00, jas@rowvwade. +1 -0
    Force flush of default table space during table space
    creation.

ChangeSet@1.2588.35.24, 2007-10-24 13:46:02-04:00, jas@rowvwade. +8 -0
  Track page number on pages for debugging.

  storage/falcon/Cache.cpp@1.28.1.3, 2007-10-24 13:45:51-04:00, jas@rowvwade. +2 -5
    Track page number on pages for debugging.

  storage/falcon/Dbb.cpp@1.11, 2007-10-24 13:45:52-04:00, jas@rowvwade. +19 -3
    Track page number on pages for debugging.

  storage/falcon/Index2RootPage.cpp@1.2, 2007-10-24 13:45:52-04:00, jas@rowvwade. +2 -1
    Track page number on pages for debugging.

  storage/falcon/IndexRootPage.cpp@1.3, 2007-10-24 13:45:52-04:00, jas@rowvwade. +2 -1
    Track page number on pages for debugging.

  storage/falcon/Page.cpp@1.2, 2007-10-24 13:45:53-04:00, jas@rowvwade. +7 -0
    Track page number on pages for debugging.

  storage/falcon/Page.h@1.2, 2007-10-24 13:45:53-04:00, jas@rowvwade. +3 -0
    Track page number on pages for debugging.

  storage/falcon/PageInventoryPage.cpp@1.2, 2007-10-24 13:45:53-04:00, jas@rowvwade. +1 -1
    Track page number on pages for debugging.

  storage/falcon/Section.cpp@1.8, 2007-10-24 13:45:54-04:00, jas@rowvwade. +14 -8
    Track page number on pages for debugging.

ChangeSet@1.2529.123.1, 2007-10-24 22:36:57+05:00, ramil@mysql.com +3 -0
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
  
  Problem: we skip views perfoming --fix-table-names.
  
  Fix: rename views as well.

  client/mysqlcheck.c@1.69.1.1, 2007-10-24 22:36:55+05:00, ramil@mysql.com +5 -2
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - rename views performing --fix-table-names as well.

  mysql-test/r/mysqlcheck.result@1.15, 2007-10-24 22:36:55+05:00, ramil@mysql.com +18 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test result.

  mysql-test/t/mysqlcheck.test@1.9, 2007-10-24 22:36:55+05:00, ramil@mysql.com +13 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test case.

ChangeSet@1.1810.3383.2, 2007-10-24 21:16:20+04:00, kaa@polly.(none) +1 -0
  Fix for bug #31566: my_write(fd, 0x0, 0, flags) fails with EFAULT on
  some platforms
  
  Since the behavior of write(fd, buf, 0) is undefined, it may fail with
  EFAULT on some architectures when buf == NULL. The error was propagated
  up to a caller, since my_write() code did not handle it properly.
  
  Fixed by checking the 'number of bytes' argument in my_write() and
  returning before calling the write() system call when there is nothing
  to write.

  mysys/my_write.c@1.15.1.1, 2007-10-24 21:16:12+04:00, kaa@polly.(none) +4 -0
    Return from my_write() before calling the write() system call when the
    number of bytes to be written is 0, since the behavior of write() in
    this case is not portable.

ChangeSet@1.2588.35.23, 2007-10-24 12:30:46-04:00, jas@rowvwade. +4 -0
  Add some page number checking to isolate I/O vs recovery bug.

  storage/falcon/Cache.cpp@1.28.1.2, 2007-10-24 12:30:37-04:00, jas@rowvwade. +9 -3
    Use Page::checksum to validate page number.  This is a temporary
    hack.

  storage/falcon/SRLIndexDelete.cpp@1.2, 2007-10-24 12:30:38-04:00, jas@rowvwade. +1 -2
    Clean up recovery logging message.

  storage/falcon/Section.cpp@1.7, 2007-10-24 12:30:38-04:00, jas@rowvwade. +26 -19
    Change some method names to reduce confusion (indexPage ->
    recordLocatorPage).

  storage/falcon/Section.h@1.2, 2007-10-24 12:30:38-04:00, jas@rowvwade. +1 -1
    Change some method names to reduce confusion (indexPage ->
    recordLocatorPage).

ChangeSet@1.2529.34.16, 2007-10-24 16:02:37+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  BUG#31702 (Missing row on slave causes assertion failure under row-based
  replication):
  
  Incremental patch to enable idempotency support for update events again.
  The final handling of errors will be done in BUG#31609, and until then
  the handling of errors should be consistent between the different types
  of changes.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.21.1.2, 2007-10-24 16:02:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.21, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  sql/log_event.cc@1.271.41.6, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +3 -6
    Incremental patch to enable idempotency support for the update events again.
    The real error handling will be implemented in BUG#31609.

ChangeSet@1.1616.3108.1, 2007-10-24 16:09:30+05:00, svoj@mysql.com +5 -0
  BUG#31159 - fulltext search on ucs2 column crashes server
  
  ucs2 doesn't provide required by fulltext ctype array. Crash
  happens because fulltext attempts to use unitialized ctype
  array.
  
  Fixed by converting ucs2 fields to compatible utf8 analogue.

  include/my_sys.h@1.116.5.2, 2007-10-24 16:09:29+05:00, svoj@mysql.com +2 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  mysql-test/r/ctype_ucs.result@1.11.4.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +6 -0
    A test case for BUG#31159.

  mysql-test/t/ctype_ucs.test@1.15.3.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +8 -0
    A test case for BUG#31159.

  mysys/charset.c@1.135.1.10, 2007-10-24 16:09:29+05:00, svoj@mysql.com +40 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  sql/item_func.cc@1.124.42.26, 2007-10-24 16:09:29+05:00, svoj@mysql.com +32 -1
    Convert ucs2 fields to utf8. Fulltext requires ctype array, but
    ucs2 doesn't provide it.

ChangeSet@1.2537.32.19, 2007-10-24 11:36:20+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  remove compiler warning

  storage/ndb/include/ndb_version.h.in@1.24, 2007-10-24 11:36:17+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    remove compiler warning

ChangeSet@1.2529.110.6, 2007-10-24 13:28:46+05:00, ramil@mysql.com +2 -0
  after-merge fix: new sys_var_character_set_client classs introduced to perform 
  separate checking.

  sql/set_var.cc@1.231.12.16, 2007-10-24 13:28:45+05:00, ramil@mysql.com +24 -1
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

  sql/set_var.h@1.106.1.6, 2007-10-24 13:28:45+05:00, ramil@mysql.com +14 -0
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

ChangeSet@1.1810.3412.1, 2007-10-24 11:15:08+03:00, gkodinov@magare.gmz +3 -0
  Bug #30715: Assertion failed: item_field->field->real_maybe_null(), 
    file .\opt_sum.cc, line
  The optimizer pre-calculates the MIN/MAX values for queries like
   SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const
  when there is a key over kp_1...kp_k
  In doing so it was not checking correctly nullability and 
  there was a superfluous assert(). 
  Fixed by making sure that the field can be null before checking and
  taking out the wrong assert().
  .
  Introduced a correct check for nullability 
  The MIN(field) can return NULL when all the row values in the group
  are NULL-able or if there were no rows.
  Fixed the assertion to reflect the case when there are no rows.

  mysql-test/r/func_group.result@1.49.1.14, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -0
    Bug #30715: test case

  mysql-test/t/func_group.test@1.48.1.10, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +9 -0
    Bug #30715: test case

  sql/opt_sum.cc@1.44.1.19, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -5
    Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.

ChangeSet@1.2603.18.5, 2007-10-24 12:54:24+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/type_date.result@1.26, 2007-10-24 12:54:22+05:00, gluh@mysql.com +2 -0
    result fix

ChangeSet@1.2529.120.5, 2007-10-24 12:49:58+05:00, gluh@mysql.com +2 -0
  result fix

  mysql-test/r/named_pipe.result@1.2.1.1, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/shm.result@1.5.1.1, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

ChangeSet@1.2603.12.7, 2007-10-24 12:27:46+05:00, bar@mysql.com +1 -0
  More Windows warnings fixes 

  strings/ctype-ucs2.c@1.76, 2007-10-24 12:27:44+05:00, bar@mysql.com +4 -4
    More Windows warnings fixes 

ChangeSet@1.1810.3411.1, 2007-10-24 12:08:33+05:00, bar@mysql.com +1 -0
  Bug#31081 server crash in regexp function
  Additional fix for valgrind warning

  sql/item_cmpfunc.cc@1.187.42.2, 2007-10-24 12:08:32+05:00, bar@mysql.com +1 -1
    Bug#31081 server crash in regexp function
    Additional fix for valgrind warning

ChangeSet@1.2588.38.6, 2007-10-24 01:58:24-05:00, chris@aldebaran.site +4 -0
  Bug#27426, "Falcon: searches fail if datetime column and index exists"
  
  Corrected DATETIME comparison overflow in Value::compare().

  mysql-test/suite/falcon/r/falcon_bug_27426.result@1.2, 2007-10-24 01:58:21-05:00, chris@aldebaran.site +9 -0
    Additional DATETIME selects

  mysql-test/suite/falcon/t/disabled.def@1.1.1.2, 2007-10-24 01:58:21-05:00, chris@aldebaran.site +0 -1
    Enabled falcon_bug_27426.test

  mysql-test/suite/falcon/t/falcon_bug_27426.test@1.3, 2007-10-24 01:58:22-05:00, chris@aldebaran.site +4 -0
    Additional DATETIME selects

  storage/falcon/Value.cpp@1.2, 2007-10-24 01:58:22-05:00, chris@aldebaran.site +7 -1
    Value::compare() uses subtraction to compare 64-bit values, but
    returns a 32-bit result, which can be overflowed when large numbers,
    such as DATETIME values, are compared. 
    
    Replaced the subtraction with greater/less than comparison.

ChangeSet@1.2603.12.6, 2007-10-24 11:04:56+05:00, bar@mysql.com +1 -0
  Get rid of warnings under Windows

  strings/ctype-ucs2.c@1.75, 2007-10-24 11:04:53+05:00, bar@mysql.com +14 -14
    Get rid of warnings under Windows

ChangeSet@1.2588.38.5, 2007-10-23 18:14:12-05:00, chris@aldebaran.site +2 -0
  Bug#30281 "Falcon: missing privilege check for dropping tablespace"
  
  Prevent system tablespaces from being dropped.

  storage/falcon/StorageHandler.cpp@1.4, 2007-10-23 18:14:09-05:00, chris@aldebaran.site +13 -12
    Reject requests to drop system tablespaces in StorageHandler::deleteTablespace().
    Removed redundant #define of SLASH

  storage/falcon/StorageHandler.h@1.5, 2007-10-23 18:14:09-05:00, chris@aldebaran.site +1 -0
    Added #define DEFAULT_TABLESPACE_PATH

ChangeSet@1.2529.121.1, 2007-10-23 22:04:09+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug #30695: An apostrophe ' in the comment of the ADD PARTITION
    causes the Server to crash.
  
  Accessing partitioned table with an apostrophe in partition options
  like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash.
  
  Partition options were saved in .frm file without escaping.
  When accessing such table it is not possible to properly restore
  partition information.
  Crashed because there was no check for partition info parser failure.
  
  Fixed by escaping quoted text in the partition info when writing it to
  the frm-file and added a check that it was able to parse the partition
  info before using it 
  
  NOTE: If the comment is written by an earlier version of the server,
  the corrupted frm-file is not fixed, but left corrupted, you have to
  manually drop the table and recreate it.

  mysql-test/r/partition.result@1.68.5.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +16 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
     testresult

  mysql-test/t/partition.test@1.62.6.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +26 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
      testcase

  sql/sql_partition.cc@1.96.22.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +17 -4
    Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
      the Server to crash.
    
      Crashes when there is an non escaped apostrophe in the partition options
    
      fixed by escaping quoted text before writing to the frm-file

  sql/table.cc@1.288.21.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +2 -1
    Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash
    
    problem was using a null poiter without check -> crash.
    
    added a check that the previus call succeded

ChangeSet@1.2588.35.22, 2007-10-23 13:45:26-04:00, jas@rowvwade. +2 -0
  Make I/O system shutdown more reliable.

  storage/falcon/Cache.cpp@1.28.1.1, 2007-10-23 13:45:19-04:00, jas@rowvwade. +21 -21
    Make I/O system shutdown more reliable.

  storage/falcon/Cache.h@1.12, 2007-10-23 13:45:19-04:00, jas@rowvwade. +2 -0
    Make I/O system shutdown more reliable.

ChangeSet@1.1810.3395.7, 2007-10-23 21:32:30+04:00, sergefp@mysql.com +2 -0
  Post-merge fixes

  mysql-test/r/type_decimal.result@1.38.1.9, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +1 -0
    Post-merge fixes

  mysql-test/t/type_decimal.test@1.35.1.2, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +15 -0
    Post-merge fixes

ChangeSet@1.2588.38.4, 2007-10-23 12:10:32-05:00, klewis@klewis-mysql. +5 -0
  Fix warnings and cleanup

  mysql-test/suite/falcon/r/falcon_options.result@1.4, 2007-10-23 12:10:15-05:00, klewis@klewis-mysql. +4 -8
    Update options tests

  mysql-test/suite/falcon/r/falcon_options2.result@1.4, 2007-10-23 12:10:18-05:00, klewis@klewis-mysql. +2 -4
    Update options tests

  storage/falcon/Cache.cpp@1.29, 2007-10-23 12:10:20-05:00, klewis@klewis-mysql. +2 -2
    Fix warnings

  storage/falcon/Interlock.h@1.2, 2007-10-23 12:10:22-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/StorageHandler.h@1.4, 2007-10-23 12:10:24-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

ChangeSet@1.2603.19.1, 2007-10-23 18:28:19+02:00, dfischer@bk-internal.mysql.com +1 -0
  .del-changelog-bleh:
    Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

  BitKeeper/deleted/.del-changelog-bleh@1.7, 2007-10-23 18:28:06+02:00, dfischer@bk-internal.mysql.com +0 -0
    Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

ChangeSet@1.1810.3373.9, 2007-10-23 19:24:59+04:00, sergefp@mysql.com +3 -0
  BUG#31450: Query causes error 1048
  - Let Item::save_in_field() call set_field_to_null_with_conversions() 
    for decimal type, like this is done for the other item result types.

  mysql-test/r/type_decimal.result@1.38.2.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +11 -0
    BUG#31450: Query causes error 1048: testcase

  mysql-test/t/type_decimal.test@1.33.1.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +19 -0
    BUG#31450: Query causes error 1048: testcase

  sql/item.cc@1.113.101.1, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +1 -1
    BUG#31450: Query causes error 1048
    - Let Item::save_in_field() call set_field_to_null_with_conversions() 
      for decimal type, like this is done for the other item result types.

ChangeSet@1.2529.120.4, 2007-10-23 20:12:50+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/type_datetime.result@1.57, 2007-10-23 20:12:48+05:00, gluh@mysql.com +1 -1
    result fix

ChangeSet@1.2588.38.3, 2007-10-23 10:10:56-05:00, chris@aldebaran.site +1 -0
  Bug#22168, "Inserting bad early dates"
  
  Enabled falcon_bug_22168.test

  mysql-test/suite/falcon/t/disabled.def@1.1.1.1, 2007-10-23 10:10:54-05:00, chris@aldebaran.site +0 -1
    Enabled 22168.

ChangeSet@1.2603.18.2, 2007-10-23 20:08:57+05:00, gluh@mysql.com +5 -0
  after merge fix

  client/mysqlslap.c@1.73.1.3, 2007-10-23 20:08:54+05:00, gluh@mysql.com +9 -6
    after merge fix

  mysql-test/r/ctype_utf8.result@1.122.1.2, 2007-10-23 20:08:54+05:00, gluh@mysql.com +110 -110
    after merge fix

  mysql-test/r/mysqlslap.result@1.17, 2007-10-23 20:08:54+05:00, gluh@mysql.com +5 -0
    after merge fix

  mysql-test/r/query_cache.result@1.108, 2007-10-23 20:08:54+05:00, gluh@mysql.com +1 -78
    after merge fix

  mysql-test/t/query_cache.test@1.90, 2007-10-23 20:08:54+05:00, gluh@mysql.com +2 -1
    after merge fix

ChangeSet@1.2529.120.2, 2007-10-23 19:28:47+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/query_cache.result@1.101.1.6, 2007-10-23 19:28:44+05:00, gluh@mysql.com +1 -78
    after merge fix

  mysql-test/t/query_cache.test@1.81.1.7, 2007-10-23 19:28:45+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3409.1, 2007-10-23 18:03:51+04:00, anozdrin@station. +3 -0
  Patch for BUG#30736: Row Size Too Large Error Creating a Table and
  Inserting Data.
  
  The problem was that under some circumstances Field class was not
  properly initialized before calling create_length_to_internal_length()
  function, which led to assert failure.
  
  The fix is to do the proper initialization.
  
  The user-visible problem was that under some circumstances
  CREATE TABLE ... SELECT statement crashed the server or led
  to wrong error message (wrong results).

  mysql-test/r/select.result@1.121.1.38, 2007-10-23 18:03:49+04:00, anozdrin@station. +35 -0
    Update result file.

  mysql-test/t/select.test@1.102.1.32, 2007-10-23 18:03:49+04:00, anozdrin@station. +48 -0
    Add a test case for BUG#30736: Row Size Too Large Error
    Creating a Table and Inserting Data.

  sql/sql_table.cc@1.239.67.1, 2007-10-23 18:03:49+04:00, anozdrin@station. +1 -1
    Move sql_field->decimals initialization before
    sql_field->create_length_to_internal_length() call.

ChangeSet@1.1810.3408.1, 2007-10-23 09:05:39-03:00, davi@moksha.local +2 -0
  Bug#31669 Buffer overflow in mysql_change_user()
  
  The problem is that when copying the supplied username and
  database, no bounds checking is performed on the fixed-length
  buffer. A sufficiently large (> 512) user string can easily
  cause stack corruption. Since this API can be used from PHP
  and other programs, this is a serious problem.
  
  The solution is to increase the buffer size to the accepted
  size in similar functions and perform bounds checking when
  copying the username and database.

  libmysql/libmysql.c@1.233.1.14, 2007-10-23 09:05:37-03:00, davi@moksha.local +4 -3
    Increase the buffer size and perform bounds checking when copying
    the supplied arguments.

  tests/mysql_client_test.c@1.167.1.72, 2007-10-23 09:05:37-03:00, davi@moksha.local +94 -0
    Add test case for Bug#31669

ChangeSet@1.1810.3374.17, 2007-10-23 16:32:05+05:00, holyfoot@mysql.com +2 -0
  type conversions fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.3, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +3 -3
    type conversion fix

  sql/ha_heap.cc@1.71.12.1, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +1 -1
    type conversion fix

ChangeSet@1.2529.61.21, 2007-10-23 14:26:57+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt for bug 30825

  mysql-test/r/innodb_gis.result@1.17, 2007-10-23 14:26:54+03:00, gkodinov@magare.gmz +1 -0
    merge 5.0-opt -> 5.1-opt for bug 30825

ChangeSet@1.1810.3406.1, 2007-10-23 16:16:59+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #31663: if the FIELDS TERMINATED BY string
  in the SELECT INTO OUTFILE clause starts with a special
  character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY
  is empty, every occurrence of this character within a
  field value is duplicated.
  
  Duplication has been avoided.
  New warning message has been added: "First character of
  the FIELDS TERMINATED string is ambiguous; please use
  non-optional and non-empty FIELDS ENCLOSED BY".

  mysql-test/r/outfile_loaddata.result@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +85 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/r/outfile_loaddata.result
    Added test case for bug #31663.

  mysql-test/r/outfile_loaddata.result@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/outfile_loaddata.test@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +89 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/t/outfile_loaddata.test
    Added test case for bug #31663.

  mysql-test/t/outfile_loaddata.test@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  sql/share/errmsg.txt@1.42.1.40, 2007-10-23 16:15:27+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #31663.
    The ER_AMBIGUOUS_FIELD_TERM warning has been added.

  sql/sql_class.cc@1.223.34.1, 2007-10-23 16:15:26+05:00, gshchepa@gleb.loc +35 -9
    Fixed bug #31663.
    The select_export::prepare method has been modified to calculate
    a value of the select_export::is_ambiguous_field_term field and
    to warn if this value is true.
    The select_export::send_data method has been modified to
    avoid escaping or duplication of the field_set_char if
    is_ambiguous_field_term is true.

  sql/sql_class.h@1.230.1.117, 2007-10-23 16:15:24+05:00, gshchepa@gleb.loc +7 -0
    Fixed bug #31663.
    The select_export::is_ambiguous_field_term field has been added.
    This field is true if select_export::field_sep_char contains
    the first char of the FIELDS TERMINATED BY (ENCLOSED BY is empty),
    and items can contain this character.
    The select_export::field_term_char field has been added (first
    char of the FIELDS TERMINATED BY string or INT_MAX).

ChangeSet@1.1810.3402.2, 2007-10-23 15:34:10+05:00, holyfoot@mysql.com +1 -0
  type conversion fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.2, 2007-10-23 15:34:08+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

ChangeSet@1.2537.37.2, 2007-10-23 12:06:14+02:00, jonas@perch.ndb.mysql.com +3 -0
  post merge weirdness

  storage/ndb/include/kernel/signaldata/CopyFrag.hpp@1.9, 2007-10-23 12:06:11+02:00, jonas@perch.ndb.mysql.com +0 -38
    post merge weirdness

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.40, 2007-10-23 12:06:11+02:00, jonas@perch.ndb.mysql.com +0 -1
    post merge weirdness

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.24, 2007-10-23 12:06:11+02:00, jonas@perch.ndb.mysql.com +0 -48
    post merge weirdness

ChangeSet@1.1810.3404.1, 2007-10-23 11:52:55+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#30560  Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.108, 2007-10-23 11:52:54+02:00, msvensson@pilot.mysql.com +31 -17
    Use an array to store the valgrind options
    Deprecate --valgrind-options=s and instead use --valgrind-option(but allow
    PushBuild's) --valgrind-options=s usage.
    Make the variables local

ChangeSet@1.2529.115.2, 2007-10-23 14:31:59+05:00, holyfoot@mysql.com +1 -0
  merging

  include/config-win.h@1.97.6.2, 2007-10-23 14:31:57+05:00, holyfoot@mysql.com +0 -1
    merging

ChangeSet@1.1810.3402.1, 2007-10-23 14:27:11+05:00, holyfoot@mysql.com +10 -0
  type conversions fixed to avoid warnings on Windows

  sql/opt_range.cc@1.159.41.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +6 -6
    type conversion fixed

  sql/sql_map.cc@1.16.1.3, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

  sql/sql_select.cc@1.312.166.12, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/sql_update.cc@1.154.37.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_federated.cc@1.24.31.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

  sql/ha_heap.cc@1.71.11.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_innodb.cc@1.202.53.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_myisam.cc@1.147.24.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/mi_write.c@1.50.16.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/sort.c@1.45.25.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

ChangeSet@1.2529.71.6, 2007-10-23 11:24:34+02:00, jonas@perch.ndb.mysql.com +18 -0
  ndb - bug#26450
    partial backport from 6.2 + add fix of bug

  storage/ndb/include/kernel/GlobalSignalNumbers.h@1.31.1.3, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -3
    add prep_copy_frag

  storage/ndb/include/kernel/signaldata/AccScan.hpp@1.10, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new argument specifying which page to scan to

  storage/ndb/include/kernel/signaldata/CopyFrag.hpp@1.5.1.1, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +40 -1
    add new argument specifying which page to scan to

  storage/ndb/include/ndb_version.h.in@1.12.1.4, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +47 -0
    add versioning checks for prep_copy_frag

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp@1.16.1.4, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add prep_copy_frag

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.33.1.16, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error codes

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.24.1.15, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +6 -1
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.19.1.4, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.96.1.32, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +105 -6
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.58.1.15, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.23.1.7, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.129.1.39, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +91 -2
    add new to-step

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.1.19, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new argument specifying which page to scan to

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.36.1.7, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +19 -0
    add utility to get max page used by fragment

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.22.1.7, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +60 -8
    add NR scan to > frag.noOfPages

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.2.6, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +54 -0
    add testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.1.48, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase

  storage/ndb/test/src/NdbRestarts.cpp@1.9.1.2, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add testcase

ChangeSet@1.2603.12.5, 2007-10-23 13:54:06+05:00, bar@mysql.com +1 -0
  After megre fix

  mysql-test/r/myisam.result@1.111.1.2, 2007-10-23 13:54:04+05:00, bar@mysql.com +1 -1
    After megre fix

ChangeSet@1.2603.2.15, 2007-10-23 13:53:08+05:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/r/information_schema.result@1.172, 2007-10-23 13:53:06+05:00, gluh@mysql.com +4 -4
    after merge fix

ChangeSet@1.2529.61.19, 2007-10-23 13:20:51+05:00, gluh@mysql.com +3 -0
  Bug#31633 Information schema = NULL queries crash the server
  added correct handling of NULL values for lookup fields

  mysql-test/r/information_schema.result@1.156.2.11, 2007-10-23 13:20:49+05:00, gluh@mysql.com +40 -0
    test result

  mysql-test/t/information_schema.test@1.100.1.11, 2007-10-23 13:20:49+05:00, gluh@mysql.com +24 -0
    test case

  sql/sql_show.cc@1.415.15.4, 2007-10-23 13:20:49+05:00, gluh@mysql.com +43 -22
    added correct handling of NULL values for lookup fields

ChangeSet@1.1810.3401.2, 2007-10-23 07:09:16+02:00, tnurnberg@mysql.com +2 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.107.10.2, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

  mysql-test/t/create.test@1.71.1.24, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

ChangeSet@1.1616.3099.6, 2007-10-23 06:54:31+02:00, tnurnberg@mysql.com +5 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.75.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +38 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/r/grant.result@1.21.1.23, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +3 -3
    Sort output for a defined state.

  mysql-test/t/create.test@1.48.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +76 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/t/grant.test@1.17.1.20, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +1 -1
    Sort output for a defined state.

  sql/sql_parse.cc@1.271.134.4, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +8 -1
    Require INSERT privilege on target table for CREATE ... SELECT.

ChangeSet@1.2588.38.2, 2007-10-22 23:05:33-05:00, chris@aldebaran.site +1 -0
  Bug#22168, "Inserting bad early dates"
  
  Changed StorageInterface::decodeRecord() to return values of type
  MYSQL_TYPE_DATETIME directly to the server without conversion.

  storage/falcon/ha_falcon.cpp@1.12, 2007-10-22 23:05:31-05:00, chris@aldebaran.site +2 -1
    The server function Field_datetime::store() converts out-of-range
    years to a current century, e.g. 0001 becomes 2001.
    
    Changed StorageInterface::decodeRecord() to return values of type
    MYSQL_TYPE_DATETIME directly to the server without conversion.

ChangeSet@1.2588.35.21, 2007-10-22 18:57:28-04:00, jas@rowvwade. +1 -0
  Work around potential deadlock in Section::insertStub.

  storage/falcon/Section.cpp@1.6, 2007-10-22 18:57:15-04:00, jas@rowvwade. +5 -1
    Work around potential deadlock in Section::insertStub.

ChangeSet@1.2588.39.1, 2007-10-22 15:51:00-04:00, jas@rowvwade. +6 -0
  Clean up error recovery for failed "rename table" operations.

  storage/falcon/Database.cpp@1.15.1.5, 2007-10-22 15:50:52-04:00, jas@rowvwade. +7 -0
    Clean up error recovery for failed "rename table" operations.

  storage/falcon/Database.h@1.12, 2007-10-22 15:50:52-04:00, jas@rowvwade. +1 -0
    Clean up error recovery for failed "rename table" operations.

  storage/falcon/Statement.cpp@1.2, 2007-10-22 15:50:52-04:00, jas@rowvwade. +0 -5
    Clean up error recovery for failed "rename table" operations.

  storage/falcon/StorageDatabase.cpp@1.1.1.1, 2007-10-22 15:50:53-04:00, jas@rowvwade. +4 -4
    Clean up error recovery for failed "rename table" operations.

  storage/falcon/Table.cpp@1.15.1.1, 2007-10-22 15:50:53-04:00, jas@rowvwade. +30 -19
    Clean up error recovery for failed "rename table" operations.

  storage/falcon/ha_falcon.cpp@1.10.1.1, 2007-10-22 15:50:53-04:00, jas@rowvwade. +6 -3
    Clean up error recovery for failed "rename table" operations.

ChangeSet@1.2529.100.6, 2007-10-22 15:16:43-04:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #31332 --event-scheduler option misbehaving
    
  Changed the behaviour of the --event-scheduler option when used without an arguments. It
  now turns the option on.

  mysql-test/r/events_bugs.result@1.44, 2007-10-22 15:16:18-04:00, dkatz@damien-katzs-computer.local +4 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.1, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +1 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.0, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/t/events_bugs.test@1.37, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +15 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  sql/events.cc@1.86, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the behaviour of the --event-scheduler option when used without an arguments.
    It now turns the option on.

ChangeSet@1.2529.109.1, 2007-10-22 23:02:05+04:00, anozdrin@station. +1 -0
  WL#4104: Deprecate the Instance Manager.
  
  A deprecation warning added.

  server-tools/instance-manager/mysqlmanager.cc@1.34, 2007-10-22 23:02:03+04:00, anozdrin@station. +3 -0
    Add a deprecation warning.

ChangeSet@1.2529.108.1, 2007-10-22 21:45:21+03:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #30594  	rpl.rpl_skip_error is nondeterministic 
  
  Non-determinism in the tests was due to results of SBR are different from those gained
  with row binlog format.
  
  Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
  to run the test on in mixed and stmt binlog format.
  ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
  favoring reentrant reading from binlog rule
  which means that a Write_rows_log_event overwrites a slave's row
  if the one has the same primary key.
  
  If future we might have skipping error due to applying of row-based events.
  The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.17.1.1, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -2
    new results

  mysql-test/suite/rpl/t/rpl_skip_error-slave.opt@1.9, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -1
    wrong error code that can not happen in the test removed.

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.16, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +8 -0
    enforcing the test is to skip only errors due to SBR.
    The current test does not check anything for RBR as ignorable ER_DUP_ENTRY
    does make sense only for SBR.

ChangeSet@1.1810.3287.32, 2007-10-22 22:35:08+04:00, kaa@polly.(none) +1 -0
  Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  libmysql/CMakeLists.txt@1.1.5.2, 2007-10-22 22:35:05+04:00, kaa@polly.(none) +1 -1
    Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.2529.1.59, 2007-10-22 20:10:51+02:00, mleich@four.local.lan +8 -0
  This changeset contains the following stuff:
  - Fix for
      Bug#28827 Partition test needs archive engine
      Bug#26669 Two tests on partition fail while blackhole engine is missing
    Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
  - The two bugs above + the fact that CSV could be also sometimes not
    available --> Move also CSV sub tests out.
  - Minor cleanups
    - Replace error numbers with error names
    - fix typos, wrong comments
    - remove redundant sub test cases
    - add missing drop database
    - SET GLOBAL general_log = default is wrong, = 1 is correct

  mysql-test/r/partition.result@1.68.2.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -43
    Updated results

  mysql-test/r/partition_archive.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +13 -0
    Expected results

  mysql-test/r/partition_archive.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_blackhole.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +7 -0
    Expected results

  mysql-test/r/partition_blackhole.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_csv.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +15 -0
    Expected results

  mysql-test/r/partition_csv.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition.test@1.62.2.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +22 -99
    Remove ARCHIVE, BLACKHOLE and CSV related sub test cases.

  mysql-test/t/partition_archive.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +32 -0
    Tests for the partition storage engine in connection with the
    storage engine ARCHIVE.

  mysql-test/t/partition_archive.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_blackhole.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +24 -0
    Tests for the partition storage engine in connection with the
    storage engine BLACKHOLE.

  mysql-test/t/partition_blackhole.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_csv.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +38 -0
    Tests for the partition storage engine in connection with the
    storage engine CSV.

  mysql-test/t/partition_csv.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

ChangeSet@1.2529.100.5, 2007-10-22 13:25:00-04:00, dkatz@damien-katzs-computer.local +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
  into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime

  BitKeeper/deleted/.del-.del-changelog@1.3, 2007-10-22 13:24:52-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: BitKeeper/deleted/.del-changelog

ChangeSet@1.1810.3374.14, 2007-10-22 19:32:18+03:00, gkodinov@magare.gmz +3 -0
  Bug #28687: Search fails on '0000-00-00' date after sql_mode change
  
  When doing indexed search the server constructs a key image for 
  faster comparison to the stored keys. While doing that it must not
  perform (and stop if they fail) the additional date checks that can 
  be turned on by the SQL mode because there already may be values in 
  the table that don't comply with the error checks.
  Fixed by ignoring these SQL mode bits while making the key image.

  mysql-test/r/type_date.result@1.13.4.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +39 -0
    Bug #28687: test case

  mysql-test/t/type_date.test@1.14.3.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +20 -0
    Bug #28687: test case

  sql/item.cc@1.113.1.174, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +3 -0
    Bug #28687: no invalid date warnings

ChangeSet@1.2603.12.4, 2007-10-22 17:43:14+05:00, bar@mysql.com +1 -0
  Fix for compilation problem after wl#1213 was pushed.

  mysys/charset.c@1.159, 2007-10-22 17:43:12+05:00, bar@mysql.com +2 -2
    Fix for compilation problem after wl#1213 was pushed.

ChangeSet@1.2603.12.3, 2007-10-22 17:19:09+05:00, bar@mysql.com +3 -0
  After merge fix

  mysql-test/r/ctype_utf16_uca.result@1.2, 2007-10-22 17:19:07+05:00, bar@mysql.com +13 -0
    After merge fix

  mysql-test/r/ctype_utf32_uca.result@1.2, 2007-10-22 17:19:07+05:00, bar@mysql.com +13 -0
    After merge fix

  mysql-test/r/show_check.result@1.129.1.2, 2007-10-22 17:19:07+05:00, bar@mysql.com +4 -4
    After merge fix

ChangeSet@1.1810.3399.2, 2007-10-22 16:10:08+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31742: delete from ... order by function call that causes
  an error, asserts server
  
  In case of a fatal error during filesort in find_all_keys() the error
  was returned without the necessary handler uninitialization.
  Fixed by changing the code so that handler uninitialization is performed
  before returning the error.

  mysql-test/r/delete.result@1.32, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +8 -0
    Added a test case for bug #31742.

  mysql-test/t/delete.test@1.30, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #31742.

  sql/filesort.cc@1.105.1.19, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +4 -1
    In case of a fatal error in find_all_keys() do not return before doing
    the necessary handler uninitialization steps.

ChangeSet@1.2547.46.1, 2007-10-22 16:43:32+05:00, bar@mysql.com +67 -0
  WL#1213 Implement 4-byte UTF8, UTF16 and UTF32

  config/ac-macros/character_sets.m4@1.10.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +73 -16
    Adding utf8mb3 definitions

  include/config-win.h@1.102.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +4 -1
    Define new character sets

  include/m_ctype.h@1.144, 2007-10-22 16:43:27+05:00, bar@mysql.com +34 -5
    Adding prototypes for new variables and functions

  include/my_global.h@1.175.4.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing ifdef condition

  include/myisam.h@1.86, 2007-10-22 16:43:27+05:00, bar@mysql.com +3 -2
    Changing MI_MAX_KEY_LENGTH, to support keys on CHAR(333),
    now with 4-byte character sets.

  include/mysql_com.h@1.125.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing maxlen constant from 3 to 4

  mysql-test/include/ctype_like.inc@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +50 -0
    New BitKeeper file ``mysql-test/include/ctype_like.inc''

  mysql-test/include/ctype_like.inc@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/include/have_utf16.inc@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_utf16.inc''

  mysql-test/include/have_utf16.inc@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/include/have_utf32.inc@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_utf32.inc''

  mysql-test/include/have_utf32.inc@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_ldml.result@1.2, 2007-10-22 16:43:27+05:00, bar@mysql.com +25 -3
    Changing test results

  mysql-test/r/ctype_ucs.result@1.59.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +11 -1
    Changing test results

  mysql-test/r/ctype_utf16.result@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +1052 -0
    New BitKeeper file ``mysql-test/r/ctype_utf16.result''

  mysql-test/r/ctype_utf16.result@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_utf16_uca.result@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +2405 -0
    New BitKeeper file ``mysql-test/r/ctype_utf16_uca.result''

  mysql-test/r/ctype_utf16_uca.result@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_utf32.result@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +1014 -0
    New BitKeeper file ``mysql-test/r/ctype_utf32.result''

  mysql-test/r/ctype_utf32.result@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_utf32_uca.result@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +2405 -0
    New BitKeeper file ``mysql-test/r/ctype_utf32_uca.result''

  mysql-test/r/ctype_utf32_uca.result@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_utf8.result@1.121.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +53 -45
    Changing test results

  mysql-test/r/explain.result@1.24, 2007-10-22 16:43:27+05:00, bar@mysql.com +16 -0
    Changing test results

  mysql-test/r/group_by.result@1.89.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/have_utf16.require@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_utf16.require''

  mysql-test/r/have_utf16.require@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/have_utf32.require@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_utf32.require''

  mysql-test/r/have_utf32.require@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/r/information_schema.result@1.161.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +2 -2
    Changing test results

  mysql-test/r/innodb_mysql.result@1.37.3.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/join.result@1.48.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +2 -2
    Changing test results

  mysql-test/r/key.result@1.47.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +4 -4
    Changing test results

  mysql-test/r/mix2_myisam.result@1.9, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/myisam.result@1.111.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +20 -20
    Changing test results

  mysql-test/r/ps_1general.result@1.67.2.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +2 -2
    Changing test results

  mysql-test/r/ps_2myisam.result@1.64.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/ps_3innodb.result@1.65.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/ps_4heap.result@1.61.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/r/ps_5merge.result@1.62.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +2 -2
    Changing test results

  mysql-test/r/show_check.result@1.127.1.1, 2007-10-22 16:43:27+05:00, bar@mysql.com +180 -180
    Changing test results

  mysql-test/r/type_blob.result@1.60, 2007-10-22 16:43:27+05:00, bar@mysql.com +3 -3
    Changing test results

  mysql-test/std_data/Index.xml@1.2, 2007-10-22 16:43:28+05:00, bar@mysql.com +23 -3
    Adding tests for new character sets

  mysql-test/suite/ndb/r/ps_7ndb.result@1.62.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -1
    Changing test results

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.25, 2007-10-22 16:43:28+05:00, bar@mysql.com +2 -2
    Changing test results

  mysql-test/t/ctype_ldml.test@1.2, 2007-10-22 16:43:28+05:00, bar@mysql.com +19 -3
    Adding tests for new character sets

  mysql-test/t/ctype_ucs.test@1.49.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -43
    Moving common part into an include file

  mysql-test/t/ctype_utf16.test@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +677 -0
    New BitKeeper file ``mysql-test/t/ctype_utf16.test''

  mysql-test/t/ctype_utf16.test@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_utf16_uca.test@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +287 -0
    New BitKeeper file ``mysql-test/t/ctype_utf16_uca.test''

  mysql-test/t/ctype_utf16_uca.test@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_utf32.test@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +710 -0
    New BitKeeper file ``mysql-test/t/ctype_utf32.test''

  mysql-test/t/ctype_utf32.test@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_utf32_uca.test@1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +288 -0
    New BitKeeper file ``mysql-test/t/ctype_utf32_uca.test''

  mysql-test/t/ctype_utf32_uca.test@1.0, 2007-10-22 16:43:29+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_utf8.test@1.110.2.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +12 -0
    Adding tests

  mysql-test/t/disabled.def@1.274.1.2, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -0
    Disallow test temporarily

  mysql-test/t/explain.test@1.13, 2007-10-22 16:43:28+05:00, bar@mysql.com +7 -1
    Adding tests

  mysql-test/t/myisam.test@1.87.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +2 -2
    Modifying test, to keep error.

  mysys/charset-def.c@1.20.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +204 -49
    Adding new character sets

  mysys/charset.c@1.158, 2007-10-22 16:43:28+05:00, bar@mysql.com +25 -4
    Adding LDML support for new character sets

  sql/item_strfunc.h@1.134.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +2 -2
    Fixing max_length formula

  sql/key.cc@1.54, 2007-10-22 16:43:28+05:00, bar@mysql.com +19 -0
    Adding alignment for multy-byte character boundaries

  sql/mysql_priv.h@1.521.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +11 -0
    Adding check_identifier_name() helper functions,
    for shorter code.

  sql/sp_head.cc@1.289.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -6
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/sql_class.cc@1.348.2.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +5 -2
    Fixing formula. The previous one was incorrect.
    (discussed with Sergey Petrunia)

  sql/sql_parse.cc@1.702.3.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +46 -5
    Addint implementation of check_identifier_name().
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/sql_plugin.cc@1.73.2.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -2
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/sql_show.cc@1.430.3.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +1 -1
    Changing max length, to keep the column in VARCHAR limit 64K.
    (discussed with Gluh)

  sql/sql_table.cc@1.403.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +9 -10
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/sql_udf.cc@1.80.1.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +2 -7
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/sql_yacc.yy@1.496.3.1, 2007-10-22 16:43:28+05:00, bar@mysql.com +5 -6
    Replacing check_string_char_length() to
    check_identifier_name().

  sql/table.cc@1.305.2.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +21 -58
    Reusing check_identifier_name().
    Disallow supplementary characters in column names.

  sql/unireg.h@1.61.1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +3 -2
    - Introducing a new constant for "key_len" width in "explain select" results.
    - Changing constant from 3 to 4

  storage/myisam/mi_check.c@1.164, 2007-10-22 16:43:29+05:00, bar@mysql.com +1 -0
    Adding assert.

  strings/ctype-mb.c@1.61, 2007-10-22 16:43:29+05:00, bar@mysql.com +12 -4
    Changes to support supplementary characters.

  strings/ctype-uca.c@1.52.1.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +3216 -1101
    - Changes to support supplementary characters
    - Adding UCA collations for new character sets

  strings/ctype-ucs2.c@1.74, 2007-10-22 16:43:29+05:00, bar@mysql.com +2613 -680
    - Adding utf16 and utf32 implementations
    - Adding "general_ci" and "bin" collation for the new character sets

  strings/ctype-utf8.c@1.120, 2007-10-22 16:43:29+05:00, bar@mysql.com +1129 -177
    - Renaming old utf8 variables and function names to utf8mb3
    - Adding utf8mb4 implementation
    - Adding "general_ci" and "bin" collations for utf8mb4
    Note:
    3-byte utf8 name is "utf8mb3" in SQL
    4-byte utf8 name us "utf8" in SQL

  tests/mysql_client_test.c@1.252.3.1, 2007-10-22 16:43:29+05:00, bar@mysql.com +1 -1
    Fixing test, according to "explain select" changes

ChangeSet@1.2529.107.2, 2007-10-22 10:32:35+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.13, 2007-10-22 10:32:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.13, 2007-10-22 10:32:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

ChangeSet@1.2603.14.1, 2007-10-22 12:01:39+05:00, holyfoot@mysql.com +1 -0
  bug #30329 main.information_schema_chmod test.
  
  the check_grant call was #ifdef-ed inproperly in check_table_access()
  what cause wrong return and crash of the embedded server.

  sql/sql_parse.cc@1.709, 2007-10-22 12:01:36+05:00, holyfoot@mysql.com +0 -2
    bug #30329 main.information_schema_chmod test.
    
    We don't need these ifdef as check_grant already #ifdef-ed for the
    NO_EMBEDDED_ACCESS_CHECK case, and the check_table_access has to return
    FALSE in this case.

ChangeSet@1.2588.38.1, 2007-10-21 16:13:17-05:00, chris@aldebaran.site +6 -0
  Bug#29823 "Falcon falcon_database_io table doesn't report stats for user DB's"
  
  Added tablespace I/O stats to StorageDatabase::getInfo() 
  Changed database I/O column header from "DATABASE" to "TABLESPACE"

  storage/falcon/StorageDatabase.cpp@1.2, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +4 -0
    Added tableSpaces to getIOInfo()

  storage/falcon/TableSpace.cpp@1.3, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +14 -0
    New method: getIOInfo() 

  storage/falcon/TableSpace.h@1.3, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +2 -0
    New method: getIOInfo()

  storage/falcon/TableSpaceManager.cpp@1.7, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +10 -0
    New method: getIOInfo()

  storage/falcon/TableSpaceManager.h@1.5, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +2 -0
    New method: getIOInfo()

  storage/falcon/ha_falcon.cpp@1.11, 2007-10-21 16:13:14-05:00, chris@aldebaran.site +1 -1
    Changed column header from "DATABASE" to "TABLESPACE" in databaseIOFieldInfo[]

ChangeSet@1.1810.3399.1, 2007-10-21 21:45:31+04:00, kaa@polly.(none) +5 -0
  Bug #28550 "Potential bugs related to the return type of the CHAR function".
    
  Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
    
  This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().

  mysql-test/r/func_str.result@1.110.1.27, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +11 -1
    Import patch bug288550.patch

  mysql-test/t/func_str.test@1.92.1.16, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +12 -0
    Import patch bug288550.patch

  sql/item.cc@1.113.1.173, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +13 -0
    Import patch bug288550.patch

  sql/item.h@1.183.1.61, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -0
    Import patch bug288550.patch

  sql/item_strfunc.h@1.101.1.24, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -1
    Import patch bug288550.patch

ChangeSet@1.1810.3398.1, 2007-10-21 18:37:37+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -0
  Bug #26199  	Replication Failure on Slave when using stored procs with bit-type parameters.
  
  The value of the actual argument of BIT-type-arg stored procedure was binlogged as non-escaped
  sequence of bytes corresponding to internal representation of the bit value.
  
  The patch enforces binlogging of the bit-argument as a valid literal: prefixing the quoted bytes
  sequence with _binary.
  Note, that behaviour of Item_field::var_str for field_type() of MYSQL_TYPE_BIT is exceptional
  in that the returned string contains the binary representation even though result_type() of
  the item is INT_RESULT.

  mysql-test/r/rpl_sp_effects.result@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +41 -0
    testing stored function and procedure called with BIT-arg.

  mysql-test/t/rpl_sp_effects.test@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +51 -0
    results changed

  sql/sp_head.cc@1.200.22.1, 2007-10-21 18:37:35+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -2
    Treating BIT field type specially to for its value to be prefixed and quoted.

ChangeSet@1.2529.34.15, 2007-10-20 20:16:12+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#24860 (Incorrect SLAVE_TRANSACTION_RETRIES code can result in slave stuck):
  
  If a temporary error occured inside a group on an event that was not the first
  event of the group, the slave could get stuck because the retry counter is reset
  whenever an event was executed successfully.
  
  This patch only reset the retry counter when an entire group has been successfully
  executed, or failed with a non-transient error.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +81 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_temporary_errors.result''

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt''

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +29 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors.test''

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.301.1.19, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +21 -5
    Adding debug printouts to every place where Relay_log_info::trans_retries
    is changed and to has_temporary_error() to print the error when returning.
    
    Adding debug variable all_errors_are_temporary_errors to make all errors
    for slave thread temporary errors.
    
    Adding code so that the Relay_log_info::trans_retries is only reset when
    an entire group was sucessfully executed, or a non-temporary error occured.

ChangeSet@1.2529.100.4, 2007-10-20 21:48:15+04:00, anozdrin@station. +3 -0
  Fix for BUG#31148: bool close_thread_table(THD*, TABLE**):
  Assertion `table->key_read == 0' failed.
  
  The problem was that key_read on a table in a sub-select was not
  properly reset. That happens because the code responsible for that
  is copy&pasted all around the server. In some place, it was obviously
  forgotten to be pasted.
  
  The fix is to reset key_read properly.

  mysql-test/r/key.result@1.45.1.2, 2007-10-20 21:48:13+04:00, anozdrin@station. +15 -0
    Update result file.

  mysql-test/t/key.test@1.37.1.1, 2007-10-20 21:48:13+04:00, anozdrin@station. +23 -0
    A test case for BUG#31148: bool close_thread_table(THD*, TABLE**):
    Assertion `table->key_read == 0' failed.

  sql/sql_select.cc@1.541.29.2, 2007-10-20 21:48:13+04:00, anozdrin@station. +8 -1
    Reset key_read before closing index.

ChangeSet@1.2529.34.14, 2007-10-20 18:19:55+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  Bug#31702 (Missing row on slave causes assertion failure under row-based replication):
  
  When replicating an update pair (before image, after image) under row-based
  replication, and the before image is not found on the slave, the after image
  was not discared, and was hence read as a before image for the next row.
  Eventually, this lead to an after image being read outside the block of rows
  in the event, causing an assertion to fire.
  
  This patch fixes this by reading the after image in the event that the row
  was not found on the slave, adds some extra debug assertion to catch future
  errors earlier, and also adds a few non-debug checks to prevent reading
  outside the block of the event.

  include/my_base.h@1.101.6.1, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +5 -3
    Adding error code HA_ERR_CORRUPT_EVENT.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.21.1.1, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +31 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.20, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +37 -0
    Adding test to try to use row-based replication to replicate an
    update of a row that doesn't exist on the slave. We should get
    an apropriate error and the slave should stop.

  sql/log_event.cc@1.271.41.5, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -5
    Adding debug printouts. Adding code to Update_rows_log_event::do_exec_row()
    so that the after image is read (and ignored) in the event of an error in
    finding the row. This is necessary so that the second pair of images is
    read correctly for the next update pair.
    
    Changing logic for ignoring errors to not include update events, since
    a "key not found" error or a "record changed" error is not idempotent
    for updates, just for deletes and inserts.

  sql/log_event.h@1.161.1.2, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -2
    Adding debug assertions to check that row reading is within the events block of rows.

ChangeSet@1.2603.1.42, 2007-10-19 18:14:56-07:00, antony@anubis.xiphis.org +1 -0
  disabled.def:
    Disabled test falcon_bug_22182 until runtime team provides RENAME DATABASE replacement. See WL#4030

  mysql-test/suite/falcon/t/disabled.def@1.2, 2007-10-19 18:13:42-07:00, antony@anubis.xiphis.org +1 -0
    Disabled test falcon_bug_22182 until runtime team provides RENAME DATABASE replacement. See WL#4030

ChangeSet@1.2588.35.19, 2007-10-19 18:35:17-04:00, jas@fluffy.netfrastructure.com +1 -0
  Moved lock operation to avoid deadlock.

  storage/falcon/Section.cpp@1.5, 2007-10-19 18:35:13-04:00, jas@fluffy.netfrastructure.com +1 -1
    Moved lock operation to avoid deadlock.

ChangeSet@1.2603.13.2, 2007-10-20 02:06:21+04:00, kostja@bodhi.(none) +1 -0
  A post-merge fix.

  sql/backup/meta_backup.cc@1.6.1.1, 2007-10-20 02:06:18+04:00, kostja@bodhi.(none) +1 -1
    A post-merge fix.

ChangeSet@1.2529.104.1, 2007-10-20 01:20:38+04:00, kostja@bodhi.(none) +12 -0
  Rename: query_error -> is_slave_error.
  Add comments.

  sql/ha_ndbcluster_binlog.cc@1.90.12.26, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/handler.cc@1.215.99.1, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/log.cc@1.297.1.3, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/log_event.cc@1.271.17.18, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +30 -24
    query_error -> slave_error

  sql/log_event_old.cc@1.9.1.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +6 -6
    query_error -> slave_error

  sql/mysqld.cc@1.636.5.35, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/protocol.cc@1.129.2.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/slave.cc@1.301.11.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sp_head.cc@1.279.10.5, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sql_class.cc@1.346.4.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/sql_class.h@1.384.13.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +9 -2
    Rename: query_error -> is_slave_error, to avoid confusion.
    Add commenta.

  sql/sql_connect.cc@1.9.1.3, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    Rename: query_error -> is_slave_error, to avoid confusion.
    Originally it was the same code to handle init-connect and init-slave 
    mysqld options. Then init-connect implementation forked off,
    but the one who copy-pasted the code didn't change it to not
    use a replication-specific variable.

ChangeSet@1.2529.100.2, 2007-10-19 19:57:08+04:00, anozdrin@station. +7 -0
  Patch for BUG#31111: --read-only crashes MySQL (events fail to load).
  
  There actually were several problems here:
    - WRITE-lock is required to load events from the mysql.event table,
      but in the read-only mode an ordinary user can not acquire it;
    - Security_context::master_access attribute was not properly
      initialized in Security_context::init(), which led to differences
      in behavior with and without debug configure options.
    - if the server failed to load events from mysql.event, it forgot to
      close the mysql.event table, that led to the coredump, described
      in the bug report.
  
  The patch is to fix all these problems:
    - Use the super-user to acquire WRITE-lock on the mysql.even table;
    - The WRITE-lock is acquired by the event scheduler in two cases:
      - on initial loading of events from the database;
      - when an event has been executed, so its attributes should
        be updated.
      Other cases when WRITE-lock is needed for the mysql.event table
      happen under the user account. So, nothing should be changed there
      for the read-only mode. The user is able to create/update/drop
      an event only if he is a super-user.
    - Initialize Security_context::master_access;
    - Close the mysql.event table in case something went wrong.

  mysql-test/r/events_bugs.result@1.43, 2007-10-19 19:57:06+04:00, anozdrin@station. +102 -1
    Update result file.

  mysql-test/t/events_bugs.test@1.36, 2007-10-19 19:57:06+04:00, anozdrin@station. +212 -12
    A test case for BUG#31111: --read-only crashes MySQL (events fail
    to load).

  sql/event_data_objects.cc@1.111, 2007-10-19 19:57:06+04:00, anozdrin@station. +14 -2
    When the worker thread is going to drop event after the execution
    we should do it under the super-user privileges in order to be able
    to lock the mysql.event table for writing in the read-only mode.
    
    This is a system operation, where user SQL can not be executed.
    So, there is no risk in compromising security by dropping an event
    under the super-user privileges.

  sql/event_db_repository.cc@1.37, 2007-10-19 19:57:06+04:00, anozdrin@station. +9 -0
    1. Close tables if something went wrong in simple_open_n_lock_tables();
    2. As soon as the system event scheduler thread is running under
       the super-user privileges, we should always be able to acquire
       WRITE-lock on the mysql.event table. However, let's have an assert
       to check this.

  sql/event_scheduler.cc@1.27.1.21, 2007-10-19 19:57:06+04:00, anozdrin@station. +7 -0
    Run the system event scheduler thread under the super-user privileges.
    In particular, this is needed to be able to lock the mysql.event table
    for writing when the server is running in the read-only mode.
    
    The event scheduler executes only system operations and does not
    execute user SQL (this is what the worker threads for). So, there
    is no risk in compromising security by running the event scheduler
    under the super-user privileges.

  sql/events.cc@1.85, 2007-10-19 19:57:06+04:00, anozdrin@station. +15 -1
    Open the mysql.event table as the super user to be able to acquire
    WRITE-lock in the read-only mode.

  sql/sql_class.cc@1.346.2.5, 2007-10-19 19:57:06+04:00, anozdrin@station. +1 -0
    Initialize Security_context::master_acces.

ChangeSet@1.1810.3339.3, 2007-10-19 17:07:08+02:00, df@pippilotta.erinye.com +13 -0
  export patch for bug#31221
  TAG: mysql-5.0.50

  mysql-test/r/ps_6bdb.result@1.27.20.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/derived.result@1.58.2.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_2myisam.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_3innodb.result@1.42.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_4heap.result@1.38.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_5merge.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +4 -2
    export patch for bug#31221

  mysql-test/r/type_date.result@1.13.5.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +30 -0
    export patch for bug#31221

  mysql-test/r/type_datetime.result@1.30.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -0
    export patch for bug#31221

  mysql-test/r/ps_7ndb.result@1.26.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/derived.test@1.53.1.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/type_date.test@1.14.4.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -0
    export patch for bug#31221

  sql/field.cc@1.256.62.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -4
    export patch for bug#31221

  sql/item_timefunc.cc@1.100.34.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +1 -2
    export patch for bug#31221

ChangeSet@1.2588.35.18, 2007-10-19 10:47:42-04:00, jas@rowvwade. +1 -0
  Relax exclusive lock around Section::insertStub.

  storage/falcon/Section.cpp@1.4, 2007-10-19 10:47:35-04:00, jas@rowvwade. +17 -8
    Relax exclusive lock around Section::insertStub.

ChangeSet@1.2529.101.1, 2007-10-19 15:43:19+03:00, gkodinov@magare.gmz +4 -0
  Bug #31157: crash when select+order by the avg of some field within the group by
  
  The uncacheable flag should be set at fix_fields() stage.
  Fixed by moving the flag setting to match the one in 5.1

  mysql-test/r/query_cache.result@1.101.2.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +14 -0
    Bug #31157: test case

  mysql-test/t/query_cache.test@1.81.3.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +17 -0
    Bug #31157: test case

  sql/item_func.cc@1.353.46.5, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +8 -1
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

  sql/item_func.h@1.166.1.5, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +1 -0
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

ChangeSet@1.2528.236.1, 2007-10-19 14:18:41+02:00, mats@kindahl-laptop.dnsalias.net +10 -0
  BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER
  is possible):
  
  When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
  flag was not set correctly, which caused the slave to not recognize that it was
  inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
  and XID events. It also adds checks if inside a group before decreasing the
  slave skip counter to zero.
  
  Begin_query_log_event was not marked that it could not end a group, which is now
  corrected.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3.1.2, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +3 -1
    Correcting slave skip counter to get the correct behaviour.

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/data/rpl_bug28618.dat''

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.5.1.1, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +208 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt''

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_slave_skip.test@1.4, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +239 -0
    Adding tests to check that skipping works for transactions:
    - Skipping one group with BEGIN first
    - Skipping two groups with BEGIN first
    - Skipping one group without BEGIN first but with AUTOCOMMIT=0
    - LOAD DATA INFILE under statement-based replication

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.12.1.1, 2007-10-19 14:18:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  sql/log_event.cc@1.271.43.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +64 -17
    Adding checks if we're in a group when the slave skip counter is 1.
    In that case, we should keep going.
    
    Adding helping member function Log_event::continue_group() denoting
    that this event cannot end a group, and if the skip counter indicates
    that the group ends after this event, it should not decrease the skip
    counter.
    
    Query_log_event will change the OPTION_BEGIN flag for BEGIN, COMMIT, and
    ROLLBACK, even when skipping because of a positive skip count, and
    Xid_log_event will also affect the OPTION_BEGIN flag, even when being
    skipped.
    
    Begin_load_query_log_event cannot end a group, so it is marked to
    continue the group.

  sql/log_event.h@1.158.2.2, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Adding helper function Log_event::continue_group().

  sql/rpl_rli.h@1.21.3.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Adding Relay_log_info::get_flag() to get the value of a
    replication flag.

  sql/slave.cc@1.301.13.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +4 -1
    Adding debug output and changing debug message.

ChangeSet@1.1810.3397.1, 2007-10-19 14:54:05+05:00, ramil@mysql.com +3 -0
  Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
  
  Problem: lying to the optimizer that a function (Item_func_inet_ntoa)
  cannot return NULL values leads to unexpected results (in the case group
  keys creation/comparison is broken). 
  
  Fix: Item_func_inet_ntoa::maybe_null should be set properly.

  mysql-test/r/func_misc.result@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test result.

  mysql-test/t/func_misc.test@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +8 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test case.

  sql/item_strfunc.h@1.101.12.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -1
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - set Item_func_inet_ntoa::maybe_null flag.

ChangeSet@1.2603.11.4, 2007-10-18 18:05:22-07:00, antony@pcg5ppc.xiphis.org +6 -0
  remove backup tests because online backup is not in tree

  BitKeeper/deleted/.del-backup.result~6ec68aa6116f94fa@1.5, 2007-10-18 18:04:29-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/r/backup.result

  BitKeeper/deleted/.del-backup_errors.result@1.3, 2007-10-18 18:04:29-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/r/backup_errors.result

  BitKeeper/deleted/.del-backup_no_data.result@1.3, 2007-10-18 18:04:29-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/r/backup_no_data.result

  BitKeeper/deleted/.del-backup_no_engine.result@1.2, 2007-10-18 18:04:29-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/r/backup_no_engine.result

  BitKeeper/deleted/.del-backup_no_engine.test@1.2, 2007-10-18 18:04:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/t/backup_no_engine.test

  BitKeeper/deleted/.del-backup_snapshot.result@1.3, 2007-10-18 18:04:30-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: mysql-test/r/backup_snapshot.result

ChangeSet@1.2603.11.3, 2007-10-18 17:25:56-07:00, antony@pcg5ppc.xiphis.org +2 -0
  remove references to backup to fix Windows build.

  BitKeeper/deleted/.del-CMakeLists.txt~4b6ee5a2e4dc4701@1.2, 2007-10-18 17:24:23-07:00, antony@pcg5ppc.xiphis.org +0 -0
    Delete: sql/backup/CMakeLists.txt

  sql/CMakeLists.txt@1.24, 2007-10-18 17:25:48-07:00, antony@pcg5ppc.xiphis.org +0 -3
    remove references to backup to fix Windows build.

ChangeSet@1.2588.37.1, 2007-10-18 18:11:48-05:00, chris@aldebaran.site +13 -0
  WL#4079: Serial log location parameter.

  storage/falcon/Configuration.cpp@1.3.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +36 -0
    Added falcon_serial_log_dir parameter.

  storage/falcon/Configuration.h@1.1.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +1 -0
    Added serialLogDir.

  storage/falcon/Database.cpp@1.2.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +57 -5
      Added setLogRoot() to establish the serial log directory.

  storage/falcon/Database.h@1.2.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +1 -0
    Added setLogRoot().

  storage/falcon/Engine.h@1.1.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +6 -0
    Added SEPARATOR define.

  storage/falcon/IO.cpp@1.2.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +56 -13
    Moved PATH_MAX define to IOx.h.
    Changed expandFileName() to return base file name.
    Corrected function name typo in doesFileExist().
    Added fileStat() method.

  storage/falcon/IOx.h@1.1.1.1, 2007-10-18 18:11:45-05:00, chris@aldebaran.site +8 -2
    Added PATH_MAX.
    Renamed doesFileExits to doesFileExist.
    Added baseName argument to expandFileName().
    Added baseName() method.
    Added fileStat() method.

  storage/falcon/JString.cpp@1.1.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +51 -2
    Overloads for append() and operator +=.

  storage/falcon/JString.h@1.1.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +3 -1
    Overloads for append() and operator +=.

  storage/falcon/MemMgr.cpp@1.5.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +0 -6
    Moved SEPARATOR define to Engine.h.

  storage/falcon/RepositoryVolume.cpp@1.1.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +1 -1
    Corrected function name typo in doesFileExist()

  storage/falcon/ScanDir.cpp@1.1.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +4 -0
    Check for data == null in isDirectory().

  storage/falcon/TableSpaceManager.cpp@1.1.1.1, 2007-10-18 18:11:46-05:00, chris@aldebaran.site +1 -1
    Corrected function name typo in doesFileExist().

ChangeSet@1.2529.98.1, 2007-10-18 14:48:04-07:00, antony@pcg5ppc.xiphis.org +7 -0
  Bug#31473
    "CSV does not work with NULL value in datetime fields"
    Attempting to insert a row with a NULL value for a DATETIME field
    results in a CSV file which the storage engine cannot read.
    Don't blindly assume that "0" is acceptable for all field types,
    Since CSV does not support NULL, we find out from the field the
    default non-null value.
    Do not permit the creation of a table with a nullable columns.

  mysql-test/r/csv.result@1.23, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +82 -24
    test for bug 31473

  mysql-test/r/log_tables.result@1.22.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +48 -48
    change in results due to bugfix 31473

  mysql-test/r/system_mysql_db.result@1.49.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +9 -9
    change in results due to bugfix 31473

  mysql-test/t/csv.test@1.28, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +63 -24
    test for bug 31473

  mysql-test/t/log_tables.test@1.19.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +9 -9
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  scripts/mysql_system_tables.sql@1.10.5.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +2 -2
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  storage/csv/ha_tina.cc@1.84.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +27 -9
    bug31473
      Don't blindly assume that "0" is acceptable for all field types,
      Since CSV does not support NULL, we find out from the field the
      default non-null value.
      Do not permit the creation of a table with a nullable columns;

ChangeSet@1.2403.28.94, 2007-10-18 23:21:18+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets
    Correct check for buffer/no buffer

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.2.4, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    new error code

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.50.3.6, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -2
    correct check for buffer/no buffer

  storage/ndb/test/ndbapi/test_event.cpp@1.23.1.5, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +88 -0
    test prg

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.4.12, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -0
    test prg

ChangeSet@1.2403.60.1, 2007-10-18 22:35:46+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.54.1.6, 2007-10-18 22:35:44+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets

ChangeSet@1.2529.97.2, 2007-10-18 17:24:57-03:00, davi@moksha.com.br +2 -0
  Post merge fix for Bug 21557

  mysql-test/r/log_tables.result@1.25, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +2 -1
    Update test result, general_log disabled.

  mysql-test/t/log_tables.test@1.22, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +1 -0
    Disable the general_log before consulting it.

ChangeSet@1.1810.3393.1, 2007-10-18 21:48:16+02:00, msvensson@pilot.mysql.com +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/binlog_killed.test@1.6.1.3, 2007-10-18 21:48:14+02:00, msvensson@pilot.mysql.com +1 -1
    Remove unportable use of "system rm"

ChangeSet@1.2588.35.16, 2007-10-18 15:38:46-04:00, jas@fluffy.netfrastructure.com +3 -0
  Fix some synchronization and smp issues with the io threads.

  storage/falcon/Cache.cpp@1.28, 2007-10-18 15:38:42-04:00, jas@fluffy.netfrastructure.com +11 -7
    Fix some synchronization and smp issues with the io threads.

  storage/falcon/Database.cpp@1.15.1.4, 2007-10-18 15:38:42-04:00, jas@fluffy.netfrastructure.com +3 -1
    Skip the asynchronous flush on shutdown.

  storage/falcon/snapshot/Snapshot.cpp@1.2, 2007-10-18 15:38:42-04:00, jas@fluffy.netfrastructure.com +2 -0
    Pick up a couple of new known entrypoints.

ChangeSet@1.2529.97.1, 2007-10-18 15:45:07-03:00, davi@moksha.com.br +9 -0
  Bug#21557 entries in the general query log truncated at 1000 characters.
  
  The general log write function (general_log_print) uses printf style
  arguments which need to be pre-processed, meaning that the all arguments
  are copied to a single buffer and the problem is that the buffer size is
  constant (1022 characters) but queries can be much larger then this.
  
  The solution is to introduce a new log write function that accepts a
  buffer and it's length as arguments. The function is to be used when
  a formatted output is not required, which is the case for almost all
  query write-to-log calls.
  
  This is a incompatible change with respect to the log format of prepared
  statements.

  mysql-test/r/log_tables.result@1.24, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +214 -0
    Add test case result for Bug#21557

  mysql-test/t/log_tables.test@1.21, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +116 -0
    Add test case for Bug#21557

  sql/log.cc@1.297.1.2, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +94 -60
    Introduce the logger function general_log_write which is similar to
    general_log_print but accepts a single buffer and the buffer length.
    The function doesn't perform any formatting and sends the buffer
    directly to the underlying log handlers.

  sql/log.h@1.30.1.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +4 -0
    Introduce the logger function general_log_write.

  sql/log_event.cc@1.271.17.17, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/mysql_priv.h@1.505.17.19, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -0
    Prototype for the logger function general_log_write.

  sql/sp_head.cc@1.279.11.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/sql_parse.cc@1.693.21.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -4
    Pass the buffer directly to the logger function when formatting
    is not required.

  sql/sql_prepare.cc@1.228.1.6, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +2 -11
    Don't log the statement id, it avoids making a extra copy of the query
    and the query is not truncated anymore if it exceeds the limit.

ChangeSet@1.2588.35.15, 2007-10-18 11:28:07-04:00, jas@rowvwade. +2 -0
  Track down io thread synchronization problem

  storage/falcon/Cache.cpp@1.27, 2007-10-18 11:28:00-04:00, jas@rowvwade. +12 -9
    Track down io thread synchronization problem

  storage/falcon/IO.cpp@1.13, 2007-10-18 11:28:00-04:00, jas@rowvwade. +1 -0
    Initialize statistics bucket.

ChangeSet@1.2603.2.12, 2007-10-18 17:50:30+03:00, timour@lamia.openlinksw.com +12 -0
  WL#1110: Subquery optimization: materialization
  
  Combined changesets for the:
  - implementation of the cache of the left IN operand, and
  - the addition of new test cases.
  
  
  Changed comment style in regression tests.
  ---
  Merge lamia.openlinksw.com:/home/tkatchaounov/mysql/src/5.2-opt-virgin
  into  lamia.openlinksw.com:/home/tkatchaounov/mysql/src/5.2-1110
  ---
  WL#1110: Subquery optimization: materialization
  
  - Implemented cache of the left operand of IN
  - Added corresponding regression tests
  - Fixed problems with incorrect subquery results
  ---
  Merge lamia.openlinksw.com:/home/tkatchaounov/mysql/src/5.2-opt-virgin
  into  lamia.openlinksw.com:/home/tkatchaounov/mysql/src/5.2-1110
  ---
  WL#1110: Subquery optimization: materialization
  Fix debug print.

  mysql-test/r/subselect_mat.result@1.5, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +133 -2
    - changed comment style as '--' comments are interpreted differently
    ---
    - Added test for the cache of the left IN operand.

  mysql-test/t/subselect_mat.test@1.5, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +83 -2
    - changed comment style as '--' comments are interpreted differently
    ---
    - Added test for the cache of the left IN operand.

  sql/field.h@1.242.1.1, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +18 -0
    - Factored out opt_range.cc:dbug_print_field() into a method of Field.

  sql/item.cc@1.205.3.2, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +3 -1
    - Added debug trace.

  sql/item.h@1.226, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +45 -3
    - Added Cached_item_field::dbug_print, Item_field::dbug_print
    - Added new parameter to new_Cached_item() to control the field used for caching. 

  sql/item_buff.cc@1.23, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +24 -10
    - Added new parameter to new_Cached_item() to control the field used for caching.
    - More debug output into the trace file.
    ---
    - Fix debug print.

  sql/item_subselect.cc@1.167, 2007-10-18 17:50:27+03:00, timour@lamia.openlinksw.com +115 -56
    - Implemented all functionality to cache the left IN operand inside Item_in_subselect.
      The engine used by Item_in_subselect is not aware of this cache.
    - Added more debug prints.
    - More comments.

  sql/item_subselect.h@1.103, 2007-10-18 17:50:28+03:00, timour@lamia.openlinksw.com +9 -6
    - Implemented all functionality to cache the left IN operand inside Item_in_subselect.
    - More comments.

  sql/opt_range.cc@1.288, 2007-10-18 17:50:28+03:00, timour@lamia.openlinksw.com +3 -20
    - Factored out opt_range.cc:dbug_print_field() into a method of Field.

  sql/sql_lex.cc@1.266.2.1, 2007-10-18 17:50:28+03:00, timour@lamia.openlinksw.com +6 -2
    - Changed the computation of the Item_subselect::is_correlated property
      to be such that if a correlated subquery predicate contains another
      correlated subquery predicate, the outer one is correlated as well.

  sql/sql_select.cc@1.556.2.10, 2007-10-18 17:50:28+03:00, timour@lamia.openlinksw.com +25 -19
    - exported end_[send | write]_group so it can be used in item_subeselect.cc,
    - renamed test_if_group_changed to test_if_item_list_changed to reflect its
      more general nature,
    - more comments

  sql/sql_select.h@1.134, 2007-10-18 17:50:28+03:00, timour@lamia.openlinksw.com +5 -0
    - exported end_[send | write]_group so it can be used in item_subeselect.cc,
    - renamed test_if_group_changed to test_if_item_list_changed to reflect its
      more general nature

ChangeSet@1.2588.36.3, 2007-10-18 09:21:45-05:00, klewis@klewis-mysql. +1 -0
  Bug#31671 - Explicitly support Row based replication.

  storage/falcon/ha_falcon.cpp@1.10, 2007-10-18 09:21:38-05:00, klewis@klewis-mysql. +1 -1
    Bug#31671 - Explicitly support Row based replication.

ChangeSet@1.2588.35.14, 2007-10-18 10:17:23-04:00, jas@rowvwade. +2 -0
  Write dirty pages in io thread page run even if not
  marked for flush.

  storage/falcon/Cache.cpp@1.26, 2007-10-18 10:17:16-04:00, jas@rowvwade. +14 -5
    Write dirty pages in io thread page run even if not
    marked for flush.

  storage/falcon/Cache.h@1.11, 2007-10-18 10:17:16-04:00, jas@rowvwade. +1 -0
    Write dirty pages in io thread page run even if not
    marked for flush.

ChangeSet@1.2529.96.1, 2007-10-18 16:14:27+02:00, istruewing@stella.local +1 -0
  Bug#31692 - binlog_killed.test crashes sometimes
  
  The server crashed when a thread was killed while locking the
  general_log table at statement begin.
  
  The general_log table is handled like a performance schema table.
  The state of open tables is saved and cleared so that this table
  seems to be the only open one. Then this table is opened and locked.
  After writing, the table is closed and the open table state is
  restored. Before restoring, however, it is asserted that there is
  no current table open.
  
  After locking the table, mysql_lock_tables() checks if the thread
  was killed in between. If so, it unlocks the table and returns an
  error. open_ltable() just returns with the error and leaves closing
  of the table to close_thread_tables(), which is called at
  statement end.
  
  open_performance_schema_table() did not take this into account.
  It assumed that a failed open_ltable() would not leave an open
  table behind.
  
  Fixed by closing thread tables after open_ltable() and before
  restore_backup_open_tables_state() if the thread was killed.
  
  No test case. It requires correctly timed parallel execution.
  Since this bug was detected by the test suite, it seems
  dispensable to add another test.

  sql/sql_base.cc@1.374.52.1, 2007-10-18 16:14:25+02:00, istruewing@stella.local +10 -0
    Bug#31692 - binlog_killed.test crashes sometimes
    Closing thread tables after open_ltable() and before
    restore_backup_open_tables_state() if the thread was killed.

ChangeSet@1.1810.3390.1, 2007-10-18 15:19:04+03:00, gkodinov@magare.gmz +13 -0
  Bug #31221: Optimizer incorrectly identifies impossible WHERE clause
   No warning was generated when a TIMESTAMP with a non-zero time part
   was converted to a DATE value. This caused index lookup to assume
   that this is a valid conversion and was returning rows that match 
   a comparison between a TIMESTAMP value and a DATE keypart.
   Fixed by generating a warning on such a truncation.

  mysql-test/r/ps_6bdb.result@1.27.19.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/derived.result@1.58.1.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/r/ps_2myisam.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_3innodb.result@1.42.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_4heap.result@1.38.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_5merge.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +4 -2
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_date.result@1.13.4.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +30 -0
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_datetime.result@1.30.1.18, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -0
    Bug #31221: test case

  mysql-test/r/ps_7ndb.result@1.26.8.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/t/derived.test@1.54, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/t/type_date.test@1.14.3.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +22 -0
    Bug #31221: test case

  sql/field.cc@1.256.61.1, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +21 -4
    Bug #31221: 
     - Upgraded fix for bug 29729
     - issue a warning only if the hh:mm:ss.msec is not zero consistently 
       for all the Field_newdate::store function

  sql/item_timefunc.cc@1.100.31.7, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +1 -2
    Bug #31221: don't ignore the errors when storing data

ChangeSet@1.2603.4.14, 2007-10-18 15:34:46+04:00, kaa@polly.(none) +1 -0
  Post-merge fixes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/handler.cc@1.255, 2007-10-18 15:34:38+04:00, kaa@polly.(none) +2 -2
    Post-merge fixes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.2529.94.2, 2007-10-18 15:17:21+04:00, kaa@polly.(none) +3 -0
  Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  include/my_sys.h@1.230, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +1 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/partition_info.cc@1.42, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -2
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/set_var.cc@1.231.25.1, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.1810.3389.1, 2007-10-18 13:09:30+02:00, mleich@four.local.lan +4 -0
  Fix for
  Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/memory_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

ChangeSet@1.1810.3366.3, 2007-10-18 12:03:30+02:00, joerg@trift2. +3 -0
  Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
  and the modified values of the compile-related variables used in "configure".
  
  Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".
  
  This fixes bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug

  configure.in@1.245.103.3, 2007-10-18 12:03:27+02:00, joerg@trift2. +5 -0
    Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS.
    
    This is necessary so that the "mysqlbug" script can output the variables affecting
    compilation with both their original (on call) and final (modified) values.
    
    This work is related to fixing bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/Makefile.am@1.43.4.1, 2007-10-18 12:03:27+02:00, joerg@trift2. +10 -4
    Clearly differ between the original and the modified values of the compile-related
    variables used in "configure".
    
    This is to fix bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/mysqlbug.sh@1.8.1.2, 2007-10-18 12:03:27+02:00, joerg@trift2. +4 -2
    Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO"
    which contain the original (call parameters, environment) and the modified values
    of the "configure" variables controlling the compile process.
    
    This fixes bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

ChangeSet@1.1810.3388.1, 2007-10-18 14:52:19+05:00, holyfoot@mysql.com +1 -0
  Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
  
  The BIG_TABLES define wasn't enabled on Windows.
  #define added

  include/config-win.h@1.71.4.1, 2007-10-18 14:52:17+05:00, holyfoot@mysql.com +1 -0
    Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
    
    BIG_TABLES enabled on Windows

ChangeSet@1.2529.61.14, 2007-10-18 11:13:52+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#31588: buffer overrun when setting variables
  
  post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

  mysql-test/r/variables.result@1.101.1.2, 2007-10-18 11:13:47+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

ChangeSet@1.1616.3098.3, 2007-10-18 10:47:54+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31588: buffer overrun when setting variables
  
  Buffer used when setting variables was not dimensioned to accomodate
  trailing '\0'. An overflow by one character was therefore possible.
  CS corrects limits to prevent such overflows.

  mysql-test/r/variables.result@1.21.1.45, 2007-10-18 10:47:51+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Try to overflow buffer used for setting system variables.
    Unpatched server should throw a valgrind warning here.
    Actual value and error message irrelevant, only length counts.

  mysql-test/t/variables.test@1.18.1.36, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +8 -1
    Try to overflow buffer used for setting system variables.

  sql/set_var.cc@1.34.71.1, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Adjust maximum number of characters we can store in 'buff' by one
    as strmake() will write a terminating '\0'.

ChangeSet@1.2588.15.24, 2007-10-18 03:11:01+02:00, hakank@au0012.local +1 -0
  Fix for Bug#31498 Error compiling Falcon tree on Mac OS X.
  Problem was that Falcon needs -fexeptions flag to get
  linked correctly.

  storage/falcon/plug.in@1.4, 2007-10-18 03:10:56+02:00, hakank@au0012.local +2 -2
    Fix for Bug#31498 Error compiling Falcon tree on Mac OS X.

ChangeSet@1.2588.35.13, 2007-10-17 18:37:53-04:00, jas@rowvwade. +1 -0
  Fix io thread deadlock problem (or at least try to).

  storage/falcon/Cache.cpp@1.25, 2007-10-17 18:37:46-04:00, jas@rowvwade. +2 -1
    Fix io thread deadlock problem (or at least try to).

ChangeSet@1.1810.3337.12, 2007-10-17 17:54:11-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
      
  Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself.
      
  Now the *_init functions get the constant as a null terminated string with the correct length supplied too.

  mysql-test/r/udf.result@1.3.4.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.3.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.77.2, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max length of the var containing the constant.

  sql/udf_example.c@1.29.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that lengths of constants are correctly passed.

  sql/udf_example.def@1.3.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2603.9.5, 2007-10-17 16:20:40-04:00, cbell@mysql_cab_desk. +4 -0
  Merge 5.2 main into 5.2-backup
  
  This patch contains minor corrections needed after merge.

  sql/backup/sql_backup.cc@1.21, 2007-10-17 16:20:36-04:00, cbell@mysql_cab_desk. +4 -1
    5.2 merge into 5.2-backup
    
    Corrected call to open_temporary_table() as a result of merge.

  client/mysqlslap.c@1.72.1.1, 2007-10-17 16:20:34-04:00, cbell@mysql_cab_desk. +4 -3
    5.2 merge into 5.2-backup
    
    Corrected use of macro. Macro must be first in methods due to compile error on Windows.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.7.1.1, 2007-10-17 16:20:35-04:00, cbell@mysql_cab_desk. +8 -8
    5.2 merge into 5.2-backup
    
    New result file.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.1.1, 2007-10-17 16:20:35-04:00, cbell@mysql_cab_desk. +2 -2
    5.2 merge into 5.2-backup
    
    Changed test to use masks.

ChangeSet@1.2529.91.2, 2007-10-17 16:43:30-03:00, davi@moksha.com.br +3 -0
  Bug#31608 missing mysqltest change_user command
  
  Post merge fixes: close any open statement before
  the change user command and fix test case output.

  client/mysqltest.c@1.313.2.4, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +6 -0
    Close an open statement since it won't work after a change_user command.

  mysql-test/r/change_user.result@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +2 -2
    Fixed test case output.

  mysql-test/t/change_user.test@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +1 -1
    Fix test case output to return 1 or 0.

ChangeSet@1.2588.35.12, 2007-10-17 15:34:04-04:00, jas@rowvwade. +4 -0
  Rework the io thread synchronization issues to avoid
  multiple writes of the same pages.

  storage/falcon/BDB.h@1.6, 2007-10-17 15:33:50-04:00, jas@rowvwade. +2 -1
    Get rid ob BDB_new as superfluous.

  storage/falcon/Cache.cpp@1.24, 2007-10-17 15:33:51-04:00, jas@rowvwade. +69 -108
    Rework the io thread synchronization issues to avoid
    multiple writes of the same pages.

  storage/falcon/Cache.h@1.10, 2007-10-17 15:33:51-04:00, jas@rowvwade. +4 -0
    Track reasons that runs were terminated for debugging
    purposes.

  storage/falcon/StorageParameters.h@1.6, 2007-10-17 15:33:51-04:00, jas@rowvwade. +1 -1
    Drop default number of I/O threads from 5 to 2.

ChangeSet@1.2529.64.3, 2007-10-17 20:40:23+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  
  Problem:
  Crashed because usage of an uninitialised mutex when auto_incrementing
    a partitioned temporary table
  
  Fix:
  Only locking (using the mutex) if not temporary table.

  mysql-test/r/partition.result@1.68.1.2, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +12 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    test result

  mysql-test/t/partition.test@1.62.1.2, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    testcase

  sql/ha_partition.cc@1.98.8.2, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +15 -5
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    
    If the table is a temporary table, the table_share->mutex is not
      initialised.
    
    Checking if not temporary table, then OK to lock (else no need
      to lock)

ChangeSet@1.1810.3287.30, 2007-10-17 11:22:41-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix syntax error build problem on Windows (variable was defined
  in middle of block)

  libmysql/libmysql.c@1.233.1.13, 2007-10-17 11:22:40-06:00, tsmith@ramayana.hindu.god +11 -7
    Fix syntax error - don't define new variables in the middle of a block.
    
    Also, use size_t instead of uint to avoid unnecessary casting.

ChangeSet@1.2603.1.32, 2007-10-17 11:05:03-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  sql/sql_delete.cc@1.218, 2007-10-17 11:05:00-06:00, malff@lambda.hsd1.co.comcast.net. +16 -7
    Manual merge

ChangeSet@1.2603.1.31, 2007-10-17 11:03:26-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge

  sql/share/errmsg.txt@1.110.2.2, 2007-10-17 11:03:23-06:00, malff@lambda.hsd1.co.comcast.net. +3 -0
    Manual merge

ChangeSet@1.1810.3387.1, 2007-10-17 20:08:58+04:00, kaa@polly.(none) +21 -0
  Fix for bug #31207: Test "join_nested" shows different strategy on IA64
  CPUs / Intel's ICC compile
  
  The bug is a combination of two problems:
  
  1. IA64/ICC MySQL binaries use glibc's qsort(), not the one in mysys.
  
  2. The order relation implemented by join_tab_cmp() is not transitive,
  i.e. it is possible to choose such a, b and c that (a < b) && (b < c)
  but (c < a). This implies that result of a sort using the relation
  implemented by join_tab_cmp() depends on the order in which
  elements are compared, i.e. the result is implementation-specific. Since
  choose_plan() uses qsort() to pre-sort the
  join tables using join_tab_cmp() as a compare function, the results of
  the sorting may vary depending on qsort() implementation.
  
  It is neither possible nor important to implement a better ordering
  algorithm in join_tab_cmp(). Therefore the only way to fix it is to
  force our own qsort() to be used by renaming it to my_qsort(), so we don't depend
  on linker to decide that.
  
  This patch also "fixes" bug #20530: qsort redefinition violates the
  standard.

  include/my_sys.h@1.178.2.21, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -2
    Renamed qsort() and qsort2() to my_qsort() and my_qsort2(). Since
    previously we relied on stdlib.h to provide a declaration for qsort(), a
    separate declaration for my_qsort() is now required.

  libmysql/Makefile.shared@1.68.1.2, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Added mf_qsort.c to libmysql, since my_lib.c now uses my_qsort() instead of qsort().

  mysys/mf_keycache.c@1.55.1.10, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  mysys/mf_qsort.c@1.17, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Renamed qsort() to my_qsort() and qsort2() to my_qsort2().

  mysys/mf_sort.c@1.7.1.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  mysys/my_lib.c@1.23.3.5, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +3 -3
    Replaced qsort() with my_qsort().

  mysys/queues.c@1.15.1.3, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.cc@1.187.44.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.h@1.122.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/opt_range.cc@1.159.1.95, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -4
    Replaced qsort() with my_qsort().

  sql/records.cc@1.40.1.7, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort() with my_qsort().

  sql/sql_acl.cc@1.128.46.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +10 -10
    Replaced qsort() with my_qsort().

  sql/sql_array.h@1.3.2.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_help.cc@1.47.1.8, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_select.cc@1.312.172.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +15 -3
    Replaced qsort() with my_qsort().

  sql/sql_table.cc@1.239.66.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/examples/ha_tina.cc@1.10.10.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/ft_boolean_search.c@1.90.8.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  myisam/ft_nlq_search.c@1.38.4.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort2() with my_qsort2().

  myisam/myisampack.c@1.39.24.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/sort.c@1.45.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +6 -6
    Replaced qsort2() with my_qsort2().

ChangeSet@1.2588.35.11, 2007-10-17 11:36:57-04:00, jas@rowvwade. +4 -0
  Track reporting of forced writes and flush writes as separate
  activities.

  storage/falcon/Cache.cpp@1.23, 2007-10-17 11:36:49-04:00, jas@rowvwade. +3 -3
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/Dbb.cpp@1.10, 2007-10-17 11:36:50-04:00, jas@rowvwade. +4 -2
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/IO.cpp@1.12, 2007-10-17 11:36:50-04:00, jas@rowvwade. +5 -4
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/IOx.h@1.8, 2007-10-17 11:36:50-04:00, jas@rowvwade. +5 -2
    Track reporting of forced writes and flush writes as separate
    activities.

ChangeSet@1.2588.35.10, 2007-10-17 11:11:29-04:00, jas@rowvwade. +1 -0
  Tweak page page cache manager to recover page consolidation.

  storage/falcon/Cache.cpp@1.22, 2007-10-17 11:11:23-04:00, jas@rowvwade. +21 -7
    Tweak page page cache manager to recover page consolidation.

ChangeSet@1.2529.50.12, 2007-10-17 15:44:22+04:00, anozdrin@station. +2 -0
  Fix result files (BUG#24923).

  mysql-test/r/information_schema.result@1.156.4.1, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

  mysql-test/r/system_mysql_db.result@1.50, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

ChangeSet@1.1616.3107.1, 2007-10-17 14:28:00+05:00, ramil@mysql.com +4 -0
  Fix for bug#31615: crash after set names ucs2 collate xxx
  
  Problem: currently, UCS-2 cannot be used as a client character set.
  
  Fix: raise an error if one attempts to set it to USC-2.

  mysql-test/r/ctype_ucs.result@1.11.1.25, 2007-10-17 14:27:58+05:00, ramil@mysql.com +8 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test result.

  mysql-test/t/ctype_ucs.test@1.15.1.21, 2007-10-17 14:27:58+05:00, ramil@mysql.com +12 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test case.

  sql/set_var.cc@1.34.52.48, 2007-10-17 14:27:58+05:00, ramil@mysql.com +22 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

  sql/set_var.h@1.54.1.9, 2007-10-17 14:27:58+05:00, ramil@mysql.com +1 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

ChangeSet@1.2529.88.3, 2007-10-17 14:08:03+05:00, gluh@mysql.com +3 -0
  Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
  move 'table_collation' field filling outside of if(file) condition
  because this field has 'OPEN_FRM_ONLY' attribute

  mysql-test/r/information_schema.result@1.156.2.10, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.100.1.10, 2007-10-17 14:08:01+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.415.15.3, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -3
    move 'table_collation' field filling outside of if(file) condition
    because this field has 'OPEN_FRM_ONLY' attribute

ChangeSet@1.1810.3374.9, 2007-10-17 13:22:34+05:00, gluh@mysql.com +3 -0
  Bug#31568 Some "information_schema" entries suddenly report a NULL default
  updated result files

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

ChangeSet@1.2529.50.11, 2007-10-17 12:13:56+04:00, anozdrin@station. +8 -0
  Fix for BUG#24923: Functions with ENUM issues.
  
  The problem was that the RETURNS column in the mysql.proc was of
  CHAR(64). That was not enough for storing long-named datatypes.
  
  The fix is to change CHAR(64) to LONGBLOB, and to throw warnings
  at the time a stored routine is created if some data is truncated
  during writing into mysql.proc.

  mysql-test/r/sp.result@1.270.16.11, 2007-10-17 12:13:53+04:00, anozdrin@station. +51 -0
    Update test result.

  mysql-test/t/sp.test@1.237.1.27, 2007-10-17 12:13:53+04:00, anozdrin@station. +70 -0
    Add a test case for BUG#24923.

  scripts/mysql_system_tables.sql@1.10.4.4, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -1
    Change the data type of column 'returns' from char(64) to longblob.

  scripts/mysql_system_tables_fix.sql@1.63.1.2, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Change the data type of column 'returns' from char(64) to longblob.

  sql/share/errmsg.txt@1.80.58.13, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Add new error message.

  sql/sp.cc@1.167.1.5, 2007-10-17 12:13:53+04:00, anozdrin@station. +92 -39
    Produce warnings if any data was truncated during writing
    into mysql.proc.

  sql/sp.h@1.40.1.2, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Add new error code.

  sql/sql_parse.cc@1.693.20.9, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Hande

ChangeSet@1.2529.34.13, 2007-10-17 09:29:11+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Removing debug variables from non-debug builds.

  sql/rpl_record.cc@1.9.1.7, 2007-10-17 09:29:06+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Turning of declaration of debug variables in non-debug builds.

ChangeSet@1.1616.3099.5, 2007-10-17 10:29:51+04:00, kaa@polly.(none) +2 -0
  Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/r/repair.result@1.14.1.9, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/t/repair.test@1.12.1.7, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

ChangeSet@1.2529.93.1, 2007-10-17 06:50:03+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  Eliminating some valgrind warnings resulting from that some
  storage engines do not set the unused null bits (i.e., the
  filler bits and the X bit) correctly. Also adding some casts
  to debug printouts to eliminate compiler warnings.

  sql/ha_ndbcluster.cc@1.408.1.62, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +55 -55
    Changing debug enter names to use full names for member functions.

  sql/records.cc@1.50.1.1, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Emptying records before starting to read records since some engines do
    not set the unused null bits, leading to valgrind errors.

  sql/rpl_record.cc@1.9.1.6, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +3 -2
    Adding casts to debug printouts to eliminate compiler warnings.

ChangeSet@1.2603.1.28, 2007-10-16 22:20:45-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  build warning cleanup

  sql/mysqld.cc@1.658.2.2, 2007-10-16 22:20:43-06:00, malff@lambda.hsd1.co.comcast.net. +0 -1
    Unused variable

ChangeSet@1.2603.1.27, 2007-10-16 22:18:47-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Manual merge of 5.1-runtime to 5.2-runtime

  sql/sql_yacc.yy@1.502.1.3, 2007-10-16 22:18:42-06:00, malff@lambda.hsd1.co.comcast.net. +294 -258
    Manual merge

ChangeSet@1.2529.50.10, 2007-10-16 20:47:08-06:00, malff@lambda.hsd1.co.comcast.net. +8 -0
  Manual merge of 5.0-runtime to 5.1-runtime

  mysql-test/r/sp-error.result@1.125.1.7, 2007-10-16 20:47:02-06:00, malff@lambda.hsd1.co.comcast.net. +14 -1
    Manual merge

  mysql-test/r/sp.result@1.270.16.10, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +16 -0
    Manual merge

  mysql-test/r/udf.result@1.21.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +10 -3
    Manual merge

  mysql-test/t/sp.test@1.237.1.26, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +31 -0
    Manual merge

  mysql-test/t/udf.test@1.19.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +2 -1
    Manual merge

  sql/item_create.cc@1.84.1.9, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +19 -0
    Manual merge

  sql/sp_head.cc@1.279.10.3, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +30 -4
    Manual merge

  sql/sql_yacc.yy@1.458.141.7, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +259 -224
    Manual merge

ChangeSet@1.2603.9.3, 2007-10-16 14:15:13-07:00, brian@zim.(none) +2 -0
  Fix conversion issues. 

  storage/archive/azio.c@1.24, 2007-10-16 14:15:10-07:00, brian@zim.(none) +6 -6
    Fix conversions. 

  storage/archive/ha_archive.cc@1.149, 2007-10-16 14:15:10-07:00, brian@zim.(none) +1 -1
    Fix conversions. 

ChangeSet@1.2588.35.9, 2007-10-16 16:38:26-04:00, jas@rowvwade. +1 -0
  Re-instate proper Bdb aging.

  storage/falcon/Cache.cpp@1.21, 2007-10-16 16:38:19-04:00, jas@rowvwade. +1 -1
    Re-instate proper Bdb aging.

ChangeSet@1.1810.3337.11, 2007-10-16 14:27:20-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed broken call to my_error

  sql/sql_yacc.yy@1.371.1.166, 2007-10-16 14:27:18-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed error message to use char*, not LEX_STRING

ChangeSet@1.2588.36.2, 2007-10-16 15:00:23-05:00, klewis@klewis-mysql. +2 -0
  New option for falcon_io_threads

  mysql-test/suite/falcon/r/falcon_options.result@1.3, 2007-10-16 15:00:15-05:00, klewis@klewis-mysql. +2 -0
    New option for falcon_io_threads

  mysql-test/suite/falcon/r/falcon_options2.result@1.3, 2007-10-16 15:00:17-05:00, klewis@klewis-mysql. +1 -0
    New option for falcon_io_threads

ChangeSet@1.2588.35.8, 2007-10-16 15:40:17-04:00, jas@rowvwade. +11 -0
  Write smallish blobs to serial log rather than page writer.

  storage/falcon/CMakeLists.txt@1.5, 2007-10-16 15:40:05-04:00, jas@rowvwade. +2 -0
    Added new class SRLUpdateBlob.

  storage/falcon/Dbb.cpp@1.9, 2007-10-16 15:40:05-04:00, jas@rowvwade. +12 -10
    Write smallish blobs to serial log rather than page writer.

  storage/falcon/Dbb.h@1.4, 2007-10-16 15:40:06-04:00, jas@rowvwade. +0 -3
    Write smallish blobs to serial log rather than page writer.

  storage/falcon/Makefile.am@1.6, 2007-10-16 15:40:06-04:00, jas@rowvwade. +2 -0
    Added new class SRLUpdateBlob.

  storage/falcon/SRLData.h@1.2, 2007-10-16 15:40:06-04:00, jas@rowvwade. +9 -7
    Stylistic edit for clarity.

  storage/falcon/SRLUpdateBlob.cpp@1.1, 2007-10-16 15:40:08-04:00, jas@rowvwade. +80 -0
    New BitKeeper file ``storage/falcon/SRLUpdateBlob.cpp''

  storage/falcon/SRLUpdateBlob.cpp@1.0, 2007-10-16 15:40:08-04:00, jas@rowvwade. +0 -0

  storage/falcon/SRLUpdateBlob.h@1.1, 2007-10-16 15:40:08-04:00, jas@rowvwade. +43 -0
    New BitKeeper file ``storage/falcon/SRLUpdateBlob.h''

  storage/falcon/SRLUpdateBlob.h@1.0, 2007-10-16 15:40:08-04:00, jas@rowvwade. +0 -0

  storage/falcon/SerialLogControl.cpp@1.5, 2007-10-16 15:40:07-04:00, jas@rowvwade. +3 -0
    Write smallish blobs to serial log rather than page writer.

  storage/falcon/SerialLogControl.h@1.2, 2007-10-16 15:40:07-04:00, jas@rowvwade. +2 -0
    Write smallish blobs to serial log rather than page writer.

  storage/falcon/SerialLogRecord.h@1.2, 2007-10-16 15:40:07-04:00, jas@rowvwade. +2 -1
    Write smallish blobs to serial log rather than page writer.

  storage/falcon/StorageParameters.h@1.5, 2007-10-16 15:40:08-04:00, jas@rowvwade. +1 -0
    Write smallish blobs to serial log rather than page writer.

ChangeSet@1.2529.34.11, 2007-10-16 23:19:39+04:00, skozlov@mysql.com +4 -0
  Fix for non-deterministic behavior of SELECTs and VIEWs

  mysql-test/suite/rpl/include/rpl_mixed_check_select.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/include/rpl_mixed_check_view.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +2 -2
    Added ORDER BY for VIEW

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +76 -76
    Updated result file

ChangeSet@1.2529.92.1, 2007-10-16 19:32:38+02:00, thek@adventure.(none) +2 -0
  Fixed query_cache_notembedded test program failure because of dependencies between
  test programs.

  mysql-test/r/query_cache.result@1.101.1.4, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +4 -0
    Reset query cache parameters to prevent dependency between test programs.

  mysql-test/t/query_cache.test@1.81.1.5, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +6 -0
    Reset query cache parameters to prevent dependency between test programs.

ChangeSet@1.2588.35.6, 2007-10-16 13:29:39-04:00, jas@rowvwade. +6 -0
  Eliminate remnants of purifier thread.

  storage/falcon/BDB.h@1.5, 2007-10-16 13:29:30-04:00, jas@rowvwade. +0 -1
    Eliminate remnants of purifier thread.

  storage/falcon/Cache.cpp@1.20, 2007-10-16 13:29:30-04:00, jas@rowvwade. +0 -69
    Eliminate remnants of purifier thread.  Also fixed
    bug in bdb aging algorithm.

  storage/falcon/Cache.h@1.9, 2007-10-16 13:29:31-04:00, jas@rowvwade. +0 -2
    Eliminate remnants of purifier thread.

  storage/falcon/IO.cpp@1.11, 2007-10-16 13:29:31-04:00, jas@rowvwade. +1 -2
    Eliminate remnants of purifier thread.

  storage/falcon/IOx.h@1.7, 2007-10-16 13:29:31-04:00, jas@rowvwade. +6 -7
    Eliminate remnants of purifier thread.

  storage/falcon/StorageParameters.h@1.4, 2007-10-16 13:29:32-04:00, jas@rowvwade. +0 -3
    Eliminate remnants of purifier thread.

ChangeSet@1.2592.3.13, 2007-10-16 10:28:37-07:00, brian@zim.(none) +13 -0
  This changeset modifies archive to now use a custom AIO set of calls (compared to the posix ones... which were leaking memory). Some asserts are still in the code (waiting to see if anything comes up in arch pushbuild tree). 
  ---
  This is mainly a refactoring of the AZIO interface. I've removed some legacy testing and replaced the read and write code with row looking interfaces (which means I've been able to pull logic from the ha_archive.cc file, and its duplicates in the tests). 
  AIO is now disabled by default. I did this because on some platforms this is slower. 

  client/mysqldump.c@1.295.1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +0 -1
    Removing warning (since yes... there is a good chance nothing was allocated).

  mysql-test/r/archive_aio_posix.result@1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +4 -0
    Adjusting test for enabling AIO

  mysql-test/r/rpl_mysqldump_slave.result@1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +0 -1
    Import patch dump-slave patch.txt

  mysql-test/t/archive_aio_posix.test@1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +2 -0
    Enabling AIO.

  mysql-test/t/rpl_mysqldump_slave.test@1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +0 -1
    Import patch dump-slave patch.txt

  storage/archive/Makefile.am@1.16, 2007-10-16 10:28:34-07:00, brian@zim.(none) +21 -1
    Adding valgrind specific test for tests
    ---
    Linking client lib is the only way to get thead end/begin working :(

  storage/archive/archive_performance.c@1.2, 2007-10-16 10:28:34-07:00, brian@zim.(none) +63 -40
    Gave the performance test its own file (so I can run archive_test at the same time). 
    ---
    Refactor test case for AZIO changes. I also placed test in loop to make it a  bit more readable. 

  storage/archive/archive_reader.c@1.12, 2007-10-16 10:28:34-07:00, brian@zim.(none) +11 -64
    Just adding init/end calls (now that we have threads).
    ---
    Updates for changes in azio.

  storage/archive/archive_test.c@1.15, 2007-10-16 10:28:34-07:00, brian@zim.(none) +70 -41
    Refactored test system to do both aio/non-aio. Errors now exit.
    ---
    Updates for changes in azio interface. 

  storage/archive/azio.c@1.20.1.13, 2007-10-16 10:28:34-07:00, brian@zim.(none) +251 -140
    Rewrote aio code to use custom aio code. Removed fprintf() warnings. 
    ---
    Removed support for older row format in 5.0 (which cleans up the code). Support for AIO, and clean up of row interface is now done so that it is in library not scattered). 

  storage/archive/azio.h@1.12.1.8, 2007-10-16 10:28:34-07:00, brian@zim.(none) +50 -23
    Created new type for holding AIO specific code. 
    ---
    Include header added. Added new API call for row interface. Removed legacy writer interface. 

  storage/archive/concurrency_test.c@1.1, 2007-10-16 10:28:34-07:00, brian@zim.(none) +344 -0
    BitKeeper file /home/brian/mysql/mysql-5.2-arch/storage/archive/concurrency_test.c
    ---
    Brand new test :)
    

  storage/archive/concurrency_test.c@1.0, 2007-10-16 10:28:34-07:00, brian@zim.(none) +0 -0

  storage/archive/ha_archive.cc@1.148, 2007-10-16 10:28:34-07:00, brian@zim.(none) +39 -152
    Reworked help message. 
    ---
    Cleanup for changes in AIO. Removed legacy upgrader and rewrote to new row format. 

ChangeSet@1.2588.36.1, 2007-10-16 12:16:48-05:00, klewis@klewis-mysql. +1 -0
  Bug#31286 - Avoid a recursive loop by not caling Record::getRecordData()
  in RecordScavenge::inventoryRecord().  It is recursive when inventoryRecord()
  is called for a low memory situation and getRecordData() has to thaw a record.

  storage/falcon/RecordScavenge.cpp@1.2, 2007-10-16 12:16:25-05:00, klewis@klewis-mysql. +1 -1
    Bug#31286 - Avoid a recursive loop by not caling Record::getRecordData()
    in RecordScavenge::inventoryRecord().  It is recursive when inventoryRecord()
    is called for a low memory situation and getRecordData() has to thaw a record.

ChangeSet@1.1810.3371.6, 2007-10-16 11:16:31-06:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  Implementing code review comments

  mysql-test/r/sp.result@1.170.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +15 -0
    Added tests for coverage

  mysql-test/t/sp.test@1.174.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +29 -0
    Added tests for coverage

  sql/sql_udf.cc@1.45.1.18, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Code cleanup

ChangeSet@1.2529.50.7, 2007-10-16 20:21:40+04:00, kostja@bodhi.(none) +1 -0
  Update the client ABI to reflect member rename 
  (this is a backward-compatible change).

  include/mysql_h.ic@1.12.1.1, 2007-10-16 20:21:38+04:00, kostja@bodhi.(none) +1 -1
    Update the ABI to reflect member rename 
    (this is a backward-compatible change).

ChangeSet@1.2603.1.24, 2007-10-16 20:19:00+04:00, kostja@bodhi.(none) +1 -0
  Reflect a rename of a member in the client ABI (a compatible change).

  include/mysql_h.ic@1.14, 2007-10-16 20:18:57+04:00, kostja@bodhi.(none) +1 -1
    Reflect a rename of a member in the client ABI (a compatible change).

ChangeSet@1.2529.53.26, 2007-10-16 20:12:37+04:00, kostja@bodhi.(none) +1 -0
  Update the client ABI to reflect member rename 
  (this is a backward-compatible change).

  include/mysql_h.ic@1.13, 2007-10-16 20:12:33+04:00, kostja@bodhi.(none) +1 -1
    Update the ABI to reflect member rename 
    (this is a backward-compatible change).

ChangeSet@1.2588.35.5, 2007-10-16 12:02:26-04:00, jas@rowvwade. +1 -0
  Mark page as non-dirty when written by an io thread.

  storage/falcon/Cache.cpp@1.19, 2007-10-16 12:02:19-04:00, jas@rowvwade. +1 -0
    Mark page as non-dirty when written by an io thread.

ChangeSet@1.2603.1.22, 2007-10-16 19:37:25+04:00, kostja@bodhi.(none) +5 -0
  Remove some remains of support of 3.22 protocol. This was in fact dead code,
  since the option to talk 3.22 protocol was removed in 4.1 and there
  is no other protocol negotiation mechanism besides this option.

  include/mysql_com.h@1.128, 2007-10-16 19:37:22+04:00, kostja@bodhi.(none) +1 -1
    Remove some remains of support of 3.22 client/server protocol.
    The support of the protocol itself was removed in 4.1.

  sql/field.cc@1.418.3.1, 2007-10-16 19:37:23+04:00, kostja@bodhi.(none) +1 -2
    Clean up.

  sql/mysqld.cc@1.658.2.1, 2007-10-16 19:37:23+04:00, kostja@bodhi.(none) +0 -3
    Clean up.

  sql/net_serv.cc@1.116, 2007-10-16 19:37:23+04:00, kostja@bodhi.(none) +1 -1
    Clean up.

  sql/protocol.cc@1.131.1.2, 2007-10-16 19:37:23+04:00, kostja@bodhi.(none) +13 -21
    Always assume protocol version 10 and older (3.23 protocol).

ChangeSet@1.2529.91.1, 2007-10-16 12:29:22-03:00, davi@moksha.com.br +5 -0
  Bug#31608 missing mysqltest change_user command
  
  The problem is that currently there is no way to test the behavior
  of the mysql_change_user() function using the mysqltest suite because
  there is no internal command for it.
  
  The solution is to introduce a change_user command that can be used
  to test aspects of the MySQL client function mysql_change_user().

  client/mysqltest.c@1.313.2.3, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +60 -1
    Add change_user command to mysqltest.

  mysql-test/r/change_user.result@1.1, 2007-10-16 12:29:20-03:00, davi@moksha.com.br +46 -0
    Add new file with test case results for bugs 20023 and 31418.

  mysql-test/r/change_user.result@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/r/mysqltest.result@1.71, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +3 -0
    Add test case result for change_user command

  mysql-test/t/change_user.test@1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +35 -0
    Add new file with test cases for bugs 20023 and 31418.

  mysql-test/t/change_user.test@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/t/mysqltest.test@1.91.1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +18 -0
    Add test case for change_user command

ChangeSet@1.2588.35.4, 2007-10-16 11:12:27-04:00, jas@rowvwade. +1 -0
  Fix scavenge time reporting.

  storage/falcon/Database.cpp@1.15.1.3, 2007-10-16 11:12:20-04:00, jas@rowvwade. +2 -2
    Fix scavenge time reporting.

ChangeSet@1.2537.32.16, 2007-10-16 17:04:15+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31618 ndb_binlog_discover test failure
  - ndb_latest_handled_binlog_epoch may not have been initialized when show binlog events is executed

  sql/ha_ndbcluster_binlog.cc@1.90.1.54, 2007-10-16 17:04:12+02:00, tomas@whalegate.ndb.mysql.com +8 -3
    Bug #31618 ndb_binlog_discover test failure
    - ndb_latest_handled_binlog_epoch may not have been initialized when show binlog events is executed

ChangeSet@1.2588.35.3, 2007-10-16 10:06:07-04:00, jas@rowvwade. +4 -0
  Timestamp transaction start time, report time of and time go scavenge,
  and report age of oldest transaction.

  storage/falcon/Database.cpp@1.15.1.2, 2007-10-16 10:05:58-04:00, jas@rowvwade. +3 -2
    Timestamp scavenge message and report time to perform
    scavenge.

  storage/falcon/Transaction.cpp@1.9, 2007-10-16 10:05:59-04:00, jas@rowvwade. +1 -0
    Track tranaction start time for performance logging.

  storage/falcon/Transaction.h@1.5, 2007-10-16 10:05:59-04:00, jas@rowvwade. +1 -0
    Track tranaction start time for performance logging.

  storage/falcon/TransactionManager.cpp@1.7, 2007-10-16 10:06:00-04:00, jas@rowvwade. +7 -2
    Report age (in seconds) of oldest transaction.

ChangeSet@1.2529.90.1, 2007-10-16 14:42:42+02:00, thek@adventure.(none) +5 -0
  Bug#30710 query_cache.test fails on embedded - per-column privs test
  
  The embedded version of the server doesn't use column level grants, and 
  the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
  the redundant HAVE_QUERY_CACHE (which is always the case) to determine if 
  column level grants should be compiled or not.

  mysql-test/r/query_cache.result@1.101.1.3, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +0 -33
    Updated result file

  mysql-test/r/query_cache_notembedded.result@1.9.1.1, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +33 -0
    Updated result file

  mysql-test/t/query_cache.test@1.81.1.4, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +0 -39
    Moved test with GRANT to query_cache_notembedded test.

  mysql-test/t/query_cache_notembedded.test@1.8.1.1, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +36 -0
    Moved test with GRANT to query_cache_notembedded test.

  sql/sql_cache.cc@1.123.6.3, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +1 -1
    Changed the conditional compilation directive to only compile column level grant
    checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.

ChangeSet@1.2529.89.1, 2007-10-16 17:19:07+05:00, ramil@mysql.com +3 -0
  Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
  
  Problem: we don't evaluate given expression checking values of the
  slow_query_log_file/general_log_file, don't check it for NULL.
  
  Fix: evaluate the expression, check result returned.

  mysql-test/r/log_state.result@1.8, 2007-10-16 17:19:05+05:00, ramil@mysql.com +13 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test result.

  mysql-test/t/log_state.test@1.10, 2007-10-16 17:19:05+05:00, ramil@mysql.com +20 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test case.

  sql/set_var.cc@1.231.12.13, 2007-10-16 17:19:05+05:00, ramil@mysql.com +17 -6
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - evaluate var->value calling val_str() method;
      - check for null values returned;
      - return proper errors if any.

ChangeSet@1.2529.49.4, 2007-10-16 13:20:08+02:00, serg@janus.mylan +2 -0
  tests/mysql_client_test.c: typo fixed

  BitKeeper/etc/ignore@1.276.11.7, 2007-10-16 13:20:05+02:00, serg@janus.mylan +6 -0
    Added libmysql_r/client_settings.h libmysql_r/link_sources libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc sql/link_sources to the ignore list

  tests/mysql_client_test.c@1.245.10.1, 2007-10-16 13:20:04+02:00, serg@janus.mylan +1 -1
    typo fixed

ChangeSet@1.2529.34.10, 2007-10-16 15:22:44+05:00, bar@mysql.com +4 -0
  After merge fix:
  Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format

  mysql-test/r/ctype_uca.result@1.18.2.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_ucs.result@1.55.2.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_utf8.result@1.117.2.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/func_regexp.result@1.12.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

ChangeSet@1.2603.2.9, 2007-10-16 15:03:11+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/ctype_utf8.result@1.121.1.2, 2007-10-16 15:03:09+05:00, gluh@mysql.com +40 -2
    result fix

ChangeSet@1.2537.32.15, 2007-10-16 11:02:09+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31618 ndb_binlog_discover test failure
  - make sure all tables are inited before binlog thread may run

  sql/ha_ndbcluster_binlog.cc@1.90.1.53, 2007-10-16 11:02:07+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #31618 ndb_binlog_discover test failure
    - make sure all tables are inited before binlog thread may run

ChangeSet@1.2529.87.1, 2007-10-16 13:43:16+05:00, ramil@mysql.com +2 -0
  Fix for bug #31285: main.status test fails with different Table_locks_waited
  
  Problem: Table_locks_waited value may depend on general logging.
  
  Fix: switch general logging off.

  mysql-test/r/status.result@1.23, 2007-10-16 13:43:13+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

  mysql-test/t/status.test@1.31, 2007-10-16 13:43:14+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

ChangeSet@1.2603.1.20, 2007-10-15 19:25:32-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Disabled log_tables.test

  mysql-test/t/disabled.def@1.278.3.1, 2007-10-15 19:25:29-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
    Disabled log_tables.test

ChangeSet@1.1810.3371.5, 2007-10-15 19:15:38-06:00, malff@lambda.hsd1.co.comcast.net. +6 -0
  Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II
  
  The root cause of the issue was that the CREATE FUNCTION grammar,
  for User Defined Functions, was using the sp_name rule.
  The sp_name rule is intended for fully qualified stored procedure names,
  like either ident.ident, or just ident but with a default database
  implicitly selected.
  
  A UDF does not have a fully qualified name, only a name (ident), and should
  not use the sp_name grammar fragment during parsing.
  
  The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
  - creating UDF (no definer, can have AGGREGATE, simple ident)
  - creating Stored Functions (definer, no AGGREGATE, fully qualified name)
  
  With the test case provided, another issue was exposed which is also fixed:
  the DROP FUNCTION statement was using sp_name and also failing when no database
  is implicitly selected, when droping UDF functions.
  The fix is also to change the grammar so that DROP FUNCTION works with
  both the ident.ident syntax (to drop a stored function), or just the ident
  syntax (to drop either a UDF or a Stored Function, in the current database)

  mysql-test/r/sp-error.result@1.102.1.14, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/r/udf.result@1.3.4.2, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/t/sp-error.test@1.100.1.17, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +5 -2
    Adjust test results

  mysql-test/t/udf.test@1.8.3.2, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  sql/sql_parse.cc@1.426.165.4, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +0 -6
    CREATE UDF FUNCTION does not use a fully qualified name.

  sql/sql_yacc.yy@1.371.1.165, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +222 -190
    Fix grammar for CREATE / DROP FUNCTION, FOR udf
    Improve error messages for select no_such_function()

ChangeSet@1.2537.36.1, 2007-10-15 23:41:02+02:00, tomas@whalegate.ndb.mysql.com +5 -0
  Bug #31618 ndb_binlog_discover test failure
  - add additional flag ndb_binlog_is_ready to indicate that binlog has flushed old events and is ready to receive new ones

  mysql-test/suite/ndb/r/ndb_binlog_discover.result@1.8, 2007-10-15 23:40:59+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    Bug #31618 ndb_binlog_discover test failure
    - add select to ensure that data was inserted

  mysql-test/suite/ndb/t/ndb_binlog_discover.test@1.8, 2007-10-15 23:40:59+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    Bug #31618 ndb_binlog_discover test failure
    - add select to ensure that data was inserted

  sql/ha_ndbcluster.cc@1.480.7.2, 2007-10-15 23:40:59+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31618 ndb_binlog_discover test failure
    - add additional flag ndb_binlog_is_ready to indicate that binlog has flushed old events and is ready to receive new ones

  sql/ha_ndbcluster_binlog.cc@1.90.1.52, 2007-10-15 23:40:59+02:00, tomas@whalegate.ndb.mysql.com +8 -0
    Bug #31618 ndb_binlog_discover test failure
    - add additional flag ndb_binlog_is_ready to indicate that binlog has flushed old events and is ready to receive new ones

  sql/ha_ndbcluster_binlog.h@1.34.2.2, 2007-10-15 23:40:59+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #31618 ndb_binlog_discover test failure
    - add additional flag ndb_binlog_is_ready to indicate that binlog has flushed old events and is ready to receive new ones

ChangeSet@1.2588.3.66, 2007-10-15 17:11:56-04:00, jas@rowvwade. +1 -0
  Look up blob section before making a terrible mistake
  (Netfrastructure build specific).

  storage/falcon/Table.cpp@1.16, 2007-10-15 17:11:49-04:00, jas@rowvwade. +3 -0
    Look up blob section before making a terrible mistake
    (Netfrastructure build specific).

ChangeSet@1.2588.35.2, 2007-10-15 15:57:36-04:00, jas@rowvwade. +2 -0
  Make all perform log info "LogInfo".

  storage/falcon/Cache.cpp@1.18, 2007-10-15 15:57:28-04:00, jas@rowvwade. +2 -2
    Make all perform log info "LogInfo".

  storage/falcon/SerialLog.cpp@1.12, 2007-10-15 15:57:29-04:00, jas@rowvwade. +1 -1
    Make all perform log info "LogInfo".

ChangeSet@1.2529.50.5, 2007-10-15 15:53:39-04:00, dkatz@damien-katzs-computer.local +1 -0
  fix problem caused by previous submission for bugs BUG#29589 BUG#29772 

  sql/set_var.cc@1.231.23.2, 2007-10-15 15:53:37-04:00, dkatz@damien-katzs-computer.local +32 -209
    fix problem caused by previous submission

ChangeSet@1.2588.35.1, 2007-10-15 15:44:54-04:00, jas@rowvwade. +6 -0
  Preface each runtime statistic log line with the delta time
  from server startup to aid benchmark analysis.

  storage/falcon/Cache.cpp@1.17, 2007-10-15 15:44:36-04:00, jas@rowvwade. +6 -4
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

  storage/falcon/Database.cpp@1.15.1.1, 2007-10-15 15:44:37-04:00, jas@rowvwade. +4 -2
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

  storage/falcon/Database.h@1.11, 2007-10-15 15:44:37-04:00, jas@rowvwade. +15 -13
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

  storage/falcon/Dbb.cpp@1.8, 2007-10-15 15:44:38-04:00, jas@rowvwade. +1 -1
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

  storage/falcon/SerialLog.cpp@1.11, 2007-10-15 15:44:38-04:00, jas@rowvwade. +2 -2
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

  storage/falcon/TransactionManager.cpp@1.6, 2007-10-15 15:44:38-04:00, jas@rowvwade. +2 -2
    Preface each runtime statistic log line with the delta time
    from server startup to aid benchmark analysis.

ChangeSet@1.1810.3366.2, 2007-10-15 19:59:14+02:00, joerg@trift2. +1 -0
  Allow for different directories containing the "libc",
  as it may well happen with 32- vs 64-bit Linux systems.
  
  This patch was proposed immediately with the report of
  Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

  configure.in@1.245.103.2, 2007-10-15 19:59:10+02:00, joerg@trift2. +1 -1
    Allow for different directories containing the "libc",
    as it may well happen with 32- vs 64-bit Linux systems.
    
    This patch was proposed immediately with the report of
    Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

ChangeSet@1.2529.61.11, 2007-10-15 19:56:24+03:00, gkodinov@magare.gmz +2 -0
  Bug #27099: system_mysql fail in pushbuild windows
  
  On Windows the debug log was doing freopen () instead of
  fflush() and that was slowing the logging down that much 
  that some tests timed out.
  Fixed by replacing the freopen() with an syncing-to-disk
  flag to fopen() and fflush().
  Also increased the timeout of the tests running with --debug
  on windows : seems to slow down as much as valgrind on linux.

  dbug/dbug.c@1.39, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +10 -18
    Bug #27099: remove the freopen() for the 
    windows log : too slow. Replace it with the "c" option
    for fopen().

  mysql-test/mysql-test-run.pl@1.122.101.2, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +2 -0
    Bug #27099: on windows debug log seems to slow the tests
    down about as much as valgrind does on linux.

ChangeSet@1.2529.1.50, 2007-10-15 17:04:43+02:00, mleich@four.local.lan +2 -0
  Fix for
  Bug#31169 Test case does not check whether configuration contains feature tested

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.6, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

  mysql-test/suite/rpl/t/rpl_innodb_bug30919.test@1.3, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

ChangeSet@1.2588.3.65, 2007-10-15 10:47:58-04:00, jas@rowvwade. +2 -0
  Bring Netfrastructure build up to rev.

  storage/falcon/Database.cpp@1.16, 2007-10-15 10:47:51-04:00, jas@rowvwade. +2 -0
    Bring Netfrastructure build up to rev.

  storage/falcon/Engine.vcproj@1.2, 2007-10-15 10:47:51-04:00, jas@rowvwade. +38 -2
    Bring Netfrastructure build up to rev.

ChangeSet@1.2588.3.64, 2007-10-15 10:45:04-04:00, jas@fluffy.netfrastructure.com +1 -0
  Initial checkin.

  storage/falcon/Engine.vcproj@1.1, 2007-10-15 10:44:19-04:00, jas@fluffy.netfrastructure.com +9161 -0
    BitKeeper file /home/mysql/mysql-6.0-nfs/storage/falcon/Engine.vcproj

  storage/falcon/Engine.vcproj@1.0, 2007-10-15 10:44:19-04:00, jas@fluffy.netfrastructure.com +0 -0

ChangeSet@1.2588.3.63, 2007-10-15 09:58:05-04:00, jas@rowvwade. +1 -0
  Fix slightly ambiguous call.

  storage/falcon/Table.cpp@1.15, 2007-10-15 09:57:59-04:00, jas@rowvwade. +1 -1
    Fix slightly ambiguous call.

ChangeSet@1.1810.3386.1, 2007-10-15 18:40:58+05:00, gluh@mysql.com +5 -0
  Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
  issue an error if string has illegal characters

  mysql-test/r/ctype_utf8.result@1.85.11.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -32
    issue an error if string has illegal characters

  mysql-test/t/ctype_utf8.test@1.84.10.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -0
    issue an error if string has illegal characters

  sql/item.cc@1.113.100.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +9 -3
    issue an error if string has illegal characters

  sql/item.h@1.183.41.1, 2007-10-15 18:40:57+05:00, gluh@mysql.com +1 -1
    issue an error if string has illegal characters

  sql/sql_yacc.yy@1.371.128.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +5 -10
    issue an error if string has illegal characters

ChangeSet@1.2403.59.1, 2007-10-15 14:55:19+02:00, tulin@mysql.com +1 -0
  configure.in:
    bump up version

  configure.in@1.330.75.20, 2007-10-15 14:54:56+02:00, tulin@mysql.com +2 -2
    bump up version

ChangeSet@1.2537.34.1, 2007-10-15 14:54:48+02:00, tulin@mysql.com +1 -0
  bump up version

  configure.in@1.330.114.6, 2007-10-15 14:54:44+02:00, tulin@mysql.com +2 -2
    bump up version

ChangeSet@1.2529.53.25, 2007-10-15 16:42:41+04:00, kostja@bodhi.(none) +2 -0
  Add comments, tidy up sql_delete.cc to refer to thd->row_count_func 
  explicitly.

  sql/sql_class.cc@1.346.2.3, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +12 -0
    Add comments.

  sql/sql_delete.cc@1.204.18.1, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +4 -4
    Change syntax to make grepping easier. No semantical change.

ChangeSet@1.2529.53.24, 2007-10-15 15:49:16+04:00, kostja@bodhi.(none) +1 -0
  Fix broken compilation.

  sql/net_serv.cc@1.115, 2007-10-15 15:49:05+04:00, kostja@bodhi.(none) +1 -1
    Fix the build I broke by the previous change.

ChangeSet@1.2529.53.23, 2007-10-15 15:45:20+04:00, kostja@bodhi.(none) +2 -0
  Remove an unused variable that was there since the first implementation
  of the stored procedure cursors (materialized on disk).

  include/mysql_com.h@1.122.2.2, 2007-10-15 15:45:15+04:00, kostja@bodhi.(none) +1 -1
    Remove an unused variable.

  sql/protocol.cc@1.129.2.1, 2007-10-15 15:45:16+04:00, kostja@bodhi.(none) +1 -1
    net->no_send_eof was not used anywhere.

ChangeSet@1.2537.32.10, 2007-10-15 11:26:11+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - 51-ndb -> 6.2 post merge bug#31482
    also fix NdbRecord code path

  storage/ndb/src/ndbapi/NdbReceiver.cpp@1.33, 2007-10-15 11:26:08+02:00, jonas@perch.ndb.mysql.com +1 -1
    post merge

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.94, 2007-10-15 11:26:08+02:00, jonas@perch.ndb.mysql.com +7 -1
    post merge

ChangeSet@1.2529.84.2, 2007-10-15 09:17:15+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - reenable disabled testcases
    ndb_load
    ndb_dd_sql_features

  mysql-test/suite/ndb/t/disabled.def@1.3.1.3, 2007-10-15 09:17:12+02:00, jonas@perch.ndb.mysql.com +0 -3
    reenable disabled testcases

ChangeSet@1.2529.84.1, 2007-10-15 09:10:14+02:00, jonas@perch.ndb.mysql.com +17 -0
  ndb - bug#31482
    (re)impl. simple-read (read that releases lock just before LQHKEYCONF)
    use simple-read for blobs

  storage/ndb/include/kernel/signaldata/TcKeyConf.hpp@1.7.1.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    rename bit

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.7.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -1
    add new lock-mode

  storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp@1.4.1.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -2
    rename bit

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.58.1.14, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove aggregate

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.129.1.38, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +48 -28
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.47.1.12, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +4 -8
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.2.25, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +107 -92
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.55.2.4, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    use simple read for blobs

  storage/ndb/src/ndbapi/NdbIndexOperation.cpp@1.28.1.4, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -0
    no simple-read for ui (yet)

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.28.2.4, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +33 -29
    impl. simple-read

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.23.4.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -9
    impl. simple-read

  storage/ndb/src/ndbapi/NdbReceiver.cpp@1.19.2.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    impl. simple-read

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.103.4.15, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -0
    no simple-read for scan (yet)

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.66.5.6, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -3
    rename bit

  storage/ndb/test/ndbapi/testBasic.cpp@1.17.1.8, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +13 -22
    add testcase for simlpe-read

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.1.46, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -0
    add testcase

  storage/ndb/test/src/HugoOperations.cpp@1.35, 2007-10-15 09:10:11+02:00, jonas@perch.ndb.mysql.com +1 -0
    add simple-read

ChangeSet@1.1810.3375.2, 2007-10-15 10:34:34+04:00, kaa@polly.(none) +3 -0
  Fix for bug #30453: String not cast to int correctly.
  
  Problem:
  
  my_strntoull10rnd_8bit() handled incorrectly cases when the input
  string contains a decimal point and is long enough to overrun the
  'unsigned long long' type. The position of the decimal point was not
  taken into account which resulted in miscalculated numbers and
  truncation to appropriate SQL data type limits.
  
  Solution:
  
  Fix my_strntoull10rnd_8bit() to take the position of a decimal point
  into account in such cases.

  mysql-test/r/insert.result@1.22.1.8, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #30453.

  mysql-test/t/insert.test@1.22.1.5, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #30453.

  strings/ctype-simple.c@1.75.4.1, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +9 -5
    In cases when the 'unsigned long long' type is overrun by the input
    string and a decimal point has occurred, adjust the 'shift' according to
    the position of the decimal point and skip all subsequent digits.

ChangeSet@1.1810.3340.4, 2007-10-15 10:11:52+05:00, holyfoot@mysql.com +1 -0
  bug #29801 Federated engine crashes local server
                 if remote server sends malicious response.
  
  We need to check if the SHOW TABLE STATUS query we issue inside the
  FEDERATED engine returned the result with the proper (or just sufficient)
  number of rows. Otherwise statements like row[12] can crash the server.

  sql/ha_federated.cc@1.24.30.1, 2007-10-15 10:11:50+05:00, holyfoot@mysql.com +6 -1
    bug #29801 Federated engine crashes local server
                   if remote server sends malicious response.
    
    Return with the error if the remote server return fewer rows than we need.

ChangeSet@1.2403.28.93, 2007-10-14 18:42:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testScan -n InsertDelete
  fix testcase

  storage/ndb/test/ndbapi/testScan.cpp@1.25, 2007-10-14 18:42:47+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix testcase

ChangeSet@1.2537.33.1, 2007-10-14 16:46:46+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  add assertion for not overrunning allocated buffer

  sql/ha_ndbcluster.cc@1.480.7.1, 2007-10-14 16:46:42+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    add assertion for not overrunning allocated buffer

ChangeSet@1.1810.3202.17, 2007-10-14 16:17:39+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - bug#29390: fix mem leak introduced in previous cset

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.9.1, 2007-10-14 16:15:43+02:00, pekka@sama.ndb.mysql.com +32 -0
    fix mem leak on discarded scanfilter

ChangeSet@1.1810.3374.6, 2007-10-14 11:28:43+03:00, gkodinov@magare.gmz +1 -0
  item_sum.cc:
    Fixed dbug macros usage errors

  sql/item_sum.cc@1.170.1.44, 2007-10-14 11:28:11+03:00, gkodinov@magare.gmz +3 -3
    Fixed dbug macros usage errors

ChangeSet@1.2529.62.5, 2007-10-13 23:12:50+03:00, aelkin@koti.dsl.inet.fi +11 -0
  manual merge for bug_29136, bug#29309.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.2, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +69 -5
    manual merge from 5.0

  mysql-test/r/innodb.result@1.165.15.8, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.52, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +21 -2
    results changed

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.25, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +53 -6
    manual merge: results re-recorded

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.51, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +53 -6
    results changed

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.2, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +23 -8
    results recorded for 5.1

  mysql-test/t/innodb.test@1.129.19.6, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +0 -39
    removing bug27716 regression test as one exists in binlog suite already.

  mysql-test/t/multi_update.test@1.58, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +6 -2
    manual merge plus refining for execution in both binlog_format.

  sql/log_event.cc@1.271.41.4, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +26 -2
    bloody manual merge;
    the fact that an event is artificial is encode with setting timestamp argument to zero.
    rli's last_master_timestamp won't be updated in stmt_done in such case.

  sql/rpl_rli.cc@1.14, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +9 -1
    simulation and the real fixing code.
    Don't update last_master_timestamp with zero.

  sql/sql_delete.cc@1.204.17.3, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +3 -3
    manual merge

ChangeSet@1.2603.2.6, 2007-10-13 18:47:36+04:00, sergefp@mysql.com +1 -0
  Disabled log_tables.test as it fails on windows (reported as bug no 31580)

  mysql-test/t/disabled.def@1.278.1.2, 2007-10-13 18:47:32+04:00, sergefp@mysql.com +1 -0
    Disabled log_tables.test as it fails on windows (reported as bug no 31580)

ChangeSet@1.1810.3336.10, 2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi +10 -0
  Bug #29136 erred multi-delete on trans table does not rollback the statement
  
  similar to bug_27716, but it was stressed on in the synopsis on that there is another
  side of the artifact affecting behaviour in transaction.
  
  Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
  to perform binlogging job if needed.
  
  The changeset includes the following side effects:
  - added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
  - fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.15.1, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +70 -6
    multi-update  and multi-delete of mixure of ta and not-ta tables tests added (relates to bug_23333).

  mysql-test/r/innodb.result@1.145.1.26, 2007-10-13 15:49:36+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.44.1.3, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +22 -2
    results changed

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.12.1, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +48 -4
    results changed

  mysql-test/t/innodb.test@1.118.2.18, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +32 -0
    trans table specific test added

  mysql-test/t/multi_update.test@1.48.1.3, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +34 -0
    testing another branch of mult-delete: send_eof() (binloggin there), send_error (early return)

  sql/sql_class.h@1.230.79.2, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +10 -0
    a new flag to designate the fact the statement's error has been handled.
    The flag is checked by ::send_error() methods (multi_update and _delete classes)

  sql/sql_delete.cc@1.144.1.57, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +25 -4
    expanding multi_delete::send_error to 
    1. early return if error_handled == t
    2. binlogging locally if there was a non-trans table modified side effect

  sql/sql_parse.cc@1.426.1.213, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +7 -0
    adding multi_update::send_error which can perform binlogging and rollback job in needed

  sql/sql_update.cc@1.154.2.70, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +11 -11
    issues relating to
     
    1. bug_27716 with zeroing of `updated' to serve as the flag of early return from send_error().
       The flag is changed to be a new member error_handled; also moved outside binlogging branch.
       The reason for this change is that bug_23333 fixes were pushed after the bug_27716's and they
       left this flaw (also no test coverage).
    2. bug_30763 with assertion on trans_safe. I decide to make 2 liner fix for that bug here instead of to remove
       those two assertions. This new bug test case is the same as for multi-update on the mixure of tables.
       The rational for this fix:
       presumption for mutli_update::trans_safe to be set to zero at
       multi_update::multi_update or multi_update::initialize_tables() is incorrect.
    
       trans_safe := false should happen only when a non-transactional table gets modified. 
       Therefore, at initialization the member must be be set to true.

ChangeSet@1.2588.3.61, 2007-10-12 17:43:48-04:00, jas@rowvwade. +2 -0
  Add a little more detail (physical writes) to cache flush statistics.

  storage/falcon/Cache.cpp@1.16, 2007-10-12 17:43:41-04:00, jas@rowvwade. +7 -3
    Add a little more detail (physical writes) to cache flush statistics.

  storage/falcon/Cache.h@1.8, 2007-10-12 17:43:41-04:00, jas@rowvwade. +1 -0
    Add a little more detail (physical writes) to cache flush statistics.

ChangeSet@1.2588.3.60, 2007-10-12 16:52:41-04:00, jas@rowvwade. +7 -0
  Work in progress on page write consolidation.

  storage/falcon/BDB.h@1.4, 2007-10-12 16:52:29-04:00, jas@rowvwade. +8 -5
    Added SyncObject to Bdb to prevent overlapping writes.

  storage/falcon/Cache.cpp@1.15, 2007-10-12 16:52:30-04:00, jas@rowvwade. +58 -11
    Work in progress on page write consolidation.

  storage/falcon/IO.cpp@1.10, 2007-10-12 16:52:30-04:00, jas@rowvwade. +21 -0
    Work in progress on page write consolidation.

  storage/falcon/IOx.h@1.6, 2007-10-12 16:52:30-04:00, jas@rowvwade. +1 -0
    Work in progress on page write consolidation.

  storage/falcon/SerialLog.cpp@1.10, 2007-10-12 16:52:31-04:00, jas@rowvwade. +0 -34
    Dead code elimination.

  storage/falcon/Synchronize.cpp@1.4, 2007-10-12 16:52:31-04:00, jas@rowvwade. +4 -0
    Make Synchronize::freeze, et al, conditional.

  storage/falcon/Synchronize.h@1.3, 2007-10-12 16:52:31-04:00, jas@rowvwade. +1 -1
    Make Synchronize::freeze, et al, conditional.

ChangeSet@1.2547.45.1, 2007-10-12 22:08:02+02:00, guilhem@gbichot4.local +2 -0
  Importing Serg's fixes to lf_alloc-pin (should fix a segfault
  of my_atomic-t in pushbuild).
  We forgot to inform my_atomic-t that we were using mutexes, causing
  the test to try to many iterations and time out in pushbuild.

  include/atomic/rwlock.h@1.5, 2007-10-12 22:07:48+02:00, guilhem@gbichot4.local +3 -0
    If we're using rwlocks because atomic ops are not supported, need to
    mark it as my_atomic-t tests it to know how many iterations it should do.

  mysys/lf_alloc-pin.c@1.3, 2007-10-12 22:07:48+02:00, guilhem@gbichot4.local +15 -10
       bugs/warnings fixed:
        1. available_stack_size() was getting the direction wrong,
           so alloca() was never used
        2. (char*) casts added to kill "break strict-aliasing rules" warnings
        3. s/node/node=0/ to kill "pointer casted to integer" warning
        4. added volatiles as appropriate to prevent gcc from moving
           assignment out of the loop, and fixing strict-aliasing problem
           with a union

ChangeSet@1.1810.3287.23, 2007-10-12 13:07:39-07:00, mtaylor@solace.(none) +45 -0
  Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion.

  BitKeeper/deleted/.del-README.debian@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/README.debian

  BitKeeper/deleted/.del-aa@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/aa

  BitKeeper/deleted/.del-ab@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ab

  BitKeeper/deleted/.del-ac@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ac

  BitKeeper/deleted/.del-ad@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ad

  BitKeeper/deleted/.del-ae@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ae

  BitKeeper/deleted/.del-az@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/az

  BitKeeper/deleted/.del-changelog~8457b43736642c@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/changelog

  BitKeeper/deleted/.del-control@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/control

  BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/copyright

  BitKeeper/deleted/.del-gomi@1.3.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/gomi

  BitKeeper/deleted/.del-libmysqlclient10.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.dirs

  BitKeeper/deleted/.del-libmysqlclient10.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.postinst

  BitKeeper/deleted/.del-libmysqlclient9.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.dirs

  BitKeeper/deleted/.del-libmysqlclient9.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.postinst

  BitKeeper/deleted/.del-move@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/move

  BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/my.cnf

  BitKeeper/deleted/.del-mysql-bench.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-bench.dirs

  BitKeeper/deleted/.del-mysql-client.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-client.dirs

  BitKeeper/deleted/.del-mysql-dev.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-dev.dirs

  BitKeeper/deleted/.del-mysql-doc.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-doc.dirs

  BitKeeper/deleted/.del-mysql-max-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.dirs

  BitKeeper/deleted/.del-mysql-max-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postinst

  BitKeeper/deleted/.del-mysql-max-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postrm

  BitKeeper/deleted/.del-mysql-max-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.dirs

  BitKeeper/deleted/.del-mysql-max-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postinst

  BitKeeper/deleted/.del-mysql-max-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postrm

  BitKeeper/deleted/.del-mysql-max.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.dirs

  BitKeeper/deleted/.del-mysql-max.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postinst

  BitKeeper/deleted/.del-mysql-max.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postrm

  BitKeeper/deleted/.del-mysql-server-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.dirs

  BitKeeper/deleted/.del-mysql-server-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postinst

  BitKeeper/deleted/.del-mysql-server-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postrm

  BitKeeper/deleted/.del-mysql-server-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.dirs

  BitKeeper/deleted/.del-mysql-server-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postinst

  BitKeeper/deleted/.del-mysql-server-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postrm

  BitKeeper/deleted/.del-mysql-server.conffiles@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.conffiles

  BitKeeper/deleted/.del-mysql-server.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.dirs

  BitKeeper/deleted/.del-mysql-server.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postinst

  BitKeeper/deleted/.del-mysql-server.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postrm

  BitKeeper/deleted/.del-mysql-server.prerm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.prerm

  BitKeeper/deleted/.del-rules~2018e0de32c6d936@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/rules

  BitKeeper/deleted/.del-shlibs@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/shlibs

  BitKeeper/deleted/.del-ta@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ta

  BitKeeper/deleted/.del-tb@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/tb

ChangeSet@1.2588.34.1, 2007-10-12 12:10:57-05:00, klewis@klewis-mysql. +2 -0
  Fix options test cases to reflect new Falcon options.

  mysql-test/suite/falcon/r/falcon_options.result@1.2, 2007-10-12 12:10:37-05:00, klewis@klewis-mysql. +8 -0
    Fix options test cases to reflect new Falcon options.

  mysql-test/suite/falcon/r/falcon_options2.result@1.2, 2007-10-12 12:10:50-05:00, klewis@klewis-mysql. +4 -0
    Fix options test cases to reflect new Falcon options.

ChangeSet@1.2529.62.3, 2007-10-12 18:22:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on):
  Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
  the write bit has been set.

  sql/field.cc@1.402.1.17, 2007-10-12 18:22:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Setting bit in write set to prevent assertion from throwing when calling Field::store().

ChangeSet@1.2592.11.2, 2007-10-12 21:04:59+05:00, svoj@mysql.com +16 -0
  WL#3951 - MyISAM: Additional Error Logs for Data Corruption
  
  When table corruption is detected, in addition to current error message
  provide following information:
  - list of threads (and queries) accessing a table;
  - thread_id of a thread that detected corruption;
  - source file name and line number where this corruption was detected;
  - optional extra information (string).

  storage/myisam/CMakeLists.txt@1.9, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -1
    Added mi_extrafunc.h to myisam sources list.

  storage/myisam/Makefile.am@1.41, 2007-10-12 21:03:01+05:00, svoj@april.(none) +1 -1
    Added mi_extrafunc.h to myisam headers list.

  storage/myisam/ha_myisam.cc@1.226.1.1, 2007-10-12 21:03:01+05:00, svoj@april.(none) +40 -0
    Added _mi_report_crashed() function (reports additional information
    whenever table corruption is detected).

  storage/myisam/mi_extrafunc.h@1.1, 2007-10-12 21:03:01+05:00, svoj@april.(none) +21 -0
    New BitKeeper file ``storage/myisam/mi_extrafunc.h''

  storage/myisam/mi_extrafunc.h@1.0, 2007-10-12 21:03:01+05:00, svoj@april.(none) +0 -0

  storage/myisam/mi_locking.c@1.55, 2007-10-12 21:03:01+05:00, svoj@april.(none) +4 -0
    For every call to mi_lock_database(F_[RD|WR|EXTRA_]LCK) - add
    current thread to the list of threads accessing this table.
    
    For every call to mi_lock_database(F_UNLCK) - remove current
    thread from the list of threads accessing this table.

  storage/myisam/mi_test1.c@1.38, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/mi_test2.c@1.38.1.1, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/mi_test3.c@1.25, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/myisam_ftdump.c@1.46, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/myisamchk.c@1.129.1.1, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/myisamdef.h@1.104, 2007-10-12 21:03:01+05:00, svoj@april.(none) +6 -0
    Extra elements are added to MI_INFO and MYISAM_SHARE structures.
    MI_INFO is extended with LIST element, that holds a pointer to
    THD object accessing a table. MYISAM_SHARE is extended with LIST
    (list of threads accessing a table).
    
    Whenever table is marked as crashed, call mi_report_crashed() macro
    to provide useful information.

  storage/myisam/myisamlog.c@1.39, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/myisampack.c@1.67, 2007-10-12 21:03:01+05:00, svoj@april.(none) +1 -1
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/rt_test.c@1.19, 2007-10-12 21:03:01+05:00, svoj@april.(none) +2 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisam/sp_test.c@1.17, 2007-10-12 21:03:01+05:00, svoj@april.(none) +1 -0
    All standalone programs must define their version of _mi_report_crashed()
    by including mi_extrafunc.h.

  storage/myisammrg/ha_myisammrg.cc@1.125, 2007-10-12 21:03:01+05:00, svoj@april.(none) +3 -0
    For each unedrlying table initialize `in_use' variable.

ChangeSet@1.2588.3.58, 2007-10-12 09:18:14-05:00, klewis@klewis-mysql. +1 -0
  Fix compiler warnings in new purifier code

  storage/falcon/Cache.cpp@1.9.1.1, 2007-10-12 09:18:04-05:00, klewis@klewis-mysql. +4 -4
    Fix compiler warnings in new purifier code

ChangeSet@1.1810.3384.1, 2007-10-12 10:55:46-03:00, davi@moksha.com.br +1 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  If mysql_lock_tables fails because the lock was aborted, we need to
  reset thd->some_tables_delete, otherwise we might loop indefinitely
  because handler's tables are not closed in a standard way, meaning
  that close_thread_tables() (which resets some_tables_deleted) is not
  used.
  
  This patch fixes sporadical failures of handler_myisam/innodb tests
  which were introduced by previous fix for this bug.

  sql/sql_handler.cc@1.72.1.22, 2007-10-12 10:55:44-03:00, davi@moksha.com.br +6 -0
    Properly reset thd->some_tables_deleted if mysql_lock_tables
    fails for some reason.

ChangeSet@1.2588.33.1, 2007-10-12 17:46:21+04:00, sergefp@mysql.com +3 -0
  BUG#31563: Semi-joins: pullout of functionally-dependent tables is not transitive
  Make eq_ref-based table pull-out be transitive.

  mysql-test/r/subselect.result@1.188, 2007-10-12 17:46:17+04:00, sergefp@mysql.com +2 -2
    BUG#31563: Semi-joins: pullout of functionally-dependent tables is not transitive
    - update test results (and this is also bug testcase)

  mysql-test/r/subselect_sj.result@1.5, 2007-10-12 17:46:17+04:00, sergefp@mysql.com +3 -3
    BUG#31563: Semi-joins: pullout of functionally-dependent tables is not transitive
    - update test results (and this is also bug testcase)

  sql/sql_select.cc@1.556.7.1, 2007-10-12 17:46:17+04:00, sergefp@mysql.com +8 -5
    BUG#31563: Semi-joins: pullout of functionally-dependent tables is not transitive
    Make eq_ref-based table pull-out be transitive.
    - when calling find_eq_ref_table(), pass the bitmap of remaining 
      sj-inner tables, not of the tables that were originally sj-inner.
    - in select_describe(), in "Extra" column calculation, let examined_rows
      be of type double, because overwise we get bogus results caused by 
      rounding errors.

ChangeSet@1.1810.3382.1, 2007-10-12 14:03:51+04:00, kaa@polly.(none) +2 -0
  Fix for bug #31254: "Max_data_length" truncated / reported wrong
  (compiler issue ?)
  
  Problem:
  
  Improper compile-time flags on AIX prevented use of files > 2 GB. This
  resulted in Max_data_length being truncated to 2 GB by MyISAM code.
  
  Solution:
  
  Reverted large-file changes from the fix for bug10776. We need to define
  _LARGE_FILES on AIX to have support for files > 2 GB.
  
   Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
  automatically defined by including standards.h, we also need a
  workaround to avoid this conflict.

  config/ac-macros/large_file.m4@1.4, 2007-10-12 14:03:41+04:00, kaa@polly.(none) +9 -2
    Reverted large-file changes from the fix for bug10776. We need to define
    _LARGE_FILES on AIX to have support for files > 2 GB.

  include/my_global.h@1.96.14.5, 2007-10-12 14:03:42+04:00, kaa@polly.(none) +5 -0
    _LARGE_FILE_API is defined in standards.h that is automatically included
    by at least some C++ compilers on AIX. Since it is also incompatible
    with _LARGE_FILES which is required for POSIX IO calls to be
    largefile-safe, the only workaround is to explicitely #undef
    _LARGE_FILE_API.

ChangeSet@1.1810.3381.1, 2007-10-12 11:46:48+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#30951: makedate returns different results depending on version of mysql
  
  makedate() will fold years below 100 into the 1970-2069 range. CS removes code
  that also wrongly folded years between 100 and 200 into that range, which should
  be left unchanged. Backport from 5.1.

  mysql-test/r/func_sapdb.result@1.15.8.1, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Show that makedate() works correctly for 100 <= year < 200.

  mysql-test/t/func_sapdb.test@1.13.3.2, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Show that makedate() works correctly for 100 <= year < 200.

  sql-common/my_time.c@1.19.17.3, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +0 -5
    Remove unnecessary date magic. Syncs behaviour with 5.1+
    and manual.

ChangeSet@1.1810.3379.1, 2007-10-12 11:23:45+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method
  
  Options to mysqld were not processed correctly because switch statement
  was missing some "break"s. CS adds them.
  
  No test case; would require .opt file and server restart. Manually tested.

  sql/mysqld.cc@1.439.129.2, 2007-10-12 11:23:43+02:00, tnurnberg@sin.intern.azundris.com +2 -0
    Add missing "break"s to switch() in mysqld to fix option processing.

ChangeSet@1.1810.3287.22, 2007-10-12 02:15:32-07:00, mtaylor@solace.(none) +96 -0
  Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474@1.5, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/Makefile.am

  BitKeeper/deleted/.del-POTFILES.in.in@1.4, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/POTFILES.in.in

  BitKeeper/deleted/.del-README.Maintainer@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/README.Maintainer

  BitKeeper/deleted/.del-ca.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ca.po

  BitKeeper/deleted/.del-changelog@1.3.1.1, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/changelog

  BitKeeper/deleted/.del-compat@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/compat

  BitKeeper/deleted/.del-control.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/control.in

  BitKeeper/deleted/.del-copyright@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright

  BitKeeper/deleted/.del-copyright.more@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright.more

  BitKeeper/deleted/.del-cs.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/cs.po

  BitKeeper/deleted/.del-da.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/da.po

  BitKeeper/deleted/.del-de.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/de.po

  BitKeeper/deleted/.del-defs.mk.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/defs.mk.in

  BitKeeper/deleted/.del-es.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/es.po

  BitKeeper/deleted/.del-eu.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/eu.po

  BitKeeper/deleted/.del-fr.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/fr.po

  BitKeeper/deleted/.del-gl.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/gl.po

  BitKeeper/deleted/.del-it.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/it.po

  BitKeeper/deleted/.del-ja.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ja.po

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.examples.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in@1.2.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.links.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.README.Debian.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.postinst.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.files.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.links.in

  BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.README.Debian.in

  BitKeeper/deleted/.del-libndbclientNLIB.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.files.in

  BitKeeper/deleted/.del-libndbclientNLIB.postinst.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.postinst.in

  BitKeeper/deleted/.del-my.cnf@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/my.cnf

  BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-client-BASE.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-client-BASE.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.docs.in

  BitKeeper/deleted/.del-mysql-client-BASE.files.in@1.4.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.files.in

  BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-common.README.Debian.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.README.Debian.in

  BitKeeper/deleted/.del-mysql-common.dirs.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.dirs.in

  BitKeeper/deleted/.del-mysql-common.files.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.files.in

  BitKeeper/deleted/.del-mysql-common.postrm.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.postrm.in

  BitKeeper/deleted/.del-mysql-common.preinst.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.preinst.in

  BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-extra-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-management-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.mysql-management.init.in

  BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-server-BASE.config.in@1.5, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.config.in

  BitKeeper/deleted/.del-mysql-server-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-server-BASE.docs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.docs.in

  BitKeeper/deleted/.del-mysql-server-BASE.files.in@1.4.1.1, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.files.in

  BitKeeper/deleted/.del-mysql-server-BASE.links.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.links.in

  BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.server.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in

  BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.mysql-server.logrotate.in

  BitKeeper/deleted/.del-mysql-server-BASE.postinst.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.postrm.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postrm.in

  BitKeeper/deleted/.del-mysql-server-BASE.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.preinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.prerm.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.prerm.in

  BitKeeper/deleted/.del-mysql-server-BASE.templates.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.templates.in

  BitKeeper/deleted/.del-mysql-server-PREV.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-PREV.preinst.in

  BitKeeper/deleted/.del-mysql-server.lintian-overrides@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/mysql-server.lintian-overrides

  BitKeeper/deleted/.del-mysql-server.preinst.in@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server.preinst.in

  BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-storage-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.files.in

  BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.mysql-storage.init.in

  BitKeeper/deleted/.del-mysql-test-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-test-BASE.files.in@1.2.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.files.in

  BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-tools-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.files.in

  BitKeeper/deleted/.del-nb.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nb.po

  BitKeeper/deleted/.del-ndb_mgmd.cnf@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/ndb_mgmd.cnf

  BitKeeper/deleted/.del-nl.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nl.po

  BitKeeper/deleted/.del-pt.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt.po

  BitKeeper/deleted/.del-pt_BR.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt_BR.po

  BitKeeper/deleted/.del-ro.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ro.po

  BitKeeper/deleted/.del-ru.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ru.po

  BitKeeper/deleted/.del-rules@1.5.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/rules

  BitKeeper/deleted/.del-source.lintian-overrides.in@1.4, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/source.lintian-overrides.in

  BitKeeper/deleted/.del-sv.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/sv.po

  BitKeeper/deleted/.del-templates.pot@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/templates.pot

  BitKeeper/deleted/.del-tr.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/tr.po

  BitKeeper/deleted/.del-watch@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/watch

  Makefile.am@1.68.1.40, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +1 -2
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  configure.in@1.245.1.214, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +0 -1
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

ChangeSet@1.2529.71.1, 2007-10-12 01:16:55-07:00, mtaylor@solace.(none) +1 -0
  Fixed a typo. We have NdbTransactions not NdbTransations. 

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.6.1, 2007-10-12 01:16:54-07:00, mtaylor@solace.(none) +1 -1
    Fixed a typo. We have NdbTransactions not NdbTransations. 

ChangeSet@1.2529.35.16, 2007-10-12 00:46:51-07:00, mtaylor@solace.(none) +1 -0
  Fixed a typo. We have NdbTransactions not NdbTransations. 

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.5.5, 2007-10-12 00:46:49-07:00, mtaylor@solace.(none) +1 -1
    Fixed a typo. We have NdbTransactions not NdbTransations. 

ChangeSet@1.2529.35.15, 2007-10-12 00:10:07-07:00, mtaylor@solace.(none) +3 -0
  Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.5.4, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +1 -2
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.12, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +2 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.52.4.2, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +3 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

ChangeSet@1.2529.70.1, 2007-10-11 23:46:25-07:00, mtaylor@solace.(none) +6 -0
  Fixed header to reflect the implementation. 
  Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.5.3, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +3 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbPool.hpp@1.4, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +2 -1
    Fixed header to reflect the implementation. 

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.11, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +1 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.52.4.1, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +7 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbOperation.cpp@1.19.1.5, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +6 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@1.17, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +4 -0
    Added accessor method to help out the NDB/Connectors.

ChangeSet@1.2603.4.5, 2007-10-11 18:17:20-06:00, tsmith@ramayana.hindu.god +2 -0
  Fix result sets for two windows-only tests (very much post-merge).

  mysql-test/r/named_pipe.result@1.3, 2007-10-11 18:17:19-06:00, tsmith@ramayana.hindu.god +26 -26
    Update result set, due to changes in Multi Range Read implementation
    (WL 2474, WL 2475; see ChangeSet 1.2409.89.12 2007/03/10 sergefp).
    
    And, due to WL 3736 (see ChangeSet 1.2482.20.8 2007/06/18 ymatsunobu)

  mysql-test/r/shm.result@1.6, 2007-10-11 18:17:19-06:00, tsmith@ramayana.hindu.god +26 -26
    Update result set, due to changes in Multi Range Read implementation
    (WL 2474, WL 2475; see ChangeSet 1.2409.89.12 2007/03/10 sergefp).
    
    And, due to WL 3736 (see ChangeSet 1.2482.20.8 2007/06/18 ymatsunobu)

ChangeSet@1.2528.235.1, 2007-10-11 17:55:18-06:00, malff@weblab.(none) +3 -0
  Bug#27858 (Failing to log to a log table doesn't log anything to error log)
  
  Before this patch, failures to write to the log tables (mysql.slow_log
  and mysql.general_log) were improperly printed (the time was printed twice),
  or not printed at all.
  
  With this patch, failures to write to the log tables is reported in the
  error log, for all cases of failures.

  mysql-test/r/log_tables.result@1.21.1.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +4 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  mysql-test/t/log_tables.test@1.20, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +56 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  sql/log.cc@1.297.1.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +21 -22
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

ChangeSet@1.2588.31.5, 2007-10-11 18:37:52-04:00, jas@rowvwade. +3 -0
  Fix computation of number of record locator pages in 
  database analysis tool.

  storage/falcon/Dbb.cpp@1.7, 2007-10-11 18:37:44-04:00, jas@rowvwade. +1 -1
    Fix computation of number of record locator pages in 
    database analysis tool.

  storage/falcon/Dbb.h@1.3, 2007-10-11 18:37:45-04:00, jas@rowvwade. +1 -1
    Fix computation of number of record locator pages in 
    database analysis tool.

  storage/falcon/SectionPage.cpp@1.2, 2007-10-11 18:37:45-04:00, jas@rowvwade. +1 -1
    Fix computation of number of record locator pages in 
    database analysis tool.

ChangeSet@1.2547.44.1, 2007-10-11 18:26:57-04:00, cbell@mysql_cab_desk. +1 -0
  Correct problem for Windows (and other OSes) that cannot compile the DBUG_ENTER macro
  unless it is the first call in a method.

  libmysql/libmysql.c@1.290.7.1, 2007-10-11 18:26:47-04:00, cbell@mysql_cab_desk. +2 -2
    Correct problem for Windows (and other OSes) that cannot compile the DBUG_ENTER macro
    unless it is the first call in a method.

ChangeSet@1.2588.31.4, 2007-10-11 17:16:06-04:00, jas@rowvwade. +3 -0
  Fix table analysis function to handle table spaces.

  storage/falcon/Cache.cpp@1.13, 2007-10-11 17:15:58-04:00, jas@rowvwade. +3 -4
    Print finer cache flush statistics.

  storage/falcon/Database.cpp@1.13.1.3, 2007-10-11 17:15:58-04:00, jas@rowvwade. +11 -4
    Fix table analysis function to handle table spaces.

  storage/falcon/Dbb.cpp@1.6, 2007-10-11 17:15:59-04:00, jas@rowvwade. +2 -2
    Fix table analysis function to handle table spaces.

ChangeSet@1.2529.53.20, 2007-10-11 17:38:40-03:00, davi@moksha.com.br +4 -0
  Bug#29223 declare cursor c for SHOW .....
  
  "DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work,
  but is untested for some SHOW commands and does not work for other SHOW
  commands.
  
  Since this is an un-intended feature that leaked as a result of a coding bug
  (in the parser grammar), the correct fix is to fix the grammar to not accept
  this construct.
  
  In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>"
  is not considered a bug, and we will not implement other features to make all
  the SHOW commands usable inside a cursor just because someone exploited a bug.

  mysql-test/r/sp-error.result@1.125.1.5, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +20 -1
    Only allow declaring cursors for SELECT statements to avoid
    possible further confusion/problems.

  mysql-test/t/information_schema.test@1.100.3.1, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +1 -1
    Only SELECT statements are allowed in cursors.

  mysql-test/t/sp-error.test@1.122.1.4, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +22 -1
    Add test case for Bug#29223. Non-SELECT statements in cursors now
    yields a parser error.

  sql/sql_yacc.yy@1.458.141.5, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +3 -15
    Rework DECLARE CURSOR statement to not allow non-SELECT statements.

ChangeSet@1.2588.31.3, 2007-10-11 15:23:28-04:00, jas@rowvwade. +2 -0
  Report possible page runs from Cache::flush.  Maybe we'll
  learn someting.

  storage/falcon/Cache.cpp@1.12, 2007-10-11 15:23:21-04:00, jas@rowvwade. +60 -13
    Report possible page runs from Cache::flush.  Maybe we'll
    learn someting.

  storage/falcon/Cache.h@1.7, 2007-10-11 15:23:21-04:00, jas@rowvwade. +5 -2
    Report possible page runs from Cache::flush.  Maybe we'll
    learn someting.

ChangeSet@1.2529.1.49, 2007-10-11 19:39:18+02:00, mleich@four.local.lan +7 -0
  Fix for
  Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
  = Adjust the files with expected results 

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.2.1.2, 2007-10-11 19:39:15+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.3.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.2.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.2.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.3.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.2.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.2.1.2, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

ChangeSet@1.2588.3.56, 2007-10-11 12:06:24-05:00, klewis@klewis-mysql. +1 -0
  Merge corrections

  storage/falcon/ha_falcon.cpp@1.9, 2007-10-11 12:06:08-05:00, klewis@klewis-mysql. +0 -3
    Merge corrections

ChangeSet@1.2528.234.1, 2007-10-11 18:18:05+02:00, mats@kindahl-laptop.dnsalias.net +20 -0
  BUG#29549 (Endians: test failures on Solaris):
  
  Refactoring code to add parameter to pack() and unpack() functions with
  purpose of indicating if data should be packed in little-endian or
  native order. Using new functions to always pack data for binary log
  in little-endian order. The purpose of this refactoring is to allow
  proper implementation of endian-agnostic pack() and unpack() functions.
  
  Eliminating several versions of virtual pack() and unpack() functions
  in favor for one single virtual function which is overridden in
  subclasses.
  
  Implementing pack() and unpack() functions for some field types that
  packed data in native format regardless of the value of the
  st_table_share::db_low_byte_first flag.
  
  The field types that were packed in native format regardless are:
  Field_real, Field_decimal, Field_tiny, Field_short, Field_medium,
  Field_long, Field_longlong, and Field_blob.
  
  Before the patch, row-based logging wrote the rows incorrectly on
  big-endian machines where the storage engine defined its own
  low_byte_first() to be FALSE on big-endian machines (the default
  is TRUE), while little-endian machines wrote the fields in correct
  order. The only known storage engine that does this is NDB. In effect,
  this means that row-based replication from or to a big-endian
  machine where the table was using NDB as storage engine failed if the
  other engine was either non-NDB or on a little-endian machine.
  
  With this patch, row-based logging is now always done in little-endian
  order, while ORDER BY uses the native order if the storage engine
  defines low_byte_first() to return FALSE for big-endian machines.
  
  In addition, the max_data_length() function available in Field_blob
  was generalized to the entire Field hierarchy to give the maximum
  number of bytes that Field::pack() will write.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.2.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Result change.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2.2.1, 2007-10-11 18:17:55+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Sorting by columns that produces deterministic order.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.8.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Enabling tests.

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@1.8, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding missing sync_slave_with_master causing slave to keep tables
    after shutdown.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.4.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Enabling tests.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test@1.4.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Adding have_log_bin.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test@1.4.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +5 -2
    Adding have_log_bin

  mysql-test/t/partition.test@1.62.4.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding have_archive, since that is used in the test.

  sql/field.cc@1.402.24.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +263 -144
    Eliminating all two-argument pack() and unpack() functions and moving
    functionality into the four-argument version. The four argument version
    is introduced so that it is possible to avoid using the storage engine
    default when writing and reading the packed format (the unpacked format
    still uses the storage engine's default). This is used by row-based
    replication to write the fields in a storage engine- and endian-agnostic
    format.
    
    Packing integral and floating-point numbers in little-endian format
    (if requested).
    
    Using pad_char for the field instead of spaces (0x20) when unpacking.
    
    Adding some Doxygen documentation.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.
    
    Adding casts to remove warnings for debug printouts.

  sql/field.h@1.225.24.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +231 -40
    Eliminating all virtual pack() and unpack() functions except the four-
    argument version, which now is the function that shall be overridden.
    The two-argument versions are convenience functions, to prevent changes
    to code that uses these.
    
    Adding code to pack integer numbers and floating-point numbers in
    little-endian format, if requested.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.

  sql/log.cc@1.293.3.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing debug printout causing crash when starting NDB on Solaris.

  sql/log_event.cc@1.271.42.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Adding missing #ifndef causing compile failure. Adding debug printouts.

  sql/rpl_record.cc@1.7.3.2, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +22 -32
    Debriding code. Using new pack() and unpack() functions to always pack
    fields little-endian. Adding debug printouts.
    ---
    Using max_data_length() when packing field into row.
    
    Adding casts to debug printouts.

  sql/sql_show.cc@1.415.16.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +4 -2
    Adding code that causes crash on Solaris machines since printf() cannot
    handle NULL values for strings properly.

ChangeSet@1.2588.31.2, 2007-10-11 10:32:43-04:00, jas@rowvwade. +8 -0
  Changed serial log checkpoint order of battle to accomodate
  synchronous flushes.

  storage/falcon/Cache.cpp@1.11, 2007-10-11 10:32:33-04:00, jas@rowvwade. +4 -3
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/Cache.h@1.6, 2007-10-11 10:32:33-04:00, jas@rowvwade. +5 -5
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/Database.cpp@1.13.1.2, 2007-10-11 10:32:33-04:00, jas@rowvwade. +10 -5
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/Database.h@1.8.1.2, 2007-10-11 10:32:34-04:00, jas@rowvwade. +2 -2
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/Dbb.cpp@1.5, 2007-10-11 10:32:34-04:00, jas@rowvwade. +1 -1
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/SerialLog.cpp@1.9, 2007-10-11 10:32:34-04:00, jas@rowvwade. +25 -17
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/SerialLog.h@1.3, 2007-10-11 10:32:35-04:00, jas@rowvwade. +1 -1
    Changed serial log checkpoint order of battle to accomodate
    synchronous flushes.

  storage/falcon/Transaction.cpp@1.6.1.1, 2007-10-11 10:32:35-04:00, jas@rowvwade. +1 -0
    Trivial edit for consistency.

ChangeSet@1.2529.69.1, 2007-10-11 15:28:10+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    decrease test time

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.1.44, 2007-10-11 15:28:07+02:00, jonas@perch.ndb.mysql.com +1 -1
    decrease test time

ChangeSet@1.2529.53.19, 2007-10-11 17:11:12+04:00, anozdrin@station. +2 -0
  A patch for BUG#31418: User locks misfunctioning after
  mysql_change_user().
  
  The problem was that THD::ull was not reset in THD::cleanup().
  
  The fix is to reset it.

  sql/sql_class.cc@1.346.2.2, 2007-10-11 17:11:10+04:00, anozdrin@station. +1 -0
    Reset THD::ull after cleanup to prevent memory corruption.

  tests/mysql_client_test.c@1.245.7.4, 2007-10-11 17:11:10+04:00, anozdrin@station. +134 -32
    Add test case for BUG#31418.

ChangeSet@1.2588.3.54, 2007-10-11 07:57:56-05:00, klewis@klewis-mysql. +8 -0
  DeferredIndex Hash implementation.  Commented lines are also included
  which allow multiple hash sizes to be used.  The active current code
  uses only size 1007.  
  Also, there is a race condition in this code suce that on pushbuild,
  where a RAMFS is used, the system crashes somewhere.  To prevent that,
  the current code searches both the hash and the DeferredIndexes.  
  It should do one or the other.

  storage/falcon/DeferredIndex.cpp@1.2, 2007-10-11 07:56:56-05:00, klewis@klewis-mysql. +29 -2
    DeferredIndex Hash implementation. 

  storage/falcon/DeferredIndex.h@1.2, 2007-10-11 07:57:22-05:00, klewis@klewis-mysql. +8 -1
    DeferredIndex Hash implementation.

  storage/falcon/Index.cpp@1.3, 2007-10-11 07:57:38-05:00, klewis@klewis-mysql. +241 -9
    DeferredIndex Hash implementation.   Commented lines are also included
    which allow multiple hash sizes to be used.  The active current code
    uses only size 1007.  
    Also, there is a race condition in this code suce that on pushbuild,
    where a RAMFS is used, the system crashes somewhere.  To prevent that,
    the current code searches both the hash and the DeferredIndexes.  
    It should do one or the other.

  storage/falcon/Index.h@1.2, 2007-10-11 07:57:40-05:00, klewis@klewis-mysql. +18 -2
    DeferredIndex Hash implementation.   Commented lines are also included
    which allow multiple hash sizes to be used.  The active current code
    uses only size 1007.  
    .

  storage/falcon/IndexKey.cpp@1.2, 2007-10-11 07:57:43-05:00, klewis@klewis-mysql. +14 -18
    DeferredIndex Hash implementation.

  storage/falcon/IndexKey.h@1.2, 2007-10-11 07:57:45-05:00, klewis@klewis-mysql. +1 -0
    DeferredIndex Hash implementation.

  storage/falcon/NBitmap.cpp@1.2, 2007-10-11 07:57:48-05:00, klewis@klewis-mysql. +1 -1
    DeferredIndex Hash implementation.

  storage/falcon/Table.cpp@1.14, 2007-10-11 07:57:50-05:00, klewis@klewis-mysql. +2 -2
    DeferredIndex Hash implementation.

ChangeSet@1.2403.28.92, 2007-10-11 14:54:05+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31525
    Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.2.3, 2007-10-11 14:54:02+02:00, jonas@perch.ndb.mysql.com +4 -1
    add new error codes for bug#31525

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.96.7.10, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add new error codes for bug#31525
    fix bug, i.e include missing_2 in LCP

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.36.2.13, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +77 -0
    add testcase for bug#31525

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.4.11, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase for bug#31525

ChangeSet@1.2588.3.53, 2007-10-11 07:50:21-05:00, klewis@klewis-mysql. +1 -0
  SRLUpdateIndex::append is missing a lock on Log::syncIndexes
  and can cause a very rare crash, which I happened upon once.

  storage/falcon/SRLUpdateIndex.cpp@1.2, 2007-10-11 07:50:14-05:00, klewis@klewis-mysql. +3 -0
    SRLUpdateIndex::append is missing a lock on Log::syncIndexes
    and can cause a very rare crash, which I happened upon once.

ChangeSet@1.2588.3.52, 2007-10-11 07:39:30-05:00, klewis@klewis-mysql. +2 -0
  DeferredIndexes are not released when a transaction rolls back.  
  They are just emptied.  This code introduces functions to release
  a deferredIndex and calls them in the three previous locations,
  and also now calls them from Transaction::rollback() and
  Transaction::commitNoUpdates().  This also should quicken the pace
  of updates since it does not have to lookup and detach each DINode.
  

  storage/falcon/Transaction.cpp@1.7, 2007-10-11 07:39:20-05:00, klewis@klewis-mysql. +43 -27
    DeferredIndexes are not released when a transaction rolls back.  
    They are just emptied.  This code introduces functions to release
    a deferredIndex and calls them in the three previous locations,
    and also now calls them from Transaction::rollback() and
    Transaction::commitNoUpdates().  This also should quicken the pace
    of updates since it does not have to lookup and detach each DINode.
    

  storage/falcon/Transaction.h@1.4, 2007-10-11 07:39:25-05:00, klewis@klewis-mysql. +2 -0
    DeferredIndexes are not released when a transaction rolls back.  
    They are just emptied.  This code introduces functions to release
    a deferredIndex and calls them in the three previous locations,
    and also now calls them from Transaction::rollback() and
    Transaction::commitNoUpdates().  This also should quicken the pace
    of updates since it does not have to lookup and detach each DINode.
    

ChangeSet@1.2588.3.51, 2007-10-11 07:25:52-05:00, klewis@klewis-mysql. +1 -0
  Fix compiler warnings.  
  In delete_file, always return success unless the error is 
  StorageErrorUncommittedUpdates.  This way, the server can
  ask Falcon to delete a file that Falcon has already deleted, 
  and no errors are returned. This helps to get pushbuild green.

  storage/falcon/ha_falcon.cpp@1.7, 2007-10-11 07:23:04-05:00, klewis@klewis-mysql. +3 -5
    Fix compiler warnings.  
    In delete_file, always return success unless the error is 
    StorageErrorUncommittedUpdates.  This way, the server can
    ask Falcon to delete a file that Falcon has already deleted, 
    and no errors are returned. This helps to get pushbuild green.

ChangeSet@1.1810.3360.5, 2007-10-11 17:20:34+05:00, ramil@mysql.com +3 -0
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
  
  Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
  which are constructed using a temporary table fields,
  see Item_func_group_concat::setup().
  As a) we don't store null bits in the tree where the bit fields store parts 
  of their data and b) there's no method to properly compare two table records
  we've got problem.
  
  Fix: convert BIT fields to INT in the temporary table used.

  mysql-test/r/func_gconcat.result@1.52.1.20, 2007-10-11 17:20:32+05:00, ramil@mysql.com +42 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test result.

  mysql-test/t/func_gconcat.test@1.44.1.15, 2007-10-11 17:20:32+05:00, ramil@mysql.com +28 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test case.

  sql/item_sum.cc@1.170.28.1, 2007-10-11 17:20:32+05:00, ramil@mysql.com +25 -6
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - force the create_tmp_table() to convert BIT columns to INT 
        in order to be able to compare records containing BIT fields.

ChangeSet@1.2588.3.50, 2007-10-11 07:12:16-05:00, klewis@klewis-mysql. +9 -0
  Cleanup

  storage/falcon/IndexRootPage.cpp@1.2, 2007-10-11 07:11:36-05:00, klewis@klewis-mysql. +0 -1
    Cleanup

  storage/falcon/JString.cpp@1.3, 2007-10-11 07:11:40-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/MemMgr.cpp@1.7, 2007-10-11 07:11:51-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/RoleModel.cpp@1.2, 2007-10-11 07:11:57-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/SRLDeleteIndex.cpp@1.2, 2007-10-11 07:11:59-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/SequenceManager.cpp@1.2, 2007-10-11 07:12:01-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/SerialPipe.cpp@1.2, 2007-10-11 07:12:03-05:00, klewis@klewis-mysql. +4 -4
    Cleanup

  storage/falcon/StorageConnection.h@1.2, 2007-10-11 07:12:05-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

  storage/falcon/Table.h@1.6, 2007-10-11 07:12:07-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

ChangeSet@1.2529.61.4, 2007-10-11 16:41:05+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_yacc.yy@1.458.144.4, 2007-10-11 16:41:03+05:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.2529.68.1, 2007-10-11 13:34:41+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug #30695: An apostrophe ' in the comment of the ADD PARTITION
    causes the Server to crash.
  
  Crashed because of the comment in the partition clause was saved in
  the frm file without escaping, causing the server to crash when it was
  read/parsed again.
  
  Fixed by escaping quoted text in the partition info when writing it to
  the frm-file and added a check that it was able to parse the partition
  info before using it 
  
  NOTE: If the comment is written by an earlier version of the server,
  the corrupted frm-file is not fixed, but left corrupted, you have to
  manually drop the table and recreate it.

  mysql-test/r/partition.result@1.68.3.1, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none) +16 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
     testresult

  mysql-test/t/partition.test@1.62.3.1, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none) +26 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
      testcase

  sql/sql_partition.cc@1.96.21.1, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none) +17 -4
    Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
      the Server to crash.
    
      Crashes when there is an non escaped apostrophe in the partition comment
    
      fixed by escaping quoted text before writing to the frm-file

  sql/table.cc@1.288.16.5, 2007-10-11 13:34:39+02:00, mattiasj@mattiasj-laptop.(none) +2 -1
    Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash
    
    problem was using a null poiter without check -> crash.
    
    added a check that the previus call succeded

ChangeSet@1.1810.3378.1, 2007-10-11 16:07:10+05:00, gluh@mysql.com +9 -0
  Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero
  Bug#30982 CHAR(..USING..) can return a not-well-formed string
  Bug#30986 Character set introducer followed by a HEX string can return bad result
  check_well_formed_result moved to Item from Item_str_func
  fixed Item_func_char::val_str for proper ucs symbols converting
  added check for well formed strings for correct conversion of constants with underscore
  charset

  mysql-test/r/ctype_ucs.result@1.39.3.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +3 -0
    test result

  mysql-test/r/ctype_utf8.result@1.85.11.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +64 -2
    test result

  mysql-test/t/ctype_ucs.test@1.36.4.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +5 -0
    test case

  mysql-test/t/ctype_utf8.test@1.84.10.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +19 -0
    test case

  sql/item.cc@1.113.100.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +35 -0
    check_well_formed_result() moved from Item_str_func

  sql/item.h@1.183.1.58, 2007-10-11 16:07:09+05:00, gluh@mysql.com +1 -0
    check_well_formed_result() moved from Item_str_func

  sql/item_strfunc.cc@1.261.1.45, 2007-10-11 16:07:09+05:00, gluh@mysql.com +3 -32
    check_well_formed_result moved to Item
    fixed Item_func_char::val_str for proper ucs symbols converting

  sql/item_strfunc.h@1.101.1.23, 2007-10-11 16:07:09+05:00, gluh@mysql.com +0 -1
    check_well_formed_result moved to Item

  sql/sql_yacc.yy@1.371.128.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +18 -4
    added check for well formed string

ChangeSet@1.2588.32.1, 2007-10-11 12:48:54+02:00, jperkin@mysql.com +1 -0
  Raise version number after cloning 6.0.3-alpha

  configure.in@1.373.3.5, 2007-10-11 12:48:44+02:00, jperkin@mysql.com +1 -1
    Raise version number after cloning 6.0.3-alpha

ChangeSet@1.1616.3106.1, 2007-10-11 14:28:12+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31174: "Repair" command on MyISAM crashes with small
  myisam_sort_buffer_size.
  
  An incorrect length of the sort buffer was used when calculating the
  maximum number of keys. When myisam_sort_buffer_size is small enough,
  this could result in the number of keys < number of
  BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.
  
  Fixed by correcting the buffer length calculation.

  mysql-test/r/repair.result@1.14.1.8, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +27 -0
    Added a test case for bug #31174.

  mysql-test/t/repair.test@1.12.1.6, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +30 -1
    Added a test case for bug #31174.

  myisam/sort.c@1.35.1.17, 2007-10-11 14:28:08+04:00, kaa@polly.(none) +4 -2
    Use a correct buffer length when calculating the maximum number of keys.
    Assert that for each BUFFPEK structure there is at least one
    corresponding key. Otherwise we would fail earlier and not reach
    merge_buffers().

ChangeSet@1.1810.3377.1, 2007-10-11 11:29:26+03:00, gkodinov@magare.gmz +3 -0
  Bug #31440: 'select 1 regex null' asserts debug server
  
  The special case with NULL as a regular expression
  was handled at prepare time. But in this special case
  the item was not marked as fixed. This caused an assertion
  at execution time.
  Fixed my marking the item as fixed even when known to 
  return NULL at prepare time.

  mysql-test/r/func_regexp.result@1.10.2.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +5 -0
    Bug #31440: test case

  mysql-test/t/func_regexp.test@1.9.1.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +10 -1
    Bug #31440: test case

  sql/item_cmpfunc.cc@1.187.43.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +1 -0
    Bug #31440: mark the item as fixed even when 
    known to return NULL.

ChangeSet@1.2588.15.23, 2007-10-11 07:05:43+02:00, hakank@lu0011.(none) +3 -0
  Speed up test cases by 20% by eliminating not related statements.

  mysql-test/suite/falcon/t/falcon_bug_23818_A.test@1.3, 2007-10-11 07:05:40+02:00, hakank@lu0011.(none) +0 -2
    Eliminated not related statements.

  mysql-test/suite/falcon/t/falcon_bug_23818_B.test@1.3, 2007-10-11 07:05:40+02:00, hakank@lu0011.(none) +0 -2
    Eliminated not related statements.

  mysql-test/suite/falcon/t/falcon_bug_23818_C.test@1.3, 2007-10-11 07:05:40+02:00, hakank@lu0011.(none) +0 -2
    Eliminated not related statements.

ChangeSet@1.2529.53.18, 2007-10-10 21:39:22-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 31409

  mysql-test/include/handler.inc@1.39, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +33 -0
    Add test case for Bug 31409

  mysql-test/r/handler_innodb.result@1.21, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +18 -0
    Add test case result for InnoDB run of the handler test for Bug 31409

  mysql-test/r/handler_myisam.result@1.34, 2007-10-10 21:39:20-03:00, davi@moksha.com.br +18 -0
    Add test case result for MyISAM run of the handler test for Bug 31409

ChangeSet@1.2529.53.16, 2007-10-10 21:07:23-03:00, davi@moksha.com.br +1 -0
  Mismerge broken 5.1-runtime compilation because do_command was defined
  static but it's still used by another compilation unit.
  
  Remove static qualifier from do_command definition.

  sql/sql_parse.cc@1.693.20.7, 2007-10-10 21:07:20-03:00, davi@moksha.com.br +1 -1
    do_command is also used by sql_connect.c in 5.1

ChangeSet@1.2529.53.10, 2007-10-10 19:06:53-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 21587

  mysql-test/include/handler.inc@1.38, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +35 -0
    Add test case for Bug 21587

  mysql-test/r/handler_innodb.result@1.20, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for InnoDB run of the handler test for Bug 21587

  mysql-test/r/handler_myisam.result@1.33, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for MyISAM run of the handler test for Bug 21587

ChangeSet@1.2529.66.1, 2007-10-10 22:03:10+02:00, mleich@four.local.lan +19 -0
  Combined fix for
     Bug#31481 test suite parts: Many tests fail because of changed server error codes
     Bug#31243 Test "partition_basic_myisam" truncates path names
  + minor cleanup

  mysql-test/suite/parts/inc/partition.pre@1.4, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +9 -9
    - Blow column file_list up to VARBINARY(10000)
       = Fix for Bug#31243 Test "partition_basic_myisam" truncates path names
    - Minor cleanup
      = remove reference to fixed bugs #17455, #19305

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +11 -9
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_check.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +12 -8
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_syntax.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +19 -19
    Minor cleanup
    = replace error numbers with error names

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +15 -13
    Adjust expected server error codes

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

ChangeSet@1.1810.3376.1, 2007-10-10 14:00:57-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback()
  
  Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
  fix is to check thd for NULL before using it.

  sql/sql_class.cc@1.223.1.55, 2007-10-10 14:00:56-06:00, tsmith@ramayana.hindu.god +5 -2
    It is possible that mark_transaction_to_rollback() may be
    called in rare circumstances when thd is NULL (e.g., from
    some calls to convert_error_code_to_mysql()).  Don't use thd
    if it is NULL.

ChangeSet@1.2606.1.2, 2007-10-10 20:02:30+02:00, mleich@four.local.lan +1 -0
  Post merge fix for
     Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
  Repairing the issues (outside of #31407) within the <engine>__datadict tests in MySQL 5.2
  exceeds the purpose of a post merge fix.
  Final solution:
  - disable <engine>__datadict test for 5.2
  - Bug 31509 funcs_1: <engine>__datadict tests broken, adjustment to 5.2 properties missing

  mysql-test/suite/funcs_1/t/disabled.def@1.6, 2007-10-10 20:02:28+02:00, mleich@four.local.lan +4 -0
    Disable the <engine>__datadict tests

ChangeSet@1.2588.31.1, 2007-10-10 12:21:34-04:00, jas@rowvwade. +9 -0
  Implement write threads for page cache flushing.

  storage/falcon/Cache.cpp@1.10, 2007-10-10 12:21:22-04:00, jas@rowvwade. +118 -0
    Implement write threads for page cache flushing.

  storage/falcon/Cache.h@1.5, 2007-10-10 12:21:23-04:00, jas@rowvwade. +14 -4
    Implement write threads for page cache flushing.

  storage/falcon/Database.cpp@1.13.1.1, 2007-10-10 12:21:23-04:00, jas@rowvwade. +10 -4
    Implement write threads for page cache flushing.

  storage/falcon/Database.h@1.8.1.1, 2007-10-10 12:21:23-04:00, jas@rowvwade. +1 -0
    Implement write threads for page cache flushing.

  storage/falcon/Dbb.cpp@1.4, 2007-10-10 12:21:24-04:00, jas@rowvwade. +3 -28
    Implement write threads for page cache flushing.

  storage/falcon/IO.cpp@1.7.1.1, 2007-10-10 12:21:24-04:00, jas@rowvwade. +5 -5
    Switch page I/O from buffered to unbuffered on non-Windows
    platforms.

  storage/falcon/SerialLog.cpp@1.8, 2007-10-10 12:21:25-04:00, jas@rowvwade. +1 -2
    Changed page cache flush mechanism to accomodate IO threads.

  storage/falcon/StorageParameters.h@1.3, 2007-10-10 12:21:25-04:00, jas@rowvwade. +1 -0
    Added parameter to control the number of IO threads.

  storage/falcon/Sync.cpp@1.2, 2007-10-10 12:21:25-04:00, jas@rowvwade. +4 -3
    Check for double lock requests.

ChangeSet@1.2529.62.1, 2007-10-10 18:10:54+02:00, sven@murkla.(none) +2 -0
  BUG#29046: rpl_stm_mystery22 unstable
  
  Problem: rpl_stm_mystery22 is unstable.
  
  Reason: At one place, the test case *should* wait until the SQL thread on the
  slave receives an error, but instead it waits until the SQL thread stops. The
  SQL thread may stop before the error flag is set, so that when the test case
  continues to execute, the error flag is not set.
  
  Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
  which waits until there is an error in the sql thread of the slave.
  
  Re-commit: fixed one logical error and two smaller things noted by Mats.

  mysql-test/include/wait_for_slave_sql_error.inc@1.1, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +33 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_sql_error.inc''
    This is a subroutine that waits until the sql thread on the slave receives an
    error, as indicated by Last_SQL_Errno in "SHOW SLAVE STATUS".

  mysql-test/include/wait_for_slave_sql_error.inc@1.0, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_stm_mystery22.test@1.12, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +1 -1
    Use the new wait_for_slave_sql_error.inc instead of wait_for_slave_to_stop.
    There may be a delay from when the slave stops to when Last_SQL_Errno is set,
    so it is not safe to merely wait until the slave stops.

ChangeSet@1.2529.35.12, 2007-10-10 17:22:21+02:00, jmiller@mysql.com +2 -0
  rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result:
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.1, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +2286 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.0, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.1, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +14 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.0, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.1810.3374.1, 2007-10-10 20:14:29+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 &&
                    precision > 0 && scale <= precision'.
  
  A sign of a resulting item of the IFNULL function was not
  updated and the maximal length of this result was calculated
  improperly. Correct algorithm was copy&pasted from the IF
  function implementation.

  mysql-test/r/create.result@1.107.1.29, 2007-10-10 19:50:45+05:00, gshchepa@gleb.loc +1 -1
    Update test case after the bugfix of bug #31471.

  mysql-test/r/null.result@1.33.1.4, 2007-10-10 19:50:35+05:00, gshchepa@gleb.loc +24 -1
    Added test case for bug #31471.

  mysql-test/t/null.test@1.22, 2007-10-10 19:50:26+05:00, gshchepa@gleb.loc +25 -2
    Added test case for bug #31471.

  sql/item_cmpfunc.cc@1.187.1.78, 2007-10-10 19:49:55+05:00, gshchepa@gleb.loc +14 -4
    Fixed bug #31471.
    The Item_func_ifnull::fix_length_and_dec method has been
    modified to update the Item_func_ifnull::unsigned_flag field
    and to take this field into account when calculating the
    Item_func_ifnull::max_length value.
    (See Item_func_if::fix_length_and_dec for reference).

ChangeSet@1.2547.29.10, 2007-10-10 16:53:56+02:00, guilhem@gbichot4.local +2 -0
  Fix for pushbuild failure related to WL#866 (online backup for MyISAM):
  sched_yield() was not well detected on Solaris, causing
  mysys/lf_alloc-pin.c to not compile. Fix for non-portable grep -q.

  config/ac-macros/ha_ndbcluster.m4@1.30.1.1, 2007-10-10 16:53:54+02:00, guilhem@gbichot4.local +1 -1
    grep -q is not portable (causes error message during "configure"
    on solaris10).

  configure.in@1.365.7.1, 2007-10-10 16:53:54+02:00, guilhem@gbichot4.local +2 -1
    sched_yield() was not well detected on Solaris10: AC_CHECK_LIB
    does not define HAVE_SCHED_YIELD, it is about detecting a library.
    The fix is inspired from an example found in autoconf's manual.

ChangeSet@1.2529.35.11, 2007-10-10 16:43:20+02:00, jmiller@mysql.com +8 -0
  .del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
  .del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
  .del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
  Many files:
    merged and cleanup of test cases

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2@1.2.1.1, 2007-10-10 14:44:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423@1.1.1.1, 2007-10-10 14:42:04+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba@1.1.1.1, 2007-10-10 14:42:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2.1.1, 2007-10-10 16:43:08+02:00, jmiller@mysql.com +692 -150
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.1.1, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.1.1, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -1
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -0
    merged and cleanup of test cases

ChangeSet@1.2529.53.8, 2007-10-10 17:57:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20023: mysql_change_user() resets the value
  of SQL_BIG_SELECTS.
  
  The bug was that SQL_BIG_SELECTS was not properly set
  in COM_CHANGE_USER.
  
  The fix is to update SQL_BIG_SELECTS properly.

  sql/mysql_priv.h@1.505.17.18, 2007-10-10 17:56:58+04:00, anozdrin@station. +0 -1
    Cleanup: make prepare_new_connection_state() private for module.

  sql/sql_class.cc@1.346.2.1, 2007-10-10 17:56:58+04:00, anozdrin@station. +6 -0
    Update THD::options with the respect to SQL_BIG_SELECTS
    in COM_CHANGE_USER.

  sql/sql_connect.cc@1.9.1.2, 2007-10-10 17:56:58+04:00, anozdrin@station. +2 -2
    Cleanup: make prepare_new_connection_state() private for module.

  tests/mysql_client_test.c@1.245.7.3, 2007-10-10 17:56:59+04:00, anozdrin@station. +171 -0
    Add a test case BUG#20023.

ChangeSet@1.2529.1.47, 2007-10-10 15:37:33+02:00, mleich@four.local.lan +5 -0
  Fix for
    Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.10.3.1, 2007-10-10 15:37:30+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.10.3.1, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.10.3.1, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.4.3.1, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +151 -403
    Updated expected results
    Attention:
       The update does not prevent that the test has to be disabled.
       Reason: Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results

  mysql-test/suite/funcs_1/t/disabled.def@1.5, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +1 -0
    Disable ndb__datadict because of
    Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
    which will be fixed later.

ChangeSet@1.1810.3373.2, 2007-10-10 16:26:02+03:00, gkodinov@magare.gmz +14 -0
  Bug #30825: Problems when putting a non-spatial index on a GIS column
   Fixed the usage of spatial data (and Point in specific) with 
   non-spatial indexes.
   Several problems :
     - The length of the Point class was not updated to include the 
       spatial reference system identifier. Fixed by increasing with 4 
       bytes.
     - The storage length of the spatial columns was not accounting for
       the length that is prepended to it. Fixed by treating the 
       spatial data columns as blobs (and thus increasing the storage
       length)
     - When creating the key image for comparison in index read wrong
       key image was created (the one needed for and r-tree search,
       not the one for b-tree/other search). Fixed by treating the
       spatial data columns as blobs (and creating the correct kind of
       image based on the index type). 

  mysql-test/r/bdb_gis.result@1.2.7.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: bdb tests

  mysql-test/t/bdb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: bdb tests

  mysql-test/include/gis_keys.inc@1.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +46 -0
    Bug #30825: Test file for spatial data and non-spatial indexes

  mysql-test/include/gis_keys.inc@1.0, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +0 -0

  mysql-test/r/gis-rtree.result@1.14.1.15, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -2
    Bug #30825: key length changed

  mysql-test/r/gis.result@1.35.1.13, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: MyISAM tests

  mysql-test/r/innodb_gis.result@1.2.2.7, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: InnoDB tests

  mysql-test/t/gis.test@1.29.1.11, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -0
    Bug #30825: MyISAM tests

  mysql-test/t/innodb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: InnoDB tests

  sql/field.cc@1.256.1.106, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -30
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/field.h@1.153.27.10, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -1
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/sql_select.h@1.92.1.31, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +6 -2
    Bug #30825: Geometry data are a blob derivate

  sql/sql_table.cc@1.239.1.117, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/sql_yacc.yy@1.371.127.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/table.cc@1.160.1.99, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +4 -2
    Bug #30825: It stores a length for spatial data
     as well, so increase the storage length (as it's
     done for blobs).

ChangeSet@1.2529.35.10, 2007-10-10 14:18:34+02:00, jmiller@mysql.com +2 -0
  rpl_bug31076.test, rpl_bug31076.result:
    Correcting test bug

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.3.1, 2007-10-10 14:18:14+02:00, jmiller@mysql.com +1 -0
    Correcting test bug

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.3.1, 2007-10-10 14:18:24+02:00, jmiller@mysql.com +3 -0
    Correcting test bug

ChangeSet@1.1810.3371.3, 2007-10-10 14:42:29+04:00, anozdrin@station. +2 -0
  Cleanup sp.test.

  mysql-test/r/sp.result@1.170.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -3
    Update result file.

  mysql-test/t/sp.test@1.174.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -7
    Cleanup sp.test.

ChangeSet@1.2603.1.12, 2007-10-10 14:37:31+04:00, anozdrin@station. +3 -0
  Fix automerge.

  mysql-test/r/sp.result@1.296, 2007-10-10 14:37:28+04:00, anozdrin@station. +176 -0
    Fix automerge.

  mysql-test/t/sp.test@1.257, 2007-10-10 14:37:28+04:00, anozdrin@station. +290 -0
    Fix automerge.

  sql/item_func.cc@1.381.2.2, 2007-10-10 14:37:28+04:00, anozdrin@station. +11 -2
    Fix automerge.

ChangeSet@1.2529.53.7, 2007-10-10 13:53:24+04:00, anozdrin@station. +1 -0
  Fix automerge.

  mysql-test/r/sp.result@1.270.16.7, 2007-10-10 13:53:21+04:00, anozdrin@station. +176 -0
    Fix automerge.

ChangeSet@1.2592.11.1, 2007-10-10 14:42:30+05:00, svoj@mysql.com +1 -0
  Fixed that worklog identifier was not mentioned in message subject.

  BitKeeper/triggers/post-commit@1.39.1.1, 2007-10-10 14:41:26+05:00, svoj@april.(none) +1 -1
    Fixed that worklog identifier was not mentioned in message subject.

ChangeSet@1.2529.2.49, 2007-10-10 14:22:21+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/view.result@1.218.6.10, 2007-10-10 14:22:19+05:00, gluh@mysql.com +6 -6
    after merge fix

  sql/sql_repl.cc@1.155.16.1, 2007-10-10 14:22:19+05:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.1810.3308.34, 2007-10-10 12:21:11+05:00, gluh@mysql.com +3 -0
  Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
  added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
  to make them visible within SHOW VARIABLES

  mysql-test/r/rpl_flush_log_loop.result@1.24.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +7 -0
    test result

  mysql-test/t/rpl_flush_log_loop.test@1.14.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    test case

  sql/set_var.cc@1.125.33.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
    to make them visible within SHOW VARIABLES

ChangeSet@1.1810.3308.33, 2007-10-10 12:16:13+05:00, gluh@mysql.com +2 -0
  Bug#25359 Test 'view' is dependent on current year to be 2006
  removed now() call to make the test to be year independent

  mysql-test/r/view.result@1.138.1.71, 2007-10-10 12:16:12+05:00, gluh@mysql.com +8 -7
    result fix

  mysql-test/t/view.test@1.126.1.64, 2007-10-10 12:16:12+05:00, gluh@mysql.com +7 -6
    removed now() call to make the test to be year independent

ChangeSet@1.2547.29.9, 2007-10-10 09:14:58+02:00, guilhem@gbichot4.local +4 -0
  Fix for pushbuild failures (related to WL#866)

  mysys/lf_alloc-pin.c@1.2, 2007-10-10 09:14:55+02:00, guilhem@gbichot4.local +1 -0
    fix for compiler warning

  unittest/examples/Makefile.am@1.10, 2007-10-10 09:14:55+02:00, guilhem@gbichot4.local +2 -0
    include CMakeLists.txt in the source tarball

  unittest/mysys/Makefile.am@1.9, 2007-10-10 09:14:55+02:00, guilhem@gbichot4.local +2 -0
    include CMakeLists.txt in the source tarball

  unittest/mytap/Makefile.am@1.6, 2007-10-10 09:14:56+02:00, guilhem@gbichot4.local +2 -0
    include CMakeLists.txt in the source tarball

ChangeSet@1.2588.3.49, 2007-10-10 02:13:29-05:00, chris@aldebaran.site +13 -0
  WL#4079: Serial log location parameter
  
  Added support for the falcon_serial_log_dir parameter.

  storage/falcon/Configuration.cpp@1.5, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +36 -1
    Added falcon_serial_log_dir parameter.

  storage/falcon/Configuration.h@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +1 -0
    Added serialLogDir.

  storage/falcon/Database.cpp@1.14, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +58 -5
    Added setLogRoot() to establish the serial log directory.

  storage/falcon/Database.h@1.9, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +1 -0
    Adde setLogRoot().

  storage/falcon/Engine.h@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +6 -0
    Added SEPARATOR define.

  storage/falcon/IO.cpp@1.8, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +56 -13
    Moved PATH_MAX define to IOx.h.
    Changed expandFileName() to return base file name.
    Corrected function name typo in doesFileExist().
    Added fileStat() method.

  storage/falcon/IOx.h@1.5, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +8 -2
    Added PATH_MAX.
    Renamed doesFileExits to doesFileExist.
    Added baseName argument to expandFileName().
    Added baseName() method.
    Added fileStat() method.

  storage/falcon/JString.cpp@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +51 -2
    Added overload for append() and operator +=.

  storage/falcon/JString.h@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +3 -1
    New overloads for append() and operator +=.

  storage/falcon/MemMgr.cpp@1.6, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +0 -6
    Moved SEPARATOR define to Engine.h.

  storage/falcon/RepositoryVolume.cpp@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +1 -1
    Corrected function name typo in doesFileExist().

  storage/falcon/ScanDir.cpp@1.2, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +4 -0
    Check for data == null in isDirectory().

  storage/falcon/TableSpaceManager.cpp@1.6, 2007-10-10 02:13:26-05:00, chris@aldebaran.site +1 -1
    Corrected function name typo in doesFileExist().

ChangeSet@1.2537.22.42, 2007-10-10 08:12:34+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  removal of current_thd usage

  sql/ha_ndbcluster.cc@1.480.5.8, 2007-10-10 08:12:31+02:00, tomas@whalegate.ndb.mysql.com +13 -15
    removal of current_thd usage

ChangeSet@1.2529.28.13, 2007-10-09 18:45:29-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix compiler warning (use correct data type)

  client/mysqltest.c@1.313.1.5, 2007-10-09 18:45:27-06:00, tsmith@ramayana.hindu.god +2 -1
    Use correct data type for dummy variable passed to dirname_part()

ChangeSet@1.2529.53.5, 2007-10-09 18:12:13-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed packet length for embedded tests

  libmysqld/lib_sql.cc@1.136.1.4, 2007-10-09 18:12:09-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed packet length for embedded

ChangeSet@1.1810.3372.1, 2007-10-09 20:46:33-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +8 -0
  Bug#28318 CREATE FUNCTION (UDF) requires a schema
  Bug#29816 Syntactically wrong query fails with misleading error message
  
  The core problem is that an SQL-invoked function name can be a <schema
  qualified routine name> that contains no <schema name>, but the mysql
  parser insists that all stored procedures (function, procedures and
  triggers) must have a <schema name>, which is not true for functions.
  This problem is especially visible when trying to create a function
  or when a query contains a syntax error after a function call (in the
  same query), both will fail with a "No database selected" message if
  the session is not attached to a particular schema, but the first
  one should succeed and the second fail with a "syntax error" message.
  
  Part of the fix is to revamp the sp name handling so that a schema
  name may be omitted for functions -- this means that the internal
  function name representation may not have a dot, which represents
  that the function doesn't have a schema name. The other part is
  to place schema checks after the type (function, trigger or procedure)
  of the routine is known.

  mysql-test/r/sp-error.result@1.102.1.13, 2007-10-09 20:45:04-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +13 -0
    Add test case result for Bug#29816

  mysql-test/r/udf.result@1.3.4.1, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +7 -0
    Add test case result for Bug#28318

  mysql-test/t/sp-error.test@1.100.1.16, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +20 -0
    Add test case for Bug#29816

  mysql-test/t/udf.test@1.8.3.1, 2007-10-09 20:45:29-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +14 -0
    Add test case for Bug#28318

  sql/sp.cc@1.82.1.54, 2007-10-09 20:45:30-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +3 -10
    Copy the (last) nul byte of the stored routine key and move name parsing
    code to the sp_name class constructor.

  sql/sp_head.cc@1.200.7.30, 2007-10-09 20:45:39-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +28 -3
    Revamp routine name parsing for when no schema is specified and
    omit dot from the qualified name if the routine is not associated
    with a scheme name.

  sql/sp_head.h@1.79.1.21, 2007-10-09 20:45:48-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +1 -10
    Name parsing got bigger, uninline by moving to a single unit -- the sp_head.cc
    file.

  sql/sql_yacc.yy@1.371.126.1, 2007-10-09 20:45:56-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +26 -5
    Only copy the schema name if one is actually set and check for schema
    name presence only where it's necessary.

ChangeSet@1.2588.3.47, 2007-10-09 16:46:34-04:00, jas@rowvwade. +1 -0
  Do index insertion after duplicate check to simplify
  backout.

  storage/falcon/Table.cpp@1.13, 2007-10-09 16:46:23-04:00, jas@rowvwade. +18 -18
    Do index insertion after duplicate check to simplify
    backout.

ChangeSet@1.2547.29.8, 2007-10-09 21:42:28+02:00, guilhem@gbichot4.local +3 -0
  Small fixes for pushbuild problems (related to WL#866
  online backup driver for MyISAM)

  include/Makefile.am@1.88, 2007-10-09 21:42:15+02:00, guilhem@gbichot4.local +1 -1
    fix for "make dist"

  include/my_sys.h@1.227.1.1, 2007-10-09 21:42:20+02:00, guilhem@gbichot4.local +0 -4
    they are declared in my_bit.h now

  mysys/Makefile.am@1.91, 2007-10-09 21:42:20+02:00, guilhem@gbichot4.local +2 -1
    adding files to Unix build

ChangeSet@1.2592.6.7, 2007-10-09 15:30:49-04:00, cmiller@zippy.cornsilk.net +2 -0
  Fixed old merge cruft.

  client/mysql.cc@1.274, 2007-10-09 15:30:46-04:00, cmiller@zippy.cornsilk.net +1 -1
    Fixed reference to recently-removed gptr.

  strings/ctype-uca.c@1.54, 2007-10-09 15:30:46-04:00, cmiller@zippy.cornsilk.net +2 -34
    Removed duplicate addition of Sinhala.

ChangeSet@1.2547.43.1, 2007-10-09 19:55:30+02:00, guilhem@mysqlwin32. +42 -0
  Prerequisite for WL#866 "MyISAM online backup driver":
  making atomic operations work under Windows. Details:
  * Making libmytap compile under Windows
  * Making all unit tests (mysys, examples) compile and pass under Windows.
  * Using Interlocked* compiler intrinsics to implement my_atomic functions
  under Windows.
  Speed stats when running my_atomic-t in Release build:
  Interlocked* is 150-200 times faster than rwlocks, and 17-60% slower
  than hand-written assembler on Linux (same machine).
  This patch was tested on Windows Server 2003, Visual Studio 7.1.

  CMakeLists.txt@1.32.2.1, 2007-10-09 19:55:09+02:00, guilhem@mysqlwin32. +6 -1
    PTHREAD_STACK_MIN is POSIX-specific, under Windows we define it
    to the same value as the /STACK parameter.
    We now build unit tests under Windows.

  config/ac-macros/misc.m4@1.20.4.1, 2007-10-09 19:55:09+02:00, guilhem@mysqlwin32. +2 -1
    detect if pthread_yield_np() is available, as it can be used as a
    replacement if pthread_yield() is not.

  include/Makefile.am@1.87, 2007-10-09 19:55:09+02:00, guilhem@mysqlwin32. +1 -1
    file was renamed

  include/atomic/generic-msvc.h@1.6, 2007-10-09 19:55:11+02:00, guilhem@mysqlwin32. +26 -73
    Using compiler intrinsics on Windows (32 and 64). This replaces assembler
    which was not functional.

  include/atomic/generic-msvc.h@1.5, 2007-10-05 11:08:33+02:00, guilhem@mysqlwin32. +0 -0
    Rename: include/atomic/x86-msvc.h -> include/atomic/generic-msvc.h

  include/atomic/nolock.h@1.5, 2007-10-09 19:55:11+02:00, guilhem@mysqlwin32. +12 -12
    * update from a newer development branch
    * and addition of support for all CPUs when using Microsoft Visual
    Studio.
    * empty struct is not supported by Visual Studio, changing to char.

  include/atomic/rwlock.h@1.4, 2007-10-09 19:55:11+02:00, guilhem@mysqlwin32. +14 -9
    update from a newer development branch

  include/atomic/x86-gcc.h@1.6, 2007-10-09 19:55:12+02:00, guilhem@mysqlwin32. +21 -10
    update from a newer development branch

  include/lf.h@1.1, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +260 -0
    Lock-free module declarations imported from a newer development branch

  include/lf.h@1.0, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +0 -0

  include/my_atomic.h@1.7, 2007-10-09 19:55:10+02:00, guilhem@mysqlwin32. +161 -60
    * update of my_atomic from a newer development branch
    * CAS-based definitions of my_atomic_fas|load|store if they are not
    natively implemented, shuffling order of make_atomic_*_body() calls
    (as "store" may depend on "fas"), and removing 8-bit and 16-bit types as
    we don't use them and Windows intrinsics don't support them (only
    32-bit and pointer are supported).

  include/my_bit.h@1.1, 2007-10-09 19:55:22+02:00, guilhem@mysqlwin32. +111 -0
    importing this file needed for lock-free algorithms
    (for example lf_hash.c needs my_reverse_bits())

  include/my_bit.h@1.0, 2007-10-09 19:55:22+02:00, guilhem@mysqlwin32. +0 -0

  include/my_global.h@1.175.2.1, 2007-10-09 19:55:10+02:00, guilhem@mysqlwin32. +3 -0
    update from a newer development branch (needed for lock-free algorithms)

  include/my_pthread.h@1.117.1.1, 2007-10-09 19:55:10+02:00, guilhem@mysqlwin32. +11 -0
    On Windows, pthread_yield() does not exist but Sleep(0) does its job.
    On other platforms, if pthread_yield() is missing, use pthread_yield_np()
    or sched_yield().

  libmysql/libmysql.c@1.290.6.1, 2007-10-09 19:55:12+02:00, guilhem@mysqlwin32. +3 -3
    fix for compilation failure (declaration after instructions).

  mysys/CMakeLists.txt@1.13, 2007-10-09 19:55:12+02:00, guilhem@mysqlwin32. +2 -1
    adding needed files to the Windows build

  mysys/lf_alloc-pin.c@1.1, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +523 -0
    Lock-free pin-based allocator imported from a newer development branch

  mysys/lf_alloc-pin.c@1.0, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +0 -0

  mysys/lf_dynarray.c@1.1, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +208 -0
    * Lock-free dynamic array imported from a newer development branch
    * strings.h -> m_string.h
    * arithmetic on void* is rejected by Visual Studio (normal), replaced
    a couple of void* by uchar*

  mysys/lf_dynarray.c@1.0, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +0 -0

  mysys/lf_hash.c@1.1, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +493 -0
    Lock-free hash imported from a newer development branch

  mysys/lf_hash.c@1.0, 2007-10-09 19:55:21+02:00, guilhem@mysqlwin32. +0 -0

  mysys/mf_keycache.c@1.74.1.1, 2007-10-09 19:55:13+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  mysys/my_atomic.c@1.4, 2007-10-09 19:55:13+02:00, guilhem@mysqlwin32. +1 -1
    for my_getncpus() it needs my_sys.h

  mysys/my_bit.c@1.7, 2007-10-09 19:55:13+02:00, guilhem@mysqlwin32. +32 -69
    update from a newer development branch

  mysys/my_bitmap.c@1.46, 2007-10-09 19:55:13+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  mysys/my_getncpus.c@1.3, 2007-10-09 19:55:14+02:00, guilhem@mysqlwin32. +17 -11
    implementation of my_getncpus() under Windows (thanks Miguel and Shane).
    Reggie however has to refine it.

  mysys/my_winthread.c@1.13.1.1, 2007-10-09 19:55:14+02:00, guilhem@mysqlwin32. +16 -6
    Two bugfixes: on Windows our implementation of pthread_create() didn't
    allow a NULL thread attribute, and also, when creating a thread,
    my_thread_init() was called but at thread's end, my_thread_end() was
    not (causing "my_thread_global_end: X threads didn't exit" to be printed).

  sql/CMakeLists.txt@1.18.5.1, 2007-10-09 19:55:14+02:00, guilhem@mysqlwin32. +5 -3
    Fix for compilation failure, contributed by Ignacio.

  sql/item_func.cc@1.379.1.1, 2007-10-09 19:55:15+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  sql/mysqld.cc@1.654.1.1, 2007-10-09 19:55:15+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  sql/sql_select.cc@1.554.6.1, 2007-10-09 19:55:15+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions.

  storage/myisam/ha_myisam.cc@1.225.2.1, 2007-10-09 19:55:16+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  storage/myisam/mi_create.c@1.73, 2007-10-09 19:55:16+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  storage/myisam/mi_test2.c@1.39, 2007-10-09 19:55:17+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  storage/myisam/myisamchk.c@1.130, 2007-10-09 19:55:17+02:00, guilhem@mysqlwin32. +1 -0
    Needs my_bit.h as it uses my_bit.c functions

  unittest/examples/CMakeLists.txt@1.1, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +40 -0
    We now build example unit tests on Windows

  unittest/examples/CMakeLists.txt@1.0, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +0 -0

  unittest/examples/core-t.c@1.3, 2007-10-09 19:55:18+02:00, guilhem@mysqlwin32. +1 -1
    my_config.h is for Unix

  unittest/examples/no_plan-t.c@1.6, 2007-10-09 19:55:18+02:00, guilhem@mysqlwin32. +1 -1
    my_config.h is for Unix

  unittest/examples/skip_all-t.c@1.6, 2007-10-09 19:55:18+02:00, guilhem@mysqlwin32. +1 -1
    my_config.h is for Unix

  unittest/examples/todo-t.c@1.5, 2007-10-09 19:55:18+02:00, guilhem@mysqlwin32. +1 -1
    my_config.h is for Unix

  unittest/mysys/CMakeLists.txt@1.1, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +31 -0
    We now build mysys unit tests on Windows

  unittest/mysys/CMakeLists.txt@1.0, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +0 -0

  unittest/mysys/my_atomic-t.c@1.12, 2007-10-09 19:55:19+02:00, guilhem@mysqlwin32. +195 -48
    * update from a newer development branch
    * changed one variable from uint32 to int32 (compiler warning)
    * pthread_join() hangs on Windows, replaced with a global counter of
    unterminated threads.

  unittest/mytap/CMakeLists.txt@1.1, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +23 -0
    we now build libmytap on Windows

  unittest/mytap/CMakeLists.txt@1.0, 2007-10-09 19:55:20+02:00, guilhem@mysqlwin32. +0 -0

  unittest/mytap/tap.c@1.11, 2007-10-09 19:55:19+02:00, guilhem@mysqlwin32. +15 -3
    my_config.h is for Unix. Visual Studio 2003 does not know vsnprintf,
    only _vsnprintf. SIGBUS not known on Windows.

  unittest/mytap/tap.h@1.10, 2007-10-09 19:55:19+02:00, guilhem@mysqlwin32. +3 -3
    fixing differences in prototype/declaration vs tap.c (compiler warnings)

  unittest/unit.pl@1.8, 2007-10-09 19:55:17+02:00, guilhem@mysqlwin32. +2 -2
    On Windows, executables end in ".exe".
    ' is not a string delimiter in Windows' shell, fixing this. Thus
    perl unit.pl run mysys
    works under ActivestatePerl and under Cygwin.

ChangeSet@1.2529.35.9, 2007-10-09 19:51:57+02:00, jmiller@mysql.com +8 -0
  Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.

  mysql-test/extra/rpl_tests/rpl_row_charset.test@1.8, 2007-10-09 19:48:04+02:00, jmiller@mysql.com +4 -2
    Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB

  mysql-test/suite/rpl/r/rpl_row_charset.result@1.10, 2007-10-09 19:48:37+02:00, jmiller@mysql.com +5 -3
    Updated results file

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.1, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +215 -0
    New results file for innodb test case

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.0, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.1, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on master

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.0, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.1, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on slave

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.0, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.1, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +9 -0
    Created a wrapper to test innodb storage engine as well

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.0, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@1.10, 2007-10-09 19:46:45+02:00, jmiller@mysql.com +17 -17
    Updated results file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test@1.5, 2007-10-09 19:46:09+02:00, jmiller@mysql.com +2 -2
    Updated test to run for both row and mixed replication testing

ChangeSet@1.2588.3.46, 2007-10-09 13:48:16-04:00, jas@rowvwade. +3 -0
  Added falcon parameter for sync threshold.

  storage/falcon/Cache.cpp@1.9, 2007-10-09 13:48:09-04:00, jas@rowvwade. +9 -8
    Added a few more configuration parameters.

  storage/falcon/Database.cpp@1.13, 2007-10-09 13:48:09-04:00, jas@rowvwade. +1 -1
    Switch int to uint.

  storage/falcon/StorageParameters.h@1.2, 2007-10-09 13:48:09-04:00, jas@rowvwade. +3 -2
    Added falcon parameter for sync threshold.

ChangeSet@1.2603.1.9, 2007-10-09 11:44:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Manual merge of 5.1-runtime to 5.2-runtime

  sql/item_func.h@1.168.1.2, 2007-10-09 11:44:14-06:00, malff@lambda.hsd1.co.comcast.net. +5 -0
    Manual merge

  sql/sql_parse.cc@1.707.1.4, 2007-10-09 11:44:14-06:00, malff@lambda.hsd1.co.comcast.net. +86 -48
    Manual merge

ChangeSet@1.1810.3360.4, 2007-10-09 22:40:22+05:00, ramil@mysql.com +2 -0
  metadata test of bug # 31249: problem with convert(..., datetime) removed 
  as PS protocol gives slightly different metadata.

  mysql-test/r/type_datetime.result@1.30.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -7
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

  mysql-test/t/type_datetime.test@1.18.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -3
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

ChangeSet@1.2588.3.45, 2007-10-09 13:38:51-04:00, jas@rowvwade. +13 -0
  Add single include file, StorageParameters.h, to define all 
  aspects of falcon unsigned integer parameters.

  storage/falcon/CMakeLists.txt@1.4, 2007-10-09 13:38:40-04:00, jas@rowvwade. +1 -0
    Add single include file, StorageParameters.h, to define all 
    aspects of falcon unsigned integer parameters.

  storage/falcon/Cache.cpp@1.8, 2007-10-09 13:38:40-04:00, jas@rowvwade. +9 -6
    Add falcon parameters to control purifier and flush threads.

  storage/falcon/Configuration.cpp@1.4, 2007-10-09 13:38:40-04:00, jas@rowvwade. +13 -3
    Add single include file, StorageParameters.h, to define all 
    aspects of falcon unsigned integer parameters.

  storage/falcon/Database.cpp@1.12, 2007-10-09 13:38:41-04:00, jas@rowvwade. +1 -1
    Replaced unnecessary signed ints with uint.

  storage/falcon/Database.h@1.8, 2007-10-09 13:38:41-04:00, jas@rowvwade. +1 -1
    Replaced unnecessary signed ints with uint.

  storage/falcon/IOx.h@1.4, 2007-10-09 13:38:41-04:00, jas@rowvwade. +10 -10
    Replaced unnecessary signed ints with uint.

  storage/falcon/Makefile.am@1.5, 2007-10-09 13:38:42-04:00, jas@rowvwade. +4 -1
    Add single include file, StorageParameters.h, to define all 
    aspects of falcon unsigned integer parameters.

  storage/falcon/StorageHandler.cpp@1.3, 2007-10-09 13:38:42-04:00, jas@rowvwade. +3 -14
    Flushed unused tablespace mode.

  storage/falcon/StorageHandler.h@1.3, 2007-10-09 13:38:42-04:00, jas@rowvwade. +2 -2
    Flushed unused tablespace mode.

  storage/falcon/StorageParameters.h@1.1, 2007-10-09 13:38:44-04:00, jas@rowvwade. +6 -0
    Add single include file, StorageParameters.h, to define all 
    aspects of falcon unsigned integer parameters.

  storage/falcon/StorageParameters.h@1.0, 2007-10-09 13:38:44-04:00, jas@rowvwade. +0 -0

  storage/falcon/TableSpaceManager.cpp@1.5, 2007-10-09 13:38:43-04:00, jas@rowvwade. +1 -1
    Replaced unnecessary signed ints with uint.

  storage/falcon/TableSpaceManager.h@1.4, 2007-10-09 13:38:43-04:00, jas@rowvwade. +1 -1
    Replaced unnecessary signed ints with uint.

  storage/falcon/ha_falcon.cpp@1.6, 2007-10-09 13:38:44-04:00, jas@rowvwade. +36 -40
    Add single include file, StorageParameters.h, to define all 
    aspects of falcon unsigned integer parameters.

ChangeSet@1.2588.3.44, 2007-10-09 12:06:33-04:00, jas@rowvwade. +6 -0
  Added diagnostic version of file sync.

  storage/falcon/Cache.cpp@1.7, 2007-10-09 12:06:23-04:00, jas@rowvwade. +25 -10
    Reworked purifier/flush parameters.  Also added diagnostic
    version of file sync.

  storage/falcon/Cache.h@1.4, 2007-10-09 12:06:24-04:00, jas@rowvwade. +1 -0
    Added diagnostic version of file sync.

  storage/falcon/Database.cpp@1.11, 2007-10-09 12:06:24-04:00, jas@rowvwade. +1 -1
    Added diagnostic version of file sync.

  storage/falcon/TableSpace.cpp@1.2, 2007-10-09 12:06:25-04:00, jas@rowvwade. +6 -0
    Added diagnostic version of file sync.

  storage/falcon/TableSpace.h@1.2, 2007-10-09 12:06:25-04:00, jas@rowvwade. +1 -0
    Added diagnostic version of file sync.

  storage/falcon/TableSpaceManager.cpp@1.4, 2007-10-09 12:06:25-04:00, jas@rowvwade. +1 -1
    Added diagnostic version of file sync.

ChangeSet@1.1810.3355.3, 2007-10-09 12:02:59-03:00, davi@moksha.local +2 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  This deadlock occurs when a client issues a HANDLER ... OPEN statement
  that tries to open a table that has a pending name-lock on it by another
  client that also needs a name-lock on some other table which is already
  open and associated to a HANDLER instance owned by the first client.
  The deadlock happens because the open_table() function will back-off
  and wait until the name-lock goes away, causing a circular wait if some
  other name-lock is also pending for one of the open HANDLER tables.
  
  Such situation, for example, can be easily repeated by issuing a RENAME
  TABLE command in such a way that the existing table is already open
  as a HANDLER table by another client and this client tries to open
  a HANDLER to the new table name.
  
  The solution is to allow handler tables with older versions (marked for
  flush) to be closed before waiting for the name-lock completion. This is
  safe because no other name-lock can be issued between the flush and the
  check for pending name-locks.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_base.cc@1.235.113.1, 2007-10-09 12:02:57-03:00, davi@moksha.local +11 -1
    Improve comments in the open_table() function, stating the importance
    of the handler tables flushing for the back-off process.

  sql/sql_handler.cc@1.72.1.21, 2007-10-09 12:02:57-03:00, davi@moksha.local +28 -19
    Allows handler tables flushes when opening new tables in order to avoid
    potential deadlocks. Add comments explaining the importance of the flush.

ChangeSet@1.2529.60.1, 2007-10-09 19:16:39+05:00, ramil@mysql.com +6 -0
  Fix for bug #29444: crash with partition refering to table in create-select
  
  Problem: creating a partitioned table during name resolution for the 
  partition function we search for column names in all parts of the
  CREATE TABLE query. It is superfluous (and wrong) sometimes.
  
  Fix: launch name resolution for the partition function against
  the table we're creating.

  mysql-test/r/partition.result@1.68.2.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  mysql-test/t/partition.test@1.62.2.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  sql/item.cc@1.167.1.122, 2007-10-09 19:16:36+05:00, ramil@mysql.com +3 -1
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.cc@1.250.17.2, 2007-10-09 19:16:36+05:00, ramil@mysql.com +1 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.h@1.284.9.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +8 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_partition.cc@1.96.20.2, 2007-10-09 19:16:37+05:00, ramil@mysql.com +7 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - set the lex->use_only_table_context before the func_expr->fix_fields()
        call to ensure we're resolving names against the table we're creating;
        then restore it back after the call.

ChangeSet@1.2537.22.41, 2007-10-09 15:37:56+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  recommit of removal of m_active_transaction

  sql/ha_ndbcluster.cc@1.480.5.7, 2007-10-09 15:37:53+02:00, tomas@whalegate.ndb.mysql.com +34 -37
    recommit of removal of m_active_transaction

ChangeSet@1.2529.51.8, 2007-10-09 15:09:27+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  removal of m_active_trans cont'd

  sql/ha_ndbcluster.cc@1.408.63.2, 2007-10-09 15:09:24+02:00, tomas@whalegate.ndb.mysql.com +5 -4
    removal of m_active_trans cont'd

ChangeSet@1.1810.3370.1, 2007-10-09 14:58:09+02:00, mhansson@linux-st28.site +4 -0
  Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
  
  Even though it returns NULL, the MAKETIME function did not have this property set,
  causing a failed assertion (designed to catch exactly this).
  Fixed by setting the nullability property of MAKETIME().

  mysql-test/r/func_sapdb.result@1.15.7.2, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +1 -1
    Bug#31160: Changed test result.

  mysql-test/r/func_time.result@1.47.1.37, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +9 -0
    Bug#31160: Test result.

  mysql-test/t/func_time.test@1.41.1.30, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +10 -0
    Bug#31160: Test case.

  sql/item_timefunc.h@1.63.7.1, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +4 -1
    Bug#31160: The fix: Initializing maybe_null to true

ChangeSet@1.2529.58.1, 2007-10-09 14:07:12+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  remove m_active_trans from ndb handler object and replace with m_thd_ndb

  sql/ha_ndbcluster.cc@1.408.63.1, 2007-10-09 14:07:09+02:00, tomas@whalegate.ndb.mysql.com +46 -55
    remove m_active_trans from ndb handler object and replace with m_thd_ndb

  sql/ha_ndbcluster.h@1.170.14.1, 2007-10-09 14:07:09+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    remove m_active_trans from ndb handler object and replace with m_thd_ndb

ChangeSet@1.2603.1.6, 2007-10-09 15:21:08+04:00, anozdrin@station. +2 -0
  Fix merge.

  sql/mysql_priv.h@1.523.4.3, 2007-10-09 15:21:05+04:00, anozdrin@station. +1 -0
    Fix merge.

  sql/sql_connect.cc@1.12, 2007-10-09 15:21:05+04:00, anozdrin@station. +12 -4
    Fix merge.

ChangeSet@1.1810.3369.1, 2007-10-09 13:10:51+02:00, istruewing@stella.local +2 -0
  Bug#15522 - create ... select and with merge tables
  Added test case.
  The fix for Bug#20662 does also fix this one.

  mysql-test/r/merge.result@1.43.1.20, 2007-10-09 13:10:50+02:00, istruewing@stella.local +5 -0
    Bug#15522 - create ... select and with merge tables
    Added test result.

  mysql-test/t/merge.test@1.37.1.15, 2007-10-09 13:10:50+02:00, istruewing@stella.local +14 -0
    Bug#15522 - create ... select and with merge tables
    Added test case.

ChangeSet@1.2529.53.3, 2007-10-09 14:53:15+04:00, anozdrin@station. +3 -0
  Fix merge.

  sql/mysql_priv.h@1.505.17.17, 2007-10-09 14:53:12+04:00, anozdrin@station. +1 -0
    Fix merge.

  sql/sql_connect.cc@1.9.1.1, 2007-10-09 14:53:12+04:00, anozdrin@station. +12 -4
    Fix merge.

  sql/sql_parse.cc@1.693.20.3, 2007-10-09 14:53:13+04:00, anozdrin@station. +0 -2
    Fix merge.

ChangeSet@1.1810.3348.3, 2007-10-09 14:37:21+05:00, ramil@mysql.com +4 -0
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
  
  Problem: creating a temporary table we allocate the group buffer if needed
  followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
  the group buffer than actually needed (used) for values retrieval may lead 
  to overlapping with followed bitmaps in the memory pool that in turn leads 
  to unpredictable consequences.
  
  As we use Item->max_length sometimes to calculate group buffer size,
  it must be set to proper value. In this particular case 
  Item_datetime_typecast::max_length is too small.
  
  Another problem is that we use max_length to calculate the group buffer
  key length for items represented as DATE/TIME fields which is superfluous.
  
  Fix: set Item_datetime_typecast::max_length properly,
  accurately calculate the group buffer key length for items 
  represented as DATE/TIME fields in the buffer.

  mysql-test/r/type_datetime.result@1.30.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +14 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test result.

  mysql-test/t/type_datetime.test@1.18.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +13 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test case.

  sql/item_timefunc.h@1.63.6.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +3 -1
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - set Item_datetime_typecast::max_length properly.

  sql/sql_select.cc@1.312.1.237, 2007-10-09 14:37:19+05:00, ramil@mysql.com +22 -4
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - the group buffer key length for items represented as 
    DATE/TIME fields in the buffer should be calculated using
    the maximum pack length of such fields (== 8), using 
    max_length here is redundant.

ChangeSet@1.1810.3368.1, 2007-10-09 11:36:05+02:00, mhansson@linux-st28.site +3 -0
  Bug#30832:Assertion + crash with select name_const('test',now());
  Completion of previous patch. Negative number were denied
  as the second argument to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.8, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +6 -0
    Bug#30832 completion: test result

  mysql-test/t/func_misc.test@1.21.2.2, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832 completion: test case
    added negative numbers

  sql/item_func.h@1.136.2.39, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +1 -0
    Bug#30832 completion
    The function that represents unary minus is considered a constant if the argument is.

ChangeSet@1.2529.34.7, 2007-10-09 13:53:39+05:00, bar@mysql.com +1 -0
  Bug#27287 extractvalue() (and updatexml()) extremely slow for large XML
  Performance improvements made.
  ExtractValue for large XML values is now much faster
  (about 2000 times faster of 1Mb-long XML values).

  sql/item_xmlfunc.cc@1.33.1.1, 2007-10-09 13:53:38+05:00, bar@mysql.com +24 -36
    Performance improvement for huge XML values:
    1. Avoid reallocs - reserve extra memory:
    using String::reserve() + String::q_append()
    instead of String::append()
    2. Parent is now not searched through the all previous
    nodes in backward direction. Instead, we do the following:
    - we introduce data->parent - a new member in MY_XML_USER_DATA
    - when entering a new tag/attribute node, we remember offset
      of the current node in data->parent
    - when leaving a tag/attribute node, we change data->parent
      to offset of the parent of the current node.

ChangeSet@1.2403.28.91, 2007-10-09 10:41:26+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - more test prg fixes (due to small change in scanUpdates impl.)
    (autotest tests)

  storage/ndb/test/ndbapi/testDict.cpp@1.34.2.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/testIndex.cpp@1.21.1.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/test_event.cpp@1.23.1.4, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +1 -1
    more test prg fixes

ChangeSet@1.2403.28.90, 2007-10-09 09:55:30+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testSystemRestart -n SR_UNDO
    yet another test prg bug

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.3.4, 2007-10-09 09:55:28+02:00, jonas@perch.ndb.mysql.com +1 -1
    yet another test prg bug

ChangeSet@1.2529.51.4, 2007-10-09 09:39:39+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/r/ndb_multi.result@1.17, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +21 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/t/ndb_multi.test@1.24.1.1, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +27 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  sql/handler.cc@1.215.91.2, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    Bug #31470 ndb table with special characters in name are not discovered correctly

ChangeSet@1.1810.3367.1, 2007-10-08 22:30:41-04:00, iggy@alf.(none) +1 -0
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Make sure to cleanup temporary files after use.

  client/mysql_upgrade.c@1.6.1.22, 2007-10-08 22:30:39-04:00, iggy@alf.(none) +4 -0
    Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
    doesn't clean them up
    - Close file handle and delete temporary file when write fails.

ChangeSet@1.2603.1.4, 2007-10-08 19:50:38-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Manual merge

  mysql-test/r/sp-code.result@1.19, 2007-10-08 19:50:33-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Manual merge

  sql/sql_lex.h@1.297.1.2, 2007-10-08 19:50:33-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Manual merge

ChangeSet@1.2529.55.1, 2007-10-08 17:43:32-04:00, iggy@alf.(none) +1 -0
  Bug#28535 mistake in mysqldump error message
  - Fixed error message.

  client/mysqldump.c@1.275.25.1, 2007-10-08 17:43:30-04:00, iggy@alf.(none) +1 -1
    Bug#28535 mistake in mysqldump error message
    - Corrected parameter order.

ChangeSet@1.2588.3.42, 2007-10-08 17:18:41-04:00, jas@rowvwade. +4 -0
  Experiment with "gentle flush".

  storage/falcon/Cache.cpp@1.6, 2007-10-08 17:18:33-04:00, jas@rowvwade. +14 -3
    Experiment with "gentle flush".

  storage/falcon/SerialLog.cpp@1.7, 2007-10-08 17:18:34-04:00, jas@rowvwade. +1 -0
    Name SyncObject for pending transaction queue.

  storage/falcon/SyncObject.cpp@1.5, 2007-10-08 17:18:34-04:00, jas@rowvwade. +5 -0
    Reset SyncObjects during reporting.

  storage/falcon/Table.cpp@1.12, 2007-10-08 17:18:34-04:00, jas@rowvwade. +7 -4
    Experimentally relax atomic updates for performance measurement.

ChangeSet@1.2529.39.6, 2007-10-09 01:07:15+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31310.
  Locked rows of the InnoDB storage was silently skipped in the read-committed
  isolation level.
  
  QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
  of the record that was read semi-consistently and just skip it.
  
  The handler::read_multi_range_next method has been modified
  to retry previous unique range if the previous read was
  semi-consistent.

  mysql-test/include/mix1.inc@1.54.1.1, 2007-10-09 01:03:44+05:00, gshchepa@gleb.loc +125 -0
    Added test case for bug #31310.

  mysql-test/r/innodb_mysql.result@1.24.24.1, 2007-10-09 01:03:59+05:00, gshchepa@gleb.loc +80 -0
    Added test case for bug #31310.

  sql/handler.cc@1.215.97.1, 2007-10-09 01:03:36+05:00, gshchepa@gleb.loc +5 -3
    Fixed bug #31310.
    The handler::read_multi_range_next method has been modified
    to retry previous unique range if the previous read was
    semi-consistent.

ChangeSet@1.2588.3.41, 2007-10-08 15:47:14-04:00, jas@rowvwade. +7 -0
  Add optional write threshold to sync operations.

  storage/falcon/Cache.cpp@1.5, 2007-10-08 15:47:05-04:00, jas@rowvwade. +2 -0
    Another pass at purifier thread.

  storage/falcon/Database.cpp@1.10, 2007-10-08 15:47:05-04:00, jas@rowvwade. +5 -16
    Add threshold to sync operation.

  storage/falcon/Database.h@1.7, 2007-10-08 15:47:06-04:00, jas@rowvwade. +1 -1
    Add threshold to sync operation.

  storage/falcon/IO.cpp@1.7, 2007-10-08 15:47:06-04:00, jas@rowvwade. +3 -1
    Reset write type statistics after report.

  storage/falcon/SerialLog.cpp@1.6, 2007-10-08 15:47:07-04:00, jas@rowvwade. +1 -1
    Add optional write threshold to sync operations.

  storage/falcon/TableSpaceManager.cpp@1.3, 2007-10-08 15:47:07-04:00, jas@rowvwade. +3 -2
    Add optional write threshold to sync operations.

  storage/falcon/TableSpaceManager.h@1.3, 2007-10-08 15:47:07-04:00, jas@rowvwade. +4 -4
    Add optional write threshold to sync operations.

ChangeSet@1.2588.8.12, 2007-10-08 23:44:54+04:00, sergefp@mysql.com +1 -0
  Disabled subselect2.test (see BUG no #31464)

  mysql-test/t/disabled.def@1.277.2.1, 2007-10-08 23:44:48+04:00, sergefp@mysql.com +1 -0
    Disabled subselect2.test (see BUG no #31464)

ChangeSet@1.2529.54.3, 2007-10-08 20:57:37+02:00, serg@janus.mylan +3 -0
  sql_plugin.cc:
    fixed uninit memory access in SET pluginvar=DEFAULT
  innodb_mysql.test, innodb_mysql.result:
    test case for SET pluginvar=DEFAULT

  mysql-test/r/innodb_mysql.result@1.24.23.1, 2007-10-08 20:57:24+02:00, serg@janus.mylan +2 -0
    test case for SET pluginvar=DEFAULT

  mysql-test/t/innodb_mysql.test@1.4, 2007-10-08 20:57:28+02:00, serg@janus.mylan +2 -1
    test case for SET pluginvar=DEFAULT

  sql/sql_plugin.cc@1.73.1.1, 2007-10-08 20:57:28+02:00, serg@janus.mylan +8 -2
    fixed uninit memory access in SET pluginvar=DEFAULT

ChangeSet@1.2529.54.2, 2007-10-08 20:56:43+02:00, serg@janus.mylan +1 -0
  rpl_mixed_dml.inc:
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.2.2, 2007-10-08 20:56:27+02:00, serg@janus.mylan +2 -2
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

ChangeSet@1.2529.54.1, 2007-10-08 20:55:44+02:00, serg@janus.mylan +2 -0
  Makefile.am:
    do link_sources only once

  libmysql_r/Makefile.am@1.34, 2007-10-08 20:55:22+02:00, serg@janus.mylan +1 -0
    do link_sources only once

  sql/Makefile.am@1.191.1.2, 2007-10-08 20:55:16+02:00, serg@janus.mylan +1 -0
    do link_sources only once

ChangeSet@1.2529.49.2, 2007-10-08 20:52:06+02:00, serg@janus.mylan +1 -0
  mtr_report.pl:
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

  mysql-test/lib/mtr_report.pl@1.54.9.1, 2007-10-08 20:51:33+02:00, serg@janus.mylan +10 -4
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

ChangeSet@1.2529.53.1, 2007-10-08 12:37:57-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Test cleanup, the upgrade test script assumes a unix like environment

  mysql-test/t/upgrade.test@1.7, 2007-10-08 12:37:55-06:00, malff@lambda.hsd1.co.comcast.net. +5 -1
    Test cleanup, --exec mkdir does not work on windows platforms

ChangeSet@1.2588.3.40, 2007-10-08 14:00:20-04:00, jas@rowvwade. +8 -0
  Added debug trace option to write page write types.  Also
  fixed non-blocking scavenge bug.

  storage/falcon/Database.cpp@1.9, 2007-10-08 14:00:10-04:00, jas@rowvwade. +3 -0
    Added debug trace option to write page write types.

  storage/falcon/Database.h@1.6, 2007-10-08 14:00:11-04:00, jas@rowvwade. +1 -0
    Added debug trace option to write page write types.

  storage/falcon/IO.cpp@1.6, 2007-10-08 14:00:11-04:00, jas@rowvwade. +11 -0
    Added debug trace option to write page write types.

  storage/falcon/IOx.h@1.3, 2007-10-08 14:00:12-04:00, jas@rowvwade. +1 -0
    Added debug trace option to write page write types.

  storage/falcon/RecordGroup.cpp@1.4, 2007-10-08 14:00:12-04:00, jas@rowvwade. +3 -0
    Defer record section deletes to second pass.

  storage/falcon/Table.cpp@1.11, 2007-10-08 14:00:12-04:00, jas@rowvwade. +1 -1
    Generalize handling of empty section bitmap.

  storage/falcon/TableSpaceManager.cpp@1.2, 2007-10-08 14:00:13-04:00, jas@rowvwade. +9 -0
    Added debug trace option to write page write types.

  storage/falcon/TableSpaceManager.h@1.2, 2007-10-08 14:00:13-04:00, jas@rowvwade. +1 -0
    Added debug trace option to write page write types.

ChangeSet@1.2588.3.39, 2007-10-08 13:20:26-04:00, jas@rowvwade. +10 -0
  Rework purifier thread.  Still a work in progress.

  storage/falcon/BDB.cpp@1.2, 2007-10-08 13:20:11-04:00, jas@rowvwade. +3 -0
    Rework purifier thread.  Still a work in progress.

  storage/falcon/BDB.h@1.3, 2007-10-08 13:20:12-04:00, jas@rowvwade. +2 -2
    Rework purifier thread.  Still a work in progress.

  storage/falcon/CMakeLists.txt@1.3, 2007-10-08 13:20:12-04:00, jas@rowvwade. +3 -1
    Added test class SyncWait.  Never, ever, called in production.

  storage/falcon/Cache.cpp@1.4, 2007-10-08 13:20:13-04:00, jas@rowvwade. +55 -63
    Rework purifier thread.  Still a work in progress.

  storage/falcon/Cache.h@1.3, 2007-10-08 13:20:13-04:00, jas@rowvwade. +4 -4
    Rework purifier thread.  Still a work in progress.

  storage/falcon/DatabaseClone.cpp@1.2, 2007-10-08 13:20:13-04:00, jas@rowvwade. +3 -3
    Track types of page writes.

  storage/falcon/Dbb.cpp@1.3, 2007-10-08 13:20:14-04:00, jas@rowvwade. +1 -1
    Track types of page writes.

  storage/falcon/IO.cpp@1.5, 2007-10-08 13:20:14-04:00, jas@rowvwade. +7 -1
    Track types of page writes.

  storage/falcon/IOx.h@1.2, 2007-10-08 13:20:14-04:00, jas@rowvwade. +11 -1
    Track types of page writes.

  storage/falcon/PageWriter.cpp@1.4, 2007-10-08 13:20:15-04:00, jas@rowvwade. +2 -1
    Track types of page writes.

ChangeSet@1.1810.3366.1, 2007-10-08 13:00:01-04:00, iggy@alf.(none) +1 -0
  Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
  tool error
  - Move disable manifest generation commands to more global location.

  CMakeLists.txt@1.1.27.4, 2007-10-08 13:00:00-04:00, iggy@alf.(none) +9 -8
    Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
    tool error
    - Disable Manifests by default for VS 7 and 8.

ChangeSet@1.2605, 2007-10-08 16:57:13+02:00, mleich@four.local.lan +5 -0
  Post merge fix for
  ChangeSet@1.2529.1.45 = Fix for bug
  Bug#31237 Test "ndb_views" fails because of differing order of select results

  mysql-test/suite/funcs_1/r/innodb_views.result@1.8.1.3, 2007-10-08 15:59:07+02:00, mleich@four.local.lan +22 -26
    Updated result

  mysql-test/suite/funcs_1/r/memory_views.result@1.8.1.3, 2007-10-08 15:59:07+02:00, mleich@four.local.lan +22 -26
    Updated result

  mysql-test/suite/funcs_1/r/myisam_views.result@1.8.1.3, 2007-10-08 15:59:07+02:00, mleich@four.local.lan +870 -871
    Updated result

  mysql-test/suite/funcs_1/r/ndb_views.result@1.3.1.3, 2007-10-08 15:59:07+02:00, mleich@four.local.lan +25 -28
    Updated result

  mysql-test/suite/funcs_1/views/views_master.inc@1.7.1.3, 2007-10-08 15:59:07+02:00, mleich@four.local.lan +2 -2
    Reduce number of tables used in join via VIEW to avoid
    NDBCLUSTER limit MaxNoOfConcurrentTransactions.

ChangeSet@1.2529.51.3, 2007-10-08 16:10:41+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - post merge fixes

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.1.5, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +0 -4
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.36.1.6, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

ChangeSet@1.2403.28.89, 2007-10-08 16:02:21+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - fix dd drop table race condition
    add list of pages being unmaped, so we can wait for it to be empty before dropping extents

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.4.11, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +2 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.3.3, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +6 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.3.2, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +13 -0
    wait for unmap pages

ChangeSet@1.2403.28.88, 2007-10-08 16:00:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Fix disk scan (backup)
    (introduced by only updating extent pages after pageout)

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.3.5, 2007-10-08 16:00:17+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix disk scan (backup)

ChangeSet@1.1810.3337.6, 2007-10-08 17:59:23+04:00, anozdrin@station. +1 -0
  Get rid of compilation warning.

  sql/sql_parse.cc@1.426.165.3, 2007-10-08 17:59:21+04:00, anozdrin@station. +2 -0
    Get rid of compilation warning.

ChangeSet@1.2403.28.87, 2007-10-08 15:58:08+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - remove extra ;
    (in test framework)

  storage/ndb/test/src/NDBT_Thread.cpp@1.2.3.1, 2007-10-08 15:58:06+02:00, jonas@perch.ndb.mysql.com +1 -1
    remove extra ;

ChangeSet@1.2403.28.86, 2007-10-08 15:57:01+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#31257
      handle partially complete LCP better in SR

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.24.3.5, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +1 -0
    remove partially complete LCP from "node" when doign removeNodeFromTable

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.96.7.9, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +34 -1
    remove partially complete LCP from "node" when doign removeNodeFromTable

ChangeSet@1.2403.28.85, 2007-10-08 15:53:29+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#30975 (recommit to 51-telco-gca)
      - only update extent pages *after* flush of real page has been done
      - sync both create/drop of table into undolog (for disk tables)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.129.4.18, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +8 -3
    inform TUP which LCP to restore each fragment to

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.4.10, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +5 -4
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.3.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +191 -63
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.3.1, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +21 -11
    log both create/drop table

  storage/ndb/src/kernel/blocks/lgman.cpp@1.23.3.1, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +10 -2
    let TUP know about all LCPs

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.2.9, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +32 -4
    add "when" argument to disk_page_unmap_callback so that TUP gets informed both before and after page writeout
      so that extent pages can be updated only *after* page has been written

  storage/ndb/src/kernel/blocks/tsman.cpp@1.13.2.1, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +38 -24
    remove lsn from update page free bits
    use wal for page vs extent relation

  storage/ndb/src/kernel/blocks/tsman.hpp@1.8.1.1, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +9 -15
    remove lsn from update page free bits
    use wal for page vs extent relation

ChangeSet@1.2403.28.84, 2007-10-08 15:11:47+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Set usable timeout for atrt
    (problem introduced by stew's timeout handling)

  storage/ndb/src/cw/cpcd/APIService.cpp@1.10.1.1, 2007-10-08 15:11:45+02:00, jonas@perch.ndb.mysql.com +1 -1
    Set usable timeout for atrt

ChangeSet@1.1810.3337.5, 2007-10-08 17:09:28+04:00, anozdrin@station. +1 -0
  Fix compilation warning.

  sql/sql_parse.cc@1.426.165.2, 2007-10-08 17:09:26+04:00, anozdrin@station. +1 -1
    Fix compilation warning.

ChangeSet@1.2403.28.83, 2007-10-08 15:07:58+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix bug in old test prg(s)
    fix SR1 and SR2

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.3.3, 2007-10-08 15:07:56+02:00, jonas@perch.ndb.mysql.com +3 -3
    fix SR1 and SR2

ChangeSet@1.2529.43.11, 2007-10-08 16:52:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #31438: updatexml still crashes
  
  Problem: check missed if the second updatexml() argument is valid.
  
  Fix: check it.

  mysql-test/r/xml.result@1.28, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test result.

  mysql-test/t/xml.test@1.23, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test case.

  sql/item_xmlfunc.cc@1.34, 2007-10-08 16:52:13+05:00, ramil@mysql.com +2 -1
    Fix for bug #31438: updatexml still crashes
      - check if the second argument passed to the updatexml() is valid.

ChangeSet@1.2547.13.21, 2007-10-08 08:47:51-03:00, davi@moksha.local +3 -0
  Bug#27249 table_wild with alias: select t1.* as something
  
  Aliases to table wildcards are silently ignored, but they should
  not be allowed as it is non-standard and currently useless. There
  is not point in having a alias to a wildcard of column names.
  
  The solution is to rewrite the select_item rule so that aliases
  for table wildcards are not accepted.
  
  Contribution by Martin Friebe

  mysql-test/r/alias.result@1.10, 2007-10-08 08:47:48-03:00, davi@moksha.local +139 -0
    Add test case result for Bug#27249

  mysql-test/t/alias.test@1.11, 2007-10-08 08:47:48-03:00, davi@moksha.local +129 -0
    Add test case for Bug#27249

  sql/sql_yacc.yy@1.496.2.1, 2007-10-08 08:47:48-03:00, davi@moksha.local +9 -7
    Split up select_item rule so that aliases for table wildcards
    are not accepted by the parser.

ChangeSet@1.1810.3365.1, 2007-10-08 12:57:43+03:00, gkodinov@magare.gmz +3 -0
  Bug #31156: mysqld: item_sum.cc:918: virtual bool 
    Item_sum_distinct::setup(THD*): Assertion
  
  There was an assertion to detect a bug in ROLLUP
  implementation. However the assertion is not true
  when used in a subquery context with non-cacheable
  statements.
  Fixed by turning the assertion to accepted case
  (just like it's done for the other aggregate functions). 

  mysql-test/r/func_group.result@1.49.1.13, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +10 -0
    Bug #31156: test case

  mysql-test/t/func_group.test@1.48.1.9, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +13 -0
    Bug #31156: test case

  sql/item_sum.cc@1.170.1.43, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +4 -1
    Bug #31156: make it OK to call setup() several times:
     done for (e.g.) scalar subquery 

ChangeSet@1.1810.3364.1, 2007-10-08 03:48:59+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31019: the MOD() function and the % operator crash the server
  when a divisor is less than 1 and its fractional part is very long.
  For example:
  1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789;
  
  Stack buffer overflow has been fixed in the do_div_mod function.

  mysql-test/r/type_decimal.result@1.38.2.1, 2007-10-08 03:43:23+05:00, gshchepa@gleb.loc +6 -0
    Added test case for bug #31019.

  mysql-test/t/type_decimal.test@1.33.1.1, 2007-10-08 03:43:15+05:00, gshchepa@gleb.loc +8 -0
    Added test case for bug #31019.

  strings/decimal.c@1.65.1.16, 2007-10-08 03:43:04+05:00, gshchepa@gleb.loc +2 -1
    Fixed bug #31019.
    Stack buffer overflow has been fixed in the do_div_mod function:
    a value of the upper bound of the buffer was increased where
    a decrement is required.

ChangeSet@1.2529.45.2, 2007-10-06 03:01:30+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #31253: crash comparing datetime to double
  
  after-merge fixies

  mysql-test/r/type_datetime.result@1.52.1.2, 2007-10-06 03:01:25+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    adjust to 5.1 warning message

ChangeSet@1.2588.3.38, 2007-10-05 18:41:55-04:00, jas@rowvwade. +1 -0
  Turn off sync time reports.

  storage/falcon/Database.cpp@1.8, 2007-10-05 18:41:48-04:00, jas@rowvwade. +3 -0
    Turn off sync time reports.

ChangeSet@1.2588.3.37, 2007-10-05 18:14:43-04:00, jas@rowvwade. +5 -0
  Implement purifier thread to perform periodic partial page
  flushes and fsync's.

  storage/falcon/BDB.h@1.2, 2007-10-05 18:14:28-04:00, jas@rowvwade. +1 -0
    Implement purifier thread to perform periodic partial page
    flushes and fsync's.

  storage/falcon/Cache.cpp@1.3, 2007-10-05 18:14:29-04:00, jas@rowvwade. +75 -5
    Implement purifier thread to perform periodic partial page
    flushes and fsync's.

  storage/falcon/Cache.h@1.2, 2007-10-05 18:14:29-04:00, jas@rowvwade. +7 -0
    Implement purifier thread to perform periodic partial page
    flushes and fsync's.

  storage/falcon/Section.cpp@1.3, 2007-10-05 18:14:30-04:00, jas@rowvwade. +0 -1
    Minor edit for consistency.

  storage/falcon/Transaction.cpp@1.6, 2007-10-05 18:14:30-04:00, jas@rowvwade. +2 -2
    Fix reporting format for table names in status reports.

ChangeSet@1.2588.3.36, 2007-10-05 16:38:04-04:00, jas@fluffy.netfrastructure.com +2 -0
  Tweaked debugging reports.

  storage/falcon/PageWriter.cpp@1.3, 2007-10-05 16:37:58-04:00, jas@fluffy.netfrastructure.com +1 -1
    Comment debugging report when stalled for page writer.

  storage/falcon/TransactionManager.cpp@1.5, 2007-10-05 16:37:58-04:00, jas@fluffy.netfrastructure.com +3 -0
    Added system freeze when reporting transaction blockage.

ChangeSet@1.2529.1.45, 2007-10-05 20:06:41+02:00, mleich@four.local.lan +5 -0
  1. Fix for Bug#31237 Test "ndb_views" fails because of differing order of select results
  2. Cleanup of test

  mysql-test/suite/funcs_1/r/innodb_views.result@1.8.1.2, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/memory_views.result@1.8.1.2, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam_views.result@1.8.1.2, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +9315 -8531
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb_views.result@1.3.1.2, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +184 -134
    Updated expected results

  mysql-test/suite/funcs_1/views/views_master.inc@1.7.1.2, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +294 -290
    1. Fix for Bug#31237
       Typical changes:
          - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
          - Partially refine the SELECT on the VIEW to get a reproducible result
    2. Cleanup of test
          - replace error numbers by names
          - remove comments and workarounds dedicated to now fixed bugs
          - minor fixes or improvements in comments
          - remove trailing spaces

ChangeSet@1.1810.3363.1, 2007-10-05 19:55:00+02:00, msvensson@pilot.mysql.com +1 -0
  Fixed Bug #27789 "Wrong permissions of sql/share/language directories"

  extra/comp_err.c@1.23.1.8, 2007-10-05 19:54:58+02:00, msvensson@pilot.mysql.com +1 -0
    Override my_mkdir() umask setting. The default is 0700 which perfectly 
    makes sense for the server but leads to Bug #27789 when applied to comp_err
    generated directories in the souce tree. Generated directories and the
    files within won't be accessible to other users, sometimes including root 
    if on a non-local filesystem, making "sudo make install" fail.

ChangeSet@1.2537.22.35, 2007-10-05 19:39:47+02:00, jmiller@mysql.com +2 -0
  ndb_alter_table_online.result, ndb_alter_table_online.test:
    Correct nondeterministic values

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.7, 2007-10-05 19:39:28+02:00, jmiller@mysql.com +2 -2
    Correct nondeterministic values

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.13, 2007-10-05 19:39:39+02:00, jmiller@mysql.com +2 -0
    Correct nondeterministic values

ChangeSet@1.1810.3305.14, 2007-10-05 19:28:09+02:00, msvensson@shellback.(none) +1 -0
  Update test case to allow the .reject file to be in either var/log or r/

  mysql-test/t/mysqltest.test@1.24.1.45, 2007-10-05 19:28:07+02:00, msvensson@shellback.(none) +3 -0
    Update test case to allow the .reject file to be in either var/log or r/

ChangeSet@1.1810.3305.13, 2007-10-05 19:23:44+02:00, msvensson@shellback.(none) +2 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard

  mysql-test/lib/mtr_cases.pl@1.12.1.30, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +25 -3
    Allow --skip-test and --do-test to take a perl regex

  mysql-test/mysql-test-run.pl@1.30.49.106, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +6 -2
    Update usage for --skip-test and --do-test

ChangeSet@1.1810.3360.2, 2007-10-05 13:16:54-04:00, cmiller@zippy.cornsilk.net +14 -0
  Change URLs.
  
  Our web server has been restructured several times, and references
  to it in our source code has stayed the same.  This patch from Paul
  DuBois updates all URLs to modern semantics.

  debian/po/ca.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/cs.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/da.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/gl.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/ja.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/pt_BR.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/sv.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/tr.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  mysql-test/lib/mtr_report.pl@1.21.3.6, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  mysql-test/mysql-test-run-shell.sh@1.262.22.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  netware/mysql_test_run.c@1.18.2.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  scripts/mysqld_safe.sh@1.80.1.4, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  sql/mysqld.cc@1.439.129.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  ndb/include/ndbapi/Ndb.hpp@1.39.15.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

ChangeSet@1.1810.3305.12, 2007-10-05 18:36:23+02:00, msvensson@shellback.(none) +1 -0
  Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.105, 2007-10-05 18:36:18+02:00, msvensson@shellback.(none) +1 -1
    Just pass the $opt_valgrind_options to mtr_add_arg - it does a
    "push(@$args, sprintf($format, @fargs));" behind the scenes 

ChangeSet@1.2529.43.6, 2007-10-05 18:24:48+02:00, msvensson@shellback.(none) +1 -0
  Remove printout

  mysql-test/lib/mtr_cases.pl@1.67, 2007-10-05 18:24:42+02:00, msvensson@shellback.(none) +0 -2
    Remove printout

ChangeSet@1.2529.43.5, 2007-10-05 18:22:28+02:00, msvensson@shellback.(none) +1 -0
  Update for 5.1 format of dirname_part

  client/mysqltest.c@1.313.1.4, 2007-10-05 18:22:24+02:00, msvensson@shellback.(none) +2 -2
    Update for 5.1 format of dirname_part

ChangeSet@1.1810.3305.11, 2007-10-05 18:18:50+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run, part2
  Write .reject file to r/ if it's writable else use opt_logdir 

  client/mysqltest.c@1.155.9.118, 2007-10-05 18:18:47+02:00, msvensson@shellback.(none) +15 -4
    Write .reject file to r/ if it's writable else use opt_logdir 

ChangeSet@1.1810.3305.10, 2007-10-05 17:54:19+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run
   - "mysqld --verbose --help" need to be started in a writable directory 

  mysql-test/mysql-test-run.pl@1.30.49.104, 2007-10-05 17:54:16+02:00, msvensson@shellback.(none) +3 -2
    Create a tmpdir where mysqld can peform it's lowercase or uppercase test

ChangeSet@1.2537.22.34, 2007-10-05 16:51:07+02:00, jmiller@mysql.com +2 -0
  ndb_alter_table_online.result, ndb_alter_table_online.test:
    Updated and merged test cases for online alter

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.6, 2007-10-05 16:50:28+02:00, jmiller@mysql.com +404 -101
    Updated and merged test cases for online alter

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.12, 2007-10-05 16:50:15+02:00, jmiller@mysql.com +422 -226
    Updated and merged test cases for online alter

ChangeSet@1.2529.47.1, 2007-10-05 17:28:34+03:00, gkodinov@magare.gmz +7 -0
  Bug #31094: Forcing index-based sort doesn't work anymore if joins are done
  
  A rule was introduced by the 5.1 part of the fix for bug 27531 to 
  prefer filesort over indexed ORDER BY when accessing all of the rows of a 
  table (because it's faster). This new rule was not accounting for the 
  presence of a LIMIT clause.
  Fixed the condition for this rule so it will prefer filesort over 
  indexed ORDER BY only if no LIMIT.

  mysql-test/r/compress.result@1.7.3.1, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/join.result@1.44.4.1, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +164 -0
    Bug #31094: test case

  mysql-test/r/select.result@1.156.3.8, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl.result@1.7.3.1, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl_compress.result@1.7.3.1, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/t/join.test@1.43, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +29 -0
    Bug #31094: test case

  sql/sql_select.cc@1.541.23.6, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +6 -6
    Bug #31094: prefer filesort over indexed ORDER BY only if no LIMIT

ChangeSet@1.2588.3.35, 2007-10-05 10:21:50-04:00, jas@rowvwade. +3 -0
  Add code to freeze system at all blocking points for
  debug analysis.

  storage/falcon/IO.cpp@1.4, 2007-10-05 10:21:42-04:00, jas@rowvwade. +5 -1
    Add code to freeze system at all blocking points for
    debug analysis.

  storage/falcon/SyncObject.cpp@1.4, 2007-10-05 10:21:42-04:00, jas@rowvwade. +16 -2
    Add code to freeze system at all blocking points for
    debug analysis.

  storage/falcon/Synchronize.cpp@1.3, 2007-10-05 10:21:43-04:00, jas@rowvwade. +2 -1
    Add code to freeze system at all blocking points for
    debug analysis.

ChangeSet@1.2588.3.34, 2007-10-05 09:51:40-04:00, jas@rowvwade. +8 -0
  Working towards bifurcating blob updates to the serial log
  (smallish blobs) and "early write" (biggish blobs).

  storage/falcon/Database.cpp@1.7, 2007-10-05 09:51:30-04:00, jas@rowvwade. +4 -1
    Add mechanism to freeze Falcon at all internal blocking site
    for debug analysis.

  storage/falcon/Database.h@1.5, 2007-10-05 09:51:31-04:00, jas@rowvwade. +1 -0
    Add mechanism to freeze Falcon at all internal blocking site
    for debug analysis.

  storage/falcon/Dbb.cpp@1.2, 2007-10-05 09:51:31-04:00, jas@rowvwade. +9 -6
    Working towards bifurcating blob updates to the serial log
    (smallish blobs) and "early write" (biggish blobs).

  storage/falcon/Dbb.h@1.2, 2007-10-05 09:51:31-04:00, jas@rowvwade. +2 -3
    Working towards bifurcating blob updates to the serial log
    (smallish blobs) and "early write" (biggish blobs).

  storage/falcon/SerialLog.cpp@1.5, 2007-10-05 09:51:32-04:00, jas@rowvwade. +1 -1
    Commented out relatively expensive assertion.

  storage/falcon/Synchronize.cpp@1.2, 2007-10-05 09:51:32-04:00, jas@rowvwade. +24 -8
    Working towards bifurcating blob updates to the serial log
    (smallish blobs) and "early write" (biggish blobs).

  storage/falcon/Synchronize.h@1.2, 2007-10-05 09:51:32-04:00, jas@rowvwade. +11 -0
    Working towards bifurcating blob updates to the serial log
    (smallish blobs) and "early write" (biggish blobs).

  storage/falcon/Table.cpp@1.10, 2007-10-05 09:51:33-04:00, jas@rowvwade. +7 -4
    Streamlined blob path.

ChangeSet@1.2547.42.1, 2007-10-05 09:12:32-04:00, cbell@mysql_cab_desk. +3 -0
  WL#3327 : Online Backup 
  
  This patch modifies the cmake files so that the backup source files are in its
  own project file.

  sql/backup/CMakeLists.txt@1.1, 2007-10-05 09:12:29-04:00, cbell@mysql_cab_desk. +32 -0
    WL#3327 : Online Backup 
    
    This patch adds a cmake file for the backup source files so that it is in its 
    own project file.
    

  sql/backup/CMakeLists.txt@1.0, 2007-10-05 09:12:29-04:00, cbell@mysql_cab_desk. +0 -0

  sql/backup/Makefile.am@1.9, 2007-10-05 09:12:28-04:00, cbell@mysql_cab_desk. +1 -0
    Added the new cmake file to the distribution.

  sql/CMakeLists.txt@1.18.3.1, 2007-10-05 09:12:27-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3327 : Online Backup 
    
    This patch modifies the cmake file for the mysqld project to separate the backup
    source files into its own project file.

ChangeSet@1.2529.46.1, 2007-10-05 14:42:38+02:00, msvensson@shellback.(none) +1 -0
  Bug#31400 mysql-test-run inconvenience problems running a certain test
   - Allow test case names to be specied in various different ways

  mysql-test/lib/mtr_cases.pl@1.66, 2007-10-05 14:42:34+02:00, msvensson@shellback.(none) +83 -63
    Allow test name to be specified in all sorts of ways:
    mysql-test-run alias
    mysql-test-run alias.test
    mysql-test-run main.alias
    mysql-test-run main.alias.test
    mysql-test-run t/alias
    mysql-test-run t/alias.test

ChangeSet@1.2528.233.1, 2007-10-05 16:35:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20550: Stored function: wrong RETURN type metadata
  when used in a VIEW.
  
  The problem was that wrong function (create_tmp_from_item())
  was used to create a temporary field for Item_func_sp.
  
  The fix is to use create_tmp_from_field().

  mysql-test/r/sp.result@1.270.17.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +49 -1
    Update result file.

  mysql-test/t/sp.test@1.237.8.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +84 -0
    Add a test case for BUG#20550.

  sql/item_func.h@1.166.2.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +5 -0
    Add a getter for Item_func_sp::sp_result_field.

  sql/sql_select.cc@1.541.28.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +30 -0
    Use create_tmp_from_field() to create a temporary field
    for Item_func_sp.

ChangeSet@1.2537.22.33, 2007-10-05 14:21:05+02:00, jmiller@mysql.com +2 -0
  rpl_bug31076.test, rpl_bug31076.result:
    Fixed test case to cleanup objects created during testing

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.2.1, 2007-10-05 14:20:56+02:00, jmiller@mysql.com +1 -0
    Fixed test case to cleanup objects created during testing

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.2.1, 2007-10-05 14:20:45+02:00, jmiller@mysql.com +1 -0
    Fixed test case to cleanup objects created during testing

ChangeSet@1.2537.22.32, 2007-10-05 13:52:04+02:00, jmiller@mysql.com +1 -0
  ndb_show_tables_result.inc:
    New include files needed by test. Was part of a different commit, but got reviews out of order, so pushing as part of last patch

  mysql-test/include/ndb_show_tables_result.inc@1.1, 2007-10-05 13:51:51+02:00, jmiller@mysql.com +11 -0
    New include files needed by test. Was part of a different commit, but got reviews out of order, so pushing as part of last patch

  mysql-test/include/ndb_show_tables_result.inc@1.0, 2007-10-05 13:51:51+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.1810.3291.7, 2007-10-05 16:33:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
  
  Problem: creating an rb-tree key we store length (2 bytes) before the actual data for 
  varchar key parts. The fact was missed for NULL key parts, when we set NULL byte and 
  skip the rest.
  
  Fix: take into account the length of the varchar key parts for NULLs.

  mysql-test/r/heap_btree.result@1.18.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +8 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      -test result.

  mysql-test/t/heap_btree.test@1.20.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +9 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - test case.

  heap/hp_hash.c@1.38.11.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +6 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - skip varchar key parts length (2 byte) for null key parts.

ChangeSet@1.1616.3103.1, 2007-10-05 15:40:32+05:00, holyfoot@mysql.com +4 -0
  Bug #30286 spatial index cause corruption and server crash!
  
  As the result of DOUBLE claculations can be bigger
  than DBL_MAX constant we use in code, we shouldn't use this constatn
  as a biggest possible value.
  Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
  that any rtree_area_increase result will be less so we return valid
  key. Though in rtree_area_increase function we calculate the area
  of the rectangle, so the result can be 'inf' if the rectangle is
  huge enough, which is bigger than DBL_MAX.
  
  Code of the rtree_pick_key modified so we always return a valid key.

  mysql-test/r/gis-rtree.result@1.8.1.8, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +31 -0
    Bug #30286 spatial index cause corruption and server crash!
    test result

  mysql-test/t/gis-rtree.test@1.9.1.7, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +36 -0
    Bug #30286 spatial index cause corruption and server crash!
    test case

  myisam/rt_index.c@1.16.6.4, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +5 -13
    Bug #30286 spatial index cause corruption and server crash!
    
    always set the best_key with the first key we get, so we always return
    somthing valid.

  myisam/rt_mbr.c@1.9.4.1, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +4 -1
    Bug #30286 spatial index cause corruption and server crash!
    
    function comment extended

ChangeSet@1.1810.3361.1, 2007-10-05 12:08:38+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug #31253: crash comparing datetime to double
  
  convert(<invalid time>, datetime) in WHERE caused crash as function
  returned (void*)NULL, but did not flag SQL NULL. It does now.

  mysql-test/r/type_datetime.result@1.30.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +9 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  mysql-test/t/type_datetime.test@1.18.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +10 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  sql/item.cc@1.113.98.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    When failing to process time values, do not just return (void*)NULL,
    but flag SQL NULL as well so no caller will try to process the 0x0L.
    This makes behaviour for Item::Item::val_decimal_from_date() and
    Item::Item::val_decimal_from_time() identical.

ChangeSet@1.1810.3359.1, 2007-10-05 09:38:57+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
  
  Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.

  mysql-test/r/type_decimal.result@1.38.1.6, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +8 -0
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].

  mysql-test/t/type_decimal.test@1.34, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +12 -1
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].
    without patch for bug#31227, valgrind will complain here; so will a
    debug build.

  sql/my_decimal.cc@1.11.3.2, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +29 -10
    Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
    Doxygenise preamble of my_decimal2string().

ChangeSet@1.1810.3354.2, 2007-10-05 12:29:02+05:00, gluh@mysql.com +2 -0
  test fix(to satisfy WIN)

  mysql-test/r/information_schema.result@1.87.1.40, 2007-10-05 12:29:01+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/t/information_schema.test@1.65.1.31, 2007-10-05 12:29:01+05:00, gluh@mysql.com +2 -2
    test fix(to satisfy WIN)

ChangeSet@1.1810.3358.1, 2007-10-05 12:15:11+05:00, bar@mysql.com +11 -0
  Bug#31081 server crash in regexp function
  Problem: The "regex" library written by Henry Spencer
  does not support tricky character sets like UCS2.
  Fix: convert tricky character sets to UTF8 before calling
  regex functions.

  mysql-test/include/ctype_regex.inc@1.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +42 -0
    New BitKeeper file ``mysql-test/include/ctype_regex.inc''
    
    Moving common regular expression tests into a separate
    file and uncluding it into func_regexp and into many ctype_xxx tests.
    

  mysql-test/include/ctype_regex.inc@1.0, 2007-10-05 12:15:09+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_uca.result@1.18.2.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_ucs.result@1.39.1.17, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_utf8.result@1.85.1.23, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/func_regexp.result@1.10.1.2, 2007-10-05 12:15:09+05:00, bar@mysql.com +13 -1
    Adding tests

  mysql-test/t/ctype_uca.test@1.16.3.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_ucs.test@1.36.1.18, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_utf8.test@1.84.1.15, 2007-10-05 12:15:09+05:00, bar@mysql.com +7 -0
    Adding tests

  mysql-test/t/func_regexp.test@1.10, 2007-10-05 12:15:09+05:00, bar@mysql.com +2 -21
    Adding tests

  sql/item_cmpfunc.cc@1.187.42.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +72 -50
    - Adding new method Item_func_regex::regcomp()
    to share more code between fix_fields() and val_int()
    - Adding conversion from ASCII-incompatible charsets like UCS2
    to UTF8, because the "regexp" does not support these charsets
    - Additional optimization: calculate flags for regcomp only
      once in fix_fields, instead of every regcomp()

  sql/item_cmpfunc.h@1.122.22.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding prototypes for new members and methods

ChangeSet@1.2592.3.12, 2007-10-04 16:19:08-07:00, brian@zim.(none) +3 -0
  disabled.def:
    Disabling test for 30221 log_tables
  rpl_grant.test:
    Updated test to make it work despite previous test failures.
  rpl_grant.result:
    New result file.

  mysql-test/suite/rpl/r/rpl_grant.result@1.5, 2007-10-04 16:19:05-07:00, brian@zim.(none) +2 -0
    New result file.

  mysql-test/suite/rpl/t/rpl_grant.test@1.4, 2007-10-04 16:19:05-07:00, brian@zim.(none) +4 -0
    Updated test to make it work despite previous test failures.

  mysql-test/t/disabled.def@1.279, 2007-10-04 16:19:05-07:00, brian@zim.(none) +1 -0
    Disabling test for 30221 log_tables

ChangeSet@1.2592.7.1, 2007-10-04 16:15:00-07:00, acurtis@xiphis.org +1 -0
  MSVC++ does have a log2() function

  include/config-win.h@1.104, 2007-10-04 16:14:46-07:00, acurtis@xiphis.org +1 -0
    MSVC++ does have a log2() function

ChangeSet@1.2588.3.33, 2007-10-04 18:01:27-04:00, jas@rowvwade. +1 -0
  Fix recently introduced insert order-of-table bug.

  storage/falcon/Table.cpp@1.9, 2007-10-04 18:01:20-04:00, jas@rowvwade. +1 -1
    Fix recently introduced insert order-of-table bug.

ChangeSet@1.2588.3.32, 2007-10-04 17:45:03-04:00, jas@rowvwade. +2 -0
  Reduce the period during table Table::syncUpdate locks are
  held during update operations to the minimum required to
  guarantee unique index violations.

  storage/falcon/Table.cpp@1.8, 2007-10-04 17:44:56-04:00, jas@rowvwade. +29 -27
    Reduce the scope that Table::syncUpdate is held in
    encourage parallelism.

  storage/falcon/Transaction.cpp@1.5, 2007-10-04 17:44:57-04:00, jas@rowvwade. +2 -2
    Enable a little more diagnostic printing.

ChangeSet@1.2588.3.31, 2007-10-04 17:24:16-04:00, jas@rowvwade. +5 -0
  Add diagnostic code to print transaction blockage
  when stalling for writes.

  storage/falcon/PageWriter.cpp@1.2, 2007-10-04 17:24:08-04:00, jas@rowvwade. +6 -4
    Add diagnostic code to print transaction blockage
    when stalling for writes.

  storage/falcon/PageWriter.h@1.2, 2007-10-04 17:24:08-04:00, jas@rowvwade. +2 -1
    Add diagnostic code to print transaction blockage
    when stalling for writes.

  storage/falcon/Transaction.cpp@1.4, 2007-10-04 17:24:09-04:00, jas@rowvwade. +10 -0
    Add single transaction version of printBlockage().

  storage/falcon/Transaction.h@1.3, 2007-10-04 17:24:09-04:00, jas@rowvwade. +2 -0
    Add single transaction version of printBlockage().

  storage/falcon/TransactionManager.cpp@1.4, 2007-10-04 17:24:09-04:00, jas@rowvwade. +1 -1
    Adjust transaction dump formatting.

ChangeSet@1.2537.22.31, 2007-10-04 23:02:25+02:00, jmiller@mysql.com +2 -0
  ndb_alter_table_online2.result:
    Updated result file
  ndb_alter_table_online2.test:
    Updated tests to add comments and checks. In addition, added test case for partitions to ensure ER_NOT_SUPPORTED_YET 1235 was returned

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@1.1.1.1, 2007-10-04 23:02:12+02:00, jmiller@mysql.com +85 -2
    Updated result file

  mysql-test/suite/ndb/t/ndb_alter_table_online2.test@1.3, 2007-10-04 22:55:40+02:00, jmiller@mysql.com +100 -6
    Updated tests to add comments and checks. In addition, added test case for partitions to ensure ER_NOT_SUPPORTED_YET 1235 was returned

ChangeSet@1.2588.3.30, 2007-10-04 16:45:34-04:00, jas@rowvwade. +3 -0
  Fix group commit.

  storage/falcon/SRLCommit.cpp@1.2, 2007-10-04 16:45:26-04:00, jas@rowvwade. +2 -1
    Fix group commit.

  storage/falcon/SerialLog.cpp@1.4, 2007-10-04 16:45:27-04:00, jas@rowvwade. +5 -0
    Fix group commit.

  storage/falcon/SerialLog.h@1.2, 2007-10-04 16:45:27-04:00, jas@rowvwade. +3 -3
    Fix group commit.

ChangeSet@1.1810.3357.1, 2007-10-04 17:34:41-03:00, davi@moksha.local +1 -0
  Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
  
  This bug is a symptom of the way handler's tables are managed. The
  most different aspect, compared to the conventional behavior, is that
  the handler's tables are long lived, meaning that their lifetimes are
  not bounded by the duration of the command that opened them. For this
  effect the handler code uses its own list (handler_tables instead of
  open_tables) to hold open handler tables so that the tables won't be
  closed at the end of the command/statement. Besides the handler_tables
  list, there is a hash (handler_tables_hash) which is used to associate
  handler aliases to tables and to refresh the tables upon demand (flush
  tables).
  
  The current implementation doesn't work properly with refreshed tables
  -- more precisely when flush commands are issued by other initiators.
  This happens because when a handler open or read statement is being
  processed, the associated table has to be opened or locked and, for this
  matter, the open_tables and handler_tables lists are swapped so that the
  new table being opened is inserted into the handler_tables list. But when
  opening or locking the table, if the refresh version is different from the
  thread refresh version then all used tables in the open_tables list (now
  handler_tables) are refreshed. In the "refreshing" process the handler
  tables are flushed (closed) without being properly unlinked from the
  handler hash.
  
  The current implementation also fails to properly discard handlers of
  dropped tables, but this and other problems are going to be addressed
  in the fixes for bugs 31397 and 31409.
  
  The chosen approach tries to properly save and restore the table state
  so that no table is flushed during the table open and lock operations.
  The logic is almost the same as before with the list swapping, but with
  a working glue code.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_handler.cc@1.72.1.20, 2007-10-04 17:34:38-03:00, davi@moksha.local +41 -12
    Backup and reset the open_tables and handler_table lists when opening
    a new handler table and merge the opened table into the handler_tables
    list afterwards. When locking, do the same but possibly close the table
    if a refresh is pending.

ChangeSet@1.2588.3.29, 2007-10-04 15:25:35-04:00, jas@rowvwade. +1 -0
  Fixed botched de-conditionalization.

  storage/falcon/Table.cpp@1.7, 2007-10-04 15:25:29-04:00, jas@rowvwade. +0 -6
    Fixed botched de-conditionalization.

ChangeSet@1.2592.3.11, 2007-10-04 11:12:23-07:00, brian@zim.(none) +1 -0
  Patch to abstract out closing and counting of queries to make sure all memory is cleaned on exit (even if it really does not matter).

  client/mysqlslap.c@1.72, 2007-10-04 11:12:19-07:00, brian@zim.(none) +63 -76
    Rewrote slap_connect() to handle all cases of connect so that I can be sure they are only happening when they should. 

ChangeSet@1.2588.3.28, 2007-10-04 14:08:45-04:00, jas@rowvwade. +15 -0
  Added mechanism to name SyncObjects for easier analysis.

  ZERO_CHECK.dir/Debug/BuildLog.htm@1.1, 2007-10-04 14:08:36-04:00, jas@rowvwade. +94 -0
    Eliminate Table::syncUpdate lock to avoid deadlocks.  This
    leaves the parallel duplicate insert bug in place.

  ZERO_CHECK.dir/Debug/BuildLog.htm@1.0, 2007-10-04 14:08:36-04:00, jas@rowvwade. +0 -0

  storage/falcon/Cache.cpp@1.2, 2007-10-04 14:08:31-04:00, jas@rowvwade. +3 -1
    Added mechanism to name SyncObjects.

  storage/falcon/Database.cpp@1.6, 2007-10-04 14:08:31-04:00, jas@rowvwade. +8 -0
    Added mechanism to name SyncObjects.

  storage/falcon/IO.cpp@1.3, 2007-10-04 14:08:32-04:00, jas@rowvwade. +2 -4
    Eliminated unneeded syncs.

  storage/falcon/Index.cpp@1.2, 2007-10-04 14:08:32-04:00, jas@rowvwade. +1 -0
    Added mechanism to name SyncObjects.

  storage/falcon/Inversion.cpp@1.2, 2007-10-04 14:08:33-04:00, jas@rowvwade. +3 -0
    Optimized flush for no updates.

  storage/falcon/RecordGroup.cpp@1.3, 2007-10-04 14:08:33-04:00, jas@rowvwade. +0 -2
    Eliminated obsolete conditionals.

  storage/falcon/RecordLeaf.cpp@1.3, 2007-10-04 14:08:33-04:00, jas@rowvwade. +1 -5
    Eliminated obsolete conditionals.

  storage/falcon/Section.cpp@1.2, 2007-10-04 14:08:34-04:00, jas@rowvwade. +2 -0
    Added mechanism to name SyncObjects.

  storage/falcon/SerialLog.cpp@1.3, 2007-10-04 14:08:34-04:00, jas@rowvwade. +5 -0
    Added mechanism to name SyncObjects.

  storage/falcon/SyncObject.cpp@1.3, 2007-10-04 14:08:34-04:00, jas@rowvwade. +20 -15
    Added mechanism to name SyncObjects.

  storage/falcon/SyncObject.h@1.3, 2007-10-04 14:08:35-04:00, jas@rowvwade. +2 -1
    Added mechanism to name SyncObjects.

  storage/falcon/Table.cpp@1.6, 2007-10-04 14:08:35-04:00, jas@rowvwade. +6 -8
    Added mechanism to name SyncObjects.

  storage/falcon/Table.h@1.5, 2007-10-04 14:08:36-04:00, jas@rowvwade. +0 -1
    Eliminated obsolete conditional.

  storage/falcon/TransactionManager.cpp@1.3, 2007-10-04 14:08:36-04:00, jas@rowvwade. +2 -0
    Added mechanism to name SyncObjects.

ChangeSet@1.2529.35.7, 2007-10-04 19:46:01+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - wl#29390 post-merge 5.0 to 5.1

  storage/ndb/src/ndbapi/ndberror.c@1.81.4.13, 2007-10-04 19:44:53+02:00, pekka@sama.ndb.mysql.com +1 -0
    wl#29390 post-merge 5.0 to 5.1

ChangeSet@1.2592.3.10, 2007-10-04 09:36:13-07:00, brian@zim.(none) +1 -0
  mysqlslap.c:
    Adding an explicit call to mysql_thread_safe() to capture any errors on thread startup. I am also adding a call to check for thread_safe to toss errors in pushbuild in cases where the client may not be being compiled with the correct library.
    AKA... this is all paranoia...

  client/mysqlslap.c@1.71, 2007-10-04 09:36:10-07:00, brian@zim.(none) +19 -3
    Adding an explicit call to mysql_thread_safe() to capture any errors on thread startup. I am also adding a call to check for thread_safe to toss errors in pushbuild in cases where the client may not be being compiled with the correct library.
    AKA... this is all paranoia. 

ChangeSet@1.2588.19.1, 2007-10-04 12:10:17-04:00, jas@rowvwade. +6 -0
  Add more diagnostic trace options include sync object dump
  and SyncObject contention tester.

  storage/falcon/Database.cpp@1.3.1.1, 2007-10-04 12:10:09-04:00, jas@rowvwade. +10 -1
    Add more diagnostic trace options include sync object dump
    and SyncObject contention tester.

  storage/falcon/Database.h@1.4, 2007-10-04 12:10:09-04:00, jas@rowvwade. +2 -0
    Add more diagnostic trace options include sync object dump
    and SyncObject contention tester.

  storage/falcon/Makefile.am@1.4, 2007-10-04 12:10:09-04:00, jas@rowvwade. +10 -2
    Added class SyncTest.

  storage/falcon/SyncObject.cpp@1.2, 2007-10-04 12:10:10-04:00, jas@rowvwade. +26 -2
    Turned off snoozed during contention state variable contention
    backoff.  Also added SyncObject::dump to simplify extraction
    of runtime data.

  storage/falcon/SyncObject.h@1.2, 2007-10-04 12:10:10-04:00, jas@rowvwade. +1 -0
    Turned off snoozed during contention state variable contention
    backoff.  Also added SyncObject::dump to simplify extraction
    of runtime data.

  storage/falcon/SyncTest.cpp@1.2, 2007-10-04 12:10:10-04:00, jas@rowvwade. +1 -2
    Fixed destructor problem.

ChangeSet@1.1810.3356.1, 2007-10-04 18:46:31+03:00, aelkin@koti.dsl.inet.fi +5 -0
  Bug #29309 Incorrect "Seconds_Behind_Master" value in SHOW SLAVE STATUS after FLUSH LOGS
  
  Report claims that Seconds_behind_master behaves unexpectedly. 
  
  Code analysis shows that there is an evident flaw in that treating of FormatDescription event is wrong
  so  that after FLUSH LOGS on slave the Seconds_behind_master's calculation slips and incorrect
  value can be reported to SHOW SLAVE STATUS. 
  Even worse is that the gap between the correct and incorrect deltas grows with time.
  
  Fixed with prohibiting changes to rpl->last_master_timestamp by artifical events (any kind of).
  suggestion as comments is added how to fight with lack of info on the slave side by means of
  new heartbeat feature coming.
  
  The test can not be done ealily fully determistic.

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +121 -0
    result are not deterministic though there are comments saying the most probable expected
    value for Seconds_behind_master

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +1 -0
    bug emulation

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +71 -0
    specic test for bug#29309. It's hard to make it reliable as it deals with timestamps.
    (a way to automate the test like this is to have I_S table for show slave status' fields)
    
    A possible way to check results is to run
    grep -i 'show\|seconds' < suite/manual/r/rpl_replication_delay.reject and to get the lines like these:
    
    show slave status /* Second_behind reports 0 */;;
    Seconds_Behind_Master   0
    show slave status /* bug emulated: reports slave threads starting time about 3*3 not 3 secs */;;
    Seconds_Behind_Master   9
    show slave status /* reports the correct diff with master query time about 3+3 secs */;;
    Seconds_Behind_Master   6
    
    Due to time discreteness of time the reported numbers may slightly vary. That's why the test is not reliable.
     

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.1.64, 2007-10-04 18:46:28+03:00, aelkin@koti.dsl.inet.fi +31 -1
    changing timestamp is affirmed only by non-artificial events. Artifical FD won't change it anymore.
    The simulation code is off unless server is started with the args from the opt-file.
    The simulation code assumes that it will execute specific schedule generated by rpl_replication_delay.test.

  sql/slave.cc@1.241.1.61, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +10 -1
    Comments are changed to announce a new possibility to cope with
    Seconds_behind_master jumping due to EOF special treatment (reset of the timestamp)

ChangeSet@1.2588.3.26, 2007-10-04 10:38:14-04:00, jas@fluffy.netfrastructure.com +1 -0
  Commented out some diagnostic, debugging code.

  storage/falcon/Database.cpp@1.4, 2007-10-04 10:38:11-04:00, jas@fluffy.netfrastructure.com +2 -2
    Commented out some diagnostic, debugging code.

ChangeSet@1.1810.3339.2, 2007-10-04 16:08:13+02:00, df@pippilotta.erinye.com +3 -0
  apply patch for bug#31035 to 5.0.50 release clone

  mysql-test/r/sp.result@1.170.28.29, 2007-10-04 16:08:11+02:00, df@pippilotta.erinye.com +176 -0
    apply patch for bug#31035

  mysql-test/t/sp.test@1.174.28.26, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +290 -0
    apply patch for bug#31035

  sql/item_func.cc@1.270.78.1, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +11 -2
    apply patch for bug#31035

ChangeSet@1.1810.3355.1, 2007-10-04 17:19:14+04:00, anozdrin@station. +3 -0
  Fix for BUG#31035: select from function, group by result crasher.
  
  This actually, fix for the patch for bug-27354. The problem with
  the patch was that Item_func_sp::used_tables() was updated, but
  Item_func_sp::const_item() was not. So, for Item_func_sp, we had
  the following inconsistency:
    - used_tables() returned RAND_TABLE, which means that the item
      can produce "random" results;
    - but const_item() returned TRUE, which means that the item is
      a constant one.
  
  The fix is to change Item_func_sp::const_item() behaviour: it must
  return TRUE (an item is a constant one) only if a stored function
  is deterministic and each of its arguments (if any) is a constant
  item.

  mysql-test/r/sp.result@1.170.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +176 -0
    Update result file.

  mysql-test/t/sp.test@1.174.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +290 -0
    Add test cases for BUG-31035, BUG-31191, BUG-31226

  sql/item_func.cc@1.270.77.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +11 -2
    Make Item::const_item() be consistent with Item::used_tables().

ChangeSet@1.2529.25.4, 2007-10-04 14:56:33+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30484: Partitions: crash with self-referencing trigger
  
  Two cases in ha_partition::extra() was missing
  (HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH)
  which only is currently used by NDB (which not uses ha_partition)

  mysql-test/r/partition.result@1.68.1.1, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
    Added result for test of Bug #30484

  mysql-test/t/partition.test@1.62.1.1, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +9 -0
    Added test for Bug #30484

  sql/ha_partition.cc@1.98.6.2, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Added HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH
    in ha_partition::extra to do nothing
    (Only currently used in NDB, which is not dependent of ha_partition)

ChangeSet@1.2529.37.4, 2007-10-04 17:08:59+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc@1.693.19.2, 2007-10-04 17:08:57+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3354.1, 2007-10-04 16:20:56+05:00, gluh@mysql.com +3 -0
  Bug#30079 A check for "hidden" I_S tables is flawed
  added check for hidden I_S tables for 'show columns|keys' commands

  mysql-test/r/information_schema.result@1.87.1.39, 2007-10-04 16:20:54+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.65.1.30, 2007-10-04 16:20:54+05:00, gluh@mysql.com +9 -0
    test case

  sql/sql_parse.cc@1.426.164.1, 2007-10-04 16:20:54+05:00, gluh@mysql.com +6 -1
    added check for hidden I_S tables for 'show columns|keys' commands

ChangeSet@1.2529.37.2, 2007-10-04 15:35:45+05:00, gluh@mysql.com +4 -0
  after merge fix

  client/client_priv.h@1.74.3.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +2 -3
    after merge fix

  client/mysqldump.c@1.275.23.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/mysqldump.result@1.152.6.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +29 -146
    after merge fix

  mysql-test/r/view_grant.result@1.36.1.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +13 -11
    after merge fix

ChangeSet@1.1616.3102.1, 2007-10-04 14:22:35+04:00, kaa@polly.(none) +3 -0
  Backport of the 5.0 patch to 4.1
  
  Bug#28878: InnoDB tables with UTF8 character set and indexes cause  wrong result for DML
  When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same.

  mysql-test/t/innodb_mysql.test@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +32 -0
    Bug#28878: test case

  mysql-test/r/innodb_mysql.result@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +36 -0
    Bug#28878: test case

  sql/field.cc@1.197.1.40, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +2 -1
    Bug#28878: Fill with space instead of binary zeros.

ChangeSet@1.2529.34.6, 2007-10-04 13:13:04+03:00, aelkin@koti.dsl.inet.fi +1 -0
  manual merge

  sql/log.h@1.31, 2007-10-04 13:12:58+03:00, aelkin@koti.dsl.inet.fi +7 -1
    manual merge: moving 5.0 hunk into the correct file.

ChangeSet@1.1810.3202.16, 2007-10-04 11:32:49+02:00, pekka@sama.ndb.mysql.com +10 -0
  ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it

  mysql-test/r/ndb_condition_pushdown.result@1.15.1.8, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +22 -0
    if ScanFilter is too large, abort or optionaly discard it

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.5, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1025 -0
    if ScanFilter is too large, abort or optionaly discard it

  sql/ha_ndbcluster_cond.cc@1.4.1.2, 2007-10-04 10:52:14+02:00, pekka@sama.ndb.mysql.com +17 -3
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/kernel/signaldata/ScanTab.hpp@1.13.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/Ndb.hpp@1.39.14.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/NdbScanFilter.hpp@1.7.2.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +27 -2
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/ndbapi_limits.h@1.7.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.8.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +187 -21
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.33.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +4 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/ndberror.c@1.30.41.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -1
    if ScanFilter is too large, abort or optionaly discard it

ChangeSet@1.1810.3291.6, 2007-10-04 12:34:00+04:00, kaa@polly.(none) +4 -0
  Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
  
  This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.

  mysql-test/r/variables.result@1.76.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +2 -0
    Fixed the test.

  mysql-test/t/variables.test@1.51.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +1 -0
    Fixed the test.

  mysys/my_getopt.c@1.55.1.8, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +16 -0
    Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.

  sql/set_var.cc@1.125.32.1, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +15 -0
    Issue an SQL warning if a user assignes a value greater than the variable's maximum value.

ChangeSet@1.1810.3336.8, 2007-10-04 13:06:01+05:00, bar@mysql.com +3 -0
  Bug#29323 mysql client only accetps ANSI encoded files
  Fix: ignore BOM marker in the first line.

  client/mysql.cc@1.199.29.1, 2007-10-04 13:05:59+05:00, bar@mysql.com +11 -0
    Skip BOM marker in the very first line.

  mysql-test/r/mysql.result@1.17.2.15, 2007-10-04 13:05:59+05:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/mysql.test@1.4.1.29, 2007-10-04 13:05:59+05:00, bar@mysql.com +9 -0
    Adding test

ChangeSet@1.1810.3281.2, 2007-10-04 09:15:26+02:00, mhansson@linux-st28.site +3 -0
  Bug #30942: select str_to_date from derived table returns varying results
  
  The function str_to_date has a field to say whether it's invoked constant 
  arguments. But this member was not initialized, causing the function to
  think that it could use a cache of the format type when said cache was in 
  fact not initialized.
  Fixed by initializing the field to false.

  mysql-test/r/type_date.result@1.13.4.2, 2007-10-04 09:15:24+02:00, mhansson@linux-st28.site +10 -0
    Bug#30942: Test result

  mysql-test/t/type_date.test@1.14.3.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +13 -0
    Bug#30942: Test case

  sql/item_timefunc.h@1.63.5.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +1 -1
    Bug#30942: Initialized const_item to false

ChangeSet@1.1810.3348.2, 2007-10-04 12:09:22+05:00, ramil@mysql.com +5 -0
  merging: results adjusted

  mysql-test/r/ctype_big5.result@1.11.1.4, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_euckr.result@1.2.2.2, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gb2312.result@1.2.1.2, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gbk.result@1.4.1.2, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_uca.result@1.18.1.3, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

ChangeSet@1.1810.3350.1, 2007-10-04 12:01:28+05:00, holyfoot@mysql.com +4 -0
  Bug #31155 gis types in union'd select cause crash.
  
  We use get_geometry_type() call to decide the exact type
  of a geometry field to be created (POINT, POLYGON etc)
  Though this function was only implemented for few items.
  In the bug's case we need to call this function for the
  Item_sum instance, where it was not implemented, what is
  the reason of the crash.
  Fixed by implementing virtual Item::get_geometry_type(),
  so it can be called for any Item.

  sql/item.cc@1.113.1.170, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -8
    Bug #31155 gis types in union'd select cause crash.
    
    Unified virtual ::get_geometry_type() function used

  sql/item.h@1.183.40.1, 2007-10-04 11:51:56+05:00, holyfoot@mysql.com +4 -2
    Bug #31155 gis types in union'd select cause crash.
    virtual Item::geometry_type() added instead of
    various geometry_type() fucntions.

  sql/item_geofunc.cc@1.27.1.5, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +7 -11
    Bug #31155 gis types in union'd select cause crash.
    
    virtual Item::geometry_type() implemented for geo-Items.
    Mostly previous ::get_geometry_type() implementation changed

  sql/item_geofunc.h@1.13.1.3, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -4
    Bug #31155 gis types in union'd select cause crash.
    
    get_geometry_type() declarations unified

ChangeSet@1.1616.3100.1, 2007-10-04 08:27:03+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
  
  The combination of --single-transaction and --master-data requires
  START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
  mysqld 4.1 on. When trying this against an older server, print
  diagnostic, then, if --force is not given, abort.
  
  No test-case given since it would require a mysqld < 4.1.

  client/mysqldump.c@1.143.15.1, 2007-10-04 08:27:01+02:00, tnurnberg@sin.intern.azundris.com +12 -0
    Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
    
    The combination of --single-transaction and --master-data requires
    START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
    mysqld 4.1 on. When trying this against an older server, print
    diagnostic, then, if --force is not given, abort.

ChangeSet@1.1616.3099.1, 2007-10-04 10:20:00+05:00, ramil@mysql.com +11 -0
  Fix for bug #31069: crash in 'sounds like'
  and for bug #31070: crash during conversion of charsets
  
  Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
  functions leads to server crash due to improper argument check.
  
  Fix: properly check arguments passed to my_mb_wc_XXX() functions.

  strings/ctype-cp932.c@1.1.9.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  mysql-test/include/ctype_common.inc@1.3, 2007-10-04 10:19:59+05:00, ramil@mysql.com +9 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test case.

  mysql-test/r/ctype_big5.result@1.11.2.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_euckr.result@1.2.2.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gb2312.result@1.2.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gbk.result@1.3.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_uca.result@1.13.1.2, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  strings/ctype-big5.c@1.67.1.14, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-euc_kr.c@1.59.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-gb2312.c@1.56.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +1 -3
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-sjis.c@1.72.1.11, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

ChangeSet@1.1810.3347.1, 2007-10-03 21:38:32+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#30992 Wrong implementation of pthread_mutex_trylock()
  It's not possible to use WaitForSingleObject to wait
  on a CRITICAL_SECTION, instead use the TryEnterCriticalSection function.
   - if "mutex" was already taken => return EBUSY
   - if "mutex" was aquired => return 0

  include/config-win.h@1.71.1.15, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +3 -0
    Make windows.h define TryEnterCriticalSection

  mysys/my_winthread.c@1.15, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +10 -12
    Use the TryEnterCriticalSection function to implement pthread_mutex_trylock
    Prevent recursive behaviour by looking at the RecursionCount variable
    in the CRITICAL_SECTION struct and return EBUSY from function if
    the mutex was already locked once.

ChangeSet@1.2592.3.9, 2007-10-03 12:08:00-07:00, brian@zim.(none) +3 -0
  New test case to confirm loop behavior is correct (it is).
  
  More tests is always good :)
  
  mysqlslap.c:
    Made if a bit easier to read.
  mysqlslap.result:
    New result set or test
  mysqlslap.test:
    I was asked to see if the generate code was generating the correct number of statements (it does). I wrote this test to confirm it.

  client/mysqlslap.c@1.70, 2007-10-03 12:06:20-07:00, brian@zim.(none) +1 -1
    Made if a bit easier to read.

  mysql-test/r/mysqlslap.result@1.13.1.1, 2007-10-03 12:06:32-07:00, brian@zim.(none) +5 -0
    New result set or test

  mysql-test/t/mysqlslap.test@1.21, 2007-10-03 12:06:47-07:00, brian@zim.(none) +14 -0
    I was asked to see if the generate code was generating the correct number of statements (it does). I wrote this test to confirm it.

ChangeSet@1.2588.3.25, 2007-10-03 13:02:57-04:00, jas@rowvwade. +4 -0
  Added debugging trace trigger mechanism.  The global
  "falcon_debug_trace" is examined by the database ticker
  thread once a second.  If the variable falcon_debug_trace
  is non-zero, it calls Database::debugTrace() to do something,
  which also resets the falcon_debug_trace back to zero.
  
  The mechanism is intended to be extensible for whatever ails
  or inspires you.

  storage/falcon/Database.cpp@1.3, 2007-10-03 13:02:47-04:00, jas@rowvwade. +18 -1
    Added debugging trace trigger mechanism.  The global
    "falcon_debug_trace" is examined by the database ticker
    thread once a second.  If the variable falcon_debug_trace
    is non-zero, it calls Database::debugTrace() to do something,
    which also resets the falcon_debug_trace back to zero.
    
    The mechanism is intended to be extensible for whatever ails
    or inspires you.

  storage/falcon/Database.h@1.3, 2007-10-03 13:02:47-04:00, jas@rowvwade. +3 -0
    Added debugging trace trigger mechanism.  The global
    "falcon_debug_trace" is examined by the database ticker
    thread once a second.  If the variable falcon_debug_trace
    is non-zero, it calls Database::debugTrace() to do something,
    which also resets the falcon_debug_trace back to zero.
    
    The mechanism is intended to be extensible for whatever ails
    or inspires you.

  storage/falcon/Transaction.cpp@1.3, 2007-10-03 13:02:47-04:00, jas@rowvwade. +3 -2
    Fixed bug in transaction trace debugging code.

  storage/falcon/ha_falcon.cpp@1.5, 2007-10-03 13:02:48-04:00, jas@rowvwade. +12 -1
    Added debugging trace trigger mechanism.  The global
    "falcon_debug_trace" is examined by the database ticker
    thread once a second.  If the variable falcon_debug_trace
    is non-zero, it calls Database::debugTrace() to do something,
    which also resets the falcon_debug_trace back to zero.
    
    The mechanism is intended to be extensible for whatever ails
    or inspires you.

ChangeSet@1.2547.29.5, 2007-10-03 12:57:11-04:00, cbell@mysql_cab_desk. +2 -0
  WL#3327 : Online Backup 
  
  This patch modifies the cmake files so that the backup source files are in its
  own project file.

  sql/backup/CMakeLists.txt@1.1, 2007-10-03 12:56:57-04:00, cbell@mysql_cab_desk. +32 -0
    WL#3327 : Online Backup 
    
    This patch adds a cmake file for the backup source files so that it is in its 
    own project file.
    

  sql/backup/CMakeLists.txt@1.0, 2007-10-03 12:56:57-04:00, cbell@mysql_cab_desk. +0 -0

  sql/CMakeLists.txt@1.18.2.1, 2007-10-03 12:56:56-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3327 : Online Backup 
    
    This patch modifies the cmake file for the mysqld project to separate the backup
    source files into its own project file.

ChangeSet@1.2588.18.1, 2007-10-03 12:03:07-04:00, jas@rowvwade. +2 -0
  Work in progress on index update atomicity and false
  wait syndrome.

  storage/falcon/Table.cpp@1.5, 2007-10-03 12:02:58-04:00, jas@rowvwade. +68 -22
    Work in progress on index update atomicity and false
    wait syndrome.

  storage/falcon/Table.h@1.4, 2007-10-03 12:02:58-04:00, jas@rowvwade. +2 -1
    Work in progress on index update atomicity and false
    wait syndrome.

ChangeSet@1.2529.2.40, 2007-10-03 15:49:51+05:00, gshchepa@gleb.loc +1 -0
  mysqldump.c:
    Post-merge fix.

  client/mysqldump.c@1.275.21.2, 2007-10-03 15:49:31+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.1810.3336.6, 2007-10-03 11:57:14+02:00, sven@murkla.(none) +2 -0
  BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)
  Problem: one thread could read uninitialized memory from (the stack of) another
  thread.
  Fix: swapped order of initializing the memory and making it available to the
  other thread.
  Fix: put lock around the statement that makes the memory available to the other
  thread.
  Fix: all fields of the struct are now initialized in the constructor, to avoid
  future problems.

  sql/sql_class.h@1.230.79.1, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +7 -1
    Initialize all members in constructor for more safe future code.

  sql/sql_repl.cc@1.133.1.30, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +8 -2
    Swap order so that linfo is first initialized, then assigned, instead of the
    other way around.
    Put a lock around the assignment. We use LOCK_thread_count since log_in_use
    uses it: log_in_use may be running concurrently, called from
    MYSQL_LOG::purge_logs.

ChangeSet@1.2547.29.4, 2007-10-03 11:10:48+02:00, rafal@quant.(none) +1 -0
  Fixing a pb build problem.

  sql/backup/sql_backup.cc@1.20, 2007-10-03 11:10:44+02:00, rafal@quant.(none) +1 -1
    my_free() is a macro and thus we should not qualify it explicitly.

ChangeSet@1.1616.3098.1, 2007-10-03 13:35:35+05:00, holyfoot@mysql.com +3 -0
  Bug #30955 geomfromtext() crasher.
  
  end-of-line check missed in Gis_read_stream::get_next_word,
  what can lead to crashes (expecially with NULL strings).
  
  End-of-line check added

  mysql-test/r/gis.result@1.15.1.11, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +6 -0
    Bug #30955 geomfromtext() crasher.
    
    test result

  mysql-test/t/gis.test@1.17.1.7, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +8 -0
    Bug #30955 geomfromtext() crasher.
    
    test case

  sql/gstream.cc@1.7.1.1, 2007-10-03 13:30:31+05:00, holyfoot@mysql.com +1 -1
    Bug #30955 geomfromtext() crasher

ChangeSet@1.2529.11.11, 2007-10-03 09:54:33+02:00, mskold@mysql.com +1 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

  sql/ha_ndbcluster.cc@1.408.62.4, 2007-10-03 09:53:49+02:00, mskold@mysql.com +8 -7
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

ChangeSet@1.1810.3342.2, 2007-10-03 09:29:10+02:00, mskold@mysql.com +1 -0
  Removed tabs

  sql/ha_ndbcluster.cc@1.175.86.2, 2007-10-03 09:28:09+02:00, mskold@mysql.com +2 -2
    Removed tabs

ChangeSet@1.2529.35.5, 2007-10-03 17:26:17+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29509 ndb_mgm help needs to list the -a option for DN restart
  
  Index: ndb/storage/ndb/src/mgmclient/CommandInterpreter.cpp
  ===================================================================

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@1.79.1.19, 2007-08-14 14:58:43+10:00, stewart@flamingspork.com +7 -5
    BUG#29509 ndb_mgm help needs to list the -a option for DN restart

ChangeSet@1.2529.35.4, 2007-10-03 17:26:03+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 make formatting of key=value consistent in getTextTransReportCounters
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.33.1.12, 2007-08-14 14:49:39+10:00, stewart@flamingspork.com +1 -1
    BUG#25064 make formatting of key=value consistent in getTextTransReportCounters

ChangeSet@1.2529.35.3, 2007-10-03 17:25:46+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 Remove newlines from cluster log
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.33.1.11, 2007-08-14 14:47:54+10:00, stewart@flamingspork.com +5 -5
    BUG#25064 Remove newlines from cluster log

ChangeSet@1.1810.3340.3, 2007-10-03 11:36:42+05:00, gshchepa@gleb.loc +2 -0
  mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.49, 2007-10-03 11:36:20+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.48, 2007-10-03 11:36:18+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

ChangeSet@1.1810.3202.15, 2007-10-03 16:16:48+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29565 managment server can log entries multiple times after mgmd restart
  
  Close the event log on shutdown of mgmd (in stopEventLog())
  
  Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp
  ===================================================================

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.55.1, 2007-10-03 16:09:34+10:00, stewart@flamingspork.com +3 -3
    BUG#29565 managment server can log entries multiple times after mgmd restart

ChangeSet@1.1810.3345.1, 2007-10-02 23:47:30-06:00, tsmith@sita.local +4 -0
  Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c
  
  Add --skip-innodb-adaptive-hash-index option, which is a way to
  work around the bug (by disabling the adaptive hash feature entirely).
  
  This may be useful even once the bug is fixed, for benchmarking purposes.
  There are some workloads for which the adaptive hash index is not effective.

  sql/mysqld.cc@1.439.128.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +8 -1
    Add --skip-innodb-adaptive-hash-index option.

  sql/set_var.cc@1.125.31.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +1 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.cc@1.202.52.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +3 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.h@1.93.7.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +2 -1
    Add --skip-innodb-adaptive-hash-index option.

ChangeSet@1.2547.13.20, 2007-10-02 21:27:31-03:00, davi@moksha.local +21 -0
  Bug#25858 Some DROP TABLE under LOCK TABLES can cause deadlocks
  
  When a client (connection) holds a lock on a table and attempts to
  drop (obtain a exclusive lock) on a second table that is already held
  by a second client and the second client then attempts to drop the table
  that is held by the first client, leads to a circular wait deadlock. This
  scenario is very similar to trying to drop (or rename) a table while
  holding read locks and are correctly forbidden.
  
  The solution is to allow a drop table operation to continue only if the
  table being dropped is write (exclusively) locked, or if the table is
  temporary, or if the client is not holding any locks. Using this scheme
  prevents the creation of a circular chain in which each client is waiting
  for one table that the next client in the chain is holding.
  
  This is incompatible change, as can be seen by number of tests cases
  that needed to be fixed, but is consistent with respect to behavior of
  the different scenarios in which the circular wait might happen.

  mysql-test/include/locktrans.inc@1.5, 2007-10-02 21:27:21-03:00, davi@moksha.local +1 -0
    Fix test case: lock table for write as the connection is already holding
    other locks.

  mysql-test/r/drop.result@1.34, 2007-10-02 21:27:21-03:00, davi@moksha.local +20 -0
    Test case result for Bug#25858

  mysql-test/r/group_by.result@1.89.1.1, 2007-10-02 21:27:21-03:00, davi@moksha.local +2 -1
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/insert_notembedded.result@1.3, 2007-10-02 21:27:21-03:00, davi@moksha.local +1 -0
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/lock.result@1.22, 2007-10-02 21:27:22-03:00, davi@moksha.local +6 -0
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/lock_multi.result@1.31, 2007-10-02 21:27:22-03:00, davi@moksha.local +1 -0
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/locktrans_myisam.result@1.6.1.1, 2007-10-02 21:27:22-03:00, davi@moksha.local +1 -0
    Fix test case result wrt drop table under lock tables -- grab exclusive
    lock in preparation for drop.

  mysql-test/r/myisam.result@1.112, 2007-10-02 21:27:22-03:00, davi@moksha.local +2 -0
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/query_cache_notembedded.result@1.10, 2007-10-02 21:27:22-03:00, davi@moksha.local +1 -0
    ix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/r/rpl_locktrans_innodb.result@1.6, 2007-10-02 21:27:22-03:00, davi@moksha.local +1 -0
    Fix test case result wrt drop table under lock tables -- grab exclusive
    lock in preparation for drop.

  mysql-test/r/rpl_locktrans_myisam.result@1.6.1.1, 2007-10-02 21:27:22-03:00, davi@moksha.local +1 -0
    Fix test case result wrt drop table under lock tables -- grab exclusive
    lock in preparation for drop.

  mysql-test/r/view.result@1.226.1.1, 2007-10-02 21:27:22-03:00, davi@moksha.local +3 -0
    Fix test case result wrt drop table under lock tables -- unlock tables
    before dropping table.

  mysql-test/t/drop.test@1.24, 2007-10-02 21:27:23-03:00, davi@moksha.local +33 -0
    Add test case for Bug#25858

  mysql-test/t/group_by.test@1.67.1.1, 2007-10-02 21:27:23-03:00, davi@moksha.local +2 -1
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/insert_notembedded.test@1.3, 2007-10-02 21:27:23-03:00, davi@moksha.local +1 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/lock.test@1.19, 2007-10-02 21:27:23-03:00, davi@moksha.local +6 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/lock_multi.test@1.33, 2007-10-02 21:27:23-03:00, davi@moksha.local +1 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/myisam.test@1.88, 2007-10-02 21:27:23-03:00, davi@moksha.local +2 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/query_cache_notembedded.test@1.9, 2007-10-02 21:27:23-03:00, davi@moksha.local +1 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  mysql-test/t/view.test@1.207.1.1, 2007-10-02 21:27:23-03:00, davi@moksha.local +3 -0
    Fix test case: unlock tables in preparation for a drop table. In some
    circumstances, dropping tables while holding locks leads to a deadlock.

  sql/lock.cc@1.112, 2007-10-02 21:27:23-03:00, davi@moksha.local +19 -0
    When trying to obtain a name lock under lock tables, ensure that the table is
    properly exclusively locked and fail otherwise.

ChangeSet@1.1810.3340.2, 2007-10-03 02:50:38+05:00, gshchepa@gleb.loc +3 -0
  mysqldump.c, mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  client/mysqldump.c@1.214.29.2, 2007-10-03 02:48:31+05:00, gshchepa@gleb.loc +1 -1
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.48, 2007-10-03 02:49:24+05:00, gshchepa@gleb.loc +14 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.47, 2007-10-03 02:48:44+05:00, gshchepa@gleb.loc +6 -3
    Bug #31077: post-commit fix.

ChangeSet@1.2588.17.1, 2007-10-02 17:37:26-04:00, jas@rowvwade. +7 -0
  Reworked Table::insert to eliminate window where duplicate
  values could be storaged in unique index.

  storage/falcon/StorageHandler.cpp@1.2, 2007-10-02 17:37:16-04:00, jas@rowvwade. +0 -1
    Remove vestiges of old table space implementation.

  storage/falcon/StorageHandler.h@1.2, 2007-10-02 17:37:16-04:00, jas@rowvwade. +0 -1
    Remove vestiges of old table space implementation.

  storage/falcon/StorageTable.cpp@1.2, 2007-10-02 17:37:17-04:00, jas@rowvwade. +5 -0
    Attempted work around of #pragma problem.  Not the right
    answer, but not worth taking out, either.

  storage/falcon/StorageTable.h@1.2, 2007-10-02 17:37:17-04:00, jas@rowvwade. +1 -0
    Attempted work around of #pragma problem.  Not the right
    answer, but not worth taking out, either.

  storage/falcon/StorageTableShare.cpp@1.2, 2007-10-02 17:37:17-04:00, jas@rowvwade. +5 -5
    Remove vestiges of old table space implementation.

  storage/falcon/Table.cpp@1.4, 2007-10-02 17:37:18-04:00, jas@rowvwade. +21 -24
    Reworked Table::insert to eliminate window where duplicate
    values could be storaged in unique index.

  storage/falcon/ha_falcon.cpp@1.4, 2007-10-02 17:37:18-04:00, jas@rowvwade. +9 -3
    Worked around a "#pragma pack" somewhere in mysql_priv.h, etc.

ChangeSet@1.2592.3.8, 2007-10-02 14:37:08-07:00, brian@zim.(none) +1 -0
  mysqlslap.c:
    That is what I get for not using citool while on a phone call...

  client/mysqlslap.c@1.69, 2007-10-02 14:36:37-07:00, brian@zim.(none) +0 -1
    That is what I get for not using citool while on a phone call...

ChangeSet@1.2592.3.7, 2007-10-02 14:13:46-07:00, brian@zim.(none) +1 -0
  mysqlslap.c:
    Removing extra call to mysql_thread_init() (was not needed). Added explicit call for startup with my_init() and added thread specific MySQL cleanup.

  client/mysqlslap.c@1.68, 2007-10-02 13:57:41-07:00, brian@zim.(none) +6 -7
    Removing extra call to mysql_thread_init() (was not needed). Added explicit call for startup with my_init() and added thread specific MySQL cleanup.

ChangeSet@1.1810.3328.5, 2007-10-02 20:44:37+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#27597 mysqld-debug broken
   - "on" -> "restore" to avoid warning in MSVC when compiling with debug

  mysys/my_init.c@1.44.1.6, 2007-10-02 20:44:35+02:00, msvensson@pilot.mysql.com +1 -1
    Fix spelling error that cause MSVC to throw a warning
    when compiling with debug.
    Use "restore" instaed of "on" to turn runtime checks back on

ChangeSet@1.1810.3308.24, 2007-10-02 17:45:49+03:00, gkodinov@magare.gmz +1 -0
  fixed a warning in the fix for bug 28702

  sql/sql_select.cc@1.312.166.11, 2007-10-02 17:45:48+03:00, gkodinov@magare.gmz +1 -1
    fixed a warning in the fix for bug 28702

ChangeSet@1.2547.29.3, 2007-10-02 15:30:45+02:00, rafal@quant.(none) +1 -0
  BUG#30938 (BACKUP DATABASE crashes server if a table with a unloaded 
  SE exists):
  
  In case of errors, e.g., when openning temporary tables, users could 
  appreciate more precise information about the cause of a problem. 
  However function open_temporary_table() used here doesn't provide such 
  information. When it does, we should improve the way we report errors
  from this function. This patch adds a comment to remind us about that.

  sql/backup/sql_backup.cc@1.19, 2007-10-02 15:30:41+02:00, rafal@quant.(none) +8 -0
    Comment added.

ChangeSet@1.1810.3308.22, 2007-10-02 14:57:10+03:00, gkodinov@magare.gmz +1 -0
  Fixed a valgrind warning with the fix for bug 28702.

  sql/sql_select.cc@1.312.166.10, 2007-10-02 14:57:09+03:00, gkodinov@magare.gmz +10 -2
    Fixed a valgrind warning with the fix for bug 28702.

ChangeSet@1.1810.3342.1, 2007-10-02 13:36:13+02:00, mskold@mysql.com +4 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/r/ndb_update.result@1.5.1.8, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/t/ndb_update.test@1.9.1.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +5 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.cc@1.175.86.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +36 -4
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.h@1.82.4.19, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -1
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

ChangeSet@1.1810.3336.4, 2007-10-02 15:20:45+05:00, bar@mysql.com +1 -0
  Bug#29675 collation_connection is defined twice for the same value
  Removing redundant initialization.

  sql/mysqld.cc@1.439.127.1, 2007-10-02 15:20:43+05:00, bar@mysql.com +0 -1
    Removing redundant variable initialization.

ChangeSet@1.1810.3336.3, 2007-10-02 13:28:58+05:00, bar@mysql.com +2 -0
  Fixing comments to use "#" instead of "--"

  mysql-test/t/ctype_uca.test@1.16.2.1, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

  mysql-test/t/subselect.test@1.129.1.29, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

ChangeSet@1.1810.3341.1, 2007-10-01 20:03:50+00:00, evgen@moonbone.local +3 -0
  Bug#31095: Unexpected NULL constant caused server crash.
  
  The Item_func_rollup_const class is used for wrapping constants to avoid
  wrong result for ROLLUP queries with DISTINCT and a constant in the select
  list. This class is also used to wrap up a NULL constant but its null_value
  wasn't set accordingly. This led to a server crash.
  
  Now the null_value of an object of the Item_func_rollup_const class is set
  by its fix_length_and_dec member function.

  mysql-test/r/olap.result@1.33.1.7, 2007-10-01 20:02:07+00:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  mysql-test/t/olap.test@1.29, 2007-10-01 20:02:05+00:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  sql/item_func.h@1.136.2.38, 2007-10-01 20:02:14+00:00, evgen@moonbone.local +2 -0
    Bug#31095: Unexpected NULL constant caused server crash. 
    Now the null_value of an object of the Item_func_rollup_const class is set
    by its fix_length_and_dec member function.

ChangeSet@1.1810.3340.1, 2007-10-01 20:35:51+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31077.
  mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
  to the end of output if the --comments switch is on.
  The only way to suppress this line is to use --skip-comments/--compact
  switch.
  
  New switch has been added to the mysqldump client command line:
  --dump-date.
  
  For the compatibility with previous releases, by default the --dump-date
  is on.
  The --dump-date switch forces mysqldump to add date to the
  "-- Dump completed on ..." string at the end of output.
  The --skip-dump-date switch supresses the output of date string
  and uses short form of that commentary: "-- Dump completed".
  --skip-comments or --compact switches disable the whole commentary
  as usual.

  client/client_priv.h@1.43.2.6, 2007-10-01 20:32:32+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #31077.
    New OPT_DUMP_DATE option has been added to implement
    the mysqldump client --dump-date switch.

  client/mysqldump.c@1.214.29.1, 2007-10-01 20:32:34+05:00, gshchepa@gleb.loc +13 -5
    Fixed bug #31077.
    The opt_dump_date variable has been added to imlements
    the mysqldump cliemt --dump-date switch.
    By default this switch is on (for compatibility with previous
    releases).
    The --dump-date switch forces mysqldump to add date to the
    "-- Dump completed on ..." string at the end of output.
    The --skip-dump-date switch supresses the output of date string
    and uses short form of that commentary: "-- Dump completed".
    --skip-comments or --compact switches disable the whole commentary
    as usual.

  mysql-test/r/mysqldump.result@1.83.1.47, 2007-10-01 20:33:05+05:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #31077.

  mysql-test/t/mysqldump.test@1.76.1.46, 2007-10-01 20:33:01+05:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #31077.

ChangeSet@1.2529.2.37, 2007-10-01 17:37:48+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/r/view_grant.result@1.38, 2007-10-01 17:37:46+03:00, gkodinov@magare.gmz +13 -11
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.2547.29.2, 2007-10-01 16:14:32+02:00, rafal@quant.(none) +9 -0
  BUG#30938 (BACKUP DATABASE crashes server if a table with a unloaded 
  SE exists).
  
  Backup of a database failed if it contained a table using invalid storage
  engine (e.g. plugin not loaded or unknown engine). This was because code
  collecting list of tables in a database (Backup_archive::add_db_items() in 
  sql_backup.cc) didn't exclude tables without a valid storage engine and later 
  kernel attempted to open such tables. This patch fixes this by filtering out 
  tables for which 'engine' field in I_S.TABLES is NULL.
  
  Additionally, the way we access handlerton structure of table's storage engine 
  has been changed. Before, we located SE plugin sing its name and then read 
  handlerton pointer from the plugin:
  
    plugin= ::ha_resolve_by_name(::current_thd,&name_lex);
    m_hton= plugin ? plugin_data(plugin, handlerton*) : 0;
  
  Now we open a table and read handlerton pointer from opened TABLE structure. 
  This is safer because it gives the open table code a chance to detect/deal with 
  non-existent or non-functional storage engines. If a table was opened 
  successfully we assume that its storage engine is fully functional.
  
  Tables are opened just before they are added to the archive inside 
  Backup_archive::add_db_items(). Each table is closed after it has been added so 
  that only one table is open at a time.

  sql/backup/api_types.h@1.4, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +3 -0
    Added another describe() method which checks buffer size using its type.

  sql/backup/backup_aux.h@1.3, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +0 -6
    String operators moved to sql_string.h.

  sql/backup/backup_kernel.h@1.7, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +4 -1
    - Changed signature of Backup_info::add_table(), now all needed data is
      read fomr Table_ref instance.
    - Added Backup_info::skip_table constant to be returned by add_table()
      if the table should be ignored.

  mysql-test/r/backup_no_engine.result@1.1, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +30 -0
    Results for the test.

  mysql-test/r/backup_no_engine.result@1.0, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +0 -0

  mysql-test/t/backup_no_engine.test@1.1, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +35 -0
    Test that backup works if database contains a table with invalid storage 
    engine.

  mysql-test/t/backup_no_engine.test@1.0, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +0 -0

  sql/backup/sql_backup.cc@1.18, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +150 -74
    - Adding to Backup_info::Table_ref methods for opening and closing the 
      table.
    - Change implementation of Backup_info::Table_ref::hton() method to get
      handlerton pointer from opened TABLE structure.
    - Change code which reads database or table list from I_S tables. For
      each record, first interesting fields are read and examined to 
      determine if it should be skipped or not. Then Db_ref or Table_ref
      instance is created using data read from the record.
    - When scanning tables in a database, skip tables with undefined storage
      engine. Produce warning in error log.
    - Handle the situation when Backup_info::add_table() informs that the
      table should be skipped.
    - Implement open()/close() methods for Backup_info::Table_ref.

  mysql-test/std_data/bug30938.frm@1.1, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +201 -0
    .frm file with table which uses no-existing engine. Used in backup_no_engine.test

  mysql-test/std_data/bug30938.frm@1.0, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +0 -0

  sql/share/errmsg.txt@1.109.1.1, 2007-10-01 16:13:20+02:00, rafal@quant.(none) +4 -0
    Add new messages.

  sql/sql_string.h@1.69, 2007-10-01 16:13:19+02:00, rafal@quant.(none) +13 -0
    Added convenience operators for comparing Strings.

ChangeSet@1.1810.3245.3, 2007-10-01 15:11:15+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#30992 (Wrong implementation of pthread_mutex_trylock()):
  
  Adding support for correct handling of pthread_mutex_trylock() on Win32
  systems as well as when using the safe mutexes. 

  include/my_pthread.h@1.90.7.1, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +5 -4
    Adding win_pthread_mutex_trylock() function as wrapper function for
    Windows implementation of pthread_mutex_trylock().
    
    Adding flag to safe_mutex_lock() that is shall not abort if the mutex
    is already locked and instead return EBUSY since this is the POSIX
    behaviour.

  mysys/my_winthread.c@1.14, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Added Win32 wrappper function to handle pthread_mutex_trylock().

  mysys/thr_mutex.c@1.27.1.3, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +42 -7
    Added parameter 'try_lock' to safe_mutex_lock() to allow it to do double-
    duty as a pthread_mutex_trylock() in addition to working as
    pthread_mutex_lock().
    
    The code needs to return EBUSY instead of throwing an error in the event
    that the mutex is re-locked (we do not have recursive mutexes), but it
    also requires some special handling to avoid race conditions when
    calling the real pthread_mutex_{lock,trylock}().

ChangeSet@1.2528.143.57, 2007-10-01 15:41:18+04:00, anozdrin@station. +2 -0
  BUG#30472: libmysql doesn't reset charset, insert_id after
  succ. mysql_change_user() call.
  
  Use 2 bytes for character set number.

  libmysql/libmysql.c@1.290.4.3, 2007-10-01 15:41:16+04:00, anozdrin@station. +2 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

  sql/sql_parse.cc@1.693.16.5, 2007-10-01 15:41:16+04:00, anozdrin@station. +11 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

ChangeSet@1.1810.3339.1, 2007-10-01 12:44:29+02:00, thek@adventure.(none) +1 -0
  Bug #30768 query cache patch for bug #21074 crashes on windows
  
  "pthread_mutex_trylock" isn't implemented correctly for the Windows platform.
  
  This temporary patch reverts the patch for bug#21074 for Windows until
  pthread_mutex_trylock is properly implemented. 

  sql/sql_cache.cc@1.76.1.33, 2007-10-01 12:44:28+02:00, thek@adventure.(none) +6 -0
    Added code branch for the Windows platform to avoid a faulty pthread_mutex_trylock
    implementation.

ChangeSet@1.1810.3338.1, 2007-10-01 15:35:42+05:00, bar@mysql.com +3 -0
  Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
  
  Problem: some valid euc-kr characters were rejected because
  condition checking multi-byte tail didn't allow 
  multi-byte characters having the second byte in the ranges
  [0x41..0x5A]  and [0x61..0x7A].
  
  Fix: allow these byte ranges for mb tails

  mysql-test/r/ctype_euckr.result@1.2.1.1, 2007-10-01 15:35:41+05:00, bar@mysql.com +41 -0
    Adding tests

  mysql-test/t/ctype_euckr.test@1.1.1.1, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -0
    Adding tests

  strings/ctype-euc_kr.c@1.65.1.5, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -4
    Fixing wrong tail character pattern

ChangeSet@1.1810.3308.20, 2007-10-01 12:51:59+03:00, gkodinov@magare.gmz +2 -0
  removed undeterministic test result from the fux for bug 30587

  mysql-test/r/func_math.result@1.33.1.6, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -8
    removed undeterministic test result from the fux for bug 30587

  mysql-test/t/func_math.test@1.27.1.3, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -2
    removed undeterministic test result from the fux for bug 30587

ChangeSet@1.1810.3308.19, 2007-10-01 11:32:29+03:00, gkodinov@magare.gmz +1 -0
  fixed pb problem with the fix for bug 30587

  mysql-test/r/func_math.result@1.33.1.5, 2007-10-01 11:32:27+03:00, gkodinov@magare.gmz +4 -4
    fixed pb problem with the fix for bug 30587

ChangeSet@1.2403.16.177, 2007-10-01 10:23:02+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - fix dd drop table race condition
    add list of pages being unmaped, so we can wait for it to be empty before dropping extents

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.57.1.11, 2007-10-01 10:23:00+02:00, jonas@perch.ndb.mysql.com +2 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.22.1.5, 2007-10-01 10:23:00+02:00, jonas@perch.ndb.mysql.com +6 -0
    add list of pages being unmapped

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.6, 2007-10-01 10:23:00+02:00, jonas@perch.ndb.mysql.com +13 -0
    wait for unmap pages

ChangeSet@1.1810.3202.14, 2007-10-01 14:32:22+10:00, stewart@willster.(none) +1 -0
  remove debug printout

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.52.1, 2007-10-01 14:32:19+10:00, stewart@willster.(none) +0 -1
    remove accidently left in printout

ChangeSet@1.2403.16.176, 2007-10-01 00:05:14+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - fix introduced bug in ndbdd_backup

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.8, 2007-10-01 00:05:12+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix ndb_dd_backup

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.7, 2007-10-01 00:05:12+02:00, jonas@perch.ndb.mysql.com +0 -26
    remove duplicates

ChangeSet@1.2528.143.56, 2007-10-01 00:16:50+04:00, anozdrin@station. +1 -0
  Fix compilation warnings.

  client/mysqltest.c@1.313.2.2, 2007-10-01 00:16:47+04:00, anozdrin@station. +3 -5
    Fix compilation warnings.

ChangeSet@1.2528.143.55, 2007-09-29 23:31:08+04:00, anozdrin@station. +4 -0
  Fix compile warnings.

  client/client_priv.h@1.74.1.2, 2007-09-29 23:31:05+04:00, anozdrin@station. +0 -4
    Fix compile warnings.

  client/mysqltest.c@1.313.2.1, 2007-09-29 23:31:05+04:00, anozdrin@station. +6 -4
    Fix compile warnings.

  libmysql/client_settings.h@1.39, 2007-09-29 23:31:05+04:00, anozdrin@station. +4 -0
    Fix compile warnings.

  libmysql/libmysql.c@1.290.4.2, 2007-09-29 23:31:05+04:00, anozdrin@station. +3 -3
    Fix compile warnings.

ChangeSet@1.2528.227.3, 2007-09-29 16:04:31-03:00, davi@moksha.local +1 -0
  The fix for BUG 21136 (ChangeSet@1.2611.1.1) introduced a regression that
  caused a few tests to fail because the thd->extra_lock wasn't being set to
  NULL after the table was unlocked. This poses a serious problem because later
  attempts to access thd->extra_lock (now a dangling pointer) will probably
  result in a crash (undefined behavior) -- and that's what actually happens
  in some test cases.
  
  The solution is to set the select_create::m_plock pointee to NULL, which
  means that thd->extra_lock is set to NULL when the lock data is not for a
  temporary table.

  sql/sql_insert.cc@1.282.1.16, 2007-09-29 16:04:24-03:00, davi@moksha.local +4 -2
    Set the m_plock pointee to NULL, thus avoiding a dangling thd->extra_lock pointer
    in some cases.

ChangeSet@1.2403.16.175, 2007-09-29 12:32:20+02:00, jonas@perch.ndb.mysql.com +1 -0
  fix weird merge error
  TAG: mysql-5.1.15-ndb-6.1.21
  TAG: mysql-5.1.15-ndb-6.1.20

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.6, 2007-09-29 12:32:18+02:00, jonas@perch.ndb.mysql.com +0 -153
    fix weird merge error

ChangeSet@1.2403.16.174, 2007-09-29 12:30:23+02:00, jonas@perch.ndb.mysql.com +1 -0
  fix extra ";"

  storage/ndb/test/src/NDBT_Thread.cpp@1.2.2.1, 2007-09-29 12:30:21+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix extra ";"

ChangeSet@1.2403.16.173, 2007-09-29 11:29:17+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#31257
    handle partially complete LCP better in SR

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.26.1.5, 2007-09-29 11:29:15+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new variable

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.101.1.19, 2007-09-29 11:29:15+02:00, jonas@perch.ndb.mysql.com +34 -1
    remove ongoing LCP from node if it did nto complete first

ChangeSet@1.2403.16.172, 2007-09-29 11:27:50+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#30975
    - only update extent pages *after* flush of real page has been done
    - sync both create/drop of table into undolog (for disk tables)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.134.2.24, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +8 -3
    inform tup which fragments restores to which lcps

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.57.1.10, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +5 -4
    - handle unmap of pages correctly
      (i.e only update extent pages on _after_ unmap)
    - handle different lcp for different fragment (not 100%)

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.22.1.4, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +197 -65
    only update extent pages after unmap
    add more debugging 

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.5, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +21 -11
    sync create/drop table to undo log if present

  storage/ndb/src/kernel/blocks/lgman.cpp@1.23.2.2, 2007-09-29 11:27:47+02:00, jonas@perch.ndb.mysql.com +10 -2
    inform tup of all LCP records

  storage/ndb/src/kernel/blocks/pgman.cpp@1.21.1.10, 2007-09-29 11:27:47+02:00, jonas@perch.ndb.mysql.com +32 -4
    split disk_page_unmap into 2 
    - one before unmap
    - one after

  storage/ndb/src/kernel/blocks/tsman.cpp@1.13.1.2, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +38 -24
    remove concept of lsn for extent pages

  storage/ndb/src/kernel/blocks/tsman.hpp@1.9, 2007-09-29 11:27:48+02:00, jonas@perch.ndb.mysql.com +9 -15
    remove concept of lsn for extent pages

ChangeSet@1.2403.28.82, 2007-09-29 11:10:12+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#30975
    add even more tests

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.3.2, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +109 -21
    add more tests...

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.4.10, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +32 -0
    add more tests

ChangeSet@1.2592.3.6, 2007-09-29 00:26:52-07:00, brian@zim.(none) +4 -0
  BUG #8368
  
  "mysqldump needs --slave-data option"
  
  Added this option, named as "--dump-slave". The purpose of this option is to be
  able to produce a dump from a slave used for making backups of the master. Originally,
  dumping from the main master was fine, but as more data accumulated, the
  dump process would take over 30 minutes, locking up the master database hence website
  for 30 minutes.  A slave dedicated to producing backups was the answer, but I needed a
  dump that could be used to restore a slave instantly and in order to do that, it has to
  have three things contained in the dump:
  
  1. "STOP SLAVE;" at the beginning
  2. "CHANGE MASTER TO ...<the master - info from 'show slave status'>"
  3. "START SLAVE;" at the end
  
  These options in this changeset contain this.
  
  --apply-slave-statements adds "STOP SLAVE" to the beginning of the dump and "START SLAVE" 
  to the end of the dump.
  
  --include-master-host-port gives the user the option to have the host explicitely
  added to the "CHANGE MASTER TO ..." line.
  
  --dump-slave adds the "CHANGE MASTER ..." to the dump representing not
  the slave's master binlog info, but the slave's master's info from "SHOW SLAVE STATUS" 
  
  

  client/client_priv.h@1.84, 2007-09-29 00:19:48-07:00, brian@zim.(none) +3 -0
    New options for slave dumps

  client/mysqldump.c@1.295.1.1, 2007-09-29 00:24:07-07:00, brian@zim.(none) +183 -0
    BUG #8368
    
    mysqldump needs --slave-data option
    
    * Added --dump-slave option (name per Brian)
    * Added --apply-slave-statements to print "STOP SLAVE;" into the dump
    * Added --include-master-host-port option to include "MASTER_HOST=..." and "MASTER_PORT=..."
      to the dump since unlike --master-data, the host can't be assumed to be
      the local host
    * Added do_start_slave and do_stop_slave to stop the slave sql thread upon
      start of the dump process, and to start the slave sql upon finish of dump process -
      to keep the log information frozen during this time.
    * Added do_show_slave_status for obtaining slave information needed to compose "CHANGE MASTER ..."
      output to the master of this slave.
    * Added necessary long options and defines required for new options
    

  mysql-test/r/rpl_mysqldump_slave.result@1.1, 2007-09-29 00:17:22-07:00, brian@zim.(none) +11 -0
    Import patch dump-slave patch.txt

  mysql-test/r/rpl_mysqldump_slave.result@1.0, 2007-09-29 00:17:22-07:00, brian@zim.(none) +0 -0

  mysql-test/t/rpl_mysqldump_slave.test@1.1, 2007-09-29 00:17:14-07:00, brian@zim.(none) +19 -0
    Import patch dump-slave patch.txt

  mysql-test/t/rpl_mysqldump_slave.test@1.0, 2007-09-29 00:17:14-07:00, brian@zim.(none) +0 -0

ChangeSet@1.1810.3308.18, 2007-09-29 01:07:29+00:00, evgen@moonbone.local +2 -0
  view_grant.result, view_grant.test:
    Corrected test case for the bug#29908.

  mysql-test/r/view_grant.result@1.8.1.19, 2007-09-29 01:06:40+00:00, evgen@moonbone.local +6 -5
    Corrected test case for the bug#29908.

  mysql-test/t/view_grant.test@1.8.1.17, 2007-09-29 01:06:22+00:00, evgen@moonbone.local +3 -2
    Corrected test case for the bug#29908.

ChangeSet@1.1810.3335.1, 2007-09-28 23:24:40+00:00, evgen@moonbone.local +3 -0
  Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
  
  The change_to_use_tmp_fields function leaves the orig_table member of an
  expression's tmp table field filled for the new Item_field being created.
  Later orig_table is used by the Field::make_field function to provide some
  info about original table and field name to a user. This is ok for a field
  but for an expression it should be empty.
  
  The change_to_use_tmp_fields function now resets orig_table member of
  an expression's tmp table field to prevent providing a wrong info to a user.
  The Field::make_field function now resets the table_name and the org_col_name
  variables when the orig_table is set to 0.

  sql/field.cc@1.256.59.1, 2007-09-28 23:22:29+00:00, evgen@moonbone.local +13 -3
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The Field::make_field function now resets the table_name and the org_col_name
    variables when the orig_table is set to 0.

  sql/sql_select.cc@1.312.171.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +3 -0
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The change_to_use_tmp_fields function now resets orig_table member of
    an expression's tmp table field to prevent providing a wrong info to a user.

  tests/mysql_client_test.c@1.167.36.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +26 -19
    The test case for the bug#21635 is altered to test behavior on both const and
    non-const tables.

ChangeSet@1.2528.227.2, 2007-09-28 19:11:26-03:00, davi@moksha.local +1 -0
  Post-merge fix for Bug 21136, initial merge missed the modifications for
  the sql_class.h file.

  sql/sql_class.h@1.384.13.1, 2007-09-28 19:11:24-03:00, davi@moksha.local +6 -1
    Add pointers for holding lock data for temporary tables.

ChangeSet@1.2528.227.1, 2007-09-28 18:25:47-03:00, davi@moksha.local +3 -0
  Bug#21136 CREATE TABLE SELECT within CREATE TABLE SELECT causes server crash
  
  When CREATE TEMPORARY TABLE .. SELECT is invoked from a stored function
  which in turn is called from CREATE TABLE SELECT causes a memory leak
  because the inner create temporary table overrides the outter extra_lock
  reference when locking the table.
  
  The solution is to simply not overrride the extra_lock by only using the
  extra_lock for a non-temporary table lock.

  mysql-test/r/create.result@1.144.1.10, 2007-09-28 18:25:42-03:00, davi@moksha.local +14 -0
    Add test case result for Bug#21136

  mysql-test/t/create.test@1.105, 2007-09-28 18:25:42-03:00, davi@moksha.local +25 -0
    Add test case for Bug#21136

  sql/sql_insert.cc@1.282.1.15, 2007-09-28 18:25:42-03:00, davi@moksha.local +20 -7
    For temporary tables, store the lock data within the select_create class
    since tmp tables contents are not replicated. For "real" tables, store
    the lock data in the thread extra_lock pointer.

ChangeSet@1.1810.3334.1, 2007-09-28 17:13:35-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29589	sys_innodb_max_purge_lag is defined twice in sys_variables
  
  Removed duplicate innodb variable from sys_variables array.

  sql/set_var.cc@1.125.5.48, 2007-09-28 17:13:30-04:00, dkatz@damien-katzs-computer.local +0 -1
    Removed duplicate innodb variable from sys_variables array.

ChangeSet@1.1810.3333.1, 2007-09-28 17:10:14-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29772  Error compiling with option --without-geometry
  
  Added #ifdef HAVE_SPATIAL around geometry related code.

  sql/item.cc@1.113.97.1, 2007-09-28 17:10:06-04:00, dkatz@damien-katzs-computer.local +4 -0
    Added #ifdef HAVE_SPATIAL around geometry related code.

ChangeSet@1.1616.3097.1, 2007-09-28 22:35:48+02:00, kent@mysql.com +1 -0
  ctype-simple.c:
    Avoid undefined value when negating (bug#30069)

  strings/ctype-simple.c@1.57.1.12, 2007-09-28 22:33:23+02:00, kent@mysql.com +2 -2
    Avoid undefined value when negating (bug#30069)

ChangeSet@1.2528.143.52, 2007-09-28 23:30:54+04:00, anozdrin@station. +5 -0
  Patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  See also WL 4066.
    
  This bug reveals two problems:
    - the problem on the client side which was described originally;
    - the problem in protocol / the server side: connection context
      on client and server should be like after mysql_real_connect()
      and be consistent. The server however just resets character
      set variables to the global defaults.
  
  The fix seems to be as follows:
    - extend the protocol so that the client be able to send
      character set information in COM_CHANGE_USER command;
    - change the server so that it understands client character set
      in the command;
    - change the client:
      - reset character set to the default value (which has been
        read from the configuration);
      - send character set in COM_CHANGE_USER command.

  client/client_priv.h@1.74.1.1, 2007-09-28 23:30:52+04:00, anozdrin@station. +4 -0
    Declare a function, used in libmysql.c and client.c.

  libmysql/libmysql.c@1.290.4.1, 2007-09-28 23:30:52+04:00, anozdrin@station. +25 -1
    1. Reset character set on the client in mysql_change_user().
    2. Send character set to the server in COM_CHANGE_USER command.

  mysql-test/t/mysql_client_test.test@1.24, 2007-09-28 23:30:52+04:00, anozdrin@station. +2 -2
    mysql_client_test.log is used by the test suite.
    
    Use mysql_client_test.out.log to collect mysql_client_test
    real output.

  sql/sql_parse.cc@1.693.16.4, 2007-09-28 23:30:52+04:00, anozdrin@station. +13 -1
    Switch character set in COM_CHANGE_USER.

  tests/mysql_client_test.c@1.245.7.2, 2007-09-28 23:30:52+04:00, anozdrin@station. +174 -2
    Test case for BUG#30472.

ChangeSet@1.2592.3.5, 2007-09-28 11:52:13-07:00, brian@zim.(none) +1 -0
  azio.c:
    Defining out aio for Windows.

  storage/archive/azio.c@1.20.1.12, 2007-09-28 11:51:39-07:00, brian@zim.(none) +4 -0
    Defining out aio for Windows.

ChangeSet@1.2588.2.12, 2007-09-28 10:51:42-06:00, tsmith@ramayana.hindu.god +1 -0
  Remove compiler warning

  client/mysqlslap.c@1.63.1.2, 2007-09-28 10:51:41-06:00, tsmith@ramayana.hindu.god +1 -1
    Remove compiler warning.

ChangeSet@1.2588.10.1, 2007-09-28 18:35:59+02:00, hakank@lu0011.wdf.sap.corp +1 -0
  Fix for Bug#31270.

  sql/ha_partition.cc@1.106.3.1, 2007-09-28 18:35:54+02:00, hakank@lu0011.wdf.sap.corp +1 -1
    Fix for Bug#31270.

ChangeSet@1.1810.3309.7, 2007-09-28 18:05:23+02:00, mhansson@linux-st28.site +3 -0
  Bug #30832: Assertion + crash with select name_const('test', now());
  
  The NAME_CONST function is required to work correctly with constants only.
  When executed with functions that return types other than those returned by
  Item::field_type (string, int, decimal, or real), the result gets cast to
  one of those types. This cannot happen for constants.
  Fixed by only allowing constants as arguments to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.7, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +16 -0
    Bug#30832: Test result

  mysql-test/t/func_misc.test@1.21.2.1, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +14 -0
    Bug#30832: Test case

  sql/item.h@1.183.1.57, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832: The fix

ChangeSet@1.2588.9.3, 2007-09-28 08:29:43-07:00, brian@zim.(none) +2 -0
  One possible memory leak on failure to open fixed (thanks to Jan's notice).
  Better cleanup of pending requests on shutdown. 

  storage/archive/azio.c@1.20.1.11, 2007-09-28 08:29:39-07:00, brian@zim.(none) +38 -3
    Better cleanup support for pending AIO calls. Example code used from aio test in glib. 

  storage/archive/ha_archive.cc@1.147, 2007-09-28 08:29:39-07:00, brian@zim.(none) +6 -2
    Cleaned up possible memory leak on bad exit (thanks to Jan).
    Was explicit in boolean behavior. 

ChangeSet@1.2588.1.9, 2007-09-28 08:22:45-07:00, brian@zim.(none) +2 -0
  New option:
  -auto-generate-sql-load-type=write,read:4
  
  This allows you to specify how often a given test should be run.
  
  mysqlslap.c:
    Added the ability to specify how often a built in generator/test can run.
  mysqlslap.test:
    New test case for option on built in tests.

  client/mysqlslap.c@1.67, 2007-09-28 08:22:42-07:00, brian@zim.(none) +243 -155
    Added the ability to specify how often a built in generator/test can run.

  mysql-test/t/mysqlslap.test@1.20, 2007-09-28 08:22:42-07:00, brian@zim.(none) +4 -2
    New test case for option on built in tests.

ChangeSet@1.1810.3332.1, 2007-09-28 16:46:05+03:00, gkodinov@macbook.gmz +3 -0
  Bug #30587: mysql crashes when trying to group by TIME div NUMBER
  
  When calculating the result length of an integer DIV function 
  the number of decimals was used without checking the result type
  first. Thus an uninitialized number of decimals was used for some 
  types. This caused an excessive amount of memory to be allocated 
  for the field's buffer and crashed the server.
  
   
  Fixed by using the number of decimals only for data types that 
  can have decimals and thus have valid decimals number.

  mysql-test/r/func_math.result@1.33.1.4, 2007-09-28 16:45:57+03:00, gkodinov@macbook.gmz +46 -0
    Bug #30587: test case

  mysql-test/t/func_math.test@1.27.1.2, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +27 -0
    Bug #30587: test case

  sql/item_func.cc@1.270.76.1, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +5 -1
    Bug #30587: Don't use decimals on a type that doesn't have them.

ChangeSet@1.2529.27.2, 2007-09-28 17:33:30+05:00, gluh@mysql.com +3 -0
  Bug#30795 Query on INFORMATION_SCHEMA.SCHEMATA, wrong result
  skip the check of directory presence for 'information_schema' name

  mysql-test/r/information_schema.result@1.156.2.7, 2007-09-28 17:33:28+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.100.1.7, 2007-09-28 17:33:28+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.415.15.2, 2007-09-28 17:33:29+05:00, gluh@mysql.com +2 -1
    skip the check of directory presence for 'information_schema' name

ChangeSet@1.2537.29.1, 2007-09-28 13:55:13+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  BUG#31276 Micro GCP timeout set too lo (2 seconds)
  - add config param
  - timeout must be set in relation to other timeouts

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.41, 2007-09-28 13:55:10+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.147, 2007-09-28 13:55:10+02:00, tomas@whalegate.ndb.mysql.com +14 -2
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.117.1.3, 2007-09-28 13:55:10+02:00, tomas@whalegate.ndb.mysql.com +13 -1
    BUG#31276 Micro GCP timeout set too lo (2 seconds)
    - add config param
    - timeout must be set in relation to other timeouts

ChangeSet@1.2528.143.51, 2007-09-28 15:42:37+04:00, anozdrin@station. +4 -0
  Prerequisite patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  Supply a correct packet length to dispatch command.

  sql/sp_head.cc@1.279.10.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +1 -1
    Fix packet length.

  sql/sql_parse.cc@1.693.16.3, 2007-09-28 15:42:35+04:00, anozdrin@station. +65 -47
    Fix packet length.

  sql/sql_prepare.cc@1.228.1.5, 2007-09-28 15:42:35+04:00, anozdrin@station. +6 -5
    Fix packet length.

  tests/mysql_client_test.c@1.245.7.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +200 -1
    Test case for COM_CHANGE_USER.

ChangeSet@1.2529.27.1, 2007-09-28 16:02:43+05:00, gluh@mysql.com +5 -0
  Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
  view_body_utf8 attribute type is changed to 'escaped string'

  mysql-test/r/ddl_i18n_koi8r.result@1.2.1.1, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/ddl_i18n_utf8.result@1.2.1.1, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/information_schema.result@1.156.2.6, 2007-09-28 16:02:41+05:00, gluh@mysql.com +16 -4
    result fix

  mysql-test/t/information_schema.test@1.100.1.6, 2007-09-28 16:02:41+05:00, gluh@mysql.com +10 -0
    test case

  sql/sql_view.cc@1.116.1.37, 2007-09-28 16:02:41+05:00, gluh@mysql.com +1 -1
    Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
    view_body_utf8 attribute type is changed to 'escaped string'

ChangeSet@1.2588.8.7, 2007-09-28 12:33:18+02:00, mhansson@dl145s.mysql.com +1 -0
  Bug#30665: Post-merge fix

  mysql-test/r/group_by.result@1.92, 2007-09-28 12:33:14+02:00, mhansson@dl145s.mysql.com +1 -1
    Bug#30665: Post-merge fix

ChangeSet@1.2529.2.33, 2007-09-28 12:30:55+02:00, mhansson@dl145s.mysql.com +1 -0
  Bug#30665: Post-merge fix

  mysql-test/r/group_by.result@1.84.2.7, 2007-09-28 12:30:52+02:00, mhansson@dl145s.mysql.com +1 -1
    Bug#30665: Post-merge fix

ChangeSet@1.2529.26.2, 2007-09-28 10:22:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  post merge

  storage/ndb/test/src/HugoTransactions.cpp@1.35.1.3, 2007-09-28 10:22:52+02:00, jonas@perch.ndb.mysql.com +0 -180
    post merge

ChangeSet@1.2596, 2007-09-28 10:16:51+02:00, joerg@trift2. +1 -0
  After-merge fix: Correct a relay log file name.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.7, 2007-09-28 10:16:47+02:00, joerg@trift2. +1 -1
    After-merge fix: Correct the relay log file name.

ChangeSet@1.2403.28.81, 2007-09-28 09:58:56+02:00, jonas@perch.ndb.mysql.com +10 -0
  ndb - add new testcases/error insert bug#30975
    (recommit for correct merge order)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.2.2, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error code

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.37.3.5, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add error inserts

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.4.6, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +1 -0
    add error insert

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.2.8, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +24 -2
    add error inserts

  storage/ndb/test/include/HugoTransactions.hpp@1.15.2.1, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +18 -0
    add 
    - loadTableStartFrom
    - scanUpdate with scanflags
    - fillTableStartFrom

  storage/ndb/test/include/UtilTransactions.hpp@1.9.1.1, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +5 -0
    add
    - clearTable with scan flags

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.3.1, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +180 -0
    add new testcases

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.4.9, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add new testcases

  storage/ndb/test/src/HugoTransactions.cpp@1.31.3.2, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +83 -48
    add new functions

  storage/ndb/test/src/UtilTransactions.cpp@1.24.2.1, 2007-09-28 09:58:54+02:00, jonas@perch.ndb.mysql.com +41 -33
    add new functions

ChangeSet@1.2529.24.1, 2007-09-28 09:36:05+02:00, mhansson@linux-st28.site +5 -0
  Bug#30665: Inconsistent optimization of IGNORE INDEX FOR {ORDER BY|GROUP BY}
  
  The optimizer takes different execution paths during EXPLAIN than SELECT,
  this fix relates only to EXPLAIN, hence no behavior changes.
  The test of sort keys for ORDER BY was prohibited from considering keys
  that were mentioned in IGNORE KEYS FOR ORDER BY. This led to two 
  inconsistencies: One was that IGNORE INDEX FOR GROUP BY and 
  IGNORE INDEX FOR ORDER BY gave apparently different EXPLAINs; the latter 
  erroneously claimed to do filesort. The second inconsistency 
  is that the test of sort keys is called twice, finding a sort key the first
  time but not the second time, leading to the mentioned filesort.
  
  Fixed by making the test of sort keys consider all enabled 
  keys on the table. This test rejects keys that are not covering, and for 
  covering keys the hint should be ignored anyway. 

  mysql-test/r/group_by.result@1.84.2.6, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +147 -1
    Bug#30665: Changed test result. The plan gets more efficient here. 
    The output is included in order to show that it is still correct.

  mysql-test/r/order_by.result@1.66.1.5, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +285 -0
    Bug#30665: Test result

  mysql-test/t/group_by.test@1.71, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +1 -0
    Bug#30665: Changed test case to show correctness of changed plan

  mysql-test/t/order_by.test@1.55, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +57 -0
    Bug#30665: Test case

  sql/sql_select.cc@1.541.24.1, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +3 -1
    Bug#30665: 
    - the fix: Give test_if_skip_sort_order all keys not the subset of non-disabled keys.
    - Added comment to test_if_skip_sort_order

ChangeSet@1.2588.9.2, 2007-09-27 13:34:31-07:00, brian@zim.(none) +2 -0
  The point to this commit is to move from write() to pwrite().
  This will allow me to write the fast recovery code, and the new
  async write code.
  
  archive_test.c:
    Fixed checkpoint to now be recorded after row write.
  azio.c:
    Moved from using write() to pwrite() for writing data to file.

  storage/archive/archive_test.c@1.14, 2007-09-27 13:30:47-07:00, brian@zim.(none) +3 -3
    Fixed checkpoint to now be recorded after row write.

  storage/archive/azio.c@1.20.1.10, 2007-09-27 13:33:06-07:00, brian@zim.(none) +15 -13
    Moved from using write() to pwrite() for writing data to file.

ChangeSet@1.2547.13.19, 2007-09-27 16:56:27-03:00, davi@moksha.local +4 -0
  Bug#28870 check that table locks are released/reset
    
  The problem is that some mysql_lock_tables error paths are not resetting the
  tables lock type back to TL_UNLOCK. If the lock types are not reset properly,
  a table might be returned to the table cache with wrong lock_type.
      
  The proposed fix is to ensure that the tables lock type is always properly
  reset when mysql_lock_tables fails. This is a incompatible change with respect
  to the process state information.

  sql/lock.cc@1.111, 2007-09-27 16:56:21-03:00, davi@moksha.local +60 -73
    Merge mysql_lock_tables cleanup sequence and the reset_lock_data
    function into a single function and take steps to ensure it is
    always called for each error exit path. Also remove references
    to the redundant THD::locked variable which was almost exclusively
    used by this function and the same information is already on proc_info.

  sql/sql_class.cc@1.348.1.1, 2007-09-27 16:56:21-03:00, davi@moksha.local +1 -1
    Remove references to the THD::locked variable.

  sql/sql_class.h@1.394.1.1, 2007-09-27 16:56:22-03:00, davi@moksha.local +1 -1
    Remove the THD::locked variable.

  sql/sql_show.cc@1.430.2.1, 2007-09-27 16:56:22-03:00, davi@moksha.local +2 -4
    Remove references to THD:locked, state_info will now default to proc_info.

ChangeSet@1.2403.57.13, 2007-09-27 21:00:51+02:00, jonas@eel.hemma.oreland.se +3 -0
  ndb - bug#30975
    more testcases

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.42.2.6, 2007-09-27 21:00:49+02:00, jonas@eel.hemma.oreland.se +32 -0
    Add new dump/error insert that kills node after rand (min,max) ms

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.3, 2007-09-27 21:00:49+02:00, jonas@eel.hemma.oreland.se +121 -40
    Add more DD testcases

  storage/ndb/test/run-test/daily-basic-tests.txt@1.66.1.18, 2007-09-27 21:00:49+02:00, jonas@eel.hemma.oreland.se +30 -2
    Add more DD SR testcases

ChangeSet@1.2588.9.1, 2007-09-27 10:20:14-07:00, brian@zim.(none) +2 -0
  azio.h:
    Removingg support for transparent mode.
  azio.c:
    Removing support for transparent mode.

  storage/archive/azio.c@1.20.1.9, 2007-09-27 10:19:22-07:00, brian@zim.(none) +2 -48
    Removing support for transparent mode.

  storage/archive/azio.h@1.12.1.7, 2007-09-27 10:19:35-07:00, brian@zim.(none) +0 -1
    Removingg support for transparent mode.

ChangeSet@1.2537.22.25, 2007-09-27 19:09:47+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  bump up version

  configure.in@1.330.114.5, 2007-09-27 19:09:45+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    bump up version

ChangeSet@1.2403.16.168, 2007-09-27 19:07:35+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  bump up version

  configure.in@1.330.75.19, 2007-09-27 19:07:33+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    bump up version

ChangeSet@1.1810.3308.14, 2007-09-27 17:56:50+03:00, gkodinov@magare.gmz +1 -0
  Fixed a warning cased by the fix for bug 30468

  sql/sql_acl.cc@1.128.45.3, 2007-09-27 17:56:49+03:00, gkodinov@magare.gmz +2 -1
    Fixed a warning cased by the fix for bug 30468

ChangeSet@1.1810.3308.13, 2007-09-27 14:29:46+03:00, gkodinov@magare.gmz +1 -0
  separated an assertion from the assignment (bug 30468)

  sql/sql_acl.cc@1.128.45.2, 2007-09-27 14:29:45+03:00, gkodinov@magare.gmz +2 -1
    separated an assertion from the assignment (bug 30468)

ChangeSet@1.1810.3331.1, 2007-09-27 12:15:19+03:00, gkodinov@magare.gmz +6 -0
  Bug #30468: column level privileges not respected when joining tables
  
  When expanding a * in a USING/NATURAL join the check for table access
  for both tables in the join was done using the grant information of the
  first one.
  Fixed by getting the grant information for the current table while 
  iterating through the columns of the join.

  mysql-test/r/grant2.result@1.25.2.11, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +18 -0
    Bug #30468: test case

  mysql-test/t/grant2.test@1.31.2.10, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +32 -0
    Bug #30468: test case

  sql/sql_acl.cc@1.128.45.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +68 -37
    Bug #30468: correctly check column grants

  sql/sql_acl.h@1.28.1.27, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +2 -3
    Bug #30468: correctly check column grants

  sql/sql_base.cc@1.235.112.2, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +1 -4
    Bug #30468: correctly check column grants

  sql/sql_insert.cc@1.146.68.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +3 -5
    Bug #30468: correctly check column grants

ChangeSet@1.2529.2.28, 2007-09-27 13:15:15+05:00, gshchepa@gleb.loc +2 -0
  mysqlslap.result, mysqlslap.test:
    Post-commit fix.

  mysql-test/r/mysqlslap.result@1.15, 2007-09-27 13:14:45+05:00, gshchepa@gleb.loc +1 -0
    Post-commit fix.

  mysql-test/t/mysqlslap.test@1.17.1.2, 2007-09-27 13:14:37+05:00, gshchepa@gleb.loc +2 -0
    Post-commit fix.

ChangeSet@1.1810.3328.1, 2007-09-27 08:48:39+02:00, msvensson@pilot.(none) +1 -0
  Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

  libmysql/libmysql.c@1.233.25.1, 2007-09-27 08:48:37+02:00, msvensson@pilot.(none) +2 -2
    Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

ChangeSet@1.1810.3304.5, 2007-09-26 21:59:17+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #26000 SHOW SLAVE STATUS can crash mysqld during shutdown process
  
  active_mi has been reset (shutdown) at the time of quering with 
  SHOW SLAVE STATUS so that 
  at handling of SHOW an attempt to read its members segfaults.
  
  Fixed with checking the value of active_mi before to call show_master_info()
  Merely send_ok() is invoked when active_mi does not exist.
  A test can not be easiely written.
  
  Notice, there are more analogical cases in the code which require a similar
  treatment (to be reported as a bug separately). 

  sql/sql_parse.cc@1.426.163.1, 2007-09-26 21:59:11+02:00, aelkin@koti.dsl.inet.fi +10 -1
    Ignore reporting and send only OK if master info struct has been destoyed.
    As this must be at shutdown merely a warning is sent to the client.

ChangeSet@1.2403.57.12, 2007-09-26 19:21:45+02:00, jonas@eel.hemma.oreland.se +8 -0
  ndb - bug#30975
    Add testcase

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.133.2.6, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +1 -0
    error insert for crash in timeout in WAIT_COMMIT_CONF

  storage/ndb/src/kernel/blocks/pgman.cpp@1.21.1.8, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +24 -2
    error insert fot blocking of writes

  storage/ndb/test/include/HugoTransactions.hpp@1.15.1.1, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +18 -0
    add
    - loadTableStartFrom
    - scanUpdateRecords with scan flags
    - fillTableStartFrom

  storage/ndb/test/include/UtilTransactions.hpp@1.10, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +5 -0
    Add 
    - clearTable with scan flags

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.2, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +99 -1
    add testcase for bug#30975

  storage/ndb/test/run-test/daily-basic-tests.txt@1.66.1.17, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +4 -0
    add testcase for bug#30975

  storage/ndb/test/src/HugoTransactions.cpp@1.31.2.3, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +83 -48
    add
    - loadTableStartFrom
    - scanUpdateRecords with scan flags
    - fillTableStartFrom

  storage/ndb/test/src/UtilTransactions.cpp@1.24.1.2, 2007-09-26 19:21:41+02:00, jonas@eel.hemma.oreland.se +41 -33
    Add 
    - clearTable with scan flags

ChangeSet@1.2529.2.25, 2007-09-26 19:06:54+03:00, gkodinov@magare.gmz +6 -0
  merge of the fix for bug 27802 & 27216 to 5.1-opt

  mysql-test/r/view.result@1.218.6.8, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +6 -6
    merge of the fix for bug 27802 to 5.1

  sql/item_cmpfunc.h@1.159.1.10, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27216 to 5.1

  sql/sql_insert.cc@1.282.14.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 27216 to 5.1

  sql/sql_lex.h@1.284.8.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27802 to 5.1

  sql/sql_select.cc@1.541.23.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +24 -27
    merge of the fix for bug 27802 to 5.1

  sql/table.h@1.174.6.6, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +0 -2
    merge of the fix for bug 27802 to 5.1

ChangeSet@1.2529.15.4, 2007-09-26 17:28:20+02:00, msvensson@pilot.(none) +2 -0
  Update result file(s) for 5.1

  mysql-test/r/named_pipe.result@1.2, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

  mysql-test/r/shm.result@1.5, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

ChangeSet@1.1810.3287.12, 2007-09-26 17:04:41+02:00, msvensson@pilot.(none) +1 -0
  Bug#31167 Introduction of @@hostname breaks replication in a ring
   - Use a local uservariable to avoid @@hostname in binlog

  scripts/mysql_system_tables_data.sql@1.1.3.1, 2007-09-26 17:04:39+02:00, msvensson@pilot.(none) +2 -1
    Load @@hostname into a local user variable to avoid
    writing @@hostname to the binary log that potentially
    would be replicated to a slave server that not yet was upgraded
    to have @@hostname.

ChangeSet@1.2588.8.2, 2007-09-26 16:15:13+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes.

  mysql-test/r/subselect_sj2.result@1.5, 2007-09-26 16:15:08+04:00, sergefp@mysql.com +2 -201
    Post-merge fixes.

ChangeSet@1.2547.1.55, 2007-09-26 15:27:14+04:00, sergefp@mysql.com +3 -0
  BUG#30993: Subqueries: LooseScan strategy produces wrong query results, with duplicates:
   - Made best_access_path() not to choose loose index scan when the index
     is not covering

  mysql-test/r/subselect_sj2.result@1.2.1.1, 2007-09-26 15:27:10+04:00, sergefp@mysql.com +244 -0
    BUG#30993: Subqueries: LooseScan strategy produces wrong query results, with duplicates:
     - Testcase

  mysql-test/t/subselect_sj2.test@1.1.1.1, 2007-09-26 15:27:10+04:00, sergefp@mysql.com +246 -0
    BUG#30993: Subqueries: LooseScan strategy produces wrong query results, with duplicates:
     - Testcase

  sql/sql_select.cc@1.554.1.5, 2007-09-26 15:27:10+04:00, sergefp@mysql.com +15 -5
    BUG#30993: Subqueries: LooseScan strategy produces wrong query results, with duplicates:
     - Made best_access_path() not to choose loose index scan when the index is not covering
     - Fixed comment

ChangeSet@1.2529.17.1, 2007-09-26 12:45:08+02:00, gshchepa@devsrv-b.mysql.com +3 -0
  Fixed bug #31075.
  The `SELECT col FROM t WHERE col NOT IN (col, ...) GROUP BY col'
  crashed in the range optimizer.
  
  The get_func_mm_tree function has been modified to check the
  Item_func_in::array field for the NULL value before using of that
  value.

  mysql-test/r/func_in.result@1.40.1.5, 2007-09-26 12:43:38+02:00, gshchepa@devsrv-b.mysql.com +5 -0
    Added test case for bug #31075.

  mysql-test/t/func_in.test@1.33, 2007-09-26 12:43:37+02:00, gshchepa@devsrv-b.mysql.com +8 -0
    Added test case for bug #31075.

  sql/opt_range.cc@1.274.1.10, 2007-09-26 12:43:35+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Fixed bug #31075.
    The get_func_mm_tree function has been modified to check the
    Item_func_in::array field for the NULL value before using of that
    value.

ChangeSet@1.2537.26.11, 2007-09-26 11:35:11+02:00, mskold@mysql.com +3 -0
  Added more checks for unsupported online alter table: no support for column re-order, no support for changing storage engine

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.5, 2007-09-26 11:34:06+02:00, mskold@mysql.com +16 -0
    Added more checks for unsupported online alter table: no support for column re-order, no support for changing storage engine

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.11, 2007-09-26 11:34:06+02:00, mskold@mysql.com +27 -0
    Added more checks for unsupported online alter table: no support for column re-order, no support for changing storage engine

  sql/sql_table.cc@1.388.55.10, 2007-09-26 11:34:06+02:00, mskold@mysql.com +12 -0
    Added more checks for unsupported online alter table: no support for column re-order, no support for changing storage engine

ChangeSet@1.2529.13.3, 2007-09-25 12:16:39+02:00, stewart@willster.(none) +2 -0
  ndb_rand.c:
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c
  ndb_rand.h:
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/include/util/ndb_rand.h@1.2, 2007-09-25 12:16:03+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/src/common/util/ndb_rand.c@1.2, 2007-09-25 12:16:22+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c

ChangeSet@1.1810.3202.13, 2007-09-25 12:01:23+02:00, stewart@flamingspork.com +4 -0
  [PATCH] BUG#30379 Better randomise time before retry in timeout check (DBTC)
  
  timoOutLoopStartLab() checks if any transactions have been delayed
  for so long that we are forced to perform some action (e.g. abort,
  resend etc).
  
  It is *MEANT* to (according to the comment):
  > To avoid aborting both transactions in a deadlock detected by time-out
  > we insert a random extra time-out of upto 630 ms by using the lowest
  > six bits of the api connect reference.
  > We spread it out from 0 to 630 ms if base time-out is larger than 3 sec,
  > we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec,
  > and otherwise we spread it out 310 ms.
  
  The comment (as all do) lies.
  
  the API connect reference is not very random, producing incredibly
  predictable "random" numbers. This could lead to both txns being
  aborted instead of just one.
  
  Before:
  timeout value: 123 3
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 123 3
  
  After:
  timeout value: 127 7
  timeout value: 126 6
  timeout value: 129 9
  timeout value: 139 19
  timeout value: 137 17
  timeout value: 151 31
  timeout value: 130 10
  timeout value: 132 12
  
  Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  ===================================================================

  ndb/include/util/ndb_rand.h@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +33 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/include/util/ndb_rand.h@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/common/util/Makefile.am@1.10.3.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +2 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +40 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.51.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +3 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

ChangeSet@1.1810.3308.11, 2007-09-24 15:34:10+03:00, gkodinov@magare.gmz +4 -0
  Bug #28702: VIEWs defined with USE/FORCE KEY ignore that request
  When storing the VIEW the CREATE VIEW command is reconstructed 
  from the parse tree. While constructing the command string
  the index hints specified should also be printed.
  Fixed by adding code to print the index hints when printing a 
  table in the FROM clause.

  mysql-test/r/view.result@1.138.1.70, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +28 -0
    Bug #28702: test case

  mysql-test/t/view.test@1.126.1.63, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +21 -0
    Bug #28702: test case

  sql/sql_select.cc@1.312.166.8, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +52 -0
    Bug #28702: preserve index hints in a VIEW definition.

  sql/table.h@1.102.1.46, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +2 -0
    Bug #28702: preserve index hints in a VIEW definition.

ChangeSet@1.2529.2.22, 2007-09-24 13:02:59+02:00, gkodinov@macbook.local +2 -0
  merging bug 28701 to 5.1-opt

  mysql-test/r/view.result@1.218.6.6, 2007-09-24 13:02:48+02:00, gkodinov@macbook.local +4 -4
    merging bug 28701 to 5.1-opt

  sql/sql_view.cc@1.116.1.35, 2007-09-24 13:02:49+02:00, gkodinov@macbook.local +2 -5
    merging bug 28701 to 5.1-opt

ChangeSet@1.1810.3305.9, 2007-09-24 12:42:44+02:00, msvensson@shellback.(none) +7 -0
  Add test for named pipes on windows
  Improve test for  shm on windows

  mysql-test/include/windows.inc@1.1.1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +5 -4
    improve "skip message" and don't require a result file

  mysql-test/r/named_pipe.result@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    New BitKeeper file ``mysql-test/r/named_pipe.result''

  mysql-test/r/named_pipe.result@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/r/shm.result@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    Update result after adding more tests

  mysql-test/r/shm.result@1.3, 2007-09-24 12:27:21+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/shm.result -> mysql-test/r/shm.result

  mysql-test/t/shm.result@1.2, 2007-09-24 12:25:34+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/r/windows_shm.result -> mysql-test/t/shm.result

  mysql-test/t/named_pipe-master.opt@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -0
    New BitKeeper file ``mysql-test/t/named_pipe-master.opt''

  mysql-test/t/named_pipe-master.opt@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/named_pipe.test@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +14 -0
    New BitKeeper file ``mysql-test/t/named_pipe.test''

  mysql-test/t/named_pipe.test@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/shm-master.opt@1.3, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -1
    Add $MTR_BUILD_THREAD to get a unique shared memory base name

  mysql-test/t/shm-master.opt@1.2, 2007-09-24 12:25:04+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm-master.opt -> mysql-test/t/shm-master.opt

  mysql-test/t/shm.test@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +11 -1
    Run a bunch of more test to check shm

  mysql-test/t/shm.test@1.3, 2007-09-24 12:24:43+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm.test -> mysql-test/t/shm.test

ChangeSet@1.2547.40.1, 2007-09-24 01:05:49-07:00, brian@zim.(none) +1 -0
  mysqlslap.c:
    Cleanup of defines to enum.

  client/mysqlslap.c@1.58.4.1, 2007-09-24 01:05:12-07:00, brian@zim.(none) +21 -10
    Cleanup of defines to enum.

ChangeSet@1.2588.5.1, 2007-09-22 07:57:24-07:00, brian@zim.(none) +3 -0
  client_priv.h:
    New srandom option
  mysqlslap.c:
    Add output support for iterations and included Google Summer of Code srandom patch.
  mysqlslap.test:
    Updated test for srandom.

  client/client_priv.h@1.83, 2007-09-22 07:55:44-07:00, brian@zim.(none) +1 -0
    New srandom option

  client/mysqlslap.c@1.65, 2007-09-22 07:55:54-07:00, brian@zim.(none) +14 -2
    Add output support for iterations and included Google Summer of Code srandom patch.

  mysql-test/t/mysqlslap.test@1.19, 2007-09-22 07:56:27-07:00, brian@zim.(none) +2 -0
    Updated test for srandom.

ChangeSet@1.2588.1.6, 2007-09-22 07:47:57-07:00, brian@zim.(none) +2 -0
  ha_archive.cc, ha_archive.h:
    Adding Global Sync point for backups.

  storage/archive/ha_archive.cc@1.146, 2007-09-22 07:47:10-07:00, brian@zim.(none) +16 -4
    Adding Global Sync point for backups.

  storage/archive/ha_archive.h@1.68, 2007-09-22 07:47:32-07:00, brian@zim.(none) +2 -0
    Adding Global Sync point for backups.

ChangeSet@1.1810.3305.8, 2007-09-22 12:17:14+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843  Bad Test addition to t/archive.test

  mysql-test/r/archive.result@1.13.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +4 -5
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

  mysql-test/t/archive.test@1.14.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +3 -3
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

ChangeSet@1.1810.3325.1, 2007-09-22 11:49:27+04:00, evgen@sunlight.local +12 -0
  Bug#27216: functions with parameters of different date types may return wrong
  type of the result.
  
  There are several functions that accept parameters of different types.
  The result field type of such functions was determined based on
  the aggregated result type of its arguments. As the DATE and the DATETIME
  types are represented by the STRING type, the result field type
  of the affected functions was always STRING for DATE/DATETIME arguments.
  The affected functions are COALESCE, IF, IFNULL, CASE, LEAST/GREATEST, CASE.
  
  Now the affected functions aggregate the field types of their arguments rather
  than their result types and return the result of aggregation as their result
  field type.
  The cached_field_type member variable is added to the number of classes to
  hold the aggregated result field type.
  The str_to_date() function's result field type now defaults to the
  MYSQL_TYPE_DATETIME.
  The agg_field_type() function is added. It aggregates field types with help
  of the Field::field_type_merge() function.
  The create_table_from_items() function now uses the 
  item->tmp_table_field_from_field_type() function to get the proper field
  when the item is a function with a STRING result type.

  libmysql/libmysql.c@1.233.24.1, 2007-09-22 11:44:40+04:00, evgen@sunlight.local +2 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The client library now accepts the NEWDATE type as a string.

  mysql-test/r/date_formats.result@1.18.12.2, 2007-09-22 11:48:37+04:00, evgen@sunlight.local +1 -1
    A test case result corrected after fixing bug#27216.

  mysql-test/r/type_datetime.result@1.30.1.17, 2007-09-22 11:48:39+04:00, evgen@sunlight.local +61 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  mysql-test/t/type_datetime.test@1.18.1.15, 2007-09-22 11:48:40+04:00, evgen@sunlight.local +38 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  sql/item_cmpfunc.cc@1.187.1.77, 2007-09-22 11:45:40+04:00, evgen@sunlight.local +36 -4
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    Now the fix_length_and_dec functions of the
    Item_func_ifnull,Item_func_if, Item_func_case, Item_func_coalesce
    classes are use agg_field_type function to find out the type of their 
    result field.

  sql/item_cmpfunc.h@1.122.2.32, 2007-09-22 11:48:32+04:00, evgen@sunlight.local +7 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field type is added to the Item_func_case, Item_func_if and
    Item_func_coalesce classes.
    The field_type function is added to the Item_func_ifnull, Item_func_if,
    Item_func_coalesce, Item_func_case classes.

  sql/item_func.cc@1.270.75.1, 2007-09-22 11:48:33+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Item_func_min_max::fix_length_and_dec function now uses the agg_field_type
    function to find out the correct type of the result field.

  sql/item_func.h@1.136.2.37, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +3 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field_type variable is added to the Item_func_min_max class.

  sql/item_timefunc.cc@1.100.31.6, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +1 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The result of the str_to_date function now defaults to the
    DATETIME type.

  sql/mysql_priv.h@1.290.124.1, 2007-09-22 11:48:35+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The prototype of the agg_field_type function is added.

  sql/protocol.cc@1.111.6.2, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Protocol_simple::store function is now used to store fields of NEWDATE type.

  sql/sql_insert.cc@1.146.67.1, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +4 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The create_table_from_items function now uses the
    tmp_table_field_from_field_type function to get field for items with the
    STRING result type.

ChangeSet@1.2588.1.5, 2007-09-21 22:21:08-07:00, brian@dib. +4 -0
  configure.in:
    Added target rule for Solaris
  azio.c:
    Changed ifdef for azio
  azio.h:
    Changed ifdef for AZIO. AIO no longer used on Solaris (was slow...)
  ha_archive.cc:
    Changed ifdef for AZIO

  configure.in@1.373.1.2, 2007-09-21 22:20:02-07:00, brian@dib. +5 -0
    Added target rule for Solaris

  storage/archive/azio.c@1.20.1.8, 2007-09-21 22:20:11-07:00, brian@dib. +6 -6
    Changed ifdef for azio

  storage/archive/azio.h@1.12.1.6, 2007-09-21 22:20:22-07:00, brian@dib. +5 -2
    Changed ifdef for AZIO. AIO no longer used on Solaris (was slow...)

  storage/archive/ha_archive.cc@1.145, 2007-09-21 22:20:42-07:00, brian@dib. +2 -2
    Changed ifdef for AZIO

ChangeSet@1.2528.225.2, 2007-09-21 12:05:54-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
      
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.10.1.1, 2007-09-21 12:05:50-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
            
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.1810.3305.6, 2007-09-21 17:52:02+02:00, msvensson@shellback.(none) +1 -0
  - Increase default connect_timeout to avoid intermittent
  disconnects when test servers are put under load

  mysql-test/mysql-test-run.pl@1.30.49.103, 2007-09-21 17:51:59+02:00, msvensson@shellback.(none) +5 -0
    - Increase default connect_timeout to avoid intermittent
    disconnects when test servers are put under load

ChangeSet@1.1810.3314.2, 2007-09-21 11:38:23-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
    
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.1.8.1, 2007-09-21 11:38:19-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
        
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.2588.2.8, 2007-09-21 17:23:26+02:00, gkodinov@macbook.local +3 -0
  fixed type conversion warnings related to bug #30639

  sql/handler.cc@1.251.1.1, 2007-09-21 17:23:13+02:00, gkodinov@macbook.local +4 -4
    fixed type conversion warnings related to bug #30639

  sql/opt_range.cc@1.286, 2007-09-21 17:23:14+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings related to bug #30639

  sql/sql_select.cc@1.556.1.3, 2007-09-21 17:23:15+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings related to bug #30639

ChangeSet@1.1810.3305.5, 2007-09-21 17:10:45+02:00, msvensson@shellback.(none) +1 -0
  Bug#28359 Intermitted lost connection at 'reading authorization packet' errors
   - Increase default 'connect_timeout' value to 10 seconds

  sql/mysql_priv.h@1.290.123.1, 2007-09-21 17:10:40+02:00, msvensson@shellback.(none) +6 -1
    Increase the default connect_timeout value to 10 seconds

ChangeSet@1.2588.1.4, 2007-09-21 04:03:26-07:00, brian@zim.(none) +1 -0
  federated_archive.test:
    Stylize fix on test (use similar include)

  mysql-test/t/federated_archive.test@1.6, 2007-09-21 04:01:38-07:00, brian@zim.(none) +2 -2
    Stylize fix on test (use similar include)

ChangeSet@1.1810.3308.8, 2007-09-21 12:09:00+04:00, evgen@sunlight.local +4 -0
  Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
  led to creating corrupted index.
  
  While execution of the  CREATE .. SELECT SQL_BUFFER_RESULT statement the 
  engine->start_bulk_insert function was called twice. On the first call
  On the first call MyISAM disabled all non-unique indexes and on the second
  call it decides to not re-enable them because all indexes was disabled.
  Due to this no indexes was actually created during CREATE TABLE thus
  producing crashed table.
  
  Now the select_inset class has is_bulk_insert_mode flag which prevents
  calling the start_bulk_insert function twice.
  The flag is set in the select_create::prepare, select_insert::prepare2
  functions and the select_insert class constructor.
  The flag is reset in the select_insert::send_eof function.

  mysql-test/r/insert_select.result@1.35.1.16, 2007-09-21 12:05:56+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the 
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  mysql-test/t/insert_select.test@1.34.1.7, 2007-09-21 12:05:22+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  sql/sql_class.h@1.230.1.116, 2007-09-21 12:06:30+04:00, evgen@sunlight.local +1 -1
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode flag is added to the select_insert class.

  sql/sql_insert.cc@1.146.66.2, 2007-09-21 12:07:40+04:00, evgen@sunlight.local +10 -2
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode is set in the select_create::prepare, select_insert::prepare2
    functions and the select_insert class constructor.
    The flag is reset in the select_insert::send_eof function.

ChangeSet@1.1810.3324.1, 2007-09-21 09:48:30+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843 Bad Test addition to t/archive.test
   - Add extra insert

  mysql-test/r/archive.result@1.13.1.6, 2007-09-21 09:48:27+02:00, msvensson@shellback.(none) +3 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

  mysql-test/t/archive.test@1.14.1.6, 2007-09-21 09:48:28+02:00, msvensson@shellback.(none) +9 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

ChangeSet@1.2547.39.1, 2007-09-21 00:09:31-07:00, brian@dib. +8 -0
  Many files:
    Removed THD reference.

  sql/filesort.cc@1.136, 2007-09-21 00:07:01-07:00, brian@dib. +2 -2
    Removed THD reference.

  sql/handler.cc@1.247.2.2, 2007-09-21 00:07:12-07:00, brian@dib. +3 -3
    Removed THD reference.

  sql/probes.d@1.2, 2007-09-21 00:07:19-07:00, brian@dib. +13 -14
    Removed THD reference.

  sql/probes.h@1.3, 2007-09-21 00:07:23-07:00, brian@dib. +52 -52
    Removed THD reference.

  sql/sql_delete.cc@1.212.1.2, 2007-09-21 00:07:27-07:00, brian@dib. +5 -5
    Removed THD reference.

  sql/sql_insert.cc@1.291.1.2, 2007-09-21 00:07:32-07:00, brian@dib. +3 -3
    Removed THD reference.
    Removed THD reference.

  sql/sql_select.cc@1.554.2.2, 2007-09-21 00:07:51-07:00, brian@dib. +2 -2
    Removed THD reference.

  sql/sql_update.cc@1.230, 2007-09-21 00:07:55-07:00, brian@dib. +6 -6
    Removed THD reference.

ChangeSet@1.2528.1.48, 2007-09-21 08:13:52+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing bug in test in that a database was not dropped and was visible
  in following tests.

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.2, 2007-09-21 08:13:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.2, 2007-09-21 08:13:28+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Dropping database so that following tests don't see it.

ChangeSet@1.1810.3323.1, 2007-09-20 18:10:35+02:00, tnurnberg@sin.intern.azundris.com +5 -0
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  clean up SHOW GRANTS so it will show host-names with case as entered.
  make REVOKE and friends case-sensitive to make things more intuitive.
  Patch by Martin Friebe.

  mysql-test/r/grant.result@1.37.14.1, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/r/grant3.result@1.4, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +122 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  mysql-test/t/grant.test@1.41.1.17, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/t/grant3.test@1.5, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +100 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  sql/sql_acl.cc@1.128.1.95, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +31 -10
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up SHOW GRANTS so it will show host-names with case as entered.
    make REVOKE and friends case-sensitive to make things more intuitive.
    Patch by Martin Friebe.

ChangeSet@1.1810.3322.1, 2007-09-20 18:05:09+04:00, evgen@sunlight.local +3 -0
  Bug#29908: A user can gain additional access through the ALTER VIEW.
  
  Non-definer of a view was allowed to alter that view. Due to this the alterer
  can elevate his access rights to access rights of the view definer and thus
  modify data which he wasn't allowed to modify. A view defined with
  SQL SECURITY INVOKER can't be used directly for access rights elevation.
  But a user can first alter the view SQL code and then alter the view to 
  SQL SECURITY DEFINER and thus elevate his access rights. Due to this
  altering a view with SQL SECURITY INVOKER is also prohibited.
  
  Now the mysql_create_view function allows ALTER VIEW only to the view
  definer or a super user. 

  mysql-test/r/view_grant.result@1.8.1.18, 2007-09-20 17:48:10+04:00, evgen@sunlight.local +47 -3
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.

  mysql-test/t/view_grant.test@1.8.1.16, 2007-09-20 17:46:26+04:00, evgen@sunlight.local +47 -2
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.
    A test case was adjusted after fixfing bug#29908.

  sql/sql_view.cc@1.78.1.40, 2007-09-20 18:03:16+04:00, evgen@sunlight.local +1 -4
    Bug#29908: A user can gain additional access through the ALTER VIEW.
    Now the mysql_create_view function allows ALTER VIEW only to the view
    definer or a super user. 

ChangeSet@1.2588.2.6, 2007-09-20 17:34:29+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.6, 2007-09-20 17:34:27+05:00, gluh@mysql.com +4 -4
    result fix

  sql/sql_show.cc@1.435, 2007-09-20 17:34:27+05:00, gluh@mysql.com +0 -6
    after merge fix

ChangeSet@1.2537.26.10, 2007-09-20 12:03:28+02:00, mskold@mysql.com +2 -0
  OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.4, 2007-09-20 12:02:36+02:00, mskold@mysql.com +23 -0
    OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.10, 2007-09-20 12:02:36+02:00, mskold@mysql.com +47 -0
    OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): Added new test cases

ChangeSet@1.2537.26.9, 2007-09-20 11:29:38+02:00, mskold@mysql.com +1 -0
  OFFLINE keyword in CREATE [ONLINE|OFFLINE] was lost (ignored): moved argument reading after reset

  sql/sql_yacc.yy@1.458.137.2, 2007-09-20 11:28:51+02:00, mskold@mysql.com +1 -1
    OFFLINE keyword in CREATE [ONLINE|OFFLINE] INDEX was lost (ignored): moved argument reading after reset

ChangeSet@1.2537.26.8, 2007-09-20 09:14:25+02:00, mskold@mysql.com +2 -0
  Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: fixed testcase so result is time independent

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.3, 2007-09-20 09:14:00+02:00, mskold@mysql.com +2 -2
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: fixed testcase so result is time independent

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.9, 2007-09-20 09:14:00+02:00, mskold@mysql.com +1 -1
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: fixed testcase so result is time independent

ChangeSet@1.2537.26.7, 2007-09-19 17:53:18+02:00, mskold@mysql.com +6 -0
  Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.2, 2007-09-19 17:52:48+02:00, mskold@mysql.com +18 -0
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.8, 2007-09-19 17:52:48+02:00, mskold@mysql.com +28 -0
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  sql/mysql_priv.h@1.508.2.1, 2007-09-19 17:52:48+02:00, mskold@mysql.com +1 -1
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  sql/sql_base.cc@1.374.43.4, 2007-09-19 17:52:48+02:00, mskold@mysql.com +5 -4
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  sql/sql_delete.cc@1.204.1.24, 2007-09-19 17:52:48+02:00, mskold@mysql.com +3 -1
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

  sql/sql_table.cc@1.388.55.9, 2007-09-19 17:52:48+02:00, mskold@mysql.com +4 -2
    Bug #31097  ALTER ONLINE of a data type with implicit default value leaves tmp frm: only remove frm file if file type is TMP_TABLE_FRM_FILE_ONLY

ChangeSet@1.2537.26.6, 2007-09-19 14:36:09+02:00, mskold@mysql.com +3 -0
  WL#3680 On-line add attribute, ndbcluster handler part: Removed redundant check for fixed tables (already checked in NdbDictionary::supportedAlterTable()

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.9.2.1, 2007-09-19 14:35:51+02:00, mskold@mysql.com +18 -0
    WL#3680 On-line add attribute, ndbcluster handler part: Removed redundant check for fixed tables (already checked in NdbDictionary::supportedAlterTable()

  mysql-test/suite/ndb/t/ndb_alter_table_online.test@1.7, 2007-09-19 14:35:51+02:00, mskold@mysql.com +28 -0
    WL#3680 On-line add attribute, ndbcluster handler part: Removed redundant check for fixed tables (already checked in NdbDictionary::supportedAlterTable()

  sql/ha_ndbcluster.cc@1.480.6.2, 2007-09-19 14:35:51+02:00, mskold@mysql.com +0 -16
    WL#3680 On-line add attribute, ndbcluster handler part: Removed redundant check for fixed tables (already checked in NdbDictionary::supportedAlterTable()

ChangeSet@1.2588.2.4, 2007-09-19 17:23:58+05:00, gluh@mysql.com +9 -0
  after merge fix

  mysql-test/suite/ndb/r/ndb_alter_table.result@1.52, 2007-09-19 17:23:56+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/suite/ndb/r/ndb_alter_table_online.result@1.13, 2007-09-19 17:23:56+05:00, gluh@mysql.com +8 -8
    result fix

  mysql-test/suite/ndb/r/ndb_alter_table_online2.result@1.3, 2007-09-19 17:23:56+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/suite/ndb/r/ndb_binlog_basic.result@1.12, 2007-09-19 17:23:56+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result@1.23, 2007-09-19 17:23:56+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/suite/ndb/r/ndb_binlog_log_bin.result@1.7, 2007-09-19 17:23:56+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/suite/ndb/r/ndb_blob.result@1.28, 2007-09-19 17:23:56+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/suite/ndb/r/ndb_dd_alter.result@1.15, 2007-09-19 17:23:56+05:00, gluh@mysql.com +7 -7
    result fix

  mysql-test/suite/ndb/r/ndb_gis.result@1.31, 2007-09-19 17:23:56+05:00, gluh@mysql.com +2 -2
    result fix

ChangeSet@1.2588.2.3, 2007-09-19 15:01:41+05:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/suite/ndb/r/ndb_row_format.result@1.14, 2007-09-19 15:01:39+05:00, gluh@mysql.com +2 -4
    after merge fix

ChangeSet@1.2529.13.1, 2007-09-19 11:20:30+02:00, jmiller@mysql.com +1 -0
  NDBT_Thread.cpp:
    Removed semicolon causing build syntax issues per pekka

  storage/ndb/test/src/NDBT_Thread.cpp@1.2.1.1, 2007-09-19 11:20:22+02:00, jmiller@mysql.com +1 -1
    Removed semicolon causing build syntax issues per pekka

ChangeSet@1.2537.26.5, 2007-09-19 11:00:05+02:00, jmiller@mysql.com +1 -0
  NDBT_Thread.cpp:
    removed semicolon that caused build issue. Per pekka

  storage/ndb/test/src/NDBT_Thread.cpp@1.3, 2007-09-19 10:59:36+02:00, jmiller@mysql.com +1 -1
    removed semicolon that caused build issue. Per pekka

ChangeSet@1.2537.28.1, 2007-09-18 17:10:20+02:00, tomas@whalegate.ndb.mysql.com +4 -0
  Bug #31082 Online add column under load hits assert during replication
  - make sure we have both versions of the table object available to be used for binlog injection
  - move table object to event_data struct, hence we have one per ongoing event subscription

  sql/ha_ndbcluster.cc@1.480.6.1, 2007-09-18 17:10:16+02:00, tomas@whalegate.ndb.mysql.com +25 -30
    Bug #31082 Online add column under load hits assert during replication
    - make sure we have both versions of the table object available to be used for binlog injection
    - move table object to event_data struct, hence we have one per ongoing event subscription

  sql/ha_ndbcluster.h@1.186.2.1, 2007-09-18 17:10:16+02:00, tomas@whalegate.ndb.mysql.com +2 -3
    Bug #31082 Online add column under load hits assert during replication
    - make sure we have both versions of the table object available to be used for binlog injection
    - move table object to event_data struct, hence we have one per ongoing event subscription

  sql/ha_ndbcluster_binlog.cc@1.90.1.51, 2007-09-18 17:10:16+02:00, tomas@whalegate.ndb.mysql.com +103 -109
    Bug #31082 Online add column under load hits assert during replication
    - make sure we have both versions of the table object available to be used for binlog injection
    - move table object to event_data struct, hence we have one per ongoing event subscription

  sql/ha_ndbcluster_binlog.h@1.34.2.1, 2007-09-18 17:10:16+02:00, tomas@whalegate.ndb.mysql.com +13 -8
    Bug #31082 Online add column under load hits assert during replication
    - make sure we have both versions of the table object available to be used for binlog injection
    - move table object to event_data struct, hence we have one per ongoing event subscription

ChangeSet@1.2547.38.2, 2007-09-18 17:40:26+03:00, sergefp@mysql.com +1 -0
  pull_out_semijoin_tables(): Fix DBUG printout

  sql/sql_select.cc@1.554.3.4, 2007-09-18 17:40:17+03:00, sergefp@mysql.com +4 -2
    pull_out_semijoin_tables(): Fix DBUG printout

ChangeSet@1.2537.26.3, 2007-09-18 15:18:40+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - micro gcp
    1) Dont block micro GCP until GCP_SAVE_IDLE
    2) If starting node is blocking GCP too long, kill it (instead of self)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.146, 2007-09-18 15:18:38+02:00, jonas@perch.ndb.mysql.com +23 -12
    1) Dont block micro GCP until GCP_SAVE_IDLE
    2) If starting node is blocking GCP too long, kill it (instead of self)

ChangeSet@1.2528.221.1, 2007-09-17 21:39:07+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29985.
  Multiple-result processing is required during the execution
  of CALL statements for stored procedures, however the mysqlslap
  client lacked that processing.
  

  client/mysqlslap.c@1.61.1.2, 2007-09-17 21:23:40+05:00, gshchepa@gleb.loc +11 -7
    Fixed bug #29985.
    1. Connection flags have been changed: the CLIENT_MULTI_STATEMENTS
    flag has been added.
    2. The run_task function has been modified to process multiple
    result sets.

  mysql-test/r/mysqlslap.result@1.14, 2007-09-17 21:24:50+05:00, gshchepa@gleb.loc +5 -0
    Added test case for bug #29985.

  mysql-test/t/mysqlslap.test@1.17.1.1, 2007-09-17 21:24:02+05:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #29985.

ChangeSet@1.2528.218.5, 2007-09-17 12:31:10+02:00, aelkin@dl145j.mysql.com +5 -0
  Merge: bug@27417,23333 and bug#28960 tests with 5.1

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +234 -0
    sourced part for bugs with SF() etc having side effects of midifying
    non-transactional tables.
    

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.0, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.24, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +186 -0
    results changed

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.49, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +18 -27
    results changed

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.13.1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +2 -0
    calling included file with testing bug#27417,23333. bug#28960 is not an rbr bug.

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.16, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +3 -231
    moved SF() with side effects bugs to a separate includable file.
    This test verifies STMT format whereas binlog_row test is reposible for
    ROW format.

ChangeSet@1.2537.27.1, 2007-09-17 10:28:42+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - micro gcp
    when blockGcp == true(nr), wait also for GCP_SAVE to become idle

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.145, 2007-09-17 10:28:40+02:00, jonas@perch.ndb.mysql.com +14 -2
    when blockGcp == true, wait also for GCP_SAVE to become idle

ChangeSet@1.2528.218.4, 2007-09-16 18:16:40+02:00, aelkin@dl145j.mysql.com +3 -0
  Merge: bug#27417,23333 manual work for fixing tests and a source code.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.48, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +53 -24
    results changed due to 
    1. tt table made temporary is it's supposed to; 
    2. show master status is turned into binlog pos masking-out macro
    3. merge defect for select_insert::abort()

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.15, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +8 -8
    masking-out binlog postions in the results via 
    source include/show_binlog_events.inc;

  sql/sql_insert.cc@1.282.10.3, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +10 -9
    merging defect in not applied hunk for select_insert::abort() is fixed

ChangeSet@1.2528.218.3, 2007-09-16 12:07:00+02:00, aelkin@dl145j.mysql.com +5 -0
  Manual merge fixes/tests for bugs_28960,27417,23333.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +0 -250
    follow-up of the previous manual resolve. The snippet is moved into the heading
    file.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +89 -19
    results changed

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.14, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +126 -12
    removing explicit offsets from report;
    appending bug#27417,23333,28960 related snippet, addressing left TODO:s.

  mysql-test/suite/rpl/r/rpl_packet.result@1.10, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +7 -2
    results changed

  mysql-test/suite/rpl/t/rpl_packet.test@1.13, 2007-09-16 12:06:57+02:00, aelkin@dl145j.mysql.com +1 -1
    fixing row/stmt compatibility with #-ing out unneeded values

ChangeSet@1.2588.1.2, 2007-09-15 14:59:42-07:00, brian@zim.(none) +2 -0
  federated_archive.test:
    Test lacked propper source for replication type
  azio.c:
    In the unlikely event there is still a running thread, we cancel it.

  mysql-test/t/federated_archive.test@1.5, 2007-09-15 14:59:13-07:00, brian@zim.(none) +1 -0
    Test lacked propper source for replication type

  storage/archive/azio.c@1.20.1.7, 2007-09-15 14:59:19-07:00, brian@zim.(none) +1 -0
    In the unlikely event there is still a running thread, we cancel it.

ChangeSet@1.2547.37.1, 2007-09-15 14:36:00-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #31040. This bug occurred for queries whose WHERE/ON conditions
  contained several predicates with IN subqueries that were flattened.

  mysql-test/r/subselect_sj2.result@1.3, 2007-09-15 14:35:57-07:00, igor@olga.mysql.com +38 -0
    Added a test case for bug #31040.

  mysql-test/t/subselect_sj2.test@1.2, 2007-09-15 14:35:57-07:00, igor@olga.mysql.com +90 -0
    Added a test case for bug #31040.

  sql/sql_select.cc@1.554.5.1, 2007-09-15 14:35:58-07:00, igor@olga.mysql.com +16 -9
    Fixed bug #31040. This bug occurred for queries whose WHERE/ON conditions
    contained several predicates with IN subqueries that were flattened.
    When such a subquery is flattened first it's pulled in a newly build
    semijoin operation with ON condition formed by the WHERE condition of
    the subquery and equality predicate with the left operand set as the left
    argument of the subquery predicate and the right operand yielded by
    the select list of the subquery. At this moment the subquery is substituted
    for an item representing TRUE. After this, for a regular join query, the ON
    condition of the semijoin operation is injected into the WHERE condition 
    of the query. During this injection the new WHERE condition is flattened
    that results in a new AND list of the WHERE condition in which the references to
    other subqueries differ from the original ones. So when replacing these
    conditions for items representing TRUE we can't use the original references to
    the subqueries. The existing code did not take into account this fact. This 
    ultimately could cause an assertion abort.
    Now replacement of all flattened subqueries is performed before injections 
    into the WHERE clause of the upper query.  

ChangeSet@1.2529.11.3, 2007-09-15 23:33:04+02:00, mikael@dator6.(none) +1 -0
  Fixed ndbcluster_rollback

  sql/ha_ndbcluster.cc@1.408.62.2, 2007-09-15 23:33:02+02:00, mikael@dator6.(none) +6 -1
    Fixed ndbcluster_rollback

ChangeSet@1.2547.36.1, 2007-09-15 19:05:18+04:00, sergefp@mysql.com +3 -0
  BUG#30363: complex query slower by 2.6x to 6x times in 5.2 then in 5.1
  The bugfix is a fix for the incorrect merge:
   - Make make_join_orderinfo() determine the last table that can use the 
     join buffering in exactly the same way as it is done in 
     make_join_readinfo() in current 5.1
   - Remove now unneeded code from make_join_readinfo()

  mysql-test/r/innodb_mysql.result@1.37.2.1, 2007-09-15 19:05:12+04:00, sergefp@mysql.com +1 -1
    BUG#30363: Updated (previously incorrect) test result

  sql/sql_select.cc@1.554.4.1, 2007-09-15 19:05:13+04:00, sergefp@mysql.com +36 -28
    BUG#30363: complex query slower by 2.6x to 6x times in 5.2 then in 5.1
    The bugfix is a fix for the incorrect merge:
     - Make make_join_orderinfo() determine the last table that can use the 
       join buffering in exactly the same way as it is done in 
       make_join_readinfo() in current 5.1
     - Remove now unneeded code from make_join_readinfo()

  sql/sql_select.h@1.133, 2007-09-15 19:05:13+04:00, sergefp@mysql.com +8 -1
    BUG#30363: complex query slower by 2.6x to 6x times in 5.2 then in 5.1
    - Added comments

ChangeSet@1.2537.26.1, 2007-09-15 14:04:24+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  enable binlogging in test to force crash

  mysql-test/suite/ndb/t/ndb_alter_table_online2.test@1.2, 2007-09-15 14:04:21+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    enable binlogging in test to force crash

ChangeSet@1.2528.220.2, 2007-09-15 04:59:46+02:00, tnurnberg@mysql.com +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  after merge fix :-/

  client/mysqlbinlog.cc@1.157.2.2, 2007-09-15 04:59:32+02:00, tnurnberg@mysql.com +0 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    after merge fix :-/

ChangeSet@1.2547.1.50, 2007-09-14 21:13:53+02:00, gshchepa@devsrv-b.mysql.com +3 -0
  locktrans_myisam.result, ndb_column_properties.result:
    Merge with 5.1-opt.
  rpl_locktrans_myisam.result:
    Merge with 5.1-opt.

  mysql-test/r/locktrans_myisam.result@1.7, 2007-09-14 18:11:59+02:00, gshchepa@devsrv-b.mysql.com +19 -19
    Merge with 5.1-opt

  mysql-test/r/rpl_locktrans_myisam.result@1.7, 2007-09-14 21:10:46+02:00, gshchepa@devsrv-b.mysql.com +19 -19
    Merge with 5.1-opt.

  mysql-test/r/ndb_column_properties.result@1.8.1.1, 2007-09-14 18:45:14+02:00, gshchepa@devsrv-b.mysql.com +9 -9
    Merge with 5.1-opt

ChangeSet@1.2528.217.1, 2007-09-14 11:22:41-04:00, cbell@mysql_cab_desk. +4 -0
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch clarifies some of the coding choices with documentationa and
  removes a limitation in the code for future expansion of the CHAR and
  BINARY fields to length > 255.

  sql/field.cc@1.402.15.2, 2007-09-14 11:22:36-04:00, cbell@mysql_cab_desk. +1 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds an assertion to ensure we are not attempting to encode
    negative values.

  sql/log_event.cc@1.271.33.5, 2007-09-14 11:22:37-04:00, cbell@mysql_cab_desk. +10 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds comments to help explain the choice of variable types.

  sql/rpl_utility.cc@1.15.4.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +23 -13
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch removes code from the calc_field_size that is not needed and
    was ambiguous. Originally intended to future expansion, the code was
    not needed.
    
    Also added are comments to help explain some portions of the code.
    
    A change was made to the korr method to use the unsigned version to 
    avoid extended sign problems.

  sql/rpl_utility.h@1.12.6.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +7 -7
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch corrects some type discrepencies and removes an extra cast.

ChangeSet@1.2547.28.12, 2007-09-14 07:03:20-07:00, brian@zim.(none) +6 -0
  ha_archive.cc:
    Added replication piece
    Cleaned up warnings for windows.
  azio.c:
    Remove need for coin, and removed warning.
  azio.h:
    Removed no longer needed variable.
  archive_bitfield.test, archive_gis.test:
    Added replication piece
  archive-big.test:
    Added replication piece
    ,

  mysql-test/t/archive-big.test@1.2, 2007-09-14 07:03:17-07:00, brian@zim.(none) +2 -1
    Added replication piece

  mysql-test/t/archive_bitfield.test@1.2, 2007-09-14 07:03:17-07:00, brian@zim.(none) +1 -0
    Added replication piece

  mysql-test/t/archive_gis.test@1.4, 2007-09-14 07:03:17-07:00, brian@zim.(none) +2 -1
    Added replication piece

  storage/archive/azio.c@1.20.1.6, 2007-09-14 07:03:17-07:00, brian@zim.(none) +4 -4
    Remove need for coin, and removed warning.

  storage/archive/azio.h@1.12.1.5, 2007-09-14 07:03:17-07:00, brian@zim.(none) +0 -1
    Removed no longer needed variable.

  storage/archive/ha_archive.cc@1.144, 2007-09-14 07:03:17-07:00, brian@zim.(none) +4 -4
    Added replication piece
    Cleaned up warnings for windows.

ChangeSet@1.2547.33.1, 2007-09-13 18:56:07-07:00, brian@dib. +3 -0
  compile-solaris-sparc-forte:
    Fixed typo in in PREFIX
  azio.c:
    More error checking, and default logic for pread if aio_Read fails.
  Makefile.am:
    Fixes portability issues on 32bit and 64bit solaris

  BUILD/compile-solaris-sparc-forte@1.8.1.1, 2007-09-13 18:54:01-07:00, brian@dib. +6 -4
    Fixed typo in in PREFIX

  storage/archive/Makefile.am@1.13.1.1, 2007-09-13 18:55:13-07:00, brian@dib. +8 -10
    Fixes portability issues on 32bit and 64bit solaris

  storage/archive/azio.c@1.20.2.1, 2007-09-13 18:54:30-07:00, brian@dib. +22 -17
    More error checking, and default logic for pread if aio_Read fails.

ChangeSet@1.2547.28.10, 2007-09-13 17:59:48-07:00, brian@dib. +2 -0
  Makefile.am, probes.h:
    Fix for Windows (it lacks a unistd.h)

  sql/Makefile.am@1.197, 2007-09-13 17:58:42-07:00, brian@dib. +6 -1
    Fix for Windows (it lacks a unistd.h)

  sql/probes.h@1.2, 2007-09-13 17:58:58-07:00, brian@dib. +1 -1
    Fix for Windows (it lacks a unistd.h)

ChangeSet@1.2528.143.50, 2007-09-13 19:22:08-03:00, davi@moksha.local +3 -0
  Bug#30747 Create table with identical constraint names behaves incorrectly
  
  MySQL provides what appears to be a non standard extension to the
  FOREIGN KEY syntax which let users name (label/tag) a foreign key
  to more easily identify a specific foreign key if any problems show
  up later during the query parsing or execution. But the foreign key
  name was not being properly set to the right key, possible leaving
  the foreign key with no name.

  mysql-test/include/mix1.inc@1.51.1.1, 2007-09-13 19:22:04-03:00, davi@moksha.local +34 -0
    Add test case for Bug#30747

  mysql-test/r/innodb_mysql.result@1.24.19.1, 2007-09-13 19:22:05-03:00, davi@moksha.local +36 -0
    Add test case result for Bug#30747

  sql/sql_yacc.yy@1.458.141.3, 2007-09-13 19:22:05-03:00, davi@moksha.local +3 -2
    Set the foreign key name to the constraint name if a specific name was
    not provided. As for the constraint name, only use the foreign name if
    a specific name was not provided.

ChangeSet@1.2529.11.2, 2007-09-14 00:10:47+02:00, mikael@dator6.(none) +4 -0
  BUG#30996: Committed too early when autocommit and lock table
  Moved out a lot of code into functions from external_lock and
  start_stmt
  Fixed a crashing bug at memory alloc failure
  Merged the stmt and all variables into one trans variable
  Always register start of statement as according to the
  interface of the handlers.
  Also register for start of transaction when not statement commit
  == not autocommit AND no begin - commit ongoing
  Now that we registered in a proper manner we also needed to handle
  the commit call when end of statement and transaction is ongoing
  Added start_stmt_count to know when we have start of statement
  for first table

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +11 -0
    Added a new test case for bug30996

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.1, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/r/ndb_lock_table.result

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.0, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +5 -1
    Added a new test case for bug30996

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.1, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +11 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/t/ndb_lock_table.test

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.0, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +0 -0

  sql/ha_ndbcluster.cc@1.408.62.1, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +166 -163
    Moved out a lot of code into functions from external_lock and
    start_stmt
    Fixed a crashing bug at memory alloc failure
    Merged the stmt and all variables into one trans variable
    Always register start of statement as according to the
    interface of the handlers.
    Also register for start of transaction when not statement commit
    == not autocommit AND no begin - commit ongoing
    Now that we registered in a proper manner we also needed to handle
    the commit call when end of statement and transaction is ongoing
    Added start_stmt_count to know when we have start of statement
    for first table

  sql/ha_ndbcluster.h@1.170.11.5, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +6 -2
    New functions and merged variables

ChangeSet@1.1810.3314.1, 2007-09-13 16:19:46+02:00, tnurnberg@mysql.com +26 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout. if they
  didn't configure a value, assume "use a sensible default", which
  will be read from /etc/services or, failing that, from the factory
  default. That makes the order of preference
  - command-line option
  - my.cnf, where applicable
  - $MYSQL_TCP_PORT environment variable
  - /etc/services (unless configured --with-tcp-port)
  - default port (--with-tcp-port=... or factory default)

  scripts/mysqld_safe-watch.sh@1.5.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  client/mysqlmanagerc.c@1.13.2.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql.cc@1.199.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql_upgrade.c@1.6.11.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqladmin.cc@1.115.1.3, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlbinlog.cc@1.123.1.17, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlcheck.c@1.55.1.4, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqldump.c@1.214.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlimport.c@1.58.1.5, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlshow.c@1.49.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqltest.c@1.155.36.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  configure.in@1.245.102.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +28 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

  include/mysql_version.h.in@1.20, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  libmysql/libmysql.c@1.233.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +17 -4
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    initialize default tcp port for client, like so:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)
    - environment variable MYSQL_TCP_PORT overrides this default
    - command-line option overrides all of the above

  mysql-test/Makefile.am@1.66.7.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  mysql-test/mysql-test-run-shell.sh@1.262.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +10 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  netware/mysql_test_run.c@1.18.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +2 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  netware/mysqld_safe.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  scripts/Makefile.am@1.43.3.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  scripts/mysql_config.sh@1.27.1.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  scripts/mysql_fix_privilege_tables.sh@1.35.1.4, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    clarifying notice only

  server-tools/instance-manager/priv.h@1.10.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  sql/mysqld.cc@1.439.124.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +20 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    if builder specifically requested a default port, use that
    (even if it coincides with our factory default).
    only if they didn't do we check /etc/services (and, failing
    on that, fall back to the factory default of 3306).
    either default can be overridden by the environment variable
    MYSQL_TCP_PORT, which in turn can be overridden with command
    line options.

  tests/mysql_client_test.c@1.167.35.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  tests/ssl_test.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  tests/thread_test.c@1.17.1.1, 2007-09-13 16:19:45+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

ChangeSet@1.2528.211.1, 2007-09-13 18:33:40+05:00, svoj@mysql.com +3 -0
  BUG#30583 - Partition on DOUBLE key + INNODB + count(*) == crash
  
  Issuing SELECT COUNT(*) against partitioned InnoDB table may cause
  server crash.
  
  Fixed that not all required fields were included into read_set.

  mysql-test/r/partition_innodb.result@1.7, 2007-09-13 18:33:37+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30583.

  mysql-test/t/partition_innodb.test@1.6, 2007-09-13 18:33:37+05:00, svoj@mysql.com +8 -0
    A test case for BUG#30583.

  sql/ha_partition.cc@1.97.3.1, 2007-09-13 18:33:37+05:00, svoj@mysql.com +16 -0
    Ensure that all fields of current key are included into read_set,
    as partitioning requires them for sorting
    (see ha_partition::handle_ordered_index_scan).

ChangeSet@1.1810.3312.1, 2007-09-13 17:30:44+04:00, anozdrin@station. +2 -0
  Bug#16918: Aborted_clients > Connections.
  
  The problem was that aborted_threads variable was updated
  twice when a client connection had been aborted.
  
  The fix is to refactor a code to have aborted_threads updated
  only in one place.

  sql/mysql_priv.h@1.290.1.171, 2007-09-13 17:30:42+04:00, anozdrin@station. +0 -1
    Make do_command() a private function.

  sql/sql_parse.cc@1.426.162.1, 2007-09-13 17:30:43+04:00, anozdrin@station. +17 -10
    1. Make do_command() a private function;
    2. Update aborted_threads in the only one place.

ChangeSet@1.1616.3096.1, 2007-09-13 15:39:16+05:00, svoj@mysql.com +5 -0
  BUG#30590 - delete from memory table with composite btree primary key
  
  DELETE query against memory table with btree index may remove
  not all matching rows. This happens only when DELETE uses
  index read method to find matching rows. E.g. for queries
  like DELETE FROM t1 WHERE a=1.
  
  Fixed by reverting fix for BUG9719 and applying proper solution.

  mysql-test/r/heap_btree.result@1.13.2.5, 2007-09-13 15:39:15+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30590.

  mysql-test/t/heap_btree.test@1.12.1.6, 2007-09-13 15:39:15+05:00, svoj@mysql.com +9 -0
    A test case for BUG#30590.

  heap/hp_delete.c@1.12.2.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +0 -3
    Reverted fix for BUG9719 as it makes queries like
    DELETE FROM t1 WHERE a=1 to remove not all matching
    rows (assuming this is memory table and there is btree
    key over `a`).
    
    This happens because we calculate info->lastkey_len in
    heap_rkey(). When we enter heap_rnext(), info->lastkey_len
    is 0 (set by hp_rb_delete_key()). We need to preserve
    info->lastkey_len in this situation, otherwise
    tree_search_key() will always return smallest value in
    a tree.

  heap/hp_rfirst.c@1.13.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +11 -0
    If we're performing index_first on a table that was taken from
    table cache, info->lastkey_len is initialized to previous query.
    Thus we set info->lastkey_len to proper value for subsequent
    heap_rnext() calls.
    This is needed for DELETE queries only, otherwise this variable is
    not used.
    Note that the same workaround may be needed for heap_rlast(), but
    for now heap_rlast() is never used for DELETE queries.

  heap/hp_rnext.c@1.11.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +29 -0
    An optimization for DELETE queries that use index_first()/index_next().
    Use faster tree_search_edge() instead of tree_search_key().

ChangeSet@1.2547.31.1, 2007-09-13 13:53:25+04:00, sergefp@mysql.com +1 -0
  pull_out_semijoin_tables(): fix DBUG printout

  sql/sql_select.cc@1.554.1.3, 2007-09-13 13:53:18+04:00, sergefp@mysql.com +4 -2
    pull_out_semijoin_tables(): fix DBUG printout

ChangeSet@1.2528.209.1, 2007-09-12 12:42:02-06:00, malff@lambda.weblab +1 -0
  Cleanup of sql_yacc.yy

  sql/sql_yacc.yy@1.458.143.1, 2007-09-12 12:41:57-06:00, malff@lambda.weblab +15 -15
    Remove useless actions from the grammar.
    Empty {} actions in the middle of a rule caused an extra reduce,
    which is affecting the parser complexity and performances.

ChangeSet@1.2547.28.9, 2007-09-12 04:26:28-07:00, brian@zim.(none) +1 -0
  Makefile.am:
    Adding probes.h to include

  sql/Makefile.am@1.196, 2007-09-12 04:25:15-07:00, brian@zim.(none) +1 -0
    Adding probes.h to include

ChangeSet@1.2547.28.8, 2007-09-12 03:55:43-07:00, brian@zim.(none) +1 -0
  azio.h:
    Fixed dependencies on mysql_priv.h

  storage/archive/azio.h@1.12.1.4, 2007-09-12 03:55:17-07:00, brian@zim.(none) +2 -1
    Fixed dependencies on mysql_priv.h

ChangeSet@1.2547.28.7, 2007-09-12 01:12:35-07:00, brian@zim.(none) +4 -0
  probes.d:
    BitKeeper file /home/bk/mysql-5.2-arch/sql/probes.d
  azio.c:
    Fix for bad include
  mysql_priv.h:
    Adjusting order
  Makefile.am:
    Added extra dist

  sql/Makefile.am@1.195, 2007-09-12 01:10:32-07:00, brian@zim.(none) +1 -0
    Added extra dist

  sql/mysql_priv.h@1.520.2.2, 2007-09-12 01:10:52-07:00, brian@zim.(none) +1 -1
    Adjusting order

  sql/probes.d@1.1, 2007-09-12 01:10:10-07:00, brian@zim.(none) +31 -0
    BitKeeper file /home/bk/mysql-5.2-arch/sql/probes.d

  sql/probes.d@1.0, 2007-09-12 01:10:10-07:00, brian@zim.(none) +0 -0

  storage/archive/azio.c@1.20.1.4, 2007-09-12 01:11:23-07:00, brian@zim.(none) +2 -0
    Fix for bad include

ChangeSet@1.2547.30.1, 2007-09-11 21:16:59-07:00, brian@dib. +12 -0
  First patch for including dtrace in MySQL. 

  BUILD/compile-solaris-sparc-forte@1.9, 2007-09-11 20:42:39-07:00, brian@dib. +6 -4
    Updating solaris forte script so that it works :)

  config/ac-macros/dtrace.m4@1.1, 2007-09-11 21:15:53-07:00, brian@dib. +20 -0
    New BitKeeper file ``config/ac-macros/dtrace.m4''

  config/ac-macros/dtrace.m4@1.0, 2007-09-11 21:15:53-07:00, brian@dib. +0 -0

  configure.in@1.365.6.1, 2007-09-11 20:35:53-07:00, brian@dib. +1 -0
    Include for Dtrace

  sql/Makefile.am@1.194, 2007-09-11 20:46:28-07:00, brian@dib. +19 -0
    Additions needed for DTRACE. 

  sql/filesort.cc@1.135, 2007-09-11 20:51:04-07:00, brian@dib. +3 -0
    Update for dtrace

  sql/handler.cc@1.247.2.1, 2007-09-11 20:54:38-07:00, brian@dib. +5 -0
    Adding in dtrace probes.

  sql/mysql_priv.h@1.520.2.1, 2007-09-11 20:59:08-07:00, brian@dib. +5 -0
    Update for dtrace

  sql/probes.h@1.1, 2007-09-11 21:14:57-07:00, brian@dib. +133 -0
    New BitKeeper file ``sql/probes.h''

  sql/probes.h@1.0, 2007-09-11 21:14:57-07:00, brian@dib. +0 -0

  sql/sql_delete.cc@1.212.1.1, 2007-09-11 21:02:54-07:00, brian@dib. +16 -7
    Update for dtrace

  sql/sql_insert.cc@1.291.1.1, 2007-09-11 21:06:04-07:00, brian@dib. +3 -0
    Update for dtrace

  sql/sql_select.cc@1.554.2.1, 2007-09-11 21:09:06-07:00, brian@dib. +2 -0
    Update for dtrace

  sql/sql_update.cc@1.229, 2007-09-11 21:11:58-07:00, brian@dib. +16 -10
    Update for dtrace

ChangeSet@1.2547.28.5, 2007-09-11 15:38:15-07:00, brian@zim.(none) +2 -0
  Fix warnings in Makefile.am. We now pause for shutdown of any outstanding AIO requests on close. 

  storage/archive/Makefile.am@1.14, 2007-09-11 15:38:10-07:00, brian@zim.(none) +8 -10
    Fixed warnings. 

  storage/archive/azio.c@1.20.1.3, 2007-09-11 15:38:10-07:00, brian@zim.(none) +9 -0
    We now wait on cleanup of any AIO outstanding requests. 

ChangeSet@1.2528.208.1, 2007-09-11 15:00:52+02:00, msvensson@pilot.(none) +1 -0
  Add support for specifying suites not located in mysql-test/suite/
  Example otions that will all run binlog_stm_binlog.test in suite/binlog:
   --suite=binlog binlog.binlog_stm_binlog
   --suite=binlog binlog_stm_binlog
   binlog_stm_binlog
   --suite=suite/binlog binlog.binlog_stm_binlog
   --suite=suite/binlog binlog_stm_binlog
   

  mysql-test/lib/mtr_cases.pl@1.65, 2007-09-11 15:00:50+02:00, msvensson@pilot.(none) +10 -13
    Add support for specifying suites not located in mysql-test/suite/
    Example otions that will all run binlog_stm_binlog.test in suite/binlog:
     --suite=binlog binlog.binlog_stm_binlog
     --suite=binlog binlog_stm_binlog
     binlog_stm_binlog
     --suite=suite/binlog binlog.binlog_stm_binlog
     --suite=suite/binlog binlog_stm_binlog
     

ChangeSet@1.2547.29.1, 2007-09-11 11:29:35+02:00, rafal@quant.(none) +3 -0
  BUG#30947 (BACKUP DATABASE fails if table definitions are larger than 
  4kbyte):
  
  This is fixed by increasing the limit on single data chunk size to a 
  more realistic value of 2MB. Now backup should work as long as 
  definitions of all tables being backed-up fit into 2MB. The limits are
  configurable through constants defined in backup/stream.h.

  mysql-test/r/backup.result@1.4, 2007-09-11 11:29:28+02:00, rafal@quant.(none) +4 -4
    Change of results due to different size of data buffers used by 
    backup kernel.

  sql/backup/data_backup.cc@1.10, 2007-09-11 11:29:29+02:00, rafal@quant.(none) +1 -1
    Use data buffers of size io_buffer_size instead of fixed 2kB. 

  sql/backup/stream.h@1.10, 2007-09-11 11:29:29+02:00, rafal@quant.(none) +11 -1
    Define parameters for data buffer size and maximal chunk size.

ChangeSet@1.2528.143.48, 2007-09-10 16:10:37-06:00, malff@lambda.weblab +18 -0
  WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name>
    UPGRADE)
  
  Bug 17565 (RENAME DATABASE destroys events)
  Bug#28360 (RENAME DATABASE destroys routines)
  
  Removed the
    RENAME DATABASE db1 TO db2
  statement.
  
  Implemented the
    ALTER DATABASE db UPGRADE DATA DIRECTORY NAME
  statement, which has the same function.

  client/mysqlcheck.c@1.68, 2007-09-10 12:53:15-06:00, malff@omega.weblab +21 -4
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/create.result@1.144.1.9, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/query_cache.result@1.101.1.2, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -49
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/renamedb.result@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -32
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-code.result@1.16.1.1, 2007-09-10 12:53:15-06:00, malff@omega.weblab +2 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-error.result@1.125.1.4, 2007-09-10 12:53:15-06:00, malff@omega.weblab +13 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/upgrade.result@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +25 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/create.test@1.104, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/query_cache.test@1.81.1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +39 -41
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/renamedb.test@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +49 -22
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/sp-error.test@1.122.1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +28 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/upgrade.test@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +31 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/mysql_priv.h@1.505.17.15, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_db.cc@1.160.1.3, 2007-09-10 16:10:32-06:00, malff@lambda.weblab +42 -80
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_lex.h@1.284.2.13, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_parse.cc@1.693.16.2, 2007-09-10 12:53:16-06:00, malff@omega.weblab +11 -15
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_prepare.cc@1.228.1.4, 2007-09-10 12:53:17-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_yacc.yy@1.458.141.1, 2007-09-10 12:53:17-06:00, malff@omega.weblab +12 -20
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

ChangeSet@1.2547.28.4, 2007-09-08 00:11:05-07:00, brian@zim.(none) +1 -0
  Fix for Windows and a smal clenaup to remove duplcate variable setting.

  storage/archive/azio.c@1.20.1.2, 2007-09-08 00:11:02-07:00, brian@zim.(none) +1 -9
    Set now sane. AKA use memset, remove other variables.

ChangeSet@1.2547.28.3, 2007-09-07 15:00:08-07:00, brian@zim.(none) +2 -0
  Fix for Windows (aka removes config.h from needed to be found). 

  storage/archive/Makefile.am@1.13, 2007-09-07 15:00:04-07:00, brian@zim.(none) +9 -8
    Removed -lrt dependency (not needed)
    Added define for config.h

  storage/archive/azio.h@1.12.1.3, 2007-09-07 15:00:04-07:00, brian@zim.(none) +3 -1
    Added config.h explicit compile information. 

ChangeSet@1.2547.27.1, 2007-09-07 12:57:25-07:00, brian@zim.(none) +2 -0
  Now support a --ignore-sql-errors to allow tests to continue even if an error occurs. 

  client/client_priv.h@1.82, 2007-09-07 12:57:22-07:00, brian@zim.(none) +1 -0
    New flag

  client/mysqlslap.c@1.62.1.1, 2007-09-07 12:57:22-07:00, brian@zim.(none) +12 -3
    if for error conditions.

ChangeSet@1.2547.25.1, 2007-09-07 12:29:33-07:00, brian@zim.(none) +14 -0
  aio support in archive added. read() has been replaced with pread() for normal read cases. 
  
  This can be enabled and disabled through the variable archive_aio. 

  configure.in@1.365.5.1, 2007-09-07 12:29:29-07:00, brian@zim.(none) +3 -0
    Adding check for librt

  mysql-test/r/archive.result@1.34, 2007-09-07 12:29:29-07:00, brian@zim.(none) +4 -0
    Creating a specific test to make sure that the non-aio version is tested. 

  mysql-test/r/archive_aio_posix.result@1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +12684 -0
    BitKeeper file /home/brian/mysql/archive-5.2/mysql-test/r/archive_aio_posix.result

  mysql-test/r/archive_aio_posix.result@1.0, 2007-09-07 12:29:30-07:00, brian@zim.(none) +0 -0

  mysql-test/t/archive.test@1.33, 2007-09-07 12:29:29-07:00, brian@zim.(none) +2 -0
    Adding specific piece to make sure non-aio is tested. 

  mysql-test/t/archive_aio_posix.test@1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +1562 -0
    BitKeeper file /home/brian/mysql/archive-5.2/mysql-test/t/archive_aio_posix.test
    ---
    Results are not predictable (some platforms may never enable aio)

  mysql-test/t/archive_aio_posix.test@1.0, 2007-09-07 12:29:30-07:00, brian@zim.(none) +0 -0

  storage/archive/Makefile.am@1.12, 2007-09-07 12:29:29-07:00, brian@zim.(none) +16 -4
    Update for changes in library name.

  storage/archive/archive_performance.c@1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +160 -0
    BitKeeper file /home/brian/mysql/archive-5.2/storage/archive/archive_performance.c
    ---
    Remove test file at end of run.

  storage/archive/archive_performance.c@1.0, 2007-09-07 12:29:30-07:00, brian@zim.(none) +0 -0

  storage/archive/archive_reader.c@1.9.1.1, 2007-09-07 12:29:29-07:00, brian@zim.(none) +1 -1
    Rename headers. 

  storage/archive/archive_test.c@1.13, 2007-09-07 12:29:29-07:00, brian@zim.(none) +27 -16
    More tests. Loop through to test rewind, also test both aio and read.

  storage/archive/azio.c@1.19.1.1, 2007-09-07 12:29:29-07:00, brian@zim.(none) +96 -20
    All new support for aio.

  storage/archive/azio.h@1.12.1.2, 2007-09-07 12:29:29-07:00, brian@zim.(none) +16 -2
    aio support pieces. 

  storage/archive/azio.h@1.12.1.1, 2007-09-07 12:14:22-07:00, brian@zim.(none) +0 -0
    Rename: storage/archive/azlib.h -> storage/archive/azio.h

  storage/archive/ha_archive.cc@1.141.1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +20 -2
    AIO support pieces. 

  storage/archive/ha_archive.h@1.65.1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +1 -1
    Change of headers

  storage/archive/support/archive_read_test.slap@1.1, 2007-09-07 12:29:30-07:00, brian@zim.(none) +26 -0
    BitKeeper file /home/brian/mysql/archive-5.2/storage/archive/support/archive_read_test.slap
    ---
    Support file (aka the test run I used for slap).

  storage/archive/support/archive_read_test.slap@1.0, 2007-09-07 12:29:30-07:00, brian@zim.(none) +0 -0

ChangeSet@1.2547.13.18, 2007-09-07 12:46:38+01:00, markleith@medusa.mysql.com +1 -0
  Fixed comment

  sql/sql_connect.cc@1.11, 2007-09-07 12:43:58+01:00, markleith@medusa.mysql.com +2 -2
    Fixing comment 

ChangeSet@1.2528.1.42, 2007-09-07 12:04:57+04:00, skozlov@mysql.com +1 -0
  replaced '--exec rm' to '--remove_file'

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.7, 2007-09-07 12:04:48+04:00, skozlov@mysql.com +2 -2
    replaced '--exec rm' to '--remove_file'

ChangeSet@1.1810.2582.3, 2007-09-07 11:58:04+04:00, kaa@polly.(none) +2 -0
  This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB".
    
  The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
    
  - I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
  - even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.

  include/my_global.h@1.96.10.3, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +0 -3
    Removed SSIZE_MAX definition because it's not neeeded anymore.

  sql/mysqld.cc@1.439.123.1, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +3 -3
    Limit read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms.

ChangeSet@1.2547.23.1, 2007-09-05 15:06:37-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#30793: set random seed for mysqlslap
  
  Contributed patch from "mushuiliu".  No CLA.
  
  Add a new parameter "set-random-seed", which takes an uint
  as an argument.
  
  If the parameter isn't used or is used for value "0", then the
  random_seed is set from time() as usual.
  
  Print the seed value in the output, so a run can be replayed.

  client/mysqlslap.c@1.58.3.1, 2007-09-05 15:06:35-04:00, cmiller@zippy.cornsilk.net +11 -1
    Add a new parameter "set-random-seed", which takes an uint
    as an argument.
    
    If the parameter isn't used or is used for value "0", then the
    random_seed is set from time() as usual.
    
    Print the seed value in the output, so a run can be replayed.

ChangeSet@1.1810.3246.2, 2007-09-05 15:06:10-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
    
  Previously, UDF *_init functions were passed constant strings with erroneous lengths.
  The length came from the containing variable's size, not the length of the value itself.
    
  Now the *_init functions get the constant as a null terminated string with the correct
  length supplied too.

  mysql-test/r/udf.result@1.3.1.11, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.1.6, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.74.1, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max
    length of the var containing the constant.

  sql/udf_example.c@1.29.1.7, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that the
    lengths of constants are correctly passed.

  sql/udf_example.def@1.3.1.1, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2528.1.41, 2007-09-04 15:24:04+02:00, rafal@quant.(none) +1 -0
  Disabling rpl_ndb_2other test.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.4.3.1, 2007-09-04 15:24:01+02:00, rafal@quant.(none) +1 -0
    The rpl_ndb_2other test must be disabled until replication correctly
    handles endianess issues.

ChangeSet@1.2528.182.2, 2007-09-03 12:57:47+04:00, kaa@polly.(none) +2 -0
  Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1. This is for bug #5731.

  include/my_global.h@1.176, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +3 -0
    Added SIZE_T_MAX.

  sql/mysqld.cc@1.636.5.25, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +1 -1
    Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1.

ChangeSet@1.2547.7.2, 2007-08-30 16:55:03+05:00, bar@mysql.com +1 -0
  Adding Erik Wetterberg into the list of authors

  sql/authors.h@1.20, 2007-08-30 16:55:01+05:00, bar@mysql.com +1 -0
    Adding Erik Wetterberg into the list of authors

ChangeSet@1.1810.3294.1, 2007-08-29 19:57:10+03:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #30209  	rpl_packet.test: Slave_running mismatch (timing bug?)
  
  explicit --sleep is removed in favor of wait_for_slave_io_to_stop.inc.
  The status reporting uses `SHOW SLAVE STATUS' *not* possibly buggy "SHOW STATUS LIKE 'Slave_running'".

  mysql-test/r/rpl_packet.result@1.4.2.1, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +34 -3
    Recording the necessary Slave_IO_Running status at the end of the bug test.
    It must be No.

  mysql-test/t/rpl_packet.test@1.4.2.2, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +6 -4
    Removing sleep; wait_for_slave_io_to_stop.inc instead;
    Original "SHOW STATUS LIKE 'Slave_running'" seems to be buggy (to be reported) as with the macro above
    there were evidence slave IO was stopped indeed but "SHOW STATUS" did not find that (see failures in pb)

ChangeSet@1.1810.3293.1, 2007-08-29 20:45:04+04:00, kaa@polly.local +2 -0
  Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.

  include/keycache.h@1.7.2.2, 2007-08-29 20:45:00+04:00, kaa@polly.local +5 -5
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

  mysys/mf_keycache.c@1.55.1.9, 2007-08-29 20:45:00+04:00, kaa@polly.local +13 -12
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

ChangeSet@1.1810.3292.1, 2007-08-29 20:33:44+04:00, kaa@polly.local +1 -0
  Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms, since the related code in 5.0 is not 64-bit safe. This is patch is a part of work on bug #5731 and will be null-merged to 5.1.

  sql/mysqld.cc@1.439.1.184, 2007-08-29 20:33:37+04:00, kaa@polly.local +3 -3
    Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms.

ChangeSet@1.1810.3291.2, 2007-08-29 19:20:18+04:00, kaa@polly.local +4 -0
  Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.
  
  This is required to allow key_buffer_size > 4 GB (bug #5731).

  include/my_sys.h@1.178.2.20, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -13
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_largepage.c@1.2.1.1, 2007-08-29 19:20:12+04:00, kaa@polly.local +6 -6
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_malloc.c@1.9.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +8 -8
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/safemalloc.c@1.24.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -14
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

ChangeSet@1.2528.176.1, 2007-08-27 18:44:13+04:00, skozlov@mysql.com +3 -0
  WL#3694 Replication of Invocation and Invoked Features Testing.
  Bug#29020 Event results not correctly replicated to slave in RBR: partially.

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.5, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +14 -16
    Updated result file.

  mysql-test/suite/rpl/t/disabled.def@1.13, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +0 -3
    removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.6, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +49 -31
    Added comments, implemented the waiting via include/wait_condition, minor fixes.

ChangeSet@1.2528.1.37, 2007-08-27 16:17:17+02:00, rafal@quant.(none) +5 -0
  Post merge fixes.

  sql/log_event.cc@1.271.33.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +23 -18
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event.h@1.155.3.2, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event_old.cc@1.5.2.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/log_event_old.h@1.7, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +8 -8
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/sql_yacc.yy@1.458.138.1, 2007-08-27 16:17:13+02:00, rafal@quant.(none) +1 -12
    Reverting to version used in the rpl tree.

ChangeSet@1.1810.3278.1, 2007-08-23 10:22:20+02:00, thek@adventure.(none) +3 -0
  Bug#27358 INSERT DELAYED does not honour SQL_MODE of the client
  
  SQL_MODE was ignored when a client issued INSERT DELAYED.
  
  Some system settings weren't copied as intended when a record was saved for
  a delayed insert. 

  mysql-test/r/delayed.result@1.12.1.3, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +29 -0
    Added test case

  mysql-test/t/delayed.test@1.11.1.8, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +31 -0
    Added test case

  sql/sql_insert.cc@1.146.65.1, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +8 -0
    - Added two new variables (sql_mode, auto_increment_field_not_null) to support
      SQL_MODE in INSERT DELAYED statements.

ChangeSet@1.1810.3272.3, 2007-08-22 15:43:16+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#23333
  
  fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)

  mysql-test/r/sp_trans_log.result@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +4 -3
    results changed as prescribed

  mysql-test/t/sp_trans_log.test@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -1
    Replacing the reporting pattern
    
    ### a possible bug: 
    #show master status /* the offset must denote there is the query */|
    # displays different offests in ps-protocol
    
    with 
      show binlog events

ChangeSet@1.1810.3272.2, 2007-08-22 10:40:38+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#27417
  
  refining of cleanup of the tests.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    proper cleanup.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    results changed.

ChangeSet@1.1810.3272.1, 2007-08-21 15:16:55+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +8 -0
  Bug #23333 stored function + non-transac table + transac table = breaks stmt-based binlog
  
  Binlogging of the statement with a side effect like a modified non-trans table did not happen.
  The artifact involved all binloggable dml queries.
  
  Fixed with changing the binlogging conditions all over the code to exploit thd->transaction.stmt.modified_non_trans_table
  introduced by the patch for bug@27417.
  
  Multi-delete case has own specific addressed by another bug@29136. Multi-update case has been addressed by bug#27716 and
  patch and will need merging.

  mysql-test/r/sp_trans_log.result@1.1.1.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -2
    results changed

  mysql-test/t/sp_trans_log.test@1.1.1.1, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -2
    refining of the proof of that there is an event in binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +119 -1
    specific to the bug tests added

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +71 -2
    results changed

  sql/sql_delete.cc@1.144.1.56, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -3
    deploying the binlogging check with thd->transaction.stmt.modified_non_trans_table

  sql/sql_insert.cc@1.146.1.104, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +39 -39
    binlogging when thd->transaction.stmt.modified_non_trans_table is TRUE. Merge with Bug#29571.

  sql/sql_load.cc@1.78.1.39, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

  sql/sql_update.cc@1.154.2.69, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

ChangeSet@1.2528.144.2, 2007-08-20 13:24:37+04:00, skozlov@mysql.com +2 -0
  Bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.6, 2007-08-20 13:24:20+04:00, skozlov@mysql.com +2 -2
    removed file_id,block_len from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.6, 2007-08-20 13:24:21+04:00, skozlov@mysql.com +2 -2
    updated result file

ChangeSet@1.2528.144.1, 2007-08-20 12:31:21+04:00, skozlov@mysql.com +1 -0
  rpl.rpl_innodb_mixed_dml enabled

  mysql-test/suite/rpl/t/disabled.def@1.12, 2007-08-20 12:31:11+04:00, skozlov@mysql.com +1 -1
    rpl.rpl_innodb_mixed_dml enabled

ChangeSet@1.2528.141.1, 2007-08-17 19:51:25+02:00, jmiller@mysql.com +1 -0
  rpl_packet.test:
    Removed sleep from test per lars request

  mysql-test/suite/rpl/t/rpl_packet.test@1.11, 2007-08-17 19:51:05+02:00, jmiller@mysql.com +0 -1
    Removed sleep from test per lars request

ChangeSet@1.2528.138.1, 2007-08-16 14:00:35-07:00, antony@pcg5ppc.xiphis.org +1 -0
  Bug#30359
    "Test federated_bug_25714 issues non-existing shell command"
    Problem caused by missing '$' symbol in eval statement causing it
    to always attempt to run test even if the test was not compiled.

  mysql-test/include/have_bug25714.inc@1.2, 2007-08-16 14:00:32-07:00, antony@pcg5ppc.xiphis.org +1 -1
    bug30359
      missing '$' in eval statement

ChangeSet@1.2528.105.1, 2007-08-03 03:50:19+05:00, svoj@mysql.com +1 -0
  BUG#27040 - Incorrect FTS parser name output
  
  When a table uses two (or more) fulltext keys with different fulltext parsers,
  all fulltext keys (excluding those that use built-in parser) were using first
  parser that was mentioned in .frm.
  
  With this fix fulltext keys use proper (assigned during create table) fulltext
  parser.
  
  This code was contributed by Yoshinori Matsunobu ymatsunobu@mysql.com
  on 2007-03-12 The copyright was assigned and transferred under the
  terms of the MySQL Contributor License Agreement.

  sql/table.cc@1.288.15.1, 2007-08-03 03:50:09+05:00, svoj@mysql.com +1 -0
    Shift extra data segment buffer pointer by parser name length to restore
    next key parser name correctly.

ChangeSet@1.2547.4.4, 2007-08-02 14:48:21-07:00, antony@pcg5ppc.xiphis.org +2 -0
  bug#29640
    "log2() is not available on many Unix dialects or older versions"
    Add check for existance of log2() function after checking for
    existance of libm.
    Declare a macro which approximates log2() if it does not exist.
    Tested on FreeBSD 6.2 which does not have a log2() implementation.

  configure.in@1.365.2.3, 2007-08-02 14:48:17-07:00, antony@pcg5ppc.xiphis.org +1 -0
    bug29640
      Add check for existance of log2() function after checking for
      existance of libm.

  include/my_global.h@1.174.1.1, 2007-08-02 14:48:18-07:00, antony@pcg5ppc.xiphis.org +8 -0
    bug29640
      If log2() does not exist, declare a macro which approximates it.

ChangeSet@1.1810.3211.1, 2007-07-27 16:26:26-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29419 "Specifying a join_buffer > 4GB on 64 bit machines not possible."
  
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
  
  The test case for this bug is a part of the test suite for bug #5731.

  sql/sql_select.cc@1.312.164.1, 2007-07-27 16:26:22-04:00, dkatz@damien-katzs-computer.local +4 -3
    Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.

ChangeSet@1.2495.21.20, 2007-07-20 16:06:04+05:00, bar@mysql.com +4 -0
  Bug#29459 server died handling latin2 collate latin2_czech_cs
  Problem: sizeof() was errouneously used instead array_elements(),
  which made the loop access to wrong memory.
  Fix: changing sizeof() to array_elements().

  mysql-test/r/ctype_latin2_ch.result@1.4, 2007-07-20 16:06:02+05:00, bar@mysql.com +11 -0
    Adding test

  mysql-test/t/ctype_latin2_ch.test@1.4, 2007-07-20 16:06:02+05:00, bar@mysql.com +12 -0
    Adding test

  strings/ctype-czech.c@1.69, 2007-07-20 16:06:02+05:00, bar@mysql.com +1 -1
    Changing sizeof() to array_elements()

  strings/ctype-win1250ch.c@1.61, 2007-07-20 16:06:02+05:00, bar@mysql.com +46 -30
    - Changing sizeof() to array_elements()
    - Changing TAB to spaces
    - Fixing coding style

ChangeSet@1.2495.21.19, 2007-07-19 15:27:49+05:00, bar@mysql.com +3 -0
  Bug#29752 Linefeeds break LOAD XML INFILE
  Problem: Linefeed, newline and tab characters where
  not considered as separators. Only space character
  worked as separator.
  Fix: convert linefeed, newline and tab characters to space
  when loading the next character from the input stream.
  This is safe, because these characters are equal from the
  point of view of XML.

  mysql-test/r/loadxml.result@1.4, 2007-07-19 15:27:47+05:00, bar@mysql.com +16 -0
    Adding tests

  mysql-test/std_data/loadxml.dat@1.2, 2007-07-19 15:27:47+05:00, bar@mysql.com +20 -1
    Adding tests

  sql/sql_load.cc@1.130.1.1, 2007-07-19 15:27:47+05:00, bar@mysql.com +39 -20
    When loading from the input stream, convert all newline,
    linefeed and tab characters to spaces.

ChangeSet@1.2528.33.1, 2007-07-17 15:49:07-05:00, jmiller@mysql.com +4 -0
  Many files:
    Added new test case for dropping column on the end of master table

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.4, 2007-07-17 15:48:33-05:00, jmiller@mysql.com +64 -2
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_innodb.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_myisam.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_ndb_extraCol.result@1.6.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

ChangeSet@1.2482.130.1, 2007-07-05 07:42:12-05:00, jmiller@mysql.com +2 -0
  ndb api test case for bug 29501

  storage/ndb/test/ndbapi/testDict.cpp@1.35.1.3, 2007-07-05 07:40:36-05:00, jmiller@mysql.com +255 -0
    Added test for Bug#29501. Tested on both code without patch and code with patch. DN fails on code w/o and passed for code w/. Also includes new helper functions runWaitStarted and DropDDObjects. Along with these helper function I have included a test for DropDDObjects. I did find a case where lgman fails on the restarting DN with corrupt fs error. I will file a new bug report and test case for that.

  storage/ndb/test/run-test/daily-basic-tests.txt@1.61.9.6, 2007-07-05 07:41:16-05:00, jmiller@mysql.com +8 -0
    Added new tests for bug29501

ChangeSet@1.2403.16.165, 2007-07-05 12:05:16+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  bump up version

  configure.in@1.330.75.17, 2007-07-05 12:05:14+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    bump up version

ChangeSet@1.2403.16.163, 2007-07-03 11:34:02+02:00, tomas@whalegate.ndb.mysql.com +9 -0
  special CGE 6.1 slave batching patch

  mysql-test/mysql-test-run.pl@1.122.64.3, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    special CGE 6.1 slave batching patch

  mysql-test/r/rpl_ndb_basic.result@1.4.5.2, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    special CGE 6.1 slave batching patch

  mysql-test/t/disabled.def@1.227.1.2, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    special CGE 6.1 slave batching patch

  sql/ha_ndbcluster.cc@1.397.7.13, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +65 -33
    special CGE 6.1 slave batching patch

  sql/ha_ndbcluster.h@1.165.3.2, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    special CGE 6.1 slave batching patch

  sql/log_event.cc@1.263.3.2, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +22 -0
    special CGE 6.1 slave batching patch

  sql/mysql_priv.h@1.470.21.1, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +6 -0
    special CGE 6.1 slave batching patch

  sql/mysqld.cc@1.601.20.3, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +6 -1
    special CGE 6.1 slave batching patch

  sql/set_var.cc@1.211.4.1, 2007-07-03 11:33:56+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    special CGE 6.1 slave batching patch

ChangeSet@1.2469.268.2, 2007-06-12 16:29:21-04:00, cmiller@zippy.cornsilk.net +4 -0
  Bug#26780: automatic vertical output for wide results
  
  Feature from Eric Bergen, CLA signed 2007-06-27.
  
  Adds new mysql client option "--auto-vertical-output", which causes
  the client to test whether a result table is too wide for the current
  window (where available) and emit vertical results in that case. 
  Otherwise, it sends normal tabular results.

  client/client_priv.h@1.63.3.1, 2007-06-12 16:04:48-04:00, cmiller@zippy.cornsilk.net +1 -0
    Add a new enum item for client options

  client/mysql.cc@1.255.3.2, 2007-06-12 16:29:19-04:00, cmiller@zippy.cornsilk.net +1 -0
    This should only ever be called at the beginning of reading a result.

  client/mysql.cc@1.255.3.1, 2007-06-12 16:04:48-04:00, cmiller@zippy.cornsilk.net +88 -3
    Add new command-line option "auto-vertical-output".
    
    Add functions to get the terminal width and functions to get the 
    widths of fields.

  mysql-test/r/mysql.result@1.34.1.1, 2007-06-12 16:04:48-04:00, cmiller@zippy.cornsilk.net +196 -0
    Verify that long rows wrap and short ones do not.

  mysql-test/t/mysql.test@1.42.1.1, 2007-06-12 16:04:48-04:00, cmiller@zippy.cornsilk.net +10 -1
    Verify that long rows wrap and short ones do not.

ChangeSet@1.2469.268.1, 2007-06-08 09:57:36-04:00, cmiller@zippy.cornsilk.net +5 -0
  Contributed patch from Harshula Jayasuriya,  CLA signed 21 Feb 2007.
  
  Bug#26474: Add Sinhala script collation
  
  The Default Unicode Collation Element Table (DUCET) and the Unicode 
  binary order are insufficient to properly sort Sinhala script.
  
  A standard Sinhala collation order has been established as part of 
  SLS1134 (SCCII Part 1 : Collation Sequence).

  config/ac-macros/character_sets.m4@1.8.1.1, 2007-06-08 09:57:34-04:00, cmiller@zippy.cornsilk.net +2 -2
    Add Sinhala collation reference.

  mysql-test/r/ctype_utf8.result@1.113.2.1, 2007-06-08 09:57:34-04:00, cmiller@zippy.cornsilk.net +110 -0
    Verify collation order matches predictions.
    ---
    Include the hexadecimal, as requested by submitter.

  mysql-test/t/ctype_utf8.test@1.103.2.1, 2007-06-08 09:57:34-04:00, cmiller@zippy.cornsilk.net +13 -0
    Test predicted collation order.
    ---
    Include the hexadecimal, as requested by submitter.

  mysys/charset-def.c@1.17.1.1, 2007-06-08 09:57:34-04:00, cmiller@zippy.cornsilk.net +4 -0
    Insert new collation.

  strings/ctype-uca.c@1.43.2.1, 2007-06-08 09:57:34-04:00, cmiller@zippy.cornsilk.net +94 -1
    Add new utf8 and ucs2 collations for Sinhala.

ChangeSet@1.1810.3029.1, 2007-06-06 17:54:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug #28701:
  Views don't have indexes. So they can't take index hints.
  Added a check and disabled the usage of hints for views.

  mysql-test/r/view.result@1.138.1.68, 2007-06-06 17:54:00+03:00, gkodinov@macbook.gmz +12 -1
    Bug #28701: test case

  mysql-test/t/view.test@1.126.1.61, 2007-06-06 17:54:01+03:00, gkodinov@macbook.gmz +21 -1
    Bug #28701: test case

  sql/sql_view.cc@1.78.23.4, 2007-06-06 17:54:03+03:00, gkodinov@macbook.gmz +9 -0
    Bug #28701: disable usage of hints for views

ChangeSet@1.1810.2832.3, 2007-04-12 09:47:45+02:00, mats@capulet.net +1 -0
  Adding build file for Solaris on AMD64

  BUILD/compile-solaris-amd64@1.1, 2007-04-12 09:47:34+02:00, mats@capulet.net +55 -0
    New BitKeeper file ``BUILD/compile-solaris-amd64''

  BUILD/compile-solaris-amd64@1.0, 2007-04-12 09:47:34+02:00, mats@capulet.net +0 -0

ChangeSet@1.2469.14.1, 2007-03-11 22:30:54+04:00, holyfoot@mysql.com +1 -0
  Bug #26527 LOAD DATA INFILE extremely slow with partitioned table
  mysql_load calls hander::start_bulk_insert(0) to prepare caches
  for big inserts. As ha_partition didn't allow these caches
  for underlaying tables, the inserts were much slower

  sql/ha_partition.cc@1.83.1.4, 2007-03-11 22:30:51+04:00, holyfoot@mysql.com +1 -6
    allow using caches for BIG inserts

ChangeSet@1.1810.2430.5, 2006-12-15 11:32:41+01:00, rafal@quant.(none) +1 -0
  BUG#21132 (Slave fails to reconnect on update_slave_list):
  
  The update_slave_list() call is a remainder from attempts to implement failsafe 
  replication. This code is now obsolete and not maintained (see comments in 
  rpl_failsafe.cc). 
  
  Inspecting the code one can see that this function do not interferre with normal 
  slave operation and thus can be safely removed. This will solve the issue 
  reported in the bug (errors on slave reconnection). 
  
  A related issue is to remove unneccessary reconnections done by slave. This is 
  handled in the patch for BUG#20435.

  sql/slave.cc@1.241.12.1, 2006-12-15 11:32:37+01:00, rafal@quant.(none) +1 -1
    Removed call to obsolete function update_slave_list() upon slave's I/O thread 
    reconnect.

ChangeSet@1.1810.1388.1, 2006-02-21 14:55:54+01:00, msvensson@neptunus.(none) +3 -0
  Bug#11589 mysqltest, --ps-protocol, strange output, float/double/real with zerofill
   - Add zerofill in client if real/float/double is bound to string and fetched using binary protocol.

  libmysql/libmysql.c@1.230.4.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +9 -1
    Add zerofill before value if column is created with zerofill 

  mysql-test/r/type_float.result@1.42.3.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +16 -0
    Update test for zerofill

  mysql-test/t/type_float.test@1.27.2.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +18 -0
    Add test for zerofill and prepared statments

