ChangeSet@1.2499, 2007-04-04 14:19:47+02:00, df@pippilotta.erinye.com +2 -0
  build fixes for 5.1.17

  CMakeLists.txt@1.26, 2007-04-04 14:19:45+02:00, df@pippilotta.erinye.com +8 -0
    use correct runtime library for RelWithDebugInfo target and always generate .map files

  scripts/make_win_bin_dist@1.5, 2007-04-04 14:19:45+02:00, df@pippilotta.erinye.com +21 -7
    use RelWithDebInfo target output if exists, include copy mysqld and mysqlmanager debug info in distribution

ChangeSet@1.2498, 2007-04-02 18:08:11+02:00, df@pippilotta.erinye.com +2 -0
  fix previous mysqlbinlog test case fix

  mysql-test/r/mysqlbinlog.result@1.34, 2007-04-02 18:08:09+02:00, df@pippilotta.erinye.com +7 -7
    adjust to change in test file

  mysql-test/t/mysqlbinlog.test@1.44, 2007-04-02 18:08:09+02:00, df@pippilotta.erinye.com +1 -1
    substitute correct directory

ChangeSet@1.2497, 2007-04-02 15:36:59+02:00, df@pippilotta.erinye.com +1 -0
  BUG#25303 log_state fails

  sql/set_var.cc@1.223, 2007-04-02 15:36:57+02:00, df@pippilotta.erinye.com +1 -1
    BUG#25303 opt_slow_log is really a my_bool

ChangeSet@1.2496, 2007-04-02 15:20:46+02:00, df@pippilotta.erinye.com +1 -0
  BUG#27489 build fix

  scripts/make_binary_distribution.sh@1.150, 2007-04-02 15:20:44+02:00, df@pippilotta.erinye.com +29 -14
    BUG#27489 make_binary_distribution doesn't copy all files

ChangeSet@1.2495, 2007-04-02 15:19:06+02:00, df@pippilotta.erinye.com +1 -0
  build fix for bug#27049

  mysql-test/t/mysqlbinlog.test@1.43, 2007-04-02 15:19:04+02:00, df@pippilotta.erinye.com +1 -1
    build fix for bug#27049

ChangeSet@1.1810.2126.57, 2007-03-22 11:12:18+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix test prg

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.24.1, 2007-03-22 11:12:17+01:00, jonas@perch.ndb.mysql.com +1 -1
    fix test prg

ChangeSet@1.2473.22.8, 2007-03-22 00:11:58+03:00, kostja@bodhi.local +1 -0
  Update the result file with an updated comment.

  mysql-test/r/events_logs_tests.result@1.17, 2007-03-22 00:11:55+03:00, kostja@bodhi.local +1 -1
    Update the result file with an updated comment.

ChangeSet@1.2473.22.6, 2007-03-22 00:09:50+03:00, kostja@bodhi.local +1 -0
  Try to fix events_logs_tests race on Windows.

  mysql-test/t/events_logs_tests.test@1.17, 2007-03-22 00:09:45+03:00, kostja@bodhi.local +4 -2
    Try to fix a race condition that breaks this test on Windows.

ChangeSet@1.1810.2708.1, 2007-03-21 13:58:11-04:00, iggy@recycle.(none) +1 -0
  Bug#27144 sp-destruct.test is disabled on Windows
  - Update test to run properly on Windows.

  mysql-test/t/sp-destruct.test@1.3.1.4, 2007-03-21 13:58:09-04:00, iggy@recycle.(none) +18 -14
    Bug#27144 sp-destruct.test is disabled on Windows
    - Enabled test on Windows.
    - Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo) 
    with the mysqltest builtin commands.
    - Replace Windows directory seperator in error ER_NOT_FROM_FILE with
    posix directory seperator for single test/result pair.

ChangeSet@1.2473.22.4, 2007-03-21 20:32:15+03:00, kostja@bodhi.local +1 -0
  Fix warnings on Windows.

  sql/event_data_objects.cc@1.89, 2007-03-21 20:32:13+03:00, kostja@bodhi.local +2 -2
    Fix Windows 64 bit build warnings. No better fix exists at the moment.

ChangeSet@1.2473.22.3, 2007-03-21 19:20:44+03:00, kostja@bodhi.local +2 -0
  Fix a broken merge.

  scripts/mysql_system_tables.sql@1.6, 2007-03-21 19:20:39+03:00, kostja@bodhi.local +1 -1
    Add time_zone to the list of mysql.event columns.

  scripts/mysql_system_tables_fix.sql@1.61, 2007-03-21 19:20:39+03:00, kostja@bodhi.local +5 -65
    Update after a bad merge: now mysql_system_tables_fix contains
    only alter definitions, no CREATE definitions (single definition
    source approach that was implemented by Magnus). 

ChangeSet@1.1810.2126.56, 2007-03-21 15:34:47+01:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#27283
      Additional fix for 2-node case

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.18.1, 2007-03-21 15:34:45+01:00, jonas@perch.ndb.mysql.com +2 -0
    Add error insert ref for errcode = 7181

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.76.1, 2007-03-21 15:34:45+01:00, jonas@perch.ndb.mysql.com +6 -1
    Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.19.1, 2007-03-21 15:34:45+01:00, jonas@perch.ndb.mysql.com +3 -0
    Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.39.1, 2007-03-21 15:34:45+01:00, jonas@perch.ndb.mysql.com +2 -0
    Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it

ChangeSet@1.2473.6.29, 2007-03-21 09:28:26+01:00, holyfoot@mysql.com +1 -0
  mysqlbinlog-cp932.test:
    merging

  mysql-test/t/mysqlbinlog-cp932.test@1.4, 2007-03-21 09:27:43+01:00, holyfoot@mysql.com +3 -0
    merging

ChangeSet@1.2403.16.3, 2007-03-21 09:23:49+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #26825 MySQL Server Crashes in high load
    - initialize to NULL, to avoid call of free on uninitialized variable

  sql/ha_ndbcluster.cc@1.397.7.4, 2007-03-21 09:23:46+01:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #26825 MySQL Server Crashes in high load
      - initialize to NULL, to avoid call of free on uninitialized variable

ChangeSet@1.1810.2126.55, 2007-03-21 08:57:14+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27286 (5.0 version)
    make sure master is sendable

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.51.1, 2007-03-21 08:57:13+01:00, jonas@perch.ndb.mysql.com +2 -0
    make sure master is sendable

ChangeSet@1.2403.15.14, 2007-03-21 08:47:54+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27286
    make sure master node is sendable, when getting ref::NotMaster 

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.116.1.2, 2007-03-21 08:47:51+01:00, jonas@perch.ndb.mysql.com +4 -0
    make sure master node is sendable, when getting ref::NotMaster 

ChangeSet@1.1810.2593.12, 2007-03-21 08:40:24+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #26825 MySQL Server Crashes in high load
  - initialize to NULL, to avoid call of free on uninitialized variable

  sql/ha_ndbcluster.cc@1.175.67.2, 2007-03-21 08:40:22+01:00, tomas@whalegate.ndb.mysql.com +7 -4
    Bug #26825 MySQL Server Crashes in high load
    - initialize to NULL, to avoid call of free on uninitialized variable

ChangeSet@1.2403.16.1, 2007-03-21 08:22:36+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  correct event buffer status reporting

  storage/ndb/src/common/debugger/EventLogger.cpp@1.30.2.2, 2007-03-21 08:22:33+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    correct event buffer status reporting

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.77.3.1, 2007-03-21 08:22:33+01:00, tomas@whalegate.ndb.mysql.com +6 -4
    correct event buffer status reporting

ChangeSet@1.2473.1.29, 2007-03-21 08:02:11+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  minor fix of ndb cluster startup script

  mysql-test/ndb/ndbcluster.sh@1.55, 2007-03-21 08:02:09+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    minor fix of ndb cluster startup script

ChangeSet@1.2475.3.2, 2007-03-20 16:01:38-04:00, iggy@recycle.(none) +1 -0
  Post Merge Fix.

  mysys/mf_tempdir.c@1.12, 2007-03-20 16:01:35-04:00, iggy@recycle.(none) +1 -1
    Post Merge Fix.

ChangeSet@1.1616.2992.1, 2007-03-20 19:43:36+01:00, msvensson@pilot.blaudden +1 -0
  Remove the variables for long gone disable_ps_warnings 

  client/mysqltest.c@1.92.21.53, 2007-03-20 19:43:35+01:00, msvensson@pilot.blaudden +1 -6
    Remove the variables for long gone disable_ps_warnings 

ChangeSet@1.1616.2991.1, 2007-03-20 19:36:11+01:00, joerg@trift2. +2 -0
  Test "help": 
  Shift the ID values up into a range where they will not collide with those
  which we use for real data, when we fill the system tables.
  
  Will be merged up to 5.0 where it is needed for 5.0.38.

  mysql-test/r/help.result@1.4.1.1, 2007-03-20 19:36:09+01:00, joerg@trift2. +44 -44
    Fix the result file according to the changed ID values in "help.test".

  mysql-test/t/help.test@1.6.2.1, 2007-03-20 19:36:09+01:00, joerg@trift2. +22 -22
    Now that (at least in 5.0) the system tables are filled with real data,
    inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
    like it should already have done in customer installations.
    
    Shift the ID values up into a high area where they will not conflict,
    also make the distinct for the different kinds of values (= unique throughout the test).
    
    No change to the logic.

ChangeSet@1.1616.2990.1, 2007-03-20 19:19:17+01:00, joerg@trift2. +1 -0
  Test "help": 
  Shift the ID values up into a range where they will not collide with those
  which we use for real data, when we fill the system tables.
  
  Will be merged up to 5.0 where it is needed for 5.0.38.

  mysql-test/t/help.test@1.6.1.1, 2007-03-20 19:19:15+01:00, joerg@trift2. +22 -22
    Now that (at least in 5.0) the system tables are filled with real data,
    inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38)
    like it should already have done in customer installations.
    
    Shift the ID values up into a high area where they will not conflict,
    also make the distinct for the different kinds of values (= unique throughout the test).
    
    No change to the logic.

ChangeSet@1.1616.2881.67, 2007-03-20 19:09:28+01:00, tsmith@quadxeon.mysql.com +1 -0
  Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option
  - Problem: data separators were copied to a fixed-size buffer
    on the stack; memcpy was used, without bounds checking; a
    server crash could result if long FIELDS ENCLOSED BY, etc.,
    was given
  - Fix: write the separators directly, instead of copying to
    a buffer first (in select_export::send_data())

  sql/sql_class.cc@1.105.1.109, 2007-03-20 18:59:23+01:00, tsmith@quadxeon.mysql.com +6 -8
    In select_export::send_data(), write data separators
    directly, instead of copying into a fixed-size memory
    buffer before writing.  This avoids a buffer overflow
    when very large separators are specified.

ChangeSet@1.2484, 2007-03-20 18:37:09+01:00, msvensson@pilot.blaudden +1 -0
  my_print_default does not need to be linked with odbc32.lib(and friends)

  extra/CMakeLists.txt@1.13, 2007-03-20 18:37:07+01:00, msvensson@pilot.blaudden +1 -1
    my_print_default does not need to be linked with odbc32.lib(and friends)

ChangeSet@1.1810.2548.99, 2007-03-20 18:31:49+01:00, kent@mysql.com +1 -0
  echo.c:
    Corrected GPL to be version 2 only

  client/echo.c@1.2, 2007-03-20 18:31:35+01:00, kent@mysql.com +1 -2
    Corrected GPL to be version 2 only

ChangeSet@1.2473.1.27, 2007-03-20 17:07:53+01:00, tomas@whalegate.ndb.mysql.com +5 -0
  enabled test case
  + some fixes to do the enable

  mysql-test/r/rpl_ndb_sync.result@1.9, 2007-03-20 17:07:50+01:00, tomas@whalegate.ndb.mysql.com +4 -4
    enabled test case

  mysql-test/t/disabled.def@1.238, 2007-03-20 17:07:50+01:00, tomas@whalegate.ndb.mysql.com +0 -3
    enabled test case

  sql/ha_ndbcluster.cc@1.417, 2007-03-20 17:07:50+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    enabled test case

  sql/ha_ndbcluster_tables.h@1.6, 2007-03-20 17:07:50+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    add defines for old sys table

  storage/ndb/tools/restore/Restore.cpp@1.48, 2007-03-20 17:07:50+01:00, tomas@whalegate.ndb.mysql.com +2 -1
    add check for old sys table

ChangeSet@1.1810.2126.54, 2007-03-20 16:16:25+01:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#27283 (wl2325-5.0)
      Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.19.1, 2007-03-20 16:16:24+01:00, jonas@perch.ndb.mysql.com +1 -1
    new error codes

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.74.1, 2007-03-20 16:16:24+01:00, jonas@perch.ndb.mysql.com +29 -3
    Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.22.1, 2007-03-20 16:16:24+01:00, jonas@perch.ndb.mysql.com +45 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.27.33.1, 2007-03-20 16:16:24+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.1810.2126.53, 2007-03-20 16:08:39+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27291
    Fix correct min-value for LockPagesInMemory

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.31.1, 2007-03-20 16:08:37+01:00, jonas@perch.ndb.mysql.com +1 -1
    Fix correct min-value

ChangeSet@1.2483, 2007-03-20 15:42:34+01:00, msvensson@pilot.blaudden +2 -0
  chmod u+x win/build-vs*.bat

  win/build-vs71.bat@1.7, 2007-03-20 15:41:44+01:00, msvensson@pilot.blaudden +0 -0
    Change mode to -rwxrw-rw-

  win/build-vs8.bat@1.7, 2007-03-20 15:41:44+01:00, msvensson@pilot.blaudden +0 -0
    Change mode to -rwxrw-rw-

ChangeSet@1.1810.2704.1, 2007-03-20 10:34:25-04:00, iggy@recycle.(none) +4 -0
  Bug#23736 Pointer free error in mysqlbinlog
  - Mis-matched SAFEMALLOC defines caused misleading error message.

  client/mysqlbinlog.cc@1.123.1.13, 2007-03-20 10:34:23-04:00, iggy@recycle.(none) +13 -14
    Bug#23736 Pointer free error in mysqlbinlog
    - Re-worked the Load_log_processor so that it frees it's resources before 
    my_end is called.  This is necessary because SAFEMALLOC's _my_free calls
    pthread_mutex_lock() using THR_LOCK_malloc which is cleaned up in my_end().

  include/my_sys.h@1.178.2.16, 2007-03-20 10:34:23-04:00, iggy@recycle.(none) +9 -8
    Bug#23736 Pointer free error in mysqlbinlog
    - Define DYNAMIC_ARRAY beofore MY_TMPDIR
    - Add DYNAMIC_ARRAY to MY_TMP_DIR

  mysys/array.c@1.11.1.2, 2007-03-20 10:34:23-04:00, iggy@recycle.(none) +0 -4
    Bug#23736 Pointer free error in mysqlbinlog
    - SAFEMALLOC should not be unconditionally undef'd.

  mysys/mf_tempdir.c@1.3.1.3, 2007-03-20 10:34:23-04:00, iggy@recycle.(none) +6 -7
    Bug#23736 Pointer free error in mysqlbinlog
    - Use struct's DYNAMIC_ARRAY.
    - Use DYNAMIC_ARRAY:delete_dynamic function instead of my_free

ChangeSet@1.2475.2.2, 2007-03-20 10:22:15-04:00, iggy@recycle.(none) +1 -0
  Post Merge Fix.

  storage/innobase/CMakeLists.txt@1.11, 2007-03-20 10:22:13-04:00, iggy@recycle.(none) +2 -2
    Post Merge Fix.

ChangeSet@1.1810.2698.10, 2007-03-20 15:12:50+01:00, kent@mysql.com +6 -0
  vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj:
    No need to set LICENSE or USE_SYMDIR from project files
  make_win_bin_dist:
    Changed location of SQL initialization files to be "share/"

  VC++Files/libmysqld/libmysqld.vcproj@1.2.4.2, 2007-03-20 14:59:06+01:00, kent@mysql.com +10 -10
    No need to set LICENSE or USE_SYMDIR from project files

  scripts/make_win_bin_dist@1.1.8.6, 2007-03-20 14:57:45+01:00, kent@mysql.com +3 -0
    Changed location of SQL initialization files to be "share/"

  VC++Files/sql/mysqld.vcproj@1.3.7.2, 2007-03-20 14:59:06+01:00, kent@mysql.com +4 -4
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/mysqldemb/mysqldemb.vcproj@1.1.2.2, 2007-03-20 14:59:06+01:00, kent@mysql.com +10 -10
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/mysys/mysys.vcproj@1.2.5.3, 2007-03-20 14:59:06+01:00, kent@mysql.com +3 -3
    No need to set LICENSE or USE_SYMDIR from project files

  VC++Files/vio/vio.vcproj@1.1.1.2, 2007-03-20 14:59:06+01:00, kent@mysql.com +1 -1
    No need to set LICENSE or USE_SYMDIR from project files

ChangeSet@1.1810.2690.4, 2007-03-20 10:07:23-04:00, iggy@recycle.(none) +1 -0
  Bug#25765 too many dbg heap assertions on windows
  - SAFEMALLOC should be defined for each project in debug Windows builds.
  SAFEMALLOC was not defined for the innodb project. Debug asserts caused 
  due to mixed SAFEMALLOC defines.

  innobase/CMakeLists.txt@1.1.5.1, 2007-03-20 10:07:21-04:00, iggy@recycle.(none) +2 -2
    Bug#25765 too many dbg heap assertions on windows
    - Make sure that *_DEBUG defaults are not overwritten.
    - Define SAFEMALLOC and SAFE_MUTEX for debug innodb builds.

ChangeSet@1.1810.2703.1, 2007-03-20 17:53:55+04:00, holyfoot@mysql.com +6 -0
  tests fixed to work in embedded server

  mysql-test/r/delayed.result@1.12.1.2, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +5 -0
    result fixed

  mysql-test/r/merge.result@1.43.1.16, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +0 -5
    result fixed

  mysql-test/t/delayed.test@1.11.1.7, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +10 -0
    moved here from merge.test

  mysql-test/t/init_connect.test@1.5.1.5, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +3 -2
    test fixed as it created users, then stopped without deletion, what caused
    problems in consequent tests

  mysql-test/t/merge.test@1.37.1.12, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +0 -9
    moved to delayed.test

  mysql-test/t/mysqlbinlog-cp932.test@1.1.1.1, 2007-03-20 17:53:54+04:00, holyfoot@mysql.com +2 -0
    disabled in embedded server

ChangeSet@1.1810.2702.2, 2007-03-20 13:33:17+01:00, df@pippilotta.erinye.com +1 -0
  small build fix

  netware/Makefile.am@1.15.3.1, 2007-03-20 13:33:14+01:00, df@pippilotta.erinye.com +1 -1
    use detected awk variant instead of using awk directly

ChangeSet@1.2473.26.2, 2007-03-20 13:32:49+01:00, df@pippilotta.erinye.com +1 -0
  build fix for netware

  include/my_global.h@1.161.1.1, 2007-03-20 13:32:45+01:00, df@pippilotta.erinye.com +14 -1
    netware does not have <new>, so we define placement versions of operator new and delete ourselves

ChangeSet@1.2481, 2007-03-20 11:21:27+01:00, msvensson@pilot.blaudden +2 -0
  Bug#27070 server logs are created unrequested and in wrong directory
   - Avoid defaault log file names looking like <hostname>.pid.slow.log
    by using the FN_REPLACE_EXT flag to 'fn_format'
   - Remove the default log files generated by log_state.test before
     test completes

  mysql-test/t/log_state.test@1.6, 2007-03-20 11:21:26+01:00, msvensson@pilot.blaudden +5 -0
    Tess sets location of log files to default location ie. they will be
    created in var/run form which the mysqld was started. Remove the
    files when test are completed

  sql/log.cc@1.267.2.1, 2007-03-20 11:21:26+01:00, msvensson@pilot.blaudden +1 -1
    Replace the extension formatting the default log file name
    from "pidfile_name" which already contains an extension  

ChangeSet@1.2480, 2007-03-20 11:17:07+01:00, msvensson@pilot.blaudden +1 -0
  Update test reulst after setting logging to be sent both to file and tables

  mysql-test/r/flush2.result@1.2.1.1, 2007-03-20 11:17:05+01:00, msvensson@pilot.blaudden +2 -2
    Update test reulst after setting logging to be sent both to file and tables

ChangeSet@1.1810.2374.80, 2007-03-20 11:15:15+01:00, msvensson@pilot.blaudden +1 -0
  Bug#27070 server logs are created unrequested and in wrong directory
  - Setting up a A->B->A replication causes relay logs being written
    by the master, remove them when test is finished
   

  mysql-test/t/rpl_dual_pos_advance.test@1.2, 2007-03-20 11:15:14+01:00, msvensson@pilot.blaudden +6 -0
    Cleanup files created by test case in var/run directory

ChangeSet@1.2473.1.26, 2007-03-20 11:11:08+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  BUG#24363 If the table structure has been changed, the default action about the restore will fail.
   - correction of patch, original patch will segfault for print option

  storage/ndb/tools/restore/consumer_restore.cpp@1.42, 2007-03-20 11:11:05+01:00, tomas@whalegate.ndb.mysql.com +5 -1
    BUG#24363 If the table structure has been changed, the default action about the restore will fail.
     - correction of patch, original patch will segfault for print option

ChangeSet@1.2473.27.1, 2007-03-20 10:50:10+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +5 -0
  Bug #26079 max_binlog_size + innodb = not make new binlog and hang server
  
  There was hanging at binlog_commit by a thread executing autocommit query.
  
  The hang appeared to be due to an overly condtion for early return 
  from binlog_commit introduced by bug#20265 fix.
  
  Fixed with reverting the logic back to 5.0 version.

  mysql-test/extra/binlog_tests/binlog.test@1.17, 2007-03-20 10:50:07+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +17 -0
    added a regression test

  mysql-test/r/binlog_row_binlog.result@1.12, 2007-03-20 10:50:07+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +14 -0
    results changed

  mysql-test/r/binlog_stm_binlog.result@1.19, 2007-03-20 10:50:07+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +14 -0
    results changed

  sql/log.cc@1.267.1.1, 2007-03-20 10:50:07+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +1 -1
    Removing `all' conjuction arg from early return condition.
    There is nothing to execute by transaction if trx_data is empty.
    
    The work for rotate_and_purge is delayed till TC_LOG::unlog 
    (same as in 5.0 code)

  sql/log.h@1.24, 2007-03-20 10:50:07+02:00, aelkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi +1 -1
    singed because there are assert on positiveness

ChangeSet@1.2473.23.2, 2007-03-20 01:37:33+03:00, evgen@moonbone.local +1 -0
  sql_insert.cc:
    After merge fix.

  sql/sql_insert.cc@1.246.1.18, 2007-03-20 01:35:53+03:00, evgen@moonbone.local +12 -16
    After merge fix.

ChangeSet@1.1810.2701.1, 2007-03-20 00:46:19+03:00, evgen@moonbone.local +3 -0
  sql_insert.cc:
    Removed wrong fix for the bug#27006.
    The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.
  trigger.test, trigger.result:
    Corrected test case for the bug#27006.

  mysql-test/r/trigger.result@1.29.11.10, 2007-03-20 00:46:03+03:00, evgen@moonbone.local +6 -5
    Corrected test case for the bug#27006.

  mysql-test/t/trigger.test@1.34.11.11, 2007-03-20 00:45:30+03:00, evgen@moonbone.local +3 -3
    Corrected test case for the bug#27006.

  sql/sql_insert.cc@1.146.1.79, 2007-03-20 00:39:47+03:00, evgen@moonbone.local +5 -5
    Removed wrong fix for the bug#27006.
    The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21.

ChangeSet@1.1810.2698.9, 2007-03-19 22:41:16+01:00, kent@mysql.com +3 -0
  mysys.vcproj:
    Removed accidently added my_winsem.c
  make_win_bin_dist:
    Corrected test for relwithdebinfo target
  mysql.sln:
    Specify that comp_err depends on zlib

  scripts/make_win_bin_dist@1.1.8.5, 2007-03-19 22:41:03+01:00, kent@mysql.com +1 -1
    Corrected test for relwithdebinfo target

  VC++Files/mysql.sln@1.5.8.2, 2007-03-19 21:14:15+01:00, kent@mysql.com +1 -0
    Specify that comp_err depends on zlib

  VC++Files/mysys/mysys.vcproj@1.2.5.2, 2007-03-19 21:13:24+01:00, kent@mysql.com +0 -3
    Removed accidently added my_winsem.c

ChangeSet@1.2473.21.1, 2007-03-19 20:44:46+01:00, df@pippilotta.erinye.com +1 -0
  BUG#27270 Can't compile latest 5.1-main

  sql/sql_yacc.yy@1.549.2.4, 2007-03-19 20:44:42+01:00, df@pippilotta.erinye.com +3 -3
    BUG#27270 remove semicolon that is ignored by newer versions of bison but an error with 1.875

ChangeSet@1.1810.2698.8, 2007-03-19 16:45:37+01:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Restore accidently removed line

  scripts/make_win_bin_dist@1.1.8.4, 2007-03-19 16:45:29+01:00, kent@mysql.com +1 -0
    Restore accidently removed line

ChangeSet@1.1810.2698.7, 2007-03-19 16:18:10+01:00, kent@mysql.com +46 -0
  Many files:
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/bdb/bdb.vcproj@1.1.2.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +15 -2623
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/comp_err/comp_err.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +73 -18
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/dbug/dbug.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +32 -104
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/sql/gen_lex_hash.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +27 -22
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/heap/heap.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +50 -818
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/innobase/innobase.vcproj@1.1.2.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -2614
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysql/libmysql.vcproj@1.2.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -1817
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqld/libmysqld.vcproj@1.2.4.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +459 -4013
    Major cleanup of old Visual Studio project files, aligning engines etc

  scripts/make_win_bin_dist@1.1.8.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +0 -1
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqltest/myTest.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +35 -51
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/my_print_defaults/my_print_defaults.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +31 -116
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisam/myisam.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +41 -1737
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisam_ftdump/myisam_ftdump.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -37
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisamchk/myisamchk.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +30 -116
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisamlog/myisamlog.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -106
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisammrg/myisammrg.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +54 -726
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/myisampack/myisampack.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -105
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysql.sln@1.5.8.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +1233 -1148
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysql.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +18 -178
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/tests/mysql_client_test.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +21 -39
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysql_upgrade.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqladmin.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj@1.2.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +15 -123
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlcheck/mysqlcheck.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +22 -106
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlclient.vcproj@1.2.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +24 -2832
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/sql/mysqld.vcproj@1.3.7.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +222 -8039
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqldemb/mysqldemb.vcproj@1.1.2.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +358 -2579
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqldump.vcproj@1.2.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +23 -131
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlimport.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysqlserver/mysqlserver.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -18
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqlshow.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/client/mysqltest.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -128
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/mysys/mysys.vcproj@1.2.5.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +55 -4385
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/perror/perror.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +21 -110
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/regex/regex.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -126
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/replace/replace.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -103
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/strings/strings.vcproj@1.2.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -782
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/test1/test1.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +20 -37
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/libmysqld/examples/test_libmysqld.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +73 -41
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/thr_test/thr_test.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +18 -36
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/vio/vio.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +14 -78
    Major cleanup of old Visual Studio project files, aligning engines etc

  VC++Files/zlib/zlib.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -315
    Major cleanup of old Visual Studio project files, aligning engines etc

  extra/yassl/taocrypt/taocrypt.vcproj@1.3.1.2, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -374
    Major cleanup of old Visual Studio project files, aligning engines etc

  extra/yassl/yassl.vcproj@1.2.1.3, 2007-03-19 16:17:48+01:00, kent@mysql.com +16 -230
    Major cleanup of old Visual Studio project files, aligning engines etc

  server-tools/instance-manager/mysqlmanager.vcproj@1.8, 2007-03-19 16:17:48+01:00, kent@mysql.com +17 -8
    Major cleanup of old Visual Studio project files, aligning engines etc

  ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj@1.1.1.1, 2007-03-19 16:17:48+01:00, kent@mysql.com +19 -19
    Major cleanup of old Visual Studio project files, aligning engines etc

ChangeSet@1.1810.2699.1, 2007-03-19 15:24:07+01:00, joerg@trift2. +1 -0
  netware/Makefile.am  :  "libmysql.imp" must survive a "make clean" for the NetWare builds.

  netware/Makefile.am@1.15.2.2, 2007-03-19 15:24:04+01:00, joerg@trift2. +2 -1
    "libmysql.imp" must survive a "make clean" for the NetWare builds.

ChangeSet@1.2403.15.12, 2007-03-19 14:51:17+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - test_event
    Fix compile error with gcc4

  storage/ndb/test/ndbapi/test_event.cpp@1.26, 2007-03-19 14:51:02+01:00, jonas@perch.ndb.mysql.com +5 -5
    Fix compile error with gcc4

ChangeSet@1.2403.15.11, 2007-03-19 12:31:23+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#20185
    Fix race in testprg...causing random TC crashes

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.1.1, 2007-03-19 12:31:21+01:00, jonas@perch.ndb.mysql.com +5 -10
    remove incorrect work-around

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.38.1.5, 2007-03-19 12:31:21+01:00, jonas@perch.ndb.mysql.com +11 -3
    Fix race in testprg...causing random TC crashes

ChangeSet@1.2403.15.10, 2007-03-19 11:13:10+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest 
   increase some timeouts...

  storage/ndb/test/run-test/daily-devel-tests.txt@1.30, 2007-03-19 11:13:08+01:00, jonas@perch.ndb.mysql.com +5 -5
    increase timeouts...

ChangeSet@1.1810.2698.4, 2007-03-18 10:47:15+01:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    - Support both "release" and "relwithdebinfo" targets
    - Copy ".pdb" and ".pdb" files for the server and instance manager
    - Removed the examples directory, unsupported
    - Handle both old and new builds in the same script, "-debug" and "-nt"
      extensions, directory "data" and "share" in different location

  scripts/make_win_bin_dist@1.1.8.1, 2007-03-18 10:42:35+01:00, kent@mysql.com +54 -34
    - Support both "release" and "relwithdebinfo" targets
    - Copy ".pdb" and ".pdb" files for the server and instance manager
    - Removed the examples directory, unsupported
    - Handle both old and new builds in the same script, "-debug" and "-nt"
      extensions, directory "data" and "share" in different location

ChangeSet@1.1810.2698.3, 2007-03-17 19:45:01+01:00, joerg@trift2. +1 -0
  Fix a failure in test "func_in" on some 64-bit big-endian hosts in first 5.0.38 builds.

  sql/item_cmpfunc.cc@1.187.1.53, 2007-03-17 19:44:58+01:00, joerg@trift2. +2 -2
    Ensure both operands of a comparison are cast to "ulonglong", not just one only.
    Without this, some 64-bit big-endian hosts failed test "func_in" when 5.0.38 builds were started.
    
    Patch provided by Timothy.

ChangeSet@1.2473.6.23, 2007-03-17 11:19:21+01:00, serg@janus.mylan +4 -0
  dbug/dbug.c: unused variable removed
  include/config-win.h: SIZEOF_INT
  include/my_global.h: win64 fix
  support-files/Makefile.am: automake magic

  dbug/dbug.c@1.36, 2007-03-17 11:19:17+01:00, serg@janus.mylan +0 -1
    unused variable removed

  include/config-win.h@1.98, 2007-03-17 11:19:17+01:00, serg@janus.mylan +1 -0
    SIZEOF_INT

  include/my_global.h@1.161, 2007-03-17 11:19:17+01:00, serg@janus.mylan +3 -1
    win64 fix

  support-files/Makefile.am@1.37, 2007-03-17 11:19:17+01:00, serg@janus.mylan +1 -1
    automake magic

ChangeSet@1.2473.18.2, 2007-03-17 00:13:25+01:00, serg@janus.mylan +47 -0
  wl#3700 - post-review fixes:
  s/ulonglong/key_part_map/, comments

  include/heap.h@1.33, 2007-03-17 00:13:16+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  include/my_base.h@1.98, 2007-03-17 00:13:16+01:00, serg@janus.mylan +5 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  include/myisam.h@1.82, 2007-03-17 00:13:17+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  include/myisammrg.h@1.19, 2007-03-17 00:13:17+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  sql/event_db_repository.cc@1.23, 2007-03-17 00:13:17+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  sql/ha_partition.cc@1.87, 2007-03-17 00:13:17+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  sql/ha_partition.h@1.35, 2007-03-17 00:13:17+01:00, serg@janus.mylan +5 -4
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/

  sql/handler.cc@1.299, 2007-03-17 00:13:17+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/handler.h@1.254, 2007-03-17 00:13:17+01:00, serg@janus.mylan +23 -6
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/item_subselect.cc@1.149.1.2, 2007-03-17 00:13:17+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/log_event.cc@1.270, 2007-03-17 00:13:17+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/mysql_priv.h@1.489, 2007-03-17 00:13:17+01:00, serg@janus.mylan +0 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/opt_range.cc@1.268, 2007-03-17 00:13:17+01:00, serg@janus.mylan +29 -41
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/opt_range.h@1.78, 2007-03-17 00:13:18+01:00, serg@janus.mylan +16 -13
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sp.cc@1.141, 2007-03-17 00:13:18+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_acl.cc@1.233, 2007-03-17 00:13:18+01:00, serg@janus.mylan +10 -10
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_handler.cc@1.93, 2007-03-17 00:13:18+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_help.cc@1.58, 2007-03-17 00:13:18+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_insert.cc@1.252, 2007-03-17 00:13:18+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_plugin.cc@1.46, 2007-03-17 00:13:18+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_select.cc@1.498, 2007-03-17 00:13:18+01:00, serg@janus.mylan +6 -7
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_select.h@1.120, 2007-03-17 00:13:19+01:00, serg@janus.mylan +1 -6
    wl#3700 - post-review fixes:
    remove tab_to_keypart_map()

  sql/sql_servers.cc@1.8, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/sql_udf.cc@1.72, 2007-03-17 00:13:19+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/table.cc@1.280, 2007-03-17 00:13:19+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/table.h@1.163, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  sql/tztime.cc@1.51, 2007-03-17 00:13:19+01:00, serg@janus.mylan +4 -4
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/blackhole/ha_blackhole.cc@1.49, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/blackhole/ha_blackhole.h@1.14, 2007-03-17 00:13:19+01:00, serg@janus.mylan +4 -5
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/example/ha_example.cc@1.54, 2007-03-17 00:13:19+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/example/ha_example.h@1.22, 2007-03-17 00:13:19+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/heap/ha_heap.cc@1.110, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/heap/ha_heap.h@1.52, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/heap/heapdef.h@1.19, 2007-03-17 00:13:19+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/heap/hp_hash.c@1.49, 2007-03-17 00:13:19+01:00, serg@janus.mylan +7 -7
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/heap/hp_rkey.c@1.21, 2007-03-17 00:13:19+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/innobase/handler/ha_innodb.cc@1.324, 2007-03-17 00:13:20+01:00, serg@janus.mylan +8 -8
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/ha_myisam.cc@1.214, 2007-03-17 00:13:20+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/ha_myisam.h@1.83, 2007-03-17 00:13:20+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/mi_check.c@1.160, 2007-03-17 00:13:20+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/mi_key.c@1.57, 2007-03-17 00:13:20+01:00, serg@janus.mylan +2 -2
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/mi_range.c@1.23, 2007-03-17 00:13:20+01:00, serg@janus.mylan +4 -4
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/mi_rkey.c@1.32, 2007-03-17 00:13:20+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisam/myisamdef.h@1.99, 2007-03-17 00:13:20+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisammrg/ha_myisammrg.cc@1.118, 2007-03-17 00:13:20+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisammrg/ha_myisammrg.h@1.52, 2007-03-17 00:13:20+01:00, serg@janus.mylan +3 -3
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

  storage/myisammrg/myrg_rkey.c@1.24, 2007-03-17 00:13:20+01:00, serg@janus.mylan +1 -1
    wl#3700 - post-review fixes:
    s/ulonglong/key_part_map/, comments

ChangeSet@1.2473.6.21, 2007-03-16 23:10:12+03:00, evgen@moonbone.local +1 -0
  sql_insert.cc:
    Post-merge fix.

  sql/sql_insert.cc@1.246.1.16, 2007-03-16 23:09:56+03:00, evgen@moonbone.local +14 -13
    Post-merge fix.

ChangeSet@1.1810.2698.2, 2007-03-16 20:56:16+01:00, joerg@trift2. +9 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build sql files for netware from the mysql_system_tables*.sq files
   - Fix comments about mysql_create_system_tables.sh
   - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
   - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
  
  Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.

  BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023@1.8.1.1, 2007-03-16 20:47:21+01:00, joerg@trift2. +0 -0
    Delete: netware/init_db.sql

  BitKeeper/deleted/.del-test_db.sql@1.4.1.1, 2007-03-16 20:47:45+01:00, joerg@trift2. +0 -0
    Delete: netware/test_db.sql

  BitKeeper/etc/ignore@1.210.15.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +2 -0
    Added netware/init_db.sql netware/test_db.sql to the ignore list

  mysql-test/install_test_db.sh@1.35.3.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +8 -12
    Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
    to install the system tables

  mysql-test/mysql-test-run.pl@1.30.78.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +11 -3
    Look for the mysql_system_tables*.sql also in share/mysql

  netware/Makefile.am@1.15.2.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +24 -4
    Build netware/init_db.sql and netware/test_db.sql from
    the sources in scripts/msyql_system_tables*.sql

  scripts/make_binary_distribution.sh@1.101.8.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +0 -6
    netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
    from the scripts/mysql_system_tables*.sql files

  sql/mysql_priv.h@1.290.101.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +3 -2
    Update comment remindging to update the MySQL system table definitions
    when adding a new SQL_MODE

  sql/sql_acl.h@1.28.3.1, 2007-03-16 20:56:13+01:00, joerg@trift2. +1 -1
    Update comment reminding to update the MySQL System tables
    when changing the ACL defines

ChangeSet@1.1810.2698.1, 2007-03-16 19:56:16+01:00, joerg@trift2. +2 -0
  Fix bug#27212, test case "loaddata": Take the file to read from the binary package.

  mysql-test/r/loaddata.result@1.20.1.6, 2007-03-16 19:56:11+01:00, joerg@trift2. +3 -3
    Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
    because it will be missing when the tests are run during release build or by a customer.

  mysql-test/t/loaddata.test@1.15.1.5, 2007-03-16 19:56:11+01:00, joerg@trift2. +2 -2
    Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
    because it will be missing when the tests are run during release build or by a customer.

ChangeSet@1.2473.15.2, 2007-03-16 19:44:00+01:00, serg@janus.mylan +1 -0
  remove unnecessary line

  unittest/mysys/my_atomic-t.c@1.10, 2007-03-16 19:43:57+01:00, serg@janus.mylan +0 -3
    remove unnecessary line

ChangeSet@1.2473.6.19, 2007-03-16 22:23:37+04:00, holyfoot@mysql.com +1 -0
  merging

  sql/sql_insert.cc@1.246.1.14, 2007-03-16 22:23:35+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.2454.1.17, 2007-03-16 20:50:37+03:00, kroki@moonlight.home +2 -0
  Fix compilation on Windows broken with the push of bug#16420.
  Fix three compilation warnings.

  sql/event_data_objects.cc@1.86.1.2, 2007-03-16 20:50:34+03:00, kroki@moonlight.home +2 -2
    Fix compilation warnings.

  sql/event_queue.cc@1.25.1.2, 2007-03-16 20:50:34+03:00, kroki@moonlight.home +5 -9
    Fix compilation warning: reimplement event_queue_element_compare_q()
    properly.
    
    Use set_timespec() to initialize struct timespec.

ChangeSet@1.1810.2374.79, 2007-03-16 17:28:32+01:00, msvensson@pilot.blaudden +9 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build sql files for netware from the mysql_system_tables*.sq files
   - Fix comments about mysql_create_system_tables.sh
   - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
   - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files

  BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023@1.9, 2007-03-16 17:26:27+01:00, msvensson@pilot.blaudden +0 -0
    Rename: netware/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023

  BitKeeper/deleted/.del-test_db.sql@1.5, 2007-03-16 17:26:27+01:00, msvensson@pilot.blaudden +0 -0
    Rename: netware/test_db.sql -> BitKeeper/deleted/.del-test_db.sql

  BitKeeper/etc/ignore@1.210.1.34, 2007-03-16 17:28:30+01:00, msvensson@pilot.blaudden +2 -0
    Added netware/init_db.sql netware/test_db.sql to the ignore list

  mysql-test/install_test_db.sh@1.35.1.4, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +8 -12
    Use mysql_install_db from install_test_db(which is used bu mysql-test-run-shell)
    to install the system tables

  mysql-test/mysql-test-run.pl@1.30.49.67, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +11 -3
    Look for the mysql_system_tables*.sql also in share/mysql

  netware/Makefile.am@1.15.1.6, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +24 -4
    Build netware/init_db.sql and netware/test_db.sql from
    the sources in scripts/msyql_system_tables*.sql

  scripts/make_binary_distribution.sh@1.101.1.22, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +0 -6
    netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
    from the scripts/mysql_system_tables*.sql files

  sql/mysql_priv.h@1.290.100.1, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +3 -2
    Update comment remindging to update the MySQL system table definitions
    when adding a new SQL_MODE

  sql/sql_acl.h@1.28.1.25, 2007-03-16 17:28:31+01:00, msvensson@pilot.blaudden +1 -1
    Update comment reminding to update the MySQL System tables
    when changing the ACL defines

ChangeSet@1.2473.16.2, 2007-03-16 09:21:25-07:00, omer@linux.site +1 -0
  Modifications to Makefile.am to include new test options 
   - for including qa developed suites
   - for options to run 'fast' tests

  Makefile.am@1.120, 2007-03-16 09:21:22-07:00, omer@linux.site +45 -4
    Modifications to include new test options 
     - for including qa developed suites
     - for options to run 'fast' tests

ChangeSet@1.2454.6.1, 2007-03-16 17:31:07+03:00, kroki@moonlight.home +29 -0
  BUG#16420: Events: timestamps become UTC
  BUG#26429: SHOW CREATE EVENT is incorrect for an event that
             STARTS NOW()
  BUG#26431: Impossible to re-create an event from backup if its
             STARTS clause is in the past
  WL#3698: Events: execution in local time zone
  
  The problem was that local times specified by the user in AT, STARTS
  and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC,
  and the original time zone was forgotten.  This way, event scheduler
  couldn't honor Daylight Saving Time shifts, and times shown to the
  user were also in UTC.  Additionally, CREATE EVENT didn't allow times
  in the past, thus preventing straightforward event restoration from
  old backups.
  
  This patch reworks event scheduler time computations, performing them
  in the time zone associated with the event.  Also it allows times to
  be in the past.
  
  The patch adds time_zone column to mysql.event table.
  
  NOTE: The patch is almost final, but the bug#9953 should be pushed
  first.

  mysql-test/lib/init_db.sql@1.31.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +1 -0
    Add time_zone column.

  scripts/mysql_create_system_tables.sh@1.47.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +1 -0
    Add new column 'time_zone' to mysql.event.

  client/mysqldump.c@1.269, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +9 -3
    Before every CREATE EVENT, output its time zone.

  mysql-test/include/wait_condition.inc@1.2, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +16 -1
    Add optional $wait_timeout parameter.

  mysql-test/r/events.result@1.47, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +51 -50
    Update result.

  mysql-test/r/events_bugs.result@1.26, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +5 -2
    Update result.

  mysql-test/r/events_grant.result@1.4, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +12 -12
    Update result.

  mysql-test/r/events_restart_phase1.result@1.3, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +2 -2
    Update result.

  mysql-test/r/events_scheduling.result@1.7.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +1 -0
    Update result.

  mysql-test/r/events_time_zone.result@1.1, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +291 -0
    BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/r/events_time_zone.result

  mysql-test/r/events_time_zone.result@1.0, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +0 -0

  mysql-test/r/mysqldump.result@1.138, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +16 -16
    Update result.

  mysql-test/r/ps.result@1.104, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +6 -6
    Update result.

  mysql-test/r/system_mysql_db.result@1.47, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +1 -0
    Update result.

  mysql-test/t/events.test@1.44, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +19 -0
    Remove STARTS from the result, as it depends on current time.

  mysql-test/t/events_bugs.test@1.25, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +9 -2
    Time in the past is no longer an error.

  mysql-test/t/events_restart_phase1.test@1.3, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +2 -2
    Fill new column 'time_zone' in mysql.event.

  mysql-test/t/events_scheduling.test@1.9.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +1 -0
    Cleanup: disable event scheduler.

  mysql-test/t/events_time_zone.test@1.1, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +463 -0
    BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/t/events_time_zone.test

  mysql-test/t/events_time_zone.test@1.0, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +0 -0

  scripts/mysql_fix_privilege_tables.sql@1.54.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +4 -1
    Add new column 'time_zone' to mysql.event.

  sql/event_data_objects.cc@1.86.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +347 -232
    The essence of the change is the following:
     - for internal times use my_time_t instead of TIME.  Assignment and
       comparison is done now on plain numbers.
     - in init_execute_at(), init_starts(), init_ends() convert given time
       to number of seconds since Epoch (aka Unix time, in UTC).
     - handle time_zone field loading and storing.
     - in get_next_time(), Unix time is converted back to event time zone,
       interval is added, and the result is converted to UTC again.
     - fix Event_timed::get_create_event() to report STARTS and ENDS.
     - before executing the event body we set thread time zone to the
       event time zone.

  sql/event_data_objects.h@1.17, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +24 -11
    Add time_zone member to Event_basic class.
    
    Store internal times in my_time_t (number of seconds since Epoch),
    rather than in broken down TIME structure.

  sql/event_db_repository.cc@1.21.1.1, 2007-03-16 17:31:03+03:00, kroki@moonlight.home +36 -7
    Add time_zone column handling.
    
    Give a warning and do not create an event if its execution time is in
    the past, and ON COMPLETION NOT PRESERVE is set, because such an event
    should be dropped by that time.  Also, do not allow ALTER EVENT to
    set execution time in the past when ON COMPLETION NOT PRESERVE is set.

  sql/event_db_repository.h@1.13, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +1 -0
    Add enum member for new time zone column.

  sql/event_queue.cc@1.25.1.1, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +22 -21
    Replace handling of broken down times with simple handling of
    my_time_t.

  sql/event_queue.h@1.15, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +1 -1
    Store internal times in my_time_t (number of seconds since Epoch),
    rather than in broken down TIME structure.

  sql/event_scheduler.cc@1.37, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +8 -0
    Add TODO comment.

  sql/events.cc@1.71, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +10 -3
    Send time_zone column for SHOW CREATE EVENT.

  sql/share/errmsg.txt@1.141.2.2, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +5 -2
    Update error message, and add two more errors.

  sql/sql_show.cc@1.394.1.3, 2007-03-16 17:31:04+03:00, kroki@moonlight.home +17 -7
    Add TIME_ZONE column to the output of SHOW EVENTS.

ChangeSet@1.1810.2697.1, 2007-03-16 17:25:20+03:00, kaa@polly.local +3 -0
  Fix for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits".
  
  Problem: to handle a situation when the size of event on the master is greater than max_allowed_packet on slave, we checked for the wrong constant (ER_NET_PACKET_TOO_LARGE instead of CR_NET_PACKET_TOO_LARGE).
  
  Solution: test for the client "packet too large" error code instead of the server one in slave I/O thread.

  mysql-test/r/rpl_packet.result@1.4, 2007-03-16 17:25:15+03:00, kaa@polly.local +9 -0
    Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"

  mysql-test/t/rpl_packet.test@1.4, 2007-03-16 17:25:15+03:00, kaa@polly.local +33 -0
    Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"

  sql/slave.cc@1.241.18.1, 2007-03-16 17:25:15+03:00, kaa@polly.local +2 -1
    Test for the client "packet too large" error code instead of the server one in slave I/O thread.

ChangeSet@1.1810.2548.93, 2007-03-16 17:23:26+03:00, evgen@moonbone.local +3 -0
  Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
  UPDATE if the row wasn't actually changed.
  
  This bug was caused by fix for bug#19978. It causes AFTER UPDATE triggers
  not firing if a row wasn't actually changed by the update part of the
  INSERT .. ON DUPLICATE KEY UPDATE.
  
  Now triggers are always fired if a row is touched by the INSERT ... ON
  DUPLICATE KEY UPDATE.

  mysql-test/r/trigger.result@1.29.11.9, 2007-03-16 17:21:22+03:00, evgen@moonbone.local +41 -0
    Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
    UPDATE if the row wasn't actually changed.

  mysql-test/t/trigger.test@1.34.11.10, 2007-03-16 17:21:43+03:00, evgen@moonbone.local +38 -0
    Added a test case for the bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
    UPDATE if the row wasn't actually changed.

  sql/sql_insert.cc@1.146.1.78, 2007-03-16 17:20:54+03:00, evgen@moonbone.local +6 -6
    Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
    UPDATE if the row wasn't actually changed.
    Now triggers are always fired if a row is touched by the INSERT ... ON
    DUPLICATE KEY UPDATE.

ChangeSet@1.2442.1.1, 2007-03-16 14:57:02+01:00, thek@kpdesk.mysql.com +4 -0
  Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
  
  - Crash occured because Event engine is only initialized if
    ACLs are used but not properly marked as disabled.
  - The patch is to mark the Event engine as DISABLED if no ACLs
    are used to avoid access of uninitialized variables.

  mysql-test/r/skip_grants.result@1.9.1.1, 2007-03-16 14:56:59+01:00, thek@kpdesk.mysql.com +2 -0
    Added test case

  mysql-test/t/skip_grants.test@1.12, 2007-03-16 14:56:59+01:00, thek@kpdesk.mysql.com +7 -0
    Added test case

  sql/mysqld.cc@1.601.22.1, 2007-03-16 14:56:59+01:00, thek@kpdesk.mysql.com +5 -0
    Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
    
    - Crash occured because Event engine is only initialized if
      ACLs are used but not properly marked as disabled.
    - The patch is to mark the Event engine as DISABLED if no ACLs
      are used to avoid access of uninitialized variables.

  sql/set_var.cc@1.215.5.1, 2007-03-16 14:57:00+01:00, thek@kpdesk.mysql.com +1 -1
    Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
    
    - Crash occured because Event engine is only initialized if
      ACLs are used but not properly marked as disabled.
    - The patch is to mark the Event engine as DISABLED if no ACLs
      are used to avoid access of uninitialized variables.

ChangeSet@1.2403.15.9, 2007-03-16 10:58:24+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#27203
    Allow readTablePk to stumble on scan+deleted tuple,
        reporting no-match instead of crash (in case scan is lock-owner)

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.34.1.1, 2007-03-16 10:58:22+01:00, jonas@perch.ndb.mysql.com +1 -1
    Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.81.1.1, 2007-03-16 10:58:22+01:00, jonas@perch.ndb.mysql.com +15 -4
    Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash

ChangeSet@1.1810.2696.1, 2007-03-16 10:35:39+02:00, gkodinov@macbook.gmz +5 -0
  Bug #26261: 
   INSERT uses query_id to verify what fields are
   mentioned in the fields list of the INSERT command.
   However the check for that is made after the 
   ON DUPLICATE KEY is processed. This causes all
   the fields mentioned in ON DUPLICATE KEY to be 
   considered as mentioned in the fields list of 
   INSERT.
   Moved the check up, right after processing the
   fields list.

  mysql-test/r/insert_update.result@1.18.2.1, 2007-03-16 10:35:20+02:00, gkodinov@macbook.gmz +11 -0
    Bug #26261: test case

  mysql-test/t/insert_update.test@1.20.2.1, 2007-03-16 10:35:22+02:00, gkodinov@macbook.gmz +21 -0
    Bug #26261: test case

  sql/mysql_priv.h@1.290.95.3, 2007-03-16 10:35:23+02:00, gkodinov@macbook.gmz +2 -1
    Bug #26261: moved the check inside mysql_prepare_insert

  sql/sql_insert.cc@1.146.51.1, 2007-03-16 10:35:25+02:00, gkodinov@macbook.gmz +45 -23
    Bug #26261: move the check inside mysql_prepare_insert
    before setting up the ON DUPLICATE KEY part

  sql/sql_prepare.cc@1.142.21.9, 2007-03-16 10:35:25+02:00, gkodinov@macbook.gmz +1 -1
    Bug #26261: moved the check inside mysql_prepare_insert

ChangeSet@1.1810.2695.1, 2007-03-16 12:15:51+04:00, gluh@mysql.com +3 -0
  Bug#26285 selecting information_schema crahes server
  The crash happens when 'skip-grant-tables' is enabled.
  We skip the filling of I_S privilege tables 
  if acl_cache is not initialized.

  mysql-test/r/skip_grants.result@1.10, 2007-03-16 12:15:49+04:00, gluh@mysql.com +12 -0
    test result

  mysql-test/t/skip_grants.test@1.6.1.6, 2007-03-16 12:15:49+04:00, gluh@mysql.com +8 -0
    test case

  sql/sql_acl.cc@1.128.1.90, 2007-03-16 12:15:49+04:00, gluh@mysql.com +4 -0
    skip filling of I_S privilege tables
    if acl_cache is not initialized

ChangeSet@1.1810.2686.5, 2007-03-14 21:45:20-07:00, omer@linux.site +1 -0
  Added test options to Makefile.am including
   - test suites developed by QA 
   - additional 'fast' test options 

  Makefile.am@1.68.1.30, 2007-03-14 21:42:15-07:00, omer@linux.site +32 -4
    Added test options to cover 
     - test suites developed by QA 
     - additional 'fast' test options 

ChangeSet@1.1810.2686.4, 2007-03-15 19:01:58+01:00, jbruehe@mysql.com +1 -0
  Raise version number after cloning 5.0.38

  configure.in@1.245.1.188, 2007-03-15 19:01:47+01:00, jbruehe@mysql.com +2 -2
    Raise version number after cloning 5.0.38

ChangeSet@1.1810.2691.1, 2007-03-15 23:21:29+03:00, evgen@moonbone.local +4 -0
  Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
  touched but not actually changed.
  
  The LAST_INSERT_ID() is reset to 0 if no rows were inserted or changed.
  This is the case when an INSERT ... ON DUPLICATE KEY UPDATE updates a row
  with the same values as the row contains.
  
  Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows
  successfully inserted or touched.
  The new 'touched' field is added to the COPY_INFO structure. It holds the
  number of rows that were touched no matter whether they were actually
  changed or not.

  mysql-test/r/insert_update.result@1.18.1.4, 2007-03-15 23:20:59+03:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
    touched but not actually changed.
    

  mysql-test/t/insert_update.test@1.20.1.2, 2007-03-15 23:20:59+03:00, evgen@moonbone.local +12 -0
    Added a test case for the bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
    touched but not actually changed.
    

  sql/sql_class.h@1.230.1.95, 2007-03-15 23:20:57+03:00, evgen@moonbone.local +17 -5
    Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
    touched but not actually changed.
    
    The new 'touched' field is added to the COPY_INFO structure. It holds the
    number of rows that were touched no matter whether they were actually
    changed or not.

  sql/sql_insert.cc@1.146.1.76, 2007-03-15 23:20:59+03:00, evgen@moonbone.local +9 -7
    Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
    touched but not actually changed.
    
    Now the LAST_INSERT_ID() values is reset to 0 only if there were no rows
    successfully inserted or touched.

ChangeSet@1.2454.1.14, 2007-03-15 23:17:44+03:00, kostja@bodhi.local +3 -0
  Bug#26765 "typo when running mysql-test-run"
  Fix a typo (togheter -> together)

  mysql-test/mysql-test-run.pl@1.270.1.6, 2007-03-15 23:17:39+03:00, kostja@bodhi.local +1 -1
    Fix a typo (togheter -> together)

  storage/ndb/test/include/NDBT_Error.hpp@1.5, 2007-03-15 23:17:39+03:00, kostja@bodhi.local +2 -2
    Fix a typo (togheter -> together)

  storage/ndb/test/include/NDBT_ReturnCodes.h@1.4, 2007-03-15 23:17:39+03:00, kostja@bodhi.local +1 -1
    Fix a typo (togheter -> together)

ChangeSet@1.1810.2374.77, 2007-03-15 15:52:04+01:00, msvensson@pilot.blaudden +3 -0
  Remove test/udf_test and test/udf_test.res, since udf's are nowadays
  tested by mysql-test-run.pl 

  BitKeeper/deleted/.del-udf_test@1.5, 2007-03-15 15:48:47+01:00, msvensson@pilot.blaudden +0 -0
    Delete: tests/udf_test

  BitKeeper/deleted/.del-udf_test.res@1.5, 2007-03-15 15:48:48+01:00, msvensson@pilot.blaudden +0 -0
    Delete: tests/udf_test.res

  tests/Makefile.am@1.23.1.9, 2007-03-15 15:52:03+01:00, msvensson@pilot.blaudden +1 -1
    Remove test/udf_test and test/udf_test.res, since udf's are nowadays
    tested by mysql-test-run.pl 

ChangeSet@1.2473.12.6, 2007-03-15 17:35:31+04:00, holyfoot@mysql.com +2 -0
  merging

  mysql-test/r/gis-rtree.result@1.31, 2007-03-15 17:35:29+04:00, holyfoot@mysql.com +1 -1
    merging

  mysql-test/t/gis-rtree.test@1.24, 2007-03-15 17:35:29+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.2473.13.1, 2007-03-15 13:35:49+01:00, hartmut@mysql.com +1 -0
  added missing prototype implementations (bug #25933)

  storage/ndb/src/ndbapi/NdbOperation.cpp@1.21, 2007-03-15 13:35:47+01:00, hartmut@mysql.com +12 -0
    added missing prototype implementations (bug #25933)

ChangeSet@1.2403.15.8, 2007-03-15 13:30:42+01:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#27169
    Fix bug in SUMA::resend_bucket which could cause mysqld to crash

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.3, 2007-03-15 13:30:39+01:00, jonas@perch.ndb.mysql.com +4 -1
    Remove *len* part from sz,
      or an extra word will be sent (sometimes) which will cause event-api barf

  storage/ndb/test/ndbapi/test_event.cpp@1.25, 2007-03-15 13:30:39+01:00, jonas@perch.ndb.mysql.com +150 -0
    test prg for bug#27169

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.1.4, 2007-03-15 13:30:39+01:00, jonas@perch.ndb.mysql.com +4 -0
    test prg for bug#27169

ChangeSet@1.1810.2126.52, 2007-03-15 11:05:12+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix bug in UtilTransactions::compare
    reset rowcount on temporary error during scan of base table

  ndb/test/src/UtilTransactions.cpp@1.17.5.1, 2007-03-15 11:05:11+01:00, jonas@perch.ndb.mysql.com +1 -0
    ndb - fix bug in UtilTransactions::compare
      reset rowcount on temporary error during scan of base table

ChangeSet@1.1810.2374.76, 2007-03-15 09:58:39+01:00, msvensson@pilot.blaudden +1 -0
  Pass pointer to current mysqld to mysqld_arguments in order to make the
  code eaiser and more extensible

  mysql-test/mysql-test-run.pl@1.30.49.66, 2007-03-15 09:58:37+01:00, msvensson@pilot.blaudden +55 -83
    Pass pointer to current mysqld to mysqld_arguments in order to make the
    code eaiser and more extensible

ChangeSet@1.1810.2689.1, 2007-03-15 11:51:35+03:00, dlenev@mockturtle.local +3 -0
  Fix for bug #25966 "2MB per second endless memory consumption after LOCK
  TABLE ... WRITE".
  
  Memory and CPU hogging occured when connection which had to wait for table
  lock was serviced by thread which previously serviced connection that was
  killed (note that connections can reuse threads if thread cache is enabled).
  One possible scenario which exposed this problem was when thread which
  provided binlog dump to replication slave was implicitly/automatically
  killed when the same slave reconnected and started pulling data through
  different thread/connection.
  The problem also occured when one killed particular query in connection
  (using KILL QUERY) and later this connection had to wait for some table
  lock.
  
  This problem was caused by the fact that thread-specific mysys_var::abort
  variable, which indicates that waiting operations on mysys layer should
  be aborted (this includes waiting for table locks), was set by kill
  operation but was never reset back. So this value was "inherited" by the
  following statements or even other connections (which reused the same
  physical thread). Such discrepancy between this variable and THD::killed
  flag broke logic on SQL-layer and caused CPU and memory hogging.
  
  This patch tries to fix this problem by properly resetting this member.
  
  There is no test-case associated with this patch since it is hard to test
  for memory/CPU hogging conditions in our test-suite.

  sql/mysqld.cc@1.439.1.158, 2007-03-15 11:51:32+03:00, dlenev@mockturtle.local +6 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of other connections.

  sql/sp_head.cc@1.200.15.1, 2007-03-15 11:51:33+03:00, dlenev@mockturtle.local +1 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of further statements.

  sql/sql_parse.cc@1.426.147.2, 2007-03-15 11:51:33+03:00, dlenev@mockturtle.local +3 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of further statements.

ChangeSet@1.1616.2989.3, 2007-03-15 11:30:17+03:00, dlenev@mockturtle.local +1 -0
  Fix for bug #25966 "2MB per second endless memory consumption after LOCK
  TABLE ... WRITE".
  
  CPU hogging occured when connection which had to wait for table lock was
  serviced by thread which previously serviced connection that was killed
  (note that connections can reuse threads if thread cache is enabled).
  One possible scenario which exposed this problem was when thread which
  provided binlog dump to replication slave was implicitly/automatically
  killed when the same slave reconnected and started pulling data through
  different thread/connection.
  In 5.* versions memory hogging was added to CPU hogging. Moreover in
  those versions the problem also occured when one killed particular query
  in connection (using KILL QUERY) and later this connection had to wait for
  some table lock.
  
  This problem was caused by the fact that thread-specific mysys_var::abort
  variable, which indicates that waiting operations on mysys layer should
  be aborted (this includes waiting for table locks), was set by kill
  operation but was never reset back. So this value was "inherited" by the
  following statements or even other connections (which reused the same
  physical thread). Such discrepancy between this variable and THD::killed
  flag broke logic on SQL-layer and caused CPU and memory hogging.
  
  This patch tries to fix this problem by properly resetting this member.
  
  There is no test-case associated with this patch since it is hard to test
  for memory/CPU hogging conditions in our test-suite.

  sql/mysqld.cc@1.356.98.40, 2007-03-15 11:30:16+03:00, dlenev@mockturtle.local +6 -0
    We should not forget to reset THD::mysys_var::abort after kill operation
    if we are going to use thread to which this operation was applied for
    handling of other connections.

ChangeSet@1.1810.2688.1, 2007-03-15 12:06:06+04:00, ramil@mysql.com +3 -0
  Fix for bug #24558: Increasing decimal column length causes data loss
  
  Altering to a decimal field we get double value then store it 
  that may cause data loss. 
  Fix: use store_decimal() instead.
  

  mysql-test/r/type_newdecimal.result@1.36.1.8, 2007-03-15 12:06:05+04:00, ramil@mysql.com +8 -0
    Fix for bug #24558: Increasing decimal column length causes data loss
      - test result.

  mysql-test/t/type_newdecimal.test@1.33.1.10, 2007-03-15 12:06:05+04:00, ramil@mysql.com +11 -0
    Fix for bug #24558: Increasing decimal column length causes data loss
      - test case.

  sql/field_conv.cc@1.52.1.10, 2007-03-15 12:06:05+04:00, ramil@mysql.com +9 -0
    Fix for bug #24558: Increasing decimal column length causes data loss
      - if target field's result type is DECIMAL_RESULT
        use store_decimal(val_decimal()) in order not to loss data.

ChangeSet@1.2403.15.6, 2007-03-15 07:08:15+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    fix test_event -n EventOperationApplier

  storage/ndb/test/ndbapi/test_event.cpp@1.24, 2007-03-15 07:08:12+01:00, jonas@perch.ndb.mysql.com +11 -3
    fix potential race

  storage/ndb/test/src/HugoCalculator.cpp@1.24, 2007-03-15 07:08:12+01:00, jonas@perch.ndb.mysql.com +23 -2
    genrate longer varsize keys

ChangeSet@1.2454.1.12, 2007-03-14 17:38:06-06:00, malff@weblab.(none) +6 -0
  Manual merge from 5.0-runtime to 5.1-runtime

  include/my_global.h@1.157.1.5, 2007-03-14 17:38:03-06:00, malff@weblab.(none) +6 -0
    Manual merge from 5.0-runtime to 5.1-runtime

  mysql-test/r/sp-error.result@1.124, 2007-03-14 17:38:03-06:00, malff@weblab.(none) +52 -0
    Manual merge from 5.0-runtime to 5.1-runtime

  mysql-test/r/sp.result@1.248.1.5, 2007-03-14 17:38:03-06:00, malff@weblab.(none) +165 -0
    Manual merge from 5.0-runtime to 5.1-runtime

  mysql-test/t/sp.test@1.216.1.4, 2007-03-14 17:38:03-06:00, malff@weblab.(none) +135 -0
    Manual merge from 5.0-runtime to 5.1-runtime

  sql/field.cc@1.376.1.2, 2007-03-14 17:38:04-06:00, malff@weblab.(none) +3 -3
    Manual merge from 5.0-runtime to 5.1-runtime

  sql/sql_select.cc@1.492.2.3, 2007-03-14 17:38:04-06:00, malff@weblab.(none) +3 -3
    Manual merge from 5.0-runtime to 5.1-runtime

ChangeSet@1.1810.2687.1, 2007-03-14 12:02:32-06:00, malff@weblab.(none) +9 -0
  Bug#26503 (Illegal SQL exception handler code causes the server to crash)
  
  Before this fix, the parser would accept illegal code in SQL exceptions
  handlers, that later causes the runtime to crash when executing the code,
  due to memory violations in the exception handler stack.
  
  The root cause of the problem is instructions within an exception handler
  that jumps to code located outside of the handler. This is illegal according
  to the SQL 2003 standard, since labels located outside the handler are not
  supposed to be visible (they are "out of scope"), so any instruction that
  jumps to these labels, like ITERATE or LEAVE, should not parse.
  
  The section of the standard that is relevant for this is :
    SQL:2003 SQL/PSM (ISO/IEC 9075-4:2003)
    section 13.1 <compound statement>,
    syntax rule 4
  <quote>
    The scope of the <beginning label> is CS excluding every <SQL schema
    statement> contained in CS and excluding every
    <local handler declaration list> contained in CS. <beginning label> shall
    not be equivalent to any other <beginning label>s within that scope.
  </quote>
  
  With this fix, the C++ class sp_pcontext, which represent the "parsing
  context" tree (a.k.a symbol table) of a stored procedure, has been changed
  as follows:
  - constructors have been cleaned up, so that only building a root node for
  the tree is public; building nodes inside a tree is not public.
  - a new member, m_label_scope, indicates if a given syntactic context
  belongs to a DECLARE HANDLER block,
  - label resolution, in the method find_label(), has been changed to
  implement the restriction of scope regarding labels used in a compound
  statement.
  
  The actions in the parser, when parsing the body of a SQL exception handler,
  have been changed as follows:
  - the implementation of an exception handler (DECLARE HANDLER) now creates
  explicitly a new sp_pcontext, to isolate the code inside the handler from
  the containing compound statement context.
  - registering exception handlers as a result occurs in the parent context,
  see the rule sp_hcond_element
  - the code in sp_hcond_list has been cleaned up, to avoid code duplication
  
  In addition, the flags IN_SIMPLE_CASE and IN_HANDLER, declared in sp_head.h
  have been removed, since they are unused and broken by design (as seen with
  Bug 19194 (Right recursion in parser for CASE causes excessive stack usage,
  limitation), representing a stack in a single flag is not possible.
  
  Tests in sp-error have been added to show that illegal constructs are now
  rejected.
  
  Tests in sp have been added for code coverage, to show that ITERATE or LEAVE
  statements are legal when jumping to a label in scope, inside the body of
  an exception handler.

  mysql-test/r/sp-error.result@1.102.1.10, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +52 -0
    SQL Exception handlers define a parsing context for label resolution.

  mysql-test/r/sp.result@1.170.33.3, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +165 -0
    SQL Exception handlers define a parsing context for label resolution.

  mysql-test/t/sp-error.test@1.100.1.13, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +68 -0
    SQL Exception handlers define a parsing context for label resolution.

  mysql-test/t/sp.test@1.174.32.3, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +135 -0
    SQL Exception handlers define a parsing context for label resolution.

  sql/sp_head.cc@1.200.7.14, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +1 -1
    Minor cleanup

  sql/sp_head.h@1.79.1.16, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +0 -2
    Minor cleanup

  sql/sp_pcontext.cc@1.33, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +69 -23
    SQL Exception handlers define a parsing context for label resolution.

  sql/sp_pcontext.h@1.31, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +51 -10
    SQL Exception handlers define a parsing context for label resolution.

  sql/sql_yacc.yy@1.371.101.1, 2007-03-14 12:02:30-06:00, malff@weblab.(none) +16 -27
    SQL Exception handlers define a parsing context for label resolution.

ChangeSet@1.1346.1.867, 2007-03-14 18:28:16+01:00, kent@mysql.com +1 -0
  EXCEPTIONS-CLIENT:
    Updated to version 0.6 of the text

  EXCEPTIONS-CLIENT@1.2, 2007-03-14 18:28:10+01:00, kent@mysql.com +4 -2
    Updated to version 0.6 of the text

ChangeSet@1.2473.2.15, 2007-03-14 18:18:30+02:00, gkodinov@magare.gmz +1 -0
  merge 5.0->5.1

  mysql-test/r/alter_table.result@1.77, 2007-03-14 18:18:28+02:00, gkodinov@magare.gmz +4 -4
    merge 5.0->5.1

ChangeSet@1.2473.2.14, 2007-03-14 17:07:48+02:00, gkodinov@magare.gmz +1 -0
  Bug #26794: fixed valgrind warning

  sql/sql_table.cc@1.397, 2007-03-14 17:07:47+02:00, gkodinov@magare.gmz +1 -2
    Bug #26794: fixed valgrind warning

ChangeSet@1.2403.15.5, 2007-03-14 15:37:47+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#27005
      Handle API failure during resend
      API failure could cause release of table object, which will make resend crash
        when dereferencing table object
        
      Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
  

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.2, 2007-03-14 15:37:45+01:00, jonas@perch.ndb.mysql.com +49 -29
    Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
          
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend

  storage/ndb/test/tools/listen.cpp@1.4.1.1, 2007-03-14 15:37:45+01:00, jonas@perch.ndb.mysql.com +7 -1
    add new events

ChangeSet@1.1810.2548.86, 2007-03-14 15:58:14+02:00, gkodinov@magare.gmz +1 -0
  Bug #26794: fixed valgrind warning

  sql/sql_table.cc@1.239.49.2, 2007-03-14 15:58:13+02:00, gkodinov@magare.gmz +1 -2
    Bug #26794: fixed valgrind warning

ChangeSet@1.1346.1.866, 2007-03-14 14:27:46+01:00, kent@mysql.com +1 -0
  configure.in:
    Added test for sched_yield() possibly in -lposix4 on Solaris

  configure.in@1.191.1.153, 2007-03-14 14:27:40+01:00, kent@mysql.com +3 -0
    Added test for sched_yield() possibly in -lposix4 on Solaris

ChangeSet@1.2473.2.11, 2007-03-14 13:32:12+02:00, gkodinov@magare.gmz +1 -0
  WL#3527 : inspected a 5.1 covarage report

  sql/item.cc@1.254, 2007-03-14 13:32:10+02:00, gkodinov@magare.gmz +2 -0
    WL#3527 : inspected a covarage report

ChangeSet@1.2473.10.1, 2007-03-14 12:15:14+01:00, mhansson@linux-st28.site +3 -0
  Bug #24778: Innodb: No result when using ORDER BY
  
  This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
  ok to call test_if_skip_sort_order since this function will 
  alter the execution plan. By contract it is not ok to call 
  test_if_skip_sort_order in this context.
  
  This bug appears only in the case when the optimizer has chosen 
  an index for accessing a particular table but finds a covering 
  index that enables it to skip ORDER BY. This happens in 
  test_if_skip_sort_order.

  mysql-test/r/key.result@1.42, 2007-03-14 12:15:09+01:00, mhansson@linux-st28.site +41 -0
    Bug#24778
    
    test case.
    
    The bug causes the result to be the empty set.

  mysql-test/t/key.test@1.34, 2007-03-14 12:15:09+01:00, mhansson@linux-st28.site +48 -0
    Bug#24778
    
    The minimal test case that reveals the bug. The reason for such a 
    complicated schema is that we have to convince the optimizer to 
    pick one index, then discard it in order to be able to skip 
    ORDER BY.

  sql/sql_select.cc@1.492.1.14, 2007-03-14 12:15:10+01:00, mhansson@linux-st28.site +1 -4
    bug#24778
    
    Removed the call to test_if_skip_sort_order that constituted the
    bug.

ChangeSet@1.2403.15.4, 2007-03-14 11:22:11+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27087
    Make sure not to handle API_FAILREQ if it's already handled

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.1, 2007-03-14 11:22:09+01:00, jonas@perch.ndb.mysql.com +15 -0
    Make sure not to handle API_FAILREQ if it's already handled

ChangeSet@1.2473.2.10, 2007-03-14 12:20:34+02:00, gkodinov@magare.gmz +5 -0
  Bug #26794: 5.1 part
   It was syntactically correct to define 
   spatial keys over parts of columns (e.g.
   ALTER TABLE t1 ADD x GEOMETRY NOT NULL, 
     ADD SPATIAL KEY (x(32))).
   This may lead to undefined results and/or
   interpretation.
   Fixed by not allowing partial column 
   specification in a SPATIAL index definition.

  mysql-test/r/alter_table.result@1.75, 2007-03-14 12:20:33+02:00, gkodinov@magare.gmz +6 -4
    Bug #26794: 5.1 part
     test case

  mysql-test/r/gis-rtree.result@1.27.1.2, 2007-03-14 12:20:33+02:00, gkodinov@magare.gmz +3 -3
    Bug #26794: 5.1 part
     updated the tests to the new syntax

  mysql-test/t/alter_table.test@1.59, 2007-03-14 12:20:33+02:00, gkodinov@magare.gmz +4 -0
    Bug #26794: 5.1 part
     test case

  mysql-test/t/gis-rtree.test@1.21.1.1, 2007-03-14 12:20:33+02:00, gkodinov@magare.gmz +3 -3
    Bug #26794: 5.1 part
     updated the tests to the new syntax

  sql/sql_table.cc@1.395, 2007-03-14 12:20:33+02:00, gkodinov@magare.gmz +8 -0
    Bug #26794: 5.1 part
     Disable defining SPATIAL KEYS with sub-key parts

ChangeSet@1.1810.2684.1, 2007-03-14 11:54:20+02:00, gkodinov@magare.gmz +6 -0
  Bug #26794:
  Different set of conditions is used to verify
  the validity of index definitions over a GEOMETRY
  column in ALTER TABLE and CREATE TABLE. 
  The difference was on how sub-keys notion validity
  is checked.
  Fixed by extending the CREATE TABLE condition to
  support the cases allowed in ALTER TABLE.
  Made the SHOW CREATE TABLE not to display spatial
  indexes using the sub-key notion.

  mysql-test/r/alter_table.result@1.49.4.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +34 -0
    Bug #26794: test case

  mysql-test/r/gis-rtree.result@1.14.6.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +2 -2
    Bug #26794: fixed SHOW CREATE TABLE output.

  mysql-test/t/alter_table.test@1.36.5.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +23 -0
    Bug #26794: test case

  sql/field.cc@1.256.47.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +1 -0
    Bug #26794: Allow sub-keys for GEOMETRY

  sql/sql_show.cc@1.253.48.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +1 -1
    Bug #26794: Don't show sub-key notion 
     in SHOW CREATE TABLE for SPATIAL indexes.

  sql/sql_table.cc@1.239.49.1, 2007-03-14 11:54:19+02:00, gkodinov@magare.gmz +3 -1
    Bug #26794: Allow sub-keys for GEOMETRY

ChangeSet@1.1810.2683.4, 2007-03-14 02:30:05+04:00, svoj@mysql.com +1 -0
  Removed tabs.

  myisam/mi_open.c@1.90.22.1, 2007-03-14 02:30:03+04:00, svoj@mysql.com +1 -1
    Removed tabs.

ChangeSet@1.2403.15.3, 2007-03-13 21:03:34+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27102
    Make sure head after undo execute does not point to last page of file
    As this will confuse next write to group

  storage/ndb/src/kernel/blocks/lgman.cpp@1.23.1.1, 2007-03-13 21:03:32+01:00, jonas@perch.ndb.mysql.com +19 -0
    Make sure head after undo execute does not point to last page of file
    As this will confuse next write to group

ChangeSet@1.2454.1.10, 2007-03-13 21:15:29+03:00, kroki@moonlight.home +1 -0
  Fix the bug introduced with the push of the fix for bug#18326: Do not
  lock table for writing during prepare of statement.
  
  When single call open_normal_and_derived_tables() was used, we never
  set table_count to the right value.  This patch reverts the part of
  the old code that does open_tables() (and sets table_count), then
  checks if table_list->multitable_view is set (and returns if so, using
  table_count value), and only then it does mysql_handle_derived().

  sql/sql_prepare.cc@1.204.1.1, 2007-03-13 21:15:24+03:00, kroki@moonlight.home +8 -1
    Fix the bug introduced with the push of the fix for bug#18326: Do not
    lock table for writing during prepare of statement.
    
    When single call open_normal_and_derived_tables() was used, we never
    set table_count to the right value.  This patch reverts the part of
    the old code that does open_tables() (and sets table_count), then
    checks if table_list->multitable_view is set (and returns if so, using
    table_count value), and only then it does mysql_handle_derived().

ChangeSet@1.2409.96.1, 2007-03-13 16:43:45+01:00, istruewing@chilla.local +1 -0
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  
  The previous two patches for this bug worked together so that
  no permanent table was memory mapped. The first patch tried to
  avoid mapping while a table is in use. It allowed mapping only
  if there was exactly one lock on the table, assuming that the
  calling thread owned it. During mi_open(), a different call to
  memory mapping was coded, which did not have this limitation.
  
  The second patch tried to remove the code duplication and just
  called mi_extra() from mi_open() an thus inherited the limitation.
  But on open, a thread does not have a lock on the table...
  
  A possible solution would be to check for zero or one lock.
  But since I learned that it is safe to memory map a file while
  normal file I/O is done on it, I removed the restriction altogether
  and allow to memory map while a table is in use.
  
  No test case. I do not see a chance to verify with the test suite
  which kind of I/O is used on a table.

  storage/myisam/mi_extra.c@1.54, 2007-03-13 16:43:41+01:00, istruewing@chilla.local +6 -4
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Allow to memory map while table is in use.

ChangeSet@1.1616.2989.2, 2007-03-13 18:02:06+04:00, svoj@mysql.com +5 -0
  BUG#26881 - Large MERGE tables report incorrect specification when no
              differences in tables
  Certain merge tables were wrongly reported as having incorrect definition:
  - Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
    be internally casted (in certain cases) to a different type on a
    storage engine layer. (affects 4.1 and up)
  - If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
    than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
    identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
    sync. (affects 4.1 only)
  
  This is fixed by relaxing a check for underlying conformance and setting
  field type to FIELD_TYPE_STRING in case varchar is shorter than 4
  when a table is created.

  mysql-test/r/merge.result@1.32.1.14, 2007-03-13 18:02:04+04:00, svoj@mysql.com +13 -0
    A test case for bug#26881.

  mysql-test/t/merge.test@1.28.1.15, 2007-03-13 18:02:04+04:00, svoj@mysql.com +17 -0
    A test case for bug#26881.

  sql/sql_parse.cc@1.271.1.225, 2007-03-13 18:02:05+04:00, svoj@mysql.com +7 -1
    When a table that has varchar field shorter than 4 is created, field type is
    set to FIELD_TYPE_VAR_STRING. Later, when a table is modified using alter
    table, field type is changed to FIELD_TYPE_STRING (see Field_string::type).
    That means HA_OPTION_PACK_RECORD flag might be lost and thus null_bit might
    be shifted by alter table, in other words alter table doesn't create 100%
    equal table definition.
    
    This is usually not a problem, since when a table is created/altered,
    definition on a storage engine layer is based on one that is passed from
    sql layer. But it is a problem for merge engine - null_bit is shifted when
    a table (merge or underlying) is altered.
    
    Set field type to FIELD_TYPE_STRING in case FIELD_TYPE_VAR_STRING is shorter
    than 4 when a table is created as it is done in Field::type.

  sql/ha_myisam.cc@1.115.1.50, 2007-03-13 18:02:04+04:00, svoj@mysql.com +36 -1
    Relaxed some checks performed by check_definition():
    As comparing of fulltext keys (and key segments) is not yet implemented,
    only return an error in case one of keys is fulltext and other is not.
    Otherwise, if both keys are fulltext, accept them as is.
    
    As comparing of spatial keys (and key segments) is not yet implemented,
    only return an error in case one of keys is spatial and other is not.
    Otherwise, if both keys are spatial, accept them as is.
    
    A workaround to handle situation when field is casted from FIELD_SKIP_ZERO
    to FIELD_NORMAL. This could happen only in case field length is 1 and row
    format is fixed.

  myisam/mi_create.c@1.37.1.14, 2007-03-13 18:02:04+04:00, svoj@mysql.com +4 -0
    Added a comment.

ChangeSet@1.1810.2657.13, 2007-03-13 06:06:09-07:00, mtaylor@qualinost.(none) +1 -0
  BUG#26952: mysql.server needs to be able to not timeout in certain situations
  
  For systems running MySQL through heartbeat, it is imperitive that the startup scripts 
  not only return correct return values, but do not return until success or failure has been 
  determined. This is a different behavior than is typically wanted for the startup 
  of a normal machine. 
  
  This patch adds support for a timeout variable for mysql.server. Read from my.cnf, this
  variable defaults to 900 (the current default). A value of 0 means not to wait at all for
  startup confirmation. A negative value means to wait forever.  

  support-files/mysql.server.sh@1.49.1.5, 2007-03-13 06:06:02-07:00, mtaylor@qualinost.(none) +9 -1
    Added support for a timeout variable to control timing out our wait for server startup. BUG#26952

ChangeSet@1.2403.15.2, 2007-03-13 12:38:47+01:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#27003
    merge to 5.1, adopt testprg to optimized node recovery

  storage/ndb/include/kernel/signaldata/LqhKey.hpp@1.6, 2007-03-13 12:38:45+01:00, jonas@perch.ndb.mysql.com +1 -0
    Add Restore as friend

  storage/ndb/src/kernel/blocks/restore.cpp@1.12.1.1, 2007-03-13 12:38:45+01:00, jonas@perch.ndb.mysql.com +16 -1
    Give proper error message on LQHKEYREF

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.38.1.4, 2007-03-13 12:38:45+01:00, jonas@perch.ndb.mysql.com +2 -2
    post merge fix, adopt to optimized node recovery...

ChangeSet@1.1810.2126.51, 2007-03-13 11:29:14+01:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - bug#27003
    Handle random(not in order) LQHKEYREQ failures during node-restart

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.18.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +12 -0
    Document new error codes

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.45.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +16 -3
    Handle random(not in order) LQHKEYREQ failures during node-restart

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.6.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +24 -0
    Error codes for various oom problems

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.15.8.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +1 -1
    move CLEAR_ERROR_INSERT_VALUE to constructor so that it's reasonable to use it for
    restart testing
    

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.27.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +1 -0
    Add error insert for CopyFragRef
    

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.21.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +56 -0
    Testprg for bug#27003

  ndb/test/run-test/daily-basic-tests.txt@1.27.32.1, 2007-03-13 11:29:13+01:00, jonas@perch.ndb.mysql.com +4 -0
    add testprg

ChangeSet@1.2409.93.4, 2007-03-13 11:22:20+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  BUG#25880, Adding new column to ndb_dd table moves data for non_indexed fields in memory
  correct the inconsistency between columns' storage type with table's storage_media & tablespace

  sql/ha_ndbcluster.cc@1.408.3.1, 2007-03-13 11:22:18+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -1
    move something to proper location, 
    then columns' storage type are consistent with table's storage_media & tablespace

ChangeSet@1.1616.2881.62, 2007-03-12 21:27:07+01:00, kent@mysql.com +1 -0
  configure.in:
    Restored accidently removed line to check for zlib

  configure.in@1.201.64.26, 2007-03-12 21:26:03+01:00, kent@mysql.com +2 -0
    Restored accidently removed line to check for zlib

ChangeSet@1.1810.2659.4, 2007-03-12 16:57:00+02:00, gkodinov@magare.gmz +6 -0
  Bug #26794:
  Different set of conditions is used to verify
  the validity of index definitions over a GEOMETRY
  column in ALTER TABLE and CREATE TABLE. 
  The difference was on how sub-keys notion validity
  is checked.
  Fixed by extending the CREATE TABLE condition to
  support the cases allowed in ALTER TABLE.
  Made the SHOW CREATE TABLE not to display spatial
  indexes using the sub-key notion.

  mysql-test/r/alter_table.result@1.49.1.14, 2007-03-12 16:56:58+02:00, gkodinov@magare.gmz +34 -0
    Bug #26794: test case

  mysql-test/r/gis-rtree.result@1.14.5.1, 2007-03-12 16:56:58+02:00, gkodinov@magare.gmz +2 -2
    Bug #26794: fixed SHOW CREATE TABLE output.

  mysql-test/t/alter_table.test@1.36.1.14, 2007-03-12 16:56:58+02:00, gkodinov@magare.gmz +23 -0
    Bug #26794: test case

  sql/field.cc@1.256.46.1, 2007-03-12 16:56:58+02:00, gkodinov@magare.gmz +1 -0
    Bug #26794: Allow sub-keys for GEOMETRY

  sql/sql_show.cc@1.253.47.1, 2007-03-12 16:56:58+02:00, gkodinov@magare.gmz +1 -1
    Bug #26794: Don't show sub-key notion 
     in SHOW CREATE TABLE for SPATIAL indexes.

  sql/sql_table.cc@1.239.48.1, 2007-03-12 16:56:59+02:00, gkodinov@magare.gmz +3 -1
    Bug #26794: Allow sub-keys for GEOMETRY

ChangeSet@1.2473.6.4, 2007-03-12 14:55:45+01:00, kent@mysql.com +1 -0
  CMakeLists.txt:
    Removed references to my_winsem.c

  mysys/CMakeLists.txt@1.12, 2007-03-12 14:55:33+01:00, kent@mysql.com +1 -1
    Removed references to my_winsem.c

ChangeSet@1.1810.2682.2, 2007-03-12 14:52:37+01:00, kent@mysql.com +2 -0
  Makefile.am, CMakeLists.txt:
    Removed references to my_winsem.c

  mysys/CMakeLists.txt@1.1.3.1, 2007-03-12 14:52:30+01:00, kent@mysql.com +1 -1
    Removed references to my_winsem.c

  mysys/Makefile.am@1.62.1.14, 2007-03-12 14:52:30+01:00, kent@mysql.com +1 -1
    Removed references to my_winsem.c

ChangeSet@1.1616.2881.61, 2007-03-12 13:18:48+01:00, kent@mysql.com +2 -0
  mysys_ia64.dsp, mysys.vcproj:
    Removed references to unused files

  VC++Files/mysys/mysys.vcproj@1.1.1.2, 2007-03-12 13:18:03+01:00, kent@mysql.com +0 -43
    Removed unused files

  VC++Files/mysys/mysys_ia64.dsp@1.2.1.2, 2007-03-12 13:18:03+01:00, kent@mysql.com +0 -4
    Removed unused files

ChangeSet@1.1810.2681.1, 2007-03-12 13:15:43+01:00, df@pippilotta.erinye.com +1 -0
  add missing test cases to windows binary distribution

  scripts/make_win_bin_dist@1.1.7.1, 2007-03-12 13:15:41+01:00, df@pippilotta.erinye.com +1 -0
    add missing test cases to windows binary distribution

ChangeSet@1.1346.1.865, 2007-03-12 13:12:42+01:00, kent@mysql.com +7 -0
  Makefile.am, configure.in, mysys.dsp:
    Removed unused files
  .del-my_winsem.c:
    Delete: mysys/my_winsem.c
  .del-my_semaphore.c:
    Delete: mysys/my_semaphore.c
  .del-my_semaphore.h:
    Delete: include/my_semaphore.h

  BitKeeper/deleted/.del-my_semaphore.c@1.3.1.1, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: mysys/my_semaphore.c

  BitKeeper/deleted/.del-my_semaphore.h@1.8, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: include/my_semaphore.h

  BitKeeper/deleted/.del-my_winsem.c@1.4, 2007-03-12 13:10:40+01:00, kent@mysql.com +0 -0
    Delete: mysys/my_winsem.c

  VC++Files/mysys/mysys.dsp@1.6.1.8, 2007-03-12 13:12:09+01:00, kent@mysql.com +0 -4
    Removed unused files

  configure.in@1.191.1.152, 2007-03-12 13:12:09+01:00, kent@mysql.com +0 -3
    Removed unused files

  include/Makefile.am@1.29.1.12, 2007-03-12 13:12:09+01:00, kent@mysql.com +1 -1
    Removed unused files

  mysys/Makefile.am@1.29.1.17, 2007-03-12 13:12:09+01:00, kent@mysql.com +1 -1
    Removed unused files

ChangeSet@1.2473.2.8, 2007-03-12 13:20:46+02:00, gkodinov@magare.gmz +2 -0
  group_by.result:
    WL3527: disable wrong optimization.
  sql_select.cc:
    WL#3527: disable wrong optimization.

  mysql-test/r/group_by.result@1.79, 2007-03-12 12:19:10+02:00, gkodinov@magare.gmz +1 -1
    WL3527: disable wrong optimization.

  sql/sql_select.cc@1.492.1.13, 2007-03-12 12:17:20+02:00, gkodinov@magare.gmz +0 -12
    WL#3527: disable wrong optimization.

ChangeSet@1.1810.2548.82, 2007-03-12 01:39:57-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #26738: incomplete string values in a result set column 
  when the column is to be read from a derived table column which 
  was specified as a concatenation of string literals.
  The bug happened because the Item_string::append did not adjust the
  value of Item_string::max_length. As a result of it the temporary 
  table column  defined to store the concatenation of literals was 
  not wide enough to hold the whole value.
  

  mysql-test/r/subselect.result@1.134.1.45, 2007-03-12 01:39:55-07:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26738.

  mysql-test/t/subselect.test@1.129.1.15, 2007-03-12 01:39:55-07:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26738.

  sql/item.h@1.183.1.39, 2007-03-12 01:39:55-07:00, igor@olga.mysql.com +5 -1
    Fixed bug #26738: incomplete string values in a result set column 
    when the column is to be read from a derived table column which 
    was specified as a concatenation of string literals.
    The bug happened because the Item_string::append did not adjust the
    value of Item_string::max_length. As a result of it the temporary 
    table column  defined to store the concatenation of literals was 
    not wide enough to hold the whole value.
    

ChangeSet@1.1810.2677.4, 2007-03-11 23:34:40-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #26963: invalid optimization of the pushdown conditions
  after single-row table substitution could lead to a wrong result set.
  The bug happened because the function Item_field::replace_equal_field
  erroniously assumed that any field included in a multiple equality
  with a constant has been already substituted for this constant.
  This not true for fields becoming constant after row substitutions
  for constant tables.
   

  mysql-test/r/select.result@1.121.12.1, 2007-03-11 23:34:38-07:00, igor@olga.mysql.com +38 -0
    Added a test case for bug #26963.

  mysql-test/t/select.test@1.102.10.1, 2007-03-11 23:34:39-07:00, igor@olga.mysql.com +47 -0
    Added a test case for bug #26963.

  sql/item.cc@1.113.1.143, 2007-03-11 23:34:39-07:00, igor@olga.mysql.com +13 -2
    Fixed bug #26963: invalid optimization of the pushdown conditions
    after single-row table substitution could lead to a wrong result set.
    The bug happened because the function Item_field::replace_equal_field
    erroneously assumed that any field included in a multiple equality
    with a constant has been already substituted for this constant.
    This not true for fields becoming constant after row substitutions
    for constant tables.
     

ChangeSet@1.2473.2.7, 2007-03-11 14:31:43+02:00, gkodinov@magare.gmz +3 -0
  WL3527: post-merge updates
  sql_yacc.yy:
    WL3527: updated the diff to use correct parser words
  table.cc:
    WL3527: exteneded the fix for bug #20604 to fit the new variables
  sql_select.cc:
    WL3527: renamed used_keys to covering_keys

  sql/sql_select.cc@1.492.1.12, 2007-03-11 14:26:12+02:00, gkodinov@magare.gmz +1 -1
    renamed used_keys to covering_keys

  sql/sql_yacc.yy@1.549.2.3, 2007-03-11 14:26:41+02:00, gkodinov@magare.gmz +1 -1
    WL3527: updated the diff to use correct parser words

  sql/table.cc@1.275.1.7, 2007-03-11 14:29:46+02:00, gkodinov@magare.gmz +3 -3
    WL3527: exteneded the fix for bug #20604 to fit the new variables

ChangeSet@1.1810.2679.1, 2007-03-10 19:55:34+03:00, evgen@moonbone.local +3 -0
  Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
  
  When the SUBSTRING() function was used over a LONGTEXT field the max_length of
  the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
  parameter is used while tmp field creation it limits the length of the result
  field and leads to printing an empty string instead of the correct result.
  
  Now the Item_func_substr::fix_length_and_dec() function correctly calculates
  the max_length parameter.

  mysql-test/r/func_str.result@1.110.7.1, 2007-03-10 19:55:10+03:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.

  mysql-test/t/func_str.test@1.92.5.1, 2007-03-10 19:55:04+03:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.

  sql/item_strfunc.cc@1.261.25.1, 2007-03-10 19:55:10+03:00, evgen@moonbone.local +3 -4
    Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
    Now the Item_func_substr::fix_length_and_dec() function correctly calculates
    the max_length parameter.

ChangeSet@1.1810.2678.1, 2007-03-10 17:44:25+04:00, holyfoot@mysql.com +1 -0
  bug #26833 (Compile error with embedded lib)
  org_tables declaration was mistakenly #ifdef-ed with the EMBEDDED_LIBRARY
  instead of ACCESS_CHECKS

  sql/sql_parse.cc@1.426.1.184, 2007-03-10 17:44:23+04:00, holyfoot@mysql.com +1 -1
    default condition fixed

ChangeSet@1.1810.2677.1, 2007-03-10 02:47:47-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26830: a crash for the query with a subselect containing ROLLUP.
  Crash happened because the function get_best_group_min_max detected
  joins with ROLLUP incorrectly.

  mysql-test/r/olap.result@1.33.1.3, 2007-03-10 02:47:44-08:00, igor@olga.mysql.com +9 -0
    Added a test case for bug #26830.

  mysql-test/t/olap.test@1.27, 2007-03-10 02:47:44-08:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #26830.

  sql/opt_range.cc@1.159.1.82, 2007-03-10 02:47:45-08:00, igor@olga.mysql.com +1 -1
    Fixed bug #26830: a crash for the query with a subselect containing ROLLUP.
    Crash happened because the function get_best_group_min_max detected
    joins with ROLLUP incorrectly.

ChangeSet@1.1810.2670.4, 2007-03-10 11:46:20+07:00, tomas@poseidon.mysql.com +1 -0
  disabling _new_ unstable test case

  mysql-test/t/disabled.def@1.2.4.25, 2007-03-10 11:46:13+07:00, tomas@poseidon.mysql.com +1 -0
    disabling _new_ unstable test case

ChangeSet@1.1810.2668.5, 2007-03-09 23:37:33+01:00, knielsen@ymer.(none) +2 -0
  BUG#27018: Partial blob write inside blob clobbers data after the write.
  
  When doing partial blob update with NdbBlob::writeData(), zero-padding
  after the write was wrongly done, causing part of the old blob value
  to be overwritten with zeros (or spaces for text field).
  
  Fixed by only padding when needed (when writing at end of the blob).

  ndb/src/ndbapi/NdbBlob.cpp@1.22.11.1, 2007-03-09 23:37:29+01:00, knielsen@ymer.(none) +3 -1
    Do not pad rest of blob part after the write, unless it is a write at the
    end of the blob.

  ndb/test/ndbapi/testBlobs.cpp@1.20.15.1, 2007-03-09 23:37:29+01:00, knielsen@ymer.(none) +53 -1
    Add test case.

ChangeSet@1.1810.2675.1, 2007-03-10 00:29:02+03:00, evgen@moonbone.local +12 -0
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  
  Additional fix for bug#22331. Now Item_field prints its value in the case of
  the const field.

  mysql-test/r/explain.result@1.17.1.3, 2007-03-10 00:18:45+03:00, evgen@moonbone.local +3 -3
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_default.result@1.5.1.1, 2007-03-10 00:18:44+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_regexp.result@1.10.1.1, 2007-03-10 00:18:43+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_str.result@1.110.6.1, 2007-03-10 00:18:43+03:00, evgen@moonbone.local +3 -3
    Corrected test case after fix for bug#22331.

  mysql-test/r/func_test.result@1.29.1.6, 2007-03-10 00:18:42+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/having.result@1.26.1.1, 2007-03-10 00:18:42+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/subselect.result@1.134.16.3, 2007-03-10 00:18:41+03:00, evgen@moonbone.local +11 -11
    Corrected test case after fix for bug#22331.

  mysql-test/r/union.result@1.80.4.1, 2007-03-10 00:18:40+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  mysql-test/r/varbinary.result@1.16.1.2, 2007-03-10 00:18:36+03:00, evgen@moonbone.local +1 -1
    Corrected test case after fix for bug#22331.

  sql/item.cc@1.113.75.1, 2007-03-10 00:19:26+03:00, evgen@moonbone.local +19 -2
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Added the print() member function to the Item_field class.

  sql/item.h@1.183.1.38, 2007-03-10 00:19:10+03:00, evgen@moonbone.local +1 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Added the print() member function to the Item_field class.

  sql/sql_union.cc@1.130.1.10, 2007-03-10 00:18:58+03:00, evgen@moonbone.local +6 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Cleanup of the SELECT_LEX::order_list list.

ChangeSet@1.2454.5.2, 2007-03-09 18:09:57+01:00, guilhem@gbichot3.local +13 -0
  Fix for BUG#735 "Prepared Statements: there is no support for Query
  Cache".
  WL#1569 "Prepared Statements: implement support of Query Cache".
  Prepared SELECTs did not look up in the query cache, and their results
  were not stored in the query cache. This made them slower than
  non-prepared SELECTs in some cases.
  The fix is to re-use the expanded query (the prepared query where
  "?" placeholders are replaced by their values, at execution time)
  for searching/storing in the query cache.
  It works fine for statements prepared via mysql_stmt_prepare(), which
  are the most commonly used and were the scope of this bugfix and WL.
  It works less fine for statements prepared via the SQL command
  PREPARE...FROM, which are still not using the query cache if they
  have at least one parameter (because then the expanded query contains
  names of user variables, and user variables don't work with the
  query cache, even in non-prepared queries).
  Note that results from prepared SELECTs, which are in the binary
  protocol, and results from normal SELECTs, which are in the text
  protocol, ignore each other in the query cache, because a result in the
  binary protocol should never be served to a SELECT expecting the text
  protocol and vice-versa.
  Note, after this patch, bug 25843 starts applying to query cache
  ("changing default database between PREPARE and EXECUTE of statement
  breaks binlog"), we need to fix it.

  mysql-test/include/have_query_cache.inc@1.5, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +0 -3
    Now prepared statements work with the query cache, so don't disable
    prep stmts by default when doing a query cache test. All tests which
    include this file will now be really tested against prepared
    statements (in particular, query_cache.test).

  mysql-test/r/query_cache.result@1.84.1.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +23 -0
    result update

  mysql-test/r/query_cache_sql_prepare.result@1.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +204 -0
    result of new test: we see hits when there is no parameter,
    no hit when there is a parameter.

  mysql-test/r/query_cache_sql_prepare.result@1.0, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/grant_cache.test@1.17.1.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +26 -0
    Cannot enable this test in ps-protocol, because in normal protocol,
    a SELECT failing due to insufficient privileges increments
    Qcache_not_cached, while in ps-protocol, no.
    In detail: in normal protocol,
    the "access denied" errors on SELECT are issued at (stack trace):
    mysql_parse/mysql_execute_command/execute_sqlcom_select/handle_select/
    mysql_select/JOIN::prepare/setup_wild/insert_fields/
    check_grant_all_columns/my_error/my_message_sql, which then calls
    push_warning/query_cache_abort: at this moment,
    query_cache_store_query() has been called, so query exists in cache,
    so thd->net.query_cache_query!=NULL, so query_cache_abort() removes
    the query from cache, which causes a query_cache.refused++ (thus,
    a Qcache_not_cached++).
    While in ps-protocol, the error is issued at prepare time;
    for this mysql_test_select() is called, not execute_sqlcom_select()
    (and that also leads to JOIN::prepare/etc). Thus, as
    query_cache_store_query() has not been called,
    thd->net.query_cache_query==NULL, so query_cache_abort() does nothing:
    Qcache_not_cached is not incremented.
    As this test prints Qcache_not_cached after SELECT failures,
    we cannot enable this test in ps-protocol.

  mysql-test/t/ndb_cache_multi2.test@1.6, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +31 -0
    The principle of this test is: two mysqlds connected to one cluster,
    both using their query cache. Queries are cached in server1
    ("select a!=3 from t1", "select * from t1"),
    table t1 is modified in server2, we want to see that this invalidates
    the query cache of server1. Invalidation with NDB works like this:
    when a query is found in the query cache, NDB is asked if the tables
    have changed. In this test, ha_ndbcluster calls NDB every millisecond
    to collect change information about tables.
    Due to this millisecond delay, there is need for a loop ("while...")
    in this test, which waits until a query1 ("select a!=3 from t1") is
    invalidated (which is equivalent to it returning
    up-to-date results), and then expects query2 ("select * from t1")
    to have been invalidated (see up-to-date results).
    But when enabling --ps-protocol in this test, the logic breaks,
    because query1 is still done via mysql_real_query() (see mysqltest.c:
    eval_expr() always uses mysql_real_query()). So, query1 returning
    up-to-date results is not a sign of it being invalidated in the cache,
    because it was NOT in the cache ("select a!=3 from t1" on line 39
    was done with prep stmts, while `select a!=3 from t1` is not,
    thus the second does not see the first in the cache). Thus, we may run
    query2 when cache still has not been invalidated.
    The solution is to make the initial "select a!=3 from t1" run
    as a normal query, this repairs the broken logic.
    But note, "select * from t1" is still using prepared statements
    which was the goal of this test with --ps-protocol.

  mysql-test/t/query_cache.test@1.65.1.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +20 -0
    now that prepared statements work with the query cache, we check
    that results in binary protocol (prepared statements) and in text
    protocol (normal queries) don't mix in the query cache even though
    the text of the statement/query are identical.

  mysql-test/t/query_cache_sql_prepare.test@1.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +144 -0
    new test to see if SQL PREPARE'd statements enter/hit the query cache:
    - if having at least one parameter, they should not
    - if having zero parameters, they should.

  mysql-test/t/query_cache_sql_prepare.test@1.0, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +0 -0

  sql/mysql_priv.h@1.479.2.1, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +8 -0
    In class Query_cache_flags, we add a bit to say if the result
    is in binary or text format (because, a result in binary format
    should never be served to a query expecting text format, and vice-
    versa).
    A macro to emphasize that we read the size of the query cache
    without mutex ("maybe" word).
    A macro which gives a first indication of if a query is cache-able
    (first indication - it does not consider the query cache's state).

  sql/protocol.cc@1.126, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +4 -3
    indentation.

  sql/protocol.h@1.39, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +11 -0
    Children classes of Protocol report their type (currently,
    text or binary). Query cache needs to know that.

  sql/sql_cache.cc@1.106, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +15 -5
    When we store a result in the query cache, we need to remember if it's
    in binary or text format. And when we search for a result in the query
    cache, we need to select only those results which are in the format
    which the current statement expects (binary or text).

  sql/sql_prepare.cc@1.206, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +54 -16
    Enabling use of the query cache by prepared statements.
    1) Prep stmts are of two types:
      a) prepared via the mysql_stmt_prepare() API call
      b) prepared via the SQL PREPARE...FROM statement.
    2) We already, when executing a prepared statement, sometimes built an
    "expanded" statement. For a), "?" placeholders were replaced by their
    values. For b), by names of the user variables containing the values.
    We did that only when we needed to write the query to logs.
    We now use this expanded query also for storing/searching
    in the query cache.
    Assume a query "SELECT * FROM T WHERE c=?", and the parameter is 10.
    For a), the expanded query is "SELECT * FROM T WHERE c=10", we look
    for "SELECT * FROM T WHERE c=10" in the query cache, and store that
    query's result in the query cache.
    For b), the expanded query is "SELECT * FROM T WHERE c=@somevar", and
    user variables don't work with the query cache (even inside non-
    prepared queries), so we don't enable query caching for SQL PREPARE'd
    statements if they have at least one parameter (see
    "if (stmt->param_count > 0)" in the patch).
    3) If query cache is enabled and this is a SELECT, we build the
    expanded query (as an optimisation, we don't want to build this
    expanded query if the query cache is disabled or this is not a SELECT).
    As the decision of building the expanded query or not is taken
    at prepare time (setup_set_params()), if query cache is disabled
    at prepare time, we won't build the expanded query at all next
    executions, thus shouldn't use this query for query cacheing.
    To ensure that we don't, we set safe_to_cache_query to FALSE.
    Note that we read the size of the query cache without mutex, which is
    ok: if we see it 0 but that cache has just been enlarged, no big deal,
    just our statement will not use the query cache; if we see it >0 but
    that cache has just been made destroyed, we'll build the expanded
    query at all executions, but query_cache_store_query() and
    query_cache_send_result_to_client() will read the size with a mutex
    and so properly decide to cache or not cache.
    4) Some functions in this file were named "withlog", others "with_log",
    now using "with_log" for all.

  tests/mysql_client_test.c@1.230, 2007-03-09 18:09:54+01:00, guilhem@gbichot3.local +268 -2
    Testing of how prepared statements enter and hit the query cache.
    test_ps_query_cache() is inspired from test_ps_conj_select().
    It creates data, a prepared SELECT statement, executes it once,
    then a second time with the same parameter value, to see that cache
    is hit, then a 3rd time with another parameter value to see that cache
    is not hit. Then, same from another connection, expecting hits.
    Then, tests border cases (enables query cache at prepare and disables
    at execute and vice-versa).
    It checks all results of SELECTs, cache hits and misses.

ChangeSet@1.1616.2988.3, 2007-03-09 16:19:42+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  Fixed a compiler warning, deteced by pushbuild only.

  myisam/rt_index.c@1.16.6.3, 2007-03-09 16:19:40+01:00, istruewing@chilla.local +1 -1
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    Fixed a compiler warning, deteced by pushbuild only.

ChangeSet@1.2403.14.7, 2007-03-09 21:01:19+07:00, tomas@poseidon.mysql.com +1 -0
  corrected returned error code

  mysql-test/r/ndb_single_user.result@1.2, 2007-03-09 21:01:10+07:00, tomas@poseidon.mysql.com +1 -1
    corrected returned error code

ChangeSet@1.2475, 2007-03-09 14:39:24+01:00, guilhem@gbichot4.local +1 -0
  Fix for BUG#26971 "BUILD/check-cpu does not recognize Intel Core 2
  Duo T7400". Treat such CPU as Xeon. Here's /proc/cpuinfo for T7400:
  model name      : Intel(R) Core(TM)2 CPU         T7400  @ 2.16GHz

  BUILD/check-cpu@1.21.1.1, 2007-03-09 14:39:22+01:00, guilhem@gbichot4.local +3 -2
    Fix for BUG#26971 "BUILD/check-cpu does not recognize Intel Core 2
    Duo T7400". Treat such CPU as Xeon.

ChangeSet@1.1810.2593.11, 2007-03-09 20:34:00+07:00, tomas@poseidon.mysql.com +2 -0
  added error code for failing send signal and timeout waiting for node failure
  added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.30.1, 2007-03-09 20:33:54+07:00, tomas@poseidon.mysql.com +4 -0
    added error code for failing send signal and timeout waiting for node failure

  ndb/src/ndbapi/ndberror.c@1.30.39.1, 2007-03-09 20:33:54+07:00, tomas@poseidon.mysql.com +2 -0
    added error code for failing send signal and timeout waiting for node failure

ChangeSet@1.2403.14.5, 2007-03-09 20:29:46+07:00, tomas@poseidon.mysql.com +3 -0
  Bug #26825  	MySQL Server Crashes in high load
  Bug #26997  	mysqld segfault when in single user mode

  sql/ha_ndbcluster.cc@1.397.7.2, 2007-03-09 20:29:37+07:00, tomas@poseidon.mysql.com +7 -0
    make sure error is always set even if no proper error code from ndb

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.157.1.1, 2007-03-09 20:29:37+07:00, tomas@poseidon.mysql.com +2 -0
    add error code for failing send signal (typically single user mode)

  storage/ndb/src/ndbapi/ndberror.c@1.82.1.2, 2007-03-09 20:29:38+07:00, tomas@poseidon.mysql.com +2 -0
    added error code for failing send signal and timeout waiting for node failure

ChangeSet@1.1810.2674.1, 2007-03-09 15:20:06+02:00, gkodinov@macbook.gmz +3 -0
  WL#3527: Extend IGNORE INDEX so places where index is ignored can 
           be specified
   5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
   of IGNORE INDEX for backward compatibility with the 5.1 fix.

  mysql-test/r/select.result@1.121.11.1, 2007-03-09 15:19:58+02:00, gkodinov@macbook.gmz +9 -0
    WL#3527: Extend IGNORE INDEX so places where index is ignored can 
             be specified
    - test case

  mysql-test/t/select.test@1.102.9.1, 2007-03-09 15:19:59+02:00, gkodinov@macbook.gmz +10 -0
    WL#3527: Extend IGNORE INDEX so places where index is ignored can 
             be specified
    - test case

  sql/sql_yacc.yy@1.371.100.1, 2007-03-09 15:20:00+02:00, gkodinov@macbook.gmz +13 -4
    WL#3527: Extend IGNORE INDEX so places where index is ignored can 
             be specified
     5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
     of IGNORE INDEX for backward compatibility with the 5.1 fix.

ChangeSet@1.2454.4.1, 2007-03-09 15:52:50+03:00, kroki@moonlight.home +3 -0
  Resolve one shift/reduce conflict introduced with the push of the fix
  for bug#16425: Events: no DEFINER clause.  The problem was that there
  were two rules
  
    ALTER view_algorithm_opt definer ... VIEW ...
    ALTER definer EVENT ...
  
  so when there was 'ALTER definer' in the input it was unclear if empty
  view_algorithm_opt should be executed or not.
  
  We solve this by introducing three distinct rules
  
    ALTER view_algorithm definer ... VIEW ...
    ALTER definer ... VIEW ...
    ALTER definer EVENT ...
  
  that remove the ambiguity.

  mysql-test/r/view.result@1.210.2.1, 2007-03-09 15:52:43+03:00, kroki@moonlight.home +35 -0
    Add result for the test of ALTER ALGORITHM= DEFINER= VIEW.

  mysql-test/t/view.test@1.189.2.1, 2007-03-09 15:52:43+03:00, kroki@moonlight.home +27 -0
    Add test case for ALTER ALGORITHM= DEFINER= VIEW.

  sql/sql_yacc.yy@1.549.1.1, 2007-03-09 15:52:43+03:00, kroki@moonlight.home +21 -21
    Resolve one shift/reduce conflict introduced with the push of the fix
    for bug#16425: Events: no DEFINER clause.  The problem was that there
    were two rules
    
      ALTER view_algorithm_opt definer ... VIEW ...
      ALTER definer EVENT ...
    
    so when there was 'ALTER definer' in the input it was unclear if empty
    view_algorithm_opt should be executed or not.
    
    We solve this by introducing three distinct rules
    
      ALTER view_algorithm definer ... VIEW ...
      ALTER definer ... VIEW ...
      ALTER definer EVENT ...
    
    that remove the ambiguity.

ChangeSet@1.1810.2672.1, 2007-03-09 12:47:12+02:00, gkodinov@magare.gmz +3 -0
  Bug #26281:
   Fixed boundry checks in the INSERT() function:
   were one off.

  mysql-test/r/func_str.result@1.110.5.2, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +12 -0
    Bug #26281: test case

  mysql-test/t/func_str.test@1.92.4.2, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +8 -0
    Bug #26281: test case

  sql/item_strfunc.cc@1.261.24.1, 2007-03-09 12:47:11+02:00, gkodinov@magare.gmz +5 -5
    Bug #26281: fixed boundry checks

ChangeSet@1.2443.1.1, 2007-03-09 13:12:31+03:00, kroki@moonlight.home +35 -0
  BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
  
  The problem was that some facilities (like CONVERT_TZ() function or
  server HELP statement) may require implicit access to some tables in
  'mysql' database.  This access was done by ordinary means of adding
  such tables to the list of tables the query is going to open.
  However, if we issued LOCK TABLES before that, we would get "table
  was not locked" error trying to open such implicit tables.
  
  The solution is to treat certain tables as MySQL system tables, like
  we already do for mysql.proc.  Such tables may be opened for reading
  at any moment regardless of any locks in effect.  The cost of this is
  that system table may be locked for writing only together with other
  system tables, it is disallowed to lock system tables for writing and
  have any other lock on any other table.
  
  After this patch the following tables are treated as MySQL system
  tables:
    mysql.help_category
    mysql.help_keyword
    mysql.help_relation
    mysql.help_topic
    mysql.proc (it already was)
    mysql.time_zone
    mysql.time_zone_leap_second
    mysql.time_zone_name
    mysql.time_zone_transition
    mysql.time_zone_transition_type
  
  These tables are now opened with open_system_tables_for_read() and
  closed with close_system_tables(), or one table may be opened with
  open_system_table_for_update() and closed with close_thread_tables()
  (the latter is used for mysql.proc table, which is updated as part of
  normal MySQL server operation).  These functions may be used when
  some tables were opened and locked already.
  
  NOTE: online update of time zone tables is not possible during
  replication, because there's no time zone cache flush neither on LOCK
  TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
  data from cache, while on slave updated data will be loaded from the
  time zone tables.

  mysql-test/r/help.result@1.6, 2007-03-09 13:12:24+03:00, kroki@moonlight.home +9 -0
    Update result.

  mysql-test/r/lock.result@1.19, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +21 -0
    Update result.

  mysql-test/r/sp-error.result@1.119.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +2 -2
    Update result.

  mysql-test/r/timezone2.result@1.19, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +11 -0
    Add result for bug#9953: CONVERT_TZ requires mysql.time_zone_name
    to be locked.

  mysql-test/r/view.result@1.209.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +4 -3
    Update result: use table t3 rather than utilize MySQL system table.

  mysql-test/t/help.test@1.7, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +22 -1
    Test that we can use HELP even under LOCK TABLES.

  mysql-test/t/lock.test@1.17, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +43 -1
    Test LOCK TABLE on system tables.

  mysql-test/t/timezone2.test@1.14, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +28 -0
    Add test case for bug#9953: CONVERT_TZ requires mysql.time_zone_name
    to be locked.

  mysql-test/t/view.test@1.189.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +3 -2
    Update test: use table t3 rather that utilize MySQL system table.

  sql/handler.h@1.252.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +7 -2
    Fix comment for 'count' parameter of check_if_locking_is_allowed().
    Add 'current' and 'system_count' parameters.

  sql/item_create.cc@1.74, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +0 -3
    We no longer have LEX::add_time_zone_tables_to_query_tables().

  sql/item_timefunc.cc@1.157.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +3 -15
    We no longer have LEX::time_zone_tables_used, so
    Item_func_convert_tz::fix_fields() became the same as base
    Item_date_func::fix_fields().
    
    my_tz_find() no longer takes table list, but takes THD pointer now.

  sql/item_timefunc.h@1.81, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +0 -3
    Remove dead field and method.

  sql/lock.cc@1.102.1.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +2 -1
    Pass values for 'current' and 'system_count' to
    check_if_locking_is_allowed().

  sql/log_event.cc@1.266.3.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +1 -2
    We no longer have my_tz_find_with_opening_tz_tables(), its functions is
    performed by my_tz_find().

  sql/mysql_priv.h@1.470.13.3, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +6 -0
    Add functions to work with MySQL system tables.

  sql/set_var.cc@1.215.3.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +2 -4
    my_tz_find() no longer takes table list, but takes THD pointer now.

  sql/share/errmsg.txt@1.141.2.1, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +1 -2
    Change the error message, as now we allow write-locking of several
    system tables if not mixed with ordinary tables.

  sql/sp.cc@1.138.2.1, 2007-03-09 13:12:25+03:00, kroki@moonlight.home +19 -69
    Remove close_proc_table().  Use close_system_tables() instead.
    
    Use open_system_tables_for_read() and open_system_table_for_update().

  sql/sp.h@1.38, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +0 -1
    Remove close_proc_table() declaration.

  sql/sql_base.cc@1.374.2.2, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +119 -0
    Add implementation of open_system_tables_for_read(),
    close_system_tables(), open_system_table_for_update().

  sql/sql_help.cc@1.54.2.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +8 -2
    Operate on MySQL system tables mysql.help_* with
    open_system_tables_for_read() and close_system_tables() to allow the
    usage of HELP statement under LOCK TABLES.

  sql/sql_lex.cc@1.226.1.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +0 -27
    Remove LEX::time_zone_tables_used and
    LEX::add_time_zone_tables_to_query_tables() which are no longer used.

  sql/sql_lex.h@1.262.1.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +0 -6
    Remove LEX::time_zone_tables_used and
    LEX::add_time_zone_tables_to_query_tables() which are no longer used.

  sql/sql_parse.cc@1.631.1.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +4 -9
    Remove references to LEX::time_zone_tables_used and
    my_tz_check_n_skip_implicit_tables() which are no longer used.

  sql/sql_show.cc@1.391.2.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +1 -1
    Use close_system_tables() instead of removed close_proc_table().

  sql/sql_view.cc@1.121.1.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +0 -2
    LEX::time_zone_tables_used is no longer there.

  sql/sql_yacc.yy@1.543.1.1, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +1 -8
    LEX::add_time_zone_tables_to_query_tables() is no longer there.

  sql/table.cc@1.275.2.2, 2007-03-09 13:12:26+03:00, kroki@moonlight.home +47 -5
    Add more tables that should be treated as MySQL system tables.

  sql/tztime.cc@1.47.3.1, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +50 -151
    Do not add time zone tables to the list of query tables in
    tz_init_table_list().
    
    Remove fake_time_zone_tables_list and my_tz_get_tables_list().
    
    In my_tz_init(), open mysql.time_zone_leap_second with
    simple_open_n_lock_tables(), but pass time zone name to my_tz_find(),
    which will open and close time zone tables as necessary.
    
    In tz_load_from_open_tables() do not call table->use_all_columns(), as
    this was already done in open_system_tables_for_read().
    
    my_tz_find() takes THD pointer instead of table list, and calls
    open_system_tables_for_read() and close_system_tables() as necessary.
    
    Remove my_tz_find_with_opening_tz_tables().

  sql/tztime.h@1.19, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +1 -34
    Remove declarations of my_tz_get_table_list(),
    my_tz_find_with_opening_tz_tables(), fake_time_zone_tables_list,
    definition of my_tz_check_n_skip_implicit_tables().
    Update prototype for my_tz_find().

  storage/csv/ha_tina.cc@1.76, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +2 -1
    Add new parameters to check_if_locking_is_allowed().

  storage/csv/ha_tina.h@1.28, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +2 -1
    Add new parameters to check_if_locking_is_allowed().

  storage/myisam/ha_myisam.cc@1.208.1.1, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +8 -5
    Add new parameters to check_if_locking_is_allowed().  In this
    function we count system tables.  If there are system tables, but
    there are also non-system tables, we report an error.

  storage/myisam/ha_myisam.h@1.81.1.1, 2007-03-09 13:12:27+03:00, kroki@moonlight.home +2 -1
    Add new parameters to check_if_locking_is_allowed().

ChangeSet@1.1810.2671.1, 2007-03-09 01:45:32-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #26661: crash when order by clause in a union
  construct references invalid name.
  Derived tables currently cannot use outer references.
  Thus there is no outer context for them.
  The 4.1 code takes this fact into account while the 
  Item_field::fix_outer_field code of 5.0 lost the check that blocks
  any attempts to resolve names in outer context for derived tables.

  mysql-test/r/union.result@1.80.1.8, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +11 -0
    Added a test case for bug #26661.

  mysql-test/t/union.test@1.97.1.1, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26661.

  sql/item.cc@1.113.73.2, 2007-03-09 01:45:30-08:00, igor@olga.mysql.com +6 -1
    Fixed bug #26661.
    Derived tables currently cannot use outer references.
    Thus there is no outer context for them.
    The 4.1 code takes this fact into account while the 
    Item_field::fix_outer_field code of 5.0 lost the check that blocks
    any attempts to resolve names in outer context for derived tables.

ChangeSet@1.1810.2593.10, 2007-03-09 16:39:13+07:00, tomas@poseidon.mysql.com +2 -0
  ndb single user basic test

  mysql-test/r/ndb_single_user.result@1.1, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +46 -0
    ndb single user basic test

  mysql-test/r/ndb_single_user.result@1.0, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-telco-gca/mysql-test/r/ndb_single_user.result

  mysql-test/t/ndb_single_user.test@1.1, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +84 -0
    ndb single user basic test

  mysql-test/t/ndb_single_user.test@1.0, 2007-03-09 16:39:03+07:00, tomas@poseidon.mysql.com +0 -0
    BitKeeper file /home/tomas/mysql-5.0-telco-gca/mysql-test/t/ndb_single_user.test

ChangeSet@1.2472.1.2, 2007-03-09 13:38:40+04:00, holyfoot@mysql.com +2 -0
  aftermerge fix

  mysql-test/r/sp.result@1.255, 2007-03-09 13:38:38+04:00, holyfoot@mysql.com +13 -0
    merging

  mysql-test/r/view.result@1.214, 2007-03-09 13:38:38+04:00, holyfoot@mysql.com +37 -0
    merging

ChangeSet@1.1810.2548.75, 2007-03-09 13:37:06+04:00, holyfoot@mysql.com +1 -0
  aftermerge fix

  mysql-test/r/view.result@1.138.1.59, 2007-03-09 13:37:05+04:00, holyfoot@mysql.com +37 -0
    merging

ChangeSet@1.2469.1.1, 2007-03-09 10:15:33+01:00, guilhem@gbichot4.local +1 -0
  Implementing the feature at BUG#26964 "option --no-beep for mysqladmin".
  Option --no-beep is added to mysqladmin like it already exists in
  the "mysql" command-line client (short option: -b; long: --no-beep).
  Default is to emit beeps like that "mysql" client.
  Can't test in the testsuite; but on my Linux I tested by hand:
  open a *xterm* and there do "mysqladmin shutdown" - I hear a beep;
  with --no-beep, no beep.

  client/mysqladmin.cc@1.119, 2007-03-09 10:15:31+01:00, guilhem@gbichot4.local +37 -32
    new option --no-beep like in mysql.cc: if used, no beeps (ASCII 7, BEL)
    are emitted upon errors. Default is to emit beeps, like mysql.cc.

ChangeSet@1.1810.2593.9, 2007-03-09 15:37:10+07:00, tomas@poseidon.mysql.com +3 -0
  
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  - correction of part 1
      add ndb_waiter option to wait for single user mode

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.45.1, 2007-03-09 15:37:02+07:00, tomas@poseidon.mysql.com +21 -15
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - correction of part 1

  ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.9.23.1, 2007-03-09 15:37:03+07:00, tomas@poseidon.mysql.com +2 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    - correction of part 1

  ndb/tools/waiter.cpp@1.23.4.1, 2007-03-09 15:37:03+07:00, tomas@poseidon.mysql.com +11 -1
    add ndb_waiter option to wait for single user mode

ChangeSet@1.1810.2641.23, 2007-03-09 10:44:48+03:00, anozdrin@booka.opbmk +1 -0
  Fix typo.

  sql/sql_show.cc@1.253.1.90, 2007-03-09 10:44:45+03:00, anozdrin@booka.opbmk +1 -1
    Fix typo.

ChangeSet@1.1810.2641.22, 2007-03-09 08:05:08+03:00, anozdrin@booka.opbmk +13 -0
  Polishing: use constants instead of magic numbers.

  include/my_global.h@1.96.1.41, 2007-03-09 08:05:04+03:00, anozdrin@booka.opbmk +9 -0
    Introduce constants to be used instead of magic numbers.

  sql/field.cc@1.256.45.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -3
    Polishing: use contants instead of magic numbers.

  sql/handler.cc@1.167.1.62, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -3
    Polishing: use contants instead of magic numbers.

  sql/item.cc@1.113.74.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -3
    Polishing: use contants instead of magic numbers.

  sql/item.h@1.183.24.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +6 -3
    Polishing: use contants instead of magic numbers.

  sql/item_func.cc@1.270.45.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -2
    Polishing: use contants instead of magic numbers.

  sql/item_subselect.cc@1.113.1.41, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +2 -1
    Polishing: use contants instead of magic numbers.

  sql/log_event.cc@1.174.1.55, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -2
    Polishing: use contants instead of magic numbers.

  sql/sql_base.cc@1.235.88.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +2 -1
    Polishing: use contants instead of magic numbers.

  sql/sql_select.cc@1.312.137.2, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +3 -3
    Polishing: use contants instead of magic numbers.

  sql/sql_show.cc@1.253.1.89, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +25 -18
    Polishing: use contants instead of magic numbers.

  sql/sql_table.cc@1.239.1.95, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +2 -1
    Polishing: use contants instead of magic numbers.

  sql/ha_innodb.cc@1.202.37.1, 2007-03-09 08:05:05+03:00, anozdrin@booka.opbmk +8 -8
    Polishing: use contants instead of magic numbers.

ChangeSet@1.2403.14.3, 2007-03-09 10:21:11+07:00, tomas@poseidon.mysql.com +1 -0
  BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed

  storage/ndb/src/kernel/vm/Pool.hpp@1.11.1.1, 2007-03-09 10:21:00+07:00, tomas@poseidon.mysql.com +5 -2
    Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the ri
    ght value, or else the parameter ptr should be "not touched"

ChangeSet@1.2473, 2007-03-08 19:57:35+01:00, tsmith@quadxeon.mysql.com +2 -0
  rpl_ssl.result, rpl_ssl.test:
    Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

  mysql-test/r/rpl_ssl.result@1.3, 2007-03-08 19:57:16+01:00, tsmith@quadxeon.mysql.com +4 -4
    Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

  mysql-test/t/rpl_ssl.test@1.2, 2007-03-08 19:57:15+01:00, tsmith@quadxeon.mysql.com +2 -2
    Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

ChangeSet@1.1616.2988.2, 2007-03-08 19:22:43+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  After backport fix.
  Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

  myisam/rt_index.c@1.16.6.2, 2007-03-08 19:22:41+01:00, istruewing@chilla.local +3 -3
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    After backport fix.
    Added forgotten DBUG_RETURNs, which was detected in 5.1 only.

ChangeSet@1.2472, 2007-03-08 18:38:17+01:00, tsmith@bk-internal.mysql.com +2 -0
  The most recent push into mysql-5.1 from mysql-5.2 was a mistake.
  
  This just reverses those changes.  I'm really sorry about that.
  
  configure.in, version.c:
    Reverse last push (from mysql-5.2 into mysql-5.1)

  configure.in@1.442, 2007-03-08 18:36:55+01:00, tsmith@bk-internal.mysql.com +1 -1
    Reverse last push (from mysql-5.2 into mysql-5.1)

  storage/ndb/src/common/util/version.c@1.28, 2007-03-08 18:36:55+01:00, tsmith@bk-internal.mysql.com +0 -1
    Reverse last push (from mysql-5.2 into mysql-5.1)

ChangeSet@1.1810.2604.21, 2007-03-08 18:12:16+01:00, df@pippilotta.erinye.com +1 -0
  add comment to compiler_warnings.supp

  support-files/compiler_warnings.supp@1.2.1.7, 2007-03-08 18:12:14+01:00, df@pippilotta.erinye.com +5 -0
    add comment to make this file more useful

ChangeSet@1.2409.95.2, 2007-03-08 20:57:12+04:00, holyfoot@mysql.com +3 -0
  merging

  mysql-test/r/explain.result@1.21, 2007-03-08 20:57:10+04:00, holyfoot@mysql.com +10 -10
    merging

  mysql-test/r/func_in.result@1.39, 2007-03-08 20:57:10+04:00, holyfoot@mysql.com +6 -0
    merging

  mysql-test/r/sp.result@1.248.2.2, 2007-03-08 20:57:10+04:00, holyfoot@mysql.com +13 -0
    merging

ChangeSet@1.1810.2648.11, 2007-03-08 19:38:21+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Postfix for bug#22331.

  sql/sql_select.cc@1.312.133.5, 2007-03-08 19:37:19+03:00, evgen@moonbone.local +2 -1
    Postfix for bug#22331.

ChangeSet@1.2470, 2007-03-08 16:47:18+01:00, msvensson@pilot.blaudden +1 -0
  Update result for 5.1

  mysql-test/r/rpl_ssl.result@1.2, 2007-03-08 16:47:16+01:00, msvensson@pilot.blaudden +4 -4
    Update result for 5.1

ChangeSet@1.2467, 2007-03-08 14:29:29+01:00, msvensson@pilot.blaudden +3 -0
  Fix 6 warnings from win64, where one is a potential bug.

  sql/event_data_objects.cc@1.87, 2007-03-08 14:29:27+01:00, msvensson@pilot.blaudden +2 -2
    Passing time as time_t to function my_time_t requires
    cast to my_time_t since my_time_t are only required to be 32bits. 

  sql/log.cc@1.267, 2007-03-08 14:29:27+01:00, msvensson@pilot.blaudden +1 -1
    Using time_t instead of my_time_t when calculating current_time.
    This is a potential bugfix for problem with mysql_system_db reporting
    slow log as crashed. 

  sql/sql_show.cc@1.395, 2007-03-08 14:29:27+01:00, msvensson@pilot.blaudden +4 -3
    Passing time as time_t to function my_time_t requires
    cast to my_time_t since my_time_t are only required to be 32bits. 

ChangeSet@1.1810.2669.2, 2007-03-08 12:08:59+01:00, istruewing@chilla.local +1 -0
  Bug#25673 - spatial index corruption, error 126 incorrect key file for table
  After merge fix

  mysql-test/r/gis-rtree.result@1.14.1.11, 2007-03-08 12:08:56+01:00, istruewing@chilla.local +1 -0
    Bug#25673 - spatial index corruption, error 126 incorrect key file for table
    After merge fix

ChangeSet@1.2409.93.1, 2007-03-08 17:47:13+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), 
            ndbd nodes are crashed

  storage/ndb/src/kernel/vm/Pool.hpp@1.12, 2007-03-08 17:47:11+08:00, gni@dev3-221.dev.cn.tlan +5 -2
    Only when m_pool.seize() return true, the ptr.i and ptr.p is assigned the right value, 
    or else the parameter ptr should be "not touched".

ChangeSet@1.1810.2641.20, 2007-03-08 12:04:45+03:00, kostja@bodhi.local +2 -0
  Fix -ansi -pedantic warning (can't cast a pointer to function 
  to a pointer to object, that is, int foo(); void *bar= (void*) foo
  is not allowed.

  sql/lex.h@1.137.1.9, 2007-03-08 12:04:41+03:00, kostja@bodhi.local +2 -2
    Fix -ansi -pedantic warning.

  sql/lex_symbol.h@1.7.1.3, 2007-03-08 12:04:41+03:00, kostja@bodhi.local +1 -1
    Fix -ansi -pedantic warning.

ChangeSet@1.1616.2988.1, 2007-03-08 09:54:37+01:00, istruewing@chilla.local +5 -0
  Bug#25673 - spatial index corruption, error 126
            incorrect key file for table
  
  In certain cases it could happen that deleting a row could
  corrupt an RTREE index.
  
  According to Guttman's algorithm, page underflow is handled
  by storing the page in a list for later re-insertion. The
  keys from the stored pages have to be inserted into the
  remaining pages of the same level of the tree. Hence the
  level number is stored in the re-insertion list together
  with the page.
  
  In the MySQL RTree implementation the level counts from zero
  at the root page, increasing numbers for levels down the tree.
  
  If during re-insertion of the keys the tree height grows, all
  level numbers become invalid. The remaining keys will be
  inserted at the wrong level.
  
  The fix is to increment the level numbers stored in the
  reinsert list after a split of the root block during reinsertion.

  mysql-test/r/gis-rtree.result@1.8.1.7, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +552 -0
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added the test result.

  mysql-test/t/gis-rtree.test@1.9.1.6, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +556 -0
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added a test.

  myisam/rt_index.c@1.16.6.1, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +75 -25
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added a loop in rtree_delete() to increment the level numbers
    stored in the reinsert list after a split of the root block
    during reinsertion.
    Added comments and DBUG statements.

  myisam/rt_key.c@1.8.2.1, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +12 -5
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added DBUG statements.

  myisam/rt_split.c@1.11.4.3, 2007-03-08 09:54:35+01:00, istruewing@chilla.local +5 -2
    Bug#25673 - spatial index corruption, error 126
                incorrect key file for table
    Added DBUG statements.

ChangeSet@1.1810.2657.12, 2007-03-08 08:15:30+01:00, tsmith@quadxeon.mysql.com +1 -0
  comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

  extra/comp_err.c@1.23.4.1, 2007-03-08 08:15:05+01:00, tsmith@quadxeon.mysql.com +2 -2
    return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

ChangeSet@1.2464, 2007-03-08 07:55:03+01:00, tsmith@quadxeon.mysql.com +1 -0
  Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074

  client/mysql_upgrade.c@1.30, 2007-03-08 07:54:37+01:00, tsmith@quadxeon.mysql.com +5 -10
    Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074

ChangeSet@1.2457.1.3, 2007-03-08 02:00:21+01:00, tsmith@quadxeon.mysql.com +1 -0
  Bug #26940: CREATE SERVER does not initialize record[0] in insert_server_record()
  
  sql_servers.cc:insert_server_record():  initialize record[0] before inserting row

  sql/sql_servers.cc@1.5.1.1, 2007-03-08 01:59:16+01:00, tsmith@quadxeon.mysql.com +2 -0
    sql_servers.cc:insert_server_record():  initialize record[0] before inserting row

ChangeSet@1.1810.2667.1, 2007-03-07 23:49:46+01:00, tsmith@quadxeon.mysql.com +1 -0
  update test results for bdb_gis after merge of fix for b26038

  mysql-test/r/bdb_gis.result@1.2.2.2, 2007-03-07 23:49:21+01:00, tsmith@quadxeon.mysql.com +2 -2
    update test results for bdb_gis after merge of fix for b26038

ChangeSet@1.1810.2648.10, 2007-03-08 00:27:42+03:00, evgen@moonbone.local +3 -0
  sql_select.cc:
    Postfix for bug#22331 for windows platform.
  explain.test, explain.result:
    Cleanup after bugfix#22331.

  mysql-test/r/explain.result@1.17.1.2, 2007-03-08 00:27:00+03:00, evgen@moonbone.local +1 -0
    Cleanup after bugfix#22331.

  mysql-test/t/explain.test@1.10.1.2, 2007-03-08 00:26:50+03:00, evgen@moonbone.local +1 -0
    Cleanup after bugfix#22331.

  sql/sql_select.cc@1.312.133.4, 2007-03-08 00:27:05+03:00, evgen@moonbone.local +1 -1
    Postfix for bug#22331 for windows platform.

ChangeSet@1.1810.2666.1, 2007-03-07 22:11:57+03:00, evgen@moonbone.local +3 -0
  Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
  result.
  
  For built-in functions like sqrt() function names are hard-coded and can be
  compared by pointer. But this isn't the case for a used-defined stored
  functions - names there are dynamical and should be compared as strings.
  
  Now the Item_func::eq() function employs my_strcasecmp() function to compare
  used-defined stored functions names.

  mysql-test/r/sp.result@1.170.34.1, 2007-03-07 22:05:53+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.

  mysql-test/t/sp.test@1.174.33.1, 2007-03-07 22:05:47+03:00, evgen@moonbone.local +15 -0
    Added a test case for bug#25373: Stored functions wasn't compared correctly which leads to a wrong result.

  sql/item_func.cc@1.270.44.1, 2007-03-07 22:05:57+03:00, evgen@moonbone.local +7 -2
    Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
    result.
    Now the Item_func::eq() function employs my_strcasecmp() function to compare
    used-defined stored functions names.

ChangeSet@1.1810.2580.8, 2007-03-07 21:44:58+03:00, evgen@moonbone.local +8 -0
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  
  During optimization stage the WHERE conditions can be changed or even
  be removed at all if they know for sure to be true of false. Thus they aren't
  showed in the EXPLAIN EXTENDED which prints conditions after optimization.
  
  Now if all elements of an Item_cond were removed this Item_cond is substituted
  for an Item_int with the int value of the Item_cond.
  If there were conditions that were totally optimized away then values of the
  saved cond_value and having_value will be printed instead.

  mysql-test/r/explain.result@1.17.1.1, 2007-03-07 21:31:36+03:00, evgen@moonbone.local +29 -0
    Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.

  mysql-test/r/func_test.result@1.29.1.5, 2007-03-07 21:31:34+03:00, evgen@moonbone.local +1 -1
    Corrected test case result after fix for bug#22331.

  mysql-test/r/subselect.result@1.134.17.1, 2007-03-07 21:31:33+03:00, evgen@moonbone.local +8 -8
    Corrected test case result after fix for bug#22331.

  mysql-test/t/explain.test@1.10.1.1, 2007-03-07 21:31:28+03:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized away.

  sql/sql_lex.cc@1.142.38.1, 2007-03-07 21:43:19+03:00, evgen@moonbone.local +1 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    The initialization of the cond_value and the having_value variables.

  sql/sql_lex.h@1.175.37.1, 2007-03-07 21:42:15+03:00, evgen@moonbone.local +2 -0
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    The cond_value and the having_value variables are
    added to the SELECT_LEX class.

  sql/sql_select.cc@1.312.127.3, 2007-03-07 21:40:05+03:00, evgen@moonbone.local +18 -5
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Now if all elements of an Item_cond were removed this Item_cond is substituted
    for an Item_int with the int value of the Item_cond.
    If there were conditions that were totally optimized away then values of the
    saved cond_value and having_value will be printed instead.

  sql/sql_select.h@1.92.1.24, 2007-03-07 21:44:25+03:00, evgen@moonbone.local +1 -1
    Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
    away.
    Now having_value is also stored in the JOIN class.

ChangeSet@1.2454.1.5, 2007-03-07 20:47:39+03:00, kroki@moonlight.home +1 -0
  Cleanup: removed unused variable that produced a warning.

  sql/sql_prepare.cc@1.204, 2007-03-07 20:47:35+03:00, kroki@moonlight.home +0 -1
    Cleanup: removed unused variable that produced a warning.

ChangeSet@1.1810.2641.19, 2007-03-07 09:53:46-07:00, malff@weblab.(none) +2 -0
  
  Bug 8407, post review cleanup: use instr::get_cont_dest() to get the instruction
  continuation instruction, for CONTINUE exception handlers.

  sql/sp_head.cc@1.200.7.13, 2007-03-07 09:53:43-07:00, malff@weblab.(none) +7 -13
    Post review cleanup: use instr::get_cont_dest() to get the instruction
    continuation instruction, for CONTINUE exception handlers.

  sql/sp_head.h@1.79.1.15, 2007-03-07 09:53:43-07:00, malff@weblab.(none) +12 -15
    Post review cleanup: use instr::get_cont_dest() to get the instruction
    continuation instruction, for CONTINUE exception handlers.

ChangeSet@1.2416.1.1, 2007-03-07 18:51:49+03:00, kroki@moonlight.home +3 -0
  BUG#18326: Do not lock table for writing during prepare of statement
  
  During statement prepare phase the tables were locked as if the
  statement is being executed, however this is not necessary.
  
  The solution is to not lock tables on statement prepare phase.
  Opening tables is enough to prevent DDL on them, and during statement
  prepare we do not access nor modify any data.

  mysql-test/r/ps.result@1.100.1.1, 2007-03-07 18:51:45+03:00, kroki@moonlight.home +37 -0
    Add result for bug#18326: Do not lock table for writing during
    prepare of statement.

  mysql-test/t/ps.test@1.105.1.1, 2007-03-07 18:51:45+03:00, kroki@moonlight.home +57 -0
    Add test case for bug#18326: Do not lock table for writing during
    prepare of statement.

  sql/sql_prepare.cc@1.190.3.1, 2007-03-07 18:51:45+03:00, kroki@moonlight.home +50 -56
    Do not lock tables on statement prepare phase.  Opening tables is
    enough to prevent DDL on them, and during statement prepare we do not
    access nor modify any data.
    
    Use open_normal_and_derived_tables() for table opening on prepare.

ChangeSet@1.1810.2657.9, 2007-03-07 10:46:38-05:00, iggy@recycle.(none) +1 -0
  Bug#25222 Win32 HANDLE leak in my_sopen()
  - When attempting to associate a Windows File handle to a C run-time file
  handle there is an upper bound.  Once reached, the newly created handles
  will cause a memory leak since they are not properly associated with a
  handle that can later be cleaned up.

  mysys/my_open.c@1.25.3.3, 2007-03-07 10:46:36-05:00, iggy@recycle.(none) +6 -1
    Bug#25222 Win32 HANDLE leak in my_sopen()
    - Check for failure in _open_osfhandle and close allocated HANDLE on failure.

ChangeSet@1.2454.1.3, 2007-03-07 16:08:36+03:00, kostja@bodhi.local +2 -0
  A post merge fix.

  sql/event_data_objects.cc@1.86, 2007-03-07 16:08:31+03:00, kostja@bodhi.local +0 -10
    A post merge fix.

  sql/sql_yacc.yy@1.549, 2007-03-07 16:08:31+03:00, kostja@bodhi.local +16 -16
    A post merge fix.

ChangeSet@1.1810.2664.2, 2007-03-07 14:51:45+02:00, gkodinov@macbook.gmz +3 -0
  Bug #26672:
   DATE/DATETIME values are out of the currently supported
   4 basic value types (INT,STRING,REAL and DECIMAL).
   So expressions (not fields) of compile type DATE/DATETIME are 
   generally considered as STRING values. This is not so
   when they are compared : then they are compared as 
   INTEGER values.
   But the rule for comparison as INTEGERS must be checked
   explicitly each time when a comparison is to be performed.
   filesort is one such place. However there the check was 
   not done and hence the expressions (not fields) of type 
   DATE/DATETIME were sorted by their string representation.
   Fixed to compare them as INTEGER values for filesort.

  mysql-test/r/order_by.result@1.55.3.2, 2007-03-07 14:51:39+02:00, gkodinov@macbook.gmz +22 -0
    Bug #26672: test case

  mysql-test/t/order_by.test@1.41.2.2, 2007-03-07 14:51:40+02:00, gkodinov@macbook.gmz +15 -0
    Bug #26672: test case

  sql/filesort.cc@1.105.1.12, 2007-03-07 14:51:40+02:00, gkodinov@macbook.gmz +4 -1
    Bug #26672: sort dates/times as integers

ChangeSet@1.1810.2641.18, 2007-03-07 14:03:44+03:00, kostja@bodhi.local +1 -0
  A fix for the windows build (harmless warning).

  sql/sql_lex.cc@1.142.1.74, 2007-03-07 14:03:41+03:00, kostja@bodhi.local +1 -1
    A fix for the windows build.

ChangeSet@1.1810.2665.1, 2007-03-07 12:24:46+03:00, kostja@bodhi.local +10 -0
  A fix for Bug#26750 "valgrind leak in sp_head" (and post-review
  fixes).
  
  The legend: on a replication slave, in case a trigger creation
  was filtered out because of application of replicate-do-table/
  replicate-ignore-table rule, the parsed definition of a trigger was not 
  cleaned up properly. LEX::sphead member was left around and leaked 
  memory. Until the actual implementation of support of 
  replicate-ignore-table rules for triggers by the patch for Bug 24478 it 
  was never the case that "case SQLCOM_CREATE_TRIGGER"
  was not executed once a trigger was parsed,
  so the deletion of lex->sphead there worked and the memory did not leak.
  
  The fix: 
  
  The real cause of the bug is that there is no 1 or 2 places where
  we can clean up the main LEX after parse. And the reason we 
  can not have just one or two places where we clean up the LEX is
  asymmetric behaviour of MYSQLparse in case of success or error. 
  
  One of the root causes of this behaviour is the code in Item::Item()
  constructor. There, a newly created item adds itself to THD::free_list
  - a single-linked list of Items used in a statement. Yuck. This code
  is unaware that we may have more than one statement active at a time,
  and always assumes that the free_list of the current statement is
  located in THD::free_list. One day we need to be able to explicitly
  allocate an item in a given Query_arena.
  Thus, when parsing a definition of a stored procedure, like
  CREATE PROCEDURE p1() BEGIN SELECT a FROM t1; SELECT b FROM t1; END;
  we actually need to reset THD::mem_root, THD::free_list and THD::lex
  to parse the nested procedure statement (SELECT *).
  The actual reset and restore is implemented in semantic actions
  attached to sp_proc_stmt grammar rule.
  The problem is that in case of a parsing error inside a nested statement
  Bison generated parser would abort immediately, without executing the
  restore part of the semantic action. This would leave THD in an 
  in-the-middle-of-parsing state.
  This is why we couldn't have had a single place where we clean up the LEX
  after MYSQLparse - in case of an error we needed to do a clean up
  immediately, in case of success a clean up could have been delayed.
  This left the door open for a memory leak.
  
  One of the following possibilities were considered when working on a fix:
  - patch the replication logic to do the clean up. Rejected
  as breaks module borders, replication code should not need to know the
  gory details of clean up procedure after CREATE TRIGGER.
  - wrap MYSQLparse with a function that would do a clean up.
  Rejected as ideally we should fix the problem when it happens, not
  adjust for it outside of the problematic code.
  - make sure MYSQLparse cleans up after itself by invoking the clean up
  functionality in the appropriate places before return. Implemented in 
  this patch.
  - use %destructor rule for sp_proc_stmt to restore THD - cleaner
  than the prevoius approach, but rejected
  because needs a careful analysis of the side effects, and this patch is 
  for 5.0, and long term we need to use the next alternative anyway
  - make sure that sp_proc_stmt doesn't juggle with THD - this is a 
  large work that will affect many modules.
  
  Cleanup: move main_lex and main_mem_root from Statement to its
  only two descendants Prepared_statement and THD. This ensures that
  when a Statement instance was created for purposes of statement backup,
  we do not involve LEX constructor/destructor, which is fairly expensive.
  In order to track that the transformation produces equivalent 
  functionality please check the respective constructors and destructors
  of Statement, Prepared_statement and THD - these members were
  used only there.
  This cleanup is unrelated to the patch.

  sql/log_event.cc@1.174.1.54, 2007-03-07 12:24:41+03:00, kostja@bodhi.local +2 -2
    THD::main_lex is private and should not be used.

  sql/mysqld.cc@1.439.104.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +0 -12
    Move MYSQLerror to sql_yacc.yy as it depends on LEX headers now.

  sql/sql_class.cc@1.223.25.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +14 -18
    Cleanup: move main_lex and main_mem_root to THD and Prepared_statement

  sql/sql_class.h@1.230.59.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +39 -16
    Cleanup: move main_lex and main_mem_root to THD and Prepared_statement

  sql/sql_lex.cc@1.142.1.73, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +30 -0
    Implement st_lex::restore_lex()

  sql/sql_lex.h@1.175.1.65, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +4 -0
    Declare st_lex::restore_lex().

  sql/sql_parse.cc@1.426.146.1, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +7 -27
    Consolidate the calls to unit.cleanup() and deletion of lex->sphead
    in mysql_parse (COM_QUERY handler)

  sql/sql_prepare.cc@1.142.1.54, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +32 -18
    No need to delete lex->sphead to restore memory roots now in case of a 
    parse error - this is done automatically inside MYSQLparse

  sql/sql_trigger.cc@1.35.1.30, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +2 -5
    This code could lead to double deletion apparently, as in case
    of an error lex.sphead was never reset.

  sql/sql_yacc.yy@1.371.1.138, 2007-03-07 12:24:42+03:00, kostja@bodhi.local +394 -327
    Trap all returns from the parser to ensure that MySQL-specific cleanup
    is invoked: we need to restore the global state of THD and LEX in 
    case of a parsing error. In case of a parsing success this happens as 
    part of normal grammar reduction process.

ChangeSet@1.2456, 2007-03-07 10:15:45+01:00, tsmith@quadxeon.mysql.com +2 -0
  Post-merge fix of mysqlbinlog.{test,result}

  mysql-test/r/mysqlbinlog.result@1.32, 2007-03-07 10:15:07+01:00, tsmith@quadxeon.mysql.com +2 -1
    Post-merge fix of mysqlbinlog.{test,result}

  mysql-test/t/mysqlbinlog.test@1.41, 2007-03-07 10:15:07+01:00, tsmith@quadxeon.mysql.com +1 -1
    Post-merge fix of mysqlbinlog.{test,result}

ChangeSet@1.1810.2593.8, 2007-03-07 10:37:30+07:00, tomas@poseidon.mysql.com +1 -0
  source code indentation alignment with 5.1, no real change

  ndb/src/ndbapi/NdbRecAttr.cpp@1.20.9.1, 2007-03-07 10:37:19+07:00, tomas@poseidon.mysql.com +193 -189
    source code indentation alignment with 5.1, no real change

ChangeSet@1.1810.2593.7, 2007-03-07 08:11:16+07:00, tomas@poseidon.mysql.com +1 -0
  ndb -
    fix printout
    crashes testSystemRestart -n SR_UNDO

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.72.1, 2007-03-07 08:11:07+07:00, tomas@poseidon.mysql.com +1 -1
    fix printout
    crashes testSystemRestart -n SR_UNDO

ChangeSet@1.1810.2662.2, 2007-03-06 14:55:52-07:00, tsmith@siva.hindu.god +1 -0
  Bug #25075: sql_class.cc doesn't compile with --without-query-cache
  
  Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()

  sql/sql_class.cc@1.223.18.3, 2007-03-06 14:55:48-07:00, tsmith@siva.hindu.god +2 -0
    Bug #25075: sql_class.cc doesn't compile with --without-query-cache
    
    Wrap query_cache_init_query() call with #ifdef HAVE_QUERY_CACHE in THD::THD()

ChangeSet@1.1810.2662.1, 2007-03-06 14:47:26-07:00, tsmith@siva.hindu.god +1 -0
  Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""

  libmysql/libmysql.c@1.233.13.1, 2007-03-06 14:47:21-07:00, tsmith@siva.hindu.god +1 -1
    Fix for bug #25595 "missing DBUG_RETURN in function "mysql_stat""
    
    Use DBUG_RETURN instead of return

ChangeSet@1.1810.2641.16, 2007-03-06 14:30:28-07:00, malff@weblab.(none) +2 -0
  Manual merge

  mysql-test/r/trigger.result@1.29.11.8, 2007-03-06 14:30:25-07:00, malff@weblab.(none) +37 -0
    Manual merge

  mysql-test/t/trigger.test@1.34.11.9, 2007-03-06 14:30:25-07:00, malff@weblab.(none) +74 -0
    Manual merge

ChangeSet@1.1810.2661.1, 2007-03-06 23:58:10+03:00, evgen@moonbone.local +3 -0
  Bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.
  
  Functions over sum functions wasn't set up correctly for the ORDER BY clause
  which leads to a wrong order of the result set.
  
  The split_sum_func() function is called now for each ORDER BY item that
  contains a sum function to set it up correctly.

  mysql-test/r/order_by.result@1.55.3.1, 2007-03-06 23:49:17+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.

  mysql-test/t/order_by.test@1.41.2.1, 2007-03-06 23:49:15+03:00, evgen@moonbone.local +8 -0
    Added a test case for bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.

  sql/sql_select.cc@1.312.135.1, 2007-03-06 23:49:29+03:00, evgen@moonbone.local +11 -0
    Bug#25376: Incomplete setup of ORDER BY clause results in a wrong result.
    The split_sum_func() function is called now for each ORDER BY item that
    contains a sum function to set it up correctly.

ChangeSet@1.2451.1.2, 2007-03-06 13:46:33-07:00, malff@weblab.(none) +6 -0
  Manual merge

  mysql-test/r/sp-error.result@1.121, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +137 -6
    Manual merge

  mysql-test/r/sp.result@1.248.1.2, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +40 -2
    Manual merge

  mysql-test/r/trigger.result@1.59, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +37 -0
    Manual merge

  mysql-test/t/sp-error.test@1.119, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +187 -6
    Manual merge

  mysql-test/t/trigger.test@1.69, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +74 -0
    Manual merge

  sql/sql_class.h@1.339.1.5, 2007-03-06 13:46:30-07:00, malff@weblab.(none) +68 -0
    Manual merge

ChangeSet@1.2453, 2007-03-06 21:32:43+03:00, kostja@bodhi.local +2 -0
  Post-merge fixes.

  mysql-test/r/subselect.result@1.170, 2007-03-06 21:32:36+03:00, kostja@bodhi.local +52 -10
    A post-merge fix: update test results.

  sql/sql_yacc.yy@1.547, 2007-03-06 21:32:37+03:00, kostja@bodhi.local +2 -2
    Update to the number of conflicts in 5.1

ChangeSet@1.2409.1.83, 2007-03-06 10:36:15-07:00, tsmith@siva.hindu.god +6 -0
  Bug #26598: Create variable to allow turning off of statistic gathering on metadata commands
  
  Add innodb_stats_on_metadata option, which enables gathering
  index statistics when processing metadata commands such as
  SHOW TABLE STATUS.  Default behavior of the server does not
  change (this option is enabled by default).

  sql/mysqld.cc@1.601.21.1, 2007-03-06 10:36:06-07:00, tsmith@siva.hindu.god +8 -1
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

  sql/set_var.cc@1.218.1.1, 2007-03-06 10:36:06-07:00, tsmith@siva.hindu.god +3 -1
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

  storage/innobase/handler/ha_innodb.cc@1.320.1.3, 2007-03-06 10:36:06-07:00, tsmith@siva.hindu.god +11 -6
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

  storage/innobase/handler/ha_innodb.h@1.134, 2007-03-06 10:36:07-07:00, tsmith@siva.hindu.god +2 -1
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

  storage/innobase/include/srv0srv.h@1.64, 2007-03-06 10:36:07-07:00, tsmith@siva.hindu.god +2 -0
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

  storage/innobase/srv/srv0srv.c@1.104, 2007-03-06 10:36:07-07:00, tsmith@siva.hindu.god +2 -0
    Add innodb_stats_on_metadata option, which enables gathering
    index statistics when processing metadata commands such as
    SHOW TABLE STATUS.  Default behavior of the server does not
    change (this option is enabled by default).

ChangeSet@1.1810.2655.3, 2007-03-06 18:52:00+02:00, gkodinov@macbook.gmz +2 -0
  Bug#19342: additional test case for code coverage

  mysql-test/r/func_in.result@1.28.1.5, 2007-03-06 18:51:53+02:00, gkodinov@macbook.gmz +7 -1
    Bug#19342: additional test case for code coverage

  mysql-test/t/func_in.test@1.22.1.5, 2007-03-06 18:51:54+02:00, gkodinov@macbook.gmz +5 -1
    Bug#19342: additional test case for code coverage

ChangeSet@1.1810.2660.1, 2007-03-05 19:42:07-07:00, malff@weblab.(none) +18 -0
  Bug#8407 (Stored functions/triggers ignore exception handler)
  Bug 18914 (Calling certain SPs from triggers fail)
  Bug 20713 (Functions will not not continue for SQLSTATE VALUE '42S02')
  Bug 21825 (Incorrect message error deleting records in a table with a
    trigger for inserting)
  Bug 22580 (DROP TABLE in nested stored procedure causes strange dependency
    error)
  Bug 25345 (Cursors from Functions)
  
  
  This fix resolves a long standing issue originally reported with bug 8407,
  which affect the behavior of Stored Procedures, Stored Functions and Trigger
  in many different ways, causing symptoms reported by all the bugs listed.
  In all cases, the root cause of the problem traces back to 8407 and how the
  server locks tables involved with sub statements.
  
  Prior to this fix, the implementation of stored routines would:
  - compute the transitive closure of all the tables referenced by a top level
  statement
  - open and lock all the tables involved
  - execute the top level statement
  "transitive closure of tables" means collecting:
  - all the tables,
  - all the stored functions,
  - all the views,
  - all the table triggers
  - all the stored procedures
  involved, and recursively inspect these objects definition to find more
  references to more objects, until the list of every object referenced does
  not grow any more.
  This mechanism is known as "pre-locking" tables before execution.
  The motivation for locking all the tables (possibly) used at once is to
  prevent dead locks.
  
  One problem with this approach is that, if the execution path the code
  really takes during runtime does not use a given table, and if the table is
  missing, the server would not execute the statement.
  This in particular has a major impact on triggers, since a missing table
  referenced by an update/delete trigger would prevent an insert trigger to run.
  
  Another problem is that stored routines might define SQL exception handlers
  to deal with missing tables, but the server implementation would never give
  user code a chance to execute this logic, since the routine is never
  executed when a missing table cause the pre-locking code to fail.
  
  With this fix, the internal implementation of the pre-locking code has been
  relaxed of some constraints, so that failure to open a table does not
  necessarily prevent execution of a stored routine.
  
  In particular, the pre-locking mechanism is now behaving as follows:
  
  1) the first step, to compute the transitive closure of all the tables
  possibly referenced by a statement, is unchanged.
  
  2) the next step, which is to open all the tables involved, only attempts
  to open the tables added by the pre-locking code, but silently fails without
  reporting any error or invoking any exception handler is the table is not
  present. This is achieved by trapping internal errors with
  Prelock_error_handler
  
  3) the locking step only locks tables that were successfully opened.
  
  4) when executing sub statements, the list of tables used by each statements
  is evaluated as before. The tables needed by the sub statement are expected
  to be already opened and locked. Statement referencing tables that were not
  opened in step 2) will fail to find the table in the open list, and only at
  this point will execution of the user code fail.
  
  5) when a runtime exception is raised at 4), the instruction continuation
  destination (the next instruction to execute in case of SQL continue
  handlers) is evaluated.
  This is achieved with sp_instr::exec_open_and_lock_tables()
  
  6) if a user exception handler is present in the stored routine, that
  handler is invoked as usual, so that ER_NO_SUCH_TABLE exceptions can be
  trapped by stored routines. If no handler exists, then the runtime execution
  will fail as expected.
  
  With all these changes, a side effect is that view security is impacted, in
  two different ways.
  
  First, a view defined as "select stored_function()", where the stored
  function references a table that may not exist, is considered valid.
  The rationale is that, because the stored function might trap exceptions
  during execution and still return a valid result, there is no way to decide
  when the view is created if a missing table really cause the view to be invalid.
  
  Secondly, testing for existence of tables is now done later during
  execution. View security, which consist of trapping errors and return a
  generic ER_VIEW_INVALID (to prevent disclosing information) was only
  implemented at very specific phases covering *opening* tables, but not
  covering the runtime execution. Because of this existing limitation,
  errors that were previously trapped and converted into ER_VIEW_INVALID are
  not trapped, causing table names to be reported to the user.
  This change is exposing an existing problem, which is independent and will
  be resolved separately.

  mysql-test/r/information_schema_db.result@1.1.1.9, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -3
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/sp-error.result@1.102.1.9, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +137 -6
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/sp.result@1.170.33.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +40 -2
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/trigger.result@1.29.13.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +37 -0
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/r/view.result@1.138.31.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -3
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/sp-error.test@1.100.1.12, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +187 -6
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/sp.test@1.174.32.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +49 -4
    Revised the pre-locking code implementation, aligned the tests.

  mysql-test/t/trigger.test@1.34.16.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +74 -0
    Revised the pre-locking code implementation, aligned the tests.

  sql/lock.cc@1.64.1.30, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table

  sql/mysqld.cc@1.439.101.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +8 -0
    my_message_sql(): invoke internal exception handlers

  sql/sp_head.cc@1.200.14.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +40 -9
    exec_open_and_lock_tables(): open and lock tables, or return the
    continuation destination of this instruction

  sql/sp_head.h@1.79.4.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +24 -0
    exec_open_and_lock_tables(): open and lock tables, or return the
    continuation destination of this instruction

  sql/sql_base.cc@1.235.87.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +94 -8
    Prelock_error_handler: delay open table errors until execution

  sql/sql_class.cc@1.223.24.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +32 -0
    THD: add internal error handler, as an exception mechanism.

  sql/sql_class.h@1.230.57.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +67 -0
    THD: add internal error handler, as an exception mechanism.

  sql/sql_update.cc@1.154.30.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table

  sql/table.cc@1.160.49.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +3 -1
    st_table_list::hide_view_error(): masked more errors for view security

  sql/table.h@1.102.14.1, 2007-03-05 19:42:04-07:00, malff@weblab.(none) +1 -1
    table->placeholder now checks for schema_table, and unopened tables

ChangeSet@1.2343.59.1, 2007-03-05 19:08:41+02:00, gkodinov@macbook.gmz +25 -0
  WL#3527: Extend IGNORE INDEX so places where index is ignored 
           can be specified
  Currently MySQL allows one to specify what indexes to ignore during
  join optimization. The scope of the current USE/FORCE/IGNORE INDEX 
  statement is only the FROM clause, while all other clauses are not 
  affected.
  
  However, in certain cases, the optimizer
  may incorrectly choose an index for sorting and/or grouping, and
  produce an inefficient query plan.
  
  This task provides the means to specify what indexes are
  ignored/used for what operation in a more fine-grained manner, thus
  making it possible to manually force a better plan. We do this
  by extending the current IGNORE/USE/FORCE INDEX syntax to:
  
  IGNORE/USE/FORCE INDEX [FOR {JOIN | ORDER | GROUP BY}]
  
  so that:
  - if no FOR is specified, the index hint will apply everywhere.
  - if MySQL is started with the compatibility option --old_mode then
    an index hint without a FOR clause works as in 5.0 (i.e, the 
    index will only be ignored for JOINs, but can still be used to
    compute ORDER BY).
  
  See the WL#3527 for further details.

  BitKeeper/deleted/.del-mysqld.cc.rej@1.1.1.1, 2007-03-05 13:02:00+02:00, gkodinov@macbook.gmz +0 -0
    Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej

  BitKeeper/deleted/.del-sql_parse.cc.rej@1.1.1.1, 2007-03-05 13:02:07+02:00, gkodinov@macbook.gmz +0 -0
    Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej

  BitKeeper/deleted/.del-table.cc.rej@1.1.1.1, 2007-03-05 13:02:10+02:00, gkodinov@macbook.gmz +0 -0
    Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej

  mysql-test/r/endspace.result@1.10.1.1, 2007-03-05 19:08:14+02:00, gkodinov@macbook.gmz +9 -6
    WL3527 : fixed undeterministic test

  mysql-test/r/group_by.result@1.76.1.1, 2007-03-05 19:08:15+02:00, gkodinov@macbook.gmz +105 -7
    WL#3527: test cases

  mysql-test/t/endspace.test@1.6, 2007-03-05 19:08:15+02:00, gkodinov@macbook.gmz +6 -3
    WL3527 : fixed undeterministic test

  mysql-test/t/group_by.test@1.61.1.1, 2007-03-05 19:08:16+02:00, gkodinov@macbook.gmz +61 -5
    WL#3527: test cases

  sql/item.cc@1.223.1.3, 2007-03-05 19:08:16+02:00, gkodinov@macbook.gmz +1 -1
    WL#3527: renames

  sql/mysql_priv.h@1.464.5.1, 2007-03-05 19:08:17+02:00, gkodinov@macbook.gmz +2 -1
    WL#3527: corrected initialization

  sql/mysqld.cc@1.599.10.1, 2007-03-05 19:08:18+02:00, gkodinov@macbook.gmz +6 -1
    WL#3527: added old_mode command line option

  sql/opt_range.cc@1.252.3.1, 2007-03-05 19:08:19+02:00, gkodinov@macbook.gmz +4 -4
    WL#3527: renames

  sql/sql_base.cc@1.368.2.1, 2007-03-05 19:08:20+02:00, gkodinov@macbook.gmz +7 -30
    WL#3527: 
     - renames
     - correct initialization
     - extended the processing of USE/FORCE/IGNORE index

  sql/sql_class.h@1.331.5.1, 2007-03-05 19:08:20+02:00, gkodinov@macbook.gmz +6 -0
    WL#3527: added old_mode command line option

  sql/sql_delete.cc@1.204.1.1, 2007-03-05 19:08:21+02:00, gkodinov@macbook.gmz +2 -2
    WL#3527: renames

  sql/sql_help.cc@1.53.1.1, 2007-03-05 19:08:21+02:00, gkodinov@macbook.gmz +1 -1
    WL#3527: renames

  sql/sql_lex.cc@1.210.4.1, 2007-03-05 19:08:22+02:00, gkodinov@macbook.gmz +71 -20
    WL#3527: extended parsing of USE/FORCE/IGNORE index

  sql/sql_lex.h@1.252.5.1, 2007-03-05 19:08:22+02:00, gkodinov@macbook.gmz +71 -10
    WL#3527: extended parsing of USE/FORCE/IGNORE index

  sql/sql_parse.cc@1.611.8.1, 2007-03-05 19:08:23+02:00, gkodinov@macbook.gmz +3 -10
    WL#3527: extended parsing of USE/FORCE/IGNORE index

  sql/sql_select.cc@1.473.1.1, 2007-03-05 19:08:24+02:00, gkodinov@macbook.gmz +59 -37
    WL#3527:
     - renames
     - passing additional info to support the extended 
       USE/FORCE/IGNORE INDEX syntax
     - If there is a covering index, and we have 
       IGNORE INDEX FOR GROUP/ORDER, and this index is 
       used for the JOIN part, then we have to ignore the
       IGNORE INDEX FOR GROUP/ORDER.

  sql/sql_show.cc@1.379.4.1, 2007-03-05 19:08:25+02:00, gkodinov@macbook.gmz +2 -4
    WL#3527: passing additional info to support the extended 
       USE/FORCE/IGNORE INDEX syntax

  sql/sql_update.cc@1.215.1.1, 2007-03-05 19:08:26+02:00, gkodinov@macbook.gmz +8 -8
    WL#3527: renames

  sql/sql_yacc.yy@1.521.4.1, 2007-03-05 19:08:26+02:00, gkodinov@macbook.gmz +80 -78
    WL#3527: extended parsing of USE/FORCE/IGNORE index

  sql/table.cc@1.262.3.1, 2007-03-05 19:08:27+02:00, gkodinov@macbook.gmz +170 -1
    WL#3527: extended the processing of USE/FORCE/IGNORE index

  sql/table.h@1.155.1.1, 2007-03-05 19:08:28+02:00, gkodinov@macbook.gmz +27 -2
    WL#3527: extended the processing of USE/FORCE/IGNORE index

  storage/myisam/ha_myisam.cc@1.202.2.1, 2007-03-05 19:08:28+02:00, gkodinov@macbook.gmz +24 -25
    WL#3527: extended the processing of USE/FORCE/IGNORE index

ChangeSet@1.1810.2548.71, 2007-03-05 17:16:16+01:00, msvensson@pilot.blaudden +1 -0
  Fix VC++ warning, "conversion from ha_checksum to char"

  extra/comp_err.c@1.23.1.6, 2007-03-05 17:16:15+01:00, msvensson@pilot.blaudden +1 -1
    Fix VC++ warning, "conversion from ha_checksum to char"

ChangeSet@1.1810.2654.2, 2007-03-05 14:02:29+01:00, tnurnberg@mysql.com +1 -0
  Bug#21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix BDB queries to still work.

  mysql-test/r/ps_6bdb.result@1.27.10.1, 2007-03-05 14:02:26+01:00, tnurnberg@mysql.com +6 -6
    Bug#21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix BDB queries to still work.

ChangeSet@1.2409.50.8, 2007-03-05 19:14:56+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  BUG#25877, After DROP INDEX non-indexed data isn't moved from memory into tablespace

  sql/ha_ndbcluster.cc@1.408.2.1, 2007-03-05 19:14:53+08:00, Justin.He@dev3-240.dev.cn.tlan +13 -0
    add/drop index online will change storage media type, 
    so add storage type check in check_if_incompatible_data(),
    when storage type is changed, will create a new table,
    then this can correct the column and table's storage type.

ChangeSet@1.1616.2985.1, 2007-03-05 11:52:28+01:00, istruewing@chilla.local +3 -0
  Bug#26464 - insert delayed + update + merge = corruption
  
  Using INSERT DELAYED on MERGE tables could lead to table
  corruptions.
  
  The manual lists a couple of storage engines, which can be
  used with INSERT DELAYED. MERGE is not in this list.
  
  The attempt to try it anyway has not been rejected yet.
  This bug was not detected earlier as it can work under
  special circumstances. Most notable is low concurrency.
  
  To be safe, this patch rejects any attempt to use INSERT
  DELAYED on MERGE tables.

  mysql-test/r/merge.result@1.32.1.13, 2007-03-05 11:52:25+01:00, istruewing@chilla.local +5 -0
    Bug#26464 - insert delayed + update + merge = corruption
    Added test result.

  mysql-test/t/merge.test@1.28.1.14, 2007-03-05 11:52:26+01:00, istruewing@chilla.local +9 -0
    Bug#26464 - insert delayed + update + merge = corruption
    Added test.

  sql/ha_myisammrg.h@1.35.1.5, 2007-03-05 11:52:26+01:00, istruewing@chilla.local +1 -1
    Bug#26464 - insert delayed + update + merge = corruption
    Removed HA_CAN_INSERT_DELAYED flag from table_flags().
    The insert delayed thread upgrades the lock from the first
    entry in MYSQL_LOCK::locks only. Hence it is incapable to
    handle MERGE tables, which have as many entries in this
    array as they have MyISAM sub-tables.

ChangeSet@1.2409.88.2, 2007-03-05 11:45:01+01:00, msvensson@pilot.blaudden +1 -0
  Bitkeeper magic

  mysql-test/t/ssl_des.test@1.4, 2007-03-05 11:44:21+01:00, msvensson@pilot.blaudden +0 -0
    Rename: BitKeeper/deleted/.del-ssl_des.test -> mysql-test/t/ssl_des.test

  BitKeeper/deleted/.del-ssl_des.test@1.3, 2007-03-05 11:41:10+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/t/ssl_des.test

ChangeSet@1.1810.2658.3, 2007-03-05 11:42:03+01:00, msvensson@pilot.blaudden +2 -0
  Remove ssl_des.test and ssl_des.result

  BitKeeper/deleted/.del-ssl_des.result@1.2, 2007-03-05 11:41:44+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/r/ssl_des.result

  BitKeeper/deleted/.del-ssl_des.test@1.2.1.1, 2007-03-05 11:41:37+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/t/ssl_des.test

ChangeSet@1.1810.2658.2, 2007-03-05 10:07:22+01:00, msvensson@pilot.blaudden +2 -0
  Bug#21781 Replication slave io thread hangs
   - Add test case that shows how slave server hangs in "STOP SLAVE"
     when run on MySQL version 5.0.33 compiled with OpenSSL.
     Works fine with latest version of MySQL since that problem
     has been fixed by patch for bug#24148. The fix has been noted in
     the changelog for MySQL 5.0.36

  mysql-test/r/rpl_ssl.result@1.1, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +93 -0
    New BitKeeper file ``mysql-test/r/rpl_ssl.result''

  mysql-test/r/rpl_ssl.result@1.0, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/t/rpl_ssl.test@1.1, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +60 -0
    New BitKeeper file ``mysql-test/t/rpl_ssl.test''

  mysql-test/t/rpl_ssl.test@1.0, 2007-03-05 10:07:21+01:00, msvensson@pilot.blaudden +0 -0

ChangeSet@1.1810.2658.1, 2007-03-05 10:03:42+01:00, msvensson@pilot.blaudden +13 -0
  Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_des.test@1.2, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/include/have_ssl.inc@1.6, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +2 -2
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/include/have_ssl.inc@1.5, 2007-03-02 16:51:17+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/include/have_openssl.inc -> mysql-test/include/have_ssl.inc

  mysql-test/r/have_ssl.require@1.5, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/r/have_ssl.require@1.4, 2007-03-02 16:51:58+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/r/have_openssl.require -> mysql-test/r/have_ssl.require

  mysql-test/t/func_des_encrypt.test@1.3, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/func_encrypt.test@1.8, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/openssl_1.test@1.18, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +4 -3
    Add "have_ssl" as synonym for "have_openssl"
    Correct comment

  mysql-test/t/rpl_openssl.test@1.11.1.10, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl.test@1.4, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_compress.test@1.4, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  mysql-test/t/ssl_connect.test@1.2, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  sql/mysql_priv.h@1.290.87.9, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +1 -1
    Add "have_ssl" as synonym for "have_openssl"

  sql/mysqld.cc@1.439.82.20, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +5 -5
    Add "have_ssl" as synonym for "have_openssl"

  sql/set_var.cc@1.125.22.5, 2007-03-05 10:03:40+01:00, msvensson@pilot.blaudden +3 -1
    Add "have_ssl" as synonym for "have_openssl"

ChangeSet@1.1616.2984.1, 2007-03-05 09:52:40+01:00, msvensson@pilot.blaudden +1 -0
  Bug #26792 Add DBX debugger support to mysql-test-run.pl
   - Add --debugger=dbx
   - Fix --debugger=devenv, --debugger=DevEnv and --debugger=/path/devenv

  mysql-test/mysql-test-run.pl@1.8.20.7, 2007-03-05 09:52:39+01:00, msvensson@pilot.blaudden +20 -6
    Add support for --debugger=dbx to mysql-test-run.pl
    Fix case senitive match for vc, vcexpress or deven
    Make it possible to use full path to debugger for
    --debugger=/path/vcexpress

ChangeSet@1.1810.2648.7, 2007-03-04 19:54:35-08:00, igor@olga.mysql.com +7 -0
  Fixed bug #26560.
  The flag alias_name_used was not set on for the outer references
  in subqueries. It resulted in replacement of any outer reference
  resolved against an alias for a full field name when the frm 
  representation of a view with a subquery was generated. 
  If the subquery and the outer query referenced the same table in
  their from lists this replacement effectively changed the meaning
  of the view and led to wrong results for selects from this view. 
  
  Modified several functions to ensure setting the right value of
  the alias_name_used flag for outer references resolved against
  aliases.
   

  mysql-test/r/view.result@1.138.30.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +37 -0
    Added a test case for bug #26560.
    

  mysql-test/t/view.test@1.126.28.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +40 -0
    Added a test case for bug #26560.

  sql/item.cc@1.113.73.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +17 -9
    Fixed bug #26560.
    Made the function resolve_ref_in_select_and_group analyze the return
    value of the last parameter with the type of the name resolution for
    the submitted reference. If the reference has been resolved against 
    an alias name from select list then its flag alias_name_used is set on.
    Now this value is used in Item_field::fix_outer_field to initialize the flag
    when the item_ref object is created for an outer reference.
    Added a parameter for the second Item_ref::Item_ref constructor to initialize
    properly the flag alias_name_used. The default value of the parameter is FALSE.
    If this flag is set on at the creation of an object by this constructor it
    will never be changed. Corrected appropriately the Item_ref::set_properties
    function.
    The function Item_ref::print now prints alias name for an outer reference
    if the flag alias_name_used is set on.  

  sql/item.h@1.183.1.37, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +7 -3
    Fixed bug #26560.
    Added a parameter for the second Item_ref::Item_ref constructor to initialize
    properly the flag alias_name_used. The default value of the parameter is FALSE.
    A similar change has been applied to the first Item_direct_ref::Item_direct_ref
    constructor.

  sql/mysql_priv.h@1.290.86.6, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +21 -1
    Fixed bug #26560.
    Added an an enumeration type enum_resolution_type to return info on
    how the function find_item_in_list has resolved the submitted item.
    The type is used only for this function.

  sql/sql_base.cc@1.235.85.3, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +69 -52
    Fixed bug #26560.
    Made the last parameter of the function find_field_in_tables return
    more detailed information on how the submitted item has been resolved.
    Now it says whether the item has been resolved
      against an alias name,
      or as a field name without alias,
      or as a field name hidden by alias, 
      or was resolved ignoring alias. 

  sql/sql_select.cc@1.312.133.1, 2007-03-04 19:54:30-08:00, igor@olga.mysql.com +4 -4
    Fixed bug #26560.
    Took into account the new type of the last parameter of the function
    find_item_in_list. 

ChangeSet@1.2409.87.1, 2007-03-05 11:25:44+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#25992 Data nodes died during creating many tables based on different tablespaces.

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.114.3.1, 2007-03-05 11:25:41+08:00, gni@dev3-221.dev.cn.tlan +0 -1
    Because TableSpaces, Datafiles, Undofiles and LogfileGroups uses the same id-space with Tables,
    when they are created, the objId allocated for TableSpaces, Datafiles, Undofiles and LogfileGroups 
    shouldn't satisfy the rule of (tableId < c_tableRecordPool.getSize()).

ChangeSet@1.2409.86.1, 2007-03-05 02:09:24+04:00, holyfoot@mysql.com +2 -0
  bug #26538 (flush2.test fails in embedded run)
  
  in the embedded result we don't have 'log_slave_updates OFF' line
  as replication is disabled in the embedded server.
  As we don't need to check for log_slave_updates variable in this
  test, we can not to SHOW it at all

  mysql-test/r/flush2.result@1.3, 2007-03-05 02:09:21+04:00, holyfoot@mysql.com +2 -16
    result fixed

  mysql-test/t/flush2.test@1.2, 2007-03-05 02:09:21+04:00, holyfoot@mysql.com +2 -2
    here we only need to check for log_bin% variables

ChangeSet@1.1616.2983.1, 2007-03-04 00:47:42+03:00, evgen@sunlight.local +4 -0
  Bug#25126: Wrongly resolved field leads to a crash.
  
  When the ORDER BY clause gets fixed it's allowed to search in the current
  item_list in order to find aliased fields and expressions. This is ok for a
  SELECT but wrong for an UPDATE statement. If the ORDER BY clause will
  contain a non-existing field which is mentioned in the UPDATE set list
  then the server will crash due to using of non-existing (0x0) field.
  
  When an Item_field is getting fixed it's allowed to search item list for
  aliased expressions and fields only for selects.

  mysql-test/r/update.result@1.22.1.9, 2007-03-04 00:46:39+03:00, evgen@sunlight.local +4 -0
    Added a test case for bug#25126: Wrongly resolved field leads to a crash.

  mysql-test/t/update.test@1.19.1.10, 2007-03-04 00:46:43+03:00, evgen@sunlight.local +8 -0
    Added a test case for bug#25126: Wrongly resolved field leads to a crash.

  sql/sql_base.cc@1.145.1.131, 2007-03-04 00:45:51+03:00, evgen@sunlight.local +30 -1
    Bug#25126: Wrongly resolved field leads to a crash.
    When an Item_field is getting fixed it's allowed to search item list for
    aliased expressions and fields only for selects.

  sql/sql_select.cc@1.216.125.20, 2007-03-04 00:46:24+03:00, evgen@sunlight.local +2 -5
    Bug#25126: Wrongly resolved field leads to a crash.
    When an Item_field is getting fixed it's allowed to search item list for
    aliased expressions and fields only for selects.

ChangeSet@1.2409.85.1, 2007-03-02 18:45:09+00:00, lzhou@dev3-63.(none) +18 -0
  BUG#26307 correct inconsistant jam() and ljam() use in DBTUP source files.

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.57.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +93 -16
    redefine jam and jamEntry and change offset ranges of source files

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp@1.14.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +32 -34
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp@1.13, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +16 -18
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.21.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +20 -22
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp@1.15, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +6 -8
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +1 -0
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp@1.7.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +5 -7
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.35.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +40 -42
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.21.1.1, 2007-03-02 18:45:01+00:00, lzhou@dev3-63.(none) +34 -36
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.1.1, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +47 -49
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp@1.11, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +26 -28
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.11, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +38 -40
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.32.1.1, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +113 -115
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.19.1.1, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +1 -0
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp@1.5, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +12 -14
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp@1.7, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +18 -20
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp@1.28, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +85 -87
    redefine jam and jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@1.5.1.1, 2007-03-02 18:45:02+00:00, lzhou@dev3-63.(none) +17 -20
    redefine jam and jamEntry

ChangeSet@1.2403.11.11, 2007-03-02 19:08:58+01:00, jonas@eel.(none) +1 -0
  ndb - bug#15632
    arg...also fix starting node...(version 6)
  

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.1.5, 2007-03-02 19:08:55+01:00, jonas@eel.(none) +5 -2
    arg...also fix starting node...

ChangeSet@1.2403.11.10, 2007-03-02 18:47:30+01:00, jonas@eel.(none) +1 -0
  ndb - bug#15632
    fix testNodeRestart -n Bug15632
    handle version > 5

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.1.4, 2007-03-02 18:47:27+01:00, jonas@eel.(none) +5 -2
    fix testNodeRestart -n Bug15632
    handle version > 5

ChangeSet@1.1810.2648.6, 2007-03-02 19:32:46+02:00, gkodinov@magare.gmz +1 -0
  fixed win32 warnings

  sql/item_cmpfunc.h@1.122.18.2, 2007-03-02 19:32:45+02:00, gkodinov@magare.gmz +1 -1
    fixed win32 warnings

ChangeSet@1.1810.2655.2, 2007-03-02 19:27:32+02:00, gkodinov@macbook.gmz +1 -0
  fixed win32 warning

  sql/item_cmpfunc.h@1.122.17.2, 2007-03-02 19:27:26+02:00, gkodinov@macbook.gmz +1 -1
    fixed win32 warning

ChangeSet@1.1616.2981.6, 2007-03-02 16:32:27+01:00, joerg@trift2. +1 -0
  More man pages for the RPMs.

  support-files/mysql.spec.sh@1.83.1.49, 2007-03-02 16:32:25+01:00, joerg@trift2. +2 -0
    More man pages.

ChangeSet@1.1346.894.2, 2007-03-02 16:30:22+01:00, joerg@trift2. +1 -0
  Another man page in the RPMs.

  support-files/mysql.spec.sh@1.61.1.39, 2007-03-02 16:30:21+01:00, joerg@trift2. +1 -0
    Another man page.

ChangeSet@1.1810.2655.1, 2007-03-02 16:25:56+02:00, gkodinov@macbook.gmz +5 -0
  Bug #19342:
  Several problems here :
   1. The conversion to double of an hex string const item
   was not taking into account the unsigned flag.
   
   2. IN was not behaving in the same was way as comparisons
   when performed over an INT/DATE/DATETIME/TIMESTAMP column
   and a constant. The ordinary comparisons in that case 
   convert the constant to an INTEGER value and do int 
   comparisons. Fixed the IN to do the same.
   
   3. IN is not taking into account the unsigned flag when 
   calculating <expr> IN (<int_const1>, <int_const2>, ...).
   Extended the implementation of IN to store and process
   the unsigned flag for its arguments.

  mysql-test/r/func_in.result@1.28.1.4, 2007-03-02 16:25:48+02:00, gkodinov@macbook.gmz +66 -0
    Bug #19342: test case

  mysql-test/t/func_in.test@1.22.1.4, 2007-03-02 16:25:48+02:00, gkodinov@macbook.gmz +58 -0
    Bug #19342: test case

  sql/item.h@1.183.23.1, 2007-03-02 16:25:49+02:00, gkodinov@macbook.gmz +4 -1
    Bug #19342: correct handling of sign in conersion to real.

  sql/item_cmpfunc.cc@1.187.28.1, 2007-03-02 16:25:50+02:00, gkodinov@macbook.gmz +125 -5
    Bug #19342: exteneded the IN values list
     to support unsigned longlong values.
     Correct comparison of integers in IN with
     regard of signedness.
     Compare DATE/DATETIME/TIMESTAMP values as
     integers in IN.

  sql/item_cmpfunc.h@1.122.17.1, 2007-03-02 16:25:50+02:00, gkodinov@macbook.gmz +15 -2
    Bug #19342: exteneded the IN values list
     to support unsigned longlong values.
     Correct comparison of integers in IN with
     regard of signedness.

ChangeSet@1.1810.2654.1, 2007-03-02 15:23:13+01:00, tnurnberg@mysql.com +9 -0
  Bug #21103: DATE column not compared as DATE
  
  If we compare two items A and B, with B being (a constant) of a
  larger type, then A gets promoted to B's type for comparison if
  it's a constant, function, or CAST() column, but B gets demoted
  to A's type if A is a (not explicitly CAST()) column. This is
  counter-intuitive and not mandated by the standard.
   
  Disabling optimisation where it would be lossy so field value
  will properly get promoted and compared as binary string (rather
  than as integers).

  mysql-test/include/ps_conv.inc@1.6, 2007-03-02 15:23:09+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/func_time.result@1.47.18.2, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +17 -0
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Show that everything works as expected.

  mysql-test/r/ps_2myisam.result@1.39.1.6, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_3innodb.result@1.42.1.6, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_4heap.result@1.38.1.6, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_5merge.result@1.39.1.6, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +12 -12
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/r/ps_7ndb.result@1.26.1.22, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +6 -6
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Fix certain queries to still work.

  mysql-test/t/func_time.test@1.41.16.2, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +13 -0
    Bug #21103: DATE column not compared as DATE
    
    When comparing a DATE field with a DATETIME constant, we now compare
    as DATETIMEs, not as DATEs.  Show that everything works as expected.

  sql/field.cc@1.256.44.1, 2007-03-02 15:23:10+01:00, tnurnberg@mysql.com +13 -10
    Bug #21103: DATE column not compared as DATE
    
    #0 stores the date only as a 3-byte integer; save_in_field() in
    #1 saves 'this' in field's format (DATE), #2 "converts a constant
    item to an int and replaces the original item" -- consequently,
    this replaces the Item_string "2006-11-06 04:08:36.0" with the
    Item_int_with_ref 20061106.
    
    #0  Field_newdate::store (this=0x8d26880, from=0x8d5e658 "2006-11-06
    04:08:36.0", len=21, cs=0x88022c0) at field.cc:5344
    #1  0x0817e3b0 in Item_string::save_in_field (this=0x8d5e670, field=0x8d26880, no_conversions=true) at item.cc:4340
    #2  0x081b22ae in convert_constant_item (thd=0x8d25240, field=0x8d26880, item=0x8d5e74c) at item_cmpfunc.cc:245
    #3  0x081b8a36 in Item_bool_func2::fix_length_and_dec (this=0x8d5e6f8) at item_cmpfunc.cc:309
    #4  0x081a3427 in Item_func::fix_fields (this=0x8d5e6f8, thd=0x8d25240, ref=0x8d5f5fc) at item_func.cc:190
    #5  0x0825bc2d in setup_conds (thd=0x8d25240, tables=0x8d5e410, leaves=0x8d5e410, conds=0x8d5f5fc) at sql_base.cc:4941
    ...
    
    Disabling optimisation where it would be lossy so field value will
    properly get promoted and compared as binary string (rather than as
    integers).

ChangeSet@1.1810.2548.68, 2007-03-02 15:21:01+01:00, msvensson@pilot.blaudden +1 -0
  Add hint about using --help to see what options are available

  BUILD/SETUP.sh@1.44.1.20, 2007-03-02 15:21:00+01:00, msvensson@pilot.blaudden +1 -0
    Add hint about using --help to see what options are available

ChangeSet@1.2409.78.6, 2007-03-02 14:13:13+01:00, joerg@trift2. +1 -0
  Add man pages for NDB to the RPMs.

  support-files/mysql.spec.sh@1.185, 2007-03-02 14:13:08+01:00, joerg@trift2. +28 -10
    Add man pages for NDB.

ChangeSet@1.1810.2653.1, 2007-03-02 14:08:32+01:00, joerg@trift2. +1 -0
  Add the man pages for NDB to the RPMs.

  support-files/mysql.spec.sh@1.99.1.68, 2007-03-02 14:08:29+01:00, joerg@trift2. +21 -6
    Add the man pages for NDB.

ChangeSet@1.1616.2981.4, 2007-03-02 14:05:43+01:00, joerg@trift2. +1 -0
  Add the man pages for NDB to the RPMs.

  support-files/mysql.spec.sh@1.83.1.47, 2007-03-02 14:05:40+01:00, joerg@trift2. +19 -5
    Add the man pages for NDB.

ChangeSet@1.1346.894.1, 2007-03-02 14:03:28+01:00, joerg@trift2. +1 -0
  Add missing man pages to the RPMs.

  support-files/mysql.spec.sh@1.61.1.38, 2007-03-02 14:03:27+01:00, joerg@trift2. +9 -0
    Add missing man pages.

ChangeSet@1.1810.2641.13, 2007-03-02 15:05:16+03:00, kostja@bodhi.local +1 -0
  Freeze the number of conflicts. We should not introduce any more
  conflicts without proper analysis and documentation of the nature of
  the conflict.

  sql/sql_yacc.yy@1.371.1.137, 2007-03-02 15:05:13+03:00, kostja@bodhi.local +5 -0
    Freeze the number of conflicts. We should not introduce any more
    conflicts without proper analysis and documentation of the nature of
    the conflict.

ChangeSet@1.1810.2641.12, 2007-03-02 14:29:51+03:00, kostja@bodhi.local +1 -0
  Rename a macro to better reflect the action taken.

  sql/sql_yacc.yy@1.371.1.136, 2007-03-02 14:29:48+03:00, kostja@bodhi.local +19 -19
    Rename: YYERROR_UNLESS -> YYABORT_UNLESS
    yyerror doesn't have to abort of the parser, whereas this macro
    does explicitly call YYABORT.

ChangeSet@1.1810.2634.2, 2007-03-02 15:09:44+04:00, ramil@mysql.com +7 -0
  after merge fix (bug #26038)
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.

  mysql-test/include/gis_generic.inc@1.3.1.1, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/archive_gis.result@1.2.2.2, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/gis.result@1.35.1.6, 2007-03-02 15:09:43+04:00, ramil@mysql.com +46 -4
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/innodb_gis.result@1.2.2.2, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/r/ndb_gis.result@1.3.1.2, 2007-03-02 15:09:43+04:00, ramil@mysql.com +4 -4
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  mysql-test/t/gis.test@1.29.1.5, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -2
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

  sql/item_geofunc.cc@1.27.2.4, 2007-03-02 15:09:43+04:00, ramil@mysql.com +2 -5
    after merge fix
    
    Item_func_geometry_from_text::val_str() should set null_value
    in case of wrong data.

ChangeSet@1.2403.11.9, 2007-03-02 11:48:14+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    fix printout
    crashes testSystemRestart -n SR_UNDO

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.1.3, 2007-03-02 11:48:12+01:00, jonas@perch.ndb.mysql.com +1 -1
    fix printout
    crashes testSystemRestart -n SR_UNDO

ChangeSet@1.1810.2648.3, 2007-03-02 13:25:41+03:00, evgen@sunlight.local +1 -0
  sql_base.cc:
    Post fix for bug#25122.

  sql/sql_base.cc@1.235.85.2, 2007-03-02 13:23:54+03:00, evgen@sunlight.local +2 -1
    Post fix for bug#25122.

ChangeSet@1.1810.2651.1, 2007-03-02 12:14:50+02:00, gkodinov@magare.gmz +3 -0
  Bug #26537: item_unhex() was not expected 
  to return NULL for non-NULL arguments.
  This is not the case as it can return NULL
  for invalid hexidecimal strings.
  Fixed by setting the maybe_null flag.

  mysql-test/r/func_str.result@1.110.5.1, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +6 -0
    Bug #26537: test case

  mysql-test/t/func_str.test@1.92.4.1, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +6 -0
    Bug #26537: test case

  sql/item_strfunc.h@1.101.1.20, 2007-03-02 12:14:49+02:00, gkodinov@magare.gmz +5 -1
    Bug #26537: item_unhex() can return NULLs
    even for guaranteed non-null arguments.

ChangeSet@1.2409.67.20, 2007-03-02 10:35:04+01:00, rafal@quant.(none) +1 -0
  Removing global events_till_disconnect variable as it is replaced by a member of 
  master info structure.

  sql/slave.cc@1.306.1.8, 2007-03-02 10:35:00+01:00, rafal@quant.(none) +0 -3
    Removing global events_till_disconnect variable as it is replaced by a member of 
    master info structure.

ChangeSet@1.2450, 2007-03-02 09:04:23+01:00, Kristofer.Pettersson@naruto. +1 -0
  Merge BUG: Windows target won't compile.
   - winsock2.h must be included before windows.h

  server-tools/instance-manager/WindowsService.cpp@1.10, 2007-03-02 09:04:17+01:00, Kristofer.Pettersson@naruto. +1 -2
    Merge BUG: Windows target won't compile.
     - winsock2.h must be included before windows.h

ChangeSet@1.2449, 2007-03-01 20:04:49-07:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/item_func.cc@1.357.1.2, 2007-03-01 20:04:46-07:00, malff@weblab.(none) +4 -0
    Manual merge

ChangeSet@1.2409.50.6, 2007-03-02 11:03:16+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected
  when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
  beacuase the function's definition is changed from 5.0 to 5.1

  storage/ndb/test/ndbapi/testScanFilter.cpp@1.3, 2007-03-02 11:03:14+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    bug#24568
    it need change f() call because NDBT_CreateTableHook definition is changed from 5.0 to 5.1

ChangeSet@1.1810.2649.1, 2007-03-01 19:20:47-07:00, malff@weblab.(none) +3 -0
  Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid
    results)
  
  Before this fix, the function BENCHMARK() would fail to evaluate expressions
  like "(select avg(a) from t1)" in debug builds (with an assert),
  or would report a time of zero in non debug builds.
  
  The root cause is that evaluation of DECIMAL_RESULT expressions was not
  supported in Item_func_benchmark::val_int().
  
  This has been fixed by this change.

  mysql-test/r/func_misc.result@1.21.1.6, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +44 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

  mysql-test/t/func_misc.test@1.21, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +57 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

  sql/item_func.cc@1.270.43.1, 2007-03-01 19:20:46-07:00, malff@weblab.(none) +4 -0
    Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()

ChangeSet@1.1810.2593.6, 2007-03-02 09:06:05+07:00, tomas@poseidon.mysql.com +7 -0
  Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
  (part 1)
  - add signal data
  - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/AlterTable.hpp@1.1.6.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/CreateIndx.hpp@1.6.3.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/CreateTable.hpp@1.3.3.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/DropIndx.hpp@1.3.3.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/include/kernel/signaldata/DropTable.hpp@1.1.5.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +2 -1
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.43.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +41 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

  ndb/src/ndbapi/ndberror.c@1.30.38.1, 2007-03-02 09:05:59+07:00, tomas@poseidon.mysql.com +1 -0
    Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
    (part 1)
    - add signal data
    - add ref in dict on create/drop table/index

ChangeSet@1.1810.2593.5, 2007-03-02 08:56:22+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #26720 Infinite loop on unknown signal in logging function
  - terminate printing

  ndb/src/common/debugger/signaldata/PackedSignal.cpp@1.1.2.1, 2007-03-02 08:56:14+07:00, tomas@poseidon.mysql.com +2 -0
    Bug #26720 Infinite loop on unknown signal in logging function
    - terminate printing

ChangeSet@1.2409.50.5, 2007-03-02 09:41:47+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected,
  add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1

  storage/ndb/test/ndbapi/testScanFilter.cpp@1.2, 2007-03-02 09:39:17+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0
    Rename: ndb/test/ndbapi/testScanFilter.cpp -> storage/ndb/test/ndbapi/testScanFilter.cpp

ChangeSet@1.2447, 2007-03-01 18:14:51-07:00, malff@weblab.(none) +1 -0
  Missing parameter to DBUG_PRINT

  sql/events.cc@1.70, 2007-03-01 18:14:48-07:00, malff@weblab.(none) +2 -1
    Missing parameter to DBUG_PRINT

ChangeSet@1.1810.2604.16, 2007-03-02 00:54:02+01:00, kent@mysql.com +1 -0
  mysql.sln:
    Correction of embedded build types

  VC++Files/mysql.sln@1.5.7.1, 2007-03-02 00:04:10+01:00, kent@mysql.com +4 -4
    Correction of embedded build types

ChangeSet@1.2446, 2007-03-01 16:39:00-07:00, malff@weblab.(none) +4 -0
  Fixed compiler warnings

  server-tools/instance-manager/angel.cc@1.7, 2007-03-01 16:38:56-07:00, malff@weblab.(none) +0 -2
    Compiler warnings

  sql/event_queue.cc@1.25, 2007-03-01 16:38:56-07:00, malff@weblab.(none) +2 -2
    Compier warnings

  sql/event_scheduler.cc@1.36, 2007-03-01 16:38:56-07:00, malff@weblab.(none) +8 -8
    Compiler warnings

  sql/events.cc@1.69, 2007-03-01 16:38:56-07:00, malff@weblab.(none) +1 -1
    Compiler warnings

ChangeSet@1.1810.2604.15, 2007-03-01 23:48:22+01:00, kent@mysql.com +1 -0
  mysql.sln:
    Disabled build of all embedded server libraries, "libmysqld.ldd"
    "mysqldemb.lib" and "mysqlserver.lib"

  VC++Files/mysql.sln@1.5.6.1, 2007-03-01 23:45:55+01:00, kent@mysql.com +15 -22
    Disabled build of all embedded server libraries, "libmysqld.ldd"
    "mysqldemb.lib" and "mysqlserver.lib"

ChangeSet@1.1810.2641.10, 2007-03-01 15:10:14-07:00, malff@weblab.(none) +2 -0
  Manual merge of 5.0 into 5.0-runtime

  mysql-test/r/subselect.result@1.134.1.42, 2007-03-01 15:10:11-07:00, malff@weblab.(none) +51 -9
    Manual merge

  mysql-test/t/subselect.test@1.129.1.14, 2007-03-01 15:10:11-07:00, malff@weblab.(none) +28 -0
    Manual merge

ChangeSet@1.1810.2600.6, 2007-03-02 00:09:22+03:00, evgen@moonbone.local +7 -0
  Bug#25122: Views based on a self-joined table aren't insertable.
  
  When INSERT is done over a view the table being inserted into is 
  checked to be unique among all views tables. But if the view contains
  self-joined table an error will be thrown even if all tables are used under
  different aliases.
  
  The unique_table() function now also checks tables' aliases when needed.

  sql/mysql_priv.h@1.290.99.1, 2007-03-02 00:09:02+03:00, evgen@moonbone.local +2 -1
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated prototype of the unique_table() function.

  sql/sql_base.cc@1.235.84.1, 2007-03-02 00:09:04+03:00, evgen@moonbone.local +7 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Now the unique_table() function checks tables' aliases when needed.

  sql/sql_delete.cc@1.144.21.1, 2007-03-02 00:09:05+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_insert.cc@1.146.45.6, 2007-03-02 00:09:05+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_load.cc@1.78.8.1, 2007-03-02 00:09:06+03:00, evgen@moonbone.local +1 -1
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_parse.cc@1.426.144.1, 2007-03-02 00:09:06+03:00, evgen@moonbone.local +2 -2
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

  sql/sql_update.cc@1.154.29.1, 2007-03-02 00:09:07+03:00, evgen@moonbone.local +3 -3
    Bug#25122:  Views based on a self-joined table aren't insertable.
    Updated calls to the unique_table() function.

ChangeSet@1.2445, 2007-03-01 13:47:28-07:00, malff@weblab.(none) +4 -0
  Manual merge of 5.1 into 5.1-runtime

  mysql-test/r/subselect.result@1.168, 2007-03-01 13:47:23-07:00, malff@weblab.(none) +9 -9
    Manual merge

  server-tools/instance-manager/mysqlmanager.cc@1.32, 2007-03-01 13:47:23-07:00, malff@weblab.(none) +1 -1
    Manual merge

  sql/event_scheduler.cc@1.35, 2007-03-01 13:47:23-07:00, malff@weblab.(none) +24 -21
    Manual merge

  sql/sql_parse.cc@1.633, 2007-03-01 13:47:23-07:00, malff@weblab.(none) +17 -995
    Manual merge

ChangeSet@1.1810.2548.67, 2007-03-01 20:59:08+01:00, msvensson@pilot.blaudden +2 -0
  After merge fixes

  mysql-test/r/mysqlbinlog.result@1.25.1.8, 2007-03-01 20:59:07+01:00, msvensson@pilot.blaudden +1 -2
    After merge fixes

  mysql-test/t/mysqlbinlog.test@1.21.1.23, 2007-03-01 20:59:07+01:00, msvensson@pilot.blaudden +1 -2
    After merge fixes

ChangeSet@1.1616.2982.5, 2007-03-01 19:09:43+01:00, msvensson@pilot.blaudden +1 -0
  Add two more USE_CYGWIN ifdefs to mysqltest

  client/mysqltest.c@1.92.21.52, 2007-03-01 19:09:42+01:00, msvensson@pilot.blaudden +4 -0
    Add two more USE_CYGWIN ifdefs to mysqltest

ChangeSet@1.1616.2982.4, 2007-03-01 18:31:09+01:00, msvensson@pilot.blaudden +1 -0
  Fix bug in mtr.pl where slave wes using same query log file as master

  mysql-test/mysql-test-run.pl@1.8.20.6, 2007-03-01 18:31:09+01:00, msvensson@pilot.blaudden +1 -1
    Fix bug in mtr.pl where slave wes using same query log file as master

ChangeSet@1.1616.2982.3, 2007-03-01 18:30:29+01:00, msvensson@pilot.blaudden +1 -0
  Don't set the "is_windows" flag if using cygwin

  client/mysqltest.c@1.92.21.51, 2007-03-01 18:30:28+01:00, msvensson@pilot.blaudden +2 -0
    Don't set the "is_windows" flag if using cygwin

ChangeSet@1.2409.79.6, 2007-03-01 16:17:48+01:00, lars@mysql.com +1 -0
  Post-merge fix

  sql/sql_insert.cc@1.246.1.9, 2007-03-01 16:17:45+01:00, lars@mysql.com +1 -1
    Post-merge fix

ChangeSet@1.2409.1.78, 2007-03-01 15:25:42+01:00, msvensson@pilot.blaudden +5 -0
  Switch back to master before cleanup of the created tables
  That causes test case for bug#6880 to be run on the master
  instead of the slave and thus the result files need to be updated

  mysql-test/extra/rpl_tests/rpl_log.test@1.42, 2007-03-01 15:25:40+01:00, msvensson@pilot.blaudden +4 -0
    Switch back to master before cleanup of the created tables
    That causes test case for bug#6880 to be run on the master
    instead of the slave and thus the result files need to be updated

  mysql-test/r/rpl_ndb_log.result@1.17, 2007-03-01 15:25:40+01:00, msvensson@pilot.blaudden +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_row_log.result@1.13, 2007-03-01 15:25:40+01:00, msvensson@pilot.blaudden +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_row_log_innodb.result@1.13, 2007-03-01 15:25:40+01:00, msvensson@pilot.blaudden +3 -3
    Update result, test is now run on master

  mysql-test/r/rpl_stm_log.result@1.74, 2007-03-01 15:25:40+01:00, msvensson@pilot.blaudden +4 -4
    Update result, test is now run on master

ChangeSet@1.2409.79.4, 2007-03-01 18:16:17+04:00, bar@mysql.com +7 -0
  After merge fix

  mysql-test/r/ctype_cp932_binlog_stm.result@1.4, 2007-03-01 18:16:13+04:00, bar@mysql.com +6 -6
    After merge fix

  mysql-test/r/mysqlbinlog.result@1.28.1.2, 2007-03-01 18:16:13+04:00, bar@mysql.com +8 -7
    After merge fix

  mysql-test/r/rpl_loaddata_simple.result@1.5, 2007-03-01 16:02:11+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_simple.result

  mysql-test/t/ctype_cp932_binlog_stm.test@1.4, 2007-03-01 18:16:13+04:00, bar@mysql.com +1 -1
    After merge fix

  mysql-test/t/mysqlbinlog.test@1.35.1.2, 2007-03-01 18:16:13+04:00, bar@mysql.com +4 -3
    After merge fix

  mysql-test/t/rpl_loaddata_simple.test@1.5, 2007-03-01 16:01:49+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_simple.test

  sql/log_event.cc@1.266.1.7, 2007-03-01 18:16:13+04:00, bar@mysql.com +4 -4
    After merge fix

ChangeSet@1.1810.2648.1, 2007-03-01 15:28:10+02:00, gkodinov@magare.gmz +1 -0
  Correctly recognize Intel Core2Duo Extreme
  in build.

  BUILD/check-cpu@1.13.1.6, 2007-03-01 15:28:09+02:00, gkodinov@magare.gmz +4 -0
    Correctly recognize Intel Core2Duo Extreme.

ChangeSet@1.2409.1.76, 2007-03-01 14:16:38+01:00, msvensson@pilot.blaudden +37 -0
  Make sure tests drops objects created and restore variables to default  

  mysql-test/extra/rpl_tests/rpl_row_func003.test@1.4, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -1
    Fix spelling error

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.7, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +4 -0
    Restore sql_mode after test

  mysql-test/r/events_logs_tests.result@1.16, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Turn even_scheduleroff before test ends

  mysql-test/r/events_scheduling.result@1.8, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Turn even_scheduleroff before test ends

  mysql-test/r/insert.result@1.32, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop tables t1 before test ends

  mysql-test/r/rpl_read_only.result@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Set read_only flag back to default

  mysql-test/r/rpl_row_NOW.result@1.2, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop database mysqltest1 before test ends 

  mysql-test/r/rpl_row_USER.result@1.4, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Drop users created by test

  mysql-test/r/rpl_row_basic_11bugs.result@1.13, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Drop table and set query_cache_size back to default

  mysql-test/r/rpl_row_func002.result@1.2, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop table created by test

  mysql-test/r/rpl_row_sp008.result@1.5, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop table created by test

  mysql-test/r/rpl_row_sp012.result@1.2, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop user created by test

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.9, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.6, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_tabledefs_7ndb.result@1.2, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Restore sql_mode

  mysql-test/r/rpl_row_view01.result@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop database created by test

  mysql-test/r/rpl_slave_status.result@1.9, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Remove created users

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.16.1.1, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Reset binlog_format to default

  mysql-test/r/sp.result@1.251, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop procedure created by test

  mysql-test/r/varbinary.result@1.20, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop table created by test

  mysql-test/r/variables.result@1.96, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +4 -4
    Reset changed variables to their defaults

  mysql-test/t/events_logs_tests.test@1.16, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Turn off event_scheduler before test ends

  mysql-test/t/events_scheduling.test@1.10, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Turn off event_scheduler

  mysql-test/t/insert.test@1.29, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Drop table created by test

  mysql-test/t/rpl_read_only.test@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +2 -0
    Reset read_only flag

  mysql-test/t/rpl_row_NOW.test@1.4, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop db created by test

  mysql-test/t/rpl_row_USER.test@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +3 -1
    Drop users created

  mysql-test/t/rpl_row_basic_11bugs.test@1.12, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +6 -0
    Drop tables created by test

  mysql-test/t/rpl_row_func002.test@1.5, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop table created by test

  mysql-test/t/rpl_row_sp008.test@1.5, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop table created by test

  mysql-test/t/rpl_row_sp012.test@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop user created by test

  mysql-test/t/rpl_row_view01.test@1.3, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop db created by test

  mysql-test/t/rpl_slave_status.test@1.10, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Remove users created by test

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.13.1.2, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +8 -0
    Reset binlog_format

  mysql-test/t/sp.test@1.219, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop procedure created by test

  mysql-test/t/varbinary.test@1.13, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +1 -0
    Drop tables created by test

  mysql-test/t/variables.test@1.68, 2007-03-01 14:16:36+01:00, msvensson@pilot.blaudden +4 -4
    Restore variables to their default before test ends

ChangeSet@1.2409.79.3, 2007-03-01 16:08:13+04:00, bar@mysql.com +3 -0
  after merge fix

  BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3@1.4, 2007-03-01 16:08:10+04:00, bar@mysql.com +0 -3
    after merge fix
    MERGE: 1.1.1.2

  BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3@1.1.1.2, 2007-03-01 16:04:44+04:00, bar@bar.myoffice.izhnet.ru +0 -0
    Merge rename: mysql-test/r/ctype_cp932_notembedded.result -> BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3

  mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@1.7, 2007-03-01 16:08:10+04:00, bar@mysql.com +0 -1
    after merge fix
    MERGE: 1.2.2.2

  mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@1.2.2.2, 2007-03-01 16:04:44+04:00, bar@bar.myoffice.izhnet.ru +0 -0
    Merge rename: mysql-test/t/ctype_cp932_binlog.test -> mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

  mysql-test/r/binlog_stm_ctype_ucs.result@1.11, 2007-03-01 16:08:10+04:00, bar@mysql.com +0 -9
    after merge fix
    MERGE: 1.2.4.2

  mysql-test/r/binlog_stm_ctype_ucs.result@1.2.4.2, 2007-03-01 16:04:44+04:00, bar@bar.myoffice.izhnet.ru +0 -0
    Merge rename: mysql-test/r/ctype_cp932_binlog.result -> mysql-test/r/binlog_stm_ctype_ucs.result

ChangeSet@1.2409.67.18, 2007-03-01 11:52:20+01:00, rafal@quant.(none) +1 -0
  Fixing manual merge error.

  sql/slave.cc@1.306.1.6, 2007-03-01 11:52:18+01:00, rafal@quant.(none) +0 -7
    Removing piece of code which get there when manual merging from 5.0 tree.

ChangeSet@1.1616.2971.24, 2007-03-01 11:41:29+01:00, msvensson@pilot.blaudden +1 -0
  MySQL versions before 5.0 still use cygwin, no need
  to convert path

  mysql-test/lib/mtr_misc.pl@1.5.1.7, 2007-03-01 11:41:29+01:00, msvensson@pilot.blaudden +6 -0
    MySQL versions before 5.0 still use cygwin, no need
    to convert path

ChangeSet@1.1810.2646.1, 2007-03-01 10:40:48+01:00, rafal@quant.(none) +2 -0
  Removing two more compilation warnings.

  sql/slave.cc@1.241.1.53, 2007-03-01 10:38:17+01:00, rafal@quant.(none) +2 -0
    Guard declaration of variable to avoid "unused variable" warning.

  sql/sql_repl.cc@1.133.1.25, 2007-03-01 10:38:17+01:00, rafal@quant.(none) +2 -0
    Guard declaration of variable to avoid "unused variable" warning.

ChangeSet@1.1810.2640.3, 2007-03-01 11:28:33+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
  Fixed compiler warnings.

  client/mysqltest.c@1.155.9.88, 2007-03-01 11:28:30+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed a compiler warning.

  support-files/compiler_warnings.supp@1.2.1.6, 2007-03-01 11:28:30+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Suppressed compiler warnings on Win 64.

ChangeSet@1.1810.2640.2, 2007-03-01 10:52:25+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
  Disabled compiler warnings.

  sql/ha_archive.cc@1.60.14.2, 2007-03-01 10:52:22+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -1
    Fixed a warning from unused computed value. This block is
    only used in debug mode and changes nothing.

  support-files/compiler_warnings.supp@1.2.1.5, 2007-03-01 10:52:22+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
    Disabled a warning from BDB.

ChangeSet@1.1810.2641.6, 2007-03-01 12:26:07+04:00, bar@mysql.com +2 -0
  Fix for wrong replace command.

  mysql-test/r/mysqlbinlog.result@1.25.1.6, 2007-03-01 12:26:05+04:00, bar@mysql.com +7 -7
    Fix for wrong replace command.

  mysql-test/t/mysqlbinlog.test@1.21.1.21, 2007-03-01 12:26:05+04:00, bar@mysql.com +1 -1
    Fix for wrong replace command.

ChangeSet@1.1810.2645.1, 2007-03-01 11:52:25+04:00, bar@mysql.com +2 -0
  Renaming recenly added test case, because of name conflict
  when merging into 5.1.

  mysql-test/r/rpl_loaddata_charset.result@1.2, 2007-03-01 11:50:27+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_charset.result

  mysql-test/t/rpl_loaddata_charset.test@1.2, 2007-03-01 11:50:13+04:00, bar@mysql.com +0 -0
    Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_charset.test

ChangeSet@1.1810.2644.1, 2007-03-01 08:41:13+01:00, rafal@quant.(none) +4 -0
  Fixes of compilation warnings and errors.

  sql/mysql_priv.h@1.290.98.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -1
    Removing compiler warning "NULL used in arithmetic"

  sql/mysqld.cc@1.439.1.153, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -1
    First argument to WARN_DEPRECATED is supposed to be a pointer (to THD structure)

  sql/sql_insert.cc@1.146.50.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +2 -0
    Removing compiler warning "unused variable". Apparently query is not used when compiling libmysqld.

  sql/sql_yacc.yy@1.371.99.1, 2007-03-01 08:41:12+01:00, rafal@quant.(none) +1 -0
    Removing compiler error "Macro already defined"

ChangeSet@1.1810.2641.2, 2007-03-01 11:23:12+04:00, bar@mysql.com +2 -0
  Additional fix for bug N 15126
  Replacing local directory.

  mysql-test/r/mysqlbinlog.result@1.25.1.5, 2007-03-01 11:23:09+04:00, bar@mysql.com +7 -7
    Additional fix for bug N 15126

  mysql-test/t/mysqlbinlog.test@1.21.1.20, 2007-03-01 11:23:09+04:00, bar@mysql.com +1 -0
    Additional fix for bug N 15126

ChangeSet@1.1810.2643.1, 2007-03-01 15:13:33+08:00, Justin.He@dev3-240.dev.cn.tlan +5 -0
  correct NAND/NOR scan operations, and add a test case for it.

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.4.1, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +45 -1
    translate NAND/NOR into AND/OR, since AND/OR operations are all correct

  ndb/test/include/NDBT_Test.hpp@1.11.5.1, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +6 -0
    add a new method executeOneCtx() in class NDBT_TestSuite, declare it

  ndb/test/ndbapi/Makefile.am@1.19.12.1, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -0
    Add a new test case: testScanFIlter.cpp to test/ndbapi/,
    thus modify the Makefile.am related to it

  ndb/test/ndbapi/testScanFilter.cpp@1.1, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +851 -0
    It's a test case for ndbapi scan filter, test for AND/OR/NAND/NOR scan operations.

  ndb/test/ndbapi/testScanFilter.cpp@1.0, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  ndb/test/src/NDBT_Test.cpp@1.23.5.1, 2007-03-01 15:13:31+08:00, Justin.He@dev3-240.dev.cn.tlan +57 -0
    add a new method in class NDBT_TestSuite in order to adapt to 
    some customized test cases, because the default NDBT's test talbes
    and flow are fixed, if just modify related existing methods, it will
    influence other test cases in test/ndbapi/

ChangeSet@1.2409.1.75, 2007-03-01 07:23:37+01:00, msvensson@pilot.blaudden +1 -0
  There is no .sql files in mysql-test/lib/  anymore, don't try to copy from there

  scripts/make_win_bin_dist@1.4, 2007-03-01 07:23:36+01:00, msvensson@pilot.blaudden +0 -1
    There is no .sql files in mysql-test/lib/  anymore, don't try to copy from there

ChangeSet@1.2403.13.4, 2007-03-01 11:07:24+07:00, tomas@poseidon.mysql.com +1 -0
  Bug #26741  	ndb_restore with only print_data seg faults
  - only creat systable if conencted to ndb

  storage/ndb/tools/restore/consumer_restore.cpp@1.39.2.1, 2007-03-01 11:07:15+07:00, tomas@poseidon.mysql.com +2 -0
    Bug #26741  	ndb_restore with only print_data seg faults
    - only creat systable if conencted to ndb

ChangeSet@1.1810.2593.4, 2007-03-01 08:34:59+07:00, tomas@poseidon.mysql.com +2 -0
  ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
  ndb - 5.1.16 uint64 align for ndb_restore
  (backport)

  ndb/src/ndbapi/NdbRecAttr.cpp@1.20.8.1, 2007-03-01 08:34:52+07:00, tomas@poseidon.mysql.com +19 -19
     ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
    (backport)

  ndb/tools/restore/Restore.cpp@1.22.9.1, 2007-03-01 08:34:52+07:00, tomas@poseidon.mysql.com +6 -1
     ndb - 5.1.16 uint64 align for ndb_restore
    (backport)

ChangeSet@1.1346.891.8, 2007-02-28 22:30:50+01:00, kent@mysql.com +1 -0
  Makefile.am:
    EXCEPTIONS-CLIENT is now static part of repository

  Docs/Makefile.am@1.38.1.18, 2007-02-28 22:30:09+01:00, kent@mysql.com +1 -1
    EXCEPTIONS-CLIENT is now static part of repository

ChangeSet@1.2443, 2007-03-01 00:25:50+03:00, kostja@bodhi.local +6 -0
  Remove dead code: flush_version was never increased in the server,
  therefore the logic associated with it never worked.

  sql/ha_partition.cc@1.83.2.1, 2007-03-01 00:25:44+03:00, kostja@bodhi.local +3 -2
    Remove dead code. Update comments.

  sql/mysql_priv.h@1.470.13.2, 2007-03-01 00:25:44+03:00, kostja@bodhi.local +1 -1
    Remove dead code (flush_version).

  sql/mysqld.cc@1.601.19.1, 2007-03-01 00:25:44+03:00, kostja@bodhi.local +2 -2
    Remove dead code (flush_version).

  sql/sql_base.cc@1.374.2.1, 2007-03-01 00:25:44+03:00, kostja@bodhi.local +1 -7
    Remove dead code.

  sql/table.cc@1.275.2.1, 2007-03-01 00:25:45+03:00, kostja@bodhi.local +0 -1
    Remove dead code.

  sql/table.h@1.158.2.1, 2007-03-01 00:25:45+03:00, kostja@bodhi.local +1 -1
    Remove dead code.

ChangeSet@1.1346.891.7, 2007-02-28 22:09:09+01:00, kent@mysql.com +2 -0
  Makefile.am:
    EXCEPTIONS-CLIENT is now static part of repository
  EXCEPTIONS-CLIENT:
    BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT

  Docs/Makefile.am@1.38.1.17, 2007-02-28 22:07:29+01:00, kent@mysql.com +0 -3
    EXCEPTIONS-CLIENT is now static part of repository

  EXCEPTIONS-CLIENT@1.1, 2007-02-28 21:54:33+01:00, kent@mysql.com +117 -0
    BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT

  EXCEPTIONS-CLIENT@1.0, 2007-02-28 21:54:33+01:00, kent@mysql.com +0 -0

ChangeSet@1.2409.1.73, 2007-02-28 21:29:14+01:00, msvensson@pilot.blaudden +2 -0
  Bug #25074 mysql_upgrade test can't give consistent results
   - Remove from disabled list
   - Update test result

  mysql-test/r/mysql_upgrade.result@1.7, 2007-02-28 21:29:13+01:00, msvensson@pilot.blaudden +130 -0
    Update test result

  mysql-test/t/disabled.def@1.231.3.1, 2007-02-28 21:29:13+01:00, msvensson@pilot.blaudden +0 -1
    Remove test from list of disabled

ChangeSet@1.1810.2640.1, 2007-02-28 22:23:35+02:00, jani@ua141d10.elisa.omakaista.fi +12 -0
  Fixed compiler warnings.

  sql/ha_berkeley.cc@1.151.9.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Added casts to avoid warnings.

  client/mysql_upgrade.c@1.6.1.12, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +20 -9
    Fixed problem with mysql_upgrade being dependent
    on local my.cnf files and problem with memory not being freed.

  client/mysqltest.c@1.155.9.87, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Changed type to avoid warning.

  cmd-line-utils/readline/xmalloc.c@1.8.1.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -4
    Fix to avoid warning.

  include/my_dbug.h@1.16.2.6, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    To disable parts from code in non-debug more.

  sql/field.cc@1.256.43.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +3 -3
    Fixed warning.

  sql/ha_ndbcluster.cc@1.175.1.125, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +22 -7
    Fixed warnings.

  sql/log.cc@1.158.19.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -2
    Added casts to avoid warnings.

  sql/slave.cc@1.241.17.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    Avoid warning.

  sql/sql_repl.cc@1.133.7.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +2 -0
    Avoid warning.

  sql/ha_archive.cc@1.60.14.1, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +1 -1
    Fixed warning.

  support-files/compiler_warnings.supp@1.2.1.4, 2007-02-28 22:23:33+02:00, jani@ua141d10.elisa.omakaista.fi +53 -3
    Added disabled warnings to compiler_warnings.supp file.
    These are backported mainly from 5.1 suppress file, but there
    are some additional new ones.

ChangeSet@1.1810.2639.1, 2007-02-28 21:05:39+01:00, msvensson@pilot.blaudden +1 -0
  Bug #25074 mysql_upgrade test can't give consistent results
   - Tell the programs executed by mysql_upgrade to only read
    from the defaults file generated by msyql_upgrade
   - Fix memory leaks

  client/mysql_upgrade.c@1.6.5.4, 2007-02-28 21:05:38+01:00, msvensson@pilot.blaudden +65 -55
    - Always generate defaults file used for the programs executed
      by mysql_upgrade.
    - Set the executed programs to read options _only_ from the
      generated defaults file 
    - Add DBUG printouts
    - Add comments
    - Fix memory leaks
    - Change one 'my_delete'(delete a file) to 'my_free'(free memory)
    - Free memory allocated by 'load_default'

ChangeSet@1.1810.2548.63, 2007-02-28 20:44:49+01:00, msvensson@pilot.blaudden +2 -0
  Bug #20166 mysql-test-run.pl does not test system privilege tables creation
   - No .sql files in mysql-test/lib/ anymore, don't copy them

  scripts/make_win_bin_dist@1.1.6.1, 2007-02-28 20:44:48+01:00, msvensson@pilot.blaudden +0 -1
    No need to copy mysql-test/lib/*.sql there are no sql files there anymore

  scripts/make_binary_distribution.sh@1.101.7.1, 2007-02-28 20:44:48+01:00, msvensson@pilot.blaudden +0 -1
    No need to copy mysql-test/lib/*.sql there are no sql files there anymore

ChangeSet@1.2409.1.70, 2007-02-28 20:33:59+01:00, msvensson@pilot.blaudden +5 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Additional fixes caused by running without anonymous users

  mysql-test/r/federated_server.result@1.5, 2007-02-28 20:33:57+01:00, msvensson@pilot.blaudden +0 -2
    There are no default server in mysql.servers anymore
    The test will create it's own test servers

  mysql-test/r/rpl_read_only.result@1.2, 2007-02-28 20:33:57+01:00, msvensson@pilot.blaudden +2 -0
    Update result

  mysql-test/r/rpl_row_USER.result@1.3, 2007-02-28 20:33:57+01:00, msvensson@pilot.blaudden +4 -4
    Update test result, it basically checks that the values
    return by USER() and CURRENT_USER() are the
    same on master and slave, so it's doing the correct
    thing. Since connection m_1 is logged in as ''@localhost%
    that is what will end up in the log.

  mysql-test/t/ndb_multi_row.test@1.4, 2007-02-28 20:33:57+01:00, msvensson@pilot.blaudden +2 -2
    Connect as root instead of '' which would pick currently logged in user
     

  mysql-test/t/rpl_read_only.test@1.2, 2007-02-28 20:33:57+01:00, msvensson@pilot.blaudden +6 -0
    Add user test with no privs(no anonymous by default anymore)

ChangeSet@1.2409.71.11, 2007-02-28 19:37:31+01:00, tsmith@bk-internal.mysql.com +2 -0
  Update version to 5.2.0-alpha - new 5.2 tree

  configure.in@1.440, 2007-02-28 19:33:32+01:00, tsmith@bk-internal.mysql.com +1 -1
    Set version number to 5.2.0-alpha

  storage/ndb/src/common/util/version.c@1.27, 2007-02-28 19:33:04+01:00, tsmith@bk-internal.mysql.com +1 -0
    Add version 5.2 to ndbCompatibleTable_full

ChangeSet@1.1616.2980.1, 2007-02-28 16:37:50+01:00, msvensson@pilot.blaudden +1 -0
  Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
   - Add printout of current time when mysqld is killed by an
     unhandled signal

  sql/mysqld.cc@1.356.115.1, 2007-02-28 16:37:50+01:00, msvensson@pilot.blaudden +10 -1
    Add printout of current time before the "mysqld got signal %d" message
    Hopefully we don't crash in the calls to 'time' or 'localtime_r'
    but if that should start to happen we can move the printout of
    time further down. At least it's now below the check for segfault
    inside of segfault handler. 

ChangeSet@1.1810.2638.1, 2007-02-28 18:34:35+04:00, svoj@mysql.com +3 -0
  BUG#26238 - inserted delayed always inserts 0 for BIT columns
  
  INSERT DELAYED inserts garbage for BIT columns.
  
  When delayed thread clones TABLE object, it didn't adjusted bit_ptr
  to newly created record (though it correctly adjusts ptr and null_ptr).
  
  This is fixed by correctly adjusting bit_ptr when performing a clone.
  With this fix BIT values are stored correctly by INSERT DELAYED.

  mysql-test/r/delayed.result@1.12.1.1, 2007-02-28 18:34:33+04:00, svoj@mysql.com +7 -0
    A test case for BUG#26238.

  mysql-test/t/delayed.test@1.11.1.6, 2007-02-28 18:34:33+04:00, svoj@mysql.com +8 -0
    A test case for BUG#26238.

  sql/field.h@1.153.18.9, 2007-02-28 18:34:34+04:00, svoj@mysql.com +6 -1
    Added move_field() to Field_bit class. When moving a field, adjust
    bit_ptr also, which is specific to Field_bit class.

ChangeSet@1.1810.2548.60, 2007-02-28 15:15:38+01:00, msvensson@pilot.blaudden +2 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Null merge 4.1 patch

  mysql-test/Makefile.am@1.66.1.22, 2007-02-28 15:15:36+01:00, msvensson@pilot.blaudden +1 -6
    Null merge to 4.1 patch

  scripts/Makefile.am@1.43.1.15, 2007-02-28 15:15:36+01:00, msvensson@pilot.blaudden +0 -1
    No need to clean mysql_create_system_tablesa anyomre

ChangeSet@1.1810.2632.6, 2007-02-28 18:13:23+04:00, bar@mysql.com +3 -0
  Additional test changes for
  Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
  Positions of some binlog events were changed because of
  additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_notembedded.result@1.1.1.1, 2007-02-28 18:13:20+04:00, bar@mysql.com +3 -3
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/t/ctype_cp932_binlog.test@1.2.2.1, 2007-02-28 18:13:20+04:00, bar@mysql.com +1 -1
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

  mysql-test/r/ctype_cp932_binlog.result@1.2.4.1, 2007-02-28 18:13:20+04:00, bar@mysql.com +9 -9
    Additional test changes for
    Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
    Positions of some binlog events were changed because of
    additional logging of @@collation_database.

ChangeSet@1.1616.2971.22, 2007-02-28 15:03:47+01:00, msvensson@pilot.blaudden +4 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build lib/init-db.sql from the output of mysql_create_system_tables
   - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
   - Leave netware/init_db.sql until 5.0 where we should soon have possibility
     to test with mysql-test-run.pl

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@1.4.1.2, 2007-02-28 15:01:05+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/lib/init_db.sql

  BitKeeper/deleted/.del-init_db.sql@1.2.2.1, 2007-02-28 15:01:02+01:00, msvensson@pilot.blaudden +0 -0
    Delete: mysql-test/init_db.sql

  BitKeeper/etc/ignore@1.153.1.88, 2007-02-28 15:03:46+01:00, msvensson@pilot.blaudden +1 -0
    Added mysql-test/lib/init_db.sql to the ignore list

  mysql-test/Makefile.am@1.39.1.21, 2007-02-28 15:03:46+01:00, msvensson@pilot.blaudden +6 -1
    Build lib/init_db.sql from the output of mysql_create_system_tables

ChangeSet@1.2409.1.65, 2007-02-28 14:58:19+01:00, msvensson@pilot.blaudden +1 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation

  scripts/mysql_system_tables_data.sql@1.2, 2007-02-28 14:58:17+01:00, msvensson@pilot.blaudden +5 -5
    Update initial data for system tables to 5.1 version format

ChangeSet@1.1810.2632.5, 2007-02-28 17:32:18+04:00, bar@mysql.com +2 -0
  After merge fix

  mysql-test/r/mysqlbinlog.result@1.25.1.4, 2007-02-28 17:32:15+04:00, bar@mysql.com +0 -1
    After merge fix

  mysql-test/t/mysqlbinlog.test@1.21.1.19, 2007-02-28 17:32:15+04:00, bar@mysql.com +0 -2
    After merge fix

ChangeSet@1.1810.2548.58, 2007-02-28 14:26:58+01:00, msvensson@pilot.blaudden +6 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Split out initial data in mysql_system_tables.sql to  it's own file
   - Use file from mysql_install_db and mysql-test-run

  mysql-test/mysql-test-run.pl@1.30.49.59, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +10 -4
    - Add mysql_system_tables_data.sql as part of the bootstrap
    - Remove the addition of pid to end of bootstrap.sql, now
      to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
    - Improve error message descibing how to find cause of a
      failed bootstrap

  scripts/Makefile.am@1.43.1.14, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +9 -7
    - Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
    - Build mysql_fix_privilege_tables from mysql_system_tables.sql and
      mysql_system_tables_fix.sql
    - Add mysql_system_tables_fix.sql to EXTRA_DIST

  scripts/mysql_install_db.sh@1.64.1.7, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +11 -1
    - Use mysql_system_tables_data.sql file when bootstrapping
      mysql, it will contain initial data for MysQL system tables

  scripts/mysql_system_tables.sql@1.1.1.3, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +0 -10
    Move initial data for system tables to it's own file

  scripts/mysql_system_tables_data.sql@1.1, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +13 -0
    Move initial data for system tables to it's own file

  scripts/mysql_system_tables_data.sql@1.0, 2007-02-28 14:26:57+01:00, msvensson@pilot.blaudden +0 -0

  scripts/mysql_system_tables_fix.sql@1.9.1.35, 2007-02-28 11:37:38+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql

ChangeSet@1.1810.2636.1, 2007-02-28 17:06:57+04:00, bar@mysql.com +11 -0
  Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)
  This patch fixes problem that LOAD DATA could use different
  character sets when loading files on master and on slave sides:
  - Adding replication of thd->variables.collation_database
  - Adding optional character set clause into LOAD DATA
  
  Note, the second way, with explicit CHARACTER SET clause
  should be the recommended way to load data using an alternative
  character set.
  The old way, using "SET @@character_set_database=xxx" should be
  gradually depricated.

  mysql-test/r/mysqlbinlog.result@1.25.3.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +58 -0
    Adding test case

  mysql-test/r/rpl_loaddata2.result@1.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +37 -0
    New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''

  mysql-test/r/rpl_loaddata2.result@1.0, 2007-02-28 17:06:54+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/r/rpl_loaddata2.result

  mysql-test/std_data/loaddata6.dat@1.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    New BitKeeper file ``mysql-test/std_data/loaddata6.dat''

  mysql-test/std_data/loaddata6.dat@1.0, 2007-02-28 17:06:54+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/std_data/loaddata6.dat

  mysql-test/t/mysqlbinlog.test@1.21.8.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +24 -0
    Adding test case

  mysql-test/t/rpl_loaddata2.test@1.1, 2007-02-28 17:06:55+04:00, bar@mysql.com +33 -0
    New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''

  mysql-test/t/rpl_loaddata2.test@1.0, 2007-02-28 17:06:55+04:00, bar@mysql.com +0 -0
    BitKeeper file /home/bar/mysql-5.0.b15126/mysql-test/t/rpl_loaddata2.test

  sql/log_event.cc@1.174.16.2, 2007-02-28 17:06:54+04:00, bar@mysql.com +44 -4
    Adding logging of thd->variables.collation_database

  sql/log_event.h@1.122.5.2, 2007-02-28 17:06:54+04:00, bar@mysql.com +4 -1
    Adding declarations

  sql/sql_class.cc@1.223.22.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    Exchange character set is null by default

  sql/sql_class.h@1.230.56.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +1 -0
    Adding character set into sql_exchange

  sql/sql_load.cc@1.78.7.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +2 -1
    - Using exchange character set (if it was specified in LOAD DATA syntax)
    - Using thd->variables.collation_database by default

  sql/sql_yacc.yy@1.371.97.1, 2007-02-28 17:06:54+04:00, bar@mysql.com +7 -0
    Adding optional character set clause into LOAD DATA syntax

ChangeSet@1.1810.2606.12, 2007-02-28 16:03:38+03:00, kostja@bodhi.local +1 -0
  Add more comments to open_table and open_tables. No real changes.

  sql/sql_base.cc@1.235.83.1, 2007-02-28 16:03:35+03:00, kostja@bodhi.local +111 -5
    Add more comments to open_table and open_tables. No real changes.

ChangeSet@1.1616.2971.21, 2007-02-28 13:47:41+01:00, msvensson@pilot.blaudden +1 -0
  When using a --mem=<dir> the memdir must be removed to assure
  afresh start

  mysql-test/mysql-test-run.pl@1.8.20.5, 2007-02-28 13:47:40+01:00, msvensson@pilot.blaudden +10 -0
    When using a --mem=<dir> the memdir must be removed to assure
    afresh start

ChangeSet@1.2409.71.10, 2007-02-28 15:44:57+04:00, gluh@mysql.com +1 -0
  added initialization of 'cmp_type' variable(to remove compiler warning)

  sql/item_cmpfunc.cc@1.248, 2007-02-28 15:44:55+04:00, gluh@mysql.com +1 -1
    added initialization of 'cmp_type' variable(to remove compiler warning)

ChangeSet@1.2409.66.2, 2007-02-28 14:27:19+04:00, svoj@mysql.com +3 -0
  BUG#26080 - Memory Storage engine not working properly
  
  Extending varchar column length with ALTER TABLE may result in unusable
  memory table.
  
  The problem is that we use fast ALTER TABLE in this case, which is not
  supported by now.
  
  This is fixed by refusing fast ALTER TABLE when extending varchar column.
  In other words force copy of a table during ALTER TABLE.
  
  Affects MEMORY tables in 5.1 only.

  mysql-test/r/heap.result@1.52, 2007-02-28 14:27:17+04:00, svoj@mysql.com +7 -0
    A test case for BUG#26080.

  mysql-test/t/heap.test@1.37, 2007-02-28 14:27:17+04:00, svoj@mysql.com +9 -0
    A test case for BUG#26080.

  storage/heap/ha_heap.cc@1.107.1.1, 2007-02-28 14:27:17+04:00, svoj@mysql.com +4 -3
    For MEMORY, if varchar column extended, it should return incompatible for
    now. In other words force copy of a table during alter table.

ChangeSet@1.1810.2635.1, 2007-02-28 11:23:00+01:00, joerg@trift2. +1 -0
  A binary package should also contain the "mysqld-debug" server (backport from 5.1).

  scripts/make_binary_distribution.sh@1.101.1.20, 2007-02-28 11:22:57+01:00, joerg@trift2. +2 -1
    A binary package should also contain the "mysqld-debug" server (backport from 5.1).

ChangeSet@1.1616.2971.20, 2007-02-28 10:52:51+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
   - Thanks to Christian for the patch!

  mysql-test/lib/mtr_process.pl@1.15.3.12, 2007-02-28 10:52:50+01:00, msvensson@pilot.blaudden +2 -8
    Avoid printout of "Hangup" when script exits by using
    POSIX::kill

ChangeSet@1.1616.2971.19, 2007-02-28 10:37:32+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
   - Add error handling for waitpid returns -1 for "simple run of command"

  mysql-test/lib/mtr_process.pl@1.15.3.11, 2007-02-28 10:37:31+01:00, msvensson@pilot.blaudden +20 -9
    - Add error handling for waitpid returns -1
    when a simple command is run.
    - Add missing return
    - Add mtr_errors where the program should never come 
    - Remove an else to improve program readability
    - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..." 

ChangeSet@1.2409.71.8, 2007-02-28 13:25:49+04:00, gluh@mysql.com +1 -0
  valgrind error fix

  sql/ha_partition.cc@1.83.1.2, 2007-02-28 13:25:48+04:00, gluh@mysql.com +6 -3
    valgrind error fix

ChangeSet@1.1616.2971.17, 2007-02-28 10:05:51+01:00, msvensson@pilot.blaudden +1 -0
  Use cygwin for --exec and --system in mysqltest for MySQL before 5.0

  client/mysqltest.c@1.92.21.49, 2007-02-28 10:05:50+01:00, msvensson@pilot.blaudden +5 -0
    Use cygwin for --exec and --system in mysqltest for MySQL before 5.0

ChangeSet@1.1616.2979.1, 2007-02-28 09:10:38+01:00, msvensson@pilot.blaudden +1 -0
  Bug#19410 Test 'kill' fails on Windows + SCO
  - Use "mysql_stmt_field_count" to determine if there is a need to
  call "mysql_stmt_store_result"

  client/mysqltest.c@1.92.26.1, 2007-02-28 09:10:37+01:00, msvensson@pilot.blaudden +2 -1
    Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
    greater than 0 indicating that this query has a result set.
    This change is mainly since if mysql_stmt_store_result fails
    the value returned by mysql_stmt_field_count will be reset.

ChangeSet@1.2409.67.15, 2007-02-27 20:57:46+01:00, lars@mysql.com +2 -0
  Fix of incorrect merge of test case

  mysql-test/r/rpl_user_variables.result@1.22, 2007-02-27 20:57:43+01:00, lars@mysql.com +0 -110
    Fix of incorrect merge of test case

  mysql-test/t/rpl_user_variables.test@1.21, 2007-02-27 20:57:43+01:00, lars@mysql.com +2 -301
    Fix of incorrect merge of test case

ChangeSet@1.2409.75.1, 2007-02-27 22:01:03+03:00, sergefp@mysql.com +4 -0
  BUG#26117 "index_merge sort-union over partitioned table crashes"
  Before the fix: 
    ha_partition objects had ha_partition::m_part_info==NULL and that caused
    crash
  After: 
  - The new ha_partition::clone() function makes the clones use parent's
    m_part_info value.
  - The parent ha_partition object remains responsible for deallocation of
    m_part_info.

  mysql-test/r/partition_innodb.result@1.2.1.1, 2007-02-27 22:00:59+03:00, sergefp@mysql.com +54 -0
    BUG#26117 "index_merge sort-union over partitioned table crashes"
     - Testcase

  mysql-test/t/partition_innodb.test@1.4, 2007-02-27 22:00:59+03:00, sergefp@mysql.com +58 -0
    BUG#26117 "index_merge sort-union over partitioned table crashes"
     - Testcase

  sql/ha_partition.cc@1.83.1.1, 2007-02-27 22:00:59+03:00, sergefp@mysql.com +17 -4
    BUG#26117 "index_merge sort-union over partitioned table crashes"
    Before the fix: 
      ha_partition objects had ha_partition::m_part_info==NULL and that caused
      crash
    After: 
    - The new ha_partition::clone() function makes the clones use parent's
      m_part_info value.
    - The parent ha_partition object remains responsible for deallocation of
      m_part_info.

  sql/ha_partition.h@1.32.1.1, 2007-02-27 22:00:59+03:00, sergefp@mysql.com +6 -0
    BUG#26117 "index_merge sort-union over partitioned table crashes"
    Before the fix: 
      ha_partition objects had ha_partition::m_part_info==NULL and that caused
      crash
    After: 
    - The new ha_partition::clone() function makes the clones use parent's
      m_part_info value.
    - The parent ha_partition object remains responsible for deallocation of
      m_part_info.

ChangeSet@1.2409.73.3, 2007-02-27 20:06:37+02:00, monty@mysql.com +2 -0
  Fix (last) compiler warnings

  storage/innobase/pars/lexyy.c@1.23, 2007-02-27 20:06:36+02:00, monty@mysql.com +1 -1
    Fix compiler warnings (fix is also in pars0lex.l)

  support-files/compiler_warnings.supp@1.9, 2007-02-27 20:06:36+02:00, monty@mysql.com +1 -0
    Extra safety to ensure we really get rid of warning :)

ChangeSet@1.2409.73.2, 2007-02-27 19:31:49+02:00, monty@mysql.com +12 -0
  Remove compiler warnings

  mysql-test/mysql-test-run.pl@1.270.1.3, 2007-02-27 19:31:46+02:00, monty@mysql.com +15 -15
    Fix warning when using --extern

  server-tools/instance-manager/user_map.cc@1.26, 2007-02-27 19:31:46+02:00, monty@mysql.com +4 -4
    Remove compiler warnings

  sql/field.cc@1.372.1.2, 2007-02-27 19:31:46+02:00, monty@mysql.com +3 -5
    Fix wrong fix

  sql/ha_ndbcluster.cc@1.411.1.5, 2007-02-27 19:31:46+02:00, monty@mysql.com +28 -20
    Better fixes to remove compiler warnings

  sql/ha_ndbcluster_binlog.cc@1.102.1.2, 2007-02-27 19:31:46+02:00, monty@mysql.com +6 -2
    Better fixes to remove compiler warnings

  sql/log.cc@1.253.5.2, 2007-02-27 19:31:46+02:00, monty@mysql.com +1 -1
    Fix compiler warnings

  sql/sql_parse.cc@1.626.2.3, 2007-02-27 19:31:47+02:00, monty@mysql.com +3 -1
    Indentation fix

  sql/sql_table.cc@1.393, 2007-02-27 19:31:47+02:00, monty@mysql.com +5 -3
    Indentation fixes

  storage/myisammrg/ha_myisammrg.cc@1.114.1.3, 2007-02-27 19:31:47+02:00, monty@mysql.com +3 -4
    Fix compiler warnings

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.83, 2007-02-27 19:31:47+02:00, monty@mysql.com +2 -1
    Fix compiler warnings

  support-files/compiler_warnings.supp@1.8, 2007-02-27 19:31:47+02:00, monty@mysql.com +14 -3
    Suppress all 'safe' warnings, as detected by win64

  win/README@1.8, 2007-02-27 19:31:47+02:00, monty@mysql.com +1 -1
    Fixed typo

ChangeSet@1.2409.67.12, 2007-02-27 11:36:17-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#20141 "User-defined variables are not replicated properly for 
            SF/Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
            correctly"
  
  This patch corrects a minor error in the previous patch for BUG#20141. This patch
  corrects an errant code change to sp_head.cc. The comments for the first patch follow:
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.
  

  sql/sp_head.cc@1.252.1.2, 2007-02-27 11:35:41-05:00, cbell@mysql_cab_desk. +1 -1
    BUG#20141 "User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode."
    
    This patch corrects a minor error in the previous patch for BUG#20141. The code:
    
    q= ::query_id; 
    
    was an errant line of code that was not intended to be in the patch. Instead, the
    correct line of code is:
    
    q= global_query_id;

ChangeSet@1.2409.74.1, 2007-02-27 16:58:40+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
   - my_time_t is defined as long which means it will not always be the
  same size as time_t. See explanation in include/my_time.h

  sql/event_queue.cc@1.23.1.1, 2007-02-27 16:58:38+01:00, msvensson@pilot.blaudden +0 -7
    No need to require that "sizeof(time_t) == sizeof(my_time_t)"

ChangeSet@1.1810.2631.1, 2007-02-27 10:32:45-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#20141 "User-defined variables are not replicated properly for 
            SF/Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
            correctly"
  
  This patch corrects a minor error in the previous patch for BUG#20141. This patch
  corrects an errant code change to sp_head.cc. The comments for the first patch follow:
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.

  sql/sp_head.cc@1.200.7.10, 2007-02-27 10:32:40-05:00, cbell@mysql_cab_desk. +1 -1
    BUG#20141 "User-defined variables are not replicated properly for 
              SF/Triggers in SBR mode."
    
    This patch corrects a minor error in the previous patch for BUG#20141. The code:
    
    q= ::query_id; 
    
    was an errant line of code that was not intended to be in the patch. Instead, the
    correct line of code is:
    
    q= global_query_id;

ChangeSet@1.1810.2548.57, 2007-02-27 15:28:19+01:00, msvensson@pilot.blaudden +1 -0
  Bug#23669 mysql.proc not created in default install
   - Remove DEFAULT values for blob's in mysql_system_tables.sql

  scripts/mysql_system_tables.sql@1.1.1.2, 2007-02-27 15:28:18+01:00, msvensson@pilot.blaudden +1 -1
    Remove attempt to set default value for blob columns since
    they can't have any. Depending on 'sql_mode' the default values
    has either been silently dropped or thrown an error as reported
    by the bug. 

ChangeSet@1.1810.2630.1, 2007-02-27 14:18:12+01:00, msvensson@pilot.blaudden +2 -0
  Bug#26678 SSL tests fail on win64
   - Import a patch from yaSSL CVS that uses "word" instead
  of "unsigned long" in three function's that uses sizeof to find
  out the word size being used. NOTE! long is 32 bit also on 
  64 bit windows.

  extra/yassl/taocrypt/include/misc.hpp@1.17, 2007-02-27 12:05:12+01:00, msvensson@pilot.blaudden +3 -3
    Import patch yassl.diff

  extra/yassl/taocrypt/src/misc.cpp@1.20, 2007-02-27 12:05:13+01:00, msvensson@pilot.blaudden +3 -3
    Import patch yassl.diff

ChangeSet@1.1810.2612.6, 2007-02-27 14:10:27+01:00, msvensson@pilot.blaudden +1 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Escape undercore character in mysql.db to only allow
    access test_% and not test%

  scripts/mysql_system_tables.sql@1.1.1.1, 2007-02-27 14:10:26+01:00, msvensson@pilot.blaudden +1 -1
    underscore is a wildcard character so it need to be
    expaed to only match one _

ChangeSet@1.2409.55.5, 2007-02-27 11:39:29+01:00, msvensson@pilot.blaudden +3 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Updates for 5.1

  mysql-test/t/lock_multi.test@1.29, 2007-02-27 11:39:27+01:00, msvensson@pilot.blaudden +6 -0
    Test need anonymous users

  mysql-test/t/rpl_temporary.test@1.28.1.2, 2007-02-27 11:39:27+01:00, msvensson@pilot.blaudden +5 -0
    Test need anonymous users

  scripts/mysql_system_tables.sql@1.2, 2007-02-27 11:39:27+01:00, msvensson@pilot.blaudden +31 -9
    Update mysql_system_tables.sql for 5.1

ChangeSet@1.2409.73.1, 2007-02-27 11:27:04+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +12 -0
  Fixes for compiler warnings.

  include/my_dbug.h@1.26, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Added macro for fixing compiler warnings.

  sql/field.cc@1.372.1.1, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Fixed compiler warnings.

  sql/ha_ndbcluster.cc@1.411.1.4, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +20 -13
    Fixed compiler warnings.

  sql/ha_ndbcluster_binlog.cc@1.102.1.1, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +71 -64
    Fixed compiler warnings.
    Changed some tabs into spaces.

  sql/rpl_injector.h@1.9, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Fixed compiler warnings.

  sql/sql_binlog.cc@1.9, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed compiler warnings.

  sql/sql_repl.cc@1.161, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Fixed compiler warnings.

  sql/sql_table.cc@1.392, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed compiler warnings.

  storage/myisammrg/ha_myisammrg.cc@1.114.1.2, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -0
    Fixed compiler warnings.

  strings/ctype-ucs2.c@1.68, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Fixed compiler warnings.

  strings/ctype-utf8.c@1.112, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -0
    Fixed compiler warnings.

  support-files/compiler_warnings.supp@1.7, 2007-02-27 11:27:00+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -2
    Added suppressed warnings.

ChangeSet@1.1810.2604.10, 2007-02-27 12:37:17+04:00, gluh@mysql.com +1 -0
  removed unused variable

  sql/sql_select.cc@1.312.1.183, 2007-02-27 12:37:15+04:00, gluh@mysql.com +0 -1
    removed unused variable

ChangeSet@1.2409.71.5, 2007-02-27 12:16:41+04:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/r/binlog_row_blackhole.result@1.10, 2007-02-27 12:16:40+04:00, gluh@mysql.com +11 -0
    after merge fix

ChangeSet@1.1810.2629.1, 2007-02-27 11:01:58+04:00, ramil@mysql.com +2 -0
  Fix for bug #25834: Test failure in "func_group"
  
  Round the results of std() for some calls with double arguments
  to avoid double math precision problems.

  mysql-test/r/func_group.result@1.49.1.10, 2007-02-27 11:01:57+04:00, ramil@mysql.com +15 -15
    Fix for bug #25834: Test failure in "func_group"
    
    Round the results of std() for some calls with double arguments
    to avoid double math precision problems.

  mysql-test/t/func_group.test@1.48.1.6, 2007-02-27 11:01:57+04:00, ramil@mysql.com +3 -3
    Fix for bug #25834: Test failure in "func_group"
    
    Round the results of std() for some calls with double arguments
    to avoid double math precision problems.

ChangeSet@1.1616.2881.53, 2007-02-26 20:35:28+01:00, gbichot@dl145h.mysql.com +1 -0
  Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent
  to the client only after the binlog write and engine commit.
  No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
  which we cannot do in the testsuite. But, I tested by hand.

  sql/sql_load.cc@1.46.3.43, 2007-02-26 20:33:55+01:00, gbichot@dl145h.mysql.com +3 -1
    D in ACID means that once the client got the ok from the server, the data
    is durable on disk. Implies that the ok must be sent after the binlog write
    and after the engine commit, not before.

ChangeSet@1.2390.27.1, 2007-02-26 14:06:10-05:00, cbell@mysql_cab_desk. +7 -0
  BUG#20141 "User-defined variables are not replicated properly for 
            SF/Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
            correctly"
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.
  

  mysql-test/r/rpl_user_variables.result@1.20, 2007-02-26 14:05:59-05:00, cbell@mysql_cab_desk. +174 -0
    BUG#20141 - User-defined variables are not replicated properly for 
                SF/Triggers in SBR mode.
    This patch adds the correct results for execution of the added test 
    procedures to the rpl_user_variables test.

  mysql-test/t/rpl_user_variables.test@1.19, 2007-02-26 14:06:00-05:00, cbell@mysql_cab_desk. +297 -0
    BUG#20141 - User-defined variables are not replicated properly for 
                SF/Triggers in SBR mode.
    This patch adds additional tests to the rpl_user_variables test that test 
    many of the different ways user-defined variables can be required to be 
    replicated.

  sql/item_func.cc@1.347.3.1, 2007-02-26 14:06:00-05:00, cbell@mysql_cab_desk. +8 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers
                in SBR mode.
    To properly log accesses to user-defined variables from stored 
    functions/triggers, the get_var_with_binlog() method needs to log references 
    to such variables even from non-table-updating statements within them.

  sql/log.cc@1.255.1.1, 2007-02-26 14:06:01-05:00, cbell@mysql_cab_desk. +2 -2
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers 
                in SBR mode.
    This patch modifies the start_union_events method to accept the query id from 
    a parameter. This allows callers to set the query_id to the id of the sub 
    statement such as a trigger or stored function. Which permits the code to 
    identify when a user defined variable has been used by the statement and this 
    already present in THD::user_var_event.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the 
    proper replication of access to user-defined variables under a special test 
    case (the last case shown in rpl_user_variables.test).
    

  sql/log.h@1.21.1.1, 2007-02-26 14:06:01-05:00, cbell@mysql_cab_desk. +1 -1
    BUG#20141 - User-defined variables are not replicated properly for 
                SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to 
    mysql_bin_log.start_union_events().

  sql/sp_head.cc@1.250.2.1, 2007-02-26 14:06:02-05:00, cbell@mysql_cab_desk. +17 -1
    BUG#20141 - User-defined variables are not replicated properly for 
                SF/Triggers in SBR mode.
    This patch modifies the code to allow for cases where events for function calls
    have a separate union for each event and thus cannot use the query_id of the 
    caller as the start of the union. Thus, we use an artifically created query_id
    to set the start of the events.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the 
    proper replication of access to user-defined variables under a special test 
    case (the last case shown in rpl_user_variables.test).
    

  sql/sql_class.cc@1.306.1.1, 2007-02-26 14:06:03-05:00, cbell@mysql_cab_desk. +9 -0
    BUG#20141 - User-defined variables are not replicated properly for 
                SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to 
    mysql_bin_log.start_union_events().
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow 
    the proper replication of access to user-defined variables under a special 
    test case (the last case shown in rpl_user_variables.test).

ChangeSet@1.2409.67.10, 2007-02-26 18:05:08+01:00, mats@romeo.(none) +3 -0
  Eliminating compiler warnings in the sql/ directory.

  sql/log.cc@1.260, 2007-02-26 18:05:04+01:00, mats@romeo.(none) +5 -5
    Eliminating some warning from incompatible arguments to DBUG_PRINT().

  sql/log_event.cc@1.266.1.5, 2007-02-26 18:05:04+01:00, mats@romeo.(none) +1 -2
    Eliminating unused auto variable.

  sql/sql_insert.cc@1.246.1.6, 2007-02-26 18:05:05+01:00, mats@romeo.(none) +1 -1
    Eliminating some warning from incompatible arguments to DBUG_PRINT().

ChangeSet@1.2403.13.2, 2007-02-26 23:52:11+07:00, tomas@poseidon.mysql.com +1 -0
  corrected manual merge

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.57.2.1, 2007-02-26 23:52:04+07:00, tomas@poseidon.mysql.com +2 -1
    corrected manual merge

ChangeSet@1.2409.67.9, 2007-02-26 17:44:55+01:00, mats@romeo.(none) +4 -0
  BUG#26634 (Valgrind failure in tree: memory loss for memory allocated in rpl_utility.h):
  Adding code to release allocated memory when tables_to_lock list is
  cleared.

  sql/log_event.cc@1.266.1.4, 2007-02-26 17:44:47+01:00, mats@romeo.(none) +10 -4
    Using RPL_TABLE_LIST instead of TABLE_LIST for tables_to_lock.

  sql/rpl_rli.cc@1.5, 2007-02-26 17:44:48+01:00, mats@romeo.(none) +20 -0
    Moving st_relay_log_info::clear_tables_to_lock() into rpl_rli.cc.
    Adding code to release memory allocated for saved table definition.

  sql/rpl_rli.h@1.9, 2007-02-26 17:44:48+01:00, mats@romeo.(none) +4 -11
    Moving st_relay_log_info::clear_tables_to_lock() into rpl_rli.cc.
    Using RPL_TABLE_LIST instead of TABLE_LIST for tables_to_lock.

  sql/rpl_utility.h@1.6, 2007-02-26 17:44:48+01:00, mats@romeo.(none) +4 -0
    Adding forward declarations.
    Adding boolean to tell if tabledef is valid.

ChangeSet@1.2409.72.1, 2007-02-26 17:06:10+01:00, df@pippilotta.erinye.com +1 -0
  BUG#20013 No pentium_cflags in SETUP.sh
  ---
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-20013
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
  ---
  reorder lines from BUG#20013 to resemble order in 5.0 

  BUILD/SETUP.sh@1.73, 2007-02-26 17:06:09+01:00, df@pippilotta.erinye.com +1 -0
    BUG#20013 No pentium_cflags in SETUP.sh
    ---
    reorder lines from BUG#20013 to resemble order in 5.0 

ChangeSet@1.2409.71.4, 2007-02-26 19:49:24+04:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/mix2_myisam.result@1.4.1.1, 2007-02-26 19:49:22+04:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/update.result@1.34, 2007-02-26 19:49:22+04:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.1616.2971.16, 2007-02-26 14:52:51+01:00, msvensson@pilot.blaudden +1 -0
  Only allow a version number to be read from "/etc/debian_version"

  mysql-test/mysql-test-run.pl@1.8.20.4, 2007-02-26 14:52:50+01:00, msvensson@pilot.blaudden +1 -1
    Only allow a version number to be read from "/etc/debian_version"

ChangeSet@1.1810.2612.5, 2007-02-26 14:49:41+01:00, msvensson@pilot.blaudden +1 -0
  Remove another spurious "

  scripts/mysql_fix_privilege_tables.sql.in@1.9.1.34, 2007-02-26 14:49:40+01:00, msvensson@pilot.blaudden +1 -1
    Remove another spurious "

ChangeSet@1.1810.2612.4, 2007-02-26 14:48:41+01:00, msvensson@pilot.blaudden +1 -0
  Remove spurious "

  scripts/mysql_fix_privilege_tables.sql.in@1.9.1.33, 2007-02-26 14:48:40+01:00, msvensson@pilot.blaudden +1 -1
    Remove spurious "

ChangeSet@1.2409.43.7, 2007-02-26 16:52:54+04:00, gluh@mysql.com +5 -0
  after merge fix

  mysql-test/r/insert_select.result@1.48, 2007-02-26 16:52:52+04:00, gluh@mysql.com +0 -14
    after merge fix

  mysql-test/r/subselect.result@1.164.1.2, 2007-02-26 16:52:52+04:00, gluh@mysql.com +6 -6
    after merge fix

  mysql-test/t/insert_select.test@1.39, 2007-02-26 16:52:52+04:00, gluh@mysql.com +0 -13
    after merge fix

  mysql-test/t/subselect.test@1.143.1.2, 2007-02-26 16:52:52+04:00, gluh@mysql.com +1 -3
    after merge fix

  sql/sql_insert.cc@1.246.3.2, 2007-02-26 16:52:52+04:00, gluh@mysql.com +4 -2
    after merge fix

ChangeSet@1.1810.2628.1, 2007-02-26 15:25:43+04:00, bar@mysql.com +5 -0
  Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters
  Problem: DROP TRIGGER was not properly handled in combination
  with slave filters, which made replication stop
  Fix: loading table name before checking slave filters when
  dropping a trigger.

  mysql-test/r/rpl_replicate_do.result@1.30.1.4, 2007-02-26 15:25:40+04:00, bar@mysql.com +34 -0
    Adding test case

  mysql-test/t/rpl_replicate_do.test@1.22.1.4, 2007-02-26 15:25:40+04:00, bar@mysql.com +32 -0
    Adding test case

  sql/sql_parse.cc@1.426.142.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +25 -0
    Loading table name when dropping a trigger
    before checking slave filtering rules.

  sql/sql_trigger.cc@1.35.17.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +1 -5
    Making add_table_for_trigger() public

  sql/sql_trigger.h@1.19.4.1, 2007-02-26 15:25:40+04:00, bar@mysql.com +4 -0
    Making add_table_for_trigger() public

ChangeSet@1.1810.2612.3, 2007-02-26 11:49:24+01:00, msvensson@pilot.blaudden +31 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Use mysql_system_tables.sql to create MySQL system tables in
     all places where we create them(mysql_install_db, mysql-test-run-pl
     and mysql_fix_privilege_tables.sql)

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@1.14.1.1, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8

  BitKeeper/deleted/.del-init_db.sql@1.4.1.1, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql

  BitKeeper/deleted/.del-mysql_create_system_tables.sh@1.12.1.19, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh

  BitKeeper/etc/ignore@1.210.13.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -0
    Added scripts/mysql_fix_privilege_tables.sql to the ignore list

  mysql-test/Makefile.am@1.66.1.20, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -2
    lib/init_db.sql has been removed

  mysql-test/include/add_anonymous_users.inc@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +7 -0
    New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''

  mysql-test/include/add_anonymous_users.inc@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/include/delete_anonymous_users.inc@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +5 -0
    New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''

  mysql-test/include/delete_anonymous_users.inc@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/mysql-test-run.pl@1.30.49.57, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +37 -34
    - Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
    mysql_test_data_timezone.sql and fill_help_tables.sql and use
    it when bootsraping the system tables to use during test. 

  mysql-test/r/create.result@1.107.1.17, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -0
    Update result file

  mysql-test/r/derived.result@1.58, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -0
    Update result file

  mysql-test/r/join.result@1.38.1.3, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Update result file

  mysql-test/r/mysql_upgrade.result@1.1.1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -30
    Update result file

  mysql-test/r/sp-security.result@1.25.1.7, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -3
    Update result file

  mysql-test/t/create.test@1.71.1.13, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -1
    Add user mysqltest_1 before trying to connect as that user - no
    anon users by default anymore

  mysql-test/t/derived.test@1.53, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -1
    Add user mysqltest_1 before trying to connect as that user - no
    anon users by default anymore

  mysql-test/t/grant2.test@1.31.2.7, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +4 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/grant_cache.test@1.18, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/init_connect.test@1.5.1.4, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +4 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/lock_multi.test@1.13.1.9, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +6 -0
    Add anonymous users for part of thes that need it.

  mysql-test/t/ndb_basic.test@1.32.1.6, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +3 -3
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/ndb_index_ordered.test@1.25.1.3, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -2
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/ndb_multi.test@1.5.1.6, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +2 -2
    Connect as "root", blank user will take currently logged in
    username

  mysql-test/t/overflow.test@1.9, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Connect as root - no anonymous users by default anymore

  mysql-test/t/rpl_temporary.test@1.15.3.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +8 -2
    Add anonymous users for the test

  mysql-test/t/xa.test@1.8, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -1
    Connect as "root", blank user wil pick currently logged in user

  scripts/Makefile.am@1.43.1.13, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +16 -6
    Remove mysql_create_system_tables.sh
    Add mysql_system_tables.sql and mysql_test_data_timezone.sql
    Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
    and mysql_fix_privilege_tables.sql.in

  scripts/mysql_fix_privilege_tables.sh@1.35.1.3, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +1 -5
    Update message describing what the script does

  scripts/mysql_install_db.sh@1.64.1.6, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +120 -81
    Use mysql_system_tables.sql to create the MySQL system tables
    Update comments and indentation
    Add more descriptive comments about --windows switch
    Reduce number of hardcoded names for the SQL files the script
    looks for

  scripts/mysql_system_tables.sql@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +65 -0
    New BitKeeper file ``scripts/mysql_system_tables.sql''

  scripts/mysql_system_tables.sql@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

  scripts/mysql_fix_privilege_tables.sql.in@1.9.1.32, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +43 -222
    Remove the part that creates system tables as that will be added to
    mysql_fix_privileg_tables.sql from mysql_system_tables.sql
    Change all comments to use # 

  scripts/mysql_fix_privilege_tables.sql.in@1.9.1.31, 2007-02-26 11:48:43+01:00, msvensson@pilot.blaudden +0 -0
    Rename: scripts/mysql_fix_privilege_tables.sql -> scripts/mysql_fix_privilege_tables.sql.in

  scripts/mysql_test_data_timezone.sql@1.1, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +5 -0
    New BitKeeper file ``scripts/mysql_test_data_timezone.sql''

  scripts/mysql_test_data_timezone.sql@1.0, 2007-02-26 11:49:23+01:00, msvensson@pilot.blaudden +0 -0

ChangeSet@1.2390.26.1, 2007-02-26 10:19:08+01:00, mats@romeo.(none) +8 -0
  BUG#25091 (A DELETE statement to mysql database is not logged in ROW format):
  With this patch, statements that change metadata (in the mysql database)
  is logged as statements, while normal changes (e.g., using INSERT, DELETE,
  and/or UPDATE) is logged according to the format in effect.
  
  The log tables (i.e., general_log and slow_log) are not replicated at all.
  
  With this patch, the following statements are replicated as statements:
  GRANT, REVOKE (ALL), CREATE USER, DROP USER, and RENAME USER.

  mysql-test/extra/binlog_tests/binlog.test@1.16, 2007-02-26 10:19:04+01:00, mats@romeo.(none) +13 -0
    Added test to check that normal INSERT, DELETE, and UPDATE to a table in
    the mysql database is replicated both under row-based and statement-based
    replication.

  mysql-test/r/binlog_row_binlog.result@1.11, 2007-02-26 10:19:04+01:00, mats@romeo.(none) +17 -0
    Result change.

  mysql-test/r/binlog_stm_binlog.result@1.18, 2007-02-26 10:19:04+01:00, mats@romeo.(none) +11 -0
    Result change.

  sql/handler.cc@1.290.1.1, 2007-02-26 10:19:04+01:00, mats@romeo.(none) +1 -1
    Removed hardcoded check for mysql database.
    Added table-specific flag for non-replication (used by log tables).

  sql/log.cc@1.253.6.1, 2007-02-26 10:19:04+01:00, mats@romeo.(none) +1 -0
    Adding flag that a table shall not be replicated and set it for log
    tables.

  sql/sp.cc@1.136.2.1, 2007-02-26 10:19:05+01:00, mats@romeo.(none) +21 -0
    Turning row-based replication off for statements that change metadata.

  sql/sql_acl.cc@1.228.2.1, 2007-02-26 10:19:05+01:00, mats@romeo.(none) +56 -0
    Turning row-based replication off for statements that change metadata.

  sql/table.h@1.157.1.1, 2007-02-26 10:19:05+01:00, mats@romeo.(none) +5 -0
    Adding flag that a table shall not be replicated.

ChangeSet@1.1810.2548.53, 2007-02-26 09:24:03+01:00, msvensson@pilot.blaudden +1 -0
  Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows

  mysql-test/t/trigger-grant.test@1.1.1.8, 2007-02-26 09:24:02+01:00, msvensson@pilot.blaudden +2 -0
    Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows

ChangeSet@1.1810.2548.52, 2007-02-26 09:16:22+01:00, msvensson@pilot.blaudden +2 -0
  Workaround non portable use of "grep" and "cut" by loading the whole processlist
  into temporary table and selecting the correct row with SQL

  mysql-test/include/get_binlog_dump_thread_id.inc@1.4, 2007-02-26 09:16:21+01:00, msvensson@pilot.blaudden +16 -3
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

  mysql-test/r/rpl_temporary.result@1.18.1.9, 2007-02-26 09:16:21+01:00, msvensson@pilot.blaudden +10 -1
    Workaround non portable use of "grep" and "cut" by loading the whole processlist
    into temporary table and selecting the correct row with SQL

ChangeSet@1.1810.2604.8, 2007-02-26 08:11:10+01:00, knielsen@ymer.(none) +1 -0
  Compiler warning suppression fix: Add missing file to 'make dist'.

  support-files/Makefile.am@1.34.1.1, 2007-02-26 08:11:07+01:00, knielsen@ymer.(none) +2 -1
    Add missing file to 'make dist'.

ChangeSet@1.1810.2598.8, 2007-02-26 09:01:43+03:00, evgen@sunlight.local +2 -0
  item.cc, item.h:
    Post fix for bug#23800.

  sql/item.cc@1.113.71.4, 2007-02-26 09:00:57+03:00, evgen@sunlight.local +1 -0
    Post fix for bug#23800.

  sql/item.h@1.183.16.11, 2007-02-26 09:00:36+03:00, evgen@sunlight.local +0 -1
    Post fix for bug#23800.

ChangeSet@1.1810.2598.7, 2007-02-25 23:02:11+03:00, evgen@sunlight.local +1 -0
  item.h:
    Post fix for bug#23800.
    Copy the table name of an Item_outer_ref to the conventional memory.

  sql/item.h@1.183.16.10, 2007-02-25 23:01:05+03:00, evgen@sunlight.local +1 -0
    Post fix for bug#23800.
    Copy the table name of an Item_outer_ref to the conventional memory.

ChangeSet@1.1810.2627.3, 2007-02-25 00:31:26+01:00, lars@mysql.com +1 -0
  log_on needed also in embedded server

  sql/sql_insert.cc@1.146.1.72, 2007-02-25 00:31:24+01:00, lars@mysql.com +0 -2
    log_on needed also in embedded server

ChangeSet@1.1810.2626.1, 2007-02-24 23:04:15+03:00, evgen@moonbone.local +4 -0
  item.cc:
    Post fix for bug#23800.
    The Item_field constructor now increases the select_n_where_fields counter.
  sql_yacc.yy:
    Post fix for bug#23800.
    Take into account fields that might be added by subselects.
  sql_lex.h:
    Post fix for bug#23800.
    Added the select_n_where_fields variable to the st_select_lex class.
  sql_lex.cc:
    Post fix for bug#23800.
    Initialization of the select_n_where_fields variable.

  sql/item.cc@1.113.71.3, 2007-02-24 23:00:46+03:00, evgen@moonbone.local +3 -0
    Post fix for bug#23800.
    The Item_field constructor now increases the select_n_where_fields counter.

  sql/sql_lex.cc@1.142.37.2, 2007-02-24 22:55:10+03:00, evgen@moonbone.local +2 -0
    Post fix for bug#23800.
    Initialization of the select_n_where_fields variable.

  sql/sql_lex.h@1.175.36.2, 2007-02-24 22:58:14+03:00, evgen@moonbone.local +5 -0
    Post fix for bug#23800.
    Added the select_n_where_fields variable to the st_select_lex class.

  sql/sql_yacc.yy@1.371.96.2, 2007-02-24 23:02:49+03:00, evgen@moonbone.local +6 -0
    Post fix for bug#23800.
    Take into account fields that might be added by subselects.

ChangeSet@1.2409.69.6, 2007-02-24 19:51:45+01:00, mats@romeo.(none) +1 -0
  Fixes to make it compile on Windows.

  sql/log_event.cc@1.266.2.3, 2007-02-24 19:51:41+01:00, mats@romeo.(none) +1 -1
    The type byte is not equivalent to char on Windows, so compile fails.

ChangeSet@1.2409.69.5, 2007-02-24 17:33:58+01:00, mats@romeo.(none) +1 -0
  Changes to fix building on Windows.

  include/my_global.h@1.157.2.2, 2007-02-24 17:33:51+01:00, mats@romeo.(none) +2 -6
    Using Standard C++ header file <new> instead of defining all the versions
    of operator new and operator delete ourself.

ChangeSet@1.2409.70.1, 2007-02-24 16:35:15+01:00, gbichot@dl145h.mysql.com +1 -0
  rpl_insert_delayed.test:
    fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.4, 2007-02-24 16:34:21+01:00, gbichot@dl145h.mysql.com +2 -2
    fix after merge: server now returns ER_DUP_ENTRY_WITH_KEY_NAME, not ER_DUP_ENTRY

ChangeSet@1.2390.25.1, 2007-02-24 14:33:45+01:00, mats@romeo.(none) +1 -0
  BUG#26286 (row-based logging scales worse than statement-based logging):
  Submitting patch on Guilhem's behalf (he found the solution).
    
  Correcting a typo that caused very big increases in memory usage when
  more memory needed to be allocated for row-based events. Also correcting
  a border case check when more memory needed to be allocated.

  sql/log_event.cc@1.262.3.1, 2007-02-24 14:33:40+01:00, mats@romeo.(none) +3 -3
    Correcting typo that caused very big increases in memory allocation.
    Correcting border case for when more memory should be allocated.

ChangeSet@1.2409.69.2, 2007-02-24 12:30:15+01:00, lars@mysql.com +1 -0
  log_on variable needed also in embedded library

  sql/sql_insert.cc@1.246.2.2, 2007-02-24 12:30:12+01:00, lars@mysql.com +0 -2
    log_on variable needed also in embedded library

ChangeSet@1.2442, 2007-02-24 13:41:59+03:00, anozdrin@booka.opbmk +1 -0
  Remove DBUG_ASSERT() -- essential functionality can not be
  wrapped by DBUG_ASSERT().

  server-tools/instance-manager/angel.cc@1.6, 2007-02-24 13:41:56+03:00, anozdrin@booka.opbmk +8 -8
    Remove DBUG_ASSERT() -- essential functionality can not be
    wrapped by DBUG_ASSERT().

ChangeSet@1.2441, 2007-02-24 13:37:13+03:00, anozdrin@booka.opbmk +1 -0
  Fix merge.

  server-tools/instance-manager/angel.cc@1.5, 2007-02-24 13:37:10+03:00, anozdrin@booka.opbmk +6 -0
    Fix merge.

ChangeSet@1.1810.2606.11, 2007-02-24 13:18:09+03:00, anozdrin@booka.opbmk +1 -0
  Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdown

  server-tools/instance-manager/mysqlmanager.cc@1.17.1.4, 2007-02-24 13:18:06+03:00, anozdrin@booka.opbmk +4 -0
    Delete IM-angel pid file on exit.

ChangeSet@1.1810.2606.10, 2007-02-24 13:12:20+03:00, anozdrin@booka.opbmk +4 -0
  IM test suite fix.
  
  Log messages from shell-scripts were put to var/log/<test id>.log
  file. Now, this file is used by mysql-test-run.pl. So, move log
  messages to var/log/<test id>.script.log.

  mysql-test/t/kill_n_check.sh@1.6, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/log.sh@1.3, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/wait_for_process.sh@1.3, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

  mysql-test/t/wait_for_socket.sh@1.4, 2007-02-24 13:12:18+03:00, anozdrin@booka.opbmk +1 -1
    Log messages from shell-scripts were put to var/log/<test id>.log
    file. Now, this file is used by mysql-test-run.pl. So, move log
    messages to var/log/<test id>.script.log.

ChangeSet@1.1810.2606.9, 2007-02-24 13:10:04+03:00, anozdrin@booka.opbmk +2 -0
  Fix shutdown delay option name according to The Manual.

  mysql-test/mysql-test-run.pl@1.30.76.3, 2007-02-24 13:09:58+03:00, anozdrin@booka.opbmk +1 -1
    Fix shutdown delay option name according to The Manual.

  server-tools/instance-manager/instance_options.cc@1.29.2.2, 2007-02-24 13:09:58+03:00, anozdrin@booka.opbmk +1 -1
    Fix shutdown delay option name according to The Manual.

ChangeSet@1.2409.1.58, 2007-02-24 08:19:37+01:00, msvensson@pilot.blaudden +1 -0
  Link comp_err with zlib

  extra/CMakeLists.txt@1.12, 2007-02-24 08:19:36+01:00, msvensson@pilot.blaudden +1 -1
    Link comp_err with zlib

ChangeSet@1.1810.2548.51, 2007-02-24 08:18:57+01:00, msvensson@pilot.blaudden +1 -0
  Replace non portable system commmands in trigger-grant

  mysql-test/t/trigger-grant.test@1.1.1.7, 2007-02-24 08:18:56+01:00, msvensson@pilot.blaudden +13 -3
    Replace non portable system commmands in trigger-grant

ChangeSet@1.2409.67.4, 2007-02-24 04:22:34+02:00, monty@mysql.com +2 -0
  Fixed windows compilation problems

  extra/yassl/taocrypt/mySTL/algorithm.hpp@1.3, 2007-02-24 04:22:31+02:00, monty@mysql.com +2 -0
    max is defined on windows

  sql/sql_list.h@1.45, 2007-02-24 04:22:31+02:00, monty@mysql.com +2 -0
    Fixed compiler warning on windows

ChangeSet@1.2390.1.23, 2007-02-23 22:23:54+01:00, gbichot@dl145h.mysql.com +6 -0
  Fix for BUG#25628: "mysqlbinlog crashes while processing binary logs".
  mysqlbinlog prints all row-based events of a single statement as a
  single "BINLOG" statement containing the concatenation of those events.
  Big (i.e. >64k) concatenations of row-based events
  (e.g. Write_rows_log_event) caused mysqlbinlog's IO_CACHE to overflow
  to a temporary file but the IO_CACHE had not been inited with
  open_cached_file(), so it tried to create a temporary file in
  an uninitialized directory (thus failing to create, then to write;
  some OS errors were printed, and it finally segfaulted).
  After fixing this, it appeared that mysqlbinlog was printing only
  a piece of big concatenations of row-based events (it printed
  at most the size of the IO_CACHE's buffer i.e. 64k); that caused data
  loss at restore. We fix and test that.
  Last, mysqlbinlog's printouts looked a bit strange with the informative
  header (#-prefixed) of groupped Rows_log_event all on one line,
  so we insert \n. After that, a small bug in the --hexdump code appeared
  (only if the string to hex-print had its length a multiple of 16),
  we fix it.
  

  client/mysqlbinlog.cc@1.143.1.1, 2007-02-23 22:19:09+01:00, gbichot@dl145h.mysql.com +5 -5
    if we write to IO_CACHE more than can fit into its memory buffer,
    it will try to overflow into a file; for that to work, IO_CACHE
    must be inited via open_cached_file().

  mysql-test/r/mysqlbinlog_base64.result@1.4, 2007-02-23 22:19:55+01:00, gbichot@dl145h.mysql.com +20 -0
    result update

  mysql-test/t/mysqlbinlog_base64.test@1.4, 2007-02-23 22:20:11+01:00, gbichot@dl145h.mysql.com +28 -0
    test for BUG#25628: test that mysqlbinlog does not have OS errors
    with big concatenations of row-based events
    (e.g. Write_rows_log_event), and prints those concatenations entirely
    (testing by piping the output back into the server and comparing data).

  mysys/mf_iocache2.c@1.31.1.1, 2007-02-23 22:20:38+01:00, gbichot@dl145h.mysql.com +7 -10
    my_b_copy_to_file() had a problem: it assumed that bytes_in_cache
    are all the bytes to copy to the file, while it only tells how many
    bytes are in the buffer; so the code forgot to copy what had already
    overflown into a temporary file. Thus any big event was printed only
    partially by mysqlbinlog (loss of data at restore). The fix is
    inspired by MYSQL_BIN_LOG::write_cache().

  sql/log_event.cc@1.262.1.3, 2007-02-23 22:21:11+01:00, gbichot@dl145h.mysql.com +7 -2
    Several Table_map/Write_rows events generated by one single statement
    get groupped together in mysqlbinlog's output; it printed things like
    #718 7:30:51 server id 12 end_log_pos 988      Write_rows: table id 17#718 7:30:51 server id 12 #718 7:30:51 server id 12  end_log_pos 988      Write_rows: table id 17#718 7:30:51 server id 12 end_log_pos 1413 <cut>
    It didn't look nice to have printouts glued like this without line
    breaks. Adding a line break.
    Doing this, when using --hexdump the result was:
    #718 7:30:51 server id 12 end_log_pos 988
    # <hexdump output>
    # Write_rows: table id 17
    which is correct; unfortunately if the hex dump had only full lines
    (i.e the string to print in hex had its length a multiple of 16),
    then the # in front of Write_rows was not printed. Fixed.

  sql/log_event.h@1.145.1.3, 2007-02-23 22:21:53+01:00, gbichot@dl145h.mysql.com +9 -6
    removing strcpy() (one less function call).
    If we write to IO_CACHE more than can fit into its memory buffer,
    it will try to overflow into a file; for that to work, IO_CACHE
    must be inited via open_cached_file().
    open_cached_file(), like init_io_cache(), can fail; we make sure to
    catch this constructor's problem via the init_ok() method.

ChangeSet@1.2409.67.3, 2007-02-23 22:48:15+02:00, monty@mysql.com +14 -0
  Fixed compilations problems and warnings on windows

  extra/yassl/include/openssl/ssl.h@1.24, 2007-02-23 22:48:11+02:00, monty@mysql.com +6 -7
    Move things up to avoid problems with defines in winsock2

  extra/yassl/include/socket_wrapper.hpp@1.13, 2007-02-23 22:48:11+02:00, monty@mysql.com +2 -4
    Don't include winsock2.h twice

  include/config-win.h@1.97, 2007-02-23 22:48:11+02:00, monty@mysql.com +1 -1
    Use winsock2.h instead of winsock.h
    (winsock2.h must be included before windows.h and will automaticly include windows.h)

  include/mysql.h@1.177, 2007-02-23 22:48:11+02:00, monty@mysql.com +1 -1
    Use winsock2.h

  libmysqld/examples/builder-sample/emb_samples.cpp@1.3, 2007-02-23 22:48:11+02:00, monty@mysql.com +1 -1
    Use winsock2.h

  server-tools/instance-manager/IMService.cpp@1.12.1.1, 2007-02-23 22:48:11+02:00, monty@mysql.com +1 -1
    Use winsock2.h

  sql/item_strfunc.cc@1.309.1.3, 2007-02-23 22:48:11+02:00, monty@mysql.com +0 -3
    Remove duplicate include

  sql/lex.h@1.170, 2007-02-23 22:48:12+02:00, monty@mysql.com +1 -1
    Fixed conflict with external GROUP define

  sql/net_serv.cc@1.106, 2007-02-23 22:48:12+02:00, monty@mysql.com +0 -3
    winsock.h is already included in my_global.h

  sql/sql_class.cc@1.312.2.3, 2007-02-23 22:48:12+02:00, monty@mysql.com +6 -6
    Fixed compiler warning on windows

  sql/sql_table.cc@1.391, 2007-02-23 22:48:12+02:00, monty@mysql.com +4 -2
    Fixed compiler warning

  sql/sql_yacc.yy@1.534.1.6, 2007-02-23 22:48:12+02:00, monty@mysql.com +10 -10
    Fixed conflict with external GROUP define

  sql/udf_example.c@1.36, 2007-02-23 22:48:12+02:00, monty@mysql.com +1 -1
    Use winsock2 instead of winsock.h

  win/README@1.7, 2007-02-23 22:48:12+02:00, monty@mysql.com +19 -8
    Updated readme

ChangeSet@1.2439, 2007-02-23 23:36:25+03:00, anozdrin@alik.opbmk +2 -0
  Fix merge & update result file.

  mysql-test/mysql-test-run.pl@1.270.2.3, 2007-02-23 23:36:23+03:00, anozdrin@alik.opbmk +1 -1
    Fix merge.

  mysql-test/r/im_utils.result@1.14, 2007-02-23 23:36:23+03:00, anozdrin@alik.opbmk +2 -0
    Updated result file.

ChangeSet@1.1810.2606.8, 2007-02-23 21:51:33+03:00, anozdrin@alik.opbmk +1 -0
  Fix mysql-test-run.pl: IM in 5.0 uses old incorrect
  'shutdown_delay' option name.

  mysql-test/mysql-test-run.pl@1.30.76.2, 2007-02-23 21:51:31+03:00, anozdrin@alik.opbmk +1 -1
    IM in 5.0 uses old incorrect 'shutdown_delay' option name.

ChangeSet@1.1810.2606.7, 2007-02-23 21:13:21+03:00, anozdrin@alik.opbmk +1 -0
  Fix result file.

  mysql-test/r/im_daemon_life_cycle.result@1.2.1.8, 2007-02-23 21:13:20+03:00, anozdrin@alik.opbmk +1 -1
    Fix result file.

ChangeSet@1.1810.2624.1, 2007-02-23 12:58:56-05:00, cbell@mysql_cab_desk. +7 -0
  BUG#20141 "User-defined variables are not replicated properly for SF/
             Triggers in SBR mode."
  BUG#14914 "SP: Uses of session variables in routines are not always
             replicated"
  BUG#25167 "Dupl. usage of user-variables in trigger/function is not
             replicated correctly"
  
  User-defined variables used inside of stored functions/triggers in
  statements which did not update tables directly were not replicated.
  We also had problems with replication of user-defined variables which
  were used in triggers (or stored functions called from table-updating
  statements) more than once.
  
  This patch addresses the first issue by enabling logging of all
  references to user-defined variables in triggers/stored functions
  and not only references from table-updating statements.
  
  The second issue stemmed from the fact that for user-defined
  variables used from triggers or stored functions called from
  table-updating statements we were writing binlog events for each
  reference instead of only one event for the first reference.
  This problem is already solved for stored functions called from
  non-updating statements with help of "event unioning" mechanism.
  So the patch simply extends this mechanism to the case affected.
  It also fixes small problem in this mechanism which caused wrong
  logging of references to user-variables in cases when non-updating
  statement called several stored functions which used the same
  variable and some of these function calls were omitted from binlog
  as they were not updating any tables.

  mysql-test/r/rpl_user_variables.result@1.14.1.4, 2007-02-23 12:57:17-05:00, Chuck@mysql_cab_desk. +176 -0
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the correct results for execution of the added test procedures to the
    rpl_user_variables test.

  mysql-test/t/rpl_user_variables.test@1.12.1.3, 2007-02-23 12:57:18-05:00, Chuck@mysql_cab_desk. +300 -3
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds additional tests to the rpl_user_variables test that test many of the
    different ways user-defined variables can be required to be replicated.

  sql/item_func.cc@1.270.42.1, 2007-02-23 12:57:18-05:00, Chuck@mysql_cab_desk. +8 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    To properly log accesses to user-defined variables from stored functions/triggers,
    the get_var_with_binlog() method needs to log references to such variables even from 
    non-table-updating statements within them.

  sql/log.cc@1.158.18.1, 2007-02-23 12:57:19-05:00, Chuck@mysql_cab_desk. +2 -2
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch modifies the start_union_events method to accept the query id from a parameter.
    This allows callers to set the query_id to the id of the sub statement such as a trigger
    or stored function. Which permits the code to identify when a user defined variable has
    been used by the statement and this already present in THD::user_var_event.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sp_head.cc@1.200.13.1, 2007-02-23 12:57:19-05:00, Chuck@mysql_cab_desk. +17 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch modifies the code to allow for cases where events for function calls have
    a separate union for each event and thus cannot use the query_id of the caller as the
    start of the union. Thus, we use an artifically created query_id to set the start of 
    the events.
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sql_class.cc@1.223.21.1, 2007-02-23 12:57:20-05:00, Chuck@mysql_cab_desk. +7 -0
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().
    
    Note:
    The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
    replication of access to user-defined variables under a special test case (the last case 
    shown in rpl_user_variables.test).

  sql/sql_class.h@1.230.55.1, 2007-02-23 12:57:20-05:00, Chuck@mysql_cab_desk. +1 -1
    BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
    This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().

ChangeSet@1.2390.1.21, 2007-02-23 18:54:26+01:00, mats@romeo.(none) +3 -0
  BUG#19033 (RBR: slave does not handle schema changes correctly):
  Post-merge fixes.

  include/my_global.h@1.154.1.1, 2007-02-23 18:54:20+01:00, mats@romeo.(none) +11 -0
    Post-merge fixes.
    Moving placement versions of operator new and operator delete to general
    server-wide header.

  sql/slave.h@1.106, 2007-02-23 18:54:20+01:00, mats@romeo.(none) +0 -9
    Post-merge fixes.
    Moving placement versions of operator new and operator delete to general
    server-wide header.

  storage/ndb/include/ndb_global.h.in@1.17, 2007-02-23 18:54:20+01:00, mats@romeo.(none) +0 -2
    Removing local definition of placement versions of
    operator new and operator delete.

ChangeSet@1.1810.2606.6, 2007-02-23 20:49:01+03:00, anozdrin@alik.opbmk +2 -0
  Fix test for views with national characters,
  which accidentally got broken during the merge
  on 16-Feb-2007.

  mysql-test/r/view.result@1.138.1.56, 2007-02-23 20:49:00+03:00, anozdrin@alik.opbmk +10 -8
    Updated result file.

  mysql-test/t/view.test@1.126.1.53, 2007-02-23 20:49:00+03:00, anozdrin@alik.opbmk +8 -6
    Fix test for views with national characters,
    which accidentally got broken during the merge
    on 16-Feb-2007.
    
    Now view.test is in UTF8 character set,
    so SET NAMES is required.

ChangeSet@1.1810.2606.5, 2007-02-23 20:24:32+03:00, anozdrin@alik.opbmk +2 -0
  BUG#24415: im_daemon_life_cycle.imtest fails
  
  Fix timeouts. Only test suite is changed.

  mysql-test/mysql-test-run.pl@1.30.76.1, 2007-02-23 20:24:30+03:00, anozdrin@alik.opbmk +1 -0
    Decrease MySQL server shutdown delay.
    Trasactional storage engines are not used here,
    so it should be enough.

  mysql-test/t/im_daemon_life_cycle.imtest@1.1.1.11, 2007-02-23 20:24:30+03:00, anozdrin@alik.opbmk +12 -7
    Increase wait-timeout.

ChangeSet@1.2409.1.56, 2007-02-23 18:07:08+01:00, msvensson@pilot.blaudden +1 -0
  Extend the max length of second format specifier to max length
  200 allowing it to print paths a little better

  sql/share/errmsg.txt@1.147, 2007-02-23 18:07:07+01:00, msvensson@pilot.blaudden +8 -8
    Extend the max length of second format specifier to max length
    200 allowing it to print paths a little better

ChangeSet@1.1810.2548.50, 2007-02-23 18:05:32+01:00, msvensson@pilot.blaudden +1 -0
  Convert "system cp" to portable mysqltest commands

  mysql-test/t/type_varchar.test@1.8.1.4, 2007-02-23 18:05:31+01:00, msvensson@pilot.blaudden +3 -2
    Convert "system cp" to portable mysqltest commands

ChangeSet@1.2409.68.2, 2007-02-23 17:59:07+01:00, msvensson@pilot.blaudden +1 -0
  Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
   - Fixes for 5.1
   - Always use long for my_time_t

  include/my_time.h@1.29, 2007-02-23 17:59:05+01:00, msvensson@pilot.blaudden +1 -7
    Use long for my_time_t
    It should be signed and hold seconds for 1902 -- 2038-01-19 range
    i.e at least a 32bit variable
    
    Using the system built in time_t is not an option as
    we rely on the above requirements in the time functions
    
    For example QNX has an unsigned time_t type

ChangeSet@1.1810.2548.48, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +2 -0
  Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
   - Avoid overflow in sec_since_epoch by shifting the time
     back 2 days for times close to the maximum range of my_time_t
   - Improve comment about why we need my_time_t
   - Patch will also fix timezone2.test

  include/my_time.h@1.11.5.3, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +7 -1
    Improve comment for my_time_t, especially that we require
    it to be at least a 32bit unsigned type

  sql/tztime.cc@1.24.2.2, 2007-02-23 17:33:11+01:00, msvensson@pilot.blaudden +20 -3
    - Add assert in sec_since_epoch to guard it against broken down time
    values that would cause overflow in my_time_t on systems with 32 bit
    my_time_t
    - Avoid overflow in sec_since_epoch by "shifting" the broken down
    time back 2 days for times that are near the max value.c

ChangeSet@1.1810.2614.5, 2007-02-23 16:51:13+01:00, msvensson@pilot.blaudden +1 -0
  Link comp_err with zlib

  extra/CMakeLists.txt@1.1.3.1, 2007-02-23 16:51:11+01:00, msvensson@pilot.blaudden +1 -1
    Link comp_err with zlib

ChangeSet@1.1810.2622.1, 2007-02-23 15:32:51+01:00, gbichot@dl145h.mysql.com +2 -0
  the fix for BUG#24432
    "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
  didn't make it into 5.0.36 and 5.1.16,
  so we need to adjust the bug-detection-based-on-version-number code.
  Because the rpl tree has a too old version, rpl_insert_id cannot pass,
  so I disable it (like is already the case in 5.1-rpl for the same reason),
  and the repl team will re-enable it when they merge 5.0 and 5.1 into
  their trees (thus getting the right version number).

  mysql-test/t/disabled.def@1.2.11.1, 2007-02-23 15:26:32+01:00, gbichot@dl145h.mysql.com +1 -0
        rpl_insert_id tests statement-based replication of INSERT ON
        DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
        fixed in 5.0.38; we made the slave detect if it is connected to a
        <5.0.38 master and if so refuse to replicate.
        The problem is that this 5.0-rpl tree, even though it will produce
        the 5.0.38 release, still has a 5.0.36 version in configure.in.
        Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
        tree gets the changesets from the main 5.0, its version will change
        to 5.0.38 and so the repl team will re-enable the test.

  sql/slave.cc@1.241.16.2, 2007-02-23 15:28:39+01:00, gbichot@dl145h.mysql.com +2 -2
    the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
    so we need to adjust the bug-detection-based-on-version-number code.

ChangeSet@1.2409.67.1, 2007-02-23 13:13:55+02:00, monty@mysql.com +177 -0
  Fixed compiler warnings
  Fixed compile-pentium64 scripts
  Fixed wrong estimate of update_with_key_prefix in sql-bench
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
  Fixed unsafe define of uint4korr()
  Fixed that --extern works with mysql-test-run.pl
  Small trivial cleanups
  This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
  Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
  Split handle_one_connection() into reusable sub functions.
  Split create_new_thread() into reusable sub functions.
  Added thread_scheduler; Preliminary interface code for future thread_handling code.
  
  Use 'my_thread_id' for internal thread id's
  Make thr_alarm_kill() to depend on thread_id instead of thread
  Make thr_abort_locks_for_thread() depend on thread_id instead of thread
  In store_globals(), set my_thread_var->id to be thd->thread_id.
  Use my_thread_var->id as basis for my_thread_name()
  The above changes makes the connection we have between THD and threads more soft.
  
  Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
  Fixed compiler warnings
  Fixed core dumps when running with --debug
  Removed setting of signal masks (was never used)
  Made event code call pthread_exit() (portability fix)
  Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
  Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
  Removed one common 'not freed memory' warning from mysqltest
  Fixed a couple of usage of not initialized warnings (unlikely cases)
  Suppress compiler warnings from bdb and (for the moment) warnings from ndb

  BUILD/compile-pentium@1.19, 2007-02-23 13:13:46+02:00, monty@mysql.com +1 -1
    Send command line options to SETUP.sh

  BUILD/compile-pentium64@1.2, 2007-02-23 13:13:46+02:00, monty@mysql.com +3 -5
    Update this to be in line with compile-pentium

  BUILD/compile-pentium64-max@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +11 -0
    New BitKeeper file ``BUILD/compile-pentium64-max''

  BUILD/compile-pentium64-max@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  BUILD/compile-solaris-sparc@1.12, 2007-02-23 13:13:46+02:00, monty@mysql.com +12 -5
    Update scripts

  BUILD/compile-solaris-sparc-debug@1.6, 2007-02-23 13:13:46+02:00, monty@mysql.com +9 -5
    Update scripts

  BUILD/compile-solaris-sparc-forte@1.5.1.1, 2007-02-23 13:13:46+02:00, monty@mysql.com +7 -7
    Update scripts

  BUILD/compile-solaris-sparc-purify@1.17.1.1, 2007-02-23 13:13:46+02:00, monty@mysql.com +5 -5
    Update scripts

  BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d@1.10, 2007-02-23 13:13:46+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  BitKeeper/deleted/.del-SETUP.sh.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej

  BitKeeper/deleted/.del-configure.in.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej

  BitKeeper/deleted/.del-ha_berkeley.cc@1.187, 2007-02-23 13:13:46+02:00, monty@mysql.com +10 -0
    Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64

  BitKeeper/deleted/.del-ha_berkeley.h@1.88, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -7
    Moved get_auto_primary_key() to ha_berkeley.cc

  BitKeeper/deleted/.del-my_global.h.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej

  BitKeeper/deleted/.del-my_pthread.h.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej

  BitKeeper/deleted/.del-mysql_client_test.c.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej

  BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89

  BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b@1.51, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  BitKeeper/deleted/.del-sql_parse.cc.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej

  BitKeeper/deleted/.del-table.cc.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej

  BitKeeper/deleted/.del-thr_alarm.c.rej@1.2, 2007-02-23 12:59:58+02:00, monty@mysql.com +0 -0
    Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej

  BitKeeper/etc/ignore@1.277, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -0
    added storage/ndb/src/ndbapi/ndberror_check

  client/mysqlbinlog.cc@1.148, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Removed not needed 'static' (caused compiler warning)

  client/mysqldump.c@1.267, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings from 'max' build

  client/mysqltest.c@1.267.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +25 -22
    Free warning and query memory no abort.
    (Removes strange warnings on screen if mysql-test-run fails)
    Removed compiler warnings
    Portability fix for windows (windows doesn't have mode_t)

  client/sql_string.h@1.18.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  cmd-line-utils/readline/xmalloc.c@1.7.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +3 -4
    Fixed compiler warnings from 'max' build

  configure.in@1.438, 2007-02-23 13:13:46+02:00, monty@mysql.com +5 -5
    Added detection of port_create and port.h (for future)as 
    ---
    manual merge

  extra/charset2html.c@1.10, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  extra/comp_err.c@1.26.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +4 -0
    Fixed compiler warnings from 'max' build

  extra/yassl/include/lock.hpp@1.5, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Fix for windows64

  extra/yassl/include/openssl/ssl.h@1.22, 2007-02-23 13:13:47+02:00, monty@mysql.com +7 -2
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/include/socket_wrapper.hpp@1.10.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +3 -5
    Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit

  extra/yassl/include/yassl.hpp@1.3, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Fix for windows64

  extra/yassl/src/ssl.cpp@1.29, 2007-02-23 13:13:47+02:00, monty@mysql.com +6 -2
    Removed compiler warning
    Detect wrong parameter (Happens when running test suite on solaris)
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/taocrypt/src/integer.cpp@1.28.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  extra/yassl/testsuite/testsuite.cpp@1.7, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -2
    Removed compiler warning

  include/config-win.h@1.96, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -0
    Added HAVE_WINSOCK2 (for future)

  include/my_dbug.h@1.25, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Fixed DBUG_PROCESS() so that we don't get compiler warnings for it

  include/my_global.h@1.157.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +14 -13
    Fixed unsafe define of uint4korr()
    manual merge (ignore changes from 5.0)
    Fixed warnings on win64 when using int5store and int6store

  include/my_pthread.h@1.106.2.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +5 -4
    Added my_thread_id typedef
    Renamed 'my_thread_id() function to my_thead_dbug_id()

  include/thr_alarm.h@1.23, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -1
    Make thr_alarm_kill() to depend on thread_id instead of thread

  include/thr_lock.h@1.21, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -2
    Make thr_abort_locks_for_thread() depend on thread_id instead of thread

  libmysql/libmysql.def@1.46, 2007-02-23 13:13:47+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  libmysqld/CMakeLists.txt@1.13, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -0
    Added missing files

  libmysqld/Makefile.am@1.109, 2007-02-23 13:13:47+02:00, monty@mysql.com +2 -1
    Added new files

  libmysqld/lib_sql.cc@1.131, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -9
    Remove not needed code (store_globals() now takes care of things)

  libmysqld/scheduler.cc@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0
    New BitKeeper file ``libmysqld/scheduler.cc''

  libmysqld/scheduler.cc@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  libmysqld/sql_connect.cc@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0
    New BitKeeper file ``libmysqld/sql_connect.cc''

  libmysqld/sql_connect.cc@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/include/one_thread_per_connection.inc@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +5 -0
    New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc''

  mysql-test/include/one_thread_per_connection.inc@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/lib/mtr_report.pl@1.44, 2007-02-23 13:13:47+02:00, monty@mysql.com +4 -2
    Removed wrong messages when using --extern

  mysql-test/mysql-test-run.pl@1.270.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +111 -83
    Fixed that --extern works
    Print help on stdout instead of stderr (make it easier to pipe it to less)
    Fixed typo that caused mysql-test-run.pl to fail on Solaris

  mysql-test/r/keywords.result@1.10, 2007-02-23 13:13:47+02:00, monty@mysql.com +13 -13
    manual merge

  mysql-test/r/ndb_lock.result@1.18, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    After merge fixes

  mysql-test/r/no-threads.result@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +6 -0
    New BitKeeper file ``mysql-test/r/no-threads.result''

  mysql-test/r/no-threads.result@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/r/one_thread_per_connection.require@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/one_thread_per_connection.require''

  mysql-test/r/one_thread_per_connection.require@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/r/ps.result@1.102, 2007-02-23 13:13:47+02:00, monty@mysql.com +3 -3
    Portability fix

  mysql-test/t/disabled.def@1.231.1.1, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -0
    Disabled ndb_alter_table as this very often fails for me (and have done it for a long time)

  mysql-test/t/keywords.test@1.10, 2007-02-23 13:13:47+02:00, monty@mysql.com +21 -22
    manual merge

  mysql-test/t/ndb_lock.test@1.17, 2007-02-23 13:13:47+02:00, monty@mysql.com +1 -1
    Added other possible error code

  mysql-test/t/no-threads-master.opt@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/no-threads-master.opt''

  mysql-test/t/no-threads-master.opt@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/t/no-threads.test@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +5 -0
    New BitKeeper file ``mysql-test/t/no-threads.test''

  mysql-test/t/no-threads.test@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  mysql-test/t/ps.test@1.107, 2007-02-23 13:13:48+02:00, monty@mysql.com +3 -3
    Portability fix (when compiling without DLOPEN)

  mysql-test/t/wait_timeout.test@1.13, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -0
    Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts)

  mysys/base64.c@1.18, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  mysys/mf_keycache.c@1.64, 2007-02-23 13:13:48+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings

  mysys/my_getopt.c@1.65, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -1
    Fixed compiler warning

  mysys/my_init.c@1.55, 2007-02-23 13:13:48+02:00, monty@mysql.com +11 -7
    Fixed compiler warning
    Re-indented long comment

  mysys/my_thr_init.c@1.49, 2007-02-23 13:13:48+02:00, monty@mysql.com +42 -39
    Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage)
    Always generate my_thread_name() when using DBUG
    Ensure mysys_var->pthread_self is set
    Fixed compiler warnings

  mysys/ptr_cmp.c@1.9, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings from 'max' build

  mysys/thr_alarm.c@1.57, 2007-02-23 13:13:48+02:00, monty@mysql.com +6 -5
    Change thr_alarm_kill() to use mysys_var->id instead of thread id
    Fixed compiler warning on windows

  mysys/thr_lock.c@1.58, 2007-02-23 13:13:48+02:00, monty@mysql.com +21 -8
    Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id
    Add purecov statements around not tested code
    Fixed compiler warnings

  mysys/thr_mutex.c@1.31, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -2
    my_thread_id() -> my_thread_dbug_id()

  server-tools/instance-manager/guardian.cc@1.42, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -2
    Fixed compiler warning

  server-tools/instance-manager/instance.cc@1.53, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  server-tools/instance-manager/mysql_connection.cc@1.27, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  server-tools/instance-manager/mysqlmanager.cc@1.25.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql-bench/bench-init.pl.sh@1.35, 2007-02-23 13:13:50+02:00, monty@mysql.com +9 -5
    Added --one-missing-tests

  sql-bench/example@1.2, 2007-02-23 13:13:50+02:00, monty@mysql.com +18 -1
    Better example

  sql-bench/run-all-tests.sh@1.17, 2007-02-23 13:13:50+02:00, monty@mysql.com +5 -1
    Added --only-missing-tests

  sql-bench/test-insert.sh@1.46, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed wrong estimate of update_with_key_prefix

  sql/CMakeLists.txt@1.35, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -0
    Added missing files

  sql/Makefile.am@1.173.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +6 -4
    Added new files

  sql/event_scheduler.cc@1.31.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +17 -18
    Added pthread_exit() calls
    Ensure DBUG_xxx calls are not made before my_thread_init()
    Use common functions to set up thread handling

  sql/field.h@1.212, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    manual merge

  sql/ha_ndbcluster.cc@1.411.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +3 -3
    Removed some trivial 'current_thd' calls

  sql/handler.cc@1.295.2.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +3 -3
    Avoid warnings on KILL_CONNECTION
    Don't print out null pointer with printf()  (Causes crashes on Solaris)

  sql/item.cc@1.243, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/item_cmpfunc.cc@1.245, 2007-02-23 13:13:48+02:00, monty@mysql.com +2 -1
    After merge fixes

  sql/item_func.cc@1.356, 2007-02-23 13:13:48+02:00, monty@mysql.com +4 -14
    Merge embedded and normal code usage
    (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t)
    Fixed compiler warning

  sql/item_strfunc.cc@1.309.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  sql/item_timefunc.cc@1.158, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/lock.cc@1.103, 2007-02-23 13:13:48+02:00, monty@mysql.com +1 -1
    Use (new) parameter to thr_abort_locks_for_thread()

  sql/log.cc@1.253.5.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +4 -4
    Fixed compiler warning

  sql/log_event.cc@1.266.1.1, 2007-02-23 13:13:48+02:00, monty@mysql.com +8 -7
    Fixed compiler warnings about not used variable

  sql/mysql_priv.h@1.470.14.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +27 -5
    Remove TEST_NO_THREADS (not needed with new scheduler interface)
    Added functions from sql_connect.cc and new functions from sql_parse.cc

  sql/mysqld.cc@1.601.1.20, 2007-02-23 13:13:49+02:00, monty@mysql.com +218 -107
    Use thread_scheduler structure to dispatch calls (make code more dynamic)
    Change --one-thread option to use thread_scheduler interface
    Made ONE_THREAD option independent of DBUG_BUILD
    --one-thread is now depricated. One should instead use '--thread-handling=no-threads'
    Remove not used uname() function.
    Split create_new_thread() into reusable sub functions.
    Preliminary interface code for future thread_handling code.
    Fixed compiler warnings

  sql/parse_file.cc@1.27, 2007-02-23 13:13:49+02:00, monty@mysql.com +1 -1
    Don't send zero pointer to fn_format() (Causes crashes when using --debug)

  sql/repl_failsafe.cc@1.73, 2007-02-23 13:13:49+02:00, monty@mysql.com +4 -8
    Setup pseudo_thread_id same way as other code

  sql/scheduler.cc@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +88 -0
    New BitKeeper file ``sql/scheduler.cc''

  sql/scheduler.cc@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  sql/scheduler.h@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +60 -0
    New BitKeeper file ``sql/scheduler.h''

  sql/scheduler.h@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  sql/set_var.cc@1.215.2.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +15 -3
    Added variables 'thread_handling'
    Prepare for future variable 'thread_pool_size'
    Fixed compiler warnings

  sql/set_var.h@1.101, 2007-02-23 13:13:49+02:00, monty@mysql.com +1 -1
    Fixed compiler warning

  sql/slave.cc@1.306.1.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +1 -8
    Setup pseudo_thread_id same way as other code
    Removed not used signal mask

  sql/sql_acl.cc@1.228.1.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/sql_base.cc@1.375, 2007-02-23 13:13:49+02:00, monty@mysql.com +37 -15
    Fixed long comments
    Normalized variable setup
    Don't destroy value of thd->variables.pseduo_thread_id
    More DBUG_PRINT()'s
    More DBUG_ASSERT()'s
    Fixed compiler warnings from 'max' build

  sql/sql_class.cc@1.312.2.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +13 -12
    Remove thd->real_id and thd->dbug_thread_id
    Added DBUG_ASSERT()
    Use thread_scheduler to signal threads to be killed.
    In THD::store_globals(), set my_thread_var->id to be thd->thread_id.
    Fixed compiler warnings

  sql/sql_class.h@1.339.1.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +13 -10
    Use 'my_thread_id' for internal thread id's
    Remove not needed THD elements: block_signals and dbug_thread_id
    Added 'thread_scheduler' scheduling extension element to THD

  sql/sql_connect.cc@1.1, 2007-02-23 13:13:52+02:00, monty@mysql.com +1108 -0
    New BitKeeper file ``sql/sql_connect.cc''
    

  sql/sql_connect.cc@1.0, 2007-02-23 13:13:52+02:00, monty@mysql.com +0 -0

  sql/sql_insert.cc@1.246.1.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +2 -7
    After merge fixes
    (This actually fixes a bug in old code when many connections are in use)
    Setup pseudo_thread_id same way as other code
    Removed not used signal mask
    Initialize variable that may be used unitialized on error conditions (not fatal)

  sql/sql_parse.cc@1.626.2.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +5 -995
    Move connection related code to sql_connect.cc
    Remove setting of signal mask (not needed)
    Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug)
    Added previous 'optional' element to reset_mgh()
    Removed not needed DBUG_PRINT call

  sql/sql_partition.cc@1.100, 2007-02-23 13:13:49+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/sql_prepare.cc@1.198, 2007-02-23 13:13:49+02:00, monty@mysql.com +2 -1
    Removed not needed casts
    Fixed compiler warnings from 'max' build

  sql/sql_select.cc@1.492.1.1, 2007-02-23 13:13:49+02:00, monty@mysql.com +5 -4
    Fixed compiler warnings

  sql/sql_show.cc@1.392, 2007-02-23 13:13:50+02:00, monty@mysql.com +4 -7
    Don't send pthread_kill() to threads to detect if they exists.
    (Not that useful and causes problems with future thread_handling code)
    Fixed compiler warnings

  sql/sql_table.cc@1.389, 2007-02-23 13:13:50+02:00, monty@mysql.com +6 -11
    Simplify code
    Fixed compiler warnings

  sql/sql_test.cc@1.51, 2007-02-23 13:13:50+02:00, monty@mysql.com +7 -5
    Remove dbug_thread_id from test output

  sql/sql_view.cc@1.122, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Don't send zero pointer to fn_format()

  sql/tztime.cc@1.47.1.1, 2007-02-23 13:13:50+02:00, monty@mysql.com +2 -2
    Fixed compiler warning

  sql/udf_example.def@1.2.1.1, 2007-02-23 13:13:50+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  sql/unireg.cc@1.97, 2007-02-23 13:13:50+02:00, monty@mysql.com +3 -0
    Initialize variable that may be used unitialized on error conditions

  storage/archive/archive_test.c@1.11, 2007-02-23 13:13:50+02:00, monty@mysql.com +6 -6
    Fixed compiler warnings

  storage/archive/azio.c@1.16, 2007-02-23 13:13:50+02:00, monty@mysql.com +6 -4
    Fixed compiler warnings

  storage/innobase/dict/dict0crea.c@1.43, 2007-02-23 13:13:50+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings detected on windows64

  storage/innobase/dict/dict0dict.c@1.101, 2007-02-23 13:13:50+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings detected on windows64

  storage/innobase/dict/dict0load.c@1.54, 2007-02-23 13:13:50+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings detected on windows64

  storage/innobase/dict/dict0mem.c@1.25, 2007-02-23 13:13:50+02:00, monty@mysql.com +11 -11
    Fixed compiler warnings detected on windows64

  storage/innobase/eval/eval0proc.c@1.8, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/innobase/handler/ha_innodb.cc@1.320.1.1, 2007-02-23 13:13:50+02:00, monty@mysql.com +14 -10
    Fixed compiler warnings detected on windows64

  storage/innobase/include/ut0byte.ic@1.8, 2007-02-23 13:13:50+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  storage/innobase/include/ut0ut.ic@1.6, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings on win64

  storage/innobase/mtr/mtr0log.c@1.16, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/innobase/pars/pars0lex.l@1.15, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed warnings on win64

  storage/innobase/rem/rem0cmp.c@1.35, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/innobase/row/row0mysql.c@1.139, 2007-02-23 13:13:50+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings detected on windows64

  storage/innobase/row/row0sel.c@1.116, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/innobase/sync/sync0rw.c@1.31, 2007-02-23 13:13:50+02:00, monty@mysql.com +4 -4
    Fixed compiler warnings detected on windows64

  storage/innobase/trx/trx0trx.c@1.71, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/myisam/mi_log.c@1.15, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    my_thread_id() -> my_thread_debug_id()

  storage/myisam/mi_packrec.c@1.46, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings detected on windows64

  storage/myisam/myisamchk.c@1.125, 2007-02-23 13:13:50+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  storage/ndb/src/common/debugger/EventLogger.cpp@1.36.1.1, 2007-02-23 13:13:50+02:00, monty@mysql.com +9 -8
    Fixed compiler warnings

  storage/ndb/src/common/util/ConfigValues.cpp@1.16, 2007-02-23 13:13:51+02:00, monty@mysql.com +4 -4
    Removed compiler warnings

  storage/ndb/src/common/util/NdbSqlUtil.cpp@1.36, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -2
    Removed compiler warnings

  storage/ndb/src/cw/cpcd/CPCD.hpp@1.7, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.64, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -3
    Fixed compiler warnings detected on windows64

  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@1.36, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings detected on windows64

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.83, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -2
    Fixed compiler warnings detected on windows64

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.115, 2007-02-23 13:13:51+02:00, monty@mysql.com +2 -9
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.48, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.109, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -3
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.139, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -4
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.135, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -4
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.59, 2007-02-23 13:13:51+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.22, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -6
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.53, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -3
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp@1.8, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.34, 2007-02-23 13:13:51+02:00, monty@mysql.com +4 -5
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.33, 2007-02-23 13:13:51+02:00, monty@mysql.com +2 -5
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.20, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@1.6, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp@1.4, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -2
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp@1.5, 2007-02-23 13:13:51+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp@1.3, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings

  storage/ndb/src/kernel/blocks/diskpage.hpp@1.5, 2007-02-23 13:13:51+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/vm/ndbd_malloc.cpp@1.4, 2007-02-23 13:13:51+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@1.13, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings

  storage/ndb/src/mgmclient/main.cpp@1.29, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -2
    Fixed compiler warnings

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.82, 2007-02-23 13:13:51+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.28, 2007-02-23 13:13:51+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  storage/ndb/src/ndbapi/SignalSender.cpp@1.14, 2007-02-23 13:13:51+02:00, monty@mysql.com +0 -9
    Fixed compiler warnings

  storage/ndb/tools/restore/consumer_restore.cpp@1.39.1.1, 2007-02-23 13:13:51+02:00, monty@mysql.com +5 -1
    Fixed compiler warnings

  strings/ctype-ucs2.c@1.66, 2007-02-23 13:13:52+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings

  strings/ctype-utf8.c@1.110, 2007-02-23 13:13:52+02:00, monty@mysql.com +3 -1
    Fixed compiler warnings

  strings/decimal.c@1.81, 2007-02-23 13:13:52+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  strings/my_strchr.c@1.4, 2007-02-23 13:13:52+02:00, monty@mysql.com +1 -1
    Fixed conflict between function and prototype

  support-files/compiler_warnings.supp@1.5, 2007-02-23 13:13:52+02:00, monty@mysql.com +43 -11
    Ignore warnings from sql_yacc.cc that are hard to remove
    Ignore some not important warnings from windows 64 bit build
    Suppress warnings from bdb and (for the moment) warnings from ndb
    Suppress all warnings for all pushbuild platforms (should make all trees green)

  vio/viosslfactories.c@1.38, 2007-02-23 13:13:52+02:00, monty@mysql.com +8 -0
    Added DBUG_PRINT

ChangeSet@1.1810.2621.1, 2007-02-23 10:28:50+01:00, msvensson@pilot.blaudden +3 -0
  Bug#25197 repeat function returns null when using table field directly as count
   - Return empty string also if count is unsigned and value is 0

  mysql-test/r/func_str.result@1.110.1.17, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +14 -0
    Update test result

  mysql-test/t/func_str.test@1.92.1.8, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +22 -0
    Add test case for using an unsigned value as count parameter
    for REPEAT

  sql/item_strfunc.cc@1.261.23.1, 2007-02-23 10:28:49+01:00, msvensson@pilot.blaudden +3 -1
    The repeat function should return the emptystring if
    count is unsigned and equal to zero or
    count is signed and less than or equal to zero

ChangeSet@1.2435, 2007-02-22 22:56:43+03:00, anozdrin@alik.opbmk +2 -0
  Merge fix.

  server-tools/instance-manager/angel.cc@1.4, 2007-02-22 22:56:41+03:00, anozdrin@alik.opbmk +8 -7
    Merge fix.

  server-tools/instance-manager/manager.cc@1.50, 2007-02-22 22:56:41+03:00, anozdrin@alik.opbmk +3 -1
    Merge fix.

ChangeSet@1.1810.2619.2, 2007-02-22 20:20:49+02:00, monty@mysql.com +2 -0
  Portability fix
  Suppress compiler warnings from bdb and (for the moment) warnings from ndb

  client/mysqltest.c@1.155.9.86, 2007-02-22 20:20:47+02:00, monty@mysql.com +1 -1
    Portability fix for windows (windows doesn't have mode_t)

  support-files/compiler_warnings.supp@1.2.1.3, 2007-02-22 20:20:48+02:00, monty@mysql.com +14 -0
    Suppress warnings from bdb and (for the moment) warnings from ndb

ChangeSet@1.2409.1.52, 2007-02-22 21:05:45+03:00, kaa@polly.local +1 -0
  Disable mysqlbinlog-cp932.test for row based binlog, since mysqlbinlog is also disabled.

  mysql-test/t/mysqlbinlog-cp932.test@1.2, 2007-02-22 21:05:40+03:00, kaa@polly.local +1 -0
    Disable mysqlbinlog-cp932.test for row based binlog, since mysqlbinlog is also disabled.

ChangeSet@1.2433, 2007-02-22 20:56:33+03:00, anozdrin@alik.opbmk +1 -0
  Fix powermacg5 build failure.

  server-tools/instance-manager/angel.cc@1.3, 2007-02-22 20:56:31+03:00, anozdrin@alik.opbmk +1 -0
    Include my_dir.h because MacOS defines mode constants
    (S_IRUSR, S_IWUSR, ...) in sys/stat.h.

ChangeSet@1.1810.2620.2, 2007-02-22 17:53:41+01:00, msvensson@pilot.blaudden +1 -0
  Bug#24617  	Typo in Czech translation

  sql/share/errmsg.txt@1.42.23.2, 2007-02-22 17:53:39+01:00, msvensson@pilot.blaudden +1 -1
    Add the missing "d"

ChangeSet@1.2432, 2007-02-22 19:45:06+03:00, kostja@bodhi.local +1 -0
  Clean up one place that misuses LOCK_open (dead code)

  sql/handler.cc@1.295.1.1, 2007-02-22 19:45:02+03:00, kostja@bodhi.local +3 -8
    Clean up one place that misuses LOCK_open (dead code)

ChangeSet@1.1810.2620.1, 2007-02-22 16:41:51+01:00, msvensson@pilot.blaudden +3 -0
  Bug #26571  	Different format specifiers in errmsg.txt
  - Add check of format specifiers in error message strings
  - Update error message text accordingly to be equal between all translations

  extra/Makefile.am@1.30.1.8, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +2 -1
    comp_err uses my_cheksum, link with zlib

  extra/comp_err.c@1.23.3.1, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +119 -0
    Add check of format specifiers in error message strings

  sql/share/errmsg.txt@1.42.23.1, 2007-02-22 16:41:49+01:00, msvensson@pilot.blaudden +540 -540
    Update error messages after checks
    ---
    Remove the newly added space in error message, should not be there

ChangeSet@1.1810.2619.1, 2007-02-22 16:59:57+02:00, monty@mysql.com +43 -0
  Fixed compiler warnings (for linux and win32 and win64)
  Fixed a couple of usage of not initialized warnings (unlikely cases)

  sql/ha_berkeley.cc@1.151.8.1, 2007-02-22 16:59:55+02:00, monty@mysql.com +10 -0
    Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64

  sql/ha_berkeley.h@1.70.6.1, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -7
    Moved get_auto_primary_key() to ha_berkeley.cc

  tools/mysqlmanager.c@1.47.3.1, 2007-02-22 16:59:56+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  client/mysqldump.c@1.214.1.43, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings from 'max' build

  client/mysqltest.c@1.155.9.85, 2007-02-22 16:59:54+02:00, monty@mysql.com +9 -8
    Removed compiler warnings

  cmd-line-utils/readline/xmalloc.c@1.8, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings from 'max' build

  extra/comp_err.c@1.23.2.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +4 -0
    Fixed compiler warnings from 'max' build

  extra/yassl/include/openssl/ssl.h@1.14.1.7, 2007-02-22 16:59:54+02:00, monty@mysql.com +6 -2
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/include/socket_wrapper.hpp@1.11, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -4
    Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit

  extra/yassl/src/ssl.cpp@1.16.1.10, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit

  extra/yassl/taocrypt/src/integer.cpp@1.29, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  include/my_global.h@1.96.1.40, 2007-02-22 16:59:54+02:00, monty@mysql.com +15 -0
    Added my_offsetof() macro from 5.1 to get rid of compiler warnings

  libmysql/libmysql.def@1.43.1.2, 2007-02-22 16:59:54+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  mysys/base64.c@1.5.1.10, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  mysys/mf_keycache.c@1.55.1.6, 2007-02-22 16:59:54+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings from 'max' build

  mysys/my_getopt.c@1.55.1.7, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  mysys/my_init.c@1.44.1.4, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  mysys/my_thr_init.c@1.31.4.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +3 -3
    Fixed compiler warnings

  mysys/ptr_cmp.c@1.6.1.2, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings from 'max' build

  server-tools/instance-manager/mysql_connection.cc@1.14.1.5, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  server-tools/instance-manager/mysqlmanager.cc@1.17.2.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/filesort.cc@1.105.1.11, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -1
    Initalize variable that was used unitialized in error conditions

  sql/item.cc@1.113.1.137, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/item_timefunc.cc@1.100.1.41, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings

  sql/mysqld.cc@1.439.1.150, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  sql/sql_acl.cc@1.128.1.89, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings from 'max' build

  sql/sql_base.cc@1.235.82.1, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  sql/sql_insert.cc@1.146.1.70, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Initialize variable that may be used unitialized on error conditions (not fatal)

  sql/sql_prepare.cc@1.142.1.52, 2007-02-22 16:59:55+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  sql/sql_select.cc@1.312.1.181, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings

  sql/sql_show.cc@1.253.1.88, 2007-02-22 16:59:55+02:00, monty@mysql.com +4 -3
    Fixed compiler warnings

  sql/udf_example.def@1.3, 2007-02-22 16:59:55+02:00, monty@mysql.com +0 -1
    Fixed compiler warnings on win64

  sql/unireg.cc@1.53.1.30, 2007-02-22 16:59:55+02:00, monty@mysql.com +3 -0
    Initialize variable that may be used unitialized on error conditions

  sql/ha_innodb.cc@1.202.36.1, 2007-02-22 16:59:55+02:00, monty@mysql.com +6 -3
    Fixed compiler warnings

  innobase/include/ut0byte.ic@1.4.1.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +2 -2
    Fixed compiler warnings on win64

  innobase/include/ut0ut.ic@1.3.1.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings on win64

  myisam/mi_packrec.c@1.30.15.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -1
    Fixed compiler warnings on win64

  myisam/myisamchk.c@1.112.11.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +1 -0
    Fixed compiler warnings from 'max' build

  ndb/include/kernel/signaldata/DictTabInfo.hpp@1.17.8.1, 2007-02-22 16:59:54+02:00, monty@mysql.com +5 -5
    Fixed compiler warnings

  strings/ctype-ucs2.c@1.50.1.15, 2007-02-22 16:59:55+02:00, monty@mysql.com +4 -1
    Fixed compiler warnings

  strings/ctype-utf8.c@1.97.1.8, 2007-02-22 16:59:55+02:00, monty@mysql.com +2 -0
    Fixed compiler warnings

  strings/decimal.c@1.65.1.12, 2007-02-22 16:59:55+02:00, monty@mysql.com +3 -0
    Fixed compiler warnings

  support-files/compiler_warnings.supp@1.2.1.2, 2007-02-22 16:59:56+02:00, monty@mysql.com +8 -0
    Ignore warnings from sql_yacc.cc that are hard to remove
    Ignore some not important warnings from windows 64 bit build

ChangeSet@1.1810.2618.1, 2007-02-22 14:11:01+01:00, mhansson@linux-st28.site +2 -0
  Bug #24010: INSERT INTO ... SELECT fails on unique constraint with data 
  it doesn't select.
  
  This bug was fixed along with bug #16861: User defined variable can 
  have a wrong value if a tmp table was used.
  
  There the fix consisted of Item_func_set_user_var overloading the method
  Item::save_in_field. Consider the query from the test case:
  
  
  INSERT INTO foo( bar, baz )
  SELECT 
    bar,
    @newBaz := 1 + baz
  FROM 
    foo
  WHERE 
    quux <= 0.1;
  
  Here the assignment expression '@newBaz := 1 + baz' is represented by an 
  Item_func_set_user_var. Its member method save_in_field, which writes the 
  value of this assignment into the result field, writes the val_xxx() value, 
  which is not updated at this point. In the fix introduced by the patch,
  the save_in_field method reads the actual variable value instead.
  
  See also comment for 
  ChangeSet@1.2368.1.3, 2007-01-09 23:24:56+03:00, evgen@moonbone.local +4 -0
  and comment for
  Item_func_set_user_var::save_in_field (item_func.cc)

  mysql-test/r/update.result@1.31.1.1, 2007-02-22 14:11:00+01:00, mhansson@linux-st28.site +19 -0
    BUG#24010
    The correct, and expected, result

  mysql-test/t/update.test@1.30, 2007-02-22 14:11:00+01:00, mhansson@linux-st28.site +26 -0
    BUG#24010
    The test case for this bug. When the bug is active, the INSERT ... SELECT 
    statement will try to insert the values <1, 2> which gives an error

ChangeSet@1.2409.1.51, 2007-02-22 15:41:39+03:00, kaa@polly.local +1 -0
  Fixed the binlog_row_ctype_cp932 test failure in PB introduced by the patch for bug #18743.

  mysql-test/r/binlog_row_ctype_cp932.result@1.5.1.1, 2007-02-22 15:41:33+03:00, kaa@polly.local +10 -0
    Fixed the binlog_row_ctype_cp932 test failure in PB introduced by the patch for bug #18743.

ChangeSet@1.1810.2614.3, 2007-02-22 15:28:42+03:00, kaa@polly.local +1 -0
  Force the server restart before running mysqlbinlog-cp932.test to fix PB failures introduced by the patch for bug #18743.

  mysql-test/t/mysqlbinlog-cp932-master.opt@1.1, 2007-02-22 15:28:39+03:00, kaa@polly.local +1 -0
    New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932-master.opt''

  mysql-test/t/mysqlbinlog-cp932-master.opt@1.0, 2007-02-22 15:28:39+03:00, kaa@polly.local +0 -0

ChangeSet@1.2409.64.1, 2007-02-22 09:12:07+01:00, istruewing@chilla.local +1 -0
  Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
  Decreased code duplication by calling memory mapping
  function through mi_extra().

  storage/myisam/mi_open.c@1.116.1.1, 2007-02-22 09:12:03+01:00, istruewing@chilla.local +8 -16
    Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.
    Decreased code duplication by calling memory mapping
    function through mi_extra().

ChangeSet@1.1810.2617.1, 2007-02-21 23:00:32+03:00, evgen@moonbone.local +11 -0
  Bug#23800: Outer fields in correlated subqueries is used in a temporary table
  created for sorting.
  
  Any outer reference in a subquery was represented by an Item_field object.
  If the outer select employs a temporary table all such fields should be
  replaced with fields from that temporary table in order to point to the 
  actual data. This replacement wasn't done and that resulted in a wrong
  subquery evaluation and a wrong result of the whole query.
  
  Now any outer field is represented by two objects - Item_field placed in the
  outer select and Item_outer_ref in the subquery. Item_field object is
  processed as a normal field and the reference to it is saved in the
  ref_pointer_array. Thus the Item_outer_ref is always references the correct
  field. The original field is substituted for a reference in the
  Item_field::fix_outer_field() function.
  
  New function called fix_inner_refs() is added to fix fields referenced from
  inner selects and to fix references (Item_ref objects) to these fields.
  
  The new Item_outer_ref class is a descendant of the Item_direct_ref class.
  It additionally stores a reference to the original field and designed to
  behave more like a field.

  mysql-test/r/subselect.result@1.134.16.1, 2007-02-21 22:59:50+03:00, evgen@moonbone.local +51 -9
    Added a test case for bug#23800: Correlated sub query returning incorrect results when
    operated upon.

  mysql-test/r/subselect3.result@1.1.1.4, 2007-02-21 22:59:51+03:00, evgen@moonbone.local +11 -11
    Corrected test cases result after fix for bug#23800: Correlated sub query returning
    incorrect results when operated upon.

  mysql-test/t/subselect.test@1.129.8.1, 2007-02-21 22:59:51+03:00, evgen@moonbone.local +28 -1
    Added a test case for bug#23800: Correlated sub query returning incorrect results when
    operated upon.

  sql/item.cc@1.113.72.1, 2007-02-21 22:59:45+03:00, evgen@moonbone.local +71 -9
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Now all outer fields are substituted with references to them (Item_outer_ref objects)
    in the Item_field::fix_outer_field() function.
    The original field is saved in the Item_outer_ref object.

  sql/item.h@1.183.22.1, 2007-02-21 22:59:48+03:00, evgen@moonbone.local +37 -3
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added the Item_outer_ref class.

  sql/mysql_priv.h@1.290.94.3, 2007-02-21 22:59:48+03:00, evgen@moonbone.local +2 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added the fix_inner_refs() function prototype.

  sql/sql_delete.cc@1.144.1.48, 2007-02-21 22:59:49+03:00, evgen@moonbone.local +6 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added call to the fix_inner_refs() function.

  sql/sql_lex.cc@1.142.37.1, 2007-02-21 23:00:04+03:00, evgen@moonbone.local +1 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added cleanup of the inner_refs_list.

  sql/sql_lex.h@1.175.36.1, 2007-02-21 23:00:14+03:00, evgen@moonbone.local +2 -1
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    The inner_refs_list is added to the SELECT_LEX class.

  sql/sql_select.cc@1.312.128.2, 2007-02-21 22:59:49+03:00, evgen@moonbone.local +76 -7
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    The new function called fix_inner_refs() is added.

  sql/sql_update.cc@1.154.26.8, 2007-02-21 22:59:50+03:00, evgen@moonbone.local +5 -0
    Bug#23800: Correlated sub query returning incorrect results when operated upon.
    Added call to the fix_inner_refs() function.

ChangeSet@1.2409.59.2, 2007-02-21 19:18:09+01:00, serg@janus.mylan +1 -0
  after merge

  sql/opt_range.cc@1.262.1.2, 2007-02-21 19:18:06+01:00, serg@janus.mylan +1 -1
    after merge

ChangeSet@1.1810.2615.2, 2007-02-21 19:38:40+02:00, monty@mysql.com +18 -0
  After merge fixes
  This also fixes a bug in counting number of rows that are updated when we have many simultanous queries

  ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp@1.5.3.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  extra/yassl/src/ssl.cpp@1.16.1.9, 2007-02-21 19:38:38+02:00, monty@mysql.com +1 -1
    Removed compiler warning

  extra/yassl/taocrypt/src/asn.cpp@1.12.1.2, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    After merge fixes

  extra/yassl/testsuite/testsuite.cpp@1.5.1.2, 2007-02-21 19:38:38+02:00, monty@mysql.com +2 -2
    Removed compiler warning

  mysql-test/r/ndb_lock.result@1.5.7.3, 2007-02-21 19:38:38+02:00, monty@mysql.com +1 -1
    After merge fixes

  sql/ha_ndbcluster.cc@1.175.1.122, 2007-02-21 19:38:38+02:00, monty@mysql.com +3 -0
    Some extra safety

  sql/item_cmpfunc.cc@1.187.1.49, 2007-02-21 19:38:39+02:00, monty@mysql.com +1 -1
    After merge fixes

  sql/item_subselect.cc@1.113.17.2, 2007-02-21 19:38:39+02:00, monty@mysql.com +4 -5
    After merge fixes

  sql/sql_insert.cc@1.146.1.69, 2007-02-21 19:38:39+02:00, monty@mysql.com +1 -1
    After merge fixes
    (This actually fixes a bug in old code when many connections are in use)

  ndb/src/common/debugger/EventLogger.cpp@1.21.13.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +3 -0
    Removed compiler warning

  ndb/src/common/util/ConfigValues.cpp@1.8.7.2, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/common/util/NdbSqlUtil.cpp@1.29.6.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.36.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -3
    Removed compiler warning

  ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@1.13.2.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/kernel/vm/ndbd_malloc.cpp@1.1.2.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +2 -0
    Removed compiler warning

  ndb/src/mgmclient/main.cpp@1.20.7.1, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -2
    Removed compiler warning

  ndb/src/ndbapi/SignalSender.cpp@1.3.9.2, 2007-02-21 19:38:38+02:00, monty@mysql.com +0 -8
    Removed compiler warning

  support-files/compiler_warnings.supp@1.2.1.1, 2007-02-21 19:38:39+02:00, monty@mysql.com +2 -10
    Removed some suppressed warnings

ChangeSet@1.2409.56.3, 2007-02-21 19:50:48+03:00, kaa@polly.local +3 -0
  Moved the test requiring cp932 to a separate unit.
  
  This is for bug #18743.

  mysql-test/r/mysql_cp932.result@1.1, 2007-02-21 19:50:43+03:00, kaa@polly.local +10 -0
    Moved the test requiring cp932 to a separate unit

  mysql-test/r/mysql_cp932.result@1.0, 2007-02-21 19:50:43+03:00, kaa@polly.local +0 -0

  mysql-test/t/mysql.test@1.40, 2007-02-21 19:50:43+03:00, kaa@polly.local +0 -14
    Moved the test requiring cp932 to a separate unit

  mysql-test/t/mysql_cp932.test@1.1, 2007-02-21 19:50:43+03:00, kaa@polly.local +22 -0
    Moved the test requiring cp932 to a separate unit

  mysql-test/t/mysql_cp932.test@1.0, 2007-02-21 19:50:43+03:00, kaa@polly.local +0 -0

ChangeSet@1.1810.2531.5, 2007-02-21 13:02:57+02:00, monty@mysql.com +5 -0
  Fixed unsafe define of uint4korr()
  Fixed that --extern works with mysql-test-run.pl
  Small trivial cleanups

  include/my_global.h@1.96.1.38, 2007-02-21 13:02:55+02:00, monty@mysql.com +1 -1
    Fixed unsafe define of uint4korr()

  mysql-test/lib/mtr_report.pl@1.21.1.14, 2007-02-21 13:02:55+02:00, monty@mysql.com +4 -2
    Removed wrong messages when using --extern

  mysql-test/mysql-test-run.pl@1.30.74.1, 2007-02-21 13:02:55+02:00, monty@mysql.com +99 -80
    Fixed that --extern works
    Print help on stdout instead of stderr (make it easier to pipe it to less)

  mysql-test/t/ndb_lock.test@1.7.7.3, 2007-02-21 13:02:55+02:00, monty@mysql.com +1 -1
    Added other possible error code

  sql/sql_prepare.cc@1.142.1.50, 2007-02-21 13:02:55+02:00, monty@mysql.com +2 -2
    Removed not needed casts

ChangeSet@1.1616.2973.6, 2007-02-21 14:45:19+04:00, ramil@mysql.com +6 -0
  Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
  
  Having maybe_null flag unset for geometry/spatial functions leads to
  wrong Item_func_isnull::val_int()'s results.
  Fix: set maybe_null flag and add is_null() methods.

  mysql-test/r/gis.result@1.15.1.9, 2007-02-21 14:45:18+04:00, ramil@mysql.com +43 -1
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - test result.

  mysql-test/t/gis.test@1.17.1.5, 2007-02-21 14:45:18+04:00, ramil@mysql.com +35 -1
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - test case.

  sql/item_geofunc.cc@1.18.1.7, 2007-02-21 14:45:18+04:00, ramil@mysql.com +17 -12
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - set maybe_null flag for Item_geometry_func and Item_func_as_wkt.
      - moved length check to the beginnig of the 
        Item_func_spatial_collection::val_str() to affect geometry 
        collection objects at once.
      - changed Item_func_isempty::val_int() and Item_func_issimple::val_int()
        to properly handle null_value.

  sql/item_geofunc.h@1.8.1.3, 2007-02-21 14:45:18+04:00, ramil@mysql.com +32 -5
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - set maybe_null flag for geometry/spatial functions.
      - added is_null() to Item_geometry_func and Item_func_spatial_rel
        classes.

  sql/spatial.cc@1.19.2.1, 2007-02-21 14:45:18+04:00, ramil@mysql.com +7 -6
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - changed return type of Geometry::create_from_wkb() to be 
        consistent with Geometry::create_from_wkt(), now it returns
        Geometry object or NULL in case of error.

  sql/spatial.h@1.12.1.5, 2007-02-21 14:45:18+04:00, ramil@mysql.com +2 -2
    Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
      - changed return type of Geometry::create_from_wkb() to be 
        consistent with Geometry::create_from_wkt(), now it returns
        Geometry object or NULL in case of error.

ChangeSet@1.2409.51.5, 2007-02-20 21:42:45+01:00, kent@mysql.com +1 -0
  Raise version number after cloning 5.1.16-beta

  configure.in@1.435, 2007-02-20 21:42:35+01:00, kent@mysql.com +1 -1
    Raise version number after cloning 5.1.16-beta

ChangeSet@1.2409.1.46, 2007-02-20 21:00:05+01:00, msvensson@pilot.blaudden +2 -0
  Test for setting general_log_file to a directory fails
  since /tmp is used as the directory. It does not always
  exist so let's use one that always exists MYSQLTEST_VARDIR

  mysql-test/r/log_state.result@1.4, 2007-02-20 21:00:04+01:00, msvensson@pilot.blaudden +2 -2
    Test for setting general_log_file to a directory fails
    since /tmp is used as the directory. It does not always
    exist so let's use one that always exists MYSQLTEST_VARDIR

  mysql-test/t/log_state.test@1.5, 2007-02-20 21:00:04+01:00, msvensson@pilot.blaudden +8 -1
    Test for setting general_log_file to a directory fails
    since /tmp is used as the directory. It does not always
    exist so let's use one that always exists MYSQLTEST_VARDIR

ChangeSet@1.1810.2606.4, 2007-02-20 22:31:50+03:00, anozdrin@alik.opbmk +7 -0
  Fix for BUG#24415: Instance manager test im_daemon_life_cycle fails randomly.
  
  The cause of im_daemon_life_cycle.imtest random failures was the following
  behaviour of some implementations of LINUX threads: let's suppose that a
  process has several threads (in LINUX threads, there is a separate process for
  each thread). When the main process gets killed, the parent receives SIGCHLD
  before all threads (child processes) die. In other words, the parent receives
  SIGCHLD, when its child is not completely dead.
  
  In terms of IM, that means that IM-angel receives SIGCHLD when IM-main is not dead
  and still holds some resources. After receiving SIGCHLD, IM-angel restarts
  IM-main, but IM-main failed to initialize, because previous instance (copy) of
  IM-main still holds server socket (TCP-port).
  
  Another problem here was that IM-angel restarted IM-main only if it was killed
  by signal. If it exited with error, IM-angel thought it's intended / graceful
  shutdown and exited itself.
  
  So, when the second instance of IM-main failed to initialize, IM-angel thought
  it's intended shutdown and quit.
  
  The fix is
    1. to change IM-angel so that it restarts IM-main if it exited with error code;
    2. to change IM-main so that it returns proper exit code in case of failure.

  mysql-test/t/disabled.def@1.2.4.23, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +0 -1
    Enable im_daemon_life_cycle.

  server-tools/instance-manager/listener.cc@1.24.1.6, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +3 -0
    Set error status if Listener failed to initialize.

  server-tools/instance-manager/manager.cc@1.32.1.7, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +9 -5
    Return exit code from the manager.

  server-tools/instance-manager/manager.h@1.5.1.3, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +1 -1
    Return exit code from the manager.

  server-tools/instance-manager/mysqlmanager.cc@1.17.1.3, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +13 -15
    1. Restart IM-main if exit code is not EXIT_SUCCESS (0).
    2. Log IM-main exit code in case of failure.

  server-tools/instance-manager/thread_registry.cc@1.10.1.3, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +21 -0
    Add support for exit code.

  server-tools/instance-manager/thread_registry.h@1.6.1.3, 2007-02-20 22:31:48+03:00, anozdrin@alik.opbmk +4 -0
    Add support for exit code.

ChangeSet@1.1810.2614.2, 2007-02-20 22:29:18+03:00, kaa@polly.local +1 -0
  Fixed the binlog numbering after changes introduced by patch for bug18743.

  mysql-test/t/mysqlbinlog.test@1.21.7.2, 2007-02-20 22:29:16+03:00, kaa@polly.local +3 -3
    Fixed the binlog numbering after changes introduced by patch for bug18743.

ChangeSet@1.2430, 2007-02-20 21:28:30+03:00, anozdrin@alik.opbmk +4 -0
  Polishing:
    1. use MySQL headers instead of system ones;
    2. move logical part of code into a separate function.

  server-tools/instance-manager/angel.cc@1.2, 2007-02-20 21:28:28+03:00, anozdrin@alik.opbmk +5 -8
    Polishing: try not to use system headers.
    Use headers from include/ directory when it is possible.

  server-tools/instance-manager/manager.cc@1.48, 2007-02-20 21:28:28+03:00, anozdrin@alik.opbmk +50 -28
    Polishing: move logical part of code into a separate function.

  server-tools/instance-manager/manager.h@1.14, 2007-02-20 21:28:28+03:00, anozdrin@alik.opbmk +1 -0
    Polishing: move logical part of code into a separate function.

  server-tools/instance-manager/mysqlmanager.cc@1.28, 2007-02-20 21:28:28+03:00, anozdrin@alik.opbmk +3 -3
    Polishing: rollback rename.

ChangeSet@1.2409.1.45, 2007-02-20 18:47:47+01:00, msvensson@pilot.blaudden +15 -0
  Use "diff_files" instead ot "exec diff"

  mysql-test/extra/rpl_tests/rpl_row_UUID.test@1.5, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/extra/rpl_tests/rpl_row_blob.test@1.7, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/extra/rpl_tests/rpl_row_func003.test@1.3, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/extra/rpl_tests/rpl_row_sp006.test@1.4, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_ndb_bank.test@1.9, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_ndb_dd_advance.test@1.11, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_rbr_to_sbr.test@1.7, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_NOW.test@1.3, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_func002.test@1.4, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_sp001.test@1.5, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_sp011.test@1.4, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_trig001.test@1.5, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_row_trig003.test@1.3, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_sp004.test@1.5, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +1 -1
    Use "diff_files" instead ot "exec diff"

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.13.1.1, 2007-02-20 18:47:45+01:00, msvensson@pilot.blaudden +2 -2
    Use "diff_files" instead ot "exec diff"

ChangeSet@1.1810.2548.47, 2007-02-20 18:35:59+01:00, msvensson@pilot.blaudden +1 -0
  Use a temporary file to execute SQL commands with utf-8 chararcters

  mysql-test/t/rpl_temporary.test@1.15.1.8, 2007-02-20 18:35:58+01:00, msvensson@pilot.blaudden +8 -1
    Use a temporary file to execute SQL commands with utf-8 chararcters

ChangeSet@1.2429, 2007-02-20 20:31:16+03:00, anozdrin@alik.opbmk +1 -0
  Fix Windows build.

  server-tools/instance-manager/WindowsService.h@1.10, 2007-02-20 20:31:13+03:00, anozdrin@alik.opbmk +1 -1
    Fix Windows build.

ChangeSet@1.1810.2548.46, 2007-02-20 18:22:33+01:00, msvensson@pilot.blaudden +1 -0
  Replace "exec diff" with diff_files

  mysql-test/t/mysql.test@1.4.10.4, 2007-02-20 18:22:32+01:00, msvensson@pilot.blaudden +1 -1
    Replace "exec diff" with diff_files

ChangeSet@1.1616.2971.15, 2007-02-20 18:20:58+01:00, msvensson@pilot.blaudden +2 -0
  Add "diff_files" command to mysqltest

  client/mysqltest.c@1.92.21.48, 2007-02-20 18:20:57+01:00, msvensson@pilot.blaudden +75 -1
    Add "diff_files" command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.25, 2007-02-20 18:20:57+01:00, msvensson@pilot.blaudden +35 -0
    Add "diff_files" command to mysqltest

ChangeSet@1.1810.2613.1, 2007-02-20 16:50:54+01:00, bteam@mysql.com +1 -0
  Raise version number after cloning 5.0.36

  configure.in@1.245.1.182, 2007-02-20 16:50:44+01:00, bteam@mysql.com +2 -2
    Raise version number after cloning 5.0.36

ChangeSet@1.2409.55.3, 2007-02-20 16:29:56+01:00, msvensson@pilot.blaudden +2 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Fixes for 5.1

  sql/log.cc@1.253.1.4, 2007-02-20 16:29:54+01:00, msvensson@pilot.blaudden +1 -1
    Use "pidfile_name" instead of "glob_hostname" as base for
    log file name

  sql/mysqld.cc@1.601.16.3, 2007-02-20 16:29:54+01:00, msvensson@pilot.blaudden +1 -1
    Use "pidfile_name" instead of "glob_hostname" as base for
    log file name

ChangeSet@1.1810.2612.2, 2007-02-20 16:24:38+01:00, msvensson@pilot.blaudden +5 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Part 2, add @@hostname system variable

  mysql-test/r/variables.result@1.76.1.15, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +8 -0
    Add testcase for @@hostname

  mysql-test/t/variables.test@1.51.1.15, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +11 -0
    Add testcase for @@hostname

  sql/log.cc@1.158.17.1, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +1 -1
    Use pidfile_name as base when generating the default log name

  sql/mysqld.cc@1.439.82.17, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +10 -4
    Init "glob_hostname" to that of hostname, fallback to "localhost"
    if 'gethostname' should fail.
    Init "pidfile_name" to hostname.pid and fallback to "mysql.pid" if
    'gethostname' should fail 

  sql/set_var.cc@1.125.22.4, 2007-02-20 16:24:37+01:00, msvensson@pilot.blaudden +6 -0
    Add new system variable "hostname"

ChangeSet@1.1616.2971.14, 2007-02-20 14:20:49+01:00, msvensson@pilot.blaudden +1 -0
  New version of 'do_cat_file' that will trim cr/lf to lf

  client/mysqltest.c@1.92.21.47, 2007-02-20 14:20:48+01:00, msvensson@pilot.blaudden +20 -3
    New version of 'do_cat_file' that will trim cr/lf to lf

ChangeSet@1.1616.2881.51, 2007-02-20 13:10:27+01:00, joerg@trift2. +1 -0
  After-merge fix:
  The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".

  mysys/thr_alarm.c@1.44.2.6, 2007-02-20 13:10:25+01:00, joerg@trift2. +1 -0
    After-merge fix:
    In 4.1, the variable "thr_client_alarm" is declared in this module.

ChangeSet@1.1810.2548.43, 2007-02-20 13:06:01+01:00, msvensson@pilot.blaudden +1 -0
  Change "exec echo" commands with different delimiters that are also
  escape chars to use "write_file" to avoid confusion about what's what.

  mysql-test/t/mysql.test@1.4.10.3, 2007-02-20 13:05:59+01:00, msvensson@pilot.blaudden +10 -4
    Change "exec echo" commands with different delimiters that are also
    escape chars to use "write_file" to avoid confusion about what's what.

ChangeSet@1.1810.2612.1, 2007-02-20 12:48:15+01:00, msvensson@pilot.blaudden +4 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Add test of bootstrap mode
   - Make mysqld return error if bootstrap failed  

  mysql-test/mysql-test-run.pl@1.30.49.56, 2007-02-20 12:48:13+01:00, msvensson@pilot.blaudden +5 -2
    Remove options --skip-grant-tables as that is always
    turned on by --bootstrap
    Remove options --console as that does not affect --bootstrap mode
    at all
    Add environment variable MYSQLD_BOOTSTRAP_CMD containing path 
    to mysqld and the arguments used for bootstrap

  mysql-test/r/bootstrap.result@1.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +8 -0
    New BitKeeper file ``mysql-test/r/bootstrap.result''

  mysql-test/r/bootstrap.result@1.0, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +0 -0

  mysql-test/t/bootstrap.test@1.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +46 -0
    New BitKeeper file ``mysql-test/t/bootstrap.test''

  mysql-test/t/bootstrap.test@1.0, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +0 -0

  sql/sql_parse.cc@1.426.141.1, 2007-02-20 12:48:14+01:00, msvensson@pilot.blaudden +12 -1
    Abort bootstrap if execution fails
    Report error to stderr/log

ChangeSet@1.1810.2548.42, 2007-02-20 12:06:04+01:00, msvensson@pilot.blaudden +1 -0
  Bug#25807 LOAD DATA INFILE does not work with Pipes
   - Additional fix for io_cache_init being called on a closed file

  mysys/mf_iocache.c@1.56.1.10, 2007-02-20 12:06:02+01:00, msvensson@pilot.blaudden +19 -15
    The file does not need to be open when init_io_cache is called
    so don't call my_tell in that case

ChangeSet@1.2428, 2007-02-20 12:28:24+03:00, anozdrin@booka. +2 -0
  Fix build failures on Windows and Mac.

  server-tools/instance-manager/WindowsService.cpp@1.9, 2007-02-20 12:28:21+03:00, anozdrin@booka. +1 -0
    Include my_global.h for DBUG_ASSERT.

  server-tools/instance-manager/mysqlmanager.cc@1.27, 2007-02-20 12:28:21+03:00, anozdrin@booka. +1 -0
    Include my_dir.h for umask().

ChangeSet@1.1616.2971.13, 2007-02-19 20:34:12+01:00, msvensson@pilot.blaudden +1 -0
  Turn the "is_windows" flag _on_ when compiled on windows

  client/mysqltest.c@1.92.21.46, 2007-02-19 20:34:11+01:00, msvensson@pilot.blaudden +1 -1
    Turn the "is_windows" flag _on_ when compiled on windows

ChangeSet@1.1810.2548.40, 2007-02-19 20:30:34+01:00, msvensson@pilot.blaudden +1 -0
  Remove extra ; at end of line

  mysql-test/t/mysqldump.test@1.76.1.34, 2007-02-19 20:30:33+01:00, msvensson@pilot.blaudden +4 -4
    Remove extra ; at end of line

ChangeSet@1.1810.2548.39, 2007-02-19 18:25:42+01:00, msvensson@pilot.blaudden +1 -0
  Remove unportable constructs in mysqldump.test

  mysql-test/t/mysqldump.test@1.76.1.33, 2007-02-19 18:25:41+01:00, msvensson@pilot.blaudden +14 -12
    Remove unportable constructs in mysqldump.test

ChangeSet@1.1616.2971.12, 2007-02-19 18:23:59+01:00, msvensson@pilot.blaudden +2 -0
  Commment out two test's thats just confusing for cmd.exe 

  mysql-test/r/mysqltest.result@1.3.1.19, 2007-02-19 18:23:58+01:00, msvensson@pilot.blaudden +0 -3
    Commment out two test's thats just confusing for cmd.exe 

  mysql-test/t/mysqltest.test@1.3.1.24, 2007-02-19 18:23:58+01:00, msvensson@pilot.blaudden +4 -4
    Commment out two test's thats just confusing for cmd.exe 

ChangeSet@1.1616.2971.11, 2007-02-19 18:19:47+01:00, msvensson@pilot.blaudden +3 -0
  Add cat_file command to mysqltest

  client/mysqltest.c@1.92.21.45, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +47 -1
    Add cat_file command to mysqltest

  mysql-test/r/mysqltest.result@1.3.1.18, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +4 -0
    Add cat_file command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.23, 2007-02-19 18:19:46+01:00, msvensson@pilot.blaudden +14 -0
    Add cat_file command to mysqltest

ChangeSet@1.1810.2548.36, 2007-02-19 17:40:34+01:00, msvensson@pilot.blaudden +1 -0
  Use a temporary file to pass UTF8 chars to "mysql" in a portable
  way

  mysql-test/t/mysqlbinlog.test@1.21.6.1, 2007-02-19 17:40:33+01:00, msvensson@pilot.blaudden +9 -1
    Use a temporary file to pass UTF8 chars to "mysql" in a portable
    way

ChangeSet@1.2409.1.36, 2007-02-19 17:06:47+01:00, msvensson@pilot.blaudden +2 -0
  Remove non portable exec's from csv.test

  mysql-test/r/csv.result@1.18, 2007-02-19 17:06:45+01:00, msvensson@pilot.blaudden +0 -7
    Update result file
     - There is no builtin equvivalent of "cat"
     - ls was replaced with "file_exists" which does not produce any output

  mysql-test/t/csv.test@1.23, 2007-02-19 17:06:45+01:00, msvensson@pilot.blaudden +35 -15
    Replce obscure exec's with mysqltest builtin commands

ChangeSet@1.1616.2971.10, 2007-02-19 16:39:50+01:00, msvensson@pilot.blaudden +2 -0
  Add "append_file" command to mysqltest

  client/mysqltest.c@1.92.21.44, 2007-02-19 16:39:49+01:00, msvensson@pilot.blaudden +90 -30
    Add "append_file" command to mysqltest

  mysql-test/t/mysqltest.test@1.3.1.22, 2007-02-19 16:39:49+01:00, msvensson@pilot.blaudden +19 -0
    Add "append_file" command to mysqltest

ChangeSet@1.2422.1.2, 2007-02-19 16:09:55+01:00, thek@kpdesk.mysql.com +2 -0
  Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00' as the date time
  
  - Merged from 5.0
  - Removed redundant call to set_time(); now included in init_for_queries

  sql/ha_ndbcluster.cc@1.397.6.1, 2007-02-19 16:09:52+01:00, thek@kpdesk.mysql.com +0 -1
    Removed redundant call to set_time(); now included in init_for_queries

  sql/ha_ndbcluster_binlog.cc@1.95.3.1, 2007-02-19 16:09:52+01:00, thek@kpdesk.mysql.com +0 -1
    Removed redundant call to set_time(); now included in init_for_queries

ChangeSet@1.1810.2548.34, 2007-02-19 15:46:32+01:00, msvensson@pilot.blaudden +1 -0
  Replace "exec rm" with  remove_file and "exec touch" with "write_file"

  mysql-test/t/csv.test@1.5.1.5, 2007-02-19 15:46:30+01:00, msvensson@pilot.blaudden +4 -2
    Replace "exec rm" with  remove_file and "exec touch" with "write_file"

ChangeSet@1.1810.2528.14, 2007-02-19 14:57:54+01:00, thek@kpdesk.mysql.com +4 -0
  Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time
  
  - Starting time of a query sent by bootstrapping wasn't initialized
    and starting time defaulted to 0. This later used value by NOW-
    item and was translated to 1970-01-01 11:00:00.
  - Marketing the time with thd->set_time() before the call to
    mysql_parse resolves this issue.
  - set_time was refactored to be part of the thd->init_for_queries-
    process.

  mysql-test/r/init_file.result@1.3, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +7 -0
    Manual merge from 4.1

  mysql-test/std_data/init_file.dat@1.8, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +9 -0
    Manual merge from 4.1

  sql/sql_class.cc@1.223.20.1, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +1 -0
    - Moved set_time into init_for_queries process.

  sql/sql_parse.cc@1.426.140.2, 2007-02-19 14:57:52+01:00, thek@kpdesk.mysql.com +1 -2
    Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time
    
    - Starting time of a query sent by bootstrapping wasn't initialized
      and starting time defaulted to 0. This later used value by NOW-
      item and was translated to 1970-01-01 11:00:00.
    - Marketing the time with thd->set_time() before the call to
      mysql_parse resolves this issue.
    - set_time was refactored to be part of the thd->init_for_queries-
      process.

ChangeSet@1.2426, 2007-02-19 15:48:00+03:00, kostja@bodhi.local +1 -0
  Fix a merge error (4.1->5.0 merge from 2005)

  sql/sql_parse.cc@1.629, 2007-02-19 15:47:56+03:00, kostja@bodhi.local +0 -3
    Fix a merge error (4.1->5.0 merge from 2005)

ChangeSet@1.1810.2611.1, 2007-02-19 14:39:37+02:00, gkodinov@macbook.gmz +9 -0
  Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
   Several problems fixed: 
    1. There was a "catch-all" context initialization in setup_tables()
      that was causing the table that we insert into to be visible in the 
      SELECT part of an INSERT .. SELECT .. statement with no tables in
      its FROM clause. This was making sure all the under-initialized
      contexts in various parts of the code are not left uninitialized.
      Fixed by removing the "catch-all" statement and initializing the 
      context in the parser.
    2. Incomplete name resolution context when resolving the right-hand
      values in the ON DUPLICATE KEY UPDATE ... part of an INSERT ... SELECT ...
      caused columns from NATURAL JOIN/JOIN USING table references in the
      FROM clause of the select to be unavailable.
      Fixed by establishing a proper name resolution context.
    3. When setting up the special name resolution context for problem 2
      there was no check for cases where an aggregate function without a
      GROUP BY effectively takes the column from the SELECT part of an 
      INSERT ... SELECT unavailable for ON DUPLICATE KEY UPDATE.
      Fixed by checking for that condition when setting up the name 
      resolution context.

  mysql-test/r/insert_update.result@1.18.1.3, 2007-02-19 14:39:24+02:00, gkodinov@macbook.gmz +17 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - test case

  mysql-test/t/insert_update.test@1.20.1.1, 2007-02-19 14:39:25+02:00, gkodinov@macbook.gmz +23 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - test case

  sql/item.h@1.183.21.1, 2007-02-19 14:39:25+02:00, gkodinov@macbook.gmz +6 -1
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - save_next_local is not referenced any more outside class methods

  sql/sql_base.cc@1.235.81.1, 2007-02-19 14:39:26+02:00, gkodinov@macbook.gmz +2 -15
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - removed a "catch-all" code to cater for correct context initialization

  sql/sql_help.cc@1.47.1.7, 2007-02-19 14:39:27+02:00, gkodinov@macbook.gmz +2 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - fixed the name resolution context initialization

  sql/sql_insert.cc@1.146.47.1, 2007-02-19 14:39:28+02:00, gkodinov@macbook.gmz +39 -38
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Fixed the context of resolving the values in INSERT SELECT ON UPDATE

  sql/sql_prepare.cc@1.142.25.1, 2007-02-19 14:39:29+02:00, gkodinov@macbook.gmz +8 -13
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Correct context for name resolution of prepared INSERT .. SELECT

  sql/sql_union.cc@1.130.3.3, 2007-02-19 14:39:30+02:00, gkodinov@macbook.gmz +2 -0
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - fixed the name resolution context initialization

  sql/sql_yacc.yy@1.371.95.1, 2007-02-19 14:39:30+02:00, gkodinov@macbook.gmz +6 -1
    Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.
     - Set the context here instead of setup_tables()

ChangeSet@1.2372.32.2, 2007-02-19 15:31:55+03:00, kaa@polly.local +5 -0
  5.1-specific fix for bug #18743.
  
  Moved tests requiring ucs2 from mix2_myisam.test to a separate unit.

  mysql-test/include/mix2.inc@1.4.1.1, 2007-02-19 15:31:49+03:00, kaa@polly.local +0 -222
    Moved tests requiring ucs2 to a separate unit

  mysql-test/include/mix2_ucs2.inc@1.1, 2007-02-19 15:31:50+03:00, kaa@polly.local +228 -0
    Moved tests requiring ucs2 to a separate unit

  mysql-test/include/mix2_ucs2.inc@1.0, 2007-02-19 15:31:50+03:00, kaa@polly.local +0 -0

  mysql-test/r/mix2_myisam.result@1.5, 2007-02-19 15:31:49+03:00, kaa@polly.local +0 -312
    Moved tests requiring ucs2 to a separate unit

  mysql-test/r/mix2_myisam_ucs2.result@1.1, 2007-02-19 15:31:49+03:00, kaa@polly.local +312 -0
    Moved tests requiring ucs2 to a separate unit

  mysql-test/r/mix2_myisam_ucs2.result@1.0, 2007-02-19 15:31:49+03:00, kaa@polly.local +0 -0

  mysql-test/t/mix2_myisam_ucs2.test@1.1, 2007-02-19 15:31:50+03:00, kaa@polly.local +27 -0
    Moved tests requiring ucs2 to a separate unit

  mysql-test/t/mix2_myisam_ucs2.test@1.0, 2007-02-19 15:31:50+03:00, kaa@polly.local +0 -0

ChangeSet@1.1810.2548.33, 2007-02-19 13:21:06+01:00, msvensson@pilot.blaudden +1 -0
  Add echo.c as EXTRA_DIST file

  client/Makefile.am@1.52.1.12, 2007-02-19 13:21:04+01:00, msvensson@pilot.blaudden +1 -1
    Add echo.c as EXTRA_DIST file

ChangeSet@1.2409.1.32, 2007-02-19 12:59:19+01:00, msvensson@pilot.blaudden +1 -0
  Bug#25592 wrong reporting for mysql-test-run.pl --mysqld=--binlog-format=...

  mysql-test/mysql-test-run.pl@1.273, 2007-02-19 12:59:18+01:00, msvensson@pilot.blaudden +1 -1
    Allow both dash and underscore as separator for mysqld option

ChangeSet@1.2409.1.29, 2007-02-19 12:25:25+01:00, msvensson@pilot.blaudden +1 -0
  Clean "gen_lex_hash" if it's been built

  sql/Makefile.am@1.176, 2007-02-19 12:25:24+01:00, msvensson@pilot.blaudden +1 -0
    Clean "gen_lex_hash" if it's been built

ChangeSet@1.1810.2548.30, 2007-02-19 12:03:42+01:00, msvensson@pilot.blaudden +2 -0
  Update for running with cmd.exe directly

  mysql-test/r/mysqltest.result@1.24.8.2, 2007-02-19 12:03:41+01:00, msvensson@pilot.blaudden +0 -2
    Update result file after removing one test

  mysql-test/t/mysqltest.test@1.24.8.3, 2007-02-19 12:03:41+01:00, msvensson@pilot.blaudden +35 -22
    Remove use of "ls" in system
    Rewrite "system echo" which introduces CR/LF problems
    with  "write_file"
    Remove test for end of line junk for "write_file" - it has mismatching number of "'s 

ChangeSet@1.1616.2971.9, 2007-02-19 12:00:17+01:00, msvensson@pilot.blaudden +1 -0
  Don't output escape char from 'do_eval' on windows. "It" won't 
  know it's an escape char.
  Replace /dev/null with NUL
  Replace "closed stdout" with "not open fd"

  client/mysqltest.c@1.92.21.43, 2007-02-19 12:00:16+01:00, msvensson@pilot.blaudden +20 -3
    Don't output escape char from 'do_eval' on windows. "It" won't 
    know it's an escape char.
    Replace /dev/null with NUL
    Replace "closed stdout" with "not open fd"

ChangeSet@1.1810.2610.1, 2007-02-19 13:57:06+03:00, kaa@polly.local +19 -0
  Bug#18743: Several test cases fails if "classic" configuration in 5.0
  The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
  - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
  - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"

  mysql-test/t/ctype_cp932.test@1.8.4.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +14 -0
    Moved cp932-specific test case from mysql.test

  mysql-test/r/ctype_cp932.result@1.6.4.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +10 -0
    Moved cp932-specific test case from mysql.test

  mysql-test/r/innodb-ucs2.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +313 -0
    New BitKeeper file ``mysql-test/r/innodb-ucs2.result''

  mysql-test/r/innodb-ucs2.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/innodb.result@1.145.5.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -312
    Moved ucs2-specific test cases to innodb-ucs2.test

  mysql-test/r/mysql.result@1.17.2.10, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -10
    Move cp932-specific test cases to ctype_cp932.test

  mysql-test/r/mysqlbinlog-cp932.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +19 -0
    New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''

  mysql-test/r/mysqlbinlog-cp932.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/mysqlbinlog.result@1.24.2.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -18
    Moved cp932-specific test case to mysqlbinlog-cp932.test

  mysql-test/r/sp-ucs2.result@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +14 -0
    New BitKeeper file ``mysql-test/r/sp-ucs2.result''

  mysql-test/r/sp-ucs2.result@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/r/sp.result@1.170.32.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -14
    Moved ucs2-specific test case to sp-ucs2.test

  mysql-test/t/ctype_ucs2_def-master.opt@1.3.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +1 -1
    Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server

  mysql-test/t/ctype_ucs2_def.test@1.3.1.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -0
    Added requirement for ucs2 in the server

  mysql-test/t/innodb-ucs2.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +226 -0
    New BitKeeper file ``mysql-test/t/innodb-ucs2.test''

  mysql-test/t/innodb-ucs2.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/innodb.test@1.118.6.2, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -222
    Moved ucs2-specific test cases to innodb-ucs2.test

  mysql-test/t/mysql.test@1.4.11.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +0 -14
    Move cp932-specific test cases to ctype_cp932.test

  mysql-test/t/mysqlbinlog-cp932.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +19 -0
    New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''

  mysql-test/t/mysqlbinlog-cp932.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/mysqlbinlog.test@1.21.5.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +3 -18
    Moved cp932-specific test case to mysqlbinlog-cp932.test

  mysql-test/t/sp-ucs2.test@1.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +28 -0
    New BitKeeper file ``mysql-test/t/sp-ucs2.test''

  mysql-test/t/sp-ucs2.test@1.0, 2007-02-19 13:57:03+03:00, kaa@polly.local +0 -0

  mysql-test/t/sp.test@1.174.31.1, 2007-02-19 13:57:02+03:00, kaa@polly.local +2 -23
    Moved ucs2-specific test case to sp-ucs2.test

  sql/mysqld.cc@1.439.97.1, 2007-02-19 13:57:03+03:00, kaa@polly.local +27 -4
    Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
    mysqld --default-character-set=ucs2,latin1
    The first available character set will be chosen.

ChangeSet@1.1616.2957.2, 2007-02-19 09:37:34+01:00, thek@kpdesk.mysql.com +4 -0
  Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
  
  - Starting time of a query sent by file bootstrapping wasn't initialized
    and starting time defaulted to 0. This later used value by the Now-
    item and is translated to 1970-01-01 11:00:00.
  - marking the time with thd->set_time() before the call to 
    mysql_parse resolves this issue.

  mysql-test/r/init_file.result@1.1.1.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +7 -0
    Appended test case

  mysql-test/std_data/init_file.dat@1.3.2.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +8 -0
    Appended test case

  mysql-test/t/init_file.test@1.6.1.2, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +9 -0
    Appended test case

  sql/sql_parse.cc@1.271.132.1, 2007-02-19 09:37:32+01:00, thek@kpdesk.mysql.com +1 -0
    Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time
    
    - Starting time of a query sent by file bootstrapping wasn't initialized
      and starting time defaulted to 0. This later used value by the Now-
      item and is translated to 1970-01-01 11:00:00.
    - marking the time with thd->set_time() before the call to 
      mysql_parse resolves this issue.

ChangeSet@1.2425, 2007-02-18 15:45:28+03:00, anozdrin@alik.opbmk +15 -0
  Patch for IM in scope of working on BUG#24415: Instance manager test
  im_daemon_life_cycle fails randomly.
  
  1. Move IM-angel functionality into a separate file, create Angel class.
  2. Be more verbose;
  3. Fix typo in FLUSH INSTANCES implementation;
  4. Polishing.

  mysql-test/r/im_options.result@1.5, 2007-02-18 15:45:23+03:00, anozdrin@alik.opbmk +3 -7
    Updated result file.

  mysql-test/t/im_cmd_line.imtest@1.4, 2007-02-18 15:45:23+03:00, anozdrin@alik.opbmk +2 -2
    Updated test.

  server-tools/instance-manager/IMService.cpp@1.13, 2007-02-18 15:45:23+03:00, anozdrin@alik.opbmk +42 -27
    Move HandleServiceOptions() into IMService::main().

  server-tools/instance-manager/IMService.h@1.8, 2007-02-18 15:45:23+03:00, anozdrin@alik.opbmk +4 -3
    Move HandleServiceOptions() into IMService::main().

  server-tools/instance-manager/Makefile.am@1.48, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +3 -1
    Added angel.cc and angel.h.

  server-tools/instance-manager/WindowsService.cpp@1.8, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +18 -8
    Initialize class-members in constructor.

  server-tools/instance-manager/WindowsService.h@1.9, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +1 -3
    Initialize class-members in constructor.

  server-tools/instance-manager/angel.cc@1.1, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +401 -0
    IM-angel functionality.

  server-tools/instance-manager/angel.cc@1.0, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +0 -0

  server-tools/instance-manager/angel.h@1.1, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +34 -0
    IM-angel functionality.

  server-tools/instance-manager/angel.h@1.0, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +0 -0

  server-tools/instance-manager/commands.cc@1.45, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +4 -2
    Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE)
    from FLUSH INSTANCES.

  server-tools/instance-manager/manager.cc@1.47, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +29 -20
    1. Return actual error code from Manager::flush_instances().
    2. Be more verbose.

  server-tools/instance-manager/manager.h@1.13, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +1 -1
    Return actual error code from Manager::flush_instances().

  server-tools/instance-manager/mysqlmanager.cc@1.26, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +104 -270
    Move IM-angel functionality into separate file (angel.cc).

  server-tools/instance-manager/priv.cc@1.20, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +4 -4
    Use return bool datatype instead int{ 0, 1 }.

  server-tools/instance-manager/priv.h@1.18, 2007-02-18 15:45:24+03:00, anozdrin@alik.opbmk +1 -1
    Use return bool datatype instead int{ 0, 1 }.

ChangeSet@1.1810.2600.4, 2007-02-16 15:43:50-08:00, igor@olga.mysql.com +1 -0
  Adjusted results after fix for bug 25971.

  mysql-test/r/bdb.result@1.48.3.2, 2007-02-16 15:43:49-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after fix for bug 25971.

ChangeSet@1.1810.2600.3, 2007-02-16 14:30:25-08:00, igor@olga.mysql.com +1 -0
  Adjusted results after fix for bug 25971.

  mysql-test/r/bdb.result@1.48.3.1, 2007-02-16 14:30:23-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after fix for bug 25971.

ChangeSet@1.1810.2606.2, 2007-02-16 13:42:52-07:00, malff@weblab.(none) +4 -0
  Manual merge

  mysql-test/r/subselect.result@1.134.1.40, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +125 -18
    Manual merge

  mysql-test/r/view.result@1.138.1.55, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +121 -9
    Manual merge

  mysql-test/t/subselect.test@1.129.1.12, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +93 -0
    Manual merge

  mysql-test/t/view.test@1.126.1.52, 2007-02-16 13:42:51-07:00, malff@weblab.(none) +89 -7
    Manual merge

ChangeSet@1.1810.2607.1, 2007-02-16 19:39:28+03:00, evgen@moonbone.local +6 -0
  Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
  UPDATE contains wrong data if the SELECT employs a temporary table.
  
  If the UPDATE values of the INSERT .. SELECT .. ON DUPLICATE KEY UPDATE
  statement contains fields from the SELECT part and the select employs a
  temporary table then those fields will contain wrong values because they
  aren't corrected to get data from the temporary table.
  
  The solution is to add these fields to the selects all_fields list,
  to store pointers to those fields in the selects ref_pointer_array and
  to access them via Item_ref objects.
  
  The substitution for Item_ref objects is done in the new function called 
  Item_field::update_value_transformer(). It is called through the
  item->transform() mechanism at the end of the select_insert::prepare()
  function.

  mysql-test/r/insert_select.result@1.35.1.10, 2007-02-16 19:38:47+03:00, evgen@moonbone.local +13 -0
    Added a test case for bug#16630: The update fields of the INSERT .. SELECT ..
    ON DUPLICATE KEY UPDATE contains wrong data if the SELECT employs a 
    temporary table.

  mysql-test/t/insert_select.test@1.34.1.3, 2007-02-16 19:38:50+03:00, evgen@moonbone.local +15 -0
    Added a test case for bug#16630: The update fields of the INSERT .. SELECT ..
    ON DUPLICATE KEY UPDATE contains wrong data if the SELECT employs a 
    temporary table.

  sql/item.cc@1.113.70.1, 2007-02-16 19:38:21+03:00, evgen@moonbone.local +45 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    The new method Item_field::update_value_transformer() is added. It
    substitutes fields in the update values list for references 
    (Item_ref objects) to them.

  sql/item.h@1.183.16.7, 2007-02-16 19:38:36+03:00, evgen@moonbone.local +2 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    The update_value_transformer() method is added to the Item and to the
    Item_field classes.

  sql/sql_insert.cc@1.146.45.4, 2007-02-16 19:38:40+03:00, evgen@moonbone.local +16 -0
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    Traverse update values and substitute fields from the select for
    references (Item_ref objects) to them.

  sql/sql_select.cc@1.312.131.1, 2007-02-16 19:38:45+03:00, evgen@moonbone.local +3 -3
    Bug#16630: The update fields of the INSERT .. SELECT .. ON DUPLICATE KEY
    UPDATE contains wrong data if the SELECT employs a temporary table.
    Traverse update values and substitute fields from the select for
    references (Item_ref objects) to them.

ChangeSet@1.1346.893.4, 2007-02-16 16:31:31+01:00, joerg@trift2. +1 -0
  include/config-win.h  :  
  Companion change to this one
     ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
       include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
  which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
  TAG: mysql-4.0.30

  include/config-win.h@1.23.1.15, 2007-02-16 16:31:29+01:00, joerg@trift2. +1 -1
    Companion change to this one
       ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
         include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
    which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...

ChangeSet@1.1810.2548.29, 2007-02-16 16:08:08+01:00, msvensson@pilot.blaudden +1 -0
  Use " instead of ' to avoid win problem with '

  mysql-test/t/mysql.test@1.4.10.2, 2007-02-16 16:08:06+01:00, msvensson@pilot.blaudden +2 -2
    Use " instead of ' to avoid win problem with '

ChangeSet@1.2409.1.26, 2007-02-16 15:33:54+01:00, msvensson@pilot.blaudden +1 -0
  Add echo to be compiled

  client/CMakeLists.txt@1.16, 2007-02-16 15:33:52+01:00, msvensson@pilot.blaudden +3 -0
    Add echo to be compiled

ChangeSet@1.1810.2548.28, 2007-02-16 15:25:49+01:00, msvensson@pilot.blaudden +1 -0
  Add echo.c to be built on Windows

  client/CMakeLists.txt@1.1.4.1, 2007-02-16 15:25:48+01:00, msvensson@pilot.blaudden +2 -0
    Add echo.c to be built on Windows

ChangeSet@1.1616.2978.1, 2007-02-16 15:19:38+01:00, msvensson@neptunus.(none) +4 -0
  Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
  mainly occurs on win2003 64bit.
   - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." 

  client/echo.c@1.1, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +45 -0
    New BitKeeper file ``client/echo.c''

  client/echo.c@1.0, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +0 -0

  client/mysqltest.c@1.92.25.1, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +84 -9
    Workaround the problem with "echo" in windows not behaving like "echo" in Unix.
    - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing
      use of our own echo implementation which baheves like on Unix.
    - The above change makes it possible to remove the need to execute all --exec's
      inside cygwin. Add ifdefs to only use use cygwin's bash conditionally  

  mysql-test/lib/mtr_misc.pl@1.5.1.6, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +11 -0
    Add function for converting to the OS's native format

  mysql-test/mysql-test-run.pl@1.8.20.3, 2007-02-16 15:19:35+01:00, msvensson@neptunus.(none) +21 -13
    Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode
    necessary for pipes and redirects to work properly in cmd.exe

ChangeSet@1.2389.1.7, 2007-02-16 13:56:06+02:00, gkodinov@macbook.gmz +5 -0
  BUG#20420: optimizer reports wrong keys on left join with IN
   When checking if an IN predicate can be evaluated using a key
   the optimizer makes sure that all the arguments of IN are of
   the same result type. To assure that it check whether 
   Item_func_in::array is filled in. 
   However Item_func_in::array is set if the types are
   the same AND all the arguments are compile time constants.
   Fixed by introducing Item_func_in::arg_types_compatible
   flag to allow correct checking of the desired condition.

  mysql-test/r/func_in.result@1.32.1.3, 2007-02-16 13:55:58+02:00, gkodinov@macbook.gmz +44 -0
    BUG#20420: optimizer reports wrong keys on left join with IN
     - reenabled the test case

  mysql-test/t/func_in.test@1.24.1.3, 2007-02-16 13:55:58+02:00, gkodinov@macbook.gmz +35 -36
    BUG#20420: optimizer reports wrong keys on left join with IN
     - reenabled the test case

  sql/item_cmpfunc.cc@1.234.5.1, 2007-02-16 13:55:59+02:00, gkodinov@macbook.gmz +13 -9
    BUG#20420: optimizer reports wrong keys on left join with IN
     Check the IN argument types in a correct way

  sql/item_cmpfunc.h@1.140.1.1, 2007-02-16 13:55:59+02:00, gkodinov@macbook.gmz +7 -1
    BUG#20420: optimizer reports wrong keys on left join with IN
     Check the IN argument types in a correct way

  sql/opt_range.cc@1.255.2.1, 2007-02-16 13:56:00+02:00, gkodinov@macbook.gmz +2 -2
    BUG#20420: optimizer reports wrong keys on left join with IN
     Check the IN argument types in a correct way

ChangeSet@1.2424, 2007-02-15 18:47:39-07:00, malff@weblab.(none) +3 -0
  Manual merge

  mysql-test/r/view.result@1.207, 2007-02-15 18:47:34-07:00, malff@weblab.(none) +121 -20
    Manual merge

  mysql-test/t/view.test@1.187, 2007-02-15 18:47:34-07:00, malff@weblab.(none) +90 -18
    Manual merge

  sql/sql_parse.cc@1.628, 2007-02-15 18:47:34-07:00, malff@weblab.(none) +109 -96
    Manual merge

ChangeSet@1.2390.24.4, 2007-02-15 20:28:58+01:00, guilhem@gbichot3.local +13 -0
  Manual merge from 5.0-rpl, of fixes for:
  1)
    BUG#25507 "multi-row insert delayed + auto increment causes
    duplicate key entries on slave" (two concurrrent connections doing
    multi-row INSERT DELAYED to insert into an auto_increment column,
    caused replication slave to stop with "duplicate key error" (and
    binlog was wrong), and BUG#26116 "If multi-row INSERT
    DELAYED has errors, statement-based binlogging breaks" (the binlog
    was not accounting for all rows inserted, or slave could stop).
    The fix is that: in statement-based binlogging, a multi-row INSERT
    DELAYED is silently converted to a non-delayed INSERT.
    This is supposed to not affect many 5.1 users as in 5.1, the default
    binlog format is "mixed", which does not have the bug (the bug is
    only with binlog_format=STATEMENT).
    We should document how the system delayed_insert thread decides of
    its binlog format (which is not modified by this patch):
    this decision is taken when the thread is created
    and holds until it is terminated (is not affected by any later change
    via SET GLOBAL BINLOG_FORMAT). It is also not affected by the binlog
    format of the connection which issues INSERT DELAYED (this binlog
    format does not affect how the row will be binlogged).
    If one wants to change the binlog format of its server with SET
    GLOBAL BINLOG_FORMAT, it should do FLUSH TABLES to be sure all
    delayed_insert threads terminate and thus new threads are created,
    taking into account the new format.
  2)
    BUG#24432
    "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
    When in an INSERT ON DUPLICATE KEY UPDATE, using
    an autoincrement column, we inserted some autogenerated values and
    also updated some rows, some autogenerated values were not used
    (for example, even if 10 was the largest autoinc value in the table
    at the start of the statement, 12 could be the first autogenerated
    value inserted by the statement, instead of 11). One autogenerated
    value was lost per updated row. Led to exhausting the range of the
    autoincrement column faster.
    Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
    This bug breaks replication from a pre-5.0.24/pre-5.1.12 master.
    But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
    behave like pre-5.0.24/pre-5.1.12, breaks replication from a
    [5.0.24,5.0.34]/[5.1.12,5.1.15]
    master to a fixed (5.0.36/5.1.16) slave! To warn users against this when
    they upgrade their slave, as agreed with the support team, we add
    code for a fixed slave to detect that it is connected to a buggy
    master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
    likely to break replication, in which case it cannot replicate so
    stops and prints a message to the slave's error log and to SHOW SLAVE
    STATUS.
    For 5.0.36->[5.0.24,5.0.34] replication or 5.1.16->[5.1.12,5.1.15]
    replication we cannot warn as master
    does not know the slave's version (but we always recommended to users
    to have slave at least as new as master).
    As agreed with support, I have asked for an alert to be put into
    the MySQL Network Monitoring and Advisory Service.
  3) note that I'll re-enable rpl_insert_id as soon as 5.1-rpl gets
    the changes from the main 5.1.

  BitKeeper/deleted/.del-rpl_insert_delayed.result@1.2, 2007-02-15 16:12:16+01:00, guilhem@gbichot3.local +0 -0
    Delete: mysql-test/r/rpl_insert_delayed.result

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.3, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +24 -5
    tests for BUG#25507 (lauch many concurrent INSERT DELAYED into an auto_inc
    column and see if they cause duplicates) and BUG#26116 (see if one error
    at first row on master makes the slave's data incorrect).
    It is then incorporated into a statement-based and mixed binlogging
    test, and into a row-based test.
    It is in fact mysql-test/t/rpl_insert_delayed.test from 5.0, renamed
    and extended to test BUG#25507.

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.2, 2007-02-15 16:11:29+01:00, guilhem@gbichot3.local +0 -0
    Rename: mysql-test/t/rpl_insert_delayed.test -> mysql-test/extra/rpl_tests/rpl_insert_delayed.test

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.14.1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +54 -1
    manual merge of test for BUG#24432
    "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
    from 5.0

  mysql-test/r/rpl_insert_id.result@1.30, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +1 -1
    result update (it automerged from 5.0, contrary to the test file)

  mysql-test/r/rpl_known_bugs_detection.result@1.2, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +2 -2
    result update (binlog event sizes differ from 5.0)

  mysql-test/r/rpl_row_insert_delayed.result@1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +48 -0
    result

  mysql-test/r/rpl_row_insert_delayed.result@1.0, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/rpl_stm_insert_delayed.result@1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +88 -0
    result. Note how "mixed" and "statement" insert different data in
    the table.

  mysql-test/r/rpl_stm_insert_delayed.result@1.0, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/disabled.def@1.226.1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +1 -0
    rpl_insert_id tests statement-based replication of INSERT ON
    DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
    fixed in 5.1.16; we made the slave detect if it is connected to a
    <5.1.16 master and if so refuse to replicate.
    The problem is that this 5.1-rpl tree, even though it will produce
    the 5.1.16 release, still has a 5.1.15 version in configure.in.
    Thus rpl_insert_id fails. So I disable it. As soon as the 5.1-rpl
    tree gets the changesets from the main 5.1, its version will change
    to 5.1.16 and so I'll be able to re-enable the test.

  mysql-test/t/rpl_known_bugs_detection.test@1.2, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +3 -0
    only in statement-based; row-based has no bug so test would fail.

  mysql-test/t/rpl_row_insert_delayed.test@1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +14 -0
    wrapper to test INSERT DELAYED binlogging in row-based mode

  mysql-test/t/rpl_row_insert_delayed.test@1.0, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_stm_insert_delayed.test@1.1, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +20 -0
    wrapper to test INSERT DELAYED binlogging in statement-based and mixed
    mode

  mysql-test/t/rpl_stm_insert_delayed.test@1.0, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +0 -0

  sql/slave.cc@1.302.5.2, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +20 -20
    slave_print_msg(ERROR_LEVEL) calls my_error(ER_UNKNOWN_ERROR);
    so, for our my_printf_error(), which has a nicer message than this
    my_error(), to have any effect, it must be 
    called before slave_print_msg()

  sql/sql_insert.cc@1.239.6.2, 2007-02-15 20:28:55+01:00, guilhem@gbichot3.local +49 -1
    manual merge from 5.0 of a piece of the fixes for
    BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
    BUG#25507 "multi-row insert delayed + auto increment causes
    duplicate key entries on slave"
    BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based
    binlogging breaks".
    The other pieces (e.g. log_event.cc) automerged from 5.0.

ChangeSet@1.1810.2603.2, 2007-02-15 15:50:56+01:00, guilhem@gbichot3.local +2 -0
  Backport from the Falcon tree.
  When opening/creating the transaction coordinator's log, if binlog is
  used, the tc log is the binlog so we use the binlog's name; otherwise
  we use the mmap-based log, named after the mandatory argument of the
  --log-tc option (meant for that).

  sql/log.cc@1.158.16.1, 2007-02-15 15:50:54+01:00, guilhem@gbichot3.local +1 -1
    fixing wrong order of arguments to my_create()
    (3rd param is the desired modes of the file; "0" lead to no rights
    for anybody on the file).

  sql/mysqld.cc@1.439.89.5, 2007-02-15 15:50:54+01:00, guilhem@gbichot3.local +1 -1
    When opening/creating the transaction coordinator's log, if binlog is
    used, the tc log is the binlog so we use the binlog's name; otherwise
    we use the mmap-based log, named after the mandatory argument of the
    --log-tc option (meant for that).

ChangeSet@1.2409.52.2, 2007-02-15 15:44:56+01:00, msvensson@neptunus.(none) +1 -0
  Remove the hack to let lex_hash.h depend on it's tool and not the sources

  sql/Makefile.am@1.172.1.2, 2007-02-15 15:44:54+01:00, msvensson@neptunus.(none) +6 -5
    Remove the hack to let lex_hash.h depend on it's tool and not the sources

ChangeSet@1.1810.2603.1, 2007-02-15 15:39:03+01:00, guilhem@gbichot3.local +5 -0
  Fix for BUG#25507 "multi-row insert delayed + auto increment causes
  duplicate key entries on slave" (two concurrrent connections doing
  multi-row INSERT DELAYED to insert into an auto_increment column,
  caused replication slave to stop with "duplicate key error" (and
  binlog was wrong)), and BUG#26116 "If multi-row INSERT
  DELAYED has errors, statement-based binlogging breaks" (the binlog
  was not accounting for all rows inserted, or slave could stop).
  The fix is that: if (statement-based) binlogging is on, a multi-row
  INSERT DELAYED is silently converted to a non-delayed INSERT.
  Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
  so it is tested only in the changeset for 5.1. However, BUG#26116
  is tested here, and the fix for BUG#25507 is the same code change.

  mysql-test/r/rpl_insert_delayed.result@1.1, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +31 -0
    result. Master and slave match.

  mysql-test/r/rpl_insert_delayed.result@1.0, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_insert_delayed.test@1.1, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +67 -0
    Test for BUG#26116 (see if one error at first row on master makes the
    slave's data incorrect, see if one error at second row on master
    makes slave stop).

  mysql-test/t/rpl_insert_delayed.test@1.0, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/r/innodb-replace.result@1.3, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +2 -2
    result update

  mysql-test/t/innodb-replace.test@1.4, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +2 -2
    now that multi-row delayed inserts are converted to normal inserts
    if the statement-based binlog is enabled,
    no error is issued even if this engine does not support INSERT DELAYED,
    as the insert does not go through the INSERT DELAYED code.
    To preserve the goal of this test, we change the statements to single-
    row inserts.

  sql/sql_insert.cc@1.146.46.2, 2007-02-15 15:39:01+01:00, guilhem@gbichot3.local +21 -0
    A multi-row INSERT DELAYED cannot be recorded to a statement-based
    binlog in a way that describes the insertions actually done;
    in that case we fallback to a non-delayed INSERT.

ChangeSet@1.1810.2602.1, 2007-02-15 14:08:21+01:00, Kristofer.Pettersson@naruto. +2 -0
  Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE
  
  - The condition variable implementation "lost" a signal to
    WaitOnSingleObject when a semaphore was released.
  - The signal could be consumed by a new call to pthread_cond_wait
    before all waiting threads had awoken.
  - The new implementation of pthread_cond_* uses events
    instead of semaphores. It also uses an extra lock to protect entry
    into new cond wait before the broadcast has finished.

  include/my_pthread.h@1.90.6.4, 2007-02-15 14:08:17+01:00, Kristofer.Pettersson@naruto. +11 -5
    - New implementatin of pthread_cond_init. This version uses events
      instead of semaphores

  mysys/my_wincond.c@1.8.1.2, 2007-02-15 14:08:17+01:00, Kristofer.Pettersson@naruto. +111 -38
    - New implementatin of pthread_cond_init. This version uses events
      instead of semaphores

ChangeSet@1.2409.49.2, 2007-02-15 11:21:55+01:00, msvensson@pilot.mysql.com +1 -0
  Update error message to make sure all error strings for same error
  uses the same format specifiers

  sql/share/errmsg.txt@1.141.1.2, 2007-02-15 11:21:53+01:00, msvensson@pilot.mysql.com +507 -507
    Update error message to make sure all error strings for same error
    uses the same format specifiers

ChangeSet@1.1810.2599.2, 2007-02-15 11:17:25+01:00, msvensson@pilot.mysql.com +1 -0
  Remove the newly added space in error message, should not be there

  sql/share/errmsg.txt@1.42.22.2, 2007-02-15 11:17:23+01:00, msvensson@pilot.mysql.com +1 -1
    Remove the newly added space in error message, should not be there

ChangeSet@1.1616.2977.1, 2007-02-15 16:52:23+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#21715 mgm client command <id> status return version(0.0.0.0)

  ndb/src/mgmclient/CommandInterpreter.cpp@1.44.4.1, 2007-02-15 16:52:22+08:00, gni@dev3-221.dev.cn.tlan +13 -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.1810.2600.1, 2007-02-14 22:06:41-08:00, igor@olga.mysql.com +7 -0
  Fixed bug #25971: indexes on text columns were ignored when ref accesses
  were evaluated.
  According to the new rules for string comparison partial indexes on text
  columns can be used in the same cases when partial indexes on varchar
  columns can be used.

  mysql-test/r/endspace.result@1.11, 2007-02-14 22:06:38-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/innodb.result@1.145.1.19, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/myisam.result@1.71.1.27, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -1
    Adjusted results after the fix for bug #25971.

  mysql-test/r/select.result@1.121.1.30, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +148 -0
    Added a test case for bug #25971.

  mysql-test/r/type_blob.result@1.49.3.1, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +2 -2
    Adjusted results after the fix for bug #25971.

  mysql-test/t/select.test@1.102.1.23, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +46 -0
    Added a test case for bug #25971.

  sql/sql_select.cc@1.312.129.1, 2007-02-14 22:06:39-08:00, igor@olga.mysql.com +1 -7
    Fixed bug #25971: indexes on text columns were ignored when ref accesses
    were evaluated.
    According to the new rules for string comparison partial indexes on text
    columns can be used in the same cases when partial indexes on varchar
    columns can be used.

ChangeSet@1.1810.2599.1, 2007-02-14 19:31:06+01:00, msvensson@pilot.mysql.com +2 -0
  Add check of format specifiers in error message strings
  Update error message text accordingly to be equal between all translations

  extra/comp_err.c@1.23.1.3, 2007-02-14 19:31:02+01:00, msvensson@pilot.mysql.com +120 -0
    Add check of format specifiers in error message strings

  sql/share/errmsg.txt@1.42.22.1, 2007-02-14 19:31:03+01:00, msvensson@pilot.mysql.com +541 -541
    Update error messages after checks

ChangeSet@1.1810.2598.1, 2007-02-14 18:35:59+02:00, gkodinov@macbook.gmz +3 -0
  Bug#19717: The blackhole engine is returning an OK flag in 
  index_read(), whereas it must return HA_ERR_END_OF_FILE
  instead (as there are by definition no rows in a table of 
  that engine.

  mysql-test/t/blackhole.test@1.4.5.1, 2007-02-14 18:35:53+02:00, gkodinov@macbook.gmz +15 -0
    Bug#19717: test case

  mysql-test/r/blackhole.result@1.5.5.1, 2007-02-14 18:35:52+02:00, gkodinov@macbook.gmz +11 -0
    Bug#19717: test case

  sql/ha_blackhole.cc@1.21.5.1, 2007-02-14 18:35:54+02:00, gkodinov@macbook.gmz +1 -1
    Bug#19717: return no rows instead of success.

ChangeSet@1.1616.2973.5, 2007-02-14 16:49:41+01:00, msvensson@pilot.mysql.com +1 -0
  Use my_vsnprintf instead of vsnprintf

  client/mysqltest.c@1.92.21.41, 2007-02-14 16:49:40+01:00, msvensson@pilot.mysql.com +1 -1
    Use my_vsnprintf instead of vsnprintf

ChangeSet@1.1810.2553.2, 2007-02-14 14:44:34+01:00, msvensson@pilot.mysql.com +17 -0
  Bug#18628 mysql-test-run: security problem(part1)
   - Implement --secure-file-priv=<dir> option that limits
    "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
    with files in specified dir.
   - Use above option for mysqld in mysql-test-run.pl 

  mysql-test/mysql-test-run.pl@1.30.73.1, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +6 -0
    Add usage of --secure-file-priv=vardir when starting mysqld

  mysql-test/r/loaddata.result@1.20.1.5, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +16 -0
    Update test result after adding test to check that secure-file-priv
    works for "load data" and "load_file"

  mysql-test/r/outfile.result@1.7, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +6 -1
    Update result

  mysql-test/r/query_cache.result@1.65.1.13, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +1 -1
    Can't load from outside of vardir anymore

  mysql-test/r/type_blob.result@1.49.2.5, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +12 -12
    Can't load from outside of vardir anymore

  mysql-test/t/loaddata.test@1.15.1.4, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +23 -0
    Update test result after adding test to check that secure-file-priv 
    works for "load data" and "load_file"

  mysql-test/t/outfile.test@1.15, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +12 -0
    Update test result after adding test to check that secure-file-priv
    works for "SELECT .. INTO OUTFILE"

  mysql-test/t/query_cache.test@1.49.1.8, 2007-02-14 14:44:30+01:00, msvensson@pilot.mysql.com +2 -2
    Can't load from outside of vardir anymore

  mysql-test/t/type_blob.test@1.33.1.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +13 -14
    Can't load from outside of vardir anymore

  sql/item_strfunc.cc@1.261.22.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +5 -0
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

  sql/mysql_priv.h@1.290.96.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +1 -0
    Add secure_file_priv

  sql/mysqld.cc@1.439.96.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +19 -1
    Add "--secure_file_priv"

  sql/set_var.cc@1.125.23.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +4 -0
    Add variable "secure_file_priv" to "show variables"

  sql/share/errmsg.txt@1.42.1.34, 2007-02-14 14:44:32+01:00, msvensson@pilot.mysql.com +1 -1
    Fix swedish error message for ER_OPTION_PREVENTS_STATMENT wich was hardcoded
    to --skip-grant-tables

  sql/sql_class.cc@1.223.19.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +10 -2
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

  sql/sql_class.h@1.230.54.1, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +1 -1
    Fix spelling error

  sql/sql_load.cc@1.78.5.3, 2007-02-14 14:44:31+01:00, msvensson@pilot.mysql.com +9 -0
    Check that the path "load_file" uses for the file is within 
    what's specified with --secure-file-priv

ChangeSet@1.2409.37.7, 2007-02-14 14:05:41+01:00, msvensson@pilot.mysql.com +1 -0
  Protect DBUG_ENTER printout from NULL pointers

  mysys/my_symlink2.c@1.11, 2007-02-14 14:05:39+01:00, msvensson@pilot.mysql.com +3 -1
    Protect DBUG_ENTER printout from NULL pointers

ChangeSet@1.2409.3.6, 2007-02-14 12:42:11+01:00, serg@janus.mylan +3 -0
  /usr/share/aclocal/mysql.m4

  server-tools/CMakeLists.txt@1.3, 2007-02-14 10:55:37+01:00, serg@janus.mylan +0 -0
    Change mode to -rw-rw-r--

  support-files/Makefile.am@1.33.1.1, 2007-02-14 12:42:08+01:00, serg@janus.mylan +3 -0
    /usr/share/aclocal/mysql.m4

  support-files/mysql.m4@1.1, 2007-02-14 12:42:08+01:00, serg@janus.mylan +108 -0
    /usr/share/aclocal/mysql.m4

  support-files/mysql.m4@1.0, 2007-02-14 12:42:08+01:00, serg@janus.mylan +0 -0

ChangeSet@1.1616.2973.4, 2007-02-13 18:59:46+01:00, msvensson@pilot.mysql.com +1 -0
  Write some debug info to result log file before dying in 'do_exec'

  client/mysqltest.c@1.92.21.40, 2007-02-13 18:59:45+01:00, msvensson@pilot.mysql.com +27 -0
    Write some debug info to result log file before dying in 'do_exec'

ChangeSet@1.1616.2973.3, 2007-02-13 16:59:58+01:00, msvensson@pilot.mysql.com +1 -0
  Reset value of variable "escaped" in "default" label causing $variables not
  to be expanded in same cases 

  client/mysqltest.c@1.92.21.39, 2007-02-13 16:59:57+01:00, msvensson@pilot.mysql.com +1 -0
    Reset value of variable "escaped" in "default" label 

ChangeSet@1.2422, 2007-02-12 17:20:41-07:00, malff@weblab.(none) +2 -0
  Manual merge

  mysql-test/t/view.test@1.180.1.3, 2007-02-12 17:20:38-07:00, malff@weblab.(none) +87 -0
    Manual merge

  sql/sql_yacc.yy@1.541, 2007-02-12 17:20:38-07:00, malff@weblab.(none) +12 -20
    Manual merge

ChangeSet@1.1810.2528.12, 2007-02-12 13:59:29-07:00, malff@weblab.(none) +7 -0
  Bug#24532 (The return data type of IS TRUE is different from similar
    operations)
  
  Before this change, the boolean predicates:
  - X IS TRUE,
  - X IS NOT TRUE,
  - X IS FALSE,
  - X IS NOT FALSE
  were implemented by expanding the Item tree in the parser, by using a
  construct like:
  Item_func_if(Item_func_ifnull(X, <value>), <value>, <value>)
  
  Each <value> was a constant integer, either 0 or 1.
  
  A bug in the implementation of the function IF(a, b, c), in
  Item_func_if::fix_length_and_dec(), would cause the following :
  
  When the arguments b and c are both unsigned, the result type of the
  function was signed, instead of unsigned.
  
  When the result of the if function is signed, space for the sign could be
  counted twice (in the max() expression for a signed argument, and in the
  total), causing the member max_length to be too high.
  
  An effect of this is that the final type of IF(x, int(1), int(1)) would be
  int(2) instead of int(1).
  
  With this fix, the problems found in Item_func_if::fix_length_and_dec()
  have been fixed.
  
  While it's semantically correct to represent 'X IS TRUE' with
  Item_func_if(Item_func_ifnull(X, <value>), <value>, <value>),
  there are however more problems with this construct.
  
  a)
  Building the parse tree involves :
  - creating 5 Item instances (3 ints, 1 ifnull, 1 if),
  - creating each Item calls my_pthread_getspecific_ptr() once in the operator
    new(size), and a second time in the Item::Item() constructor, resulting
    in a total of 10 calls to get the current thread.
  Evaluating the expression involves evaluating up to 4 nodes at runtime.
  This representation could be greatly simplified and improved.
  
  b)
  Transforming the parse tree internally with if(ifnull(...)) is fine as long
  as this transformation is internal to the server implementation.
  With views however, the result of the parse tree is later exposed by the
  ::print() functions, and stored as part of the view definition.
  Doing this has long term consequences:
  
  1)
  The original semantic 'X IS TRUE' is lost, and replaced by the
  if(ifnull(...)) expression. As a result, SHOW CREATE VIEW does not restore
  the original code.
  
  2)
  Should a future version of MySQL implement the SQL BOOLEAN data type for
  example, views created today using 'X IS NULL' can be exported using
  mysqldump, and imported again. Such views would be converted correctly and
  automatically to use a BOOLEAN column in the future version.
  With 'X IS TRUE' and the current implementations, views using these
  "boolean" predicates would not be converted during the export/import, and
  would use integer columns instead.
  The difference traces back to how SHOW CREATE VIEW preserves 'X IS NULL' but
  does not preserve the 'X IS TRUE' semantic.
  
  With this fix, internal representation of 'X IS TRUE' booleans predicates
  has changed, so that:
  - dedicated Item classes are created for each predicate,
  - only 1 Item is created to represent 1 predicate
  - my_pthread_getspecific_ptr() is invoked 1 time instead of 10
  - SHOW CREATE VIEW preserves the original semantic, and prints 'X IS TRUE'.
  
  Note that, because of the fix in Item_func_if, views created before this fix
  will:
  - correctly use a int(1) type instead of int(2) for boolean predicates,
  - incorrectly print the if(ifnull(...), ...) expression in SHOW CREATE VIEW,
  since the original semantic (X IS TRUE) has been lost.
  - except for the syntax used in SHOW CREATE VIEW, these views will operate
  properly, no action is needed.
  
  Views created after this fix will operate correctly, and will preserve the
  original code semantic in SHOW CREATE VIEW.

  mysql-test/r/func_if.result@1.21.1.3, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +3 -0
    IF(x, unsigned, unsigned) should be unsigned.

  mysql-test/r/view.result@1.138.29.2, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +125 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  mysql-test/t/func_if.test@1.22, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +11 -0
    IF(x, unsigned, unsigned) should be unsigned.

  mysql-test/t/view.test@1.126.27.2, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +86 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  sql/item_cmpfunc.cc@1.187.24.1, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +68 -6
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.
    IF(x, unsigned, unsigned) should be unsigned.

  sql/item_cmpfunc.h@1.122.13.1, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +86 -0
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

  sql/sql_yacc.yy@1.371.91.7, 2007-02-12 13:59:26-07:00, malff@weblab.(none) +12 -16
    Preserve the semantic of 'X IS [NOT] (TRUE|FALSE)' boolean predicates.

ChangeSet@1.1346.893.3, 2007-02-12 20:13:34+01:00, joerg@trift2. +2 -0
  Fix a linkage problem with the previous patch for "thr_client_alarm".

  mysys/my_pthread.c@1.35.1.9, 2007-02-12 20:13:34+01:00, joerg@trift2. +1 -0
    Linkage problem with previous patch: "thr_client_alarm" must be declared in here.

  mysys/thr_alarm.c@1.41.1.4, 2007-02-12 20:13:34+01:00, joerg@trift2. +0 -1
    Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c".

ChangeSet@1.1346.893.2, 2007-02-12 19:55:33+01:00, joerg@trift2. +1 -0
  Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c".

  mysys/my_pthread.c@1.35.1.8, 2007-02-12 19:55:31+01:00, joerg@trift2. +0 -1
    Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.

ChangeSet@1.1346.893.1, 2007-02-12 15:03:11+01:00, joerg@trift2. +1 -0
  Compile error on Windows: Signal names are undefined. Fix by hiding the whole section.

  mysys/my_thr_init.c@1.21.1.7, 2007-02-12 15:03:10+01:00, joerg@trift2. +3 -0
    Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined.
    Fix by hiding the whole section, according to Jani it is not needed on Windows.

ChangeSet@1.1810.2437.2, 2007-02-12 16:35:32+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#19378 Job Buffer Full error appears for too large MaxNoOfTables

  ndb/src/mgmsrv/ConfigInfo.cpp@1.60.27.1, 2007-02-12 16:35:30+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    The high bound of MaxNoOfTables changes into MAX_TABLES defined in ndb_limits.h

ChangeSet@1.2372.31.1, 2007-02-11 13:23:23+01:00, cmiller@calliope.local.cmiller +1 -0
  Style fix-up and comment correction.

  sql/sql_trigger.cc@1.82.1.1, 2007-02-11 13:23:15+01:00, cmiller@calliope.local.cmiller +3 -3
    Style fix-up and comment correction.

ChangeSet@1.1346.891.5, 2007-02-09 17:08:37+01:00, mysqldev@mysql.com +1 -0
  Raise version number after cloning 4.0.30

  configure.in@1.191.1.151, 2007-02-09 17:08:25+01:00, mysqldev@mysql.com +1 -1
    Raise version number after cloning 4.0.30

ChangeSet@1.1346.891.4, 2007-02-09 13:03:37+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
  Fixes a compilation problem on Windows. Backport of the
  same fix from 4.0.
  TAG: clone-4.0.30-build

  sql/mysqld.cc@1.297.52.12, 2007-02-09 13:03:36+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -0
    Fixes a compilation problem on Windows. Backport of the
    same fix from 4.0.

ChangeSet@1.1616.2974.1, 2007-02-09 11:05:36+01:00, cmiller@calliope.local.cmiller +3 -0
  Bug#25126: Reference to non-existant column in UPDATE...ORDER BY... crashes server
  
  "update existingtable set anycolumn=nonexisting order by nonexisting" would crash
  the server.
  
  Though we would find the reference to a field, that doesn't mean we can then use
  it to set some values.  It could be a reference to another field.  If it is NULL, 
  don't try to use it to set values in the Item_field and instead return an error.
  
  Over the previous patch, this signals an error at the location of the error, rather
  than letting the subsequent deref signal it.

  mysql-test/r/order_by.result@1.40.2.1, 2007-02-09 11:05:29+01:00, cmiller@calliope.local.cmiller +24 -0
    Verify that all permutations work.

  mysql-test/t/order_by.test@1.29.2.1, 2007-02-09 11:05:30+01:00, cmiller@calliope.local.cmiller +30 -0
    Verify that all permutations work.

  sql/item.cc@1.58.79.1, 2007-02-09 11:05:30+01:00, cmiller@calliope.local.cmiller +12 -1
    When the field is NULL, don't dereference it when we set_field().  
    Instead, raise an error.

ChangeSet@1.1810.2520.4, 2007-02-04 18:46:48+01:00, rafal@quant.(none) +1 -0
  BUG#25463 (Memory allocation problems in replication slave thread):
  The problem is (most probably) caused by whole server shutting down before a 
  slave thread terminates correctly. Fixing this requires fixing server shutdown
  code which has been done in 5.1 tree. Thus we ignore the issue in 5.0 assuming 
  that it is fixed in 5.1.  

  mysql-test/valgrind.supp@1.3.1.5, 2007-02-04 18:46:45+01:00, rafal@quant.(none) +17 -0
    Added a suppresion rule.

ChangeSet@1.1810.2582.1, 2007-02-08 15:53:14+01:00, guilhem@gbichot3.local +10 -0
  Fix for BUG#24432
  "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values".
  When in an INSERT ON DUPLICATE KEY UPDATE, using
  an autoincrement column, we inserted some autogenerated values and
  also updated some rows, some autogenerated values were not used
  (for example, even if 10 was the largest autoinc value in the table
  at the start of the statement, 12 could be the first autogenerated
  value inserted by the statement, instead of 11). One autogenerated
  value was lost per updated row. Led to exhausting the range of the
  autoincrement column faster.
  Bug introduced by fix of BUG#20188; present since 5.0.24 and 5.1.12.
  This bug breaks replication from a pre-5.0.24 master.
  But the present bugfix, as it makes INSERT ON DUP KEY UPDATE
  behave like pre-5.0.24, breaks replication from a [5.0.24,5.0.34]
  master to a fixed (5.0.36) slave! To warn users against this when
  they upgrade their slave, as agreed with the support team, we add
  code for a fixed slave to detect that it is connected to a buggy
  master in a situation (INSERT ON DUP KEY UPDATE into autoinc column)
  likely to break replication, in which case it cannot replicate so
  stops and prints a message to the slave's error log and to SHOW SLAVE
  STATUS.
  For 5.0.36->[5.0.24,5.0.34] replication we cannot warn as master
  does not know the slave's version (but we always recommended to users
  to have slave at least as new as master).
  As agreed with support, I'll also ask for an alert to be put into
  the MySQL Network Monitoring and Advisory Service.

  mysql-test/r/rpl_insert_id.result@1.12.3.9, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +58 -0
    results to check the bugfix; without the bugfix, you would see, in
    master and slave:
    "3,2" instead of "2,2" for the INSERT VALUES testcase,
    "11,6,..." instead of "6,6,..." for the INSERT SELECT testcase.

  mysql-test/r/rpl_known_bugs_detection.result@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +133 -0
    see that SHOW SLAVE STATUS prints information that slave found a bug
    in master, and does not execute the dangerous event (table stays
    empty).

  mysql-test/r/rpl_known_bugs_detection.result@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_insert_id.test@1.13.1.10, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +53 -0
    testing that BUG#24432 is fixed

  mysql-test/t/rpl_known_bugs_detection-master.opt@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +1 -0
    pass debug symbol to make the master pretend it has BUG#24432

  mysql-test/t/rpl_known_bugs_detection-master.opt@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  mysql-test/t/rpl_known_bugs_detection.test@1.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +90 -0
    new test to see if bug detection by slave works

  mysql-test/t/rpl_known_bugs_detection.test@1.0, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +0 -0

  sql/log_event.cc@1.174.16.1, 2007-02-08 15:53:11+01:00, guilhem@gbichot3.local +37 -0
    A trick to force the master to pretend it is old and features BUG#24432.
    To do fast lookups in the list of known bugs by version, we compute
    the 3 X.Y.Z numbers from the master's version string and cache that
    into a new member Format_description_log_event::server_version_split.
    We do this computation in the event's two constructors.
    A simple prevention against buffer overrun when reading the master's
    version from a binlog event (assume the event is corrupted on disk,
    and so the version string on disk is longer than ST_SERVER_VER_LEN
    (50), then we would not get a closing 0 at the end of the class member.

  sql/log_event.h@1.122.5.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +2 -0
    new member to hold the "split server version" (3 numbers X.Y.Z),
    and a method to compute this from the version string.

  sql/slave.cc@1.241.16.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +64 -0
    a function which tells, based on master's version (as found
    in the Format_description event in the relay log being executed),
    if master can have a certain bug. This function uses a list of
    bug_id / first_version_with_bug / first_version_with_fix.
    If the test is positive, a short error message is put into SHOW SLAVE
    STATUS, and a verbose message is put into the slave's error log.
    The caller is expected to stop the slave in this case.

  sql/slave.h@1.85.1.15, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +1 -0
    new function to test if the replication master has a bug

  sql/sql_insert.cc@1.146.46.1, 2007-02-08 15:53:12+01:00, guilhem@gbichot3.local +19 -1
    Fix for BUG#24432:t he reason was a misplaced restore_auto_increment() 
    (misplaced when fixing BUG#20188). Indeed, when updating the row,
    it is clear that the autogenerated auto_increment value will not be
    used for this row (and if by "chance" the autoinc value present
    in the updated row is >= to the not used autogenerated value,
    adjust_next_insert_id_after_explicit_value() will fix next_insert_id).
    We also add code for a fixed slave to detect that it is connected to
    a buggy master (in which case it cannot replicate so stops).

ChangeSet@1.1616.2970.1, 2007-02-07 09:46:20+01:00, msvensson@neptunus.(none) +1 -0
  Bug#10777 ERROR File = sql_lex.cc, Line = 93 The identifier "symbols" is undefined.
   - Protect againt empty/corrupt lex_hash-h by writing output from gen_lex_hash to 
     a temporary file first.

  sql/Makefile.am@1.77.1.41, 2007-02-07 09:46:18+01:00, msvensson@neptunus.(none) +2 -1
    Protect against empty lex_hash.h due to failed execution of
    gen_lex_hash by writing outpout to a tmp file first

ChangeSet@1.1810.2528.11, 2007-02-06 16:01:22-07:00, malff@weblab.(none) +3 -0
  Bug#12976 (stored procedures local variables of type bit)
  
  Before this change, a local variables in stored procedures / stored functions
  or triggers, when declared with a type of bit(N), would not evaluate their
  value properly.
  
  The problem was that the data was incorrectly typed as a string,
  causing for example bit b'1', implemented as a byte 0x01, to be interpreted
  as a string starting with the character 0x01. This later would cause
  implicit conversions to integers or booleans to fail.
  
  The root cause of this problem was an incorrect translation between field
  types, like bit(N), and internal types used when representing values in Item
  objects.
  
  Also, before this change, the function HEX() would sometime print extra "0"
  characters when invoked with bit(N) values.
  
  With this fix, the type translation (sp_map_result_type, sp_map_item_type)
  has been changed so that bit(N) fields are represented with integer values.
  
  A consequence is that, for the function HEX(), when called with a stored
  procedure local variable of type bit(N) as argument, HEX() is provided with an
  integer instead of a string, and therefore does not print "0" padding.
  
  A test case for Bug 12976 was present in the test suite, and has been updated.

  mysql-test/r/sp-vars.result@1.1.3.2, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +55 -7
    Local stored procedure variables of type bit(N) are integer values.

  mysql-test/t/sp-vars.test@1.3.1.2, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +58 -7
    Local stored procedure variables of type bit(N) are integer values.

  sql/sp_head.cc@1.200.12.1, 2007-02-06 16:01:20-07:00, malff@weblab.(none) +2 -0
    Local stored procedure variables of type bit(N) are integer values.

ChangeSet@1.2409.18.1, 2007-02-06 20:00:00+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  BUG#19378 Job Buffer Full error appears for too large MaxNoOfTables

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.96.1.2, 2007-02-06 19:59:58+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    The high bound of MaxNoOfTables changes into MAX_TABLES defined in ndb_limits.h

  storage/ndb/src/mgmsrv/ParamInfo.cpp@1.4, 2007-02-06 19:59:58+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    The high bound of MaxNoOfTables changes into MAX_TABLES defined in ndb_limits.h

ChangeSet@1.2336.3.1, 2007-02-05 16:48:08+08:00, gni@dev3-221.dev.cn.tlan +4 -0
  BUG#24363 If the table structure has been changed, the default action about the restore will fail. 
            You can skip the table structure check with --skip-table-check (-s) option. 

  storage/ndb/tools/restore/consumer.hpp@1.12.1.1, 2007-02-05 16:48:06+08:00, gni@dev3-221.dev.cn.tlan +1 -0
    The method is used to judge whether the table structure has been changed when restoring the data.

  storage/ndb/tools/restore/consumer_restore.cpp@1.38.1.1, 2007-02-05 16:48:06+08:00, gni@dev3-221.dev.cn.tlan +56 -0
    The method is used to judge whether the table structure has been changed when restoring the data.

  storage/ndb/tools/restore/consumer_restore.hpp@1.15.1.1, 2007-02-05 16:48:06+08:00, gni@dev3-221.dev.cn.tlan +1 -0
    The method is used to judge whether the table structure has been changed when restoring the data.

  storage/ndb/tools/restore/restore_main.cpp@1.50.1.1, 2007-02-05 16:48:06+08:00, gni@dev3-221.dev.cn.tlan +20 -0
    Add --skip-table-check flag for ndb_restore. Its default value is false, so if the table structure has been changed, the restore will fail. 
    If using it will skip the table schema check.

ChangeSet@1.1810.2528.10, 2007-02-04 16:49:24+03:00, kroki@moonlight.home +4 -0
  BUG#25897: Some queries are no longer possible after a CREATE VIEW
             fails
  
  The bug was introduced with the push of the fix for bug#20953: after
  the error on view creation we never reset the error state, so some
  valid statements would give the same error after that.
  
  The solution is to properly reset the error state.

  mysql-test/r/view.result@1.138.29.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +10 -0
    Add result for bug#25897: Some queries are no longer possible after
    a CREATE VIEW fails.

  mysql-test/t/view.test@1.126.27.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +18 -0
    Add test case for bug#25897: Some queries are no longer possible after
    a CREATE VIEW fails.

  sql/sql_lex.cc@1.142.36.1, 2007-02-04 16:49:19+03:00, kroki@moonlight.home +11 -0
    Add st_parsing_options::reset() method, call it from lex_start().

  sql/sql_lex.h@1.175.35.1, 2007-02-04 16:49:20+03:00, kroki@moonlight.home +2 -4
    Add st_parsing_options::reset() method, call it from constructor.

ChangeSet@1.1810.2572.1, 2007-02-03 20:14:16+01:00, rafal@quant.(none) +2 -0
  BUG#25306 (Race conditions during replication slave shutdown (valgrind stacks)):
  The possibility of the race is removed by changing sequence of calls
  
    pthread_mutex_unlock(&mi->run_lock);
    pthread_cond_broadcast(&mi->stop_cond);  
  
  into
  
    pthread_cond_broadcast(&mi->stop_cond);
    pthread_mutex_unlock(&mi->run_lock);
  
  at the end of I/O thread (similar change at the end of SQL thread). This ensures 
  that no thread waiting on the condition executes between the broadcast and the 
  unlock and thus can't delete the mi structure which caused the bug.

  sql/slave.cc@1.241.14.1, 2007-02-03 20:14:12+01:00, rafal@quant.(none) +14 -5
    Change order of condition broadcast and mutex unlock at the end of slave's 
    I/O thread and SQL thread.

  sql/sql_repl.cc@1.133.6.1, 2007-02-03 20:14:13+01:00, rafal@quant.(none) +5 -3
    Add DBUG_ENTER() call

ChangeSet@1.2415.2.1, 2007-02-02 20:43:33+03:00, kroki@moonlight.home +5 -0
  BUG#16425: Events: no DEFINER clause
  
  There was already support for CREATE DEFINER=... EVENT syntax in the
  parser, but DEFINER information was ignored.
  
  This patch adds processing of DEFINER, and a new ALTER DEFINER=...
  EVENT syntax.

  mysql-test/r/events_bugs.result@1.25, 2007-02-02 20:43:26+03:00, kroki@moonlight.home +53 -0
    Add result for bug#16425: Events: no DEFINER clause.

  mysql-test/t/events_bugs.test@1.24, 2007-02-02 20:43:26+03:00, kroki@moonlight.home +57 -0
    Add test case for bug#16425: Events: no DEFINER clause.

  sql/event_data_objects.cc@1.83.1.3, 2007-02-02 20:43:26+03:00, kroki@moonlight.home +11 -10
    Event_parse_data::init_definer() looks for DEFINER in
    thd->lex->definer, which is always set now.

  sql/sql_parse.cc@1.620.1.2, 2007-02-02 20:43:26+03:00, kroki@moonlight.home +92 -77
    Move DEFINER processing into the sp_process_definer().  Call this
    function for CREATE EVENT/ALTER EVENT, as well as for CREATE
    PROCEDURE/FUNCTION.

  sql/sql_yacc.yy@1.537.1.1, 2007-02-02 20:43:26+03:00, kroki@moonlight.home +8 -7
    Add 'alter DEFINER=... event', update rule references accordingly.

ChangeSet@1.2415.1.1, 2007-02-02 14:21:04+03:00, kroki@moonlight.home +1 -0
  BUG#23225: Slow query log: setting slow_query_log_file writes to
             wrong file
  
  After execution of SET GLOBAL SLOW_QUERY_LOG_FILE=...; slow query log
  data would go into the general log file.
  
  The problem was in the bogus cut-n-paste in the code.

  sql/set_var.cc@1.211.3.1, 2007-02-02 14:20:59+03:00, kroki@moonlight.home +1 -1
    Fix cut-n-paste bug.

ChangeSet@1.1810.2528.9, 2007-02-01 09:36:17-07:00, malff@weblab.(none) +1 -0
  Improved comments

  sql/item_subselect.h@1.77.10.2, 2007-02-01 09:36:15-07:00, malff@weblab.(none) +5 -1
    Improved comments

ChangeSet@1.2390.24.2, 2007-02-01 10:11:45+04:00, bar@mysql.com +1 -0
  Additional fix for bug 25815 for test results when running with
  --binlog-format=row

  mysql-test/r/binlog_row_ctype_cp932.result@1.6, 2007-02-01 10:11:42+04:00, bar@mysql.com +12 -0
    Test result fix

ChangeSet@1.2415, 2007-01-31 21:16:48+03:00, kroki@moonlight.home +2 -0
  Fix for memory leaks introduced with the push of patch for bug#22740.
  
  Original patch did not have these leaks, they were introduced later
  during manual applying of the patch.

  sql/event_data_objects.cc@1.83.1.2, 2007-01-31 21:16:45+03:00, kroki@moonlight.home +10 -5
    Original patch was not aware of the requirement to delete lex.sphead
    before doing anything else (bug#21856), and that was missed when the
    patch was applied later.

  sql/event_scheduler.cc@1.33, 2007-01-31 21:16:45+03:00, kroki@moonlight.home +2 -0
    The line was lost during manual patch applying.

ChangeSet@1.2414, 2007-01-30 15:40:02-07:00, malff@weblab.(none) +2 -0
  manual merge

  mysql-test/r/subselect.result@1.160.1.2, 2007-01-30 15:40:00-07:00, malff@weblab.(none) +113 -0
    manual merge

  mysql-test/t/subselect.test@1.141.1.2, 2007-01-30 15:40:00-07:00, malff@weblab.(none) +100 -0
    manual merge

ChangeSet@1.2412.1.1, 2007-01-30 22:48:05+01:00, guilhem@gbichot3.local +7 -0
  Mechanical class renaming:
  Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary
  and also THD::protocol_simple->THD::protocol_text,
  THD::protocol_prep->THD::protocol_binary.
  Reason: the binary protocol is not bound to be used only with
  prepared statements long term (see WL#3559 "Decouple binary protocol
  from prepared statements"). Renaming now is pressing because
  the fix for BUG#735 "Prepared Statements: there is
  no support for Query Cache" will introduce a new member
  in class Query_cache_flags telling about the protocol's nature.
  Other reason: "simple" is less accurate than "text".
  Future patches for BUG#735 will rely on this cset.

  libmysqld/lib_sql.cc@1.127.3.1, 2007-01-30 22:48:02+01:00, guilhem@gbichot3.local +6 -6
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/protocol.cc@1.122.1.1, 2007-01-30 22:48:02+01:00, guilhem@gbichot3.local +34 -34
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/protocol.h@1.35.1.3, 2007-01-30 22:48:02+01:00, guilhem@gbichot3.local +6 -6
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/set_var.cc@1.211.2.1, 2007-01-30 22:48:03+01:00, guilhem@gbichot3.local +2 -2
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/sql_class.cc@1.308.2.3, 2007-01-30 22:48:03+01:00, guilhem@gbichot3.local +3 -3
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/sql_class.h@1.338.1.1, 2007-01-30 22:48:03+01:00, guilhem@gbichot3.local +2 -2
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

  sql/sql_prepare.cc@1.190.2.1, 2007-01-30 22:48:03+01:00, guilhem@gbichot3.local +16 -16
    Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary

ChangeSet@1.1616.2958.2, 2007-01-30 22:40:30+01:00, kent@mysql.com +1 -0
  mysql.spec.sh:
    Added man page mysql_install_db.1

  support-files/mysql.spec.sh@1.83.1.46, 2007-01-30 22:37:12+01:00, kent@mysql.com +1 -0
    Added man page mysql_install_db.1

ChangeSet@1.1810.2554.1, 2007-01-29 17:32:52-07:00, malff@weblab.(none) +5 -0
  Bug#21904 (parser problem when using IN with a double "(())")
  
  Before this fix, a IN predicate of the form: "IN (( subselect ))", with two
  parenthesis, would be evaluated as a single row subselect: if the subselect
  returns more that 1 row, the statement would fail.
  
  The SQL:2003 standard defines a special exception in the specification,
  and mandates that this particular form of IN predicate shall be equivalent
  to "IN ( subselect )", which involves a table subquery and works with more
  than 1 row.
  
  This fix implements "IN (( subselect ))", "IN ((( subselect )))" etc
  as per the SQL:2003 requirement.
  
  All the details related to the implementation of this change have been
  commented in the code, and the relevant sections of the SQL:2003 spec
  are given for reference, so they are not repeated here.
  
  Having access to the spec is a requirement to review in depth this patch.

  mysql-test/r/subselect.result@1.134.14.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +113 -0
    Implement IN predicate special exceptions with subselects.

  mysql-test/t/subselect.test@1.129.6.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +100 -0
    Implement IN predicate special exceptions with subselects.

  sql/item_subselect.cc@1.113.15.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +30 -0
    Implement IN predicate special exceptions with subselects.

  sql/item_subselect.h@1.77.9.1, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +16 -0
    Implement IN predicate special exceptions with subselects.

  sql/sql_yacc.yy@1.371.90.2, 2007-01-29 17:32:49-07:00, malff@weblab.(none) +98 -17
    Implement IN predicate special exceptions with subselects, cleanup.

ChangeSet@1.2410.1.1, 2007-01-29 20:46:29+03:00, kroki@moonlight.home +9 -0
  Fix for bug#22740 Events: Decouple Event_queue from Event_db_repository
  
  This patch implements the idea of the bug report by making Event_queue
  unaware of Event_db_repository by making a higher level class - Events,
  which is aware of most of all classes, responsible for passing all data
  needed for adding/updating/deleting an event to/from the queue.
  
  Introduces few new classes :
   - Event_worker_thread
   - Event_queue_element_for_exec

  sql/event_data_objects.cc@1.83.1.1, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +47 -29
    Introduced a new class Event_queue_element_for_exec
    According to Konstantin it should be named Event_name and hold
    only two LEX_STRINGs but `dropped` is not saved on disk and will
    require additional logic in Event_worker_thread class, after loading
    to compute whether the event should be dropped or not. It's easier
    just to pass this flag around.
    
    Removed Event_queue_element::drop(). This method was a source of a
    race condition. At the place where the event should be dropped we
    call Events::drop_event() which is the only code-flow for dropping.
    In addition, because ::drop_event() holds Events::LOCK_metadata there is
    no source of race conditions. Before this patch dropping from ::drop()
    wasn't under LOCK_metadata and races were possible.
    
    Because Events::open_event_table was removed as a method, provisionally
    events_event_db_repository was exported from events.cc till a solution is
    build where Event_queue_element does not access directly mysql.event.

  sql/event_data_objects.h@1.16, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +21 -4
    New class Event_queue_element_for_exec added which is returned
    from Event_queue::get_top_if_time() and passed through Event_scheduler
    to Event_worker_thread. There by using the (db)name Event_job_data is
    instanciated and executed.
    
    Dropped Event_queue_element::drop()
    
    thd was moved out of Event_job_data as it is now part of
    Event_queue_element_for_exec

  sql/event_queue.cc@1.22.1.1, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +34 -213
    Removed dependency of Event_queue on Event_db_repository.
    The instantiation of Event_job_data was moved to class Event_worker_thread
    In place is a return of an object of Event_queue_element_for_exec is used
    later for instantiating Event_job_data.
    
    The `dropped` flag of Event_queue_element is passed over
    Event_queue_element_for_exec to the code in Event_worker_thread.

  sql/event_queue.h@1.14, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +12 -19
    Removed dependency of Event_queue on Event_db_repository
    Removed dependency on Event_scheduler

  sql/event_scheduler.cc@1.32, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +101 -46
    Added class Event_worker_thread, which is used during
    the execution of an event. It has a static init() method
    to get a pointer to Event_db_repository to be used for
    instantiation of Event_job_data object. This object it then
    executed.

  sql/event_scheduler.h@1.20, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +27 -2
    Added class Event_worker_thread, which is used during
    the execution of an event.

  sql/events.cc@1.68, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +157 -41
    Removed Events::open_event_table() because it was a product of
    a bad architecture.

  sql/events.h@1.52, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +4 -12
    Removed friend definition, unneeded.
    
    Fixed Events::drop_event() to have the previous signature without
    bool only_from_disk

  sql/sql_parse.cc@1.620.1.1, 2007-01-29 20:46:26+03:00, kroki@moonlight.home +1 -2
    Fix call

ChangeSet@1.2409.8.1, 2007-01-29 18:07:02+01:00, serg@janus.mylan +1 -0
  making diff-p-helper obsolete

  BitKeeper/triggers/post-commit@1.37, 2007-01-29 18:07:00+01:00, serg@janus.mylan +1 -1
    making diff-p-helper obsolete

ChangeSet@1.2409.3.4, 2007-01-29 10:40:26+01:00, serg@janus.mylan +58 -0
  WL#3700: Handler API change: all index search methods - that is,
  index_read(), index_read_idx(), index_read_last(), and
  records_in_range() - instead of 'uint keylen' argument take
  'ulonglong keypart_map', a bitmap showing which keyparts are
  present in the key value.
  Fallback method is provided for handlers that are lagging behind.

  include/heap.h@1.32, 2007-01-29 10:40:16+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  include/my_base.h@1.96, 2007-01-29 10:40:16+01:00, serg@janus.mylan +5 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  include/myisam.h@1.81, 2007-01-29 10:40:16+01:00, serg@janus.mylan +3 -4
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  include/myisammrg.h@1.18, 2007-01-29 10:40:16+01:00, serg@janus.mylan +3 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/event_db_repository.cc@1.20.1.1, 2007-01-29 10:40:17+01:00, serg@janus.mylan +2 -4
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/ha_ndbcluster.cc@1.397.1.1, 2007-01-29 10:40:17+01:00, serg@janus.mylan +3 -17
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/ha_ndbcluster.h@1.166, 2007-01-29 10:40:17+01:00, serg@janus.mylan +0 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/ha_partition.cc@1.82.1.1, 2007-01-29 10:40:17+01:00, serg@janus.mylan +14 -41
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/ha_partition.h@1.33, 2007-01-29 10:40:17+01:00, serg@janus.mylan +5 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/handler.cc@1.291.1.1, 2007-01-29 10:40:17+01:00, serg@janus.mylan +19 -17
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/handler.h@1.253, 2007-01-29 10:40:17+01:00, serg@janus.mylan +33 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/item_subselect.cc@1.141.1.2, 2007-01-29 10:40:17+01:00, serg@janus.mylan +4 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/key.cc@1.49, 2007-01-29 10:40:17+01:00, serg@janus.mylan +9 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/log.cc@1.253.2.1, 2007-01-29 10:40:17+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/log_event.cc@1.263.1.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +3 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/mysql_priv.h@1.470.4.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/opt_range.cc@1.258.1.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +147 -96
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/opt_range.h@1.74.1.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +16 -7
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/opt_sum.cc@1.60, 2007-01-29 10:40:18+01:00, serg@janus.mylan +11 -7
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/slave.cc@1.302.1.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +2 -0
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/slave.h@1.103.2.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +0 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sp.cc@1.136.1.1, 2007-01-29 10:40:18+01:00, serg@janus.mylan +2 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_acl.cc@1.229, 2007-01-29 10:40:18+01:00, serg@janus.mylan +12 -19
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_handler.cc@1.92, 2007-01-29 10:40:19+01:00, serg@janus.mylan +4 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_help.cc@1.55, 2007-01-29 10:40:19+01:00, serg@janus.mylan +2 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_insert.cc@1.243.1.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +1 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_plugin.cc@1.42.2.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +1 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_select.cc@1.485.1.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +10 -6
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_select.h@1.118, 2007-01-29 10:40:19+01:00, serg@janus.mylan +5 -0
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_servers.cc@1.4.1.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +5 -8
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_servers.h@1.3.1.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +0 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/sql_udf.cc@1.71, 2007-01-29 10:40:19+01:00, serg@janus.mylan +1 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/table.cc@1.270.1.1, 2007-01-29 10:40:19+01:00, serg@janus.mylan +29 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/table.h@1.159, 2007-01-29 10:40:20+01:00, serg@janus.mylan +1 -0
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  sql/tztime.cc@1.46.1.1, 2007-01-29 10:40:20+01:00, serg@janus.mylan +5 -7
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/blackhole/ha_blackhole.cc@1.47, 2007-01-29 10:40:20+01:00, serg@janus.mylan +6 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/blackhole/ha_blackhole.h@1.13, 2007-01-29 10:40:20+01:00, serg@janus.mylan +4 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/example/ha_example.cc@1.51.1.1, 2007-01-29 10:40:20+01:00, serg@janus.mylan +2 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/example/ha_example.h@1.21, 2007-01-29 10:40:20+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/federated/ha_federated.cc@1.96.1.1, 2007-01-29 10:40:20+01:00, serg@janus.mylan +1 -4
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/heap/ha_heap.cc@1.106.1.1, 2007-01-29 10:40:20+01:00, serg@janus.mylan +7 -6
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/heap/ha_heap.h@1.51, 2007-01-29 10:40:20+01:00, serg@janus.mylan +5 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/heap/heapdef.h@1.18, 2007-01-29 10:40:20+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/heap/hp_hash.c@1.48, 2007-01-29 10:40:20+01:00, serg@janus.mylan +3 -9
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/heap/hp_rkey.c@1.20, 2007-01-29 10:40:20+01:00, serg@janus.mylan +2 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/innobase/handler/ha_innodb.cc@1.321, 2007-01-29 10:40:20+01:00, serg@janus.mylan +8 -8
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/ha_myisam.cc@1.206.1.1, 2007-01-29 10:40:21+01:00, serg@janus.mylan +15 -11
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/ha_myisam.h@1.82, 2007-01-29 10:40:21+01:00, serg@janus.mylan +5 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/mi_check.c@1.159, 2007-01-29 10:40:21+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/mi_key.c@1.56, 2007-01-29 10:40:21+01:00, serg@janus.mylan +14 -37
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/mi_range.c@1.22, 2007-01-29 10:40:21+01:00, serg@janus.mylan +18 -24
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/mi_rkey.c@1.29.1.1, 2007-01-29 10:40:21+01:00, serg@janus.mylan +8 -9
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/myisamdef.h@1.98, 2007-01-29 10:40:21+01:00, serg@janus.mylan +3 -2
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/rt_test.c@1.17, 2007-01-29 10:40:21+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisam/sp_test.c@1.15, 2007-01-29 10:40:21+01:00, serg@janus.mylan +1 -1
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisammrg/ha_myisammrg.cc@1.111.1.1, 2007-01-29 10:40:21+01:00, serg@janus.mylan +9 -6
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisammrg/ha_myisammrg.h@1.50, 2007-01-29 10:40:21+01:00, serg@janus.mylan +5 -5
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

  storage/myisammrg/myrg_rkey.c@1.23, 2007-01-29 10:40:21+01:00, serg@janus.mylan +3 -3
    WL#3700: Handler API change: all index search methods - that is,
    index_read(), index_read_idx(), index_read_last(), and
    records_in_range() - instead of 'uint keylen' argument take
    'ulonglong keypart_map', a bitmap showing which keyparts are
    present in the key value.
    Fallback method is provided for handlers that are lagging behind.

ChangeSet@1.2409.3.3, 2007-01-28 21:12:58+01:00, serg@janus.mylan +2 -0
  move intptr from my_atomic.h to my_global.h

  include/my_atomic.h@1.6, 2007-01-28 21:12:55+01:00, serg@janus.mylan +0 -8
    move intptr from my_atomic.h to my_global.h

  include/my_global.h@1.155.1.1, 2007-01-28 21:12:56+01:00, serg@janus.mylan +9 -1
    move intptr from my_atomic.h to my_global.h

ChangeSet@1.2409.3.2, 2007-01-28 21:11:42+01:00, serg@janus.mylan +2 -0
  dbug: don't consider double colom (::) a separator -
  it can be part of a function name (Item::reset)

  dbug/dbug.c@1.33.1.1, 2007-01-28 21:11:38+01:00, serg@janus.mylan +4 -2
    dbug: don't consider double colom (::) a separator -
    it can be part of a function name (Item::reset)

  dbug/user.r@1.8, 2007-01-28 21:11:39+01:00, serg@janus.mylan +5 -6
    dbug: don't consider double colom (::) a separator -
    it can be part of a function name (Item::reset)

ChangeSet@1.2409.3.1, 2007-01-28 21:09:54+01:00, serg@janus.mylan +11 -0
  BUILD scripts: s/(dist)?clean/maintainer-clean/

  BUILD/FINISH.sh@1.36, 2007-01-28 21:09:50+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-alpha-ccc@1.12, 2007-01-28 21:09:50+01:00, serg@janus.mylan +3 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-alpha-cxx@1.13, 2007-01-28 21:09:50+01:00, serg@janus.mylan +3 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-alpha-debug@1.11, 2007-01-28 21:09:50+01:00, serg@janus.mylan +3 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-dist@1.17, 2007-01-28 21:09:50+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-hpux11-parisc2-aCC@1.6, 2007-01-28 21:09:50+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-ia64-debug-max@1.8, 2007-01-28 21:09:50+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-irix-mips64-mipspro@1.5, 2007-01-28 21:09:51+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-pentium-pgcc@1.5, 2007-01-28 21:09:51+01:00, serg@janus.mylan +3 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-solaris-sparc-forte@1.6, 2007-01-28 21:09:51+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

  BUILD/compile-solaris-sparc-purify@1.18, 2007-01-28 21:09:51+01:00, serg@janus.mylan +1 -1
    s/(dist)?clean/maintainer-clean/

ChangeSet@1.2343.56.1, 2007-01-26 19:29:57+01:00, mats@romeo.(none) +6 -0
  BUG#19033 (RBR: slave does not handle schema changes correctly):
  Since checking table compatibility before locking the table, there were
  potential that a table could be locked that did not have a definition
  that was compatible with the table on the slave.
  
  This patch adds a check just after the table was locked to ensure that
  the table is (still) compatible with the table on the slave.

  sql/log.cc@1.251.1.1, 2007-01-26 19:29:50+01:00, mats@romeo.(none) +4 -13
    Moving placement new operators to slave.h since they are used in
    several places in the replication code.
    Removing some compile warnings.

  sql/log_event.cc@1.259.1.1, 2007-01-26 19:29:50+01:00, mats@romeo.(none) +61 -17
    Moving code to check table compatibility to after tables are locked for
    writing.

  sql/log_event.h@1.142.1.1, 2007-01-26 19:29:50+01:00, mats@romeo.(none) +23 -8
    Doxygenifying comments.
    Copying error codes to Rows_log_event hierarchy since they are
    now used there as well.

  sql/rpl_utility.h@1.2.1.1, 2007-01-26 19:29:51+01:00, mats@romeo.(none) +57 -48
    Doxygenifying some comments.
    Changing class table_def to copy the column types given to it.
    Adding structure RPL_TABLE_LIST as a subclass of TABLE_LIST to represent
    lists of tables for the slave.

  sql/slave.h@1.102.1.1, 2007-01-26 19:29:51+01:00, mats@romeo.(none) +9 -0
    Adding placement new and delete operators since the slave uses them
    in several places.

  sql/sql_insert.cc@1.234.4.3, 2007-01-26 19:29:51+01:00, mats@romeo.(none) +1 -1
    Removing a compiler warning.

ChangeSet@1.1810.2545.1, 2007-01-25 20:00:12+03:00, kroki@moonlight.home +1 -0
  BUG#23527: set global query_cache_size can crash the server under
             high load
  
  MySQL server could crash if two or more threads would initiate query
  cache resize at the moments very close in time.
  
  The problem was introduced with the fix of bug 21051 in 5.0 and 5.1:
  simultaneous query cache resizes would wait for the first one in
  progress, but then each thread would try to finish the operation,
  accessing the data that was already reset (attempt to dereference
  'bins' pointer, which may be NULL already).
  
  The solution is to check after synchronization if another thread has
  done the reset already (test 'query_cache_size > 0' again).
  
  No test case is provided because the bug is a subject to a race.

  sql/sql_cache.cc@1.76.8.1, 2007-01-25 20:00:10+03:00, kroki@moonlight.home +17 -1
    We release 'structure_guard_mutex' in flush_cache(), so after the
    call we check if another thread had reset the cache before us.

ChangeSet@1.1810.2544.1, 2007-01-25 19:58:04+03:00, kaa@polly.local +2 -0
  Added a test case for bug #20293 "group by cuts off value from time_format"

  mysql-test/r/func_time.result@1.47.1.33, 2007-01-25 19:57:29+03:00, kaa@polly.local +4 -0
    Added a test case for bug #20293 "group by cuts off value from time_format"

  mysql-test/t/func_time.test@1.41.1.26, 2007-01-25 19:58:02+03:00, kaa@polly.local +8 -0
    Added a test case for bug #20293 "group by cuts off value from time_format"

ChangeSet@1.1810.2520.2, 2007-01-24 16:37:38+04:00, bar@mysql.com +3 -0
  Bug#25815 Data truncated for column TEXT
  Problem: "Data truncated" warning was incorrectly generated
  when storing a Japanese character encoded in utf8
  into a cp932 column.
  Reason: Incorrect wrong warning condition
  compared the original length of the character in bytes
  (which is 3 in utf8) to the converted length of the
  character in bytes (which is 2 in cp932).
  Fix: use "how many bytes were scanned from input" instead
  of "how many bytes were put to the column" in the condition.

  mysql-test/t/ctype_cp932.test@1.8.3.1, 2007-01-24 16:37:34+04:00, bar@mysql.com +11 -0
    Adding test case

  mysql-test/r/ctype_cp932.result@1.6.3.1, 2007-01-24 16:37:34+04:00, bar@mysql.com +12 -0
    Adding test case

  sql/field.cc@1.256.40.3, 2007-01-24 16:37:34+04:00, bar@mysql.com +1 -1
    Change warning condition from:
    "if number of bytes written to destination is less than full source length"
    to
    "if number of bytes read from source is less than full source length"
     

ChangeSet@1.2390.16.1, 2007-01-23 15:14:08-07:00, malff@weblab.(none) +7 -0
  Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS)
  
  Before this fix, the command SHOW ENGINE <name> STATUS would:
  - print a warning if the engine name is unknown,
  - proceed and implement the same behavior as SHOW ENGINE ALL STATUS,
  and list the status of all the storage engines registered.
  
  In particular, this behavior caused confusion about the command :
  SHOW ENGINE MUTEX STATUS, which as a side effect would print the status
  of the innodb engine when that engine is registered.
  
  Also, before this fix, every time an unknown engine name was substituted by
  the default engine (which happen unless SQL_MODE NO_ENGINE_SUBSTITUTION is
  set), a malformed warning was raised.
  For example, the command ALTER TABLE T1 ENGINE = X would print :
  Warnings:
  Error 1286 Unknown table engine 'X'
  
  With this fix:
  SHOW ENGINE <name> STATUS|LOGS|MUTEX
  always fails with an error when the engine <name> is unknown.
  
  For other commands, warnings about unknown engines are raised as:
  Warnings:
  Warning 1286 Unknown table engine 'X'
  
  In other words, engine substitution never affect the SHOW ENGINE command,
  since this would lead to very confusing results.

  mysql-test/r/ndb_dd_basic.result@1.14, 2007-01-23 15:11:34-07:00, malff@weblab.(none) +1 -1
    Warnings for unknown engines.

  mysql-test/r/partition_innodb.result@1.3, 2007-01-23 15:11:34-07:00, malff@weblab.(none) +2 -2
    Warnings for unknown engines.

  mysql-test/r/ps_1general.result@1.64, 2007-01-23 15:11:34-07:00, malff@weblab.(none) +3 -1
    Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX

  mysql-test/r/show_check.result@1.109.1.1, 2007-01-23 15:11:34-07:00, malff@weblab.(none) +14 -0
    Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX

  mysql-test/t/ps_1general.test@1.38, 2007-01-23 15:11:35-07:00, malff@weblab.(none) +3 -7
    Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX

  mysql-test/t/show_check.test@1.72.2.1, 2007-01-23 15:11:35-07:00, malff@weblab.(none) +18 -0
    Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX

  sql/sql_yacc.yy@1.535, 2007-01-23 15:11:35-07:00, malff@weblab.(none) +22 -12
    Fixed SHOW ENGINE <name> STATUS|LOGS|MUTEX

ChangeSet@1.2343.55.1, 2007-01-23 14:32:10+04:00, bar@mysql.com +3 -0
  Bug#25081 SHOW FULL TABLES on table with latin chars in name fails
  Problem: The Table_type column of "SHOW FULL TABLES" displayed
  "ERROR" instead of "BASE TABLE" for tables having non-ascii
  characters in their names.
  Reason: tablename to filename encoding was missing, so
  mysql_frm_type() tried to open a wrong file name.
  
  Fix: adding tablename to filename encoding

  mysql-test/r/show_check.result@1.108.1.1, 2007-01-23 14:32:07+04:00, bar@mysql.com +8 -0
    Adding test case

  mysql-test/t/show_check.test@1.72.1.1, 2007-01-23 14:32:07+04:00, bar@mysql.com +12 -0
    Adding test case

  sql/sql_show.cc@1.379.3.1, 2007-01-23 14:32:07+04:00, bar@mysql.com +4 -4
    Adding tablename to filename encoding.
    Removing variable "end" with is not used anymore.

ChangeSet@1.1810.2494.2, 2007-01-18 13:35:49-05:00, cbell@mysql_cab_desk. +2 -0
  BUG#21490 - No warning issued for deprecated replication parameters
  This patch deprecates the replication startup options in the configuration
  file and on the command line. The options deprecated include:
  
  MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
  MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
  and MASTER_SSL_CIPHER
  
  The code is designed to print the warning message once.

  sql/mysql_priv.h@1.290.85.1, 2007-01-18 13:35:46-05:00, cbell@mysql_cab_desk. +12 -0
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
    warning to the user at startup when the replication startup options are detected.
    It displays the same messae as the original version of the macro but allows the 
    macro to be called before a thread is created and the ER() macro is defined.

  sql/mysqld.cc@1.439.90.1, 2007-01-18 13:35:47-05:00, cbell@mysql_cab_desk. +25 -0
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch deprecates the replication startup options in the configuration
    file and on the command line. The options deprecated include:
    
    MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
    MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
    and MASTER_SSL_CIPHER
    
    The code is designed to print the warning message once.

ChangeSet@1.2378.6.2, 2007-01-18 13:20:38-05:00, cbell@mysql_cab_desk. +2 -0
  BUG#21490 - No warning issued for deprecated replication parameters
  This patch deprecates the replication startup options in the configuration
  file and on the command line. The options deprecated include:
  
  MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
  MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
  and MASTER_SSL_CIPHER
  
  The code is designed to print the warning message once.

  sql/mysql_priv.h@1.468.1.1, 2007-01-18 13:20:34-05:00, cbell@mysql_cab_desk. +10 -7
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch modifies the WARN_DEPRECATED macro to permit displaying a deprecated 
    warning to the user at startup when the replication startup options are detected.
    It displays the same messae as the original version of the macro but allows the 
    macro to be called before a thread is created and the ER() macro is defined.

  sql/mysqld.cc@1.601.2.1, 2007-01-18 13:20:35-05:00, cbell@mysql_cab_desk. +24 -0
    BUG#21490 - No warning issued for deprecated replication parameters
    This patch deprecates the replication startup options in the configuration
    file and on the command line. The options deprecated include:
    
    MASTER_HOST, MASTER_USER, MASTER_PASSWORD, MASTER_PORT, MASTER_CONNECT_RETRY,
    MASTER_SSL, MASTER_SSL_CA, MASTER_SSL_CAPATH, MASTER_SSL_CERT, MASTER_SSL_KEY,
    and MASTER_SSL_CIPHER
    
    The code is designed to print the warning message once.

ChangeSet@1.2343.54.1, 2007-01-15 16:01:00+02:00, aelkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi +3 -0
  Bug #16567 binlog_format option does not show when doing ./mysqd --help --verbose
  
    Implementing this feature connected to wl#3368 mixed binlog_format default.
    Supplied by my.cnf or explicitly in command line option gets be displayed.
    When not supplied `(No default value)' is displayed, even though --log-bin might
    be supplied. The option is different object from @@global.binlog_format variable.
    The default `mixed' for the latter is dependant on presence of `--log-bin' option,
    otherwise the value of the var is set to NULL (undefined):
  
     var := opt | MIXED  when binlog-in-use
     var := NULL         otherwise (no binlog, no format)
  
    Comments on NDB and mixed format updated, also dependency the option on --log-bin
    aka binlog-in-use is worded.
    
    Making t/rpl_switch_stm_row_mixed.test to interprete DEFAULT for binlog_format
    as MIXED.
    Comments on what the test covers are added.
  
    todo/fixme: turning @@global.binlog_format to be read-only when it's set to NULL (no binlog).
    todo/fixme: options dependacy (acyclic) graph, particularly to solve a task of
  setting defaults values for the leaf nodes
    only when parents' nodes are set.

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.17, 2007-01-15 16:00:56+02:00, aelkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi +29 -7
    changed

  mysql-test/t/rpl_switch_stm_row_mixed.test@1.14, 2007-01-15 16:00:57+02:00, aelkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi +30 -8
    correcting interpretation of DEFAULT for binlog_format, comments on test purpose,
    switching binlog_format section is formed.

  sql/mysqld.cc@1.600.1.1, 2007-01-15 16:00:57+02:00, aelkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi +27 -17
    introducing command line option parser's opt_binlog_format and its default.
    necessary code for transfering text value from command line arg into the system variable
    @@global.binlog_format.

ChangeSet@1.2343.48.1, 2006-12-27 18:14:28+04:00, bar@mysql.com +3 -0
  Bug#24747 XPath error with the node name "Text"

  mysql-test/r/xml.result@1.19.1.1, 2006-12-27 18:14:24+04:00, bar@mysql.com +75 -0
    Adding test case

  mysql-test/t/xml.test@1.19, 2006-12-27 18:14:24+04:00, bar@mysql.com +38 -0
    Adding test case

  sql/item_xmlfunc.cc@1.22.1.1, 2006-12-27 18:14:24+04:00, bar@mysql.com +76 -16
    Bug#24747 XPath error with the node name "Text"
    
    Problem: keywords, nodetype names and axis names
    didn't work in node name context.
    
    Fix:
    1. Changes in lexem scanner behaviour when an identifier has been read:
    - search through axis names and return MY_XPATH_AXIS_xxx only
      when identifier is followed by two semicolons. Don't check axis
      names and return MY_XPATH_IDENT of not followed by two semicolons.
    - search through nodetype names and return MY_XPATH_LEX_NODETYPE
      only when identifier is followed by left parenthesis.
      Don't check nodetype names and return MY_XPATH_LEX_IDENT when
      not followed by parenthesis
    2. Change in syntax analizer: QName scanner now accepts keywords 
       AND, OR, MOD, DIV as valid node names.

ChangeSet@1.1616.2901.16, 2006-12-26 15:08:41+04:00, ramil@mysql.com +4 -0
  Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
  
  Consider double values as legal date{time} function's arguments
  (i.e. allow dates in internal format YYYYMMDDHHMMSS.XXXXXX).

  mysql-test/r/func_sapdb.result@1.2.1.10, 2006-12-26 15:08:39+04:00, ramil@mysql.com +1 -3
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - result adjusted.

  mysql-test/r/func_time.result@1.23.6.7, 2006-12-26 15:08:39+04:00, ramil@mysql.com +4 -0
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - test result.

  mysql-test/t/func_time.test@1.21.5.7, 2006-12-26 15:08:39+04:00, ramil@mysql.com +7 -0
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - test case.

  sql-common/my_time.c@1.6.1.13, 2006-12-26 15:08:39+04:00, ramil@mysql.com +1 -1
    Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
      - consider '.' as an acceptable separator for dates like YYYYYMMDDHHMMSS.XXXXXX

ChangeSet@1.2298.3.1, 2006-10-13 13:48:04+00:00, lzhou@dev3-138.dev.cn.tlan +1 -0
  BUG#21296 Add error messages when upgrading data node

  storage/ndb/src/kernel/error/ErrorReporter.cpp@1.16, 2006-10-13 13:48:02+00:00, lzhou@dev3-138.dev.cn.tlan +5 -1
    Add error messages.

ChangeSet@1.1810.2076.2, 2006-09-07 18:51:00+04:00, kroki@moonlight.intranet +3 -0
  BUG#20492: Subsequent calls to stored procedure yield incorrect result
             if join is used
  
  For procedures with selects that use complicated joins with ON expression
  re-execution could erroneously ignore this ON expression, giving
  incorrect result.
  
  The problem was that optimized ON expression wasn't saved for
  re-execution.  The solution is to properly save it.

  mysql-test/r/sp.result@1.170.22.1, 2006-09-07 18:50:57+04:00, kroki@moonlight.intranet +26 -0
    Add result for bug#20492: Subsequent calls to stored procedure yield
    incorrect result if join is used.

  mysql-test/t/sp.test@1.174.17.1, 2006-09-07 18:50:57+04:00, kroki@moonlight.intranet +41 -0
    Add test case for bug#20492: Subsequent calls to stored procedure yield
    incorrect result if join is used.

  sql/sql_select.cc@1.312.92.1, 2006-09-07 18:50:58+04:00, kroki@moonlight.intranet +8 -3
    Save modified ON expression for re-execution.

ChangeSet@1.1810.1849.38, 2006-07-23 22:13:12+02:00, msvensson@neptunus.(none) +1 -0
  Remove strange comment

  client/mysql.cc@1.199.8.2, 2006-07-23 22:13:10+02:00, msvensson@neptunus.(none) +0 -4
    Remove strange comment

