ChangeSet@1.2456, 2007-02-23 04:21:39+01:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - 5.1.16 uint64 align for ndb_restore

  storage/ndb/tools/restore/Restore.cpp@1.45, 2007-02-23 04:18:26+01:00, pekka@clam.ndb.mysql.com +6 -1
    uint64 align patch

ChangeSet@1.1810.2124.50, 2007-02-22 15:31:21+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26481 - fix of bug fix 5.0 version

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.39.1, 2007-02-22 15:31:19+01:00, jonas@perch.ndb.mysql.com +7 -4
    ndb - bug#26481 - fix of bug fix 5.0 version

ChangeSet@1.2403.11.6, 2007-02-22 15:02:48+01:00, jonas@eel.(none) +1 -0
  ndb - bug#26481 - fix of bug fix
    Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough
  

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.2.3, 2007-02-22 15:02:42+01:00, jonas@eel.(none) +7 -4
    Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...
    START_RECREQ is not enough
    

ChangeSet@1.2453, 2007-02-22 12:38:44+01:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer

  storage/ndb/src/ndbapi/NdbRecAttr.cpp@1.33, 2007-02-22 12:37:54+01:00, pekka@clam.ndb.mysql.com +16 -16
    ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer

ChangeSet@1.2451, 2007-02-21 18:52:11+01:00, kent@mysql.com +1 -0
  mi_open.c:
    Can only use mi_dynmap_file() if HAVE_MMAP is defined

  storage/myisam/mi_open.c@1.117, 2007-02-21 18:51:58+01:00, kent@mysql.com +2 -0
    Can only use mi_dynmap_file() if HAVE_MMAP is defined

ChangeSet@1.2450, 2007-02-21 18:17:32+01:00, kent@mysql.com +1 -0
  base64-t.c:
    Calculate and output line count first to be
    compatible with older versions of Test::Harness

  unittest/mysys/base64-t.c@1.8, 2007-02-21 18:16:36+01:00, kent@mysql.com +6 -1
    Calculate and output line count first to be
    compatible with older versions of Test::Harness

ChangeSet@1.1810.2124.49, 2007-02-21 18:01:04+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    Make StartREDO come up as default in cluster log

  ndb/src/common/debugger/EventLogger.cpp@1.21.11.1, 2007-02-21 18:01:02+01:00, jonas@perch.ndb.mysql.com +1 -1
    Make StartREDO come up as default in cluster log

ChangeSet@1.1810.2124.48, 2007-02-21 18:00:12+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26515
    make sure logPartPtr is correctly initialized

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.38.1, 2007-02-21 18:00:10+01:00, jonas@perch.ndb.mysql.com +4 -0
    fix bug#26515
      make sure logPartPtr is correctly initialized

ChangeSet@1.2403.12.3, 2007-02-21 16:33:16+01:00, jonas@eel.(none) +4 -0
  ndb - bug#26514
    fix overflow that could occur when have either lots of dd-data or very high dd-parallelism

  storage/ndb/src/kernel/vm/RWPool.cpp@1.4, 2007-02-21 16:33:12+01:00, jonas@eel.(none) +9 -5
    Add define for sizeof WOPage
    Make sure correct size is used when checking for end of page

  storage/ndb/src/kernel/vm/RWPool.hpp@1.5, 2007-02-21 16:33:13+01:00, jonas@eel.(none) +3 -1
    Add define for sizeof RWPage

  storage/ndb/src/kernel/vm/WOPool.cpp@1.4, 2007-02-21 16:33:13+01:00, jonas@eel.(none) +1 -1
    Add define for sizeof WOPage
    Make sure correct size is used when checking for end of page

  storage/ndb/src/kernel/vm/WOPool.hpp@1.6, 2007-02-21 16:33:13+01:00, jonas@eel.(none) +4 -2
    Add define for sizeof WOPage
    Make sure correct size is used when checking for end of page

ChangeSet@1.2449, 2007-02-21 17:15:32+02:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  Removed double definition of STRING_WITH_LEN.
  Previous declaration in m_string.h

  client/sql_string.h@1.19, 2007-02-21 17:15:29+02:00, jani@ua141d10.elisa.omakaista.fi +0 -2
    Removed double definition of STRING_WITH_LEN.
    Previous declaration in m_string.h

ChangeSet@1.2448, 2007-02-21 15:21:14+01:00, kent@mysql.com +1 -0
  archive_reader.c:
    Added include of m_string.h, to find 64 bit mapping of strtoll to strtol

  storage/archive/archive_reader.c@1.8, 2007-02-21 15:14:51+01:00, kent@mysql.com +1 -0
    Added include of m_string.h, to find 64 bit mapping of strtoll to strtol

ChangeSet@1.2403.12.2, 2007-02-21 14:40:15+01:00, jonas@eel.(none) +1 -0
  ndb - bug#26487
    fix bug in extent/page allocation when *using* >1gb datafiles

  storage/ndb/src/kernel/blocks/tsman.cpp@1.13.1.1, 2007-02-21 14:40:12+01:00, jonas@eel.(none) +2 -3
    Make sure correct page id is returned even if on extent page 2

ChangeSet@1.2446, 2007-02-21 14:26:47+07:00, tomas@poseidon.mysql.com +1 -0
  fix c++ syntac in c file

  storage/ndb/src/ndbapi/ndberror_check.c@1.2, 2007-02-21 14:26:38+07:00, tomas@poseidon.mysql.com +1 -1
    fix c++ syntac in c file

ChangeSet@1.2445, 2007-02-21 11:41:22+07:00, tomas@poseidon.mysql.com +5 -0
  Bug #26490 duplicate cluster error code
  - fixed error code
  - added test program run in mysql-test-run bk version

  mysql-test/ndb/ndbcluster.sh@1.54, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +10 -1
    Bug #26490 duplicate cluster error code
    - added check for duplicate error in mysql-test run

  storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp@1.5, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +1 -1
    Bug #26490 duplicate cluster error code
    - fixed error code

  storage/ndb/src/ndbapi/Makefile.am@1.19, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +9 -0
    Bug #26490 duplicate cluster error code
    - added test program for duplicate error messages

  storage/ndb/src/ndbapi/ndberror.c@1.83, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +1 -1
    Bug #26490 duplicate cluster error code
    - fixed error code

  storage/ndb/src/ndbapi/ndberror_check.c@1.1, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +38 -0
    New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''

  storage/ndb/src/ndbapi/ndberror_check.c@1.0, 2007-02-21 11:41:13+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/storage/ndb/src/ndbapi/ndberror_check.c

ChangeSet@1.2403.12.1, 2007-02-20 20:33:53+01:00, jonas@eel.(none) +1 -0
  ndb -
    write testcase for bug#26450...
    no solution however...

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.38.1.2, 2007-02-20 20:33:44+01:00, jonas@eel.(none) +66 -0
    write testcase for bug#26450...
    no solution however...

ChangeSet@1.1810.2372.93, 2007-02-20 10:01:54+01:00, istruewing@chilla.local +1 -0
  Fixed a bad merge. Got a duplicate symbol on OSX.

  mysys/my_thr_init.c@1.31.1.9, 2007-02-20 10:01:52+01:00, istruewing@chilla.local +0 -2
    Fixed a bad merge. Got a duplicate symbol on OSX.

ChangeSet@1.2444, 2007-02-20 09:52:18+01:00, knielsen@ymer.(none) +3 -0
  A few minor cleanups for recent AbortOption behaviour change.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.42, 2007-02-20 09:52:14+01:00, knielsen@ymer.(none) +16 -5
    Add some comments describing the new AbortOption handling.

  storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp@1.4, 2007-02-20 09:52:14+01:00, knielsen@ymer.(none) +15 -2
    Fix example to work with new AbortOption handling.

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.29, 2007-02-20 09:52:14+01:00, knielsen@ymer.(none) +18 -2
    Add forgotten method implementations.

ChangeSet@1.1810.2124.47, 2007-02-20 00:55:33+01:00, jonas@perch.ndb.mysql.com +1 -0
  fix compile error in testBitfield

  ndb/test/ndbapi/testBitfield.cpp@1.9.2.1, 2007-02-20 00:55:32+01:00, jonas@perch.ndb.mysql.com +9 -0
    fix compile error in testBitfield

ChangeSet@1.1810.2124.46, 2007-02-19 22:51:04+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix correct argv/argc handling in testBitfield

  ndb/test/ndbapi/testBitfield.cpp@1.9.1.1, 2007-02-19 22:51:02+01:00, jonas@perch.ndb.mysql.com +4 -3
    fix correct argv/argc handling in testBitfield

ChangeSet@1.1810.2124.45, 2007-02-19 22:30:54+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    forgott to add testcase for bug#26481

  ndb/test/run-test/daily-basic-tests.txt@1.27.30.1, 2007-02-19 22:30:52+01:00, jonas@perch.ndb.mysql.com +4 -0
    forgott to add testcase for bug#26481

ChangeSet@1.1810.2124.44, 2007-02-19 20:13:08+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#26481
    fix for killed node during initial node restart

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.13.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.6.10.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.68.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +22 -0
    add flag for initial node restart, to keep track on when to concider it to be "done"

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.36.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +2 -1
    Check cstartRecReq also when refusing GCP_SAVEREQ

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.18.1, 2007-02-19 20:13:07+01:00, jonas@perch.ndb.mysql.com +43 -0
    add testcase

ChangeSet@1.1810.2124.43, 2007-02-17 23:52:17+01:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#26457
    master failure during master take over

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.16.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +3 -1
    new error code

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.67.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +26 -1
    Make sure to clear NF_XX_LCP if master fails during master take-over

  ndb/test/include/NdbRestarter.hpp@1.4.3.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +2 -0
    Add support for querying next master and node group
      (for multi node failure testing)

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.17.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +42 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.27.28.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

  ndb/test/src/NdbRestarter.cpp@1.11.3.1, 2007-02-17 23:52:15+01:00, jonas@perch.ndb.mysql.com +62 -0
    Add support for querying next master and node group
      (for multi node failure testing)

ChangeSet@1.2414.22.1, 2007-02-16 21:09:38+01:00, jonas@eel.(none) +3 -0
  ndb - atrt minor fixes

  storage/ndb/test/run-test/atrt-gather-result.sh@1.4, 2007-02-16 21:09:35+01:00, jonas@eel.(none) +1 -1
    remove backup from results tars aswell

  storage/ndb/test/run-test/autotest-run.sh@1.2, 2007-02-16 21:09:35+01:00, jonas@eel.(none) +2 -1
    add permissions

  storage/ndb/test/run-test/main.cpp@1.29.1.2, 2007-02-16 21:09:35+01:00, jonas@eel.(none) +6 -0
    make it work also on dl145a

ChangeSet@1.1810.2124.42, 2007-02-16 18:20:24+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug in my.cnf handling on resize of vector
    backport fix from 5.1

  ndb/src/mgmsrv/InitConfigFileParser.cpp@1.19.7.1, 2007-02-16 18:20:23+01:00, jonas@perch.ndb.mysql.com +7 -6
    backport fix from 5.1

ChangeSet@1.1810.2124.41, 2007-02-16 18:10:27+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26454
    make lockpages=1 run a bit earlier in startup

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.21.1, 2007-02-16 18:10:25+01:00, jonas@perch.ndb.mysql.com +1 -1
    change order

ChangeSet@1.2414.3.13, 2007-02-16 01:40:50+01:00, jonas@eel.(none) +1 -0
  ndb - autotest
    increase timeout on slow test

  storage/ndb/test/run-test/daily-basic-tests.txt@1.66, 2007-02-16 01:40:46+01:00, jonas@eel.(none) +1 -1
    increase timeout...cause test is slow

ChangeSet@1.2414.3.12, 2007-02-16 01:36:22+01:00, jonas@eel.(none) +1 -0
  ndb autotest -
    Fix testcase so that it does not leak tables...causing subsequent errors

  storage/ndb/test/ndbapi/testDict.cpp@1.35, 2007-02-16 01:36:19+01:00, jonas@eel.(none) +5 -1
    Fix testcase so that it does not leak tables...

ChangeSet@1.2414.3.11, 2007-02-15 23:10:32+01:00, jonas@eel.(none) +1 -0
  ndb - new atrt
      Fix bug when restarting cluster after failure
        (fs was not cleared)
      Fix cosmetic bug that made rsync be run several times when gathering result

  storage/ndb/test/run-test/main.cpp@1.29.1.1, 2007-02-15 23:10:28+01:00, jonas@eel.(none) +10 -13
    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result

ChangeSet@1.2414.3.10, 2007-02-15 18:39:17+01:00, jonas@eel.(none) +1 -0
  ndb -
    fix ao_ignore behavior change in hugo
    (affecting testOperations & testTransactions)

  storage/ndb/test/src/HugoOperations.cpp@1.31, 2007-02-15 18:39:11+01:00, jonas@eel.(none) +10 -7
    fix ao_ignore behavior change in hugo

ChangeSet@1.2429.4.1, 2007-02-14 20:17:14+07:00, tomas@poseidon.mysql.com +1 -0
  corrected manual merge

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.60, 2007-02-14 20:17:03+07:00, tomas@poseidon.mysql.com +2 -1
    corrected manual merge

ChangeSet@1.1810.2583.4, 2007-02-14 15:33:48+07:00, tomas@poseidon.mysql.com +2 -0
  ndb_config_4_node.ini, ndb_config_1_node.ini:
    new file

  mysql-test/ndb/ndb_config_1_node.ini@1.1, 2007-02-14 15:27:30+07:00, tomas@poseidon.mysql.com +43 -0

  mysql-test/ndb/ndb_config_1_node.ini@1.0, 2007-02-14 15:27:30+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_1_node.ini

  mysql-test/ndb/ndb_config_4_node.ini@1.1, 2007-02-14 15:27:33+07:00, tomas@poseidon.mysql.com +52 -0

  mysql-test/ndb/ndb_config_4_node.ini@1.0, 2007-02-14 15:27:33+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_4_node.ini

ChangeSet@1.1810.2583.3, 2007-02-14 15:26:06+07:00, tomas@poseidon.mysql.com +4 -0
      backport some mysql-test ndbcluster things from 5.1
      remove compiler warning EventLogger.cpp
      Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
       - partial fix
       - object map to handle failed realloc
  

  mysql-test/ndb/ndb_config_2_node.ini@1.15.1.1, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +10 -0
    backport some mysql-test ndbcluster things from 5.1

  mysql-test/ndb/ndbcluster.sh@1.41.1.7, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +65 -32
    backport some mysql-test ndbcluster things from 5.1

  ndb/src/common/debugger/EventLogger.cpp@1.21.10.1, 2007-02-14 15:25:51+07:00, tomas@poseidon.mysql.com +2 -2
    remove compiler warning

  ndb/src/ndbapi/ObjectMap.hpp@1.7.3.1, 2007-02-14 15:25:52+07:00, tomas@poseidon.mysql.com +7 -6
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc

ChangeSet@1.1810.2581.3, 2007-02-14 15:16:26+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #21033 Error 0 in readAutoIncrementValue()
  - do not call function if table has no autoincrement

  sql/ha_ndbcluster.cc@1.175.67.1, 2007-02-14 15:16:01+07:00, tomas@poseidon.mysql.com +1 -1
    Bug #21033 Error 0 in readAutoIncrementValue()
    - do not call function if table has no autoincrement

ChangeSet@1.2414.21.2, 2007-02-14 16:49:40+11:00, stewart@willster.(none) +1 -0
  BUG#20121 missing err msg for ENOSPC
  
  getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
  ndbrequire(false) instead of having good error message.
  
  Can re-use error code from BACKUP as it's a FsRef error code,
  which is NDBD_EXIT... except when it isn't.

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.134, 2007-02-14 16:49:37+11:00, stewart@willster.(none) +12 -1
    Report the correct error code on exit with failure to backup fragment (run LCP)

ChangeSet@1.1810.2582.7, 2007-02-14 16:03:25+11:00, stewart@willster.(none) +25 -0
  BUG#26358  	remove unused and non-working SET_VAR_REQ/CONF signals
  
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.18.2, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +3 -3
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.8.2, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -3
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.20.3, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -157
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp@1.2.4.2, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -5
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.18.7.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/DbaccInit.cpp@1.12.6.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.49.12.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -27
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.12.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.6.9.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.66.1, 2007-02-14 16:03:22+11:00, stewart@willster.(none) +0 -24
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.16.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.14.4.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.35.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -24
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.16.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/DbtcInit.cpp@1.8.9.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.35.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -30
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.22.10.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.15.7.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp@1.2.8.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp@1.5.8.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.20.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -17
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.3.13.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@1.4.5.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.30.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -28
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.21.1, 2007-02-14 16:03:23+11:00, stewart@willster.(none) +0 -1
    remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
    
    Remove the dead SET_VAR_REQ,REF,CONF signals.
    
    They:
    a) don't currently work
    b) will cause confusion with future mgmd updates for
       signal interface to configuration things (e.g. port numbers)

ChangeSet@1.1810.2582.6, 2007-02-14 15:55:08+11:00, stewart@willster.(none) +4 -0
  BUG#26357  	remove unused GSN_STATISTICS_REQ and CONF
  
  remove GSN_STATISTICS_REQ and CONF
  
  These are unused and have been since BK import. not needed.

  ndb/include/kernel/GlobalSignalNumbers.h@1.7.18.1, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +2 -2
    remove STATISTICS_REQ and CONF

  ndb/src/common/debugger/signaldata/SignalNames.cpp@1.6.8.1, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +1 -3
    remove signal names for STATISTICS_REQ and CONF (unused)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.20.2, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +0 -19
    remove unused STATISTICS signals

  ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp@1.2.4.1, 2007-02-14 15:55:06+11:00, stewart@willster.(none) +0 -1
    remove unused STATISTICS signals

ChangeSet@1.1810.2582.5, 2007-02-14 15:51:16+11:00, stewart@willster.(none) +1 -0
  BUG#26356  	uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER
  
  Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER
  
  Even though this data is unused from the CMVMI (mgmd) signal,
  we shouldn't be doing stuff with uninited data.

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.20.1, 2007-02-14 15:51:14+11:00, stewart@willster.(none) +1 -1
    init the 3rd word of DIHNDBTAMPER before sending to DIH.

ChangeSet@1.1810.2582.4, 2007-02-14 15:47:34+11:00, stewart@willster.(none) +2 -0
  BUG#26355  	FIXME: use constant for max loglevel in ndb_mgmd

  ndb/include/mgmapi/mgmapi.h@1.42.17.1, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +2 -0
    use constant for max log level in ndb_mgmd.
    
    (more useful in 5.1 due to other defines and refinements of mgmapi)

  ndb/src/mgmsrv/Services.cpp@1.45.40.2, 2007-02-14 15:47:33+11:00, stewart@willster.(none) +3 -5
    fix the XXX fixme of constant for max log level

ChangeSet@1.1810.2582.3, 2007-02-14 15:35:29+11:00, stewart@willster.(none) +2 -0
  BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd
  
  there is backwards compatibility for GET CONFIG style configuration requests in
  ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
  5.0 or 5.1 cluster. remove the backwards compat
  
  remove it

  ndb/src/mgmsrv/Services.cpp@1.45.40.1, 2007-02-14 15:35:27+11:00, stewart@willster.(none) +3 -83
    remove MGM_GET_CONFIG_BACKWARDS_COMPAT code.
    
    any client using GET CONFIG will just not work with modern NDB.

  ndb/src/mgmsrv/Services.hpp@1.13.9.1, 2007-02-14 15:35:27+11:00, stewart@willster.(none) +0 -9
    remove GET CONFIG support

ChangeSet@1.1810.2582.2, 2007-02-14 15:28:04+11:00, stewart@willster.(none) +1 -0
  BUG#26352  	unused ndb_mgm_rep_command in mgmapi.cpp

  ndb/src/mgmapi/mgmapi.cpp@1.44.36.1, 2007-02-14 15:28:02+11:00, stewart@willster.(none) +0 -37
    remove ndb_mgm_rep_command function

ChangeSet@1.1810.2582.1, 2007-02-14 15:22:03+11:00, stewart@willster.(none) +2 -0
  WL#3704 mgmapi timeouts (and cleanups)
  
  indicate units in SocketOutputStream timeout
  
  rename timeout in SocketOutputStream to reflect units (ms)
  
  In 5.0 as well as is safe cleanup patch that will help with merging.

  ndb/include/util/OutputStream.hpp@1.3.5.1, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +3 -3
    rename timeout in SocketOutputStream to reflect units (ms)

  ndb/src/common/util/OutputStream.cpp@1.4.2.1, 2007-02-14 15:22:00+11:00, stewart@willster.(none) +4 -4
    rename timeout in SocketOutputStream to reflect units (ms)

ChangeSet@1.1810.2581.2, 2007-02-14 11:16:10+07:00, tomas@poseidon.mysql.com +2 -0
  make sure some printouts in ndbd out file is done with g_eventLogger

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.65.1, 2007-02-14 11:16:04+07:00, tomas@poseidon.mysql.com +66 -64
    make sure some printouts in ndbd out file is done with g_eventLogger

  ndb/src/kernel/vm/WatchDog.cpp@1.3.3.1, 2007-02-14 11:16:04+07:00, tomas@poseidon.mysql.com +5 -2
    make sure some printouts in ndbd out file is done with g_eventLogger

ChangeSet@1.1810.2581.1, 2007-02-14 11:05:38+07:00, tomas@poseidon.mysql.com +7 -0
  Bug#26293 cluster mgmt node sometimes doesn't receive events from all nodes on restart
  - signals where sometimes sent too early when setting up subscriptions

  ndb/include/kernel/signaldata/DumpStateOrd.hpp@1.3.9.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +4 -0
    added dump for active subscriptions in cmvmi

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.19.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +19 -1
    added dump for active subscriptions in cmvmi

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.47.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +74 -20
    bug in that signals where sent prior to api reg conf arrived, causing thrown away signals and subsequent hangs in mgmtserver
    also add retry if node connected but not yet received api reg conf

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.11.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +4 -1
    added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.10.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +1 -0
    added status variable m_api_reg_conf in cluster manager to correctly be able to determine if a node is sendable

  ndb/src/ndbapi/SignalSender.cpp@1.3.8.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +2 -0
    assert to see that node is sendable when signal is sent

  ndb/src/ndbapi/SignalSender.hpp@1.1.2.1, 2007-02-14 11:05:31+07:00, tomas@poseidon.mysql.com +1 -1
    manke metchd const

ChangeSet@1.2429.2.4, 2007-02-13 19:59:46-08:00, igor@olga.mysql.com +2 -0
  Post-merge fix

  mysql-test/r/view.result@1.205, 2007-02-13 19:59:44-08:00, igor@olga.mysql.com +10 -44
    Post-merge fix

  mysql-test/t/view.test@1.185, 2007-02-13 19:59:44-08:00, igor@olga.mysql.com +21 -57
    Post-merge fix

ChangeSet@1.1810.2580.2, 2007-02-13 15:49:42-08:00, igor@olga.mysql.com +2 -0
  Post-merge fix

  mysql-test/r/select.result@1.121.1.29, 2007-02-13 15:49:40-08:00, igor@olga.mysql.com +0 -1
    Post-merge fix

  mysql-test/t/select.test@1.102.1.22, 2007-02-13 15:49:40-08:00, igor@olga.mysql.com +0 -1
    Post-merge fix

ChangeSet@1.1810.2372.90, 2007-02-13 16:35:29-05:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#25807: LOAD DATA INFILE does not work with Pipes
  
  Showstopper and regression against 5.0.24.
  
  Previously, we ignored seek() errors (see Bug#22828) and let seek()s
  against pipes fail.  Now, since we check that a seek didn't fail,
  and return without reading, this bug popped up.
  
  This restores the behavior for file-ish objects that could never be 
  seek()ed.

  BitKeeper/etc/collapsed@1.5.1.20, 2007-02-13 15:11:04-05:00, cmiller@zippy.cornsilk.net +2 -0

  mysys/mf_iocache.c@1.56.1.9, 2007-02-13 16:35:28-05:00, cmiller@zippy.cornsilk.net +35 -6
    If we detect early that the file is not tell()able, then we should
    assume that it's also not seek()able and therefore we should never
    set the (poorly named) "seek_not_done" flag so that we don't immedi-
    ately try to seek() when reading later.
    
    The problem was that tell() was returning -1, so when we read later, 
    we needlessly tried to seek to position  (unsigned long) -1 . 
    
    Also, if we think we're supposed to seek to a position in a file and 
    the file is un-tell()able, then abort.

ChangeSet@1.2414.15.5, 2007-02-13 13:15:23-08:00, igor@olga.mysql.com +10 -0
  Post-merge fix.

  mysql-test/r/information_schema.result@1.147, 2007-02-13 13:15:18-08:00, igor@olga.mysql.com +11 -0
    Post-merge fix.

  mysql-test/r/insert_select.result@1.46, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +0 -14
    Post-merge fix.

  mysql-test/r/update.result@1.32, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +3 -3
    Post-merge fix.

  mysql-test/r/view.result@1.203, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +4 -4
    Post-merge fix.

  mysql-test/t/insert_select.test@1.37, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +0 -13
    Post-merge fix.

  mysql-test/t/view.test@1.183, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +8 -7
    Post-merge fix.

  sql/mysql_priv.h@1.475.1.2, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

  sql/opt_range.cc@1.262, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

  sql/sql_insert.cc@1.246, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +2 -2
    Post-merge fix.

  sql/sql_update.cc@1.224, 2007-02-13 13:15:19-08:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

ChangeSet@1.2414.20.1, 2007-02-13 16:33:32+01:00, istruewing@chilla.local +5 -0
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  
  Under high load it was possible that memory mapping was started on a table
  while other threads were working with the table.
  
  I fixed the start of memory mapping so that it is done at the first table
  open or when the requesting thread is using the table exclusively only.

  include/my_base.h@1.96, 2007-02-13 16:33:29+01:00, istruewing@chilla.local +1 -0
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Added a new MyISAM open_flag HA_OPEN_MMAP.

  storage/myisam/ha_myisam.cc@1.209, 2007-02-13 16:33:30+01:00, istruewing@chilla.local +19 -3
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Replaced the call to mi_extra(... HA_EXTRA_MMAP ...) by the new open_flag
    HA_OPEN_MMAP. This effects that the mapping will no longer be done on
    every open of the table but just on the initial open, when the MyISAM
    share is created.

  storage/myisam/mi_dynrec.c@1.58, 2007-02-13 16:33:30+01:00, istruewing@chilla.local +8 -0
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Added a comment with a concern regarding the mmap flag MAP_NORESERVE.

  storage/myisam/mi_extra.c@1.53, 2007-02-13 16:33:30+01:00, istruewing@chilla.local +6 -1
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Limited the start of memory mapping to situations where the requesting
    thread has the table exclusively opened.

  storage/myisam/mi_open.c@1.116, 2007-02-13 16:33:30+01:00, istruewing@chilla.local +16 -0
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Added memory mapping code. Used if the new open_flag HA_OPEN_MMAP is set.

ChangeSet@1.2414.19.1, 2007-02-13 16:31:24+01:00, df@kahlann.erinye.com +1 -0
  .del-README.txt-renamed:
    Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

  BitKeeper/deleted/.del-README.txt-renamed@1.3, 2007-02-13 16:31:11+01:00, df@kahlann.erinye.com +0 -0
    Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed

ChangeSet@1.2414.1.23, 2007-02-13 14:32:07+01:00, ndbdev@ndbmaster.mysql.com +1 -0
  adopt to changes in load_defaults

  storage/ndb/test/run-test/main.cpp@1.30, 2007-02-13 14:31:21+01:00, ndbdev@ndbmaster.mysql.com +3 -3
    adopt to changes in load_defaults

ChangeSet@1.2414.18.1, 2007-02-13 12:04:20+01:00, hhunger@hh-nb.hungers +56 -0
  objects is only for internal use.

  BitKeeper/deleted/.del-README.txt~97cdd3dccd3539d2@1.2, 2007-02-13 12:00:35+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/README.txt

  BitKeeper/deleted/.del-drop_all.inc@1.2, 2007-02-13 12:00:35+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/drop_all.inc

  BitKeeper/deleted/.del-objects.inc@1.2, 2007-02-13 12:00:35+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/objects.inc

  BitKeeper/deleted/.del-objects_falcon.result@1.2, 2007-02-13 12:00:40+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/r/objects_falcon.result

  BitKeeper/deleted/.del-objects_falcon.test@1.2, 2007-02-13 12:00:40+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/t/objects_falcon.test

  BitKeeper/deleted/.del-objects_innodb.result@1.2, 2007-02-13 12:00:40+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/r/objects_innodb.result

  BitKeeper/deleted/.del-objects_innodb.test@1.2, 2007-02-13 12:00:40+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/t/objects_innodb.test

  BitKeeper/deleted/.del-tbl01.inc@1.2, 2007-02-13 12:00:35+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl01.inc

  BitKeeper/deleted/.del-tbl02.inc@1.2, 2007-02-13 12:00:35+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl02.inc

  BitKeeper/deleted/.del-tbl03.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl03.inc

  BitKeeper/deleted/.del-tbl04.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl04.inc

  BitKeeper/deleted/.del-tbl05.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl05.inc

  BitKeeper/deleted/.del-tbl06.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl06.inc

  BitKeeper/deleted/.del-tbl07.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl07.inc

  BitKeeper/deleted/.del-tbl08.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl08.inc

  BitKeeper/deleted/.del-tbl09.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl09.inc

  BitKeeper/deleted/.del-tbl10.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl10.inc

  BitKeeper/deleted/.del-tbl11.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl11.inc

  BitKeeper/deleted/.del-tbl12.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl12.inc

  BitKeeper/deleted/.del-tbl13.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl13.inc

  BitKeeper/deleted/.del-tbl14.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl14.inc

  BitKeeper/deleted/.del-tbl15.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl15.inc

  BitKeeper/deleted/.del-tbl16.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl16.inc

  BitKeeper/deleted/.del-tbl17.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl17.inc

  BitKeeper/deleted/.del-tbl18.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl18.inc

  BitKeeper/deleted/.del-tbl19.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl19.inc

  BitKeeper/deleted/.del-tbl20.inc@1.2, 2007-02-13 12:00:36+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl20.inc

  BitKeeper/deleted/.del-tbl21.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl21.inc

  BitKeeper/deleted/.del-tbl22.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl22.inc

  BitKeeper/deleted/.del-tbl23.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl23.inc

  BitKeeper/deleted/.del-tbl24.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl24.inc

  BitKeeper/deleted/.del-tbl25.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl25.inc

  BitKeeper/deleted/.del-tbl26.inc@1.2, 2007-02-13 12:00:37+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl26.inc

  BitKeeper/deleted/.del-tbl27.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl27.inc

  BitKeeper/deleted/.del-tbl28.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl28.inc

  BitKeeper/deleted/.del-tbl29.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl29.inc

  BitKeeper/deleted/.del-tbl30.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl30.inc

  BitKeeper/deleted/.del-tbl31.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl31.inc

  BitKeeper/deleted/.del-tbl32.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl32.inc

  BitKeeper/deleted/.del-tbl33.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl33.inc

  BitKeeper/deleted/.del-tbl34.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl34.inc

  BitKeeper/deleted/.del-tbl35.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl35.inc

  BitKeeper/deleted/.del-tbl36.inc@1.2, 2007-02-13 12:00:38+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl36.inc

  BitKeeper/deleted/.del-tbl37.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl37.inc

  BitKeeper/deleted/.del-tbl38.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl38.inc

  BitKeeper/deleted/.del-tbl39.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl39.inc

  BitKeeper/deleted/.del-tbl40.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl40.inc

  BitKeeper/deleted/.del-tbl41.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl41.inc

  BitKeeper/deleted/.del-tbl42.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl42.inc

  BitKeeper/deleted/.del-tbl43.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl43.inc

  BitKeeper/deleted/.del-tbl44.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl44.inc

  BitKeeper/deleted/.del-tbl45.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl45.inc

  BitKeeper/deleted/.del-tbl46.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl46.inc

  BitKeeper/deleted/.del-tbl47.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl47.inc

  BitKeeper/deleted/.del-tbl48.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/tbl48.inc

  BitKeeper/deleted/.del-view.inc@1.2, 2007-02-13 12:00:39+01:00, hhunger@hh-nb.hungers +0 -0
    Delete: mysql-test/suite/objects/include/view.inc

ChangeSet@1.2414.16.1, 2007-02-13 02:38:54+01:00, jonas@perch.ndb.mysql.com +24 -0
  ndb - new atrt

  BitKeeper/deleted/.del-conf-daily-basic-ndb08.txt@1.2, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-daily-basic-ndb08.txt

  BitKeeper/deleted/.del-conf-daily-devel-ndb08.txt@1.2, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-daily-devel-ndb08.txt

  BitKeeper/deleted/.del-conf-daily-devel-ndbmaster.txt@1.7, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt

  BitKeeper/deleted/.del-conf-daily-sql-ndb08.txt@1.2, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-daily-sql-ndb08.txt

  BitKeeper/deleted/.del-conf-daily-sql-ndbmaster.txt@1.5, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt

  BitKeeper/deleted/.del-conf-dl145a.txt@1.8, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-dl145a.txt

  BitKeeper/deleted/.del-conf-ndbmaster.txt@1.8, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-ndbmaster.txt

  BitKeeper/deleted/.del-conf-shark.txt@1.5, 2007-02-13 02:20:35+01:00, jonas@perch.ndb.mysql.com +0 -0
    Delete: storage/ndb/test/run-test/conf-shark.txt

  storage/ndb/src/cw/cpcd/Makefile.am@1.16, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +1 -1
    new atrt

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@1.25.1.1, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +1 -1
    new atrt

  storage/ndb/test/run-test/Makefile.am@1.28, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +14 -8
    new atrt

  storage/ndb/test/run-test/atrt-gather-result.sh@1.3, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +1 -1
    new atrt

  storage/ndb/test/run-test/atrt.hpp@1.10, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +89 -23
    new atrt

  storage/ndb/test/run-test/atrt.hpp@1.9, 2007-02-13 02:18:32+01:00, jonas@perch.ndb.mysql.com +0 -0
    Rename: storage/ndb/test/run-test/run-test.hpp -> storage/ndb/test/run-test/atrt.hpp

  storage/ndb/test/run-test/autotest-boot.sh@1.1, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +165 -0
    New BitKeeper file ``storage/ndb/test/run-test/autotest-boot.sh''

  storage/ndb/test/run-test/autotest-boot.sh@1.0, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/autotest-run.sh@1.1, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +269 -0
    New BitKeeper file ``storage/ndb/test/run-test/autotest-run.sh''

  storage/ndb/test/run-test/autotest-run.sh@1.0, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/conf-dl145a.cnf@1.1, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +23 -0
    New BitKeeper file ``storage/ndb/test/run-test/conf-dl145a.cnf''

  storage/ndb/test/run-test/conf-dl145a.cnf@1.0, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/conf-ndbmaster.cnf@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +23 -0
    New BitKeeper file ``storage/ndb/test/run-test/conf-ndbmaster.cnf''

  storage/ndb/test/run-test/conf-ndbmaster.cnf@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/conf-repl.cnf@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +28 -0
    New BitKeeper file ``storage/ndb/test/run-test/conf-repl.cnf''

  storage/ndb/test/run-test/conf-repl.cnf@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/example-my.cnf@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +116 -0
    New BitKeeper file ``storage/ndb/test/run-test/example-my.cnf''

  storage/ndb/test/run-test/example-my.cnf@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/files.cpp@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +383 -0
    New BitKeeper file ``storage/ndb/test/run-test/files.cpp''

  storage/ndb/test/run-test/files.cpp@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/main.cpp@1.29, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +674 -430
    new atrt

  storage/ndb/test/run-test/setup.cpp@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +965 -0
    New BitKeeper file ``storage/ndb/test/run-test/setup.cpp''

  storage/ndb/test/run-test/setup.cpp@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/test-tests.txt@1.1, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +24 -0
    New BitKeeper file ``storage/ndb/test/run-test/test-tests.txt''

  storage/ndb/test/run-test/test-tests.txt@1.0, 2007-02-13 02:38:48+01:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/tools/Makefile.am@1.16, 2007-02-13 02:38:47+01:00, jonas@perch.ndb.mysql.com +1 -0
    new atrt

ChangeSet@1.1616.2958.2, 2007-02-13 00:55:45+04:00, holyfoot@mysql.com +1 -0
  bug #25492 (Invalid deallocation in mysql_stmt_fetch)

  libmysqld/lib_sql.cc@1.75.1.62, 2007-02-13 00:55:44+04:00, holyfoot@mysql.com +26 -6
    code modified to prevent freeing of memory that wasn't malloc-ed.
    Now we check if MYSQL_STMT::result was used.

ChangeSet@1.1810.2578.1, 2007-02-12 19:28:49+04:00, gluh@mysql.com +1 -0
  valgrind error fix

  sql/opt_range.cc@1.159.37.4, 2007-02-12 19:28:48+04:00, gluh@mysql.com +12 -7
    valgrind error fix

ChangeSet@1.1810.2571.10, 2007-02-12 16:02:53+02:00, gkodinov@macbook.gmz +1 -0
  Fixed MacOSX/Intel linking problem
   Common symbols with and without initialization
   cause the apple linker to exclude then from the
   list of global symbols.

  mysys/my_pthread.c@1.43.2.1, 2007-02-12 16:02:47+02:00, gkodinov@macbook.gmz +1 -1
    Fixed MacOSX/Intel linking problem
     Common symbols with and without initialization
     cause the apple linker to exclude then from the
     list of global symbols.

ChangeSet@1.1616.2969.1, 2007-02-12 14:31:44+01:00, tnurnberg@mysql.com +4 -0
  Bug#24660: "enum" field type definition problem
  
  ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
  This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
  being used. Now if 0xff makes an appearance, we find a character not used in the enum and
  use that as a separator. If no such character exists, we throw an error.
  
  Any solution would have broken some sort of existing behaviour. This solution should
  serve both fractions (those with 0xff and those with ',' in their enums), but
  WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
  That is, mysqldump with their current server, and restore when upgrading to one with
  this patch.

  mysql-test/r/type_enum.result@1.24.1.3, 2007-02-12 14:31:43+01:00, tnurnberg@mysql.com +25 -0
    Bug#24660: "enum" field type definition problem
    
    Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
    char in some locales), or ',', or both.

  mysql-test/t/type_enum.test@1.16.2.1, 2007-02-12 14:31:43+01:00, tnurnberg@mysql.com +21 -1
    Bug#24660: "enum" field type definition problem
    
    Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
    char in some locales), or ',', or both.

  sql/table.cc@1.111.8.1, 2007-02-12 14:31:43+01:00, tnurnberg@mysql.com +0 -11
    Bug#24660: "enum" field type definition problem
    
    Revert fix for Bug#20922.

  sql/unireg.cc@1.43.1.9, 2007-02-12 14:31:43+01:00, tnurnberg@mysql.com +40 -21
    Bug#24660: "enum" field type definition problem
    
    Use a field-separator for ENUM-values that is not part of those values. If impossible,
    throw error.

ChangeSet@1.1810.2571.9, 2007-02-12 16:06:14+04:00, gluh@mysql.com +7 -0
  Bug#24630 Subselect query crashes mysqld
  The crash happens because second filling of the same I_S table happens in
  case of subselect with order by. table->sort.io_cache previously allocated
  in create_sort_index() is deleted during second filling
  (function get_schema_tables_result). There are two places where
  I_S table can be filled: JOIN::exec and create_sort_index().
  To fix the bug we should check if the table was already filled
  in one of these places and skip processing of the table in second.

  mysql-test/r/information_schema.result@1.87.1.33, 2007-02-12 16:06:12+04:00, gluh@mysql.com +37 -0
    test case

  mysql-test/t/information_schema.test@1.65.1.25, 2007-02-12 16:06:12+04:00, gluh@mysql.com +24 -0
    test case

  sql/mysql_priv.h@1.290.92.2, 2007-02-12 16:06:12+04:00, gluh@mysql.com +2 -1
    added new parameter 'executed_place' to function get_schema_tables_result()

  sql/sql_select.cc@1.312.127.1, 2007-02-12 16:06:12+04:00, gluh@mysql.com +2 -2
    added new parameter 'executed_place' to function get_schema_tables_result()

  sql/sql_show.cc@1.253.46.2, 2007-02-12 16:06:12+04:00, gluh@mysql.com +20 -8
    added more accurate check for cases when we need to refresh I_S table

  sql/table.cc@1.160.45.3, 2007-02-12 16:06:12+04:00, gluh@mysql.com +1 -1
    added more accurate check for cases when we need to refresh I_S table

  sql/table.h@1.102.1.36, 2007-02-12 16:06:12+04:00, gluh@mysql.com +7 -1
    added more accurate check for cases when we need to refresh I_S table

ChangeSet@1.1810.2576.1, 2007-02-12 15:41:36+04:00, holyfoot@mysql.com +5 -0
  bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field)
  
  Some fields (GEOMETRY first of all) can't be handled properly in this
  case at all. So we return an error in this case

  mysql-test/r/default.result@1.3.1.2, 2007-02-12 15:41:34+04:00, holyfoot@mysql.com +11 -1
    result fixed

  mysql-test/r/gis.result@1.35.1.4, 2007-02-12 15:41:34+04:00, holyfoot@mysql.com +4 -0
    result fixed

  mysql-test/t/default.test@1.6, 2007-02-12 15:41:34+04:00, holyfoot@mysql.com +8 -1
    VIEW test added

  mysql-test/t/gis.test@1.29.1.3, 2007-02-12 15:41:34+04:00, holyfoot@mysql.com +9 -0
    testcase added

  sql/item.cc@1.113.68.1, 2007-02-12 15:41:34+04:00, holyfoot@mysql.com +7 -1
    set_defaults() changed with the 'reset()'

ChangeSet@1.1810.2575.3, 2007-02-11 19:36:46-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26209.
  The function make_unireg_sortorder ignored the fact that any
  view field is represented by a 'ref' object.
  This could lead to wrong results for the queries containing
  both GROUP BY and ORDER BY clauses.

  mysql-test/r/view.result@1.138.1.53, 2007-02-11 19:36:44-08:00, igor@olga.mysql.com +18 -0
    Added a test case for bug #26209.

  mysql-test/t/view.test@1.126.1.50, 2007-02-11 19:36:44-08:00, igor@olga.mysql.com +20 -0
    Added a test case for bug #26209.

  sql/sql_select.cc@1.312.126.1, 2007-02-11 19:36:44-08:00, igor@olga.mysql.com +8 -8
    Fixed bug #26209.
    The function make_unireg_sortorder ignored the fact that any
    view field is represented by a 'ref' object.
    This could lead to wrong results for the queries containing
    both GROUP BY and ORDER BY clauses.
    
    
     

ChangeSet@1.1810.2575.2, 2007-02-11 22:52:12+03:00, evgen@moonbone.local +2 -0
  sql_view.cc:
    Post fix for bug#12122.
  information_schema.result:
    Corrected test case after fixing bug#12122.

  mysql-test/r/information_schema.result@1.87.1.32, 2007-02-11 22:50:42+03:00, evgen@moonbone.local +1 -2
    Corrected test case after fixing bug#12122.

  sql/sql_view.cc@1.78.16.3, 2007-02-11 22:50:01+03:00, evgen@moonbone.local +1 -0
    Post fix for bug#12122.

ChangeSet@1.1810.2571.7, 2007-02-10 23:55:56-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26159.
  A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset
  caused a crash when a query with DISTINCT was executed by a loose scan
  for an InnoDB table that had been emptied. 

  mysql-test/t/innodb_mysql.test@1.3.18.1, 2007-02-10 23:55:54-08:00, igor@olga.mysql.com +26 -0
    Added a test case for bug #26159.

  mysql-test/r/innodb_mysql.result@1.3.4.11, 2007-02-10 23:55:54-08:00, igor@olga.mysql.com +27 -0
    Added a test case for bug #26159.

  sql/opt_range.cc@1.159.37.3, 2007-02-10 23:55:54-08:00, igor@olga.mysql.com +4 -5
    Fixed bug #26159.
    A wrong order of statements in QUICK_GROUP_MIN_MAX_SELECT::reset
    caused a crash when a query with DISTINCT was executed by a loose scan
    for an InnoDB table that had been emptied. 
    For an empty table quick_prefix_select->reset() was not called at all
    and thus some important initialization steps were missing.

ChangeSet@1.1810.2574.1, 2007-02-10 00:00:07+03:00, evgen@moonbone.local +3 -0
  Bug#12122: The MERGE algorithm isn't applicable if the ORDER BY clause is
  present.
  
  A view created with CREATE VIEW ... ORDER BY ... cannot be resolved with
  the MERGE algorithm, even when no other part of the CREATE VIEW statement
  would require the view to be resolved using the TEMPTABLE algorithm.
  
  The check for presence of the ORDER BY clause in the underlying select is 
  removed from the st_lex::can_be_merged() function.
  The ORDER BY list of the underlying select is appended to the ORDER BY list 

  mysql-test/r/view.result@1.138.1.52, 2007-02-09 23:36:42+03:00, evgen@moonbone.local +39 -0
    Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.

  mysql-test/t/view.test@1.126.1.49, 2007-02-09 23:35:58+03:00, evgen@moonbone.local +14 -0
    Added a test case for bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.

  sql/sql_lex.cc@1.142.35.2, 2007-02-09 23:59:09+03:00, evgen@moonbone.local +0 -1
    Bug#12122: Views with ORDER BY can't be resolved using MERGE algorithm.
    The st_lex::can_be_merged() function now allows views with the ORDER BY
    clause to be resolved using MERGE algorithm. The ORDER BY list of the view 
    is appended to the ORDER BY list of the embedding select.

ChangeSet@1.1810.2562.6, 2007-02-09 12:54:50-08:00, igor@olga.mysql.com +4 -0
  Fixed bug #26017.
  Objects of the class Item_equal contain an auxiliary member
  eval_item of the type cmp_item that is used only for direct 
  evaluation of multiple equalities. Currently a multiple equality
  is evaluated directly only in the cases when the equality holds
  at most for one row in the result set.
  The compare collation of eval_item was determined incorectly.
  It could lead to returning incorrect results for some queries.

  mysql-test/r/join_outer.result@1.44.1.9, 2007-02-09 12:54:48-08:00, igor@olga.mysql.com +20 -0
    Added a test case for bug #26017.

  mysql-test/t/join_outer.test@1.37.1.2, 2007-02-09 12:54:48-08:00, igor@olga.mysql.com +23 -0
    Added a test case for bug #26017.

  sql/item_cmpfunc.cc@1.187.23.2, 2007-02-09 12:54:48-08:00, igor@olga.mysql.com +1 -3
    Fixed bug #26017.
    Objects of the class Item_equal contain an auxiliary member
    eval_item of the type cmp_item that is used only for direct 
    evaluation of multiple equalities. Currently a multiple equality
    is evaluated directly only in the cases when the equality holds
    at most for one row in the result set.
    The compare collation of eval_item was determined incorrectly.
    It could lead to returning incorrect results for some queries.
    
       

  sql/item_cmpfunc.h@1.122.12.1, 2007-02-09 12:54:48-08:00, igor@olga.mysql.com +0 -1
    Fixed bug #26017.
    Removed the cmp_collation member from the Item_equal class as useless
    for the current implementation of the class.

ChangeSet@1.2414.1.19, 2007-02-09 21:04:43+01:00, mskold@mysql.com +3 -0
  Enabled engine_condition_pushdown (on) as default

  mysql-test/r/ndb_basic.result@1.52, 2007-02-09 21:04:11+01:00, mskold@mysql.com +1 -1
    Enabled engine_condition_pushdown (on) as default

  mysql-test/r/ndb_blob.result@1.21, 2007-02-09 21:04:11+01:00, mskold@mysql.com +2 -2
    Enabled engine_condition_pushdown (on) as default

  sql/mysqld.cc@1.613.1.2, 2007-02-09 21:04:11+01:00, mskold@mysql.com +1 -1
    Enabled engine_condition_pushdown (on) as default

ChangeSet@1.1810.2571.5, 2007-02-09 22:25:09+03:00, evgen@moonbone.local +3 -0
  Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were
  inserted.
  
  The select_insert::send_eof() function now resets LAST_INSERT_ID variable if
  no rows were inserted.

  mysql-test/r/insert_select.result@1.35.1.9, 2007-02-09 22:24:54+03:00, evgen@moonbone.local +14 -0
    Added a test case for bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted.

  mysql-test/t/insert_select.test@1.34.1.2, 2007-02-09 22:24:52+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were inserted.

  sql/sql_insert.cc@1.146.45.3, 2007-02-09 22:24:54+03:00, evgen@moonbone.local +1 -1
    Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows were
    inserted.The select_insert::send_eof() function now resets LAST_INSERT_ID variable if
    no rows were inserted.

ChangeSet@1.1810.2399.17, 2007-02-09 16:31:12+01:00, mskold@mysql.com +2 -0
  bug #26225  Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly

  sql/ha_ndbcluster.cc@1.175.61.11, 2007-02-09 16:30:46+01:00, mskold@mysql.com +1 -1
    bug #26225  Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly

  sql/item_func.cc@1.270.41.1, 2007-02-09 16:30:46+01:00, mskold@mysql.com +2 -0
    bug #26225  Engine condition pushdown doesn't work with prepare statements (ps_7ndb): ensure that query plan for prepared statement is analyzed correctly

ChangeSet@1.1810.2573.1, 2007-02-09 13:31:51+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#22025 Return correct error message when transporter error occur.

  ndb/src/common/debugger/EventLogger.cpp@1.21.9.1, 2007-02-09 13:31:46+00:00, lzhou@dev3-63.(none) +95 -4
    Add correct error string when transporter error occur.

ChangeSet@1.1810.2572.1, 2007-02-09 11:05:23+02:00, gkodinov@macbook.gmz +1 -0
  Addendum to fix of bug #22344 : removed dead code.

  sql/item.cc@1.113.62.9, 2007-02-09 11:05:17+02:00, gkodinov@macbook.gmz +1 -12
    Addendum to fix of bug #22344 : removed dead code.

ChangeSet@1.2414.7.3, 2007-02-08 15:17:27-08:00, antony@ppcg5.local +1 -0
  remove symbol after merge

  mysys/my_thr_init.c@1.46, 2007-02-08 15:17:23-08:00, antony@ppcg5.local +0 -2
    remove symbol after merge

ChangeSet@1.1810.2570.2, 2007-02-09 00:10:40+01:00, kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Copy "ndb_size.tmpl" into binary distribution (Bug#24191)

  scripts/make_binary_distribution.sh@1.101.1.19, 2007-02-09 00:10:26+01:00, kent@mysql.com +1 -0
    Copy "ndb_size.tmpl" into binary distribution (Bug#24191)

ChangeSet@1.2414.6.2, 2007-02-08 10:03:17+01:00, hhunger@hh-nb.hungers +12 -0
  updates caused by 5.1.16

  BitKeeper/etc/ignore@1.270.3.2, 2007-02-08 10:01:34+01:00, hhunger@hh-nb.hungers +2 -0
    Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list

  mysql-test/suite/funcs_1/r/a_version_check.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +1 -1
    updates caused by 5.1.16

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +11 -4
    updates caused by 5.1.16

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +11 -4
    updates caused by 5.1.16

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +11 -4
    updates caused by 5.1.16

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +11 -4
    updates caused by 5.1.16

  mysql-test/suite/funcs_1/views/views_master.inc@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +4 -4
    updates caused by 5.1.16

  mysql-test/suite/partitions/r/ndb_partition_key.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +8 -8
    updates caused by 5.1.16

  mysql-test/suite/partitions/t/disabled.def@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +16 -6
    updates caused by 5.1.16

  mysql-test/suite/rpl/data/rpl_mixed.dat@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +0 -1
    updates caused by 5.1.16

  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +1 -1
    updates caused by 5.1.16

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.2, 2007-02-08 10:01:33+01:00, hhunger@hh-nb.hungers +1 -1
    updates caused by 5.1.16

ChangeSet@1.2414.1.16, 2007-02-08 13:40:05+07:00, tomas@poseidon.mysql.com +2 -0
  Bug #24000  	ndb_config.cpp has the wrong name ndb_condig.cpp in source distro

  storage/ndb/tools/Makefile.am@1.32, 2007-02-08 13:39:46+07:00, tomas@poseidon.mysql.com +1 -1
    Bug #24000  	ndb_config.cpp has the wrong name ndb_condig.cpp in source distro

  storage/ndb/tools/ndb_config.cpp@1.22, 2007-02-08 13:37:35+07:00, tomas@poseidon.mysql.com +0 -0
    Rename: storage/ndb/tools/ndb_condig.cpp -> storage/ndb/tools/ndb_config.cpp

ChangeSet@1.1810.2562.5, 2007-02-07 14:41:57-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #25931.
  View check option clauses were ignored for updates of multi-table
  views when the updates could not be performed on fly and the rows
  to update had to be put into temporary tables first.
  

  mysql-test/r/view.result@1.138.1.51, 2007-02-07 14:41:54-08:00, igor@olga.mysql.com +27 -1
    Added a test case for bug #25931.

  mysql-test/t/view.test@1.126.1.48, 2007-02-07 14:41:54-08:00, igor@olga.mysql.com +23 -1
    Added a test case for bug #25931.
    Adjusted another existed test case to have the correct result.

  sql/sql_update.cc@1.154.26.7, 2007-02-07 14:41:54-08:00, igor@olga.mysql.com +9 -0
    Fixed bug #25931.
    View check option clauses were ignored for updates of multi-table
    views when the updates could not be performed on fly and the rows
    to update had to be put into temporary tables first.
    Added the required check to multi_update::do_updates to fix the problem.  

ChangeSet@1.1810.2524.23, 2007-02-07 14:22:19-08:00, antony@ppcg5.local +3 -0
  Bug#12204
    "CONNECTION is a reserved keyword"
    Allow connection to be used as an ordinary identifier
    Tests included.

  mysql-test/r/keywords.result@1.7.1.1, 2007-02-07 14:22:16-08:00, antony@ppcg5.local +13 -0
    test that CONNECTION may be used as ordinary identifier
    test that CONNECTION may be used in stored procedure.

  mysql-test/t/keywords.test@1.7.1.1, 2007-02-07 14:22:16-08:00, antony@ppcg5.local +22 -0
    test that CONNECTION may be used as ordinary identifier
    test that CONNECTION may be used in stored procedure.

  sql/sql_yacc.yy@1.371.91.7, 2007-02-07 14:22:17-08:00, antony@ppcg5.local +1 -0
    Set CONNECTION as an unreserved keyword

ChangeSet@1.2414.1.15, 2007-02-08 01:09:38+07:00, tomas@poseidon.mysql.com +1 -0
  ndb: correction of "ignore error" patch

  sql/ha_ndbcluster.cc@1.406, 2007-02-08 01:09:17+07:00, tomas@poseidon.mysql.com +4 -5
    ndb: correction of "ignore error" patch

ChangeSet@1.1810.2372.84, 2007-02-07 15:11:03+01:00, msvensson@pilot.mysql.com +1 -0
  Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings

  sql/Makefile.am@1.103.1.28, 2007-02-07 15:11:02+01:00, msvensson@pilot.mysql.com +2 -1
    Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings

ChangeSet@1.1810.2399.16, 2007-02-07 11:36:34+01:00, mskold@mysql.com +4 -0
  NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
  ha_ndbcluster.h:
    Removed stray mthod declaration

  sql/ha_ndbcluster.cc@1.175.61.10, 2007-02-07 11:36:15+01:00, mskold@mysql.com +2 -4
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound

  sql/ha_ndbcluster.h@1.82.6.2, 2007-02-07 11:31:44+01:00, mskold@mysql.com +0 -1
    Removed stray mthod declaration

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.9.1, 2007-02-07 11:36:14+01:00, mskold@mysql.com +2 -1
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.23.1, 2007-02-07 11:36:15+01:00, mskold@mysql.com +8 -2
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound

ChangeSet@1.2414.8.3, 2007-02-07 09:49:16+01:00, mskold@mysql.com +2 -0
  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case

  mysql-test/r/ndb_read_multi_range.result@1.13, 2007-02-07 09:49:01+01:00, mskold@mysql.com +10 -3
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case

  mysql-test/t/ndb_read_multi_range.test@1.15, 2007-02-07 09:49:01+01:00, mskold@mysql.com +10 -3
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added original test case

ChangeSet@1.1810.2399.15, 2007-02-07 09:19:33+01:00, mskold@mysql.com +1 -0
  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.8.1, 2007-02-07 09:19:19+01:00, mskold@mysql.com +1 -1
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value

ChangeSet@1.1810.2562.4, 2007-02-07 00:18:36-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26124: SELECT from a view wrapper over a table 
  with a column of the DATETIME type could return a wrong 
  result set if the WHERE clause included a BETWEEN condition
  on the column.
  Fixed the method Item_func_between::fix_length_and_dec
  where the aggregation type for BETWEEN predicates calculated
  incorrectly if the first argument was a view column of the
  DATETIME type.

  mysql-test/r/view.result@1.138.1.50, 2007-02-07 00:18:34-08:00, igor@olga.mysql.com +18 -0
    Added a test case for bug #26124.

  mysql-test/t/view.test@1.126.1.47, 2007-02-07 00:18:34-08:00, igor@olga.mysql.com +16 -0
    Added a test case for bug #26124.

  sql/item_cmpfunc.cc@1.187.23.1, 2007-02-07 00:18:34-08:00, igor@olga.mysql.com +2 -2
    Fixed bug #26124: SELECT from a view wrapper over a table 
    with a column of the DATETIME type could return a wrong 
    result set if the WHERE clause included a BETWEEN condition
    on the column.
    Fixed the method Item_func_between::fix_length_and_dec
    where the aggregation type for BETWEEN predicates calculated
    incorrectly if the first argument was a view column of the
    DATETIME type.
     

ChangeSet@1.1810.2524.22, 2007-02-06 15:19:01-08:00, antony@ppcg5.local +2 -0
  thd_lib_detected moved so that it is correctly declared as a data
  section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
  PowerPC MacOS X 10.4.8

  mysys/my_pthread.c@1.43.1.5, 2007-02-06 15:18:57-08:00, antony@ppcg5.local +0 -1
    thd_lib_detected moved to my_thr_init.c

  mysys/my_thr_init.c@1.31.1.8, 2007-02-06 15:18:57-08:00, antony@ppcg5.local +2 -0
    thd_lib_detected moved here so that it is correctly declared as a
    data section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
    PowerPC MacOS X 10.4.8

ChangeSet@1.1810.2399.14, 2007-02-06 23:06:58+01:00, mskold@mysql.com +7 -0
  Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  mysql-test/r/ndb_read_multi_range.result@1.3.2.3, 2007-02-06 23:05:56+01:00, mskold@mysql.com +7 -0
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  mysql-test/t/ndb_read_multi_range.test@1.4.2.3, 2007-02-06 23:05:56+01:00, mskold@mysql.com +9 -0
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  sql/ha_ndbcluster.cc@1.175.61.9, 2007-02-06 23:05:56+01:00, mskold@mysql.com +1 -1
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  sql/ha_ndbcluster.h@1.82.6.1, 2007-02-06 23:05:56+01:00, mskold@mysql.com +1 -0
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  ndb/include/ndbapi/NdbIndexScanOperation.hpp@1.17.6.1, 2007-02-06 23:05:56+01:00, mskold@mysql.com +4 -2
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  ndb/include/ndbapi/NdbScanOperation.hpp@1.32.7.1, 2007-02-06 23:05:56+01:00, mskold@mysql.com +4 -1
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.22.1, 2007-02-06 23:05:56+01:00, mskold@mysql.com +3 -2
    Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

ChangeSet@1.1616.2967.1, 2007-02-06 23:00:18+01:00, msvensson@neptunus.(none) +1 -0
  Bug#25344  Segmentation violation when try to run the perror utility
   - strerror might return NULL on some platforms

  extra/perror.c@1.33.1.7, 2007-02-06 23:00:16+01:00, msvensson@neptunus.(none) +4 -1
    Backport fix from 5.0

ChangeSet@1.1810.2562.3, 2007-02-07 00:46:03+03:00, evgen@moonbone.local +5 -0
  Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were
  updated.
  
  INSERT ... ON DUPLICATE KEY UPDATE reports that a record was updated when
  the duplicate key occurs even if the record wasn't actually changed
  because the update values are the same as those in the record.
  
  Now the compare_record() function is used to check whether the record was
  changed and the update of a record reported only if the record differs
  from the original one.

  mysql-test/r/insert_select.result@1.35.1.8, 2007-02-07 00:45:39+03:00, evgen@moonbone.local +12 -0
    Added a test case for bug#19978: INSERT .. ON DUPLICATE erroneously reports
    some records were updated.

  mysql-test/t/insert_select.test@1.34.1.1, 2007-02-07 00:45:19+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#19978: INSERT .. ON DUPLICATE erroneously reports
    some records were updated.

  sql/mysql_priv.h@1.290.92.1, 2007-02-07 00:45:00+03:00, evgen@moonbone.local +1 -0
    Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were
    updated.
    Added the prototype of the compare_record() function.
    

  sql/sql_insert.cc@1.146.45.2, 2007-02-07 00:44:35+03:00, evgen@moonbone.local +16 -10
    Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were
    updated.
    Now the compare_record() function is used to check whether the record was
    changed and the update of a record reported only if the record differs
    from the original one.

  sql/sql_update.cc@1.154.26.6, 2007-02-07 00:44:19+03:00, evgen@moonbone.local +1 -1
    Bug#19978: INSERT .. ON DUPLICATE erroneously reports some records were
    updated.
    The compare_record() function was changed to non-static one.

ChangeSet@1.2414.7.1, 2007-02-07 01:37:21+04:00, svoj@mysql.com +6 -0
  Excluded wrongly merged changeset.

  include/my_pthread.h@1.106, 2007-02-07 01:37:18+04:00, svoj@mysql.com +0 -9
    Excluded wrongly merged changeset.

  include/thr_alarm.h@1.22, 2007-02-07 01:37:18+04:00, svoj@mysql.com +5 -3
    Excluded wrongly merged changeset.

  mysys/my_pthread.c@1.50, 2007-02-07 01:37:18+04:00, svoj@mysql.com +3 -5
    Excluded wrongly merged changeset.

  mysys/my_thr_init.c@1.44, 2007-02-07 01:37:18+04:00, svoj@mysql.com +0 -21
    Excluded wrongly merged changeset.

  mysys/thr_alarm.c@1.55, 2007-02-07 01:37:18+04:00, svoj@mysql.com +22 -25
    Excluded wrongly merged changeset.

  sql/mysqld.cc@1.613.1.1, 2007-02-07 01:37:19+04:00, svoj@mysql.com +15 -19
    Excluded wrongly merged changeset.

ChangeSet@1.2414.1.11, 2007-02-06 22:06:13+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy
  - Add variable "ndbcluster_binlog_terminating" and use that to signal
  the cluster binlog thread it's time to shutdown. This allows
  exact control of when the thread shutdown, previous implementation 
  would start shutdown of the thread as soon as the mysqld started
  shutdown. Now we will shutdown cluster binlog thread 
  in 'ndbcluster_binlog_end'

  sql/ha_ndbcluster_binlog.cc@1.102, 2007-02-06 22:06:11+01:00, msvensson@pilot.mysql.com +23 -60
    Make binlog thread shutdown controllable by using a separet variable
    to communicate the order to shutdown

ChangeSet@1.2423, 2007-02-06 22:00:48+01:00, msvensson@pilot.mysql.com +1 -0
  Fix merge error

  extra/yassl/taocrypt/src/asn.cpp@1.15, 2007-02-06 22:00:45+01:00, msvensson@pilot.mysql.com +2 -2
    Fix merge error

ChangeSet@1.1810.2568.1, 2007-02-06 19:07:48+01:00, hhunger@hh-nb.hungers +219 -0
  copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/lib/DataGen_local.pl@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +1247 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/lib/DataGen_local.pl@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/lib/DataGen_modify.pl@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +3960 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/lib/DataGen_modify.pl@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/README.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +112 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/README.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/a_version_check.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/a_version_check.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/a_version_check.test@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +29 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/a_version_check.test@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/bitdata/bitdata_master.test@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/bitdata/bitdata_master.test@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/charset/charset_master.test@1.1, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +606 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/charset/charset_master.test@1.0, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/data/charset_utf8.txt@1.1, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +2527 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/data/charset_utf8.txt@1.0, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset.inc@1.1, 2007-02-06 19:07:44+01:00, hhunger@hh-nb.hungers +40 -0
    finished files with newline
    

  mysql-test/suite/funcs_2/include/check_charset.inc@1.0, 2007-02-06 19:07:44+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset_ucs2.inc@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +22 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/include/check_charset_ucs2.inc@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset_utf8.inc@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +21 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/include/check_charset_utf8.inc@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_database.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/create_database.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_user_no_super.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/create_user_no_super.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +121 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +3903 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +28 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +62 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +33 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +80 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +51 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/disabled.def@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +15 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/disabled.def@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/func_view.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +1404 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/func_view.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv1.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv1.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv2.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv2.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_cast.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv_cast.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_if1.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv_if1.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_if2.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv_if2.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_ifnull.inc@1.1, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/fv_ifnull.inc@1.0, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +13118 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +7 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb__load.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb__load.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb__load.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb__load.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +67 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/innodb_charset.test@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/t/innodb_charset.test@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +6472 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_func_view.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +16 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_func_view.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +19734 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +1387 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +69 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb1.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb1.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +61 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb2.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb2.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb3.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb3.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb4.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb4.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +364 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +751 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +480 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +499 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +271 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +140 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_triggers.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +2331 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_triggers.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +11434 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_views.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_views.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +46 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/innodb_views.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +13016 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory__load.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory__load.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory__load.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory__load.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/memory_charset.result@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/r/memory_charset.result@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/memory_charset.test@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/t/memory_charset.test@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +78 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +6472 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_func_view.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +15 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_func_view.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +19740 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +1387 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +63 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb1.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/memory_tb1.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +64 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb2.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/memory_tb2.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +66 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb3.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/memory_tb3.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +70 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb4.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/memory_tb4.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +360 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +747 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +476 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +495 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +267 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +402 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.1, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.0, 2007-02-06 18:54:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_triggers.result@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +2262 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_triggers.result@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_views.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +11439 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_views.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_views.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +44 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/memory_views.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +13270 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam__load.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam__load.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam__load.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam__load.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +76 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/myisam_charset.test@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/t/myisam_charset.test@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +84 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +6472 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_func_view.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +15 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_func_view.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +19740 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +1387 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb1.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb1.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +80 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb2.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb2.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb3.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb3.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +88 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb4.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb4.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +364 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +751 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +480 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +499 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +271 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +406 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_triggers.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +2266 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_triggers.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +10761 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_views.result@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_views.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/t/myisam_views.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/ndb_charset.test@1.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +12 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/t/ndb_charset.test@1.0, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/readme.txt@1.1, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +22 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_2/readme.txt@1.0, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/show_connection.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +14 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/show_connection.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.1, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.0, 2007-02-06 18:54:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +1531 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +464 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +452 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +118 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +118 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +30 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +288 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +29346 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t3.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/t3.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t4.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/t4.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t7.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/t7.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t9.txt@1.1, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/data/t9.txt@1.0, 2007-02-06 18:54:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +93 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +244 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +447 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +735 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +611 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +531 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +318 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +401 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_master.test@1.1, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +2818 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_master.test@1.0, 2007-02-06 18:54:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/views_master.inc@1.1, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +4032 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/views/views_master.inc@1.0, 2007-02-06 18:54:40+01:00, hhunger@hh-nb.hungers +0 -0

  BitKeeper/etc/ignore@1.210.12.1, 2007-02-06 19:03:58+01:00, hhunger@hh-nb.hungers +1 -0
    Added mysql-test/mysql-test-run-shell to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.warnings@1.1, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +2 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/innodb_views.warnings@1.0, 2007-02-06 18:54:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_views.warnings@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +2 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/memory_views.warnings@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_views.warnings@1.1, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +2 -0
    copy from test-extra-5.0 to main tree

  mysql-test/suite/funcs_1/r/myisam_views.warnings@1.0, 2007-02-06 18:54:37+01:00, hhunger@hh-nb.hungers +0 -0

ChangeSet@1.1810.2567.2, 2007-02-06 17:33:11+01:00, msvensson@neptunus.(none) +1 -0
  Bug#24157 openssl_1 regression test is broken two different ways
   - Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used

  vio/viosslfactories.c@1.26.3.1, 2007-02-06 17:33:09+01:00, msvensson@neptunus.(none) +14 -9
    Send output from 'ERR_print_errors_fp' to DBUG_FILE if --debug is used

ChangeSet@1.2418.1.8, 2007-02-06 17:23:21+01:00, msvensson@pilot.mysql.com +1 -0
  Update result file for 5.1

  mysql-test/r/flush2.result@1.2, 2007-02-06 17:23:20+01:00, msvensson@pilot.mysql.com +2 -0
    Update result file for 5.1

ChangeSet@1.2418.1.7, 2007-02-06 17:22:56+01:00, msvensson@pilot.mysql.com +1 -0
  Fix merge error

  mysql-test/r/grant.result@1.65, 2007-02-06 17:22:55+01:00, msvensson@pilot.mysql.com +2 -2
    Fix merge error

ChangeSet@1.1810.2565.4, 2007-02-06 16:38:32+01:00, msvensson@pilot.mysql.com +1 -0
  Correct the non working check for --skip-log-bin in "extra_opt"

  mysql-test/mysql-test-run.pl@1.30.49.53, 2007-02-06 16:38:30+01:00, msvensson@pilot.mysql.com +1 -1
    Correct the non working check for --skip-log-bin in "extra_opt"

ChangeSet@1.1810.2567.1, 2007-02-06 16:28:36+01:00, msvensson@neptunus.(none) +3 -0
  Bug#25988 openssl_1 Test Case Fails
   - Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
     an extension that allow's the email adress of the cert holder.   
   - Imported patch for yaSSL "add email to DN output"

  extra/yassl/taocrypt/src/asn.cpp@1.11.1.3, 2007-02-05 19:11:06+01:00, msvensson@neptunus.(none) +13 -1
    Import patch yassl.diff

  mysql-test/r/openssl_1.result@1.17, 2007-02-06 16:28:33+01:00, msvensson@neptunus.(none) +2 -2
    Update result file

  mysql-test/t/openssl_1.test@1.17, 2007-02-06 16:28:33+01:00, msvensson@neptunus.(none) +2 -2
    Update test to include "emailAddress=" tag in the required SUBJECT for grant.

ChangeSet@1.2418.3.3, 2007-02-06 15:03:28+01:00, msvensson@pilot.mysql.com +1 -0
  Fix windows build

  server-tools/instance-manager/instance.cc@1.52, 2007-02-06 15:03:26+01:00, msvensson@pilot.mysql.com +1 -1
    Fix windows build

ChangeSet@1.1810.2564.1, 2007-02-06 14:19:07+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#24805 mtr.pl can't handle test with --disable-log-bin
  - Don't give mysqld the --log-bin argument if .opt file
    contains --skip-log-bin
  - Enable flush2 test

  mysql-test/mysql-test-run.pl@1.30.71.1, 2007-02-06 14:19:06+01:00, msvensson@pilot.mysql.com +8 -3
    Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
    Don't pass mysqld --binlog-format=s if --skip-log-bin 

  mysql-test/t/disabled.def@1.2.10.1, 2007-02-06 14:19:06+01:00, msvensson@pilot.mysql.com +0 -1
    Enable flush2

  mysql-test/t/flush2-master.opt@1.2, 2007-02-06 14:19:06+01:00, msvensson@pilot.mysql.com +1 -1
    Use --skip-log-bin in flush2 to test flush without bin logging

ChangeSet@1.1616.2940.2, 2007-02-06 14:07:40+01:00, msvensson@neptunus.(none) +1 -0
  Bug#8983 one place that isn't strict-aliasing-safe
   - Backport fix from 5.0

  sql/sql_prepare.cc@1.34.37.1, 2007-02-06 14:07:37+01:00, msvensson@neptunus.(none) +6 -5
    Avoid problems with -no-strict-aliasing in gcc 4.0+

ChangeSet@1.2414.6.1, 2007-02-06 13:35:54+01:00, hhunger@hh-nb.hungers +510 -0
  copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/README.txt@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +139 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/README.txt@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/drop_all.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +2 -0
    inserted newline at the end of file.

  mysql-test/suite/objects/include/drop_all.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/objects.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +97 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/objects.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/r/objects_falcon.result@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +49194 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/r/objects_falcon.result@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/t/objects_falcon.test@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +21 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/t/objects_falcon.test@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/r/objects_innodb.result@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +49194 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/r/objects_innodb.result@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/t/objects_innodb.test@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +24 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/t/objects_innodb.test@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl01.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +14109 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl01.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl02.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +12198 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl02.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl03.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +12056 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl03.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl04.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +15751 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl04.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl05.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +14863 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl05.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl06.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +12654 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl06.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl07.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +12987 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl07.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl08.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +8697 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl08.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl09.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +9479 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl09.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl10.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +14363 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl10.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl11.inc@1.1, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +16972 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl11.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl12.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +12012 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl12.inc@1.0, 2007-02-06 13:21:46+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl13.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +14628 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl13.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl14.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +14004 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl14.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl15.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +9370 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl15.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl16.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +22500 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl16.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl17.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +28150 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl17.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl18.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +14980 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl18.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl19.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +11524 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl19.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl20.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +23287 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl20.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl21.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +13017 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl21.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl22.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +12124 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl22.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl23.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +16646 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl23.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl24.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +10280 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl24.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl25.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +10684 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl25.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl26.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +10869 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl26.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl27.inc@1.1, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +10687 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl27.inc@1.0, 2007-02-06 13:21:47+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl28.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +9873 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl28.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl29.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10393 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl29.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl30.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +8349 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl30.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl31.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10294 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl31.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl32.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10435 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl32.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl33.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +8963 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl33.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl34.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10457 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl34.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl35.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +9461 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl35.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl36.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10440 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl36.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl37.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +9045 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl37.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl38.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10592 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl38.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl39.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10163 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl39.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl40.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10951 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl40.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl41.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +9565 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl41.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl42.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +10686 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl42.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl43.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +11059 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl43.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl44.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +12734 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl44.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl45.inc@1.1, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +16000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl45.inc@1.0, 2007-02-06 13:21:48+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl46.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +1593 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl46.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl47.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +9424 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl47.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/tbl48.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +13020 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/tbl48.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/objects/include/view.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +6626 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/objects/include/view.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  BitKeeper/etc/ignore@1.270.3.1, 2007-02-06 13:25:22+01:00, hhunger@hh-nb.hungers +13 -0
    Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list

  mysql-test/suite/funcs_1/README.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +112 -0
    copy from test-extra-5.1 to main tree
    

  mysql-test/suite/funcs_1/README.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/bitdata/bitdata_master.test@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/bitdata/bitdata_master.test@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +3 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/cursors/cursors_master.test@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb1.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb1.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb2.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb2.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb3.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb3.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/innodb_tb4.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/innodb_tb4.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb1.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/memory_tb1.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb2.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/memory_tb2.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb3.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/memory_tb3.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/memory_tb4.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/memory_tb4.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb1.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb1.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb2.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb2.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb3.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb3.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/myisam_tb4.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/myisam_tb4.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/ndb_tb1.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/ndb_tb1.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/ndb_tb2.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/ndb_tb2.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/ndb_tb3.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/ndb_tb3.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/ndb_tb4.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/ndb_tb4.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t3.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/t3.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t4.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/t4.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t7.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/t7.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/data/t9.txt@1.1, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/data/t9.txt@1.0, 2007-02-06 13:19:28+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +121 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +3909 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +28 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +62 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +33 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +80 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +51 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_database.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/create_database.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/create_user_no_super.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/create_user_no_super.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +69 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb1.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +61 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb2.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb3.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/innodb_tb4.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +63 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/memory_tb1.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +64 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/memory_tb2.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +66 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/memory_tb3.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +70 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/memory_tb4.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb1.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@1.1, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +80 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb2.inc@1.0, 2007-02-06 13:19:29+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb3.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +88 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/myisam_tb4.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/ndb_tb1.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +69 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/ndb_tb1.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/ndb_tb2.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +61 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/ndb_tb2.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/ndb_tb3.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/ndb_tb3.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/ndb_tb4.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/ndb_tb4.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/show_connection.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +14 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/show_connection.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/include/sp_tb.inc@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/lib/DataGen_local.pl@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +1247 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/lib/DataGen_local.pl@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/lib/DataGen_modify.pl@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +3960 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/lib/DataGen_modify.pl@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/a_version_check.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/a_version_check.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +15223 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb__load.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb__load.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +67 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_bitdata.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_cursors.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +6643 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_func_view.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +19304 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +1395 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_02.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_03.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_07.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_08.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_storedproc_10.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +364 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_0102.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +716 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_03.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.1, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +1639 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.0, 2007-02-06 13:19:30+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +480 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_0407.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +507 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_08.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +271 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +140 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_triggers.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +2331 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_triggers.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +11434 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/innodb_views.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +15121 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory__load.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory__load.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_bitdata.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +78 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_cursors.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +6643 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_func_view.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +19304 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +1395 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_02.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_03.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_06.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_07.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_08.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_storedproc_10.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +360 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_0102.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +712 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_03.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +1582 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +476 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_0407.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +503 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_08.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +267 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_09.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.1, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +402 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_trig_1011ext.result@1.0, 2007-02-06 13:19:31+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_triggers.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +2262 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_triggers.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/memory_views.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +11439 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/memory_views.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +15375 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam__load.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam__load.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +76 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_bitdata.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +84 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_cursors.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +6643 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_func_view.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +19304 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1395 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_02.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_03.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_07.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_08.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_storedproc_10.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +364 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_0102.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +716 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_03.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1582 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +480 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_0407.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +507 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_08.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +271 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +406 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_triggers.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +2266 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_triggers.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +10774 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/myisam_views.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +14867 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb__load.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb__load.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_bitdata.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +67 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_bitdata.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +6643 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +19304 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1395 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_02.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_03.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +490 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_03.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_06.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +399 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_06.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +172 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +637 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +321 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_storedproc_10.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +365 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +717 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +1639 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +481 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +508 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.1, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +272 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.0, 2007-02-06 13:19:32+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +403 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/r/ndb_views.result@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +11433 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/r/ndb_views.result@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +1536 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_02.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +464 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_03.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +452 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +118 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_07.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +118 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_08.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +30 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +288 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +29343 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/a_version_check.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +29 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/a_version_check.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/disabled.def@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +16 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/disabled.def@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +7 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb__load.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb__load.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_bitdata.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_cursors.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_func_view.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +16 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_func_view.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_02.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_03.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_06.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_07.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_08.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_storedproc_10.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_0102.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_03.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +41 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_0407.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_08.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_09.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/innodb_views.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +46 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/innodb_views.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory__load.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory__load.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_bitdata.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_cursors.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_func_view.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +15 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_func_view.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_02.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_03.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_06.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_07.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_08.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_storedproc_10.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.1, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_0102.test@1.0, 2007-02-06 13:19:33+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_03.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +39 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_0407.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_08.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_09.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_trig_1011ext.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/memory_views.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +44 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/memory_views.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam__load.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam__load.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_bitdata.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_cursors.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_func_view.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +15 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_func_view.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_02.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_03.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_06.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_07.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_08.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_storedproc_10.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_0102.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_03.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +40 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_0407.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_08.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_09.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +32 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/myisam_views.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/myisam_views.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb__datadict.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +7 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb__datadict.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb__load.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb__load.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_cursors.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_cursors.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_func_view.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +16 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_func_view.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_02.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_02.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_03.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_03.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_06.tes@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_06.tes@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_06.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_06.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_07.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_07.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_08.tes@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_08.tes@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_08.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_08.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_storedproc_10.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_storedproc_10.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +42 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@1.1, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +34 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/t/ndb_views.test@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +46 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/t/ndb_views.test@1.0, 2007-02-06 13:19:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +93 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/trig_frkey.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +244 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/trig_frkey2.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +447 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_0102.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +693 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +250 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_columns.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +221 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_level.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +205 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_db_table_mix.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +117 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_definer.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +219 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_global_db_mix.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +179 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_prepare.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +219 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_table_level.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_03e_transaction.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +611 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_0407.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +538 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_08.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +318 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +401 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/triggers/triggers_master.test@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +2818 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/triggers/triggers_master.test@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/func_view.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +1373 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/func_view.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv1.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv1.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv2.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +5 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv2.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_cast.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv_cast.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_if1.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv_if1.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_if2.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv_if2.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/fv_ifnull.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/fv_ifnull.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_1/views/views_master.inc@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +4032 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_1/views/views_master.inc@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/charset/charset_master.test@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +606 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/charset/charset_master.test@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/data/charset_utf8.txt@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +2527 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/data/charset_utf8.txt@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +40 -0
    inserted newline at the end of file.

  mysql-test/suite/funcs_2/include/check_charset.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset_ucs2.inc@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +22 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/include/check_charset_ucs2.inc@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/include/check_charset_utf8.inc@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +21 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/include/check_charset_utf8.inc@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/memory_charset.result@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/r/memory_charset.result@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +120000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/readme.txt@1.1, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +22 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/readme.txt@1.0, 2007-02-06 13:19:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/innodb_charset.test@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +11 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/t/innodb_charset.test@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/memory_charset.test@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/t/memory_charset.test@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/myisam_charset.test@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/t/myisam_charset.test@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/funcs_2/t/ndb_charset.test@1.1, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +12 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/funcs_2/t/ndb_charset.test@1.0, 2007-02-06 13:20:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/methods1.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +213 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/methods1.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition.pre@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +406 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition.pre@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_20.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +48 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_20.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter1.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +238 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter1.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter2.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +347 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter2.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter3.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +201 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter3.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter4.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +126 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter4.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter_1.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +68 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter_1.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter_11.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +202 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter_11.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter_13.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +202 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter_13.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_alter_41.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +202 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_alter_41.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_basic.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +179 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_basic.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_bigint.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +59 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_bigint.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_binary.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +91 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_binary.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_bit.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +115 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_bit.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_blob.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_blob.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_blocked_sql_funcs.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +149 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_blocked_sql_funcs.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_blocked_sql_funcs_main.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +290 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_blocked_sql_funcs_main.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_char.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +95 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_char.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_check.inc@1.1, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +1198 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_check.inc@1.0, 2007-02-06 13:21:49+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_check_drop.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +72 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_check_drop.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_check_read.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +89 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_check_read.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_check_read1.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +79 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_check_read1.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_check_read2.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +75 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_check_read2.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_cleanup.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +22 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_cleanup.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_date.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +89 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_date.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_datetime.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_datetime.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_decimal.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +92 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_decimal.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_directory.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +263 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_directory.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_double.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +89 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_double.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_engine.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +271 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_engine.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_enum.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +99 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_enum.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_float.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +92 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_float.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_int.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_int.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_key_16col.inc@1.1, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +27 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_key_16col.inc@1.0, 2007-02-06 13:21:50+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_key_32col.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +39 -0
    inserted newline at the end of file.

  mysql-test/suite/partitions/include/partition_key_32col.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_key_4col.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +28 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_key_4col.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_key_8col.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +27 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_key_8col.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_layout_check1.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +71 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_layout_check1.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_layout_check2.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +70 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_layout_check2.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_mediumint.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_mediumint.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_methods1.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +335 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_methods1.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_methods2.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +212 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_methods2.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_set.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +83 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_set.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_smallint.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_smallint.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +251 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +43 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +251 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_syntax.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +811 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_syntax.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_syntax_1.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +91 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_syntax_1.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_syntax_2.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_syntax_2.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_text.inc@1.1, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_text.inc@1.0, 2007-02-06 13:22:35+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_time.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_time.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_timestamp.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_timestamp.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_tinyint.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_tinyint.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_trigg1.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +115 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_trigg1.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_trigg2.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_trigg2.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_trigg3.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +87 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_trigg3.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_value.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +157 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_value.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_varbinary.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +96 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_varbinary.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_varchar.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +95 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_varchar.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/include/partition_year.inc@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +48 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/include/partition_year.inc@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_blob_partition.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +104 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_blob_partition.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_dd_backuprestore.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +487 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_dd_backuprestore.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_partition_error.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_partition_error.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_partition_key.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +199 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_partition_key.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_partition_list.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +51 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_partition_list.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/ndb_partition_range.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +263 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/ndb_partition_range.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter1_innodb.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +80148 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter1_innodb.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter1_myisam.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +32410 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter1_myisam.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter2_innodb.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +119000 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter2_innodb.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter2_myisam.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +73943 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter2_myisam.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter3_innodb.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +633 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter3_innodb.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter3_myisam.result@1.1, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +809 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter3_myisam.result@1.0, 2007-02-06 13:22:36+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter4_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +34938 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter4_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_alter4_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +43554 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_alter4_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_basic_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +38710 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_basic_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_basic_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +23710 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_basic_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_bit_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +451 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_bit_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_bit_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +451 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_bit_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_bit_ndb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +113 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_bit_ndb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_blocked_sql_func_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +3752 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_blocked_sql_func_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_blocked_sql_func_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +3752 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_blocked_sql_func_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_char_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +2209 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_char_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_char_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +40 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_char_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_datetime_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +1676 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_datetime_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_datetime_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +1676 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_datetime_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_decimal_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +181 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_decimal_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_decimal_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +181 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_decimal_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_engine_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +6400 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_engine_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_engine_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +6566 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_engine_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_engine_ndb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +6407 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_engine_ndb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_float_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +466 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_float_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_float_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +466 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_float_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_int_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +552 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_int_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_int_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +552 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_int_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_int_ndb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +552 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_int_ndb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_special_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +222 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_special_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_special_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +222 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_special_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +4575 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +4575 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_syntax_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +1738 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_syntax_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_syntax_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +1840 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_syntax_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_syntax_ndb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +1820 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_syntax_ndb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_value_innodb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +222 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_value_innodb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_value_myisam.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +222 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_value_myisam.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/partition_value_ndb.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +189 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/partition_value_ndb.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/r/rpl_ndb_dd_partitions.result@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +726 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/r/rpl_ndb_dd_partitions.result@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/disabled.def@1.1, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +6 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/disabled.def@1.0, 2007-02-06 13:22:37+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_blob_partition.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +93 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_blob_partition.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_dd_backuprestore.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +343 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_dd_backuprestore.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_partition_error.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +71 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_partition_error.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_partition_key.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +198 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_partition_key.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_partition_list.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +64 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_partition_list.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/ndb_partition_range.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +260 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/ndb_partition_range.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter1_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +83 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter1_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter1_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter1_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter1_ndb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +87 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter1_ndb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter2_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +83 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter2_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter2_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter2_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter2_ndb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +87 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter2_ndb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter3_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter3_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter3_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter3_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter4_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +83 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter4_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_alter4_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_alter4_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_basic_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +83 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_basic_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_basic_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_basic_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_basic_ndb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +90 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_basic_ndb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_bit_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +57 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_bit_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_bit_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +56 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_bit_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_bit_ndb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +57 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_bit_ndb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_blocked_sql_func_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +44 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_blocked_sql_func_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_blocked_sql_func_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +43 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_blocked_sql_func_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_char_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +60 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_char_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_char_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +43 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_char_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_datetime_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +54 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_datetime_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_datetime_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +54 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_datetime_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_decimal_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_decimal_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_decimal_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +45 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_decimal_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_engine_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_engine_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_engine_myisam.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_engine_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_engine_ndb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_engine_ndb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_float_innodb.test@1.1, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_float_innodb.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_float_myisam.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +47 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_float_myisam.test@1.0, 2007-02-06 13:22:38+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_int_innodb.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +54 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_int_innodb.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_int_myisam.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +53 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_int_myisam.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_int_ndb.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +52 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_int_ndb.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_sessions.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +412 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_sessions.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_special_innodb.test@1.1, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_special_innodb.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_special_myisam.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +49 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_special_myisam.test@1.0, 2007-02-06 13:22:39+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +46 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +44 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_syntax_innodb.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_syntax_innodb.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_syntax_myisam.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_syntax_myisam.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_syntax_ndb.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +87 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_syntax_ndb.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_value_innodb.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +82 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_value_innodb.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_value_myisam.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +81 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_value_myisam.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/partition_value_ndb.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/partition_value_ndb.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/partitions/t/rpl_ndb_dd_partitions.test@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +310 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/partitions/t/rpl_ndb_dd_partitions.test@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/README@1.1, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +4 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/README@1.0, 2007-02-06 13:22:40+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/data/rpl_mixed.dat@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +4 -0
    inserted newline at the end of file.

  mysql-test/suite/rpl/data/rpl_mixed.dat@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_db.inc@1.1, 2007-02-06 13:23:18+01:00, hhunger@hh-nb.hungers +13 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_check_db.inc@1.0, 2007-02-06 13:23:18+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_event.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +17 -0
    inserted newline at the end of file.

  mysql-test/suite/rpl/include/rpl_mixed_check_event.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_select.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +21 -0
    inserted newline at the end of file.

  mysql-test/suite/rpl/include/rpl_mixed_check_select.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_table.inc@1.1, 2007-02-06 13:24:34+01:00, hhunger@hh-nb.hungers +16 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_check_table.inc@1.0, 2007-02-06 13:24:34+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_user.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +15 -0
    inserted newline at the end of file.

  mysql-test/suite/rpl/include/rpl_mixed_check_user.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_check_view.inc@1.1, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +17 -0
    inserted newline at the end of file.

  mysql-test/suite/rpl/include/rpl_mixed_check_view.inc@1.0, 2007-02-06 13:27:12+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_clear_tables.inc@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +9 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_clear_tables.inc@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +86 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +345 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/include/rpl_mixed_show_binlog_format.inc@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +10 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/include/rpl_mixed_show_binlog_format.inc@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +160 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +1031 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +13 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

  mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test@1.1, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +13 -0
    copy from test-extra-5.1 to main tree

  mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test@1.0, 2007-02-06 13:25:21+01:00, hhunger@hh-nb.hungers +0 -0

ChangeSet@1.1810.2563.2, 2007-02-06 15:58:40+04:00, ramil@mysql.com +1 -0
  Fix for bug #23782: Stored procedures: crash if variable in procedure
  analyse
  
  We have to call fix_fields() for procedure analyse' arguments as they may   
  not be
  fixed in some circumstances.
  
  (as the crash appears when mysqld starts skipping binlog, a test case
  will be added when we can --skip-bin-log in -master.opt)

  sql/sql_analyse.cc@1.67.2.1, 2007-02-06 15:52:18+04:00, ramil@mysql.com +10 -0
    Fix for bug #23782: Stored procedures: crash if variable in procedure
    analyse
      - call fix_fields() if arguments are not fixed.

ChangeSet@1.1810.2562.2, 2007-02-06 11:08:57+02:00, gkodinov@macbook.gmz +5 -0
  Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
   Ignoring error codes from type conversion allows default (wrong) values to
   go unnoticed in the formation of index search conditions.
   Fixed by correctly checking for conversion errors.

  mysql-test/r/select.result@1.121.10.3, 2007-02-06 11:08:47+02:00, gkodinov@macbook.gmz +28 -0
    Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
     - test case

  mysql-test/t/select.test@1.102.8.3, 2007-02-06 11:08:48+02:00, gkodinov@macbook.gmz +23 -0
    Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
     - test case

  sql/field.h@1.153.22.1, 2007-02-06 11:08:48+02:00, gkodinov@macbook.gmz +2 -2
    Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
     - don't ignore coversion errors

  sql/field_conv.cc@1.52.3.1, 2007-02-06 11:08:49+02:00, gkodinov@macbook.gmz +7 -8
    Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
     - don't ignore coversion errors

  sql/item.cc@1.113.62.8, 2007-02-06 11:08:50+02:00, gkodinov@macbook.gmz +6 -5
    Bug #22344: InnoDB keys act strange on datetime vs timestamp comparison
     - don't ignore coversion errors

ChangeSet@1.2403.8.12, 2007-02-06 15:01:24+07:00, tomas@poseidon.mysql.com +1 -0
  ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.77.2.1, 2007-02-06 15:01:13+07:00, tomas@poseidon.mysql.com +10 -4
    ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected

ChangeSet@1.2403.8.11, 2007-02-06 12:40:26+07:00, tomas@poseidon.mysql.com +2 -0
  Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read

  sql/ha_ndbcluster.cc@1.397.4.2, 2007-02-06 12:40:15+07:00, tomas@poseidon.mysql.com +144 -19
    Bug #26021: make sure ndbcluster_create_event_ops even if no binlogging as flags NSF_NO_BINLOG is set there
    set NSS_DROPPED state in handle_trailing_share if appropriate
    added dbug printout and comments for NDB_SHARE references

  sql/ha_ndbcluster_binlog.cc@1.95.2.4, 2007-02-06 12:40:15+07:00, tomas@poseidon.mysql.com +100 -9
    Bug #26021: set NSF_NO_BINLOG if !ndb_binlog_running
    Bug #26021: only reuse share if share_may_exist
    setup apply_status table to be logged always, even if no binlogging
    added dbug printout and comments for NDB_SHARE references

ChangeSet@1.2403.8.10, 2007-02-06 11:57:56+07:00, tomas@poseidon.mysql.com +1 -0
  ndb: remove WAITFOR_RESPONSE_TIMEOUT printout
  - to get cleaner error log in debug mode

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.57.1.1, 2007-02-06 11:57:47+07:00, tomas@poseidon.mysql.com +1 -1
    remove WAITFOR_RESPONSE_TIMEOUT printout

ChangeSet@1.2414.3.8, 2007-02-06 03:54:25+01:00, jonas@eel.(none) +4 -0
  ndb -
    remove debug printouts

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.1.4, 2007-02-06 03:54:21+01:00, jonas@eel.(none) +3 -3
    remove debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@1.15, 2007-02-06 03:54:22+01:00, jonas@eel.(none) +2 -2
    remove debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.22, 2007-02-06 03:54:22+01:00, jonas@eel.(none) +1 -1
    remove debug printouts

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.52, 2007-02-06 03:54:22+01:00, jonas@eel.(none) +4 -4
    remove debug printouts

ChangeSet@1.2414.3.7, 2007-02-05 21:38:16+01:00, jonas@eel.(none) +2 -0
  ndb - some more hugo abort option fix

  storage/ndb/test/src/HugoTransactions.cpp@1.33, 2007-02-05 21:37:52+01:00, jonas@eel.(none) +178 -2
    restore some accidently removed hugo code

  storage/ndb/test/src/UtilTransactions.cpp@1.26, 2007-02-05 21:37:52+01:00, jonas@eel.(none) +2 -1
    one more abort option fix

ChangeSet@1.2414.3.6, 2007-02-05 20:28:11+01:00, jonas@eel.(none) +2 -0
  ndb -
  Add abort option to lots of Hugo code, 
  as it assumes it and default value has changed

  storage/ndb/test/src/HugoTransactions.cpp@1.32, 2007-02-05 20:28:08+01:00, jonas@eel.(none) +19 -195
    Add abort option to lots of Hugo code, 
    as it assumes it and default value has changed

  storage/ndb/test/src/UtilTransactions.cpp@1.25, 2007-02-05 20:28:08+01:00, jonas@eel.(none) +11 -11
    Add abort option to lots of Hugo code, 
    as it assumes it and default value has changed

ChangeSet@1.2414.3.5, 2007-02-05 19:47:19+01:00, jonas@eel.(none) +5 -0
  ndb - bug#25801
    - improve error message if starting wo/ enough REDO
    - decrease likelyhood of trying to start too early

  storage/ndb/include/mgmapi/ndbd_exit_codes.h@1.15, 2007-02-05 19:47:15+01:00, jonas@eel.(none) +1 -0
    Add new error code (that maybe should have been there a looong time)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.102, 2007-02-05 19:47:16+01:00, jonas@eel.(none) +53 -6
    Add new check (during SR) for that sufficient REDO is present
      before continuing SR

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.18.1.1, 2007-02-05 19:47:16+01:00, jonas@eel.(none) +1 -0
    Add list of GCI's of nodes so that we can check for sufficient REDO during a SR

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.48.1.2, 2007-02-05 19:47:16+01:00, jonas@eel.(none) +83 -22
    Add check for REDO during SR
      so that
    1) cluster is not trying to start too soon
    2) a better error message (than internal error) is provided if not enough REDO is present

  storage/ndb/src/kernel/error/ndbd_exit_codes.c@1.17, 2007-02-05 19:47:16+01:00, jonas@eel.(none) +1 -0
    Add new error code (that maybe should have been there a looong time)

ChangeSet@1.2403.8.9, 2007-02-06 00:09:45+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #26021  	valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
  - revert bugfix, needs more work

  sql/ha_ndbcluster_binlog.cc@1.95.2.3, 2007-02-06 00:09:36+07:00, tomas@poseidon.mysql.com +6 -1
    Bug #26021  	valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
    - revert bugfix, needs more work

ChangeSet@1.1616.2881.46, 2007-02-05 17:09:44+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -0
  Test and bug fixes and removed unneccessary files.

  BitKeeper/etc/gone@1.92.1.3, 2007-02-05 17:03:23+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +6 -0

  mysys/my_getopt.c@1.50.1.3, 2007-02-05 17:09:42+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
    Fixes problem with getting output lines from
    my_getopt in random places in tests.

  sql/sql_prepare.cc@1.34.36.5, 2007-02-05 17:09:42+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -1
    Fixes problem with failing mysql_client_test
    on some machines. This is actually a problem
    with prepared statements.

ChangeSet@1.2414.5.5, 2007-02-05 10:50:08+01:00, knielsen@ymer.(none) +1 -0
  Fix false Valgrind warning.
  
  On some compiler/platform combination, an assignment of form *p= *p
  would map to a memcpy() call, and Valgrind flags this as an overlapped
  memcpy() error.
  
  Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
  (HAVE_purify).

  sql/sql_select.cc@1.488, 2007-02-05 10:50:03+01:00, knielsen@ymer.(none) +5 -1
    Fix false valgrind warning.

ChangeSet@1.2403.8.8, 2007-02-05 13:21:18+07:00, tomas@poseidon.mysql.com +4 -0
  Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage
  - add ndb_share connect_count to decide if share can be reused to setup replication

  sql/ha_ndbcluster.cc@1.397.4.1, 2007-02-05 13:21:08+07:00, tomas@poseidon.mysql.com +19 -9
    add additional logging info
    remove inline real_free_share (not needed) and confuses valgrind printout

  sql/ha_ndbcluster.h@1.166, 2007-02-05 13:21:09+07:00, tomas@poseidon.mysql.com +1 -0
    add connect_count to ndb_share to enable checking for version of share

  sql/ha_ndbcluster_binlog.cc@1.95.2.2, 2007-02-05 13:21:09+07:00, tomas@poseidon.mysql.com +14 -3
    use ndb_share connect_count to decide if share can be reused to setup replication
    - share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021

  sql/ha_ndbcluster_binlog.h@1.22, 2007-02-05 13:21:09+07:00, tomas@poseidon.mysql.com +0 -5
    remove inline real_free_share (not needed) and confuses valgrind printout

ChangeSet@1.2414.5.2, 2007-02-05 12:51:45+07:00, tomas@poseidon.mysql.com +1 -0
  corrected merge error

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.27, 2007-02-05 12:51:32+07:00, tomas@poseidon.mysql.com +2 -0
    corrected merge error

ChangeSet@1.2403.8.7, 2007-02-05 12:04:36+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #26019 - valgrind warning ndbcluster_log_schema_op/safe_mutex_lock invalid read
  protect the setting of ndb_schema_share = NULL with a mutex

  sql/ha_ndbcluster_binlog.cc@1.95.2.1, 2007-02-05 12:04:28+07:00, tomas@poseidon.mysql.com +36 -0
    protect the setting of ndb_schema_share = NULL with a mutec

ChangeSet@1.2414.4.1, 2007-02-04 15:31:35-08:00, brian@zim.(none) +1 -0
  Fixed bug#26027
  
  Just a bad copy/paste of help info

  client/mysqlslap.c@1.42, 2007-02-04 15:31:30-08:00, brian@zim.(none) +5 -5
    Fixed for bad option name

ChangeSet@1.1810.2524.21, 2007-02-03 09:26:11+01:00, istruewing@chilla.local +1 -0
  After merge fix

  sql/examples/ha_tina.cc@1.10.8.2, 2007-02-03 09:26:08+01:00, istruewing@chilla.local +0 -11
    After merge fix

ChangeSet@1.1810.2561.1, 2007-02-02 15:22:10-08:00, igor@olga.mysql.com +3 -0
  Fix bug #24035.
  This performance degradation for UPDATEs could be observed in the update
  statements for which the search key cannot be converted to any valid
  value of the type of the search column, like for a  the condition
  int_fld=99999999999999999999999999, though it can be guaranteed here
  that there is no row with such a key value. 

  mysql-test/r/update.result@1.31, 2007-02-02 15:22:08-08:00, igor@olga.mysql.com +57 -0
    Added a test case for bug #24035.

  mysql-test/t/update.test@1.29, 2007-02-02 15:22:08-08:00, igor@olga.mysql.com +35 -0
    Added a test case for bug #24035.

  sql/opt_range.cc@1.159.37.2, 2007-02-02 15:22:08-08:00, igor@olga.mysql.com +16 -1
    Fix bug #24035.
    This performance degradation for could be observed in the update
    statements for which the search key cannot be converted to any valid
    value of the type of the search column, like for a  the condition
    int_fld=99999999999999999999999999, though it can be guaranteed here
    that there is no row with such a key value. 
    Now the function get_mm_leaf creates trees of the type SEL_ARG::IMPOSSIBLE 
    for such conditions that tells the range scan not to perform any search
    at all.  

ChangeSet@1.1616.2881.44, 2007-02-02 20:19:13+01:00, istruewing@chilla.local +1 -0
  After merge fix

  sql/mysqld.cc@1.356.113.3, 2007-02-02 20:19:11+01:00, istruewing@chilla.local +4 -0
    After merge fix

ChangeSet@1.1810.2560.1, 2007-02-02 13:11:44-05:00, cmiller@zippy.cornsilk.net +1 -0
  Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and 
  making all to be uniform ULL(1), which is a local definition.

  sql/mysql_priv.h@1.290.91.2, 2007-02-02 13:11:42-05:00, cmiller@zippy.cornsilk.net +33 -33
    Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and 
    making all to be uniform ULL(1), which is a local definition.

ChangeSet@1.2414.1.5, 2007-02-02 17:47:13+01:00, istruewing@chilla.local +1 -0
  After merge fix

  unittest/mysys/my_atomic-t.c@1.9, 2007-02-02 17:47:10+01:00, istruewing@chilla.local +2 -0
    After merge fix

ChangeSet@1.2414.3.4, 2007-02-02 17:07:15+01:00, jonas@eel.(none) +3 -0
  ndb - bug#25984 - more than 7 failed node restart can cause cluster failure
  new behaviour is as follows:
  1) node is refused to start, and should fail with message in error log that it must be restarted --initial
  2) if cluster failure in this situation, node must also be restarted --intial
     if not SR will fail, with this message

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.101, 2007-02-02 17:07:12+01:00, jonas@eel.(none) +27 -2
    Prevent node from starting _at all_ if it has performed more than 6 failed
      node restart.
    

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.39, 2007-02-02 17:07:13+01:00, jonas@eel.(none) +98 -0
    test prg 25984

  storage/ndb/test/run-test/daily-basic-tests.txt@1.65, 2007-02-02 17:07:13+01:00, jonas@eel.(none) +4 -0
    testcase

ChangeSet@1.2343.10.37, 2007-02-02 16:14:48+01:00, jonas@eel.(none) +1 -0
  ndb - test prg
    fix failure during start

  storage/ndb/test/tools/listen.cpp@1.3.1.1, 2007-02-02 16:14:45+01:00, jonas@eel.(none) +3 -0
    fix failure during start

ChangeSet@1.1616.2963.3, 2007-02-02 17:18:42+04:00, gluh@mysql.com +3 -0
  another valgrind error fix for 4.1(backport from 5.0)

  sql/handler.cc@1.103.19.22, 2007-02-02 17:18:41+04:00, gluh@mysql.com +4 -0
    another valgrind error fix for 4.1(backport from 5.0)

  sql/examples/ha_tina.cc@1.3.1.9, 2007-02-02 17:18:41+04:00, gluh@mysql.com +12 -0
    another valgrind error fix for 4.1(backport from 5.0)

  sql/examples/ha_tina.h@1.2.1.2, 2007-02-02 17:18:41+04:00, gluh@mysql.com +2 -0
    another valgrind error fix for 4.1(backport from 5.0)

ChangeSet@1.1616.2963.2, 2007-02-02 15:01:11+04:00, gluh@mysql.com +1 -0
  Valgrind errors
  added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

  mysql-test/Makefile.am@1.39.1.20, 2007-02-02 15:01:10+04:00, gluh@mysql.com +1 -1
    Valgrind errors
    added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

ChangeSet@1.2411.4.7, 2007-02-02 14:26:53+04:00, gluh@mysql.com +4 -0
  after merge fix

  mysql-test/r/ndb_read_multi_range.result@1.9.1.1, 2007-02-02 14:26:51+04:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/t/ndb_read_multi_range.test@1.11.1.1, 2007-02-02 14:26:51+04:00, gluh@mysql.com +3 -3
    test case fix

  sql/opt_range.cc@1.258.1.2, 2007-02-02 14:26:51+04:00, gluh@mysql.com +1 -1
    after merge fix

  sql/sql_delete.cc@1.208, 2007-02-02 14:26:51+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1616.2881.43, 2007-02-02 10:01:44+01:00, istruewing@chilla.local +4 -0
  After merge fix

  include/my_pthread.h@1.65.1.20, 2007-02-02 10:01:43+01:00, istruewing@chilla.local +0 -1
    After merge fix

  include/thr_alarm.h@1.17.2.3, 2007-02-02 10:01:43+01:00, istruewing@chilla.local +1 -0
    After merge fix

  mysys/my_pthread.c@1.37.1.9, 2007-02-02 10:01:43+01:00, istruewing@chilla.local +0 -3
    After merge fix

  mysys/my_thr_init.c@1.30.1.2, 2007-02-02 10:01:43+01:00, istruewing@chilla.local +0 -4
    After merge fix

ChangeSet@1.1616.2964.1, 2007-02-01 19:51:02+04:00, ramil@mysql.com +1 -0
  Fix for bug #26012: missed Field_double::size_of()
  
  As we have Field_double::not_fixed we must have Field_double::size_of().

  sql/field.h@1.120.2.1, 2007-02-01 19:51:01+04:00, ramil@mysql.com +1 -0
    Fix for bug #26012: missed Field_double::size_of()
      - Field_double::size_of() added.

ChangeSet@1.1810.2524.17, 2007-02-01 19:12:45+04:00, gluh@mysql.com +3 -0
  Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
  additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

  mysql-test/r/information_schema.result@1.87.1.31, 2007-02-01 19:12:44+04:00, gluh@mysql.com +10 -0
    test result

  mysql-test/t/information_schema.test@1.65.1.24, 2007-02-01 19:12:44+04:00, gluh@mysql.com +12 -0
    test case

  sql/sql_show.cc@1.253.46.1, 2007-02-01 19:12:44+04:00, gluh@mysql.com +1 -0
    additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

ChangeSet@1.1810.2544.4, 2007-02-01 15:59:51+01:00, istruewing@chilla.local +1 -0
  Bug#25844: "make test" does not find mysql-test-run.pl
  Need to change directory before calling mysql-test-run.pl

  Makefile.am@1.68.7.1, 2007-02-01 15:59:48+01:00, istruewing@chilla.local +1 -0
    Bug#25844: "make test" does not find mysql-test-run.pl
    Need to change directory before calling mysql-test-run.pl

ChangeSet@1.2336.1.9, 2007-02-01 14:37:43+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch.

  storage/ndb/src/common/debugger/EventLogger.cpp@1.32, 2007-02-01 14:37:38+00:00, lzhou@dev3-63.(none) +34 -33
    Change content of error message structure

ChangeSet@1.1616.2963.1, 2007-02-01 18:00:24+04:00, gluh@mysql.com +8 -0
  Valgrind error fixes
  Notes:
  This patch doesn't fix all issues in the tree and we need jani's fix for that
  This patch shoud not be merged into 5.0

  mysql-test/valgrind.supp@1.1, 2007-02-01 18:00:23+04:00, gluh@mysql.com +437 -0
    New BitKeeper file ``mysql-test/valgrind.supp''
    This file is backported from 5.0, added suppressing of OpenSSL errors

  mysql-test/valgrind.supp@1.0, 2007-02-01 18:00:23+04:00, gluh@mysql.com +0 -0

  mysql-test/r/ps.result@1.31.1.24, 2007-02-01 18:00:23+04:00, gluh@mysql.com +0 -15
    result fix

  mysql-test/r/symlink.result@1.11.3.1, 2007-02-01 18:00:23+04:00, gluh@mysql.com +15 -0
    result fix

  mysql-test/t/ps.test@1.27.1.31, 2007-02-01 18:00:23+04:00, gluh@mysql.com +0 -18
    test is moved to 'symlink' test

  mysql-test/t/symlink.test@1.11.3.1, 2007-02-01 18:00:23+04:00, gluh@mysql.com +19 -0
    test from 'ps' test

  sql/field_conv.cc@1.33.1.6, 2007-02-01 18:00:23+04:00, gluh@mysql.com +4 -0
    valgrind error fix: backport from 5.0

  sql/mysqld.cc@1.356.114.1, 2007-02-01 18:00:23+04:00, gluh@mysql.com +3 -0
    release of ssl_context

  vio/viosslfactories.c@1.16.1.2, 2007-02-01 18:00:23+04:00, gluh@mysql.com +4 -0
    release of ssl_context

ChangeSet@1.1810.2557.2, 2007-02-01 13:25:50+02:00, gkodinov@rakia.gmz +1 -0
  trigger.result:
    merge of the 5.0-opt tree

  mysql-test/r/trigger.result@1.29.11.6, 2007-02-01 13:25:15+02:00, gkodinov@rakia.gmz +25 -25
    merge of the 5.0-opt tree

ChangeSet@1.1810.2399.13, 2007-02-01 09:48:45+01:00, mskold@mysql.com +1 -0
  Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment

  sql/ha_ndbcluster.cc@1.175.61.8, 2007-02-01 09:45:33+01:00, mskold@mysql.com +1 -2
    Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment

ChangeSet@1.2411.7.2, 2007-02-01 17:28:41+11:00, stewart@willster.(none) +1 -0
  BUG#25323  	NDB binlog timer prints incorrect stats
  
  fix time period calculation

  sql/ha_ndbcluster_binlog.cc@1.95.1.3, 2007-02-01 17:28:36+11:00, stewart@willster.(none) +2 -2
    fix time period of NDB_BINLOG_TIMER

ChangeSet@1.2411.7.1, 2007-02-01 17:19:19+11:00, stewart@willster.(none) +1 -0
  BUG#23571  	missing jamEntry() after EXECUTE_DIRECT in lqh
  
  add the jamEntry()

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.1.2, 2007-02-01 17:19:13+11:00, stewart@willster.(none) +2 -1
    add missing jamEntry() after EXECUTE_DIRECT

ChangeSet@1.2414.1.1, 2007-01-31 20:13:17-08:00, brian@zim.(none) +1 -0
  Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 

  storage/archive/ha_archive.cc@1.128, 2007-01-31 20:13:12-08:00, brian@zim.(none) +14 -7
    Put checks around the code

ChangeSet@1.1810.2524.14, 2007-01-31 19:31:36-08:00, igor@olga.mysql.com +4 -0
  Fixed bug #25407.
  The bug could cause choosing a sub-optimal execution plan for 
  a single-table query if a unique index with many null keys were 
  defined for the table. 
  It happened because the code of the check_quick_keys function 
  made an assumption that any key may occur in an unique index 
  only once. Yet this is not true for keys with nulls that may 
  have multiple occurrences in the index.

  mysql-test/r/null_key.result@1.35.1.2, 2007-01-31 19:31:34-08:00, igor@olga.mysql.com +2 -2
    Fixed bug #25407
    Adjusted result after the fix.

  mysql-test/r/select.result@1.121.10.2, 2007-01-31 19:31:34-08:00, igor@olga.mysql.com +86 -0
    Added a test case for bug #25407.

  mysql-test/t/select.test@1.102.8.2, 2007-01-31 19:31:34-08:00, igor@olga.mysql.com +74 -0
    Added a test case for bug #25407.

  sql/opt_range.cc@1.159.37.1, 2007-01-31 19:31:34-08:00, igor@olga.mysql.com +11 -1
    Fixed bug #25407.
    The bug could cause choosing a sub-optimal execution plan for 
    a single-table query if a unique index with many null keys were 
    defined for the table. 
    It happened because the code of the check_quick_keys function 
    made an assumption that any key may occur in an unique index 
    only once. Yet this is not true for keys with nulls that may 
    have multiple occurrences in the index.

ChangeSet@1.1810.2399.12, 2007-01-31 22:38:06+01:00, mskold@mysql.com +3 -0
  Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

  mysql-test/r/ndb_read_multi_range.result@1.3.2.2, 2007-01-31 22:36:49+01:00, mskold@mysql.com +17 -0
    Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

  mysql-test/t/ndb_read_multi_range.test@1.4.2.2, 2007-01-31 22:36:49+01:00, mskold@mysql.com +29 -0
    Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

  sql/ha_ndbcluster.cc@1.175.61.7, 2007-01-31 22:36:48+01:00, mskold@mysql.com +6 -2
    Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

ChangeSet@1.1810.2556.1, 2007-01-31 15:39:41-05:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#25341:  "init.d/mysql stop" may timeout too quickly
  
  Thirty five seconds is entirely too short of a period to wait for a server 
  to exit.  Instead, make a valliant effort to make sure it exits, and only
  give up after a very long period (arbitrarily chosen as 15 minutes).
  
  In addition, if we're being asked to restart the server, then don't try
  to start again if trying to stop the server failed.
  ---
  Return zero by default, when the script exits.
  ---
  Set return-/exit-value based on whether we successfully dealt with the 
  PID-file.
  ---
  Don't wait that long if the program we're waiting on exits.  It 
  should only exit if the server is not going to be started.

  BitKeeper/etc/collapsed@1.5.8.1, 2007-01-31 15:37:55-05:00, cmiller@zippy.cornsilk.net +6 -0

  support-files/mysql.server.sh@1.49.1.4, 2007-01-31 15:39:39-05:00, cmiller@zippy.cornsilk.net +18 -6
    Raise timeout to a pessimistic value, 15 minutes.  We should only be willing
    to give up and exit after an extraordinary effort.
    ---
    Return zero by default, when the script exits.
    ---
    Set return-/exit-value based on whether we successfully dealt with the 
    PID-file.
    ---
    Don't wait that long if the program we're waiting on exits.  It 
    should only exit if the server is not going to be started.

ChangeSet@1.2411.2.8, 2007-01-31 19:01:46+01:00, df@kahlann.erinye.com +1 -0
  use MTR_BUILD_THREAD=auto for rpm builds

  support-files/mysql.spec.sh@1.182, 2007-01-31 19:01:44+01:00, df@kahlann.erinye.com +3 -1
    use MTR_BUILD_THREAD=auto

ChangeSet@1.1810.2555.1, 2007-01-31 18:18:44+01:00, df@kahlann.erinye.com +1 -0
  MTR_BUILD_THREAD=auto for test runs during RPM build

  support-files/mysql.spec.sh@1.99.13.1, 2007-01-31 18:18:42+01:00, df@kahlann.erinye.com +8 -0
    MTR_BUILD_THREAD=auto for test runs

ChangeSet@1.2411.4.4, 2007-01-31 19:52:27+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/t/ps_1general.test@1.39, 2007-01-31 19:52:25+04:00, holyfoot@mysql.com +1 -1
    replace_result fixed

ChangeSet@1.1810.2552.2, 2007-01-31 18:32:53+04:00, svoj@mysql.com +2 -0
  After merge fix (WL#3567).

  sql/ha_myisam.cc@1.147.12.2, 2007-01-31 18:32:51+04:00, svoj@mysql.com +2 -1
    After merge fix (WL#3567).

  sql/ha_myisammrg.cc@1.59.14.2, 2007-01-31 18:32:51+04:00, svoj@mysql.com +1 -1
    After merge fix (WL#3567).

ChangeSet@1.1810.2546.3, 2007-01-31 15:25:56+01:00, joerg@trift2. +3 -0
  Fix bug#23293 "readline detection broken on NetBSD":
  
  Its root cause is a difference between the "readline" and "libedit" (header files)
  definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
  This variable is used as a pointer to a function returning "char *",
  but "libedit" declares it as returning "int" and then adds casts on usage.
  
  Change it to "CPFunction *" and get rid of the casts.

  client/mysql.cc@1.199.20.2, 2007-01-31 15:25:53+01:00, joerg@trift2. +3 -3
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
    it need not be cast on usage, and "no_completion()" can be declared to return "char *".

  cmd-line-utils/libedit/readline.c@1.11, 2007-01-31 15:25:53+01:00, joerg@trift2. +5 -6
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Now that the "libedit" header files declares "rl_completion_entry_function" correctly,
    it need not be cast on usage, and "complet_func()" is a "CPFunction *" as well.

  cmd-line-utils/libedit/readline/readline.h@1.4, 2007-01-31 15:25:53+01:00, joerg@trift2. +1 -1
    Fix bug#23293 "readline detection broken on NetBSD":
    
    Declare "rl_completion_entry_function()" to be a "CPFunction *", this avoids casts
    and brings "libedit" in sync with "readline".

ChangeSet@1.1810.2553.1, 2007-01-31 16:04:38+02:00, gkodinov@macbook.gmz +8 -0
  BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
   Two problems here:
  
   Problem 1:
  
   While constructing the join columns list the optimizer does as follows:
    1. Sets the join_using_fields/natural_join members of the right JOIN 
     operand.
    2. Makes a "table reference" (TABLE_LIST) to parent the two tables.
    3. Assigns the join_using_fields/is_natural_join of the wrapper table
     using join_using_fields/natural_join of the rightmost table
    4. Sets join_using_fields to NULL for the right JOIN operand.
    5. Passes the parent table up to the same procedure on the upper 
     level.
  
   Step 1 overrides the the join_using_fields that are set for a nested 
   join wrapping table in step 4.
   Fixed by making a designated variable SELECT_LEX::prev_join_using to 
   pass the data from step 1 to step 4 without destroying the wrapping 
   table data.
  
   Problem 2:
  
   The optimizer checks for ambiguous columns while transforming 
   NATURAL JOIN/JOIN USING to JOIN ON. While doing that there was no
   distinction between columns that are used in the generated join
   condition (where ambiguity can be checked) and the other columns
   (where ambiguity can be checked only when resolving references
   coming from outside the JOIN construct itself).
   Fixed by allowing the non-USING columns to be present in multiple 
   copies in both sides of the join and moving the ambiguity check 
   to the place where unqualified references to the join columns are
   resolved (find_field_in_natural_join()).

  mysql-test/r/join_nested.result@1.23.1.2, 2007-01-31 16:04:26+02:00, gkodinov@macbook.gmz +28 -0
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - test case

  mysql-test/t/join_nested.test@1.21, 2007-01-31 16:04:27+02:00, gkodinov@macbook.gmz +39 -0
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - test case

  sql/mysql_priv.h@1.290.90.1, 2007-01-31 16:04:27+02:00, gkodinov@macbook.gmz +2 -1
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - use SELECT_LEX to store the ref to JOIN USING list needed by the 
       parser

  sql/sql_base.cc@1.235.1.130, 2007-01-31 16:04:28+02:00, gkodinov@macbook.gmz +40 -11
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - proper check for duplicate cols
     - more detailed debug output

  sql/sql_lex.h@1.175.32.2, 2007-01-31 16:04:29+02:00, gkodinov@macbook.gmz +14 -0
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - use SELECT_LEX to store the ref to JOIN USING list needed by the 
       parser

  sql/sql_parse.cc@1.426.138.1, 2007-01-31 16:04:30+02:00, gkodinov@macbook.gmz +6 -7
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - proper check for duplicate cols in JOIN USING

  sql/sql_yacc.yy@1.371.93.1, 2007-01-31 16:04:31+02:00, gkodinov@macbook.gmz +10 -6
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - use SELECT_LEX to store the ref to JOIN USING list needed by the 
       parser

  sql/table.cc@1.160.46.1, 2007-01-31 16:04:31+02:00, gkodinov@macbook.gmz +1 -0
    BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-join
     - return null if no table ref (as in nested join columns).

ChangeSet@1.1810.2551.1, 2007-01-31 16:45:33+04:00, holyfoot@mysql.com +1 -0
  bug #25973 (ps_1general.test fails in embedded server)

  mysql-test/t/ps_1general.test@1.25.1.5, 2007-01-31 16:45:31+04:00, holyfoot@mysql.com +1 -1
    replace_result fixed

ChangeSet@1.1616.2961.1, 2007-01-31 16:15:20+04:00, svoj@mysql.com +4 -0
  WL#3567 - MERGE engine: a check for underlying table conformance
  
  When a merge table is opened compare column and key definition of
  underlying tables against column and key definition of merge table.
  
  If any of underlying tables have different column/key definition
  refuse to open merge table.

  mysql-test/r/merge.result@1.32.1.12, 2007-01-31 16:15:19+04:00, svoj@mysql.com +21 -1
    A test case for WL#3456.

  mysql-test/t/merge.test@1.28.1.13, 2007-01-31 16:15:19+04:00, svoj@mysql.com +28 -1
    A test case for WL#3456.

  sql/ha_myisam.cc@1.115.1.49, 2007-01-31 16:15:20+04:00, svoj@mysql.com +315 -176
    Moved a part of code that converts TABLE object to MyISAM key and column
    definition to a separate function.
    
    Added check_definition() function that compares MyISAM table definitions.

  sql/ha_myisammrg.cc@1.51.1.14, 2007-01-31 16:15:20+04:00, svoj@mysql.com +40 -2
    Check if underlying table definition conforms to merge table definition,
    and in case underlying table definition differs, refuse to open merge
    table.

ChangeSet@1.1810.2550.1, 2007-01-31 10:18:26+02:00, gkodinov@macbook.gmz +3 -0
  Bug #25551: inconsistent behaviour in grouping NULL, depending on index type
   The optimizer takes away columns from GROUP BY/DISTINCT if they constitute
   all the parts of an unique index.
   However if some of the columns can contain NULLs this cannot be done 
  (because an UNIQUE index can have multiple rows with NULL values).
   Fixed by not using UNIQUE indexes with nullable columns to remove
   grouping columns from GROUP BY/DISTINCT.

  mysql-test/r/distinct.result@1.46.1.5, 2007-01-31 10:18:13+02:00, gkodinov@macbook.gmz +25 -1
    Bug #25551: inconsistent behaviour in grouping NULL, depending on index type
     - test case

  mysql-test/t/distinct.test@1.30, 2007-01-31 10:18:13+02:00, gkodinov@macbook.gmz +16 -1
    Bug #25551: inconsistent behaviour in grouping NULL, depending on index type
     - test case

  sql/sql_select.cc@1.312.124.1, 2007-01-31 10:18:16+02:00, gkodinov@macbook.gmz +11 -8
    Bug #25551: inconsistent behaviour in grouping NULL, depending on index type
     - UNIQUE NULL indices don't guarantee GROUP BY/DISTINCT.

ChangeSet@1.1810.2549.2, 2007-01-31 11:14:32+04:00, ramil@mysql.com +2 -0
  after-merge fix.

  sql/item_cmpfunc.cc@1.187.21.2, 2007-01-31 11:14:31+04:00, ramil@mysql.com +9 -9
    after-merge fix.

  sql/item_sum.cc@1.170.14.3, 2007-01-31 11:14:31+04:00, ramil@mysql.com +4 -3
    after-merge fix.

ChangeSet@1.2411.6.4, 2007-01-31 13:01:03+07:00, tomas@poseidon.mysql.com +1 -0
  Bug#25239	Out of memory problem can cause crash in SUMA

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.1.1, 2007-01-31 13:00:54+07:00, tomas@poseidon.mysql.com +3 -4
    return RNIL instead of ndbrequire if memory allocation fails

ChangeSet@1.1616.2950.2, 2007-01-31 09:51:05+04:00, ramil@mysql.com +10 -0
  fix for bug #19690: ORDER BY eliminates rows from the result
  
  Depending on the queries we use different data processing methods
  and can lose some data in case of double (and decimal in 4.1) fields.
  
  The fix consists of two parts:
  1. double comparison changed, now double a is equal to double b 
  if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
  For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
  2. if we use a temporary table, store double values there as is 
  to avoid any data conversion (rounding).

  mysql-test/r/type_float.result@1.25.1.13, 2007-01-31 09:51:03+04:00, ramil@mysql.com +71 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - test result

  mysql-test/t/type_float.test@1.15.1.8, 2007-01-31 09:51:03+04:00, ramil@mysql.com +25 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - test case

  sql/field.cc@1.197.1.38, 2007-01-31 09:51:03+04:00, ramil@mysql.com +1 -1
    fix for bug #19690: ORDER BY eliminates rows from the result
      - use not_fixed flag instead of dec to check bounds.

  sql/field.h@1.120.1.15, 2007-01-31 09:51:03+04:00, ramil@mysql.com +12 -3
    fix for bug #19690: ORDER BY eliminates rows from the result
      - Field_Double::not_fixed flag introduced, which is set if dec == NOT_FIXED_DEC
        and is used in the ::store() to check bounds. 
      - new constructor introduced (with not_fixed_arg parameter).
    

  sql/init.cc@1.15.1.1, 2007-01-31 09:51:03+04:00, ramil@mysql.com +6 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - fill log_01[] array with 0.1 powers.

  sql/item_cmpfunc.cc@1.111.26.1, 2007-01-31 09:51:03+04:00, ramil@mysql.com +49 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - compare_real_fixed() and compare_e_real_fixed() introduced,
        they consider double a == double b if a-b is less than 'precision',
        'precision' is set to 5*0.1^(1 + max(a->decimals, b->decimals)), 
        for example, if a->decimals==1, b->decimals==2, 'precision' is 0.005
      - use the above functions if both arguments are fixed. 

  sql/item_cmpfunc.h@1.73.12.1, 2007-01-31 09:51:03+04:00, ramil@mysql.com +3 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - Arg_comparator::presision introduced.
      - Arg_comparator::compare_real_fixed(), Arg_comparator::compare_e_real_fixed() introduced.
    

  sql/mysql_priv.h@1.186.110.1, 2007-01-31 09:51:03+04:00, ramil@mysql.com +1 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - log_01 array of 0.1 powers added.
    

  sql/mysqld.cc@1.356.112.1, 2007-01-31 09:51:03+04:00, ramil@mysql.com +1 -0
    fix for bug #19690: ORDER BY eliminates rows from the result
      - log_01 array of 0.1 powers added.
    

  sql/sql_select.cc@1.216.147.1, 2007-01-31 09:51:04+04:00, ramil@mysql.com +8 -6
    fix for bug #19690: ORDER BY eliminates rows from the result
      - if we create double field in a temporary table, set not_fixed flag
        (use proper constructor) to avoid data conversion 
        in the Field_double::store(). Otherwise we can lose some data.

ChangeSet@1.2414, 2007-01-30 16:15:22-07:00, peterg@linux.site +1 -0
  Changed comments before functions to Doxygen style.

  sql/handler.cc@1.291.1.1, 2007-01-30 16:15:18-07:00, peterg@linux.site +75 -99
    Changed comments before functions to Doxygen style.

ChangeSet@1.1810.2546.2, 2007-01-31 00:06:42+01:00, kent@mysql.com +13 -0
  gen_lex_hash.cc:
    If inserting a GPL header, include a complete one
  Makefile.am, mysql.dsw, mysql.sln:
    Removed C version of mysql-test-run
  mysql.spec.sh:
    Specify GPL license only in GPL sources
  .del-my_manage.h:
    Delete: mysql-test/my_manage.h
  mysql.spec.sh:
    Added GPL header
  .del-mysql_test_run_new.c:
    Delete: mysql-test/mysql_test_run_new.c
  .del-mysql_test_run_new.dsp:
    Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
  .del-my_create_tables.c:
    Delete: mysql-test/my_create_tables.c
  .del-mysql_test_run_new_ia64.dsp:
    Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
  msql2mysql.sh:
    Use up-to-date GPL header
  .del-mysql_test_run_new.vcproj:
    Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
  .del-my_manage.c:
    Delete: mysql-test/my_manage.c

  BitKeeper/deleted/.del-my_create_tables.c@1.3.2.1, 2007-01-30 22:59:07+01:00, kent@mysql.com +0 -0
    Delete: mysql-test/my_create_tables.c

  BitKeeper/deleted/.del-my_manage.c@1.10.1.1, 2007-01-30 22:59:07+01:00, kent@mysql.com +0 -0
    Delete: mysql-test/my_manage.c

  BitKeeper/deleted/.del-my_manage.h@1.4.1.1, 2007-01-30 22:59:14+01:00, kent@mysql.com +0 -0
    Delete: mysql-test/my_manage.h

  VC++Files/mysql.dsw@1.26.4.1, 2007-01-30 23:40:03+01:00, kent@mysql.com +0 -22
    Removed C version of mysql-test-run

  VC++Files/mysql.sln@1.5.4.1, 2007-01-30 23:40:03+01:00, kent@mysql.com +0 -34
    Removed C version of mysql-test-run

  BitKeeper/deleted/.del-mysql_test_run_new.c@1.15.2.1, 2007-01-30 22:58:44+01:00, kent@mysql.com +0 -0
    Delete: mysql-test/mysql_test_run_new.c

  BitKeeper/deleted/.del-mysql_test_run_new.dsp@1.8.1.1, 2007-01-30 22:58:44+01:00, kent@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new.dsp

  BitKeeper/deleted/.del-mysql_test_run_new.vcproj@1.1.1.1, 2007-01-30 22:58:44+01:00, kent@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj

  BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp@1.4.1.1, 2007-01-30 22:58:44+01:00, kent@mysql.com +0 -0
    Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp

  mysql-test/Makefile.am@1.66.1.18, 2007-01-30 23:40:03+01:00, kent@mysql.com +0 -2
    Removed C version of mysql-test-run

  scripts/msql2mysql.sh@1.3, 2007-01-29 13:33:01+01:00, kent@mysql.com +13 -11
    Use up-to-date GPL header

  sql/gen_lex_hash.cc@1.67.1.6, 2007-01-29 14:27:17+01:00, kent@mysql.com +18 -4
    If inserting a GPL header, include a complete one

  support-files/mysql.spec.sh@1.99.1.65, 2007-01-29 13:33:25+01:00, kent@mysql.com +16 -0
    Added GPL header

  support-files/mysql.spec.sh@1.99.1.64, 2007-01-29 13:26:03+01:00, kent@mysql.com +6 -12
    Specify GPL license only in GPL sources

ChangeSet@1.1616.2924.14, 2007-01-30 13:06:36-08:00, igor@olga.mysql.com +2 -0
  Fixed bug #24987.
  Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
  no matches were found (instead of -1 it returned prior this patch).
  This changes allow us to avoid possible conflicts with return values
  from user-defined handler methods which also may return -1. 
  No particular test cases are provided with this fix.

  sql/opt_sum.cc@1.33.6.4, 2007-01-30 13:06:33-08:00, igor@olga.mysql.com +5 -5
    Fixed bug #24987.
    Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
    no matches were found (instead of -1 it returned prior this patch).
    This changes allow us to avoid possible conflicts with return values
    from user-defined handler methods which also may return -1. 

  sql/sql_select.cc@1.216.125.18, 2007-01-30 13:06:33-08:00, igor@olga.mysql.com +10 -8
    Fixed bug #24987.
    Made the function opt_sum_query to return HA_ERR_KEY_NOT_FOUND when
    no matches were found (instead of -1 it returned prior this patch).
    This changes allow us to avoid possible conflicts with return values
    from user-defined handler methods which also may return -1. 

ChangeSet@1.2343.10.36, 2007-01-30 19:45:14+01:00, jonas@perch.ndb.mysql.com +12 -0
  ndb - interface change of handling of abort option
  1) move AbortOption from NdbTransaction to NdbOperation
  
  2) let each operation have a "default" abort option dependant on
     operation type
  
     - read - AO_IgnoreError
     - dml - AbortOnError
     - scan take over - AbortOnError
  
  3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.
  
     Another value to execute(AO) is equivalent to setting AO on each operation before calling execute
  
  4) execute() does _only_ return -1 if transaction has been aborted
     otherwise, you need to check each operation for error code

  sql/ha_ndbcluster.cc@1.372.2.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +15 -14
    adopt to changes in aption option handling

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.39.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +21 -2
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.52.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +22 -34
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.49.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +9 -9
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/src/ndbapi/NdbIndexStat.cpp@1.5.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +1 -1
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.24.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +32 -21
    Put default value on abortoption dependant on operation type

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.23.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +15 -33
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.103.1.2, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +1 -0
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.70.1.2, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +19 -121
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/test/include/HugoOperations.hpp@1.18.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +2 -2
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/test/ndbapi/testNdbApi.cpp@1.23.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +274 -0
    Move "ownership" of AbortOption to operation from transaction

  storage/ndb/test/src/HugoOperations.cpp@1.28.1.1, 2007-01-30 19:45:12+01:00, jonas@perch.ndb.mysql.com +2 -2
    Move "ownership" of AbortOption to operation from transaction

ChangeSet@1.2343.10.35, 2007-01-30 19:28:32+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - 
    remove copy/paste method in NdbIndexOperation

  storage/ndb/include/ndbapi/NdbIndexOperation.hpp@1.12.1.1, 2007-01-30 19:28:31+01:00, jonas@perch.ndb.mysql.com +0 -2
    remove reduntant method

  storage/ndb/src/ndbapi/NdbIndexOperation.cpp@1.28.1.1, 2007-01-30 19:28:31+01:00, jonas@perch.ndb.mysql.com +0 -233
    remove redundant method

ChangeSet@1.2343.10.34, 2007-01-30 19:26:40+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - minor style fixes
    

  storage/ndb/src/ndbapi/Ndb.cpp@1.82.1.1, 2007-01-30 19:26:38+01:00, jonas@perch.ndb.mysql.com +4 -4
    Fix usage of correct types internally to ndbapi

  storage/ndb/test/ndbapi/testBlobs.cpp@1.33.1.1, 2007-01-30 19:26:38+01:00, jonas@perch.ndb.mysql.com +4 -3
    minor fixes to testBlobs

ChangeSet@1.2411.4.2, 2007-01-30 18:07:41+01:00, mhansson@linux-st28.site +1 -0
  This is an empty changeset to trigger a rerun of pushbuild.

  sql/table.h@1.160, 2007-01-30 18:07:37+01:00, mhansson@linux-st28.site +1 -1
    Only touched a comment.

ChangeSet@1.1346.892.1, 2007-01-30 18:52:26+02:00, jani@ua141d10.elisa.omakaista.fi +7 -0
  Cleanup of thread-type (linuxthread or NTPL) detection code
  Move get_thread_lib to mysys/my_pthread.c
  Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms

  include/my_global.h@1.34.7.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +1 -4
    Fixed to be same as in 5.1

  include/my_pthread.h@1.57.2.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +9 -8
    Move things around to be more in line with rest of code

  mysys/default.c@1.17.4.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Fixed two wrong pointer incrementations.

  mysys/my_pthread.c@1.35.2.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +4 -1
    Cleanup: Use variable thr_client_alarm

  mysys/my_thr_init.c@1.21.3.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +25 -0
    Detect thread library at startup.
    Set also thr_client_alarm signal here, so that we get
    it in init_signals() in mysqld

  mysys/thr_alarm.c@1.41.2.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +8 -13
    Set thr_client_alarm depending on which thread library we are using

  sql/mysqld.cc@1.297.55.1, 2007-01-30 18:52:25+02:00, jani@ua141d10.elisa.omakaista.fi +9 -25
    Move get_thread_lib to mysys/my_pthread.c

ChangeSet@1.1810.2547.1, 2007-01-30 17:43:34+02:00, gkodinov@macbook.gmz +3 -0
  Bug #25643: SEC_TO_TIME function problem
   Checking for NULL before calling the val_xxx()
   methods only checks for such arguments that are 
   known to be NULLs at compile time. 
   The arguments that may or may not contain
   NULLs (e.g. function calls and possibly others)
   are not checked at all.
   Fixed by first calling the val_xxx() method and
   then checking for null in SEC_TO_TIME().
   In addition QUARTER() was not returning 0 (as all the 
   val_int() functions do when processing a NULL value).

  mysql-test/r/func_time.result@1.47.1.33, 2007-01-30 17:43:28+02:00, gkodinov@macbook.gmz +14 -0
    Bug #25643: SEC_TO_TIME function problem
     - test case

  mysql-test/t/func_time.test@1.41.1.26, 2007-01-30 17:43:29+02:00, gkodinov@macbook.gmz +12 -0
    Bug #25643: SEC_TO_TIME function problem
     - test case

  sql/item_timefunc.cc@1.100.27.1, 2007-01-30 17:43:29+02:00, gkodinov@macbook.gmz +6 -3
    Bug #25643: SEC_TO_TIME function problem
     - null handling fixed for QUARTER() and SEC_TO_TIME()

ChangeSet@1.2411.1.3, 2007-01-30 13:52:26+02:00, monty@mysql.com +4 -0
  Fixed problems detected by pushbuild

  mysql-test/t/log_state.test@1.4, 2007-01-30 13:52:23+02:00, monty@mysql.com +5 -1
    Move disconnect last to avoid sporadic failures in test because 'Quit' command appeared in general log

  plugin/daemon_example/daemon_example.c@1.2.1.2, 2007-01-30 13:52:23+02:00, monty@mysql.com +3 -3
    Define __attribute__ to fix compiler error with not gcc compilers

  sql-common/client.c@1.124, 2007-01-30 13:52:23+02:00, monty@mysql.com +1 -1
    Fixed spelling error

  sql/sql_parse.cc@1.622, 2007-01-30 13:52:23+02:00, monty@mysql.com +5 -1
    Added comment

ChangeSet@1.2403.3.9, 2007-01-30 15:43:55+07:00, tomas@poseidon.mysql.com +2 -0
  valgrind leak
  - no injected events if operation is not connected
  - remove extra valgrind checks

  sql/ha_ndbcluster_binlog.cc@1.95.1.2, 2007-01-30 15:43:33+07:00, tomas@poseidon.mysql.com +0 -13
    removed extra valgrind check

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.77.1.1, 2007-01-30 15:43:34+07:00, tomas@poseidon.mysql.com +29 -27
    valgrind leak
    - no injected events if operation is not connected

ChangeSet@1.2336.1.8, 2007-01-30 13:05:40+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  Bug#23546, Cluster configured without any arbitration

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.92.2.1, 2007-01-30 13:05:38+08:00, Justin.He@dev3-240.dev.cn.tlan +78 -70
    add a judgement for arbitration rank configuration, if neither MGMD nor API nodes
    are configured with rank = 0, show warning information;
    correct indentations around patch;

ChangeSet@1.2403.3.8, 2007-01-30 11:52:37+07:00, tomas@poseidon.mysql.com +1 -0
  ndb - added extra valgrind memleak checks to try to track leak

  sql/ha_ndbcluster_binlog.cc@1.95.1.1, 2007-01-30 11:52:16+07:00, tomas@poseidon.mysql.com +13 -0
    added extra valgrind memleak checks to try to track leak

ChangeSet@1.2343.10.33, 2007-01-30 04:14:07+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    two small fixes for TC
      1) use static syntax
      2) fix attlen handling in unique index

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.129.1.2, 2007-01-30 04:14:05+01:00, jonas@perch.ndb.mysql.com +15 -15
    1) use static syntax
    2) fix attlen handling in unique index

ChangeSet@1.2403.2.7, 2007-01-29 13:17:30-08:00, brian@zim.(none) +3 -0
  Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 

  client/client_priv.h@1.63, 2007-01-29 13:17:27-08:00, brian@zim.(none) +2 -0
    More options

  client/mysqlslap.c@1.41, 2007-01-29 13:17:27-08:00, brian@zim.(none) +65 -21
    Extended the auto-sql in the following ways:
    1) You can now specify a load type of either "mixed", "read", or "write". Not great, but a definite improvement.
    2) A new option allows you to specify how many rows are inserted for the "read" load. 
    
    I also fixed a bug where limit was not being reached by running threads. 

  mysql-test/r/mysqlslap.result@1.10, 2007-01-29 13:17:27-08:00, brian@zim.(none) +2 -0
    Updated results

ChangeSet@1.2390.20.1, 2007-01-29 19:36:48+01:00, msvensson@neptunus.(none) +2 -0
  Bug#22579 use --warning-mode=pedantic and -std=c89 flags when compiling with gcc
   - Reorganize include file order to avoid problem with gcc 2.95.3
   - Compiler is confused by forward class declarations

  server-tools/instance-manager/command.cc@1.9, 2007-01-29 19:36:45+01:00, msvensson@neptunus.(none) +1 -2
    Reorganize include file order to avoid problem with gcc 2.95.3

  server-tools/instance-manager/instance.cc@1.51, 2007-01-29 19:36:45+01:00, msvensson@neptunus.(none) +3 -2
    Reorganize include file order to avoid problem with gcc 2.95.3

ChangeSet@1.1810.2545.1, 2007-01-29 19:09:30+01:00, msvensson@neptunus.(none) +1 -0
  Add result file for ssl_connect.test

  mysql-test/r/ssl_connect.result@1.1, 2007-01-29 19:09:28+01:00, msvensson@neptunus.(none) +1 -0
    New BitKeeper file ``mysql-test/r/ssl_connect.result''

  mysql-test/r/ssl_connect.result@1.0, 2007-01-29 19:09:28+01:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.1810.2543.3, 2007-01-29 18:46:06+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test
   - It's good to build the test programs for yaSSL to check for undefined
     symbols etc but they should not be installed by "make install"

  extra/yassl/taocrypt/test/Makefile.am@1.2.1.4, 2007-01-29 18:45:53+01:00, msvensson@pilot.mysql.com +1 -1
    "test" is a noinst program

  extra/yassl/testsuite/Makefile.am@1.3.1.5, 2007-01-29 18:45:58+01:00, msvensson@pilot.mysql.com +1 -1
    "testsuite" is a noinst program

ChangeSet@1.1810.2543.2, 2007-01-29 18:32:45+01:00, msvensson@neptunus.(none) +1 -0
  Add test for making sure there are no spurious connect failures when using SSL

  mysql-test/t/ssl_connect.test@1.1, 2007-01-29 18:32:43+01:00, msvensson@neptunus.(none) +13 -0
    Add test for making sure there are no spurious connect failures when using SSL

  mysql-test/t/ssl_connect.test@1.0, 2007-01-29 18:32:43+01:00, msvensson@neptunus.(none) +0 -0

ChangeSet@1.1810.2543.1, 2007-01-29 16:54:40+01:00, msvensson@neptunus.(none) +95 -0
  Import latest version of yaSSL
   - Replace SawTooth copyright header with MySQL's
   - Bug#19209 Test 'rpl_openssl' hangs on Windows
   - Spurious "2013 Connection to server lost" errors fixed
     yaSSL doesn't close socket anymore, that is left to the application 

  extra/yassl/README@1.9, 2007-01-25 19:34:37+01:00, msvensson@neptunus.(none) +2 -2
    Import patch yassl.diff

  extra/yassl/include/buffer.hpp@1.6.1.1, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/cert_wrapper.hpp@1.5, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/crypto_wrapper.hpp@1.5.1.1, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/factory.hpp@1.7, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/handshake.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/lock.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/log.hpp@1.4, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.14.1.6, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/socket_wrapper.hpp@1.10, 2006-11-02 19:10:43+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/timer.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/yassl.hpp@1.2, 2006-03-29 01:56:41+02:00, msvensson@neptunus.(none) +17 -20
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp@1.8, 2006-10-19 01:36:53+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/yassl_imp.hpp@1.7.1.1, 2006-11-02 19:10:43+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11.3.1, 2007-01-25 19:34:37+01:00, msvensson@neptunus.(none) +22 -24
    Import patch yassl.diff

  extra/yassl/include/yassl_types.hpp@1.16, 2006-10-19 01:36:53+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/buffer.cpp@1.8, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/cert_wrapper.cpp@1.10, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/crypto_wrapper.cpp@1.9.1.1, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.15, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +18 -25
    Import patch yassl.diff

  extra/yassl/src/lock.cpp@1.6, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/log.cpp@1.7, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.15, 2007-01-25 19:39:15+01:00, msvensson@neptunus.(none) +18 -25
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.8, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +17 -25
    Import patch yassl.diff

  extra/yassl/src/template_instnt.cpp@1.10.1.4, 2006-09-27 14:27:49+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/timer.cpp@1.9, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/yassl.cpp@1.4, 2006-08-29 22:06:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.11, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/yassl_imp.cpp@1.8.1.5, 2006-11-09 21:20:56+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.5, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +28 -25
    Import patch yassl.diff

  extra/yassl/taocrypt/include/aes.hpp@1.6, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/algebra.hpp@1.4.3.1, 2006-11-21 20:21:04+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/arc4.hpp@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.13, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/block.hpp@1.11, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/blowfish.hpp@1.5, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +18 -25
    Import patch yassl.diff

  extra/yassl/taocrypt/include/coding.hpp@1.3, 2006-07-12 21:15:02+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/des.hpp@1.5.1.1, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dh.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/dsa.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/error.hpp@1.7, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/file.hpp@1.6, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hash.hpp@1.6.1.1, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/hmac.hpp@1.6.1.1, 2006-10-16 10:30:36+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/integer.hpp@1.13, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/kernelc.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md2.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md4.hpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/md5.hpp@1.5, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/misc.hpp@1.16, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modarith.hpp@1.3.1.1, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/modes.hpp@1.8.1.1, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/pwdbased.hpp@1.4, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/random.hpp@1.4, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/ripemd.hpp@1.5, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/rsa.hpp@1.4.1.1, 2006-11-02 19:10:43+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/runtime.hpp@1.17, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/sha.hpp@1.5, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/twofish.hpp@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/type_traits.hpp@1.3.1.1, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/include/types.hpp@1.11, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +19 -25
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/algorithm.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/helpers.hpp@1.3, 2006-09-27 19:22:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/list.hpp@1.1.1.1, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/memory.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/memory_array.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/pair.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/stdexcept.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/mySTL/vector.hpp@1.2, 2006-09-18 22:19:22+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aes.cpp@1.5.1.1, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/aestables.cpp@1.6, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/algebra.cpp@1.12.1.1, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/arc4.cpp@1.7, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.11.1.2, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/bftables.cpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/blowfish.cpp@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.7, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/crypto.cpp@1.2, 2006-09-26 23:09:44+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/des.cpp@1.6, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dh.cpp@1.9, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/dsa.cpp@1.7, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/file.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/hash.cpp@1.5, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.28, 2007-01-25 19:34:38+01:00, msvensson@neptunus.(none) +23 -42
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md2.cpp@1.3, 2006-07-12 21:15:03+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md4.cpp@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/md5.cpp@1.7, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.19, 2006-10-17 02:33:15+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/random.cpp@1.12, 2006-11-02 19:10:43+01:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/ripemd.cpp@1.7, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/rsa.cpp@1.9, 2006-07-12 21:15:04+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/sha.cpp@1.7, 2006-10-05 23:32:32+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/template_instnt.cpp@1.13, 2006-08-16 01:36:33+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/tftables.cpp@1.3, 2006-07-12 21:15:04+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

  extra/yassl/taocrypt/src/twofish.cpp@1.4, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +17 -24
    Import patch yassl.diff

ChangeSet@1.2411.1.2, 2007-01-29 16:13:18+02:00, monty@mysql.com +18 -0
  after merge fixes
  Removed 

  mysql-test/t/disabled.def@1.230, 2007-01-29 16:13:14+02:00, monty@mysql.com +1 -1
    Disabled rp_ndb_dd_advance, becasue of random failures

  mysql-test/t/rpl_ndb_dd_advance.test@1.10, 2007-01-29 16:13:14+02:00, monty@mysql.com +1 -0
    Added big_test, as this test takes +600 seconds

  plugin/daemon_example/daemon_example.c@1.2.1.1, 2007-01-29 16:13:14+02:00, monty@mysql.com +2 -2
    Removed compiler warnings

  sql/item_cmpfunc.cc@1.234.1.4, 2007-01-29 16:13:14+02:00, monty@mysql.com +5 -3
    after merge fixes

  sql/item_subselect.cc@1.144, 2007-01-29 16:13:14+02:00, monty@mysql.com +3 -4
    after merge fixes

  storage/ndb/src/common/util/ConfigValues.cpp@1.15, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -2
    Removed declarations to nonexisting functions

  storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp@1.15, 2007-01-29 16:13:14+02:00, monty@mysql.com +3 -0
    Removed not used function

  storage/ndb/src/kernel/blocks/lgman.cpp@1.24, 2007-01-29 16:13:14+02:00, monty@mysql.com +1 -7
    Removed not used variables

  storage/ndb/src/kernel/blocks/pgman.cpp@1.21, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -2
    Removed not used variables

  storage/ndb/src/kernel/blocks/restore.cpp@1.13, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -3
    Removed not used variables

  storage/ndb/src/kernel/blocks/tsman.cpp@1.14, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -4
    Removed not used variables

  storage/ndb/src/kernel/vm/DynArr256.cpp@1.3, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -1
    Removed not used variables

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@1.12, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -1
    Removed not used variables

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.79, 2007-01-29 16:13:14+02:00, monty@mysql.com +0 -4
    Removed not used variables

  storage/ndb/src/ndbapi/NdbIndexStat.cpp@1.7, 2007-01-29 16:13:15+02:00, monty@mysql.com +0 -1
    Removed not used variable

  storage/ndb/src/ndbapi/NdbRecAttr.cpp@1.32, 2007-01-29 16:13:15+02:00, monty@mysql.com +2 -2
    Removed not used variable

  storage/ndb/tools/desc.cpp@1.30, 2007-01-29 16:13:15+02:00, monty@mysql.com +0 -1
    Removed not used variable

  support-files/compiler_warnings.supp@1.4, 2007-01-29 16:13:15+02:00, monty@mysql.com +1 -0
    Added suppress message for hard to remove warning

ChangeSet@1.2401.1.8, 2007-01-29 15:07:11+01:00, mhansson@linux-st28.site +5 -0
  BUG#20604: FORCE INDEX uses keys disabled by ALTER TABLE
   
  The function that checks whether we can use keys for aggregates,
  find_key_for_maxmin(), assumes that keys disabled by ALTER TABLE
  ... DISABLE KEYS are not in the set table->keys_in_use_for_query.
  I.E., if a key is in this set, the optimizer assumes it is free to 
  use it.
    
  The bug is that keys disabled with ALTER TABLE ... DISABLE KEYS still
  appear in table->keys_in_use_for_query When the TABLE object has been 
  initialized with setup_tables(). Before setup_tables is called, however, 
  keys that are disabled in the aforementioned way are not included in
  TABLE::keys_in_use_for_query. 
    
  The provided patch changes the code that updates keys_is_use_for_query so 
  that it assumes that keys_is_use_for_query already takes into account all 
  disabled keys, and generally all keys that should be used by the query.

  mysql-test/r/key.result@1.41, 2007-01-29 15:07:08+01:00, mhansson@linux-st28.site +7 -0
    Test for BUG#20604.
    The important part of the test is the explain output that 
    tests what indexes are used.

  mysql-test/t/key.test@1.31.1.1, 2007-01-29 15:07:08+01:00, mhansson@linux-st28.site +11 -0
    The minimal test case that reveals the bug. The optimizer for 
    aggregates relies on keys disabled with ALTER TABLE ... DISABLE KEYS
    not being in the set TABLE::keys_in_use_for_query. 
    When the execution engine tries to use a disabled index, MyISAM 
    returns an error.

  sql/sql_base.cc@1.373, 2007-01-29 15:07:08+01:00, mhansson@linux-st28.site +6 -1
    Exclude the keys disabled by ALTER TABLE ... DISABLE_KEYS 
    from TABLE::keys_in_use_for_query, and in general, don't 
    introduce any new keys. We may not know why keys have been 
    removed at previous stages.

  sql/sql_select.cc@1.485.1.1, 2007-01-29 15:07:08+01:00, mhansson@linux-st28.site +6 -5
    The intersection operation between table->s->keys_in_use and 
    table->keys_in_use_for_query is no longer necessary. 
    We can trust that the latter is a subset of the former.

  sql/table.h@1.159, 2007-01-29 15:07:09+01:00, mhansson@linux-st28.site +21 -2
    Added comments to TABLE_SHARE::keys_in_use and 
    TABLE::keys_in_use_for_query.

ChangeSet@1.2411.2.2, 2007-01-29 17:39:28+04:00, holyfoot@mysql.com +2 -0
  bug #25895 (compiling the embedded server fails on some 64-bit platforms)
  
  it can't be compile everywhere if we just cast pointer to pthread_t
  So now we use correct pthread_self() value as the pthread_t and
  pointer where we need to identify the thread exactly.

  libmysqld/lib_sql.cc@1.127.2.1, 2007-01-29 17:39:26+04:00, holyfoot@mysql.com +1 -1
    pthread_self() can be used here as we use pointer to thread
    when we need to identify the thread exactly

  sql/item_func.cc@1.349.1.1, 2007-01-29 17:39:26+04:00, holyfoot@mysql.com +10 -4
    now we use pthread_t value for thread identification in 'standalone'
    server only, in the embedded server we can use the pointer to THD
    structure

ChangeSet@1.1616.2959.1, 2007-01-29 14:31:48+01:00, msvensson@pilot.mysql.com +11 -0
  Bug#22943 syscall pruning in libmysql
   - Set the timeout values only where needed

  sql-common/client.c@1.46.1.50, 2007-01-29 14:31:47+01:00, msvensson@pilot.mysql.com +7 -1
    Call 'vio_timeout' to set up the read and write timeout's for the
    newly created connection. It only need to be done once at connect time. 

  sql/mysql_priv.h@1.186.109.2, 2007-01-29 14:31:45+01:00, msvensson@pilot.mysql.com +2 -0
    Add new functions for setting read and write timeout on "net"

  sql/mysqld.cc@1.356.111.1, 2007-01-29 14:31:45+01:00, msvensson@pilot.mysql.com +2 -8
    - Move the setting of "read_timeout" to the value of "connect_timeout" to
      just before 'check_connection' which is the function where we want
      to use the different timeout
    - With the new functions to set timeout on "net", there is no need to
      specifically set the default wait_timeout on windows.

  sql/net_serv.cc@1.63.1.15, 2007-01-29 14:31:45+01:00, msvensson@pilot.mysql.com +25 -2
    Add new functions for setting read and write timeout of "net, when
    server is compiled not to use alarms it will set the write/read timeout
    directly on connection using 'vio_timeout'(using setsockopt if socket)

  sql/repl_failsafe.cc@1.32.1.31, 2007-01-29 14:31:46+01:00, msvensson@pilot.mysql.com +6 -3
    Put unused code within "#if NOT_USED"

  sql/set_var.cc@1.34.70.1, 2007-01-29 14:31:46+01:00, msvensson@pilot.mysql.com +2 -2
    Use 'net_set_*_timeout' when adjusting timeout value
    on the current connection

  sql/slave.cc@1.188.20.1, 2007-01-29 14:31:46+01:00, msvensson@pilot.mysql.com +0 -1
    The read timeout used when connecting to master server is set
    using 'mysql_options' in 'connect_to_master' function

  sql/sql_parse.cc@1.271.131.2, 2007-01-29 14:31:46+01:00, msvensson@pilot.mysql.com +25 -12
    - Set read and write timeout values to "connect_timeout" during
    connect phase
    - Use "read_timeout" value during sslaccept phase, since this is during
    connect phase it implies "connect-timeout"
    - Set read and write timeout value back to default after connect phase
    - Set "read_timeout" to "wait_timeout" while waiting for client.

  sql/sql_repl.cc@1.102.1.39, 2007-01-29 14:31:46+01:00, msvensson@pilot.mysql.com +3 -3
    Set "read_timeout" to "wait_timeout" while ask other mysqld to send file

  vio/vio.c@1.19.1.7, 2007-01-29 14:31:47+01:00, msvensson@pilot.mysql.com +1 -1
    Use 'vio_timeout' for setting timeout also on an SSL connection
    since they both use sockets

  vio/viossl.c@1.22.1.7, 2007-01-29 14:31:47+01:00, msvensson@pilot.mysql.com +0 -11
    Remove 'vio_ssl_timeout' function

ChangeSet@1.2411.2.1, 2007-01-29 15:26:27+04:00, holyfoot@mysql.com +1 -0
  bug #25890 (mysqltest_embedded crashes on start)
  
  binlog_filter and rpl_filter are initialized in server's 'main' function
  which doesn't work in the embedded server. So this code moved to
  function working in both cases.

  sql/mysqld.cc@1.610.1.1, 2007-01-29 15:26:25+04:00, holyfoot@mysql.com +8 -8
    rpl_filter/binlog_filter initializations moved to
    init_common_variables() function.
    That will be called by both 'standalone' and 'embedded' servers

ChangeSet@1.1810.2541.1, 2007-01-29 12:24:08+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#19474 readline bug: mysql: free(): invalid pointer
   - Write to uninitialised memory occured since _rl_rapped_lines buffer
     was not extended in CHECK_INV_LBREAKS macro
   - Patch submitted to bug-readline@gnu.org

  cmd-line-utils/readline/display.c@1.15.1.1, 2007-01-29 12:24:06+01:00, msvensson@pilot.mysql.com +12 -0
    Extend _rl_wrapped_lines everytime inv_lbsize is increased

ChangeSet@1.1616.2958.1, 2007-01-29 11:48:31+04:00, holyfoot@mysql.com +1 -0
  bug #25492 (Invalid deallocation in mysql_stmt_fetch)
  Operating with the prepared statements we don't alloc MYSQL_DATA structure,
  but use MYSQL_STMT's field instead (to increase performance by reducing
  malloc calls).
  So we shouldn't free this structure as we did before.

  libmysqld/lib_sql.cc@1.75.1.61, 2007-01-29 11:48:30+04:00, holyfoot@mysql.com +1 -1
    we only should free data->alloc here, as the 'data' is a member
    of STMT structure

ChangeSet@1.2403.1.3, 2007-01-29 01:47:35+02:00, monty@mysql.com +67 -0
  After merge fixes
  Removed a lot of compiler warnings
  Removed not used variables, functions and labels
  Initialize some variables that could be used unitialized (fatal bugs)
  %ll -> %l

  BUILD/SETUP.sh@1.67.1.2, 2007-01-29 01:47:29+02:00, monty@mysql.com +6 -0
    ccache now works again

  BUILD/compile-pentium-gcov@1.20, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -0
    Added marker that we are using gcov and need special version of ccache

  BitKeeper/etc/ignore@1.270.2.2, 2007-01-28 20:31:50+02:00, monty@mysql.com +1 -0
    added storage/archive/archive_reader

  client/mysql_upgrade.c@1.26, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    after merge fixes

  client/mysqlbinlog.cc@1.147, 2007-01-29 01:47:29+02:00, monty@mysql.com +3 -2
    after merge fixes

  client/mysqldump.c@1.266, 2007-01-29 01:47:29+02:00, monty@mysql.com +3 -3
    Removed compiler warnings

  client/mysqlimport.c@1.81, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    Removed compiler warnings

  client/mysqltest.c@1.267, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    Removed compiler warnings

  mysql-test/t/mysqlcheck.test@1.8, 2007-01-29 01:47:29+02:00, monty@mysql.com +6 -11
    After merge fixes

  mysys/my_bitmap.c@1.45, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    After merge fix

  sql/event_data_objects.cc@1.84, 2007-01-29 01:47:29+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/event_db_repository.cc@1.21, 2007-01-29 01:47:29+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/event_queue.cc@1.23, 2007-01-29 01:47:29+02:00, monty@mysql.com +0 -2
    Removed not used variable

  sql/field.cc@1.370, 2007-01-29 01:47:29+02:00, monty@mysql.com +7 -7
    After merge fixes

  sql/filesort.cc@1.124, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    Added missing initialization (could cause core dump on EOM)

  sql/ha_ndbcluster.cc@1.396.2.2, 2007-01-29 01:47:29+02:00, monty@mysql.com +136 -146
    After merge fixes
    Removed not used variables
    false-> FALSE
    true -> TRUE
    %llu -> %lu (portability fix)
    Fixed bug where field could be used unitialized in build_scan_filter_predicate() 

  sql/ha_ndbcluster_binlog.cc@1.96, 2007-01-29 01:47:29+02:00, monty@mysql.com +1 -1
    Removed not used label

  sql/ha_partition.cc@1.81.1.1, 2007-01-29 01:47:29+02:00, monty@mysql.com +0 -7
    Removed not used variables

  sql/handler.cc@1.293, 2007-01-29 01:47:30+02:00, monty@mysql.com +2 -5
    Removed not used variable & function

  sql/item.cc@1.230.3.2, 2007-01-29 01:47:30+02:00, monty@mysql.com +1 -1
    After merge fixes

  sql/item_cmpfunc.cc@1.234.2.2, 2007-01-29 01:47:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/item_func.cc@1.347.1.2, 2007-01-29 01:47:30+02:00, monty@mysql.com +2 -2
    Removed compiler warning

  sql/item_xmlfunc.cc@1.25, 2007-01-29 01:47:30+02:00, monty@mysql.com +0 -4
    Removed not used variables & declarations

  sql/log.cc@1.255, 2007-01-29 01:47:30+02:00, monty@mysql.com +8 -21
    Removed compiler warnings
    Removed not used variables & label

  sql/log.h@1.22, 2007-01-29 01:47:30+02:00, monty@mysql.com +4 -4
    After merge fixes

  sql/log_event.cc@1.265, 2007-01-29 01:47:30+02:00, monty@mysql.com +0 -17
    Removed not used variable & function

  sql/mysqld.cc@1.607.3.2, 2007-01-29 01:47:30+02:00, monty@mysql.com +3 -1
    After merge fixes

  sql/opt_range.cc@1.255.1.6, 2007-01-29 01:47:30+02:00, monty@mysql.com +1 -4
    Removed not used declaration

  sql/partition_info.cc@1.34, 2007-01-29 01:47:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/protocol.cc@1.124, 2007-01-29 01:47:30+02:00, monty@mysql.com +2 -2
    Removed compiler warnings

  sql/set_var.cc@1.213, 2007-01-29 01:47:30+02:00, monty@mysql.com +0 -2
    Removed not used variable

  sql/set_var.h@1.99, 2007-01-29 01:47:31+02:00, monty@mysql.com +5 -5
    After merge fix

  sql/slave.cc@1.304, 2007-01-29 01:47:31+02:00, monty@mysql.com +1 -0
    After merge fixes

  sql/slave.h@1.104, 2007-01-29 01:47:31+02:00, monty@mysql.com +0 -2
    Moved wrong declaration to slave.cc

  sql/sp.cc@1.138, 2007-01-29 01:47:31+02:00, monty@mysql.com +1 -1
    Fixed format of DBUG_PRINT

  sql/sp_head.cc@1.252, 2007-01-29 01:47:31+02:00, monty@mysql.com +0 -1
    After merge fixes

  sql/spatial.cc@1.32, 2007-01-29 01:47:31+02:00, monty@mysql.com +2 -0
    Added DBUG_ASSERT() to verify that LINT_INIT is right

  sql/sql_class.cc@1.308.1.2, 2007-01-29 01:47:31+02:00, monty@mysql.com +4 -7
    Removed not used variables

  sql/sql_insert.cc@1.239.4.2, 2007-01-29 01:47:31+02:00, monty@mysql.com +4 -3
    After merge fixes

  sql/sql_parse.cc@1.619.1.2, 2007-01-29 01:47:31+02:00, monty@mysql.com +1 -1
    Removed not used variable
    After merge fixes

  sql/sql_partition.cc@1.99, 2007-01-29 01:47:31+02:00, monty@mysql.com +0 -5
    Removed not used variables

  sql/sql_plugin.cc@1.42.1.1, 2007-01-29 01:47:31+02:00, monty@mysql.com +11 -0
    Removed compiler warnings when compiling embedded server
    

  sql/sql_servers.cc@1.5, 2007-01-29 01:47:31+02:00, monty@mysql.com +3 -8
    Removed not used variables
    Moved wrong placed calle to use_all_columns()

  sql/sql_servers.h@1.4, 2007-01-29 01:47:31+02:00, monty@mysql.com +0 -1
    Moved declaration to right sql_servers.cc

  sql/sql_show.cc@1.386.2.2, 2007-01-29 01:47:31+02:00, monty@mysql.com +6 -6
    Removed not used variables and function
    After merge fixes

  sql/sql_table.cc@1.382.1.3, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/sql_yacc.yy@1.533.1.2, 2007-01-29 01:47:32+02:00, monty@mysql.com +5 -8
    Removed not used variables
    Lex -> lex

  sql/table.cc@1.264.1.6, 2007-01-29 01:47:32+02:00, monty@mysql.com +1 -1
    Indentation fix

  storage/archive/ha_archive.cc@1.122.1.2, 2007-01-29 01:47:32+02:00, monty@mysql.com +9 -8
    After merge fixes

  storage/example/ha_example.cc@1.52, 2007-01-29 01:47:32+02:00, monty@mysql.com +176 -90
    Indentation fixes

  storage/federated/ha_federated.cc@1.93.1.5, 2007-01-29 01:47:32+02:00, monty@mysql.com +2 -7
    Removed not used variables

  storage/myisam/mi_rkey.c@1.30, 2007-01-29 01:47:32+02:00, monty@mysql.com +1 -1
    Added 0x before address

  storage/myisammrg/ha_myisammrg.cc@1.113, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -3
    Removed old declaration

  storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp@1.8, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -3
    After merge fixes

  storage/ndb/include/util/SimpleProperties.hpp@1.14, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -1
    After merge fixes

  storage/ndb/src/common/debugger/EventLogger.cpp@1.30.1.3, 2007-01-29 01:47:32+02:00, monty@mysql.com +2 -0
    Removed not used function

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.55, 2007-01-29 01:47:32+02:00, monty@mysql.com +12 -6
    Removed compiler warnings
    Removed not used variables

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.118, 2007-01-29 01:47:32+02:00, monty@mysql.com +8 -3
    After merge fixes
    Removed not used variables

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.159, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -3
    Removed not used varibles.

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.76.1.1, 2007-01-29 01:47:32+02:00, monty@mysql.com +4 -2
    Removed not used variables

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.27, 2007-01-29 01:47:32+02:00, monty@mysql.com +1 -7
    Removed not used variables and label

  storage/ndb/src/ndbapi/NdbOperationSearch.cpp@1.35, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -4
    Removed not used label

  storage/ndb/src/ndbapi/SignalSender.cpp@1.12, 2007-01-29 01:47:32+02:00, monty@mysql.com +2 -0
    Removed not used function

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.58, 2007-01-29 01:47:32+02:00, monty@mysql.com +2 -2
    Removed not used variables

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp@1.49, 2007-01-29 01:47:32+02:00, monty@mysql.com +2 -0
    Moved static declaration from header file

  storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp@1.10, 2007-01-29 01:47:32+02:00, monty@mysql.com +0 -1
    Moved static declaration from header file

  support-files/compiler_warnings.supp@1.3, 2007-01-29 01:47:32+02:00, monty@mysql.com +4 -0
    Remove some warnings from ndb

ChangeSet@1.2343.10.32, 2007-01-28 21:56:17+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Fix so that node version is recomputed at node failure

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.42.1.7, 2007-01-28 21:56:14+01:00, jonas@perch.ndb.mysql.com +2 -0
    Fix so that node version is recomputed at node failure

ChangeSet@1.1810.2524.9, 2007-01-26 17:10:45-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #24420.
  Objects of the classes Item_func_is_not_null_test and Item_func_trig_cond
  must be transparent for the method Item::split_sum_func2 as these classes
  are pure helpers. It means that the method Item::split_sum_func2 should
  look at those objects as at pure wrappers.

  mysql-test/r/subselect3.result@1.1.1.3, 2007-01-26 17:10:42-08:00, igor@olga.mysql.com +16 -0
    Added a test case for bug #24420.
    

  mysql-test/t/subselect3.test@1.5, 2007-01-26 17:10:42-08:00, igor@olga.mysql.com +17 -0
    Added a test case for bug #24420.

  sql/item.cc@1.113.62.7, 2007-01-26 17:10:43-08:00, igor@olga.mysql.com +4 -1
    Fixed bug #24420.
    Objects of the classes Item_func_is_not_null_test and Item_func_trig_cond
    must be transparent for the method Item::split_sum_func2 as these classes
    are pure helpers. It means that the method Item::split_sum_func2 should
    look at those objects as at pure wrappers.

ChangeSet@1.2403.2.6, 2007-01-26 15:36:39-08:00, brian@zim.(none) +6 -0
  Two things:
  1) Two small windows cleanups for Archive.
  2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world. 

  include/mysql/plugin.h@1.26, 2007-01-26 15:36:36-08:00, brian@zim.(none) +19 -1
    Added new I_S type. 

  mysql-test/r/archive.result@1.29, 2007-01-26 15:36:36-08:00, brian@zim.(none) +1 -1
    Fixed not dropped table. 

  mysql-test/t/archive.test@1.30, 2007-01-26 15:36:36-08:00, brian@zim.(none) +1 -1
    Added additional drop table

  sql/sql_plugin.cc@1.43, 2007-01-26 15:36:36-08:00, brian@zim.(none) +16 -5
    Adding support in for the I_S. 

  sql/sql_show.cc@1.386.1.1, 2007-01-26 15:36:36-08:00, brian@zim.(none) +147 -4
    Added schema type for plugin I_S. Additional loops were added to pop these on to the end of requests. 

  storage/archive/ha_archive.cc@1.127, 2007-01-26 15:36:36-08:00, brian@zim.(none) +2 -2
    Windwos typo

ChangeSet@1.2403.2.5, 2007-01-26 14:17:45-08:00, brian@zim.(none) +3 -0
  For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.

  mysql-test/r/archive.result@1.28, 2007-01-26 14:17:42-08:00, brian@zim.(none) +1 -1
    Modified error output

  mysql-test/t/archive.test@1.29, 2007-01-26 14:17:42-08:00, brian@zim.(none) +1 -0
    Fix for the change in behavior

  storage/archive/ha_archive.cc@1.126, 2007-01-26 14:17:42-08:00, brian@zim.(none) +5 -5
    ifdef of the search record code

ChangeSet@1.1810.2372.72, 2007-01-26 12:17:50-08:00, mtaylor@qualinost.(none) +1 -0
  Reverting change adding /etc/mysql support, as it breaks some installs.

  mysys/default.c@1.72.4.5, 2007-01-26 12:17:48-08:00, mtaylor@qualinost.(none) +4 -6
    Reverting change adding /etc/mysql support, as it breaks some installs.

ChangeSet@1.1616.2938.19, 2007-01-26 12:00:38-08:00, mtaylor@qualinost.(none) +2 -0
  User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 

  mysys/default.c@1.43.1.9, 2007-01-26 12:00:37-08:00, mtaylor@qualinost.(none) +0 -1
    User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 

  scripts/mysqld_multi.sh@1.21.4.1, 2007-01-26 12:00:37-08:00, mtaylor@qualinost.(none) +0 -8
    User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 

ChangeSet@1.1810.2540.1, 2007-01-26 14:47:12-05:00, cmiller@zippy.cornsilk.net +3 -0
  Bug #25879: THD::options isn't set with ulonglong values and \
  	variables
  
  Bits higher than 2**31 were impossible to set on THD::options.  It's
  probably a remnant from a time when options was a 32-bit integer.
  
  Now, use unsigned long-long constants and variables to set and clear
  THD::options.
  ---
  Pulled comments back to column 49.

  BitKeeper/etc/collapsed@1.5.7.1, 2007-01-26 14:46:34-05:00, cmiller@zippy.cornsilk.net +2 -0

  sql/mysql_priv.h@1.290.86.1, 2007-01-26 14:47:10-05:00, cmiller@zippy.cornsilk.net +39 -33
    THD::options is an ulonglong, so we should define our bit constants 
    that way.
    ---
    Pulled comments back to column 49.

  sql/set_var.h@1.68.4.3, 2007-01-26 14:47:10-05:00, cmiller@zippy.cornsilk.net +2 -2
    THD::options is a ulonglong, and we if we're going to set bits higher
    than 2**31, then we must treat the bitmasks as a 64-bit number.

ChangeSet@1.2403.7.2, 2007-01-26 11:15:16-08:00, brian@zim.(none) +3 -0
  This fixes a bug in show create table displaying auto_increment field when it should not.
  It also refactors the test case for Archive (removed two bad tests).

  mysql-test/r/archive.result@1.27, 2007-01-26 11:15:13-08:00, brian@zim.(none) +77 -48
    refactor archive test

  mysql-test/t/archive.test@1.28, 2007-01-26 11:15:13-08:00, brian@zim.(none) +44 -29
    Large  refactoring of Archive test

  storage/archive/ha_archive.cc@1.125, 2007-01-26 11:15:13-08:00, brian@zim.(none) +12 -35
    Updated comments.
    Added NULL packing hack
    Fixed bug in wrong display of auto increment in show create table

ChangeSet@1.2403.7.1, 2007-01-26 10:17:53-08:00, brian@zim.(none) +2 -0
  Fixed a warning. Added the -A option so that the autoincrement could be set outside of the file.

  storage/archive/archive_reader.c@1.7, 2007-01-26 10:17:50-08:00, brian@zim.(none) +41 -5
    Add option to autoincrement file.

  storage/archive/ha_archive.cc@1.124, 2007-01-26 10:17:50-08:00, brian@zim.(none) +2 -2
    Fixed warning

ChangeSet@1.1810.2535.3, 2007-01-26 11:34:56+01:00, msvensson@shellback.(none) +1 -0
  Bug#19209 Test 'rpl_openssl' hangs on Windows
   - Remove the hack to not run it on windows

  mysql-test/t/rpl_openssl.test@1.11.1.9, 2007-01-26 11:34:54+01:00, msvensson@shellback.(none) +0 -4
    Run on all platforms

ChangeSet@1.1810.2535.2, 2007-01-26 11:30:54+01:00, msvensson@shellback.(none) +3 -0
  Bug#25203 Mysql crashes when mysql_kill() is executed in a connection using SSL
   - It's too early to free the SSL object in 'vio_ssl_close'. There
     might still be a thread using or reading from it on platforms
     where we need to close the active connection/socket in order
     to break the read.  
   - Add new function 'vio_ssl_delete' and install it as the viodelete
     function for SSL connections.

  vio/vio.c@1.28.2.2, 2007-01-26 11:30:51+01:00, msvensson@shellback.(none) +9 -10
    Install 'vio_ssl_delete' as viodelete function for SSL connections
    Cleanup 'vio_delete'

  vio/vio_priv.h@1.8, 2007-01-26 11:30:51+01:00, msvensson@shellback.(none) +1 -0
    Add declaration of vio_ssl_delete

  vio/viossl.c@1.34.2.7, 2007-01-26 11:30:51+01:00, msvensson@shellback.(none) +18 -2
    Add new function 'vio_ssl_delete' that takes care of freeing the memory
    allocated by the SSL connection
    Move the code to free the SSL object from vio_ssl_close

ChangeSet@1.1810.2530.6, 2007-01-25 22:50:48-08:00, igor@olga.mysql.com +1 -0
  Post merge fix

  sql/item_subselect.cc@1.113.1.38, 2007-01-25 22:50:46-08:00, igor@olga.mysql.com +2 -0
    Post merge fix

ChangeSet@1.1616.2924.13, 2007-01-25 18:44:35-08:00, igor@olga.mysql.com +10 -0
  Fixed bug #24653.
  The bug report has demonstrated the following two problems.
  1. If an ORDER/GROUP BY list includes a constant expression being 
  optimized away and, at the same time, containing single-row
  subselects that return more that one row, no error is reported.
  Strictly speaking the standard allows to ignore error in this case.
  Yet, now a corresponding fatal error is reported in this case.
  2. If a query requires sorting by expressions containing single-row
  subselects that, however, return more than one row, then the execution
  of the query may cause a server crash. 
  To fix this some code has been added that blocks execution of a subselect
  item in case of a fatal error in the method Item_subselect::exec.

  mysql-test/r/subselect.result@1.67.1.120, 2007-01-25 18:44:31-08:00, igor@olga.mysql.com +74 -0
    Added a test cases for bug #24653.

  mysql-test/t/subselect.test@1.58.1.106, 2007-01-25 18:44:31-08:00, igor@olga.mysql.com +59 -0
    Added a test cases for bug #24653.

  sql/filesort.cc@1.70.1.25, 2007-01-25 18:44:31-08:00, igor@olga.mysql.com +5 -1
    Fixed bug #24653.
    Added a check for fatal error after reading the next row from the table
    in the function find_all_keys.

  sql/item.cc@1.58.78.1, 2007-01-25 18:44:31-08:00, igor@olga.mysql.com +1 -0
    Fixed bug #24653.
    Down-ported calculation of the attribute with_subselect of for Item objects.

  sql/item.h@1.56.1.141, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +3 -0
    Fixed bug #24653.
    Down-ported calculation of the attribute with_subselect of for Item objects.

  sql/item_cmpfunc.cc@1.111.23.15, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +4 -3
    Fixed bug #24653.
    Down-ported calculation of the attribute with_subselect of for Item objects.

  sql/item_cmpfunc.h@1.73.1.47, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +2 -1
    Fixed bug #24653.
    Down-ported calculation of the attribute with_subselect of for Item objects.

  sql/item_func.cc@1.124.53.2, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +1 -0
    Fixed bug #24653.
    Down-ported calculation of the attribute with_subselect of for Item objects.

  sql/item_subselect.cc@1.60.1.88, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +4 -0
    Fixed bug #24653.
    Added a check for fatal error in the method Item_subselect::exec
    to block evaluation of subselects in erroneous situations.
    Down-ported calculation of the attribute with_subselect of for Item objects. 

  sql/sql_select.cc@1.216.125.17, 2007-01-25 18:44:32-08:00, igor@olga.mysql.com +21 -0
    Fixed bug #24653.
    Added a check to verify that any constant expression used
    in ORDER BY and/or GROUP BY lists which is optimized away
    does not contain subselects returning more than one row.
    If it does a fatal error is reported.

ChangeSet@1.2403.2.2, 2007-01-25 18:43:40-08:00, brian@zim.(none) +2 -0
  Made the example actually do something :)
  
  It now demonstrates creating its own thread and shows off how to clean up after itself (creates a really simple heartbeat file)

  plugin/daemon_example/Makefile.am@1.3, 2007-01-25 18:43:36-08:00, brian@zim.(none) +5 -3
    Added additional include

  plugin/daemon_example/daemon_example.cc@1.4, 2007-01-25 18:43:36-08:00, brian@zim.(none) +112 -5
    Created heart beat code. 

  plugin/daemon_example/daemon_example.cc@1.3, 2007-01-24 13:13:29-08:00, brian@zim.(none) +0 -0
    Rename: plugin/daemon_example/daemon_example.c -> plugin/daemon_example/daemon_example.cc

ChangeSet@1.1346.891.2, 2007-01-25 20:10:31+02:00, jani@ua141d10.elisa.omakaista.fi +8 -0
  Cleanup of thread-type (linuxthread or NTPL) detection code
  Move get_thread_lib to mysys/my_pthread.c
  Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
  

  include/my_global.h@1.34.1.43, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +1 -4
    Fixed to be same as in 5.1

  include/my_pthread.h@1.57.1.11, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +8 -8
    Move things around to be more in line with rest of code

  include/thr_alarm.h@1.13.1.5, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    extern of thr_client_alarm

  mysys/default.c@1.17.1.21, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Fixed two wrong pointer incrementations.

  mysys/my_pthread.c@1.35.1.6, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +3 -1
    Cleanup: Use variable thr_client_alarm

  mysys/my_thr_init.c@1.21.1.5, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +20 -0
    Detect thread library at startup

  mysys/thr_alarm.c@1.41.1.2, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +13 -13
    Set thr_client_alarm depending on which thread library we are using

  sql/mysqld.cc@1.297.52.10, 2007-01-25 20:10:30+02:00, jani@ua141d10.elisa.omakaista.fi +9 -25
    Move get_thread_lib to mysys/my_pthread.c

ChangeSet@1.2403.3.6, 2007-01-25 18:19:49+01:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.1.15-beta

  configure.in@1.420.3.1, 2007-01-25 18:19:42+01:00, dfischer@mysql.com +1 -1
    Raise version number after cloning 5.1.15-beta

ChangeSet@1.1810.2502.5, 2007-01-25 17:51:21+01:00, joerg@trift2. +5 -0
  For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
  additional files that specify some actions which are allowed to the MySQL binaries.
      
  Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
  
  This fixes bug#12676.

  configure.in@1.245.74.2, 2007-01-25 17:51:18+01:00, joerg@trift2. +2 -1
    New "support-files/RHEL4-SElinux/Makefile.am" must be processed by "automake" etc.

  support-files/Makefile.am@1.34, 2007-01-25 17:51:18+01:00, joerg@trift2. +2 -2
    For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
    additional files that specify some actions which are allowed to the MySQL binaries.
    
    Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.

  support-files/RHEL4-SElinux/Makefile.am@1.1, 2007-01-25 17:51:18+01:00, joerg@trift2. +23 -0
    BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/Makefile.am

  support-files/RHEL4-SElinux/Makefile.am@1.0, 2007-01-25 17:51:18+01:00, joerg@trift2. +0 -0

  support-files/RHEL4-SElinux/mysql.fc@1.1, 2007-01-25 17:51:18+01:00, joerg@trift2. +25 -0
    BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.fc

  support-files/RHEL4-SElinux/mysql.fc@1.0, 2007-01-25 17:51:18+01:00, joerg@trift2. +0 -0

  support-files/RHEL4-SElinux/mysql.te@1.1, 2007-01-25 17:51:18+01:00, joerg@trift2. +132 -0
    BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.te

  support-files/RHEL4-SElinux/mysql.te@1.0, 2007-01-25 17:51:18+01:00, joerg@trift2. +0 -0

ChangeSet@1.1810.2539.1, 2007-01-25 08:46:07+01:00, df@kahlann.erinye.com +2 -0
  BUG#25530 --with-readline fails with commercial source packages

  BUILD/SETUP.sh@1.44.3.1, 2007-01-25 08:46:04+01:00, df@kahlann.erinye.com +10 -1
    BUG#25530 --with-readline fails with commercial source packages
    
    The compile-* scripts should not use --with-readline explicitly when no readline is present.

  configure.in@1.245.1.177, 2007-01-25 08:46:04+01:00, df@kahlann.erinye.com +15 -2
    BUG#25530 --with-readline fails with commercial source packages
    
    Configuring --with-readline should fail when libreadline is not bundled.
    A system libreadline is only used when there is a bundled libreadline too, so the commercial source code isn't linked with GPL libreadline by accident.

ChangeSet@1.2401.1.7, 2007-01-25 10:00:09+03:00, sergefp@mysql.com +3 -0
  BUG#24127: merge: update tests results

  mysql-test/r/ndb_subquery.result@1.7, 2007-01-25 10:00:05+03:00, sergefp@mysql.com +2 -2
    BUG#24127: merge: update tests results

  mysql-test/r/subselect.result@1.163, 2007-01-25 10:00:05+03:00, sergefp@mysql.com +15 -15
    BUG#24127: merge: update tests results

  mysql-test/r/subselect3.result@1.4, 2007-01-25 10:00:05+03:00, sergefp@mysql.com +27 -26
    BUG#24127: merge: update tests results

ChangeSet@1.1810.2537.3, 2007-01-25 02:27:28+03:00, sergefp@mysql.com +1 -0
  BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...):
  Fixed typo problem that surfaced after the merge

  sql/sql_select.cc@1.312.1.173, 2007-01-25 02:27:26+03:00, sergefp@mysql.com +2 -2
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...):
    Fixed typo problem that surfaced after the merge

ChangeSet@1.2372.4.7, 2007-01-24 14:40:39-07:00, malff@weblab.(none) +4 -0
  Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)
  
  The build scripts in general, using automake, autoconf, etc, contain several
  special commands and work around all related to the way the bison code in the
  parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
  time during development, ultimately cause the build scripts to be unstable
  and cause build defects by not enforcing dependencies.
  
  This fix simplifies the build process and aligns it with the automake tooling,
  which provides native support for bison and *.yy files.
  
  In particular, the following problem have been fixed:
  - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
    corrupted builds,
  - the work around introduced by Bug 24557, to cleanup the generated files
    sql_yacc.h and sql_yacc.cc, has been removed,
  - the generated makefile, in a source distribution, used to destroy the files
    sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
    these files are now removed by make maintainer-clean.
  - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
    clearly documented, and the "sed" hack has been replaced by a cleaner
    work around, when building the code with bison 1.875.
  - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
  - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
    the compiling option DBUG_OFF takes precedence when setting YYDEBUG.

  BitKeeper/deleted/.del-sql_yacc.yy.bak@1.3, 2007-01-24 14:39:20-07:00, malff@weblab.(none) +0 -0
    Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak

  Makefile.am@1.106.1.3, 2007-01-24 14:40:37-07:00, malff@weblab.(none) +0 -8
    General cleanup of the build process for sql_yacc.yy

  sql/Makefile.am@1.170.1.1, 2007-01-24 14:40:37-07:00, malff@weblab.(none) +6 -22
    General cleanup of the build process for sql_yacc.yy

  sql/sql_yacc.yy@1.529.1.1, 2007-01-24 14:40:37-07:00, malff@weblab.(none) +22 -0
    General cleanup of the build process for sql_yacc.yy

ChangeSet@1.1810.2537.2, 2007-01-24 22:23:50+03:00, sergefp@mysql.com +3 -0
  BUG#24127: merge fixes: If subselect is a union, dont allocate several 
  identical pushed_cond_guards arrays. Allocate only one always.

  mysql-test/r/subselect.result@1.134.1.37, 2007-01-24 22:23:47+03:00, sergefp@mysql.com +3 -3
    BUG#24127: merge

  mysql-test/t/subselect3.test@1.4, 2007-01-24 22:23:47+03:00, sergefp@mysql.com +0 -1
    BUG#24127: merge

  sql/item_subselect.cc@1.113.1.36, 2007-01-24 22:23:47+03:00, sergefp@mysql.com +2 -2
    BUG#24127: merge fixes: If subselect is a union, dont allocate several 
    identical pushed_cond_guards arrays. Allocate only one always.

ChangeSet@1.1810.2534.4, 2007-01-24 22:11:27+03:00, dlenev@mockturtle.local +1 -0
  Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
  the team tree for additional investigation.

  mysql-test/t/disabled.def@1.2.4.21, 2007-01-24 22:11:25+03:00, dlenev@mockturtle.local +1 -0
    Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
    the team tree for additional investigation.

ChangeSet@1.2395.2.1, 2007-01-24 10:30:06-08:00, brian@zim.(none) +5 -0
  This patch passes comment to be embedded in ARZ.
  Fixes autodiscovery of tables. 
  Allows the FRM to be extracted from the ARZ file via archive_reader. 

  storage/archive/archive_reader.c@1.6, 2007-01-24 10:30:03-08:00, brian@zim.(none) +50 -1
    Extract FRM command added.
    We now print the embedded comment

  storage/archive/archive_test.c@1.10, 2007-01-24 10:30:03-08:00, brian@zim.(none) +25 -3
    Additional tests for FRM annd comment

  storage/archive/azio.c@1.15, 2007-01-24 10:30:03-08:00, brian@zim.(none) +81 -4
    Filled in functionality for comment and frm.

  storage/archive/azlib.h@1.10, 2007-01-24 10:30:03-08:00, brian@zim.(none) +24 -10
    Refactored position.

  storage/archive/ha_archive.cc@1.123, 2007-01-24 10:30:04-08:00, brian@zim.(none) +98 -23
    Discovery mechanism filled in. 

ChangeSet@1.2401.1.3, 2007-01-24 20:11:36+04:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/t/view.test@1.177.1.2, 2007-01-24 20:11:34+04:00, gluh@mysql.com +14 -17
    after merge fix

ChangeSet@1.2389.1.5, 2007-01-24 15:55:16+02:00, gkodinov@macbook.gmz +7 -0
  merge of 5.0-opt -> 5.1-opt

  mysql-test/r/func_in.result@1.32.1.2, 2007-01-24 15:54:58+02:00, gkodinov@macbook.gmz +3 -46
    merge of 5.0-opt -> 5.1-opt

  mysql-test/r/func_str.result@1.136, 2007-01-24 15:54:59+02:00, gkodinov@macbook.gmz +6 -6
    merge of 5.0-opt -> 5.1-opt

  mysql-test/r/range.result@1.51.1.2, 2007-01-24 15:55:00+02:00, gkodinov@macbook.gmz +1 -1
    merge of 5.0-opt -> 5.1-opt

  mysql-test/r/view.result@1.194.2.2, 2007-01-24 15:55:01+02:00, gkodinov@macbook.gmz +44 -10
    merge of 5.0-opt -> 5.1-opt

  mysql-test/t/func_in.test@1.24.1.2, 2007-01-24 15:55:01+02:00, gkodinov@macbook.gmz +36 -34
    merge of 5.0-opt -> 5.1-opt

  sql/item_strfunc.cc@1.308, 2007-01-24 15:55:02+02:00, gkodinov@macbook.gmz +0 -13
    merge of 5.0-opt -> 5.1-opt

  sql/item_strfunc.h@1.125, 2007-01-24 15:55:03+02:00, gkodinov@macbook.gmz +0 -4
    merge of 5.0-opt -> 5.1-opt

ChangeSet@1.1810.2535.1, 2007-01-24 16:45:30+03:00, kaa@polly.local +2 -0
  Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"

  mysql-test/r/grant.result@1.37.1.24, 2007-01-24 16:45:25+03:00, kaa@polly.local +2 -0
    Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"

  mysql-test/t/grant.test@1.41.1.10, 2007-01-24 16:45:26+03:00, kaa@polly.local +12 -0
    Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"

ChangeSet@1.2389.3.2, 2007-01-24 14:49:36+04:00, holyfoot@mysql.com +9 -0
  bug #22682 Test fails --without-geometry
  geometry dependent parts moved to proper .test files

  BitKeeper/etc/ignore@1.268.1.1, 2007-01-24 14:49:35+04:00, holyfoot@mysql.com +1 -0
    Added libmysqld/sql_servers.cc to the ignore list

  mysql-test/r/gis.result@1.41, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +11 -0
    result fixed

  mysql-test/r/innodb.result@1.183.1.1, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +0 -2
    result fixed

  mysql-test/r/innodb_gis.result@1.8, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +2 -0
    result fixed

  mysql-test/r/view.result@1.194.3.1, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +0 -11
    result fixed

  mysql-test/t/gis.test@1.33, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +10 -0
    HAVE_GEOMETRY dependent part moved here from view.test

  mysql-test/t/innodb.test@1.153.2.1, 2007-01-24 14:49:34+04:00, holyfoot@mysql.com +0 -6
    HAVE_GEOMETRY dependent part moved to innodb_gis.test

  mysql-test/t/innodb_gis.test@1.3, 2007-01-24 14:49:35+04:00, holyfoot@mysql.com +6 -0
    HAVE_GEOMETRY dependent part moved here from innodb.test

  mysql-test/t/view.test@1.175.4.1, 2007-01-24 14:49:35+04:00, holyfoot@mysql.com +0 -9
    HAVE_GEOMETRY dependent part moved to gis.test

ChangeSet@1.2390.7.10, 2007-01-24 10:46:25+03:00, dlenev@mockturtle.local +1 -0
  Fixed test case after merging fix for bug#24491 "using alias from source
  table in insert ... on duplicate key" in 5.1 tree.

  mysql-test/t/sp-error.test@1.115.1.2, 2007-01-24 10:46:23+03:00, dlenev@mockturtle.local +32 -31
    After merge fix.

ChangeSet@1.1616.2955.1, 2007-01-24 09:41:40+07:00, tomas@poseidon.mysql.com +1 -0
  Bug#25668 mysqld may core if cluster disconnected
  - recommit in 4.1

  sql/ha_ndbcluster.cc@1.114.3.79, 2007-01-24 09:41:35+07:00, tomas@poseidon.mysql.com +1 -1
    Bug#25668 mysqld may core if cluster disconnected
    - recommit in 4.1

ChangeSet@1.2343.10.31, 2007-01-23 19:27:55+01:00, jonas@eel.(none) +5 -0
  ndb - bug#25794
    Fix read after delete (in same op)
    - lqh, handling of attrinfo
    - tup, setup read for disk/varchar

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.128.1.3, 2007-01-23 19:27:52+01:00, jonas@eel.(none) +11 -8
    Dont save ATTRINFO "also" for DELETE, even when getting it in separate signal

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.53.1.2, 2007-01-23 19:27:52+01:00, jonas@eel.(none) +2 -1
    Add disk flag to signature
      (for read after delete)

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.49.1.1, 2007-01-23 19:27:52+01:00, jonas@eel.(none) +10 -4
    Do setup read before read after delete

  storage/ndb/test/ndbapi/testBasic.cpp@1.15.1.1, 2007-01-23 19:27:52+01:00, jonas@eel.(none) +52 -0
    testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.58.1.5, 2007-01-23 19:27:52+01:00, jonas@eel.(none) +5 -1
    testcase

ChangeSet@1.1810.2460.40, 2007-01-23 10:11:53-08:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  mysql-test/t/fulltext_left_join.test@1.12.1.3, 2007-01-23 10:11:52-08:00, igor@olga.mysql.com +0 -13
    Post-merge fix.

ChangeSet@1.2389.2.1, 2007-01-23 19:45:58+02:00, gkodinov@macbook.gmz +4 -0
  Bug #6172: RAND(a) should only accept constant values as arguments
   RAND() must accept scalar expressions regardless of their kind.
   That includes both constant expressions and expressions that 
   depend on column values.
   When the expression is constant the random seed can be initialized
   at compile time.
   However when the expression is not constant the random seed must be
   initialized at each invocation (while it still can be allocated at
   compile time).
   Implemented the above rules by extending Item_func_rand::val_real()
   to initialize the random seed at the correct place.

  mysql-test/r/func_math.result@1.40, 2007-01-23 19:45:49+02:00, gkodinov@macbook.gmz +40 -5
    Bug #6172: RAND(a) should only accept constant values as arguments
     - extened the test case

  mysql-test/t/func_math.test@1.29, 2007-01-23 19:45:49+02:00, gkodinov@macbook.gmz +19 -5
    Bug #6172: RAND(a) should only accept constant values as arguments
     - extened the test case

  sql/item_func.cc@1.345.2.1, 2007-01-23 19:45:50+02:00, gkodinov@macbook.gmz +17 -19
    Bug #6172: RAND(a) should only accept constant values as arguments
     - allow specifying non-const expressions as RAND() arguments

  sql/item_func.h@1.161, 2007-01-23 19:45:50+02:00, gkodinov@macbook.gmz +2 -0
    Bug #6172: RAND(a) should only accept constant values as arguments
     - allow specifying non-const expressions as RAND() arguments

ChangeSet@1.1810.2517.9, 2007-01-23 10:43:21-07:00, tsmith@siva.hindu.god +1 -0
  Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target

  Makefile.am@1.68.6.1, 2007-01-23 10:43:18-07:00, tsmith@siva.hindu.god +1 -0
    Fix bad merge: add 'cd mysql-test' to test-ps: target

ChangeSet@1.1810.2532.1, 2007-01-23 10:01:56-05:00, iggy@recycle.(none) +1 -0
  Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
  - Add anonymous user with no rights.

  scripts/mysql_create_system_tables.sh@1.12.5.1, 2007-01-23 10:01:54-05:00, iggy@recycle.(none) +1 -1
    Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
    - Add anonymous user with no rights.

ChangeSet@1.1810.2527.4, 2007-01-23 16:42:03+02:00, monty@mysql.com +4 -0
  Avoid compiler warnings on powermacg5
  Fixed compilation error when trying to compile libmysqld on powermac

  configure.in@1.245.76.1, 2007-01-23 16:41:58+02:00, monty@mysql.com +1 -1
    Added flag if __cxa_pure_virtual() should be defined.
    Without this flag, we get a warning from my_global.h for every compiled file on powermacg5

  extra/yassl/taocrypt/include/type_traits.hpp@1.4, 2007-01-23 16:41:58+02:00, monty@mysql.com +5 -1
    Avoid compiler warning

  include/my_global.h@1.96.1.37, 2007-01-23 16:41:59+02:00, monty@mysql.com +1 -1
    Avoid compiler warning on powermacg5

  sql/mysqld.cc@1.439.1.148, 2007-01-23 16:42:00+02:00, monty@mysql.com +1 -1
    Fix compiler error when compiling embedded on powermac

ChangeSet@1.1810.2475.2, 2007-01-23 15:03:48+03:00, dlenev@mockturtle.local +5 -0
  Proposed fix for bug#24491 "using alias from source table in insert ...
  on duplicate key".
  
  INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
  stored routine or as prepared statement and which in its ON DUPLICATE
  KEY clause erroneously tried to assign value to a column mentioned only
  in its SELECT part was properly emitting error on the first execution
  but succeeded on the second and following executions.
  
  Code which is responsible for name resolution of fields mentioned in
  UPDATE clause (e.g. see select_insert::prepare()) modifies table list
  and Name_resolution_context used in this process. It uses
  Name_resolution_context_state::save_state/restore_state() to revert
  these modifications. Unfortunately those two methods failed to revert
  properly modifications to TABLE_LIST::next_name_resolution_table
  and this broke name resolution process for successive executions.
  
  This patch fixes Name_resolution_context_state::save_state/restore_state()
  in such way that it properly handles TABLE_LIST::next_name_resolution_table.

  mysql-test/r/ps.result@1.56.12.1, 2007-01-23 15:03:45+03:00, dlenev@mockturtle.local +16 -0
    Added test case for bug#24491 "using alias from source table in insert ...
    on duplicate key"

  mysql-test/r/sp-error.result@1.102.1.8, 2007-01-23 15:03:46+03:00, dlenev@mockturtle.local +19 -0
    Added test case for bug#24491 "using alias from source table in insert ...
    on duplicate key"

  mysql-test/t/ps.test@1.56.12.1, 2007-01-23 15:03:46+03:00, dlenev@mockturtle.local +30 -0
    Added test case for bug#24491 "using alias from source table in insert ...
    on duplicate key"

  mysql-test/t/sp-error.test@1.100.1.11, 2007-01-23 15:03:46+03:00, dlenev@mockturtle.local +32 -0
    Added test case for bug#24491 "using alias from source table in insert ...
    on duplicate key"

  sql/item.h@1.183.18.1, 2007-01-23 15:03:46+03:00, dlenev@mockturtle.local +2 -7
    Name_resolution_context::save_state/restore_state():
      At the moment these methods are used only by code implementing
      INSERT and INSERT ... SELECT statements. This code doesn't modify
     'next_name_resolution_table' member of table list element
      corresponding to the first table of SELECT clause (pointed by
      'first_name_resolution_table'). But it modifies table list element
      corresponding to the target table of INSERT (pointed by 'table_list')
      So these methods were changed to reflect this.

ChangeSet@1.1616.2924.12, 2007-01-22 14:23:53-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches.
  The bug is actually a duplicate of the bug 14708.
  Down-ported the fix for 14708 from 5.0.  
  Merged the test case for bug 14708 from 5.0.

  mysql-test/r/fulltext_left_join.result@1.12.2.1, 2007-01-22 14:23:52-08:00, igor@olga.mysql.com +40 -0
    Added a test case for bug #25637 (duplicate .of bug 14708).
    Merged the test case for bug 14708 from 5.0.

  mysql-test/t/fulltext_left_join.test@1.12.2.1, 2007-01-22 14:23:52-08:00, igor@olga.mysql.com +41 -0
    Added a test case for bug #25637 (duplicate of bug 14708).
    Merged the test case for bug 14708 from 5.0.

  sql/item_func.cc@1.124.53.1, 2007-01-22 14:23:52-08:00, igor@olga.mysql.com +1 -1
    Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches.
    The bug is actually a duplicate of the bug 14708.
    Down-ported the fix for 14708 from 5.0.  

ChangeSet@1.2343.10.30, 2007-01-22 22:05:56+01:00, jonas@eel.(none) +2 -0
  ndb - bug#25286
    - add some sanity check to marker/hash code to see that element isnt inserted twice into hashtable
      (if defined VM_TRACE or ERROR_INSERT)
  
    - allow REMOVE_MARKER_ORD to fail(dont find record) in release

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.128.1.2, 2007-01-22 22:05:53+01:00, jonas@eel.(none) +11 -3
    add a bunch of sanity check ifdef#vmtrace of #error_insert

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.129.1.1, 2007-01-22 22:05:53+01:00, jonas@eel.(none) +19 -0
    add a bunch of sanity check ifdef#vmtrace of #error_insert

ChangeSet@1.1810.2460.38, 2007-01-22 23:04:14+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Code cleanup after fix for bug#23417.

  sql/sql_select.cc@1.312.1.170, 2007-01-22 23:04:03+03:00, evgen@moonbone.local +2 -3
    Code cleanup after fix for bug#23417.

ChangeSet@1.1810.2460.37, 2007-01-22 22:08:51+03:00, evgen@moonbone.local +1 -0
  sql_prepare.cc:
    Post fix for bug#25123.

  sql/sql_prepare.cc@1.142.23.1, 2007-01-22 22:08:31+03:00, evgen@moonbone.local +1 -1
    Post fix for bug#25123.

ChangeSet@1.1810.2510.5, 2007-01-22 20:00:27+03:00, anozdrin@alik. +1 -0
  Enabling im_daemon_life_cycle.imtest in team tree.
  
  Do not propagate this change into main trees.

  mysql-test/t/disabled.def@1.2.9.3, 2007-01-22 20:00:26+03:00, anozdrin@alik. +0 -1
    Enbled im_daemon_life_cycle.imtest

ChangeSet@1.2390.7.8, 2007-01-22 19:50:34+03:00, anozdrin@alik. +1 -0
  Enabling im_daemon_life_cycle.imtest in team tree in order to debug IM.
  Do not propagate this change into main trees!

  mysql-test/t/disabled.def@1.224.2.1, 2007-01-22 19:50:32+03:00, anozdrin@alik. +1 -1
    im_daemon_life_cycle enabled.

ChangeSet@1.1810.2523.5, 2007-01-22 16:54:40+01:00, msvensson@neptunus.(none) +17 -0
  Import yaSSL version 1.5.8
   - Includes patch for Bug#25189

  extra/yassl/README@1.8, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +17 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h@1.14.1.5, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/src/make.bat@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +0 -18
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.7, 2006-12-13 22:40:54+01:00, msvensson@neptunus.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp@1.10, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +10 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/benchmark/make.bat@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +0 -18
    Import patch yassl.diff

  extra/yassl/taocrypt/include/asn.hpp@1.12, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +28 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/include/error.hpp@1.6, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +5 -1
    Import patch yassl.diff

  extra/yassl/taocrypt/include/file.hpp@1.5, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +4 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/asn.cpp@1.11.1.1, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +79 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.6, 2007-01-17 19:14:50+01:00, msvensson@neptunus.(none) +10 -4
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp@1.27, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +24 -19
    Import patch yassl.diff

  extra/yassl/taocrypt/src/make.bat@1.7, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +0 -18
    Import patch yassl.diff

  extra/yassl/taocrypt/test/make.bat@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +0 -18
    Import patch yassl.diff

  extra/yassl/taocrypt/test/test.cpp@1.4.1.1, 2007-01-10 19:27:15+01:00, msvensson@neptunus.(none) +45 -1
    Import patch yassl.diff

  extra/yassl/testsuite/make.bat@1.5, 2006-10-05 05:18:12+02:00, msvensson@neptunus.(none) +0 -18
    Import patch yassl.diff

  extra/yassl/testsuite/testsuite.cpp@1.4.1.1, 2006-05-04 22:23:39+02:00, msvensson@neptunus.(none) +2 -2
    Import patch yassl.diff

ChangeSet@1.1810.2527.3, 2007-01-22 15:52:15+02:00, monty@mysql.com +8 -0
  Fixed compiler warnings
  Fixed wrong merge that disabled 'make test'
  Renamed all suppress files to end in '.supp'
  Don't give "skipped %d bytes from file" warnings in 5.0

  Makefile.am@1.68.1.28, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -0
    Added back missing cd from wrong merge

  mysql-test/purify.supp@1.2, 2007-01-22 15:50:29+02:00, monty@mysql.com +0 -0
    Rename: mysql-test/suppress.purify -> mysql-test/purify.supp

  mysql-test/r/mysqlbinlog.result@1.25.1.2, 2007-01-22 15:52:14+02:00, monty@mysql.com +7 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  mysql-test/t/mysqlbinlog.test@1.21.1.17, 2007-01-22 15:52:14+02:00, monty@mysql.com +10 -5
    Fixed test case to drop all used tables at start and used tables after each test group

  sql/net_serv.cc@1.88.1.10, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -1
    Don't give "skipped %d bytes from file" warnings in 5.0
    (The proper fix for this is in 5.1)

  sql/table.cc@1.160.1.83, 2007-01-22 15:52:14+02:00, monty@mysql.com +2 -1
    Fixed compiler warning

  heap/hp_write.c@1.22.8.1, 2007-01-22 15:52:14+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  support-files/compiler_warnings.supp@1.2, 2007-01-22 15:50:29+02:00, monty@mysql.com +0 -0
    Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp

ChangeSet@1.1810.2460.36, 2007-01-22 15:14:38+03:00, evgen@moonbone.local +3 -0
  Bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table.
  
  When inserting into a join-based view the update fields from the ON DUPLICATE
  KEY UPDATE wasn't checked to be from the table being inserted into and were
  silently ignored.
  
  The new check_view_single_update() function is added to check that
  insert/update fields are being from the same single table of the view.

  mysql-test/r/insert.result@1.22.1.5, 2007-01-22 15:13:57+03:00, evgen@moonbone.local +21 -0
    Added a test case for bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table.

  mysql-test/t/insert.test@1.22.1.3, 2007-01-22 15:14:18+03:00, evgen@moonbone.local +18 -0
    Added a test case for bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table.

  sql/sql_insert.cc@1.146.44.1, 2007-01-22 15:13:24+03:00, evgen@moonbone.local +73 -20
    Bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table.
    The new check_view_single_update() function is added to check that
    insert/update fields are being from the same single table of the view.

ChangeSet@1.1810.2523.4, 2007-01-22 12:34:39+01:00, msvensson@neptunus.(none) +1 -0
  Add define for used type of third argument to 'accept' - Netware uses size_t

  extra/yassl/testsuite/test.hpp@1.11, 2007-01-22 12:34:33+01:00, msvensson@neptunus.(none) +4 -1
    Add define for used type of third argument to 'accept' - Netware uses size_t

ChangeSet@1.2390.12.3, 2007-01-22 15:26:49+04:00, ramil@mysql.com +1 -0
  after-merge fix.

  mysql-test/r/select.result@1.145, 2007-01-22 15:26:47+04:00, ramil@mysql.com +3 -3
    results adjusted.

ChangeSet@1.1810.2525.1, 2007-01-22 14:52:23+04:00, ramil@mysql.com +3 -0
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    
  We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
  'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
  exceed the INT bounds.

  mysql-test/r/select.result@1.121.1.25, 2007-01-22 14:52:21+04:00, ramil@mysql.com +30 -0
    Fix for bug #22026: Warning when using IF statement and large unsigned bigint
      - test result.

  mysql-test/t/select.test@1.102.1.18, 2007-01-22 14:52:21+04:00, ramil@mysql.com +24 -0
    Fix for bug #22026: Warning when using IF statement and large unsigned bigint
      - test case.

  sql/item_cmpfunc.cc@1.187.19.1, 2007-01-22 14:52:21+04:00, ramil@mysql.com +9 -3
    Fix for bug #22026: Warning when using IF statement and large unsigned bigint
      - take into account unsigned flags aggregating result types:                    
        return INT_RESULT only if two items with INT_RESULT type                      
        have equal unsigned_flags, otherwise return REAL_RESULT. 

ChangeSet@1.2382.3.1, 2007-01-22 12:51:21+02:00, gkodinov@macbook.gmz +3 -0
  BUG#16590: Optimized does not do right "const" table pre-read
   st_table::const_key_parts member is used in determining if
   certain key has a prefix that is compared to constant(s) in
   the query predicates.
   If there's such prefix the index can be used to get the data
   from the remaining suffix columns in sorted order.
   However if a field is compared to another field from a "const"
   table the const_key_parts is not amended.
   This makes the optimizer unable to detect that the key can be 
   used for sorting and adds an extra filesort.
   Fixed by updating const_key_parts after reading in the "const"
   table.

  mysql-test/r/order_by.result@1.59.1.1, 2007-01-22 12:51:13+02:00, gkodinov@macbook.gmz +9 -0
    BUG#16590: Optimized does not do right "const" table pre-read
     - test case

  mysql-test/t/order_by.test@1.42.1.1, 2007-01-22 12:51:14+02:00, gkodinov@macbook.gmz +13 -0
    BUG#16590: Optimized does not do right "const" table pre-read
     - test case

  sql/sql_select.cc@1.477.1.1, 2007-01-22 12:51:14+02:00, gkodinov@macbook.gmz +16 -0
    BUG#16590: Optimized does not do right "const" table pre-read
     - fill up the const_key_parts structure

ChangeSet@1.1810.2523.3, 2007-01-22 10:41:36+01:00, msvensson@neptunus.(none) +1 -0
  gen_lex_hash does not need to link with odbc32*.lib

  extra/CMakeLists.txt@1.1.2.1, 2007-01-22 10:41:34+01:00, msvensson@neptunus.(none) +1 -1
    gen_lex_hash does not need to link with odbc32*.lib

ChangeSet@1.1616.2949.3, 2007-01-21 19:55:17-07:00, tsmith@siva.hindu.god +1 -0
  Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
  
  Fixes:
  - Bug #24299: 
  - Bug #25596: 

  innobase/dict/dict0dict.c@1.52.1.18, 2007-01-21 19:55:16-07:00, tsmith@siva.hindu.god +16 -13
    Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
    
    Revision r36:
    innodb-4.1: Port r1030 from innodb/branches/5.0:
    
    Replace isspace() with a wrapper ib_isspace(), because on
    Win32 isspace(0xa0) appears to hold.  (Bug #24299)
    
    
    Revision r38:
    ib_isspace(c): Check for c being the null character.  (Bug #25596)

ChangeSet@1.2390.11.1, 2007-01-21 18:18:11-07:00, tsmith@siva.hindu.god +6 -0
  Applied innodb-5.1-ss1186
  
  Fixes bugs:
  - Bug #20877: InnoDB data dictionary memory footprint is too big
  - Bug #24741: existing cascade clauses disappear when adding foreign keys

  mysql-test/r/innodb.result@1.184, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +17 -0
    Applied innodb-5.1-ss1186
    
    Revision r1186:
    dict_load_foreign(): Use a local variable instead of the 10-bit field
    foreign->n_fields in order to preserve ON UPDATE CASCADE and
    ON DELETE CASCADE flags.  For some reason, gcc does not warn about
    shifting a 10-bit field to right by 24 bits.  (Bug #24741)
    
    This bug was introduced while reducing the memory footprint of the
    InnoDB data dictionary (Bug #20877).
    
    innodb.test, innodb.result: Add a test case.

  mysql-test/t/innodb.test@1.154, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +16 -0
    Applied innodb-5.1-ss1186
    
    Revision r1186:
    dict_load_foreign(): Use a local variable instead of the 10-bit field
    foreign->n_fields in order to preserve ON UPDATE CASCADE and
    ON DELETE CASCADE flags.  For some reason, gcc does not warn about
    shifting a 10-bit field to right by 24 bits.  (Bug #24741)
    
    This bug was introduced while reducing the memory footprint of the
    InnoDB data dictionary (Bug #20877).
    
    innodb.test, innodb.result: Add a test case.

  storage/innobase/buf/buf0flu.c@1.40, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +1 -2
    Applied innodb-5.1-ss1186
    
    Revision r1168:
    buf_flush_batch(): Remove the test page_count != ULINT_UNDEFINED.
    The variable is initialized to zero, and after that it is only added to.
    Maybe the one who introduced the variable srv_buf_pool_flushed overlooked
    that there is a separate return statement for returning ULINT_UNDEFINED?

  storage/innobase/dict/dict0load.c@1.53, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +5 -4
    Applied innodb-5.1-ss1186
    
    Revision r1186:
    dict_load_foreign(): Use a local variable instead of the 10-bit field
    foreign->n_fields in order to preserve ON UPDATE CASCADE and
    ON DELETE CASCADE flags.  For some reason, gcc does not warn about
    shifting a 10-bit field to right by 24 bits.  (Bug #24741)
    
    This bug was introduced while reducing the memory footprint of the
    InnoDB data dictionary (Bug #20877).
    
    innodb.test, innodb.result: Add a test case.

  storage/innobase/include/ut0ut.h@1.23, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +2 -1
    Applied innodb-5.1-ss1186
    
    Revision r1165:
    ut_2_power_up(): Add __attribute__((const)), because otherwise this function
    is repeatedly called in buf_flush_free_margin() due to the definitions
    of BUF_READ_AHEAD_AREA and other macros starting with BUF_READ_AHEAD_.

  storage/innobase/que/que0que.c@1.28, 2007-01-21 18:18:09-07:00, tsmith@siva.hindu.god +33 -32
    Applied innodb-5.1-ss1186
    
    Revision r1158:
    Modify que_fork_start_command() to do only one pass over the thread list
    instead of three.

ChangeSet@1.1810.2517.6, 2007-01-21 17:58:02-07:00, tsmith@siva.hindu.god +2 -0
  Applied innodb-5.0-ss1230 snapshot
  
  Fixes:
  - Bug #25596: 

  innobase/dict/dict0dict.c@1.65.20.1, 2007-01-21 17:58:00-07:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.0-ss1230 snapshot.
    
    r1230
    
    branches/5.0: ib_isspace(c): Check for c being the null character.
    (Bug #25596)

  sql/ha_innodb.h@1.93.5.1, 2007-01-21 17:58:00-07:00, tsmith@siva.hindu.god +1 -1
    Applied innodb-5.0-ss1230
    
    Trivial indent SPACES -> TAB change.

ChangeSet@1.1346.891.1, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
  Fix for configure to detect library correctly.
  Fix to check library in use during runtime.
  Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".

  BUILD/SETUP.sh@1.17.3.1, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    To avoid warnings during compilation.

  configure.in@1.191.1.150, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +98 -61
    Fixed configure so that it can correctly detect
    between NPTL and Linuxthreads.

  include/my_global.h@1.34.1.42, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -2
    Fix for Linuxthreads.

  include/my_pthread.h@1.57.1.10, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
    Added defines for different libraries that can be detected.
    Currently only 'other', 'nptl', and 'lt' (linuxthreads) are
    being used.
    
    changed sigset() and signal() to my_sigset() and my_signal()

  include/thr_alarm.h@1.13.1.4, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +0 -5
    Removed defines for Linuxthreads. This is now detected during
    runtime and handled in the thr_alarm.c

  mysys/my_pthread.c@1.35.1.5, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -1
    Runtime check for library.

  mysys/thr_alarm.c@1.41.1.1, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +42 -51
    Runtime checks for library and corresponding
    signals.

  sql/mysqld.cc@1.297.52.9, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +34 -19
    Added function for detecting thread library in use
    during start-up.
    
    THR_KILL_SIGNAL removed, setting signals during runtime.

ChangeSet@1.2390.7.7, 2007-01-20 14:08:53+03:00, dlenev@mockturtle.local +2 -0
  Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires
  global 'opening tables' lock." after merging it into 5.1 tree.

  mysql-test/r/alter_table-big.result@1.2, 2007-01-20 14:08:50+03:00, dlenev@mockturtle.local +1 -1
    Fixed "show binlog events" usage as 5.1 and 5.0 sizes of binlog
    events differ.

  mysql-test/t/alter_table-big.test@1.2, 2007-01-20 14:08:50+03:00, dlenev@mockturtle.local +2 -2
    This test needs statement based binlogging.
    Also fixed "show binlog events" usage as 5.1 and 5.0 sizes
    of binlog events differ.

ChangeSet@1.1616.2938.16, 2007-01-19 17:34:47-08:00, mtaylor@qualinost.(none) +2 -0
  Moving version-script to acinclude.m4

  acinclude.m4@1.123.23.1, 2007-01-19 17:34:45-08:00, mtaylor@qualinost.(none) +8 -0
    Moving version-script to acinclude.m4

  configure.in@1.201.64.22, 2007-01-19 17:34:45-08:00, mtaylor@qualinost.(none) +0 -7
    Moving version-script to acinclude.m4

ChangeSet@1.2390.1.38, 2007-01-19 17:06:53-08:00, mtaylor@qualinost.(none) +1 -0
  files are in storage/ndb in 5.1. fix merge from 5.0

  config/ac-macros/ha_ndbcluster.m4@1.25, 2007-01-19 17:06:51-08:00, mtaylor@qualinost.(none) +2 -2
    files are in storage/ndb in 5.1. fix merge from 5.0

ChangeSet@1.2390.1.37, 2007-01-19 17:02:46-08:00, mtaylor@qualinost.(none) +2 -0
  We only want to do these things if we are building Ndb.

  config/ac-macros/ha_ndbcluster.m4@1.24, 2007-01-19 17:02:43-08:00, mtaylor@qualinost.(none) +11 -0
    We only want to do these things if we are building Ndb.

  configure.in@1.427, 2007-01-19 17:02:43-08:00, mtaylor@qualinost.(none) +0 -2
    Moving these to ha_ndbcluster.m4

ChangeSet@1.1810.2372.63, 2007-01-19 16:54:01-08:00, mtaylor@qualinost.(none) +3 -0
  Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb.

  config/ac-macros/ha_ndbcluster.m4@1.5.1.4, 2007-01-19 16:53:59-08:00, mtaylor@qualinost.(none) +9 -0
    We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4

  configure.in@1.245.75.9, 2007-01-19 16:53:59-08:00, mtaylor@qualinost.(none) +0 -7
    We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4

  ndb/src/Makefile.am@1.13.5.1, 2007-01-19 16:53:59-08:00, mtaylor@qualinost.(none) +0 -2
    BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.

ChangeSet@1.2390.1.35, 2007-01-19 14:58:08-08:00, mtaylor@qualinost.(none) +1 -0
  One final time making the path right.

  configure.in@1.425, 2007-01-19 14:57:55-08:00, mtaylor@qualinost.(none) +2 -2
    I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
    ---
    missed storage in one more place
    ---
    added storage back to patch after merge from 5.0-maint

ChangeSet@1.2390.1.33, 2007-01-19 14:29:01-08:00, mtaylor@qualinost.(none) +2 -0
  Merge recycle.(none):/src/bug22807/my50-bug22807
  into  recycle.(none):/src/mysql-5.0-maint
  ---
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
  ---
  I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
  ---
  missed storage in one more place
  ---
  Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
  into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
  ---
  added storage back to patch after merge from 5.0-maint
  ---
  Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.

  BitKeeper/deleted/.del-libndb.ver.in@1.2, 2007-01-19 14:19:02-08:00, mtaylor@qualinost.(none) +0 -0
    Rename: ndb/src/libndb.ver.in -> BitKeeper/deleted/.del-libndb.ver.in

  BitKeeper/etc/ignore@1.271, 2007-01-19 14:28:56-08:00, mtaylor@qualinost.(none) +1 -0
    Added storage/ndb/src/libndb.ver to the ignore list

ChangeSet@1.1810.2372.62, 2007-01-19 14:26:06-08:00, mtaylor@qualinost.(none) +2 -0
  Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean

  BitKeeper/etc/ignore@1.210.1.30, 2007-01-19 14:26:01-08:00, mtaylor@qualinost.(none) +1 -0
    Added ndb/src/libndb.ver to the ignore list

  ndb/src/Makefile.am@1.13.4.1, 2007-01-19 14:26:00-08:00, mtaylor@qualinost.(none) +2 -0
    Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean

ChangeSet@1.1810.2372.61, 2007-01-19 12:27:59-08:00, mtaylor@qualinost.(none) +1 -0
  missed storage in one more place

  configure.in@1.245.75.8, 2007-01-19 12:27:57-08:00, mtaylor@qualinost.(none) +1 -1
    missed storage in one more place

ChangeSet@1.1810.2372.60, 2007-01-19 12:23:06-08:00, mtaylor@qualinost.(none) +1 -0
  I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 

  configure.in@1.245.75.7, 2007-01-19 12:23:04-08:00, mtaylor@qualinost.(none) +1 -1
    I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 

ChangeSet@1.1810.2522.1, 2007-01-19 23:15:59+03:00, dlenev@mockturtle.local +5 -0
  Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening
  tables' lock."
  
  Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
  long time) prevented concurrent execution of all statements using tables.
  
  The problem was caused by the fact that we were holding LOCK_open mutex
  during whole duration of this statement and particularly during call
  to handler::enable_indexes(). This behavior was introduced as part of the
  fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
  too late (race cond)"
  
  The patch simply restores old behavior. Note that we can safely do this as
  this operation takes exclusive lock (similar to name-lock) which blocks both
  DML and DDL on the table being altered.
  
  It also introduces mysql-test/include/wait_show_pattern.inc helper script
  which is used to make test-case for this bug robust enough.

  mysql-test/include/wait_show_pattern.inc@1.1, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +51 -0
    New BitKeeper file ``mysql-test/include/wait_show_pattern.inc''

  mysql-test/include/wait_show_pattern.inc@1.0, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +0 -0

  mysql-test/include/wait_slave_status.inc@1.2, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +7 -36
    Now wait_slave_status.inc reuses more generic wait_output_matches.inc script.

  mysql-test/r/alter_table-big.result@1.1, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +18 -0
    New BitKeeper file ``mysql-test/r/alter_table-big.result''

  mysql-test/r/alter_table-big.result@1.0, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +0 -0

  mysql-test/t/alter_table-big.test@1.1, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +62 -0
    New BitKeeper file ``mysql-test/t/alter_table-big.test''

  mysql-test/t/alter_table-big.test@1.0, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +0 -0

  sql/sql_table.cc@1.239.45.1, 2007-01-19 23:15:58+03:00, dlenev@mockturtle.local +23 -2
    mysql_alter_table():
      Changed ALTER TABLE ... ENABLE/DISABLE KEYS not to hold LOCK_open mutex
      during call to handler::enable_indexes() as the latter can take rather
      long time and therefore such ALTER would block execution of all other
      statements that use tables. We can safely do this as this operation takes 
      exclusive lock (similar to name-lock) on the table which is altered.

ChangeSet@1.1810.2521.1, 2007-01-19 18:34:09+03:00, evgen@moonbone.local +6 -0
  Bug#25172: Not checked buffer size leads to a server crash.
  
  After fix for bug#21798 JOIN stores the pointer to the buffer for sorting
  fields. It is used while sorting for grouping and for ordering. If ORDER BY
  clause has more elements then the GROUP BY clause then a memory overrun occurs.
  
  Now the length of the ORDER BY list is always passed to the 
  make_unireg_sortorder() function and it allocates buffer big enough to be
  used for bigger list.

  mysql-test/r/select.result@1.121.9.1, 2007-01-19 18:33:41+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#25172: Not checked buffer size leads to a server crash.

  mysql-test/t/select.test@1.102.7.1, 2007-01-19 18:33:44+03:00, evgen@moonbone.local +11 -0
    Added a test case for bug#25172: Not checked buffer size leads to a server crash.

  sql/sql_delete.cc@1.144.1.46, 2007-01-19 18:33:25+03:00, evgen@moonbone.local +1 -1
    Bug#25172: Not checked buffer size leads to a server crash.
    Length parameter is initialized to 0 for the make_unireg_sortorder() function.

  sql/sql_select.cc@1.312.1.169, 2007-01-19 18:33:29+03:00, evgen@moonbone.local +8 -4
    Bug#25172: Not checked buffer size leads to a server crash.
    Now the length of the ORDER BY list is always passed to the 
    make_unireg_sortorder() function and it allocates buffer big enough to be
    used for bigger list.

  sql/sql_table.cc@1.239.44.1, 2007-01-19 18:33:37+03:00, evgen@moonbone.local +1 -1
    Bug#25172: Not checked buffer size leads to a server crash.
    Length parameter is initialized to 0 for the make_unireg_sortorder() function.

  sql/sql_update.cc@1.154.27.3, 2007-01-19 18:33:40+03:00, evgen@moonbone.local +1 -1
    Bug#25172: Not checked buffer size leads to a server crash.
    Length parameter is initialized to 0 for the make_unireg_sortorder() function.

ChangeSet@1.2390.9.1, 2007-01-19 18:33:48+03:00, kroki@moonlight.home +4 -0
  BUG#25211: events_bugs.test fails on sapsrv1
  
  The problem was that the events_bugs test could randomly fail due to
  races in the test case.
  
  The solution is to replace fixed sleeps with reliable polling of a
  certain state to settle.  For that, a new auxiliary script
  include/wait_condition.inc is used, that allows waiting for a given
  query to return true.

  mysql-test/include/wait_condition.inc@1.1, 2007-01-19 18:33:45+03:00, kroki@moonlight.home +39 -0
    New BitKeeper file ``mysql-test/include/wait_condition.inc''

  mysql-test/include/wait_condition.inc@1.0, 2007-01-19 18:33:45+03:00, kroki@moonlight.home +0 -0

  mysql-test/include/wait_until_rows_count.inc@1.2, 2007-01-19 18:33:45+03:00, kroki@moonlight.home +9 -41
    Script is rewritten using new include/wait_condition.inc.

  mysql-test/r/events_bugs.result@1.24, 2007-01-19 18:33:45+03:00, kroki@moonlight.home +72 -15
    Update result: add missing quotation mark.

  mysql-test/t/events_bugs.test@1.23, 2007-01-19 18:33:45+03:00, kroki@moonlight.home +84 -13
    Replace --sleep with the reliable waiting for a certain state.

ChangeSet@1.1810.2520.1, 2007-01-19 15:43:21+01:00, msvensson@neptunus.(none) +2 -0
  Add test's from Matthias for assigning one variable from another using let

  mysql-test/r/mysqltest.result@1.24.8.1, 2007-01-19 15:43:19+01:00, msvensson@neptunus.(none) +9 -0
    Add test's from Matthias for assigning one variable from another using let

  mysql-test/t/mysqltest.test@1.24.8.2, 2007-01-19 15:43:19+01:00, msvensson@neptunus.(none) +30 -0
    Add test's from Matthias for assigning one variable from another using let

ChangeSet@1.1616.2950.1, 2007-01-19 09:41:08+01:00, knielsen@ymer.(none) +1 -0
  Implement mysql-test-run.pl option to limit the number of saved core
  files. This helps stability of multiple parallel automated test runs,
  avoiding the situation where one bad build fills up disk with 1000s of
  core files, causing failures in other test runs.

  mysql-test/mysql-test-run.pl@1.8.20.1, 2007-01-19 09:41:06+01:00, knielsen@ymer.(none) +8 -0
    Implement mysql-test-run.pl option to limit the number of saved core
    files. This helps stability of multiple parallel automated test runs,
    avoiding the situation where one bad build fills up disk with 1000s of
    core files, causing failures in other test runs.

ChangeSet@1.1616.2949.2, 2007-01-19 12:19:53+04:00, ramil@mysql.com +1 -0
  after merge fix.

  mysql-test/r/range.result@1.19.4.1, 2007-01-19 12:19:49+04:00, ramil@mysql.com +2 -2
    Fix for bug #22533: Traditional: Too-long bit value not rejected.
      - results adjusted.

ChangeSet@1.1810.2514.2, 2007-01-19 00:17:28-08:00, igor@olga.mysql.com +4 -0
  Fixed bug #25219: crash for a query that contains an EXIST subquery with
  UNION over correlated and uncorrelated SELECTS.
  In such subqueries each uncorrelated SELECT should be considered as
  uncacheable. Otherwise join_free is called for it and in many cases
  it causes some problems.

  mysql-test/r/subselect.result@1.134.13.1, 2007-01-19 00:17:26-08:00, igor@olga.mysql.com +33 -0
    Added a test case for bug #25219.

  mysql-test/t/subselect.test@1.129.1.9, 2007-01-19 00:17:26-08:00, igor@olga.mysql.com +34 -0
    Added a test case for bug #25219.

  sql/mysql_priv.h@1.290.82.4, 2007-01-19 00:17:26-08:00, igor@olga.mysql.com +4 -1
    Fixed bug #25219: crash for a query that contains an EXIST subquery with
    UNION over correlated and uncorrelated SELECTS.
    In such subqueries each uncorrelated SELECT should be considered as
    uncacheable. Otherwise join_free is called for it and in many cases
    it causes some problems. 
    Added a new flag UNCACHEABLE_UNITED for such SELECTs.

  sql/sql_lex.cc@1.142.31.5, 2007-01-19 00:17:26-08:00, igor@olga.mysql.com +10 -2
    Fixed bug #25219: crash for a query that contains an EXIST subquery with
    UNION over correlated and uncorrelated SELECTS.
    In such subqueries each uncorrelated SELECT should be considered as
    uncacheable. Otherwise join_free is called for it and in many cases
    it causes some problems.
    Added a new flag UNCACHEABLE_UNITED for such SELECTs.

ChangeSet@1.2390.7.4, 2007-01-18 21:30:25-07:00, malff@weblab.(none) +1 -0
  Manual merge

  mysql-test/r/alter_table.result@1.73, 2007-01-18 21:30:21-07:00, malff@weblab.(none) +1 -1
    Manual merge

ChangeSet@1.1810.2510.3, 2007-01-18 18:37:52-07:00, malff@weblab.(none) +3 -0
  Manual merge

  mysql-test/r/alter_table.result@1.49.1.13, 2007-01-18 18:37:49-07:00, malff@weblab.(none) +113 -0
    Manual merge

  mysql-test/t/alter_table.test@1.36.1.13, 2007-01-18 18:37:49-07:00, malff@weblab.(none) +5 -5
    Manual merge

  sql/sql_yacc.yy@1.371.91.5, 2007-01-18 18:37:49-07:00, malff@weblab.(none) +24 -1
    Manual merge

ChangeSet@1.2390.8.2, 2007-01-18 16:31:43-08:00, mtaylor@qualinost.(none) +3 -0
  Add code to actually version the symbols in the library, and not just the library. bug #13522

  configure.in@1.422, 2007-01-18 16:31:41-08:00, mtaylor@qualinost.(none) +12 -0
    Add code to actually version the symbols in the library, and not just the library. bug #13522

  storage/ndb/src/Makefile.am@1.18, 2007-01-18 16:31:41-08:00, mtaylor@qualinost.(none) +1 -1
    Add code to actually version the symbols in the library, and not just the library. bug #13522

  storage/ndb/src/libndb.ver.in@1.1, 2007-01-18 15:39:55-08:00, mtaylor@qualinost.(none) +2 -0
    BitKeeper file /home/mtaylor/src/mysql-5.1-new-maint/storage/ndb/src/libndb.ver.in

  storage/ndb/src/libndb.ver.in@1.0, 2007-01-18 15:39:55-08:00, mtaylor@qualinost.(none) +0 -0

ChangeSet@1.1810.2372.58, 2007-01-18 16:28:47-08:00, mtaylor@qualinost.(none) +1 -0
  Added configure section to deal with actually versioning symbols.

  configure.in@1.245.75.6, 2007-01-18 16:28:45-08:00, mtaylor@qualinost.(none) +8 -0
    Added configure section to deal with actually versioning symbols.

ChangeSet@1.1616.2938.14, 2007-01-18 16:21:43-08:00, mtaylor@qualinost.(none) +3 -0
  Added version script information to actually version the symbols. 

  ndb/src/libndb.ver.in@1.1, 2007-01-18 16:20:04-08:00, mtaylor@qualinost.(none) +2 -0
    BitKeeper file /home/mtaylor/src/mysql-4.1-maint/ndb/src/libndb.ver.in

  ndb/src/libndb.ver.in@1.0, 2007-01-18 16:20:04-08:00, mtaylor@qualinost.(none) +0 -0

  configure.in@1.201.64.21, 2007-01-18 16:21:42-08:00, mtaylor@qualinost.(none) +9 -0
    Added version script information to actually version the symbols. 

  ndb/src/Makefile.am@1.12.1.2, 2007-01-18 16:21:42-08:00, mtaylor@qualinost.(none) +1 -1
    Added version script information to actually version the symbols. 

ChangeSet@1.1616.2948.1, 2007-01-18 16:53:49-07:00, malff@weblab.(none) +3 -0
  Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts)
  WL#3681 (ALTER TABLE ORDER BY)
  
  Before this fix, the ALTER TABLE statement implemented an ORDER BY option
  with the following characteristics :
  
  1) The order by clause accepts a list of criteria, with optional ASC or
  DESC keywords
  
  2) Each criteria can be a general expression, involving operators,
  native functions, stored functions, user defined functions, subselects ...
  
  With this fix :
  
  1) has been left unchanged, since it's a de-facto existing feature,
  that was already present in the code base and partially covered in the test
  suite. Code coverage for ASC and DESC was missing and has been improved.
  
  2) has been changed to limit the kind of criteria that are permissible:
  now only a column name is valid.

  mysql-test/r/alter_table.result@1.40.1.13, 2007-01-18 16:53:47-07:00, malff@weblab.(none) +113 -0
    Prevent ALTER TABLE ORDER BY clauses to use general expressions.

  mysql-test/t/alter_table.test@1.29.1.14, 2007-01-18 16:53:47-07:00, malff@weblab.(none) +66 -0
    Prevent ALTER TABLE ORDER BY clauses to use general expressions.

  sql/sql_yacc.yy@1.203.1.200, 2007-01-18 16:53:47-07:00, malff@weblab.(none) +24 -1
    Prevent ALTER TABLE ORDER BY clauses to use general expressions.

ChangeSet@1.1810.2372.56, 2007-01-18 14:21:50-08:00, mtaylor@qualinost.(none) +1 -0
  Incrementing soname to 2 for 5.0 branch.

  configure.in@1.245.75.4, 2007-01-18 14:21:48-08:00, mtaylor@qualinost.(none) +1 -1
    Incrementing soname to 2 for 5.0 branch.

ChangeSet@1.1616.2938.13, 2007-01-18 13:30:01-08:00, mtaylor@qualinost.(none) +2 -0
  Adding support for versioned libndbclient.so. bug #13522

  configure.in@1.201.64.20, 2007-01-18 13:30:00-08:00, mtaylor@qualinost.(none) +7 -0
    Added variables to support ndbclient library versioning.
    Set version to 1.0.0 for 4.1

  ndb/src/Makefile.am@1.12.1.1, 2007-01-18 13:30:00-08:00, mtaylor@qualinost.(none) +2 -0
    Making use of new variables. Adding support for versioned libraries.

ChangeSet@1.1810.2513.1, 2007-01-18 17:33:38+02:00, gkodinov@macbook.gmz +3 -0
  Bug #25382: Passing NULL to an UDF called from stored procedures 
   crashes server
   Check for null value is reliable only after calling some of the 
   val_xxx() methods. If the val_xxx() method is not called
   the null_value flag will be set only for certain types of NULL
   values (like SQL constant NULLs for example).
   This caused a crash while trying to dereference a NULL pointer
   that is returned by val_str() for NULL values.
   Fixed by swapping the order of val_xxx() and null_value check.

  mysql-test/r/udf.result@1.3.1.8, 2007-01-18 17:33:31+02:00, gkodinov@macbook.gmz +34 -0
    Bug #25382: Passing NULL to an UDF called from stored procedures 
     crashes server
     - test case

  mysql-test/t/udf.test@1.8.1.4, 2007-01-18 17:33:32+02:00, gkodinov@macbook.gmz +47 -0
    Bug #25382: Passing NULL to an UDF called from stored procedures 
     crashes server
     - test case

  sql/item_func.cc@1.270.38.1, 2007-01-18 17:33:33+02:00, gkodinov@macbook.gmz +6 -3
    Bug #25382: Passing NULL to an UDF called from stored procedures 
     crashes server
     - reliably check null_value

ChangeSet@1.1810.2509.1, 2007-01-18 12:48:17+03:00, kroki@moonlight.home +3 -0
  Bug#24404: strange bug with view+permission+prepared statement.
  
  The problem was that if a prepared statement accessed a view, the
  access to the tables listed in the query after that view was done in
  the security context of the view.
  
  The bug was in the assigning of the security context to the tables
  belonging to a view: we traversed the list of all query tables
  instead.  It didn't show up in the normal (non-prepared) statements
  because of the different order of the steps of checking privileges
  and descending into a view for normal and prepared statements.
  
  The solution is to traverse the list and stop once the last table
  belonging to the view was processed.

  mysql-test/r/view_grant.result@1.8.7.1, 2007-01-18 12:48:15+03:00, kroki@moonlight.home +43 -0
    Add result for bug#24404: strange bug with view+permission+prepared
    statement.

  mysql-test/t/view_grant.test@1.8.7.1, 2007-01-18 12:48:15+03:00, kroki@moonlight.home +71 -1
    Add test case for bug#24404: strange bug with view+permission+prepared
    statement.

  sql/sql_view.cc@1.78.17.1, 2007-01-18 12:48:15+03:00, kroki@moonlight.home +7 -3
    Remove dead line.
    When setting security context, we should traverse the list of tables
    belonging to a given view, not all query tables.  We achieve that by
    stopping at the first table past view_tables_tail.

ChangeSet@1.1810.2460.32, 2007-01-17 20:13:45-08:00, igor@olga.mysql.com +6 -0
  Fixed bug #25580: incorrect stored representations of views in cases
  when they contain the '!' operator.
  Added an implementation for the method Item_func_not::print. 
  The method encloses any NOT expression into extra parentheses to avoid
  incorrect stored representations of views that use the '!' operators.
  Without this change when a view was created that contained
  the expression !0*5  its stored representation contained not this
  expression but rather the expression not(0)*5 . 
  The operator '!' is of a higher precedence than '*', while NOT is 
  of a lower precedence than '*'. That's why the expression !0*5 
  is interpreted as not(0)*5, while the expression not(0)*5 is interpreted
  as not((0)*5) unless sql_mode is set to HIGH_NOT_PRECEDENCE.
  Now we translate !0*5 into (not(0))*5. 

  mysql-test/r/sp-code.result@1.5.2.1, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix of bug 25580.

  mysql-test/r/subselect.result@1.134.12.1, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +5 -5
    Adjusted results after the fix of bug 25580.

  mysql-test/r/view.result@1.138.28.2, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #25580.

  mysql-test/t/view.test@1.126.26.1, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #25580.

  sql/item_cmpfunc.cc@1.187.18.1, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +16 -0
    Fixed bug #25580: incorrect stored representations of views in cases
    when they contain the '!' operator.
    Added an implementation for the method Item_func_not::print. 
    The method encloses the NOT expression into extra parenthesis to avoid
    incorrect stored representations of views that use the '!' operators.

  sql/item_cmpfunc.h@1.122.8.2, 2007-01-17 20:13:43-08:00, igor@olga.mysql.com +1 -0
    Fixed bug #25580: incorrect stored representations of views in cases
    when they contain the '!' operator.
    Added an implementation for the method Item_func_not::print. 
    The method encloses the NOT expression into extra parenthesis to avoid
    incorrect stored representations of views that use the '!' operators.

ChangeSet@1.1810.2460.31, 2007-01-15 14:01:36-08:00, igor@olga.mysql.com +1 -0
  Adjusted results after merge 4.1 -> 5.0 for the patch fixing bug 24776.

  mysql-test/r/range.result@1.44.1.9, 2007-01-15 14:01:35-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after merge 4.1 -> 5.0 for the patch fixing bug 24776.

ChangeSet@1.1810.2460.29, 2007-01-15 22:40:39+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Fix for crashes on 64bit platforms after fixing bug#23417.

  sql/sql_select.cc@1.312.1.168, 2007-01-15 22:40:19+03:00, evgen@moonbone.local +5 -3
    Fix for crashes on 64bit platforms after fixing bug#23417.

ChangeSet@1.1810.2498.1, 2007-01-15 19:15:52+02:00, gkodinov@macbook.gmz +3 -0
  BUG#20420: optimizer reports wrong keys on left join with IN
   The optimizer needs to evaluate whether predicates are better
   evaluated using an index. IN is one such predicate.
   To qualify an IN predicate must involve a field of the index
   on the left and constant arguments on the right.
   However whether an expression is a constant can be determined only
   by knowing the preceding tables in the join order. 
   Assuming that only IN predicates with expressions on the right that
   are constant for the whole query qualify limits the scope of 
   possible optimizations of the IN predicate (more specifically it
   doesn't allow the "Range checked for each record" optimization for
   such an IN predicate.
   Fixed by not pre-determining the optimizability of the IN predicate
   in the case when all right IN operands are not SQL constant expressions

  mysql-test/r/func_in.result@1.28.3.1, 2007-01-15 19:15:46+02:00, gkodinov@macbook.gmz +43 -0
    BUG#20420: optimizer reports wrong keys on left join with IN
     - test case

  mysql-test/t/func_in.test@1.22.3.1, 2007-01-15 19:15:47+02:00, gkodinov@macbook.gmz +36 -0
    BUG#20420: optimizer reports wrong keys on left join with IN
     - test case

  sql/item_cmpfunc.h@1.122.7.2, 2007-01-15 19:15:48+02:00, gkodinov@macbook.gmz +5 -1
    BUG#20420: optimizer reports wrong keys on left join with IN
     - cannot decide on the optimizability of a function without
       knowing the tables before it in the join order

ChangeSet@1.2389.1.2, 2007-01-15 13:39:28+04:00, gluh@mysql.com +5 -0
  Bug#21713 incorrect value for the REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME column
  added new field 'REFERENCED_TABLE_NAME' to 'referential_constraints' table
  field 'UNIQUE_CONSTRAINT_NAME' contains the name of the referenced index

  mysql-test/r/information_schema_inno.result@1.11, 2007-01-15 13:39:26+04:00, gluh@mysql.com +8 -8
    result fix

  mysql-test/t/information_schema_inno.test@1.8, 2007-01-15 13:39:26+04:00, gluh@mysql.com +3 -4
    test fix

  sql/sql_show.cc@1.381.1.2, 2007-01-15 13:39:27+04:00, gluh@mysql.com +4 -1
    added new field 'REFERENCED_TABLE_NAME' to 'referential_constraints' table
    field 'UNIQUE_CONSTRAINT_NAME' contains the name of the referenced index

  sql/table.h@1.158, 2007-01-15 13:39:27+04:00, gluh@mysql.com +1 -0
    added 'referenced_key_name' member to 'st_foreign_key_info' struct

  storage/innobase/handler/ha_innodb.cc@1.320, 2007-01-15 13:39:27+04:00, gluh@mysql.com +8 -2
    added the filling of referenced key name

ChangeSet@1.1616.2924.11, 2007-01-13 10:49:26-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #24776: an assertion abort in handler::ha_index_init
  for queries using 'range checked for each record'.
  The problem was fixed in 5.0 by the patch for bug 12291.
  This patch down-ported the corresponding code from 5.0 into 
  QUICK_SELECT::init() and added a new test case. 

  mysql-test/r/range.result@1.19.3.9, 2007-01-13 10:49:24-08:00, igor@olga.mysql.com +43 -0
    Added a test case for bug #24776.

  mysql-test/t/range.test@1.12.6.1, 2007-01-13 10:49:24-08:00, igor@olga.mysql.com +43 -0
    Added a test case for bug #24776.

  sql/opt_range.h@1.28.1.16, 2007-01-13 10:49:24-08:00, igor@olga.mysql.com +2 -0
    Fixed bug #24776: an assertion abort in handler::ha_index_init
    for queries using 'range checked for each record'.
    The problem was fixed in 5.0 by the patch for bug 12291.
    The patch for 4.1 down-ported the corresponding code from 5.0 into 
    QUICK_SELECT::init(). 

ChangeSet@1.1810.2494.1, 2007-01-12 13:43:25-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #25398: crash in a trigger when using trigger fields 
  in a select list.
  The objects of the Item_trigger_field class inherited the implementations
  of the methods copy_or_same, get_tmp_table_item and get_tmp_table_field
  from the class Item_field while they rather should have used the default
  implementations defined for the base class Item.
  It could cause catastrophic problems for triggers that used SELECTs
  with select list containing trigger fields such as NEW.<table column>
  under DISTINCT.

  mysql-test/r/trigger.result@1.29.11.4, 2007-01-12 13:43:23-08:00, igor@olga.mysql.com +32 -0
    Added a test case for bug #25398.

  mysql-test/t/trigger.test@1.34.15.1, 2007-01-12 13:43:23-08:00, igor@olga.mysql.com +46 -0
    Added a test case for bug #25398.

  sql/item.h@1.183.16.4, 2007-01-12 13:43:23-08:00, igor@olga.mysql.com +3 -0
    Fixed bug #25398: crash in a trigger when using trigger fields 
    in a select list.
    The objects of the Item_trigger_field class inherited the implementations
    of the methods copy_or_same, get_tmp_table_item and get_tmp_table_field
    from the class Item_field while they rather should have used the default
    implementations defined for the base class Item.
    It could cause catastrophic problems for triggers that used SELECTs
    with select list containing trigger fields such as NEW.<table column>
    under DISTINCT.

ChangeSet@1.1810.2493.2, 2007-01-12 23:22:41+03:00, sergefp@mysql.com +14 -0
  BUG#24127: (a,b) IN (SELECT c,d ...) can produce wrong results if a and/or b are NULLs:
  - Make the code produce correct result: use an array of triggers to turn on/off equalities for each
    compared column. Also turn on/off optimizations based on those equalities.
  - Make EXPLAIN output show "Full scan on NULL key" for tables for which we switch between
    ref/unique_subquery/index_subquery and ALL access.
  - index_subquery engine now has HAVING clause when it is needed, and it is
    displayed in EXPLAIN EXTENDED
  - Fix incorrect presense of "Using index" for index/unique-based subqueries (BUG#22930)
  // bk trigger note: this commit refers to BUG#24127

  mysql-test/r/ndb_subquery.result@1.3.1.1, 2007-01-12 23:22:36+03:00, sergefp@mysql.com +3 -3
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Updated test results (checked)

  mysql-test/r/subselect.result@1.134.1.35, 2007-01-12 23:22:36+03:00, sergefp@mysql.com +14 -14
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Updated test results (checked)

  mysql-test/r/subselect2.result@1.14, 2007-01-12 23:22:36+03:00, sergefp@mysql.com +5 -5
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Updated test results (checked)

  mysql-test/r/subselect3.result@1.1.1.2, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +404 -4
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Testcases

  mysql-test/t/subselect3.test@1.3, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +281 -10
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Testcases

  sql/item_cmpfunc.cc@1.187.1.42, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +29 -5
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - For row-based IN subqueries, use one flag per each column. Set the flags appropriately before
      running the subquery. 

  sql/item_cmpfunc.h@1.122.2.13, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +1 -0
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
     - Added Item_func_trig_cond::get_triv_var()

  sql/item_subselect.cc@1.113.1.35, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +156 -111
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Item_subselect::exec() and subselect_*_engine::exec() don't have parameter
      anymore - now Item_subselect owns the pushed down predicates guard flags.
    - A correct set of conditional predicates is now pushed into row-based IN 
      subquery.
    - select_indexsubquery_engine now has "HAVING clause" (needed for correct query
      results), and it is shown in EXPLAIN EXTENDED

  sql/item_subselect.h@1.77.1.9, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +75 -17
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Item_subselect::exec() and subselect_*_engine::exec() don't have parameter
      anymore - now Item_subselect owns the pushed down predicates guard flags.
    - A correct set of conditional predicates is now pushed into row-based IN 
      subquery.
    - select_indexsubquery_engine now has "HAVING clause" (needed for correct query
      results), and it is shown in EXPLAIN EXTENDED

  sql/mysql_priv.h@1.290.83.1, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +1 -1
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Added "in_having_cond" special Item name

  sql/mysqld.cc@1.439.87.2, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +3 -0
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Added "in_having_cond" special Item name

  sql/sql_lex.h@1.175.33.1, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +1 -1
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)

  sql/sql_select.cc@1.312.120.1, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +120 -76
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Make "ref" analyzer be able to work with conditional equalities
    - Fix subquery optimization code to match the changes in what kinds of 
      conditions are pushed down into subqueries 
    - Fix wrong EXPLAIN output in some queries with subquery (BUG#22390)

  sql/sql_select.h@1.92.1.23, 2007-01-12 23:22:37+03:00, sergefp@mysql.com +39 -3
    BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...)
    - Make "ref" analyzer be able to work with conditional equalities
    - Fix wrong EXPLAIN output in some queries with subquery (BUG#22390)

ChangeSet@1.1810.2493.1, 2007-01-12 22:11:40+03:00, sergefp@mysql.com +4 -0
  BUG#24085: Wrong result for NULL IN (SELECT not_null_val FROM ...)
  When transforming "oe IN (SELECT ie ...)" wrap the pushed-down predicates
  iff "oe can be null", not "ie can be null".
  The fix doesn't cover row-based subqueries, those will be fixed in #24127.

  mysql-test/r/subselect.result@1.134.1.34, 2007-01-12 22:11:37+03:00, sergefp@mysql.com +2 -2
    BUG#24085: Wrong result for NULL IN (SELECT not_null_val FROM ...)
    Update the test results (checked)

  mysql-test/r/subselect3.result@1.1.1.1, 2007-01-12 22:11:37+03:00, sergefp@mysql.com +84 -6
    BUG#24085: Wrong result for NULL IN (SELECT not_null_val FROM ...)
    - Testcase

  mysql-test/t/subselect3.test@1.2, 2007-01-12 22:11:37+03:00, sergefp@mysql.com +69 -2
    BUG#24085: Wrong result for NULL IN (SELECT not_null_val FROM ...)
    - Testcase

  sql/item_subselect.cc@1.113.1.34, 2007-01-12 22:11:37+03:00, sergefp@mysql.com +25 -14
    BUG#24085: Wrong result for NULL IN (SELECT not_null_val FROM ...)
    When transforming "oe IN (SELECT ie ...)" we should make special 
    provisions (wrap the pushed predicates) if we can encounter 
    NULL IN (SELECT ...), i.e. when oe->maybe_null. The code was checking
    for ie->maybe_null instead, fixed it for single value based subqueries.
    
    Row-based subqueries (e.g. (a,b) IN (SELECT c,d ...)) are not fixed 
    because they won't produce correct results for several other reasons 
    (filed as #24085)

ChangeSet@1.1810.2460.26, 2007-01-12 17:35:24+03:00, evgen@moonbone.local +1 -0
  func_str.result:
    After merge fix

  mysql-test/r/func_str.result@1.110.1.16, 2007-01-12 17:34:59+03:00, evgen@moonbone.local +3 -3
    After merge fix

ChangeSet@1.2382.2.1, 2007-01-12 15:46:20+04:00, holyfoot@mysql.com +3 -0
  bug #24186 (nested query across partitions returns fewer records)
  
  Subselect's engine checks table->status field to determine if the
  record was properly found when we use keyread upon the table.
  Partition engine checks all the partitions for given key
  before return. So if matching record was found in the first
  partition and no matching records were found in the second, 
  we have table->status == NOT_FOUND after the function, what
  makes subselects to skip matching records.
  The patch adds table->status= 0 if we actually found something.

  mysql-test/r/partition.result@1.58, 2007-01-12 15:46:14+04:00, holyfoot@mysql.com +81 -0
    result fixed

  mysql-test/t/partition.test@1.52, 2007-01-12 15:46:14+04:00, holyfoot@mysql.com +93 -0
    testcase

  sql/ha_partition.cc@1.82, 2007-01-12 15:46:14+04:00, holyfoot@mysql.com +3 -0
    table->status set to 0 if we found something in previous partitions

ChangeSet@1.1810.2489.1, 2007-01-11 23:18:01+03:00, evgen@moonbone.local +10 -0
  Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
  
  Currently in the ONLY_FULL_GROUP_BY mode no hidden fields are allowed in the
  select list. To ensure this each expression in the select list is checked
  to be a constant, an aggregate function or to occur in the GROUP BY list.
  The last two requirements are wrong and doesn't allow valid expressions like
  "MAX(b) - MIN(b)" or "a + 1" in a query with grouping by a.
  
  The correct check implemented by the patch will ensure that:
  any field reference in the [sub]expressions of the select list 
    is under an aggregate function or
    is mentioned as member of the group list or
    is an outer reference or
    is part of the select list element that coincide with a grouping element.
  
  The Item_field objects now can contain the position of the select list
  expression which they belong to. The position is saved during the
  field's Item_field::fix_fields() call.
  
  The non_agg_fields list for non-aggregated fields is added to the SELECT_LEX
  class. The SELECT_LEX::cur_pos_in_select_list now contains the position in the
  select list of the expression being currently fixed.

  mysql-test/r/group_by.result@1.69.1.7, 2007-01-11 23:17:42+03:00, evgen@moonbone.local +102 -0
    Added a test case for the bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.

  mysql-test/t/group_by.test@1.59.1.3, 2007-01-11 23:17:43+03:00, evgen@moonbone.local +51 -0
    Added a test case for the bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.

  sql/item.cc@1.113.62.4, 2007-01-11 23:17:37+03:00, evgen@moonbone.local +21 -2
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    The Item_field objects now contain the position of the select list
    expression which they belong to. The position is saved at the field's
    Item_field::fix_fields() call.

  sql/item.h@1.183.16.3, 2007-01-11 23:17:39+03:00, evgen@moonbone.local +2 -1
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    The Item_field objects now can store the position in the select list of the
    expression to which they are belongs to.

  sql/mysql_priv.h@1.290.82.3, 2007-01-11 23:17:39+03:00, evgen@moonbone.local +2 -1
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    Added the UNDEF_POS constant.

  sql/sql_base.cc@1.235.80.1, 2007-01-11 23:17:39+03:00, evgen@moonbone.local +4 -0
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    Now the setup_fields() function maintains the cur_pos_in_select_list variable.

  sql/sql_lex.cc@1.142.31.4, 2007-01-11 23:17:40+03:00, evgen@moonbone.local +2 -0
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    Set the cur_pos_in_select_list variable and the non_agg_fields list to their initial state.

  sql/sql_lex.h@1.175.32.1, 2007-01-11 23:17:40+03:00, evgen@moonbone.local +4 -0
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    The non_agg_fields list for non-aggregated fields is added to the SELECT_LEX
    class. The SELECT_LEX::cur_pos_in_select_list now stores the position in the
    select list of the expression being currently fixed.

  sql/sql_select.cc@1.312.1.167, 2007-01-11 23:17:41+03:00, evgen@moonbone.local +56 -22
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    Each select now keeps the list of fields that aren't
    used under any aggregate function. If an expression from the select list
    isn't found in the GROUP BY list the setup_group() function additionally
    checks whether non-aggregated fields occur in that expression.
    If there at least one such field and it isn't found in the GROUP BY list
    then an error is thrown.

  sql/sql_union.cc@1.130.3.2, 2007-01-11 23:17:41+03:00, evgen@moonbone.local +1 -0
    Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.
    Clean up of the non_agg_fields list.

ChangeSet@1.1616.2924.10, 2007-01-11 16:45:38+03:00, evgen@moonbone.local +4 -0
  Bug#23409: Arguments of the ENCODE() and the DECODE() functions were not printed
  correctly.
  
  The Item_func::print method was used to print the Item_func_encode and the
  Item_func_decode objects. The last argument to ENCODE and DECODE functions
  is a plain C string and thus Item_func::print wasn't able to print it.
  
  The print() method is added to the Item_func_encode class. It correctly
  prints the Item_func_encode and the Item_func_decode objects.

  mysql-test/r/func_str.result@1.70.1.34, 2007-01-11 16:43:01+03:00, evgen@moonbone.local +13 -1
    Added a test case for bug#23409: Arguments of the ENCODE() and the DECODE() functions were not printed correctly.

  mysql-test/t/func_str.test@1.64.1.22, 2007-01-11 16:42:29+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#23409: Arguments of the ENCODE() and the
    > DECODE() functionswere not printed correctly.

  sql/item_strfunc.cc@1.196.6.20, 2007-01-11 16:44:59+03:00, evgen@moonbone.local +13 -0
    Bug#23409: Arguments of the ENCODE() and the DECODE() functions were not printed correctly.
    The print() method is added to the Item_func_encode class. It correctly
    prints the Item_func_encode and the Item_func_decode objects.

  sql/item_strfunc.h@1.73.2.20, 2007-01-11 16:44:43+03:00, evgen@moonbone.local +8 -3
    Bug#23409: Arguments of the ENCODE() and the DECODE() functions were not printed correctly.
    The print() method is added to the Item_func_encode class.

ChangeSet@1.1616.2905.3, 2007-01-11 16:05:03+03:00, evgen@moonbone.local +3 -0
  Bug#17711: DELETE doesn't use index when ORDER BY, LIMIT and non-restricting
  WHERE is present.
  
  If a DELETE statement with ORDER BY and LIMIT contains a WHERE clause
  with conditions that for sure cannot be used for index access (like in
  WHERE @var:= field) the execution always follows the filesort path.    
  It happens currently even when for the above case there is an index that
  can be used to speedup sorting by the order by list.
  
  Now if a DELETE statement with ORDER BY and LIMIT contains such WHERE
  clause conditions that cannot be used to build any quick select then
  the mysql_delete() tries to use an index like there is no WHERE clause at all.

  mysql-test/r/delete.result@1.21.1.3, 2007-01-11 16:04:02+03:00, evgen@moonbone.local +7 -0
    Added a test case for bug#17711: DELETE doesn't use index when ORDER BY, LIMIT and non-restricting WHERE is present.

  mysql-test/t/delete.test@1.19.1.4, 2007-01-11 16:03:54+03:00, evgen@moonbone.local +10 -0
    Added a test case for bug#17711: DELETE doesn't use index when ORDER BY, LIMIT and non-restricting
    WHERE is present.

  sql/sql_delete.cc@1.99.2.44, 2007-01-11 16:04:10+03:00, evgen@moonbone.local +1 -1
    Bug#17711: DELETE doesn't use index when ORDER BY, LIMIT and non-restricting WHERE is present.
    Now if a DELETE statement with ORDER BY and LIMIT contains such WHERE
    clause conditions that cannot be used to build any quick select then
    the mysql_delete() tries to use an index like there is no WHERE clause at all.

ChangeSet@1.1810.2477.3, 2007-01-10 19:05:13+02:00, jani@ua141d10.elisa.omakaista.fi +1 -0
  New file for autopush. To disable (known) compiler warnings.

  support-files/disabled_compiler_warnings.txt@1.1, 2007-01-10 19:04:39+02:00, jani@ua141d10.elisa.omakaista.fi +12 -0
    BitKeeper file /home/my/bk/mysql-5.0/support-files/disabled_compiler_warnings.txt

  support-files/disabled_compiler_warnings.txt@1.0, 2007-01-10 19:04:39+02:00, jani@ua141d10.elisa.omakaista.fi +0 -0

ChangeSet@1.1810.2480.1, 2007-01-10 16:55:53+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
  Added two possible error cases for a test.

  mysql-test/r/wait_timeout.result@1.4, 2007-01-10 16:55:49+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Added two possible error cases for a test. Depending
    on a platform, either errno can occur and is correct.
    
    Possible errors are CR_SERVER_GONE_ERROR and
    CR_SERVER_LOST

  mysql-test/t/wait_timeout.test@1.1.1.8, 2007-01-10 16:55:50+02:00, jani@ua141d10.elisa.omakaista.fi +4 -2
    Added two possible error cases for a test. Depending
    on a platform, either errno can occur and is correct.
    
    Possible errors are CR_SERVER_GONE_ERROR and
    CR_SERVER_LOST

ChangeSet@1.2303.196.1, 2006-12-22 09:59:27+08:00, dli@dev3-164.dev.cn.tlan +3 -0
  ndb - fixed for BUG#19896 Last_Errno: 4294967295, Error in Write_rows event: (error number 4 billion ?)
  
  fixed to use int instead of uint32 type to return last_slave_errno.

  sql/log_event.cc@1.245.2.1, 2006-12-22 09:59:24+08:00, dli@dev3-164.dev.cn.tlan +20 -3
    don't set -1 to last_slave_errno.

  sql/protocol.h@1.33.1.1, 2006-12-22 09:59:24+08:00, dli@dev3-164.dev.cn.tlan +2 -0
    added function store(int from) to return last_slave_errno.

  sql/slave.cc@1.287.1.1, 2006-12-22 09:59:25+08:00, dli@dev3-164.dev.cn.tlan +1 -1
    should use int instead of uint32 type to return last_slave_errno.

ChangeSet@1.1616.2906.10, 2006-12-18 17:38:59+04:00, ramil@mysql.com +1 -0
  Fix for bug #10798: If relay log fails to rotate, slave will crash after
  
  The relay log may not be open for some reason (e.g. disk error) after rotation,
  and using it causes the slave crash.
  
  Fix: check we have it open before access, return error otherwise.

  sql/slave.cc@1.188.1.97, 2006-12-18 17:38:57+04:00, ramil@mysql.com +7 -0
    Fix for bug #10798: If relay log fails to rotate, slave will crash after
      - check if the relay log is open before any access.

ChangeSet@1.2336.1.6, 2006-12-15 17:49:13+00:00, lzhou@dev3-63.dev.cn.tlan +2 -0
  BUG#22261 remove global variable global_mgmt_server_check from ClusterMgr

  storage/ndb/src/mgmsrv/main.cpp@1.52, 2006-12-15 17:49:07+00:00, lzhou@dev3-63.dev.cn.tlan +0 -4
    Remove global variable global_mgmt_server_check

  storage/ndb/src/ndbapi/ClusterMgr.cpp@1.32, 2006-12-15 17:49:07+00:00, lzhou@dev3-63.dev.cn.tlan +1 -3
    Change another method to test whether the node is mgmsrv or not

ChangeSet@1.1810.2443.2, 2006-12-15 06:21:15+02:00, monty@mysql.com +5 -0
  After merge fixes:
  - Remove compiler warnings
  - Fix merge errors
  - Indentation fixes

  sql/ha_ndbcluster.cc@1.175.1.118, 2006-12-15 06:21:13+02:00, monty@mysql.com +9 -9
    After merge fixes

  sql/slave.cc@1.241.1.47, 2006-12-15 06:21:13+02:00, monty@mysql.com +3 -1
    After merge fixes

  sql/sp.cc@1.82.1.43, 2006-12-15 06:21:13+02:00, monty@mysql.com +0 -5
    After merge fixes

  sql/sql_table.cc@1.239.1.91, 2006-12-15 06:21:13+02:00, monty@mysql.com +8 -6
    After merge fixes

  sql/sql_view.cc@1.78.1.24, 2006-12-15 06:21:13+02:00, monty@mysql.com +6 -4
    After merge fixes

ChangeSet@1.1810.2383.13, 2006-12-15 00:51:37+02:00, monty@mysql.com +227 -0
  Fixed compiler warnings detected by option -Wshadow and -Wunused:
  - Removed not used variables and functions
  - Added #ifdef around code that is not used
  - Renamed variables and functions to avoid conflicts
  - Removed some not used arguments
  
  Fixed some class/struct warnings in ndb
  Added define IS_LONGDATA() to simplify code in libmysql.c
  
  I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes

  BUILD/SETUP.sh@1.44.1.18, 2006-12-15 00:51:28+02:00, monty@mysql.com +6 -3
    Added printing of unused functions and variables.
    Made it easy to test compiling with -Wshadow

  BUILD/compile-pentium-gcov@1.14.2.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -1
    Added warnings
    Mark binary with -gcov

  ndb/src/kernel/vm/MetaData.hpp@1.4.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  client/mysql.cc@1.199.19.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +34 -33
    Fixed warnings found with gcc -Wshadow

  client/mysql_upgrade.c@1.6.4.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  client/mysqlbinlog.cc@1.123.5.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +33 -29
    Fixed warnings found with gcc -Wshadow

  client/mysqldump.c@1.214.21.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +11 -9
    Fixed warnings found with gcc -Wshadow

  client/mysqltest.c@1.155.28.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +62 -72
    Fixed warnings found with gcc -Wshadow

  client/sql_string.cc@1.26, 2006-12-15 00:51:28+02:00, monty@mysql.com +32 -18
    Fixed warnings found with gcc -Wshadow
    Merged with sql/sql_string.cc

  client/sql_string.h@1.16, 2006-12-15 00:51:28+02:00, monty@mysql.com +5 -1
    Fixed warnings found with gcc -Wshadow
    Merged with sql/sql_string.h

  cmd-line-utils/readline/display.c@1.16, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  cmd-line-utils/readline/histexpand.c@1.13, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/input.c@1.14, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/text.c@1.8, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow
    

  cmd-line-utils/readline/vi_mode.c@1.14, 2006-12-15 00:51:28+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow
    

  dbug/dbug_analyze.c@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +27 -27
    Fixed warnings found with gcc -Wshadow
    

  extra/my_print_defaults.c@1.24, 2006-12-15 00:51:28+02:00, monty@mysql.com +5 -4
    Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables

  extra/yassl/include/buffer.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  extra/yassl/include/crypto_wrapper.hpp@1.6, 2006-12-15 00:51:28+02:00, monty@mysql.com +6 -0
    Fixed compiler warnings

  extra/yassl/include/yassl_imp.hpp@1.6.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +16 -1
    Fixed compiler warnings

  extra/yassl/include/yassl_int.hpp@1.11.2.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/src/crypto_wrapper.cpp@1.10, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/benchmark/benchmark.cpp@1.3, 2006-12-15 00:51:28+02:00, monty@mysql.com +16 -16
    Fixed warnings found with gcc -Wshadow
    

  extra/yassl/taocrypt/include/algebra.hpp@1.4.2.2, 2006-12-15 00:51:28+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/des.hpp@1.4.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/hash.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  extra/yassl/taocrypt/include/hmac.hpp@1.7, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/modarith.hpp@1.4, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/modes.hpp@1.7.1.1, 2006-12-15 00:51:28+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/include/rsa.hpp@1.3.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +19 -15
    Fixed compiler warnings

  extra/yassl/taocrypt/mySTL/list.hpp@1.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed compiler warnings

  extra/yassl/taocrypt/src/aes.cpp@1.4.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +9 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/src/algebra.cpp@1.11.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  extra/yassl/taocrypt/src/asn.cpp@1.12, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  extra/yassl/taocrypt/test/test.cpp@1.3.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +46 -46
    Fixed compiler warnings

  extra/yassl/testsuite/testsuite.cpp@1.5, 2006-12-15 00:51:29+02:00, monty@mysql.com +7 -6
    Fixed compiler warnings

  include/m_ctype.h@1.114.1.10, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed warnings found with gcc -Wshadow

  include/my_pthread.h@1.90.4.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed warnings found with gcc -Wshadow

  include/my_sys.h@1.178.9.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +4 -3
    Fixed warnings found with gcc -Wshadow

  include/my_time.h@1.11.1.6, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -5
    Fixed warnings found with gcc -Wshadow

  include/mysql.h@1.154.8.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -1
    Fixed warnings found with gcc -Wshadow
    Added define IS_LONGDATA() to simplify code in libmysql.c

  libmysql/libmysql.c@1.233.10.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +129 -121
    Fixed warnings found with gcc -Wshadow
    (Mostly replaced bind -> my_bind and time -> my_time)

  libmysqld/lib_sql.cc@1.107.5.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -2
    Removed not used variables and labels

  mysql-test/r/mysqlcheck.result@1.1.1.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -0
    Remove databases and tables possible left by previous test

  mysql-test/r/mysqltest.result@1.24.7.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    New test results

  mysql-test/t/mysql.test@1.4.9.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +11 -1
    Coverage tests

  mysql-test/t/mysqlbinlog.test@1.21.4.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -0
    Coverage tests

  mysql-test/t/mysqlcheck.test@1.1.1.2, 2006-12-15 00:51:29+02:00, monty@mysql.com +9 -0
    Remove databases and tables possible left by previous test

  mysql-test/t/mysqltest.test@1.24.7.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +20 -0
    Coverage tests

  mysys/default.c@1.72.1.12, 2006-12-15 00:51:29+02:00, monty@mysql.com +19 -19
    Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions

  mysys/mf_iocache2.c@1.27.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +13 -13
    Fixed warnings found with gcc -Wshadow

  mysys/mf_keycache.c@1.55.1.3, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -2
    Fixed warnings found with gcc -Wshadow

  mysys/my_bitmap.c@1.25.1.10, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  mysys/sha1.c@1.7, 2006-12-15 00:51:29+02:00, monty@mysql.com +6 -6
    Fixed warnings found with gcc -Wshadow

  server-tools/instance-manager/commands.h@1.9.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/guardian.cc@1.20.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  server-tools/instance-manager/instance_options.cc@1.29.1.4, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  server-tools/instance-manager/mysql_connection.cc@1.14.1.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  server-tools/instance-manager/options.cc@1.30.2.4, 2006-12-15 00:51:31+02:00, monty@mysql.com +8 -8
    Fixed compiler warnings

  server-tools/instance-manager/options.h@1.14.1.3, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/parse.cc@1.13.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  server-tools/instance-manager/user_map.cc@1.15.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  server-tools/instance-manager/user_map.h@1.5.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  sql-common/client.c@1.83.13.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Removed not used variable

  sql-common/my_time.c@1.19.11.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +29 -28
    Removed not used variable
    time -> my_time

  sql/field.cc@1.256.36.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +95 -102
    Fixed compiler warnings

  sql/field.h@1.153.17.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +27 -27
    Fixed compiler warnings

  sql/filesort.cc@1.105.4.2, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -1
    Fixed compiler warnings

  sql/ha_ndbcluster.cc@1.175.62.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +43 -48
    Fixed compiler warnings

  sql/handler.cc@1.167.27.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +2 -7
    Fixed compiler warnings

  sql/item.cc@1.113.61.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +32 -31
    Fixed compiler warnings

  sql/item.h@1.183.15.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +19 -18
    Fixed compiler warnings
    new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
    el() -> element_index()

  sql/item_cmpfunc.cc@1.187.15.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +40 -37
    Fixed compiler warnings

  sql/item_cmpfunc.h@1.122.6.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  sql/item_func.cc@1.270.32.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +11 -9
    Fixed compiler warnings

  sql/item_geofunc.cc@1.27.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +3 -2
    Fixed compiler warnings

  sql/item_row.h@1.21.1.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/item_strfunc.cc@1.261.17.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -11
    Fixed compiler warnings

  sql/item_subselect.cc@1.113.12.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +20 -21
    Fixed compiler warnings

  sql/item_subselect.h@1.77.5.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  sql/item_sum.cc@1.170.12.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +11 -14
    Fixed compiler warnings

  sql/item_timefunc.cc@1.100.23.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings

  sql/log.cc@1.158.14.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +35 -20
    Fixed compiler warnings
    More comments
    Added #ifdef HAVE_REPLICATION

  sql/log_event.cc@1.174.12.3, 2006-12-15 00:51:32+02:00, monty@mysql.com +7 -3
    Fixed compiler warnings

  sql/log_event.h@1.122.3.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  sql/mysql_priv.h@1.290.77.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -4
    query_id -> global_query_id, to avoid a lot of clashes with function and class variables
    start_time -> server_start_time

  sql/mysqld.cc@1.439.81.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +65 -35
    Fixed compiler warnings:
    - Removed not used variables
    - Added #ifndef EMBEDDED_LIBRARY
    - Fixed shadow warnings

  sql/net_serv.cc@1.88.2.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +7 -1
    Fixed compiler warnings

  sql/opt_range.cc@1.159.32.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +70 -86
    range -> last_range to avoid shadow warnings
    Removed not used function print_rowid()

  sql/opt_range.h@1.57.1.9, 2006-12-15 00:51:32+02:00, monty@mysql.com +1 -1
    range -> last_range to avoid shadow warnings
    

  sql/password.c@1.39.1.2, 2006-12-15 00:51:32+02:00, monty@mysql.com +4 -3
    Fixed compiler warnings

  sql/protocol.cc@1.111.1.8, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -1
    Fixed compiler warnings

  sql/repl_failsafe.cc@1.53.1.9, 2006-12-15 00:51:33+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings

  sql/set_var.cc@1.125.18.3, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -6
    Fixed compiler warnings

  sql/set_var.h@1.68.3.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +42 -40
    type() -> show_type()
    Fixed compiler warnings

  sql/slave.cc@1.241.1.46, 2006-12-15 00:51:33+02:00, monty@mysql.com +14 -12
    Fixed compiler warnings

  sql/sp_head.cc@1.200.9.2, 2006-12-15 00:51:33+02:00, monty@mysql.com +4 -6
    Fixed compiler warnings

  sql/sp_head.h@1.79.2.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -4
    Fixed compiler warnings

  sql/spatial.cc@1.27.2.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +12 -13
    Fixed compiler warnings

  sql/spatial.h@1.19.1.2, 2006-12-15 00:51:33+02:00, monty@mysql.com +6 -6
    length() -> geom_length() to avoid compiler warnings
    wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'

  sql/sql_cache.h@1.30.1.4, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  sql/sql_class.cc@1.223.14.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +8 -6
    Fixed compiler warnings

  sql/sql_class.h@1.230.49.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +19 -15
    log -> log_xid() to avoid compiler warnings
    Fixed shadow compiler warnings

  sql/sql_derived.cc@1.78.1.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +0 -2
    Removed not used variable

  sql/sql_insert.cc@1.146.41.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -7
    Fixed compiler warnings

  sql/sql_lex.cc@1.142.32.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +20 -17
    Fixed compiler warnings

  sql/sql_lex.h@1.175.1.59, 2006-12-15 00:51:33+02:00, monty@mysql.com +2 -1
    res -> saved_error to make the meaning of the variable clear and avoid shadow warnings

  sql/sql_load.cc@1.78.4.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +5 -1
    Fixed compiler warnings

  sql/sql_parse.cc@1.426.133.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +97 -99
    Fixed compiler warnings

  sql/sql_prepare.cc@1.142.1.46, 2006-12-15 00:51:33+02:00, monty@mysql.com +7 -6
    Fixed compiler warnings

  sql/sql_select.cc@1.312.117.4, 2006-12-15 00:51:33+02:00, monty@mysql.com +55 -50
    Fixed compiler warnings

  sql/sql_show.cc@1.253.44.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +21 -13
    Fixed compiler warnings

  sql/sql_string.cc@1.91.1.4, 2006-12-15 00:51:33+02:00, monty@mysql.com +9 -10
    Fixed compiler warnings

  sql/sql_string.h@1.60.3.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +2 -1
    Fixed compiler warnings

  sql/sql_table.cc@1.239.42.1, 2006-12-15 00:51:33+02:00, monty@mysql.com +29 -26
    Fixed compiler warnings

  sql/sql_trigger.cc@1.35.14.2, 2006-12-15 00:51:33+02:00, monty@mysql.com +9 -8
    Fixed compiler warnings

  sql/sql_trigger.h@1.19.1.4, 2006-12-15 00:51:33+02:00, monty@mysql.com +3 -2
    table -> trigger_table to avoid warnings from local variables

  sql/sql_union.cc@1.130.1.5, 2006-12-15 00:51:33+02:00, monty@mysql.com +45 -44
    Fixed compiler warnings
    (mainly res -> saved_error)

  sql/sql_update.cc@1.154.2.52, 2006-12-15 00:51:34+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/sql_view.cc@1.78.1.23, 2006-12-15 00:51:34+02:00, monty@mysql.com +0 -1
    Removed not used variable

  sql/sql_yacc.yy@1.371.87.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +1 -6
    Removed not used variable

  sql/table.cc@1.160.41.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +31 -31
    Removed not used variable

  sql/tztime.cc@1.24.1.13, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Removed not used variable

  sql/unireg.cc@1.53.1.26, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -7
    Removed not used variable

  sql/ha_archive.cc@1.60.11.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +11 -9
    Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings

  sql/ha_archive.h@1.31.3.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -2
    Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings

  sql/ha_federated.cc@1.24.19.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings

  sql/ha_heap.cc@1.71.5.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  myisam/ft_boolean_search.c@1.90.4.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +8 -8
    Fixed warnings found with gcc -Wshadow

  sql/ha_myisam.cc@1.147.8.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +45 -43
    Fixed compiler warnings

  myisam/mi_open.c@1.90.12.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  myisam/mi_search.c@1.53.8.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +7 -7
    Fixed warnings found with gcc -Wshadow

  myisam/mi_unique.c@1.22.6.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  myisam/myisampack.c@1.39.19.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -4
    Fixed warnings found with gcc -Wshadow

  myisam/rt_index.c@1.16.2.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +0 -3
    Remove not used variables

  myisam/sort.c@1.45.14.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  sql/ha_myisammrg.cc@1.59.10.1, 2006-12-15 00:51:32+02:00, monty@mysql.com +14 -14
    Fixed compiler warnings

  ndb/include/kernel/signaldata/ArbitSignalData.hpp@1.3.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warning

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.17.5.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/include/ndbapi/NdbReceiver.hpp@1.15.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -1
    Fixed warnings found with gcc -Wshadow

  ndb/include/transporter/TransporterDefinitions.hpp@1.9.7.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +5 -0
    Fixed compiler warning

  ndb/include/util/InputStream.hpp@1.3.4.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/OutputStream.hpp@1.3.2.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +2 -0
    Fixed compiler warning

  ndb/include/util/SimpleProperties.hpp@1.4.4.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/SocketAuthenticator.hpp@1.2.1.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/include/util/SocketServer.hpp@1.6.5.1, 2006-12-15 00:51:29+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/common/mgmcommon/ConfigRetriever.cpp@1.24.11.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -3
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/portlib/NdbTick.c@1.5.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/SHM_Transporter.cpp@1.14.3.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/TCP_Transporter.cpp@1.9.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/transporter/TCP_Transporter.hpp@1.4.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/common/transporter/Transporter.cpp@1.18.6.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Removed not used variable

  ndb/src/common/transporter/TransporterRegistry.cpp@1.52.13.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variable

  ndb/src/common/util/Bitmask.cpp@1.8.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +15 -15
    Moved function to avoid warnings of not used function

  ndb/src/common/util/ConfigValues.cpp@1.8.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -3
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/File.cpp@1.8.10.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/Properties.cpp@1.10.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/SocketClient.cpp@1.6.4.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -1
    Fixed wrong return value

  ndb/src/common/util/random.c@1.4.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -4
    Fixed warnings found with gcc -Wshadow

  ndb/src/common/util/socket_io.cpp@1.7.9.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/cw/cpcd/APIService.cpp@1.6.3.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/cw/cpcd/main.cpp@1.7.5.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.13.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.39.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -5
    Removed not used variables

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.20.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +6 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.8.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.12.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.31.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -9
    Removed not used variables

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.11.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +4 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.22.6.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.3.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp@1.15.2.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp@1.27.4.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp@1.14.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -1
    Removed not used variables

  ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp@1.2.5.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.17.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -4
    Removed not used variables

  ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.3.3.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.3.8.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.23.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/kernel/blocks/suma/Suma.cpp@1.19.4.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -6
    Removed not used variables

  ndb/src/kernel/blocks/suma/Suma.hpp@1.3.4.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/mgmapi/LocalConfig.cpp@1.22.1.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +9 -9
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmapi/mgmapi.cpp@1.44.32.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +6 -7
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.29.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.22.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +2 -4
    Fixed warnings found with gcc -Wshadow
    Removed not used variables

  ndb/src/mgmsrv/ConfigInfo.hpp@1.8.6.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +5 -2
    Fixed warnings found with gcc -Wshadow

  ndb/src/mgmsrv/InitConfigFileParser.cpp@1.19.4.1, 2006-12-15 00:51:30+02:00, monty@mysql.com +13 -12
    Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.42.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -4
    Removed not used variables and functions

  ndb/src/mgmsrv/MgmtSrvr.hpp@1.30.18.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/mgmsrv/Services.cpp@1.45.36.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +4 -5
    Removed not used variables and functions

  ndb/src/mgmsrv/main.cpp@1.41.8.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.6.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  ndb/src/ndbapi/Ndb.cpp@1.49.17.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbBlob.cpp@1.22.8.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.27.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -5
    Removed not used variables

  ndb/src/ndbapi/NdbIndexOperation.cpp@1.21.4.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationExec.cpp@1.18.3.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -2
    Removed not used variables

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.3.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.1.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.19.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -3
    Removed not used variables

  ndb/src/ndbapi/SignalSender.cpp@1.3.4.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variables

  ndb/src/ndbapi/ndb_cluster_connection.cpp@1.29.10.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +0 -1
    Removed not used variable

  ndb/tools/delete_all.cpp@1.16.4.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/desc.cpp@1.18.3.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/drop_index.cpp@1.13.5.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/drop_tab.cpp@1.14.3.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/listTables.cpp@1.20.4.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  ndb/tools/ndb_config.cpp@1.4.14.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +9 -4
    Fixed warnings found with gcc -Wshadow
    Added missing puts(desc)

  ndb/tools/restore/Restore.hpp@1.18.4.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -1
    Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
    Fixed compiler warning

  ndb/tools/restore/consumer.hpp@1.5.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +1 -0
    Fixed compiler warning

  ndb/tools/restore/restore_main.cpp@1.29.11.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings

  ndb/tools/select_all.cpp@1.22.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +3 -1
    Removed not used variables

  ndb/tools/select_count.cpp@1.19.2.1, 2006-12-15 00:51:31+02:00, monty@mysql.com +2 -0
    Removed not used variable

  strings/ctype-bin.c@1.66.1.6, 2006-12-15 00:51:34+02:00, monty@mysql.com +3 -3
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-cp932.c@1.11.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-eucjpms.c@1.12.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-mb.c@1.47.1.6, 2006-12-15 00:51:34+02:00, monty@mysql.com +32 -32
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-simple.c@1.75.1.5, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -7
    mblen -> mb_len to avoid compiler warnings with local variable mblen
    exp -> exponent

  strings/ctype-sjis.c@1.88.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-uca.c@1.41, 2006-12-15 00:51:34+02:00, monty@mysql.com +13 -13
    mblen -> mb_len to avoid compiler warnings with local variable mblen

  strings/ctype-ujis.c@1.69.1.3, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/ctype-utf8.c@1.97.1.5, 2006-12-15 00:51:34+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  strings/decimal.c@1.65.3.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +14 -13
    Fixed compiler warnings

  strings/my_vsnprintf.c@1.36, 2006-12-15 00:51:34+02:00, monty@mysql.com +7 -0
    Added comment

  strings/strtod.c@1.23.1.1, 2006-12-15 00:51:34+02:00, monty@mysql.com +14 -13
    Fixed compiler warnings

  tests/mysql_client_test.c@1.167.24.2, 2006-12-15 00:51:34+02:00, monty@mysql.com +1237 -1237
    Fixed compiler warnings
    (Biggest part of patch is to not get a conflict with global function 'bind')

ChangeSet@1.2336.1.4, 2006-12-14 18:10:18+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  BUG #19146 If Backup parameters incorrectly set, the data nodes can't start.

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.59.1.1, 2006-12-14 18:10:16+08:00, gni@dev3-221.dev.cn.tlan +12 -0
    If FailedToSetupFsBuffers in BACKUP block, it will send back DEFINE_BACKUP_REF to LQH.

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.126.1.1, 2006-12-14 18:10:16+08:00, gni@dev3-221.dev.cn.tlan +20 -0
    If get DEFINE_BACKUP_REF signal , LQH will crash and give some messages in error log.

ChangeSet@1.1616.2750.6, 2006-12-06 12:01:19+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#21715  mgm client command <id|all> STATUS returns "not connected" for non-data nodes

  ndb/src/mgmclient/CommandInterpreter.cpp@1.44.3.2, 2006-12-06 12:01:18+08:00, gni@dev3-221.dev.cn.tlan +12 -0
    Adding the judgement for node type to distinguish the data nodes and non-data nodes. 
    From the return value. Management client can't distinguish the really not connected status for data nodes and status of non-data nodes.
    We can get the connect status about non-data nodes from version, if the version is 0, it means no connected status. 

ChangeSet@1.1616.2894.1, 2006-12-04 17:06:25+04:00, ramil@mysql.com +3 -0
  fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values
  
  Set null_value in case of wrong data.

  mysql-test/r/cast.result@1.20.1.9, 2006-12-04 17:06:22+04:00, ramil@mysql.com +4 -0
    fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values
      - test result.

  mysql-test/t/cast.test@1.15.1.8, 2006-12-04 17:06:23+04:00, ramil@mysql.com +7 -1
    fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values
      - test case.

  sql/item_timefunc.cc@1.51.16.1, 2006-12-04 17:06:23+04:00, ramil@mysql.com +3 -0
    fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values
      - set null_value in case of error.

ChangeSet@1.2303.102.2, 2006-12-01 20:57:07+00:00, lzhou@ts3-34.ts.cn.tlan +1 -0
  BUG#22025 Return correct error message when transporter error occored

  storage/ndb/src/common/debugger/EventLogger.cpp@1.27.1.1, 2006-12-01 20:57:00+00:00, lzhou@ts3-34.ts.cn.tlan +93 -4
    Add correct error string

ChangeSet@1.1810.2299.3, 2006-11-29 16:45:18+08:00, gni@dev3-127.(none) +1 -0
  BUG#21033  The error log of mysqld shows useless information, and hides the real error.

  ndb/src/ndbapi/Ndb.cpp@1.49.14.1, 2006-11-29 16:45:17+08:00, gni@dev3-127.(none) +7 -0
    Ndb.closeTransaction() modifies the value of Ndb.theError.code,
        but the error code shouldn't be changed here.
        Mysqld will use the returning error code to log the correct error information.

ChangeSet@1.2303.131.1, 2006-11-21 10:25:10+02:00, gkodinov@macbook.gmz +5 -0
  Bug #23556: TRUNCATE TABLE still maps to DELETE
   - TRUNCATE requires DROP privilege, not DELETE

  mysql-test/r/grant.result@1.60.1.1, 2006-11-21 10:25:01+02:00, gkodinov@macbook.gmz +20 -0
    Bug #23556: TRUNCATE TABLE still maps to DELETE
     - test case

  mysql-test/r/trigger-grant.result@1.12, 2006-11-21 10:25:01+02:00, gkodinov@macbook.gmz +2 -2
    Bug #23556: TRUNCATE TABLE still maps to DELETE
     - updated test case

  mysql-test/t/grant.test@1.48, 2006-11-21 10:25:02+02:00, gkodinov@macbook.gmz +35 -0
    Bug #23556: TRUNCATE TABLE still maps to DELETE
     - test case

  mysql-test/t/trigger-grant.test@1.13, 2006-11-21 10:25:03+02:00, gkodinov@macbook.gmz +2 -2
    Bug #23556: TRUNCATE TABLE still maps to DELETE
     - updated test case

  sql/sql_parse.cc@1.595.1.2, 2006-11-21 10:25:04+02:00, gkodinov@macbook.gmz +1 -1
    Bug #23556: TRUNCATE TABLE still maps to DELETE
     - TRUNCATE requires DROP privilege, not DELETE

ChangeSet@1.1810.2340.14, 2006-11-21 10:11:43+02:00, gkodinov@macbook.gmz +3 -0
  Bug#23556: TRUNCATE TABLE still maps to DELETE
   This is the 5.0 part of the fix.
   Currently TRUNCATE command will not call
   delete_all_rows() in the handler (that implements
   the "fast" TRUNCATE for InnoDB) when there are
   triggers on the table.
   As decided by the architecture team TRUNCATE must
   use "fast" TRUNCATE even when there are triggers.
   Thus it must ignore the triggers. 
   Made TRUNCATE to ignore the triggers and call
   delete_all_rows() for all storage engines
   to maintain engine consistency.

  mysql-test/r/trigger.result@1.29.12.1, 2006-11-21 10:11:37+02:00, gkodinov@macbook.gmz +25 -0
    Bug#23556: TRUNCATE TABLE still maps to DELETE
     - test case

  mysql-test/t/trigger.test@1.34.13.1, 2006-11-21 10:11:37+02:00, gkodinov@macbook.gmz +25 -0
    Bug#23556: TRUNCATE TABLE still maps to DELETE
     - test case

  sql/sql_delete.cc@1.144.20.1, 2006-11-21 10:11:38+02:00, gkodinov@macbook.gmz +5 -1
    Bug#23556: TRUNCATE TABLE still maps to DELETE
     - We implemenent fast TRUNCATE for InnoDB even
       if triggers are present.  
     - TRUNCATE ignores triggers.
       

