ChangeSet@1.2513, 2007-05-25 23:08:31+02:00, joerg@trift2. +1 -0
  Makefile.am  :  Bypass bug#28685 and skip the "rowlock" suite in the release builds.

  Makefile.am@1.136, 2007-05-25 23:08:27+02:00, joerg@trift2. +4 -2
    Bypass bug#28685 and skip the "rowlock" suite in the release builds.

ChangeSet@1.2512, 2007-05-25 17:21:12+05:00, holyfoot@mysql.com +6 -0
  decimal buffer overflow bug fixed

  mysql-test/r/ps_2myisam.result@1.58, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +16 -16
    test result fixed

  mysql-test/r/ps_3innodb.result@1.61, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +16 -16
    test result fixed

  mysql-test/r/ps_4heap.result@1.57, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +16 -16
    test result fixed

  mysql-test/r/ps_5merge.result@1.58, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +32 -32
    test result fixed

  mysql-test/r/ps_7ndb.result@1.57, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +16 -16
    test result fixed

  sql/my_decimal.h@1.23, 2007-05-25 17:20:39+05:00, holyfoot@mysql.com +8 -3
    DECIMAL_MAX_STR_LENGTH fixed

ChangeSet@1.2475.60.2, 2007-05-24 15:20:06+02:00, joerg@trift2. +1 -0
  Makefile.am   :   Add "embedded" tests to the "test-bt" target.

  Makefile.am@1.135, 2007-05-24 15:20:00+02:00, joerg@trift2. +5 -0
    The "test-bt" target was lacking "embedded" tests -
    add them, dependent on the build of the test binary needed for them.

ChangeSet@1.2403.25.1, 2007-05-22 17:53:07+02:00, tomas@whalegate.ndb.mysql.com +5 -0
  Bug #28593 cluster backup scans in acc index order, bad for disk data
  - change to scan in tup and disk order (if applicable)

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.62.1.1, 2007-05-22 17:53:04+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    tup scan for backup also, not only lcp

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.3.1, 2007-05-22 17:53:04+02:00, tomas@whalegate.ndb.mysql.com +26 -3
    choose disk order scan for disktables during backup
    + move bug workaround for 27776 from tup to lqh

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.1, 2007-05-22 17:53:04+02:00, tomas@whalegate.ndb.mysql.com +18 -3
    add missing jamEntry

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.3.1, 2007-05-22 17:53:04+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    move bug workaround for 27776 from tup to lqh

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.1, 2007-05-22 17:53:04+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    missing jamEntry

ChangeSet@1.1810.2958.2, 2007-05-22 17:21:22+02:00, joerg@trift2. +1 -0
  Add the "row_lock" test suite to the (to be) release build test run.

  Makefile.am@1.68.1.37, 2007-05-22 17:21:19+02:00, joerg@trift2. +2 -0
    Add the "row_lock" test suite to the (to be) release build test run.

ChangeSet@1.1810.2958.1, 2007-05-22 17:06:47+02:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh  :
  Include all the additional test suites in the binary packages ("tar.gz").
  This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.

  scripts/make_binary_distribution.sh@1.101.1.25, 2007-05-22 17:06:44+02:00, joerg@trift2. +40 -32
    Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock")
    in the binary packages ("tar.gz").
    Take them "as is", without any file filtering (except for the BK subdirectories "SCCS").
    
    This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
    
    Use this opportunity to correct the language in some comments.

ChangeSet@1.2475.59.1, 2007-05-21 20:24:34+02:00, joerg@trift2. +1 -0
  Prevent the failing "jp" suite from causing havoc in release builds (28563).

  Makefile.am@1.133, 2007-05-21 20:24:25+02:00, joerg@trift2. +4 -2
    This is *no* fix, it is just to avoid the failure of the "jp" test suite 
    (28563 is the number of the bug) from causing havoc in release builds.

ChangeSet@1.2475.1.48, 2007-05-21 17:48:29+05:00, svoj@mysql.com +4 -0
  BUG#25659 - memory leak via "plugins" test
  
  - Added suppressions for dlopen to make plugin test pass.
  - Do not pass empty string to mysqld, since my_getopt is
    not capable to handle it.
  - Re-enabled trailing UNINSTALL PLUGIN statement of plugin.test.
  
  The memory leak described in the bug report happens in libdl, not
  in mysqld. On some valgrind installations this error is suppressed
  by default, no idea why it isn't suppressed on pb-valgrind.
  
  <observation>
  If library remains open after thread has finished, and is closed by
  another thread, we get memory leak. But in case library is opened and
  closed by the same thread no leak occurs.
  </observation>

  mysql-test/lib/mtr_io.pl@1.13, 2007-05-21 17:48:28+05:00, svoj@mysql.com +5 -1
    Do not pass empty string since my_getopt is not capable to handle it.
    This is required to make plugin.test work on platforms where
    ha_example is not compiled.

  mysql-test/r/plugin.result@1.3, 2007-05-21 17:48:28+05:00, svoj@mysql.com +3 -0
    Updated test result.

  mysql-test/t/plugin.test@1.2, 2007-05-21 17:48:28+05:00, svoj@mysql.com +3 -3
    Re-enabled UNINSTALL PLUGIN statement. It is a good idea to cleanup
    at the end of the test. Anyway bug22694 was fixed while this test
    was disabled.

  mysql-test/valgrind.supp@1.18, 2007-05-21 17:48:28+05:00, svoj@mysql.com +17 -0
    Added suppressions for dlopen to make plugin test pass.

ChangeSet@1.2475.58.1, 2007-05-21 11:48:05+05:00, svoj@mysql.com +1 -0
  BUG#25659 - memory leak via "plugins" test
  Re-enabled plugin test to check if it still leaks memory.

  mysql-test/t/disabled.def@1.249.2.1, 2007-05-21 11:48:03+05:00, svoj@mysql.com +0 -1
    Re-enabled plugin test.

ChangeSet@1.2475.1.46, 2007-05-21 11:34:39+05:00, svoj@mysql.com +2 -0
  Addition to fix for
  BUG#28341 - Security issue still in library loading
  
  Added required option files to rpl_udf test.

  mysql-test/t/rpl_udf-master.opt@1.1, 2007-05-21 11:34:38+05:00, svoj@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_udf-master.opt''

  mysql-test/t/rpl_udf-master.opt@1.0, 2007-05-21 11:34:38+05:00, svoj@mysql.com +0 -0

  mysql-test/t/rpl_udf-slave.opt@1.1, 2007-05-21 11:34:38+05:00, svoj@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/rpl_udf-slave.opt''

  mysql-test/t/rpl_udf-slave.opt@1.0, 2007-05-21 11:34:38+05:00, svoj@mysql.com +0 -0

ChangeSet@1.2499, 2007-05-19 18:22:55+02:00, msvensson@pilot.blaudden +1 -0
  Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
   - Upgrade result file for 5.1

  mysql-test/r/mysql_upgrade.result@1.13, 2007-05-19 18:22:53+02:00, msvensson@pilot.blaudden +6 -0
    Update result for 5.1 - it has more system tables

ChangeSet@1.1810.2956.2, 2007-05-19 18:15:08+02:00, msvensson@pilot.blaudden +3 -0
  Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
   - The SQL commands used by mysql_upgrade are written to be run
      with sql_mode set to '' - thus the scripts should change sql_mode
      for the session to make sure the SQL is legal.

  mysql-test/r/mysql_upgrade.result@1.1.1.5, 2007-05-19 18:15:07+02:00, msvensson@pilot.blaudden +19 -0
    Update test result

  mysql-test/t/mysql_upgrade.test@1.4.1.4, 2007-05-19 18:15:07+02:00, msvensson@pilot.blaudden +13 -0
    The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.

  scripts/mysql_system_tables_fix.sql@1.9.1.36, 2007-05-19 18:15:07+02:00, msvensson@pilot.blaudden +1 -0
    Set sql_mode to '' before running the SQL commands
    to fix system tables - backport from 5.1

ChangeSet@1.2475.57.4, 2007-05-18 23:21:34+05:00, holyfoot@mysql.com +5 -0
  merging

  mysql-test/r/ps.result@1.111, 2007-05-18 23:21:32+05:00, holyfoot@mysql.com +0 -208
    merging

  mysql-test/r/sp_trans.result@1.19, 2007-05-18 23:21:32+05:00, holyfoot@mysql.com +0 -20
    merging

  mysql-test/t/ps.test@1.114, 2007-05-18 23:21:32+05:00, holyfoot@mysql.com +0 -109
    merging

  mysql-test/t/sp_trans.test@1.16, 2007-05-18 23:21:32+05:00, holyfoot@mysql.com +0 -29
    merging

  sql/opt_sum.cc@1.63, 2007-05-18 23:21:32+05:00, holyfoot@mysql.com +4 -3
    merging

ChangeSet@1.1810.2957.1, 2007-05-18 17:48:44+02:00, serg@sergbook.mysql.com +4 -0
  added cleanup to some tests

  mysql-test/r/sp_trans.result@1.7.1.6, 2007-05-18 17:48:39+02:00, serg@sergbook.mysql.com +1 -2
    added cleanup

  mysql-test/r/strict.result@1.25.9.1, 2007-05-18 17:48:39+02:00, serg@sergbook.mysql.com +1 -1
    added cleanup

  mysql-test/t/sp_trans.test@1.9.1.4, 2007-05-18 17:48:40+02:00, serg@sergbook.mysql.com +3 -6
    added cleanup

  mysql-test/t/strict.test@1.19.1.10, 2007-05-18 17:48:40+02:00, serg@sergbook.mysql.com +1 -1
    added cleanup

ChangeSet@1.2475.56.1, 2007-05-18 16:23:46+05:00, svoj@mysql.com +5 -0
  BUG#28341 - Security issue still in library loading
  
  UDF can be created from any library in any part of the server
  LD_LIBRARY_PATH.
  
  Allow to load udfs only from plugin_dir.
  On windows, refuse to open udf in case it's path contains a slash.
  
  No good test case for this bug because of imperfect error message
  that includes error code and error string when it fails to dlopen a
  library.

  mysql-test/mysql-test-run.pl@1.303.1.1, 2007-05-18 16:23:44+05:00, svoj@mysql.com +4 -19
    Since plugins are allowed to be open only from plugin_dir:
    - there is no sence to update LD_LIBRARY_PATH
    - there is no sence to add plugin_dir arg by default
    - set UDF_EXAMPLE_LIB_OPT and EXAMPLE_PLUGIN_OPT to be used by
      udf and plugin tests accordingly.

  mysql-test/r/plugin.result@1.2, 2007-05-18 16:23:44+05:00, svoj@mysql.com +2 -1
    Updated test result (we report addition warning).

  mysql-test/t/plugin-master.opt@1.1, 2007-05-18 16:23:44+05:00, svoj@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/plugin-master.opt''

  mysql-test/t/plugin-master.opt@1.0, 2007-05-18 16:23:44+05:00, svoj@mysql.com +0 -0

  mysql-test/t/udf-master.opt@1.1, 2007-05-18 16:23:44+05:00, svoj@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/udf-master.opt''

  mysql-test/t/udf-master.opt@1.0, 2007-05-18 16:23:44+05:00, svoj@mysql.com +0 -0

  sql/sql_udf.cc@1.76, 2007-05-18 16:23:44+05:00, svoj@mysql.com +22 -8
    Allow to load udfs only from plugin_dir.
    On windows, refuse to open udf in case it's path contains a slash.

ChangeSet@1.1616.2881.99, 2007-05-18 12:50:23+02:00, msvensson@pilot.blaudden +3 -0
  WL#2247 mysqltest: add option for sorting results
   - Final touchups

  client/mysqltest.c@1.92.21.66, 2007-05-18 12:50:22+02:00, msvensson@pilot.blaudden +4 -4
    Final touch ups, rename sorted_results to sorted_result

  mysql-test/r/mysqltest.result@1.3.1.24, 2007-05-18 12:50:22+02:00, msvensson@pilot.blaudden +48 -6
    Update test result

  mysql-test/t/mysqltest.test@1.3.1.29, 2007-05-18 12:50:22+02:00, msvensson@pilot.blaudden +76 -26
    Update results with additional subtests for empty result set,
    NULL values and 1024 rows

ChangeSet@1.1616.2769.20, 2007-05-18 11:34:57+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28443
    review comment 2, atleast 1 signal need for test prg

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.15.1.10, 2007-05-18 11:34:56+02:00, jonas@perch.ndb.mysql.com +1 -1
    review comment, atleast 1 signal need

ChangeSet@1.1616.2769.19, 2007-05-18 11:06:03+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28443
    review comment
    if some tcp-transporter has data, then do select with timeout 0

  ndb/src/common/transporter/TransporterRegistry.cpp@1.19.1.11, 2007-05-18 11:06:01+02:00, jonas@perch.ndb.mysql.com +18 -16
    review comment
    if some tcp-transporter has data, then do select with timeout 0

ChangeSet@1.1616.2769.18, 2007-05-18 09:48:52+02:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#28443
    Make sure that data can not e left lingering in receive buffer

  ndb/src/common/transporter/Packer.cpp@1.5.3.1, 2007-05-18 09:48:50+02:00, jonas@perch.ndb.mysql.com +5 -0
    test, make MAX_RECEIVED_SIGNALS an variable

  ndb/src/common/transporter/TCP_Transporter.hpp@1.3.1.2, 2007-05-18 09:48:51+02:00, jonas@perch.ndb.mysql.com +4 -0
    add new method for checking of data in receive buffer

  ndb/src/common/transporter/TransporterRegistry.cpp@1.19.1.10, 2007-05-18 09:48:51+02:00, jonas@perch.ndb.mysql.com +21 -18
    Make sure that 
    1) poll_TCP return true if any transporter has data in receiveBuffer
       (previously only if socket had data)
    2) performReceive executes signals if TCP transporter has data in receiveBuffer
       (previously only if data was recevied)

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.15.1.9, 2007-05-18 09:48:51+02:00, jonas@perch.ndb.mysql.com +17 -0
    test, make MAX_RECEIVED_SIGNALS an variable

  ndb/test/ndbapi/testNdbApi.cpp@1.9.2.2, 2007-05-18 09:48:51+02:00, jonas@perch.ndb.mysql.com +34 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.13.3.4, 2007-05-18 09:48:51+02:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.1810.2955.1, 2007-05-18 06:14:37+02:00, tsmith@quadxeon.mysql.com +1 -0
  my_time.c:
    in number_to_datetime(), zero out the MYSQL_TIME structure
    before setting values, to ensure that all fields are initialized; in
    particular, ensure that ->neg is set to zero (fixes valgrind warning
    "Conditional jump ... depends on uninitialised value" in make_date_time)

  sql-common/my_time.c@1.19.17.2, 2007-05-18 06:13:24+02:00, tsmith@quadxeon.mysql.com +1 -0
    in number_to_datetime(), zero out the MYSQL_TIME structure
    before setting values, to ensure that all fields are initialized; in
    particular, ensure that ->neg is set to zero (fixes valgrind warning
    "Conditional jump ... depends on uninitialised value" in make_date_time)

ChangeSet@1.1810.2942.13, 2007-05-17 20:45:33-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #27119  	server crash with integer division by zero during filesort on huge result
  
  Fixed a problem and compiler warning on 64bit platforms so that they only allocated UINT_MAX number of BUFFPEKS.

  sql/filesort.cc@1.105.1.15, 2007-05-17 20:45:28-04:00, dkatz@damien-katzs-computer.local +2 -2
     Fixed a problem and compiler warning on 64bit platforms so that they only allocated UINT_MAX number of BUFFPEKS.

ChangeSet@1.1810.2954.1, 2007-05-17 17:54:31-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #27119  	server crash with integer division by zero during filesort on huge result
  
  Fixed a compiler warning on platforms where uint != ulong from the first pushed fix.

  sql/filesort.cc@1.105.1.14, 2007-05-17 17:54:27-04:00, dkatz@damien-katzs-computer.local +1 -1
    fixed a compiler warning on platforms where uint != ulong

ChangeSet@1.1810.2953.1, 2007-05-17 23:09:45+04:00, evgen@moonbone.local +3 -0
  Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
  is involved.
  
  The Arg_comparator::compare_datetime() comparator caches its arguments if
  they are constants i.e. const_item() returns true. The
  Item_func_get_user_var::const_item() returns true or false based on
  the current query_id and the query_id where the variable was created.
  Thus even if a query can change its value its const_item() still will return
  true. All this leads to a wrong comparison result when an object of the
  Item_func_get_user_var class is involved.
  
  Now the Arg_comparator::can_compare_as_dates() and the
  get_datetime_value() functions never cache result of the GET_USER_VAR()
  function (the Item_func_get_user_var class).

  mysql-test/r/type_datetime.result@1.30.1.14, 2007-05-17 23:08:24+04:00, evgen@moonbone.local +24 -0
    A test case is added for the bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
    is involved.

  mysql-test/t/type_datetime.test@1.18.1.12, 2007-05-17 23:07:55+04:00, evgen@moonbone.local +12 -0
    A test case is added for the bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
    is involved.

  sql/item_cmpfunc.cc@1.187.1.65, 2007-05-17 23:08:45+04:00, evgen@moonbone.local +13 -2
    Bug#28261: Wrong DATETIME comparison result when the GET_USER_VAR function
    is involved.
    Now the Arg_comparator::can_compare_as_dates() and the
    get_datetime_value() functions never cache result of the GET_USER_VAR()
    function (the Item_func_get_user_var class).

ChangeSet@1.1810.2952.1, 2007-05-17 12:55:59-06:00, tsmith@siva.hindu.god +1 -0
  ps_6bdb.result:
    Fix bad merge of test results

  mysql-test/r/ps_6bdb.result@1.27.13.1, 2007-05-17 12:55:52-06:00, tsmith@siva.hindu.god +1 -1
    Fix bad merge of test results

ChangeSet@1.1616.3029.9, 2007-05-17 15:23:59+05:00, svoj@mysql.com +1 -0
  Addition to fix for
  BUG#25712 - insert delayed and check table run together report crashed
              tables
  Fixed wrongly applied patch.

  mysys/my_seek.c@1.11.5.2, 2007-05-17 15:23:58+05:00, svoj@mysql.com +1 -1
    Addition to fix for
    BUG#25712 - insert delayed and check table run together report crashed
                tables
    Fixed wrongly applied patch.

ChangeSet@1.2475.55.1, 2007-05-17 13:27:39+05:00, gluh@mysql.com +1 -0
  valgrind error fix(addon)

  sql/sql_lex.cc@1.240.1.1, 2007-05-17 13:27:37+05:00, gluh@mysql.com +1 -1
    valgrind error fix(addon)

ChangeSet@1.1616.3029.8, 2007-05-17 12:43:52+05:00, svoj@mysql.com +1 -0
  Addition to fix for
  BUG#25712 - insert delayed and check table run together report
              crashed tables
  
  Let MY_THREADSAFE have distinct value. Some functions call my_seek
  passing MyFlags argument directly to it. This may cause unnecessary
  locks, which may finally lead to a dead-lock (specifically see my_lock).

  include/my_sys.h@1.116.5.1, 2007-05-17 12:43:51+05:00, svoj@mysql.com +1 -1
    Addition to fix for
    BUG#25712 - insert delayed and check table run together report
                crashed tables
    
    Let MY_THREADSAFE have distinct value. Some functions call my_seek
    passing MyFlags argument directly to it. This may cause unnecessary
    locks, which may finally lead to a dead-lock (specifically see my_lock).
    
    Also it doesn't affect my_pread/my_pwrite in any way. So the comment was
    updated.

ChangeSet@1.2403.18.49, 2007-05-17 08:54:30+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28491
    disable "disable expand check" as it does not solve problems anyway

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.81.1.3, 2007-05-17 08:54:28+02:00, jonas@perch.ndb.mysql.com +2 -2
    disable "disable expand check" as it does not solve problems anyway

ChangeSet@1.1810.2951.1, 2007-05-16 23:42:10-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28337: wrong results for grouping queries with correlated
  subqueries in WHERE conditions.
  This bug was introduced by the patch for bug 27321.

  mysql-test/r/subselect.result@1.134.1.56, 2007-05-16 23:42:08-07:00, igor@olga.mysql.com +30 -0
    Added a test case for bug #28337.

  mysql-test/t/subselect.test@1.129.1.23, 2007-05-16 23:42:08-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #28337.

  sql/item.cc@1.113.85.2, 2007-05-16 23:42:09-07:00, igor@olga.mysql.com +2 -1
    Fixed bug #28337: wrong results for grouping queries with correlated
    subqueries in WHERE conditions.
    This bug was introduced by the patch for bug 27321.
    
    Now in the Item_field::fix_outer_field function we create an Item_outer_ref
    object for an outer reference only if it is used in the SELECT list or
    in the HAVING clause of the subquery against which the reference is resolved.

ChangeSet@1.1810.2942.8, 2007-05-16 16:14:13-04:00, dkatz@damien-katzs-computer.local +2 -0
  Bug #27119  	server crash with integer division by zero during filesort on huge result
  
  Added checks to detect integer overflow and fixed other bugs on the error path.

  sql/filesort.cc@1.105.1.13, 2007-05-16 16:14:09-04:00, dkatz@damien-katzs-computer.local +15 -6
    Fixed an allocation routine to detect integer overflow, and as an optimization a check that prevents the number of buffpeks being larger than can possibly fit into memory.
        
    Fixed several unchecked error codes.
        
    Changed an index variable from int to uint to the match the type of the variable it's
    being compared with.
        
        Replaced a break statement with a goto statement so that a failure will instead break
    out of the higher level while-loop, instead of just the nested for-loop.

  myisam/sort.c@1.45.19.1, 2007-05-16 16:14:08-04:00, dkatz@damien-katzs-computer.local +2 -1
    Replaced a break statement with a goto statement so that a failure will instead break

ChangeSet@1.2475.54.3, 2007-05-16 21:00:35+02:00, joerg@trift2. +1 -0
  After-merge fix in "scripts/make_win_bin_dist":
  Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.

  scripts/make_win_bin_dist@1.17, 2007-05-16 21:00:31+02:00, joerg@trift2. +2 -2
    After-merge fix:
    Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.

ChangeSet@1.1616.3029.7, 2007-05-16 23:42:32+05:00, svoj@mysql.com +2 -0
  BUG#25712 - insert delayed and check table run together report crashed
              tables
  
  In case system doesn't have native pread/pwrite calls (e.g. Windows)
  and there is CHECK TABLE runs concurrently with another statement that
  reads from a table, the table may be reported as crashed.
  
  This is fixed by locking file descriptor when my_seek is executed on
  MyISAM index file and emulated pread/pwrite may be executed concurrently.
  
  Affects MyISAM tables on platforms that do not have native
  pread/pwrite calls (e.g. Windows).
  
  No deterministic test case for this bug.

  mysys/my_seek.c@1.11.5.1, 2007-05-16 23:42:31+05:00, svoj@mysql.com +13 -2
    On platforms that do not have native pread/pwrite calls (e.g. Windows)
    these calls are emulated as follow: lock fd, lseek, read, unlock fd.
    
    In case file descriptor is shared among threads, where one thread
    executes my_pread and another thread executes my_seek, we may read
    from a wrong position. This may happen because my_seek doesn't lock
    fd and thus may be executed by another thread after emulated pread
    has done lseek and before it has done read.
    
    To fix problem mentioned above we introduce new flag MY_THREADSAFE to
    my_seek, which is meaningful only in case pread/pwrite calls are
    emulated. If this flag is set, lseek operation is performed as follow:
    lock fd, seek, unlock fd.

  myisam/mi_check.c@1.105.1.58, 2007-05-16 23:42:31+05:00, svoj@mysql.com +7 -6
    Key file descriptor is shared among threads and mixed set of
    my_pread/my_pwrite and my_seek calls is possible. This is not
    a problem on systems that have native pread/pwrite calls.
    
    In case system doesn't have native pread/pwrite calls (e.g. Windows)
    we must ensure that my_pread/my_pwrite are not executed at the same
    time with my_seek. This is done by passing MY_THREADSAFE flag to
    my_seek.

ChangeSet@1.2475.54.1, 2007-05-16 20:29:49+02:00, joerg@trift2. +2 -0
  Ensure that the 5.1 version of "scripts/make_win_bin_dist" depends on 5.0,
  so that changes from 5.0 propagate (on merge) into the 5.1 version.

  BitKeeper/deleted/.del-make_win_bin_dist-HIDE@1.10, 2007-05-16 20:24:05+02:00, joerg@trift2. +0 -0
    Delete: scripts/make_win_bin_dist-HIDE

  scripts/make_win_bin_dist-HIDE@1.9, 2007-05-16 19:50:50+02:00, joerg@trift2. +0 -0
    Rename: scripts/make_win_bin_dist -> scripts/make_win_bin_dist-HIDE

  scripts/make_win_bin_dist@1.15, 2007-05-16 20:29:45+02:00, joerg@trift2. +46 -14
    Transfer the current contents of the 5.1 version into this file.
    
    This is *no* contents change, its *only* purpose is to ensure that the 5.1 version
    of this file depends on the 5.0 version, and changes from 5.0 propagate properly
    into 5.1.

  scripts/make_win_bin_dist@1.14, 2007-05-16 19:53:16+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-make_win_bin_dist -> scripts/make_win_bin_dist

ChangeSet@1.1616.2881.98, 2007-05-16 17:51:28+02:00, msvensson@pilot.blaudden +1 -0
  Bug#28473 Does mysql-test-run.pl handle LD_LIBRARY_PATH wrong ?
   - Fix spelling error

  mysql-test/mysql-test-run.pl@1.8.20.11, 2007-05-16 17:51:28+02:00, msvensson@pilot.blaudden +1 -1
    Fix spelling error

ChangeSet@1.1616.2881.97, 2007-05-16 17:19:36+02:00, msvensson@pilot.blaudden +3 -0
  WL#2247 mysqltest: add option for sorting results
   - Change from "query_sorted <query>" to "sorted_results"

  client/mysqltest.c@1.92.21.65, 2007-05-16 17:19:35+02:00, msvensson@pilot.blaudden +12 -6
    Replace "query_sorted <query>" with the ability to turn
    on "one shot result sorting" with the command "sorted_results" 

  mysql-test/r/mysqltest.result@1.3.1.23, 2007-05-16 17:19:35+02:00, msvensson@pilot.blaudden +52 -0
    Update test and result

  mysql-test/t/mysqltest.test@1.3.1.28, 2007-05-16 17:19:35+02:00, msvensson@pilot.blaudden +64 -7
    Update test and result

ChangeSet@1.1616.2881.96, 2007-05-16 16:30:26+02:00, msvensson@pilot.blaudden +1 -0
  Bug#28470 mysqltest scripts need to know protocol

  client/mysqltest.c@1.92.21.64, 2007-05-16 16:30:25+02:00, msvensson@pilot.blaudden +5 -0
    Make it possible for test scripts to know what protocol is being used

ChangeSet@1.2475.45.3, 2007-05-16 19:19:23+05:00, gluh@mysql.com +1 -0
  valgrind error fix

  sql/sql_show.cc@1.411, 2007-05-16 19:19:22+05:00, gluh@mysql.com +11 -7
    valgrind error fix

ChangeSet@1.2475.51.11, 2007-05-16 17:19:59+04:00, kostja@vajra.(none) +1 -0
  Comment fix.

  storage/ndb/include/mgmapi/mgmapi.h@1.66, 2007-05-16 17:19:56+04:00, kostja@vajra.(none) +1 -1
    A tiny fix to make sure MGM API does not clutter doxygen index
    page for the entire MySQL Server.

ChangeSet@1.1810.2947.1, 2007-05-16 14:25:38+02:00, thek@adventure.(none) +2 -0
  Bug#27415 Text Variables in stored procedures
   - Problem was reported as a SP variable using itself as 
     right value inside SUBSTR caused corruption of data. 
   - This bug could not be verified in either 5.0bk or 5.1bk
   - Added test case to prevent future regressions.

  mysql-test/r/sp-vars.result@1.1.3.4, 2007-05-16 14:25:37+02:00, thek@adventure.(none) +41 -0
    Added test case for a reported regression which couldn't be
    verified.

  mysql-test/t/sp-vars.test@1.3.1.3, 2007-05-16 14:25:37+02:00, thek@adventure.(none) +44 -0
    Added test case for a reported regression which couldn't be
    verified.

ChangeSet@1.2475.51.9, 2007-05-16 16:05:19+04:00, kostja@vajra.(none) +1 -0
  Fix a typo.

  sql/event_data_objects.cc@1.99, 2007-05-16 16:05:17+04:00, kostja@vajra.(none) +2 -2
    Fix typo.

ChangeSet@1.2475.51.8, 2007-05-16 16:01:14+04:00, kostja@vajra.(none) +2 -0
  An attempt to fix event_bugs.test failure on Debian
  (Bug#26338 "events_bugs.test fail on Debian")

  mysql-test/r/events_bugs.result@1.31, 2007-05-16 16:01:12+04:00, kostja@vajra.(none) +0 -1
    Update results.

  mysql-test/t/events_bugs.test@1.28, 2007-05-16 16:01:12+04:00, kostja@vajra.(none) +0 -1
    Make a stab at fixing events_bugs.test failure on Debian.
    The problem is purely in the race inherent in the test case: an
    event that was started doesn't go away fast enough and clutters the 
    processlist. This patch remove the part of the event that
    we can not wait on synchronously (there is no table 'hashed_num'
    referenced anywhere).

ChangeSet@1.1810.2942.6, 2007-05-16 14:00:47+02:00, msvensson@pilot.blaudden +1 -0
  Bug#21103: "DATE column not compared as DATE"
  BDB results fixed (not p/o 5.1 fix)

  mysql-test/r/ps_6bdb.result@1.27.12.1, 2007-05-16 14:00:46+02:00, msvensson@pilot.blaudden +7 -0
    Now we get a note when we insert a datetime value into a date column

ChangeSet@1.2493, 2007-05-16 13:48:20+02:00, msvensson@pilot.blaudden +1 -0
  Update to 5.1 format

  mysql-test/r/type_datetime.result@1.43.1.4, 2007-05-16 13:48:18+02:00, msvensson@pilot.blaudden +2 -2
    Update to 5.1 format

ChangeSet@1.2475.51.7, 2007-05-16 15:35:18+04:00, kostja@vajra.(none) +1 -0
  Make a stab at events_bugs.test failure under valgrind (no
  open bug report, reproduced in the runtime team tree).

  sql/event_data_objects.cc@1.98, 2007-05-16 15:35:14+04:00, kostja@vajra.(none) +10 -0
    Make a stub at fixing a race in event_bugs.test under valgrind:
    read of uninitialized byte in SHOW PROCESSLIST from an event thread.

ChangeSet@1.1810.2946.1, 2007-05-16 10:44:59+02:00, msvensson@pilot.blaudden +38 -0
  Backport of TIME->MYSQL_TIME / Y2K fixset
     
  Made year 2000 handling more uniform
  Removed year 2000 handling out from calc_days()
  The above removes some bugs in date/datetimes with year between 0 and 200
  Now we get a note when we insert a datetime value into a date column
  For default values to CREATE, don't give errors for warning level NOTE
  Fixed some compiler failures
  Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
  Removed duplicate typedef TIME and replaced it with MYSQL_TIME
  
  Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
  Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
  Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"
   

  include/my_time.h@1.11.8.1, 2007-05-16 10:44:32+02:00, msvensson@pilot.blaudden +1 -0
    Removed not used define YY_MAGIC_BELOW
    Added prototype for year_2000_handling()

  mysql-test/r/date_formats.result@1.18.12.1, 2007-05-16 10:44:34+02:00, msvensson@pilot.blaudden +16 -2
    Updated results (fixed bug in date_format() with year < 99

  mysql-test/r/func_sapdb.result@1.15.7.1, 2007-05-16 10:44:34+02:00, msvensson@pilot.blaudden +6 -0
    Added more testing of make_date()

  mysql-test/r/ps_2myisam.result@1.39.6.1, 2007-05-16 10:44:34+02:00, msvensson@pilot.blaudden +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_3innodb.result@1.42.6.1, 2007-05-16 10:44:34+02:00, msvensson@pilot.blaudden +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_4heap.result@1.38.6.1, 2007-05-16 10:44:35+02:00, msvensson@pilot.blaudden +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_5merge.result@1.39.6.1, 2007-05-16 10:44:35+02:00, msvensson@pilot.blaudden +14 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_7ndb.result@1.26.8.1, 2007-05-16 10:44:36+02:00, msvensson@pilot.blaudden +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/strict.result@1.25.8.1, 2007-05-16 10:44:36+02:00, msvensson@pilot.blaudden +2 -0
    zero-year in str_to_date() throws warning in strict

  mysql-test/r/type_date.result@1.13.4.1, 2007-05-16 10:44:36+02:00, msvensson@pilot.blaudden +26 -0
    Added test for date conversions

  mysql-test/r/type_datetime.result@1.30.6.1, 2007-05-16 10:44:37+02:00, msvensson@pilot.blaudden +35 -0
    Added testcase for datetime to date conversion.

  mysql-test/t/date_formats.test@1.14.7.1, 2007-05-16 10:44:37+02:00, msvensson@pilot.blaudden +2 -0
    Added testing of dates < 200

  mysql-test/t/func_sapdb.test@1.13.3.1, 2007-05-16 10:44:37+02:00, msvensson@pilot.blaudden +2 -0
    More testing of makedate()

  mysql-test/t/type_date.test@1.14.3.1, 2007-05-16 10:44:37+02:00, msvensson@pilot.blaudden +13 -0
    Added test for date conversions

  mysql-test/t/type_datetime.test@1.18.6.1, 2007-05-16 10:44:37+02:00, msvensson@pilot.blaudden +25 -0
    Added testcase for datetime to date conversion

  sql-common/my_time.c@1.19.17.1, 2007-05-16 10:44:44+02:00, msvensson@pilot.blaudden +33 -1
    Added year_2000_handling()
    Removed year 2000 handling from calc_daynr()

  sql/field.cc@1.256.52.1, 2007-05-16 10:44:38+02:00, msvensson@pilot.blaudden +75 -49
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/field.h@1.153.27.1, 2007-05-16 10:44:38+02:00, msvensson@pilot.blaudden +15 -15
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.cc@1.113.88.1, 2007-05-16 10:44:39+02:00, msvensson@pilot.blaudden +46 -27
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.h@1.183.34.1, 2007-05-16 10:44:39+02:00, msvensson@pilot.blaudden +13 -13
    TIME -> MYSQL_TIME

  sql/item_cmpfunc.cc@1.187.38.1, 2007-05-16 10:44:39+02:00, msvensson@pilot.blaudden +6 -2
    Don't print notes in convert_constant_item()

  sql/item_func.h@1.136.29.1, 2007-05-16 10:44:39+02:00, msvensson@pilot.blaudden +2 -2
    TIME -> MYSQL_TIME

  sql/item_timefunc.cc@1.100.31.1, 2007-05-16 10:44:40+02:00, msvensson@pilot.blaudden +124 -95
    New parameters to make_truncated_value_warning()
    Moved year 2000 handling out from calc_days()

  sql/item_timefunc.h@1.63.5.1, 2007-05-16 10:44:40+02:00, msvensson@pilot.blaudden +24 -24
    TIME -> MYSQL_TIME

  sql/my_decimal.cc@1.11.3.1, 2007-05-16 10:44:40+02:00, msvensson@pilot.blaudden +1 -1
    TIME -> MYSQL_TIME

  sql/my_decimal.h@1.10.5.1, 2007-05-16 10:44:40+02:00, msvensson@pilot.blaudden +1 -1
    TIME -> MYSQL_TIME

  sql/mysql_priv.h@1.290.117.1, 2007-05-16 10:44:41+02:00, msvensson@pilot.blaudden +19 -13
    Added error level to make_truncated_value_warning()

  sql/protocol.cc@1.111.6.1, 2007-05-16 10:44:41+02:00, msvensson@pilot.blaudden +6 -6
    TIME -> MYSQL_TIME

  sql/protocol.h@1.31.4.1, 2007-05-16 10:44:41+02:00, msvensson@pilot.blaudden +9 -9
    TIME -> MYSQL_TIME

  sql/sp.cc@1.82.30.1, 2007-05-16 10:44:41+02:00, msvensson@pilot.blaudden +1 -1
    TIME -> MYSQL_TIME

  sql/sql_base.cc@1.235.99.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +1 -1
    Make testing of result value of save_in_field() uniform

  sql/sql_class.h@1.230.67.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +1 -1
    TIME -> MYSQL_TIME

  sql/sql_show.cc@1.253.52.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +2 -2
    TIME -> MYSQL_TIME

  sql/structs.h@1.53.3.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +1 -2
    TIME -> MYSQL_TIME

  sql/time.cc@1.57.8.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +20 -18
    Added error level to make_truncated_value_warning()

  sql/tztime.cc@1.24.5.1, 2007-05-16 10:44:42+02:00, msvensson@pilot.blaudden +44 -44
    TIME -> MYSQL_TIME

  sql/tztime.h@1.12.3.1, 2007-05-16 10:44:43+02:00, msvensson@pilot.blaudden +5 -5
    TIME -> MYSQL_TIME

  sql/unireg.cc@1.53.11.1, 2007-05-16 10:44:43+02:00, msvensson@pilot.blaudden +3 -1
    For default values to CREATE, don't give errors for warning level NOTE
    (Fixed failed CREATE when we give a datetime value to a date field)

ChangeSet@1.1810.2945.1, 2007-05-16 10:14:29+02:00, msvensson@pilot.blaudden +2 -0
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
    - mysqldump generated output that set OLD_SQL_MODE twice, to different values
      (for triggers), or not at all (for routines) in some cases.

  client/mysqldump.c@1.214.1.49, 2007-05-16 10:14:28+02:00, msvensson@pilot.blaudden +8 -2
    Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
    it's already been saved in write_header(). Likewise for dumpe_routines,
    where it was never saved.

  mysql-test/r/mysqldump.result@1.83.1.41, 2007-05-16 10:14:28+02:00, msvensson@pilot.blaudden +4 -4
    mysqldump output has subtly changed. Adjust test-results. This also shows
    OLD_SQL_MODE is always set exactly once now

ChangeSet@1.1810.2941.3, 2007-05-16 10:10:02+02:00, msvensson@pilot.blaudden +4 -0
  Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype
  - Since isinf() portability across various platforms and
    compilers is a complicated question, we should not use
    it directly. Instead, the my_isinf() macro should be used,
    which is defined as an alias to the system-defined isinf()
    if it is safe to use, or a workaround implementation otherwise

  configure.in@1.245.88.1, 2007-05-16 10:10:01+02:00, msvensson@pilot.blaudden +13 -5
    Added a check to define HAVE_ISINF only if it can be used
    in C++ code as well.

  include/my_global.h@1.96.15.1, 2007-05-16 10:10:01+02:00, msvensson@pilot.blaudden +5 -6
    Define my_isinf() as an alias to isinf(), if it is available
    in both C and C++ code. Otherwise, define it to a workaround
    implementation.

  sql/item_func.cc@1.270.63.1, 2007-05-16 10:10:01+02:00, msvensson@pilot.blaudden +2 -2
    Replaced isinf() with my_isinf().

  strings/strtod.c@1.25.2.1, 2007-05-16 10:10:01+02:00, msvensson@pilot.blaudden +1 -1
    Replaced isinf() with my_isinf().

ChangeSet@1.1810.2939.4, 2007-05-16 11:49:15+04:00, kostja@vajra.(none) +1 -0
  Fix a failing assert.

  sql/sql_insert.cc@1.146.1.91, 2007-05-16 11:49:11+04:00, kostja@vajra.(none) +1 -1
    Do not access delayed thread memory without a mutex.

ChangeSet@1.2475.51.5, 2007-05-16 10:32:47+04:00, kostja@vajra.(none) +1 -0
  Correct a merge error.

  sql/sql_insert.cc@1.267, 2007-05-16 10:32:41+04:00, kostja@vajra.(none) +3 -3
    Correct a merge error (wrong declaration was used).

ChangeSet@1.1810.2944.1, 2007-05-16 09:51:05+04:00, kostja@vajra.(none) +6 -0
  A fix and a test case for 
  Bug#21483 "Server abort or deadlock on INSERT DELAYED with another
  implicit insert"
  Also fixes and adds test cases for bugs:
  20497 "Trigger with INSERT DELAYED causes Error 1165"
  21714 "Wrong NEW.value and server abort on INSERT DELAYED to a
  table with a trigger".
  Post-review fixes.
  
  Problem:
  In MySQL INSERT DELAYED is a way to pipe all inserts into a
  given table through a dedicated thread. This is necessary for
  simplistic storage engines like MyISAM, which do not have internal
  concurrency control or threading and thus can not
  achieve efficient INSERT throughput without support from SQL layer.
  DELAYED INSERT works as follows:
  For every distinct table, which can accept DELAYED inserts and has
  pending data to insert, a dedicated thread is created to write data
  to disk. All user connection threads that attempt to
  delayed-insert into this table interact with the dedicated thread in
  producer/consumer fashion: all records to-be inserted are pushed
  into a queue of the dedicated thread, which fetches the records and 
  writes them.
  In this design, client connection threads never open or lock
  the delayed insert table.
  This functionality was introduced in version 3.23 and does not take 
  into account existence of triggers, views, or pre-locking.
  E.g. if INSERT DELAYED is called from a stored function, which,
  in turn, is called from another stored function that uses the delayed
  table, a deadlock can occur, because delayed locking by-passes
  pre-locking. Besides:
   * the delayed thread works directly with the subject table through
     the storage engine API and does not invoke triggers
   * even if it was patched to invoke triggers, if triggers,
     in turn, used other tables, the delayed thread would
     have to open and lock involved tables (use pre-locking).
   * even if it was patched to use pre-locking, without deadlock
     detection the delayed thread could easily lock out user 
     connection threads in case when the same table is used both
     in a trigger and on the right side of the insert query: 
     the delayed thread would not release locks until all inserts 
     are complete, and user connection can not complete inserts 
     without having locks on the tables used on the right side of the
     query.
  
  Solution:
  
  These considerations suggest two general alternatives for the
  future of INSERT DELAYED:
   * it is considered a full-fledged alternative to normal INSERT
   * it is regarded as an optimisation that is only relevant 
     for simplistic engines.
  Since we missed our chance to provide complete support of new
  features when 5.0 was in development, the first alternative
  currently renders infeasible.
  However, even the second alternative, which is to detect
  new features and convert DELAYED insert into a normal insert, 
  is not easy to implement.
  The catch-22 is that we don't know if the subject table has triggers
  or is a view before we open it, and we only open it in the
  delayed thread. We don't know if the query involves pre-locking
  until we have opened all tables, and we always first create
  the delayed thread, and only then open the remaining tables.
  This patch detects the problematic scenarios and converts
  DELAYED INSERT to a normal INSERT using the following approach:
   * if the statement is executed under pre-locking (e.g. from
     within a stored function or trigger) or the right
     side may require pre-locking, we detect the situation
     before creating a delayed insert thread and convert the statement
     to a conventional INSERT.
    * if the subject table is a view or has triggers, we shutdown
     the delayed thread and convert the statement to a conventional
     INSERT.

  mysql-test/r/insert.result@1.22.1.6, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +116 -0
    Update test results.

  mysql-test/t/insert.test@1.22.1.4, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +139 -0
    Add a test case for Bug#21483, Bug#20497, Bug#21714 (INSERT DELAYED
    and stored routines, triggers).

  sql/sp_head.cc@1.200.17.1, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +8 -0
    Upgrade lock type to TL_WRITE when computing the pre-locking set.

  sql/sql_base.cc@1.235.98.1, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +2 -2
    Use a new method.

  sql/sql_insert.cc@1.146.59.1, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +171 -81
    INSERT DELAYED and pre-locking:
    - if  under pre-locking, upgrade the lock type to TL_WRITE
    and proceed as a normal write
    - if DELAYED table has triggers, also request a lock upgrade.
    - make sure errors in the delayed thread are propagated
    correctly

  sql/sql_lex.h@1.175.40.1, 2007-05-16 09:51:03+04:00, kostja@vajra.(none) +6 -0
    Add a method to check if a parsed tree refers to stored
    routines.

ChangeSet@1.1810.2927.9, 2007-05-16 10:12:49+05:00, holyfoot@mysql.com +3 -0
  bug #8663 cant use bigint unsigned as input to cast
  in the case of the overflow in the decimal->integer conversion
  we didn't return the proper boundary value, but just the result
  of the conversion we calculated on the moment of the error

  mysql-test/r/bigint.result@1.31.1.4, 2007-05-16 10:12:48+05:00, holyfoot@mysql.com +10 -0
    bug #8663 cant use bigint unsigned as input to cast
    test result fixed

  mysql-test/t/bigint.test@1.29.1.1, 2007-05-16 10:12:48+05:00, holyfoot@mysql.com +6 -0
    bug #8663 cant use bigint unsigned as input to cast
    test case

  strings/decimal.c@1.65.1.14, 2007-05-16 10:12:48+05:00, holyfoot@mysql.com +5 -1
    bug #8663 cant use bigint unsigned as input to cast
    decimal->int conversion fixed to return proper boundary value
    in the case of overflow

ChangeSet@1.1810.2943.1, 2007-05-16 00:30:12+04:00, evgen@moonbone.local +3 -0
  Bug#28208: Wrong result of a non-const STRING function with a const DATETIME
  function.
  
  A wrong  condition was used to check that the
  Arg_comparator::can_compare_as_dates() function calculated the value of the
  string constant. When comparing a non-const STRING function with a constant
  DATETIME function it leads to saving an arbitrary value as a cached value of
  the DATETIME function.
  
  Now the Arg_comparator::set_cmp_func() function initializes the const_value
  variable to the impossible DATETIME value (-1) and this const_value is
  cached only if it was changed by the Arg_comparator::can_compare_as_dates()
  function.

  mysql-test/r/type_datetime.result@1.30.1.13, 2007-05-16 00:29:50+04:00, evgen@moonbone.local +6 -0
    Added a test case for the bug#28208: Wrong result of a non-const STRING function with a const DATETIME function.

  mysql-test/t/type_datetime.test@1.18.1.11, 2007-05-16 00:29:48+04:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#28208: Wrong result of a non-const STRING function with a const DATETIME function.

  sql/item_cmpfunc.cc@1.187.1.64, 2007-05-16 00:29:50+04:00, evgen@moonbone.local +2 -3
    Bug#28208: Wrong result of a non-const STRING function with a const DATETIME
    function.
    Now the Arg_comparator::set_cmp_func() function initializes the const_value
    variable to the impossible DATETIME value (-1) and this const_value is
    cached only if it was changed by the Arg_comparator::can_compare_as_dates()
    function.

ChangeSet@1.1810.2934.3, 2007-05-15 18:19:18+02:00, joerg@trift2. +1 -0
  Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_dist":
  
  Several string comparisons could never yield true because they had an 'x' guard
  added to the variable but not to the constant value. Fix that by guarding both sides.

  scripts/make_win_bin_dist@1.1.13.1, 2007-05-15 18:19:15+02:00, joerg@trift2. +17 -17
    Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_dist":
    
    Several string comparisons could never yield true because they had an 'x' guard
    added to the variable but not to the constant value. Fix that by guarding both sides.
    
    Use this occasion to apply some corrections to the comments and the usage text.
    
    Also, ensure the ".pdb" file is always optional.

ChangeSet@1.1810.2941.2, 2007-05-15 17:04:31+02:00, msvensson@pilot.blaudden +2 -0
  Add triggers for detecting bad changesets to mysql-5.0

  BitKeeper/triggers/pre-outgoing.crash-protect.pl@1.1, 2007-05-15 17:04:30+02:00, msvensson@pilot.blaudden +82 -0
    Add triggers for detecting bad changesets to mysql-5.0

  BitKeeper/triggers/pre-outgoing.crash-protect.pl@1.0, 2007-05-15 17:04:30+02:00, msvensson@pilot.blaudden +0 -0

  BitKeeper/triggers/pre-resolve.crash-protect.pl@1.1, 2007-05-15 17:04:30+02:00, msvensson@pilot.blaudden +82 -0
    Add triggers for detecting bad changesets to mysql-5.0

  BitKeeper/triggers/pre-resolve.crash-protect.pl@1.0, 2007-05-15 17:04:30+02:00, msvensson@pilot.blaudden +0 -0

ChangeSet@1.2485.2.2, 2007-05-15 10:37:14-04:00, iggy@amd64.(none) +1 -0
  Bug#24732 Executables do not include Vista manifests
  - mysqld does not need requireAdministrator rights 
  to run.

  sql/CMakeLists.txt@1.39, 2007-05-15 10:37:11-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Request less permissive set of privileges.

ChangeSet@1.1810.2942.1, 2007-05-15 10:30:11-04:00, iggy@amd64.(none) +2 -0
  Bug#24732 Executables do not include Vista manifests
  - Manifest requires four part application version.
  - mysqld does not need requireAdministrator rights 
  to run.

  sql/CMakeLists.txt@1.1.6.1, 2007-05-15 10:30:09-04:00, iggy@amd64.(none) +1 -1
    Bug#24732 Executables do not include Vista manifests
    - Request less permissive set of privileges.

  win/create_manifest.js@1.2, 2007-05-15 10:30:09-04:00, iggy@amd64.(none) +1 -0
    Bug#24732 Executables do not include Vista manifests
    - Manifest requires four part application version.

ChangeSet@1.1810.2941.1, 2007-05-15 16:03:38+02:00, msvensson@pilot.blaudden +1 -0
  Bug#27344 Total failure to start the server
   - Give some more protection against "too long socket name by setting the max
     length when to use a tmpdir for sockets to 70

  mysql-test/mysql-test-run.pl@1.30.80.1, 2007-05-15 16:03:37+02:00, msvensson@pilot.blaudden +1 -1
    Give some more protection against "too long socket name by setting the max
    ength when to use a tmpdir for sockets to 70 

ChangeSet@1.2475.51.2, 2007-05-15 17:58:26+04:00, kostja@vajra.(none) +1 -0
  A post-merge fix.

  sql/sql_base.cc@1.400, 2007-05-15 17:58:23+04:00, kostja@vajra.(none) +1 -1
    A post-merge fix.

ChangeSet@1.1810.2940.1, 2007-05-15 15:29:12+03:00, mhansson@linux-st28.site +3 -0
  Bug#27573: MIN() on an indexed column which is always NULL sets _other_ results 
  to NULL
  
  For queries of the form SELECT MIN(key_part_k) FROM t1 
  WHERE key_part_1 = const and ... and key_part_k-1 = const,
  the opt_sum_query optimization tries to
  use an index to substitute MIN/MAX functions with their values according
  to the following rules:
  1) Insert the minimum non-null values where the WHERE clause still matches, or
  3) A row of nulls
  
  However, the correct semantics requires that there is a third case 2)
  such that a NULL value is substituted if there are only NULL values for 
  key_part_k.
  
  The patch modifies opt_sum_query() to handle this missing case.

  mysql-test/r/func_group.result@1.49.5.1, 2007-05-15 15:29:10+03:00, mhansson@linux-st28.site +47 -0
    Bug #27573: Correct result

  mysql-test/t/func_group.test@1.48.4.1, 2007-05-15 15:29:10+03:00, mhansson@linux-st28.site +33 -0
    Bug #27573: test case

  sql/opt_sum.cc@1.44.1.18, 2007-05-15 15:29:10+03:00, mhansson@linux-st28.site +76 -10
    Bug #27573:
    Added code that will try to read the
    first non-null value for a given complete-field prefix, second
    choice is to read the null, and lastly set the error code if no row
    is found.

ChangeSet@1.1810.2905.20, 2007-05-15 12:07:09+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  add error code to ndb require

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.55.1, 2007-05-15 12:07:07+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    add error code to ndb require

ChangeSet@1.1810.2905.19, 2007-05-15 12:02:58+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  improve error message on corrup schema file

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.54.1, 2007-05-15 12:02:56+02:00, tomas@whalegate.ndb.mysql.com +21 -10
    improve error message on corrup schema file

ChangeSet@1.2475.45.2, 2007-05-15 12:45:50+05:00, gluh@mysql.com +7 -0
  WL#3823 Modify VARIABLE_VALUE columns to VARCHAR within INFORMATION_SCHEMA STATUS tables

  mysql-test/r/compress.result@1.10, 2007-05-15 12:45:48+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/information_schema.result@1.153, 2007-05-15 12:45:48+05:00, gluh@mysql.com +0 -2
    result fix

  mysql-test/r/openssl_1.result@1.23, 2007-05-15 12:45:48+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/rpl_packet.result@1.7, 2007-05-15 12:45:48+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/status.result@1.16, 2007-05-15 12:45:48+05:00, gluh@mysql.com +9 -9
    result fix

  sql/sql_select.cc@1.520, 2007-05-15 12:45:48+05:00, gluh@mysql.com +1 -2
    WL#3823 Modify VARIABLE_VALUE columns to VARCHAR within INFORMATION_SCHEMA STATUS tables

  sql/sql_show.cc@1.410, 2007-05-15 12:45:48+05:00, gluh@mysql.com +46 -202
    WL#3823 Modify VARIABLE_VALUE columns to VARCHAR within INFORMATION_SCHEMA STATUS tables

ChangeSet@1.2475.49.1, 2007-05-15 09:08:16+02:00, jonas@perch.ndb.mysql.com +6 -0
  ndb - bug#24631
    add Dbdict::restartDropObj*

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.133, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +185 -4
    add restartDropObj
    - handle undo files "specially"

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@1.55, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +8 -1
    add restartDropObj*

  storage/ndb/src/kernel/blocks/lgman.cpp@1.29, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +12 -1
    allow drop of meta files

  storage/ndb/src/kernel/blocks/tsman.cpp@1.17, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +6 -0
    allow drop of meta files

  storage/ndb/test/ndbapi/testDict.cpp@1.37, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +157 -0
    add testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.86, 2007-05-15 09:08:13+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase

ChangeSet@1.1810.2905.18, 2007-05-15 09:03:00+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #26386 ndbd wont start after changing schema
      backported error code from 5.1
      split error check when reading schema file

  ndb/include/mgmapi/ndbd_exit_codes.h@1.2.7.1, 2007-05-15 09:02:58+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    backported error code from 5.1

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.53.1, 2007-05-15 09:02:58+02:00, tomas@whalegate.ndb.mysql.com +18 -8
    backported error code from 5.1
    split error check when reading schema file

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.10.1, 2007-05-15 09:02:58+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    backported error code from 5.1

ChangeSet@1.1616.3036.8, 2007-05-14 23:55:18-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28272: crash that occurs when running an EXPLAIN command
  for a query over an empty table right after its creation. 
  The crash is the result of an attempt made by JOIN::optimize to evaluate
  the WHERE condition when no records have been actually read.
  The added test case can reproduce the crash only with InnoDB tables and
  only with 5.0.x.
   

  mysql-test/t/innodb_mysql.test@1.3.3.6, 2007-05-14 23:55:16-07:00, igor@olga.mysql.com +25 -0
    Added a test case for bug #28272.

  mysql-test/r/innodb_mysql.result@1.3.3.6, 2007-05-14 23:55:16-07:00, igor@olga.mysql.com +21 -0
    Added a test case for bug #28272.

  sql/sql_select.cc@1.216.148.3, 2007-05-14 23:55:16-07:00, igor@olga.mysql.com +6 -0
    Fixed bug #28272: crash that occurs when running an EXPLAIN command
    for a query over an empty table right after its creation. 
    The crash is the result of an attempt made by JOIN::optimize to evaluate
    the WHERE condition when no records have been actually read.
    Such attempts could be observed only with EXPLAIN commands.
    Now at the optimization phase the WHERE condition is never evaluated if 
    there is no record previously read from the table. 

ChangeSet@1.1810.2905.17, 2007-05-15 08:34:39+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  #26906 No message slogan found
  - added errormessage and code for "declaring node dead"

  ndb/include/mgmapi/ndbd_exit_codes.h@1.2.6.1, 2007-05-15 08:34:36+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    #26906 No message slogan found
    - added errormessage and code for "declaring node dead"

  ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.13.33.1, 2007-05-15 08:34:36+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    #26906 No message slogan found
    - added errormessage and code for "declaring node dead"

  ndb/src/kernel/error/ndbd_exit_codes.c@1.1.9.1, 2007-05-15 08:34:36+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    #26906 No message slogan found
    - added errormessage and code for "declaring node dead"

ChangeSet@1.1810.2938.3, 2007-05-14 18:26:00-07:00, igor@olga.mysql.com +2 -0
  Post-merge fix.

  mysql-test/r/ps.result@1.56.13.2, 2007-05-14 18:25:58-07:00, igor@olga.mysql.com +22 -0
    Post-merge fix.

  mysql-test/t/ps.test@1.56.14.2, 2007-05-14 18:25:58-07:00, igor@olga.mysql.com +18 -0
    Post-merge fix.

ChangeSet@1.1616.3036.7, 2007-05-14 16:41:09-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #27937: crash for the the second execution of a prepared
  statement from a UNION query with ORDER BY an expression containing
  RAND().
  The crash happened because the global order by list in the union query
  was not re-initialized for execution.
  (Local order by lists were re-initialized though).
  

  mysql-test/r/ps.result@1.31.1.25, 2007-05-14 16:41:08-07:00, igor@olga.mysql.com +22 -0
    Added a test case for bug #27937.

  mysql-test/t/ps.test@1.27.1.32, 2007-05-14 16:41:08-07:00, igor@olga.mysql.com +18 -0
    Added a test case for bug #27937.

  sql/sql_union.cc@1.74.1.73, 2007-05-14 16:41:08-07:00, igor@olga.mysql.com +5 -0
    Fixed bug #27937: crash for the the second execution of a prepared
    statement from a UNION query with ORDER BY an expression containing
    RAND().
    The crash happened because the global order by list in the union query
    was not re-initialized for execution.
    (Local order by lists were re-initialized though).
    Added re-initialization of the global order by list in the function
    st_select_lex_unit::init_prepare_fake_select_lex.  
    

ChangeSet@1.2475.48.1, 2007-05-14 22:38:26+04:00, dlenev@mockturtle.local +3 -0
  Fix for bug #28415 "Some ALTER TABLE statements no longer work under LOCK
  TABLES" and failures of alter_table.test on Windows which occured after
  pushing fix for bugs #20662, #20903, #24508, #24738 (various problems
  with CREATE TABLE SELECT).
  
  ALTER TABLE statements which were handled using "fast" alter table
  optimization were not properly working under LOCK TABLES if table
  was transactional (for all table types under Windows).
  
  Code implementing "fast" version of ALTER TABLE tried to open and
  lock table using open_ltable() after renaming .FRM files (which
  corresponds to renaming tables in normal case) in some cases
  (for transactional tables or on Windows). This caused problems
  under LOCK TABLES and conflicted with name-lock taken by 
  ALTER TABLE RENAME on target tables.
  
  This patch solves this issue by using reopen_name_locked_table()
  instead of open_ltable().

  mysql-test/include/mix1.inc@1.29.1.1, 2007-05-14 22:38:23+04:00, dlenev@mockturtle.local +20 -0
    Added test for bug #28415 "Some ALTER TABLE statements no longer work
    under LOCK TABLES" and minimal coverage for fast ALTER TABLE behaviour
    for transactional tables.

  mysql-test/r/innodb_mysql.result@1.29.1.1, 2007-05-14 22:38:23+04:00, dlenev@mockturtle.local +11 -0
    Added test for bug #28415 "Some ALTER TABLE statements no longer work
    under LOCK TABLES" and minimal coverage for fast ALTER TABLE behaviour
    for transactional tables.

  sql/sql_table.cc@1.413.2.3, 2007-05-14 22:38:23+04:00, dlenev@mockturtle.local +40 -4
    mysql_alter_table():
      Fixed handling of transactional tables (and all tables on Windows)
      by "fast" ALTER TABLE.
      Code implementing "fast" version of ALTER TABLE tried to open and
      lock table using open_ltable() after renaming .FRM files (which
      corresponds to renaming tables in normal case) for such tables.
      This caused problems under LOCK TABLES and conflicted with name-lock
      taken by ALTER TABLE RENAME on target tables. We solve this issue by
      using reopen_name_locked_table() instead of open_ltable().

ChangeSet@1.1810.2908.13, 2007-05-14 19:25:03+04:00, anozdrin@ibm. +1 -0
  Disable im_life_cycle in 5.0.

  mysql-test/t/disabled.def@1.2.4.29, 2007-05-14 19:25:01+04:00, anozdrin@ibm. +1 -0
    Disable im_life_cycle in 5.0.

ChangeSet@1.1810.2937.2, 2007-05-14 15:11:29+02:00, df@pippilotta.erinye.com +4 -0
  import of fix for bug#28240

  configure.in@1.245.87.1, 2007-05-14 15:11:28+02:00, df@pippilotta.erinye.com +13 -5
    import of fix for bug#28240

  include/my_global.h@1.96.14.1, 2007-05-14 15:11:28+02:00, df@pippilotta.erinye.com +5 -6
    import of fix for bug#28240

  sql/item_func.cc@1.270.59.6, 2007-05-14 15:11:28+02:00, df@pippilotta.erinye.com +2 -2
    import of fix for bug#28240

  strings/strtod.c@1.25.1.1, 2007-05-14 15:11:28+02:00, df@pippilotta.erinye.com +1 -1
    import of fix for bug#28240

ChangeSet@1.1810.2934.2, 2007-05-14 14:59:23+02:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.42

  configure.in@1.245.86.1, 2007-05-14 14:59:16+02:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.42

ChangeSet@1.2475.36.9, 2007-05-14 14:43:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  corrected manual merge

  sql/ha_ndbcluster.cc@1.451, 2007-05-14 14:43:05+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    corrected manual merge

ChangeSet@1.2475.36.7, 2007-05-14 14:39:37+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  disable test if log bin is not turned on

  mysql-test/t/ndb_binlog_basic2.test@1.2, 2007-05-14 14:39:34+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    disable test if log bin is not turned on

ChangeSet@1.1810.2905.16, 2007-05-14 14:38:50+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  files to check if log bin is turned on

  mysql-test/include/have_log_bin.inc@1.1, 2007-05-14 14:38:48+02:00, tomas@whalegate.ndb.mysql.com +4 -0
    New BitKeeper file ``mysql-test/include/have_log_bin.inc''

  mysql-test/include/have_log_bin.inc@1.0, 2007-05-14 14:38:48+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/r/have_log_bin.require@1.1, 2007-05-14 14:38:48+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    New BitKeeper file ``mysql-test/r/have_log_bin.require''

  mysql-test/r/have_log_bin.require@1.0, 2007-05-14 14:38:48+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.1810.2935.2, 2007-05-14 13:20:18+02:00, df@pippilotta.erinye.com +1 -0
  bug#28358 libmysql.dll cannot be dynamically loaded on Windows

  libmysql/CMakeLists.txt@1.1.3.1, 2007-05-14 13:20:17+02:00, df@pippilotta.erinye.com +4 -0
    bug#28358 USE_TLS was not defined during build of libmysql.dll with target other than Debug. Defining it for RelWithDebInfo appears to fix the bug for win32 and win64 cmake builds.

ChangeSet@1.1810.2936.1, 2007-05-14 13:02:47+02:00, tnurnberg@blasphemy.mysql.com +38 -0
  Backport of TIME->MYSQL_TIME / Y2K fixset
  
  Made year 2000 handling more uniform
  Removed year 2000 handling out from calc_days()
  The above removes some bugs in date/datetimes with year between 0 and 200
  Now we get a note when we insert a datetime value into a date column
  For default values to CREATE, don't give errors for warning level NOTE
  Fixed some compiler failures
  Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
  Removed duplicate typedef TIME and replaced it with MYSQL_TIME
  
  Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
  Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
  Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"

  include/my_time.h@1.11.7.1, 2007-05-14 13:02:03+02:00, tnurnberg@blasphemy.mysql.com +1 -0
    Removed not used define YY_MAGIC_BELOW
    Added prototype for year_2000_handling()

  mysql-test/r/date_formats.result@1.18.11.1, 2007-05-14 13:02:04+02:00, tnurnberg@blasphemy.mysql.com +16 -2
    Updated results (fixed bug in date_format() with year < 99)

  mysql-test/r/func_sapdb.result@1.15.6.1, 2007-05-14 13:02:05+02:00, tnurnberg@blasphemy.mysql.com +6 -0
    Added more testing of make_date()

  mysql-test/r/ps_2myisam.result@1.39.5.1, 2007-05-14 13:02:06+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_3innodb.result@1.42.5.1, 2007-05-14 13:02:07+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_4heap.result@1.38.5.1, 2007-05-14 13:02:08+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_5merge.result@1.39.5.1, 2007-05-14 13:02:09+02:00, tnurnberg@blasphemy.mysql.com +14 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_7ndb.result@1.26.7.1, 2007-05-14 13:02:10+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/strict.result@1.25.1.9, 2007-05-14 13:02:10+02:00, tnurnberg@blasphemy.mysql.com +2 -0
    zero-year in str_to_date() throws warning in strict

  mysql-test/r/type_date.result@1.13.3.1, 2007-05-14 13:02:11+02:00, tnurnberg@blasphemy.mysql.com +26 -0
    Added test for date conversions

  mysql-test/r/type_datetime.result@1.30.5.1, 2007-05-14 13:02:12+02:00, tnurnberg@blasphemy.mysql.com +35 -0
    Added testcase for datetime to date conversion.

  mysql-test/t/date_formats.test@1.14.6.1, 2007-05-14 13:02:13+02:00, tnurnberg@blasphemy.mysql.com +2 -0
    Added testing of dates < 200

  mysql-test/t/func_sapdb.test@1.13.2.1, 2007-05-14 13:02:14+02:00, tnurnberg@blasphemy.mysql.com +2 -0
    More testing of makedate()

  mysql-test/t/type_date.test@1.14.2.1, 2007-05-14 13:02:15+02:00, tnurnberg@blasphemy.mysql.com +13 -0
    Added test for date conversions

  mysql-test/t/type_datetime.test@1.18.5.1, 2007-05-14 13:02:16+02:00, tnurnberg@blasphemy.mysql.com +25 -0
    Added testcase for datetime to date conversion.

  sql-common/my_time.c@1.19.16.1, 2007-05-14 13:02:37+02:00, tnurnberg@blasphemy.mysql.com +33 -1
    Added year_2000_handling()
    Removed year 2000 handling from calc_daynr()

  sql/field.cc@1.256.51.1, 2007-05-14 13:02:17+02:00, tnurnberg@blasphemy.mysql.com +75 -49
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/field.h@1.153.26.1, 2007-05-14 13:02:17+02:00, tnurnberg@blasphemy.mysql.com +15 -15
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.cc@1.113.87.1, 2007-05-14 13:02:18+02:00, tnurnberg@blasphemy.mysql.com +46 -27
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.h@1.183.33.1, 2007-05-14 13:02:20+02:00, tnurnberg@blasphemy.mysql.com +13 -13
    TIME -> MYSQL_TIME

  sql/item_cmpfunc.cc@1.187.37.1, 2007-05-14 13:02:21+02:00, tnurnberg@blasphemy.mysql.com +6 -2
    Don't print notes in convert_constant_item()

  sql/item_func.h@1.136.28.1, 2007-05-14 13:02:22+02:00, tnurnberg@blasphemy.mysql.com +2 -2
    TIME -> MYSQL_TIME

  sql/item_timefunc.cc@1.100.30.1, 2007-05-14 13:02:23+02:00, tnurnberg@blasphemy.mysql.com +124 -95
    New parameters to make_truncated_value_warning()
    Moved year 2000 handling out from calc_days()

  sql/item_timefunc.h@1.63.4.1, 2007-05-14 13:02:24+02:00, tnurnberg@blasphemy.mysql.com +24 -24
    TIME -> MYSQL_TIME

  sql/my_decimal.cc@1.11.2.1, 2007-05-14 13:02:24+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/my_decimal.h@1.10.4.1, 2007-05-14 13:02:25+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/mysql_priv.h@1.290.116.1, 2007-05-14 13:02:26+02:00, tnurnberg@blasphemy.mysql.com +19 -13
    Added error level to make_truncated_value_warning()

  sql/protocol.cc@1.111.5.1, 2007-05-14 13:02:27+02:00, tnurnberg@blasphemy.mysql.com +6 -6
    TIME -> MYSQL_TIME

  sql/protocol.h@1.31.3.1, 2007-05-14 13:02:28+02:00, tnurnberg@blasphemy.mysql.com +9 -9
    TIME -> MYSQL_TIME

  sql/sp.cc@1.82.29.1, 2007-05-14 13:02:29+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/sql_base.cc@1.235.97.1, 2007-05-14 13:02:30+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    Make testing of result value of save_in_field() uniform

  sql/sql_class.h@1.230.66.1, 2007-05-14 13:02:30+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/sql_show.cc@1.253.51.1, 2007-05-14 13:02:31+02:00, tnurnberg@blasphemy.mysql.com +2 -2
    TIME -> MYSQL_TIME

  sql/structs.h@1.53.2.1, 2007-05-14 13:02:32+02:00, tnurnberg@blasphemy.mysql.com +1 -2
    TIME -> MYSQL_TIME

  sql/time.cc@1.57.7.1, 2007-05-14 13:02:33+02:00, tnurnberg@blasphemy.mysql.com +20 -18
    Added error level to make_truncated_value_warning()

  sql/tztime.cc@1.24.4.1, 2007-05-14 13:02:34+02:00, tnurnberg@blasphemy.mysql.com +44 -44
    TIME -> MYSQL_TIME

  sql/tztime.h@1.12.2.1, 2007-05-14 13:02:35+02:00, tnurnberg@blasphemy.mysql.com +5 -5
    TIME -> MYSQL_TIME

  sql/unireg.cc@1.53.10.1, 2007-05-14 13:02:36+02:00, tnurnberg@blasphemy.mysql.com +3 -1
    For default values to CREATE, don't give errors for warning level NOTE
    (Fixed failed CREATE when we give a datetime value to a date field)

ChangeSet@1.1810.2929.3, 2007-05-14 12:15:27+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28410 ndb: no retry sleep when getting autoincrement
  - add retry sleep to allow temprary error to go away

  sql/ha_ndbcluster.cc@1.175.1.138, 2007-05-14 12:15:25+02:00, tomas@whalegate.ndb.mysql.com +36 -23
    Bug #28410 ndb: no retry sleep when getting autoincrement
    - add retry sleep to allow temprary error to go away

ChangeSet@1.2475.1.41, 2007-05-14 11:33:47+02:00, istruewing@chilla.local +1 -0
  Bug#17332 - changing key_buffer_size on a running server
              can crash under load
  Post-post-review fixes.
  Fixed a typo == -> =
  Optimized normal flush at end of statement (FLUSH_KEEP),
  but let other flush types be stringent.
  Added comments.
  Fixed debugging.

  mysys/mf_keycache.c@1.69, 2007-05-14 11:33:43+02:00, istruewing@chilla.local +70 -26
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Post-post-review fixes.
    Fixed a typo == -> =
    Optimized normal flush at end of statement (FLUSH_KEEP),
    but let other flush types be stringent.
    Added comments.
    Fixed debugging.

ChangeSet@1.1810.2923.3, 2007-05-14 11:28:59+02:00, tnurnberg@blasphemy.mysql.com +37 -0
  Backport of TIME->MYSQL_TIME / Y2K fixset
  
  Made year 2000 handling more uniform
  Removed year 2000 handling out from calc_days()
  The above removes some bugs in date/datetimes with year between 0 and 200
  Now we get a note when we insert a datetime value into a date column
  For default values to CREATE, don't give errors for warning level NOTE
  Fixed some compiler failures
  Added library ws2_32 for windows compilation (needed if we want to compile with IOCP support)
  Removed duplicate typedef TIME and replaced it with MYSQL_TIME
  
  Better (more complete) fix for: Bug#21103 "DATE column not compared as DATE"
  Fixed properly Bug#18997 "DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value"
  Fixed Bug#23093 "Implicit conversion of 9912101 to date does not match cast(9912101 as date)"

  include/my_time.h@1.11.1.10, 2007-05-14 11:28:13+02:00, tnurnberg@blasphemy.mysql.com +1 -0
    Removed not used define YY_MAGIC_BELOW
    Added prototype for year_2000_handling()

  mysql-test/r/date_formats.result@1.18.1.16, 2007-05-14 11:28:14+02:00, tnurnberg@blasphemy.mysql.com +16 -2
    Updated results (fixed bug in date_format() with year < 99)

  mysql-test/r/func_sapdb.result@1.15.1.6, 2007-05-14 11:28:15+02:00, tnurnberg@blasphemy.mysql.com +6 -0
    Added more testing of make_date()

  mysql-test/r/ps_2myisam.result@1.39.1.8, 2007-05-14 11:28:16+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_3innodb.result@1.42.1.8, 2007-05-14 11:28:17+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_4heap.result@1.38.1.8, 2007-05-14 11:28:18+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_5merge.result@1.39.1.8, 2007-05-14 11:28:18+02:00, tnurnberg@blasphemy.mysql.com +14 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/ps_7ndb.result@1.26.1.24, 2007-05-14 11:28:19+02:00, tnurnberg@blasphemy.mysql.com +7 -0
    Now we get a note when we insert a datetime value into a date column

  mysql-test/r/type_date.result@1.13.1.4, 2007-05-14 11:28:20+02:00, tnurnberg@blasphemy.mysql.com +26 -0
    Added test for date conversions

  mysql-test/r/type_datetime.result@1.30.4.1, 2007-05-14 11:28:21+02:00, tnurnberg@blasphemy.mysql.com +35 -0
    Added testcase for datetime to date conversion.

  mysql-test/t/date_formats.test@1.14.1.12, 2007-05-14 11:28:22+02:00, tnurnberg@blasphemy.mysql.com +2 -0
    Added testing of dates < 200

  mysql-test/t/func_sapdb.test@1.13.1.2, 2007-05-14 11:28:23+02:00, tnurnberg@blasphemy.mysql.com +2 -0
    More testing of makedate()

  mysql-test/t/type_date.test@1.14.1.1, 2007-05-14 11:28:23+02:00, tnurnberg@blasphemy.mysql.com +13 -0
    Added test for date conversions

  mysql-test/t/type_datetime.test@1.18.4.1, 2007-05-14 11:28:24+02:00, tnurnberg@blasphemy.mysql.com +25 -0
    Added testcase for datetime to date conversion.

  sql-common/my_time.c@1.19.1.17, 2007-05-14 11:28:46+02:00, tnurnberg@blasphemy.mysql.com +33 -1
    Added year_2000_handling()
    Removed year 2000 handling from calc_daynr()

  sql/field.cc@1.256.50.1, 2007-05-14 11:28:25+02:00, tnurnberg@blasphemy.mysql.com +75 -49
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/field.h@1.153.12.17, 2007-05-14 11:28:26+02:00, tnurnberg@blasphemy.mysql.com +15 -15
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.cc@1.113.86.1, 2007-05-14 11:28:27+02:00, tnurnberg@blasphemy.mysql.com +46 -27
    Give note if we insert a datetime value in a date field
    Don't give notes if we are doing internal test conversions (like from convert_constant_item())
    More documentation (store functions can now return '3' to inform that the function did return a NOTE (not warning or error))
    Revert some changes in Field_newdate::store() to get more optimal code
    Field::set_warning() will now ignore notes if CHECK_FIELD_IGNORE is set.
    New parameters to make_truncated_value_warning()

  sql/item.h@1.183.32.1, 2007-05-14 11:28:28+02:00, tnurnberg@blasphemy.mysql.com +13 -13
    TIME -> MYSQL_TIME

  sql/item_cmpfunc.cc@1.187.36.1, 2007-05-14 11:28:29+02:00, tnurnberg@blasphemy.mysql.com +6 -2
    Don't print notes in convert_constant_item()

  sql/item_func.h@1.136.27.1, 2007-05-14 11:28:30+02:00, tnurnberg@blasphemy.mysql.com +2 -2
    TIME -> MYSQL_TIME

  sql/item_timefunc.cc@1.100.1.43, 2007-05-14 11:28:31+02:00, tnurnberg@blasphemy.mysql.com +124 -95
    New parameters to make_truncated_value_warning()
    Moved year 2000 handling out from calc_days()

  sql/item_timefunc.h@1.63.1.12, 2007-05-14 11:28:31+02:00, tnurnberg@blasphemy.mysql.com +24 -24
    TIME -> MYSQL_TIME

  sql/my_decimal.cc@1.11.1.4, 2007-05-14 11:28:32+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/my_decimal.h@1.10.3.1, 2007-05-14 11:28:33+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/mysql_priv.h@1.290.115.1, 2007-05-14 11:28:34+02:00, tnurnberg@blasphemy.mysql.com +19 -13
    Added error level to make_truncated_value_warning()

  sql/protocol.cc@1.111.1.11, 2007-05-14 11:28:35+02:00, tnurnberg@blasphemy.mysql.com +6 -6
    TIME -> MYSQL_TIME

  sql/protocol.h@1.31.1.6, 2007-05-14 11:28:36+02:00, tnurnberg@blasphemy.mysql.com +9 -9
    TIME -> MYSQL_TIME

  sql/sp.cc@1.82.28.1, 2007-05-14 11:28:36+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/sql_base.cc@1.235.96.1, 2007-05-14 11:28:37+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    Make testing of result value of save_in_field() uniform

  sql/sql_class.h@1.230.65.1, 2007-05-14 11:28:38+02:00, tnurnberg@blasphemy.mysql.com +1 -1
    TIME -> MYSQL_TIME

  sql/sql_show.cc@1.253.1.95, 2007-05-14 11:28:39+02:00, tnurnberg@blasphemy.mysql.com +2 -2
    TIME -> MYSQL_TIME

  sql/structs.h@1.53.1.5, 2007-05-14 11:28:41+02:00, tnurnberg@blasphemy.mysql.com +1 -2
    TIME -> MYSQL_TIME

  sql/time.cc@1.57.1.10, 2007-05-14 11:28:42+02:00, tnurnberg@blasphemy.mysql.com +20 -18
    Added error level to make_truncated_value_warning()

  sql/tztime.cc@1.24.1.18, 2007-05-14 11:28:43+02:00, tnurnberg@blasphemy.mysql.com +44 -44
    TIME -> MYSQL_TIME

  sql/tztime.h@1.12.1.4, 2007-05-14 11:28:44+02:00, tnurnberg@blasphemy.mysql.com +5 -5
    TIME -> MYSQL_TIME

  sql/unireg.cc@1.53.1.32, 2007-05-14 11:28:45+02:00, tnurnberg@blasphemy.mysql.com +3 -1
    For default values to CREATE, don't give errors for warning level NOTE
    (Fixed failed CREATE when we give a datetime value to a date field)

ChangeSet@1.2475.22.13, 2007-05-14 13:22:03+04:00, anozdrin@ibm. +1 -0
  Update description.

  mysql-test/t/disabled.def@1.249.1.2, 2007-05-14 13:22:00+04:00, anozdrin@ibm. +2 -2
    Update description.

ChangeSet@1.1810.2908.12, 2007-05-14 13:20:11+04:00, anozdrin@ibm. +1 -0
  Update description.

  mysql-test/t/disabled.def@1.2.4.28, 2007-05-14 13:20:10+04:00, anozdrin@ibm. +1 -1
    Update description.

ChangeSet@1.2475.22.12, 2007-05-14 13:04:59+04:00, anozdrin@ibm. +1 -0
  Disable random-failing IM tests.

  mysql-test/t/disabled.def@1.249.1.1, 2007-05-14 13:04:56+04:00, anozdrin@ibm. +3 -1
    Disable random-failing IM tests.

ChangeSet@1.1810.2908.11, 2007-05-14 13:02:12+04:00, anozdrin@ibm. +1 -0
  Disable random-failing IM tests.

  mysql-test/t/disabled.def@1.2.4.27, 2007-05-14 13:02:09+04:00, anozdrin@ibm. +1 -0
    Disable random-failing IM tests.

ChangeSet@1.2403.18.48, 2007-05-14 10:34:21+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#28348
    remove LCP files when dropping table

  storage/ndb/include/kernel/signaldata/FsOpenReq.hpp@1.9, 2007-05-14 10:34:20+02:00, jonas@perch.ndb.mysql.com +2 -0
    add tup as user (for fsremove)

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.7, 2007-05-14 10:34:20+02:00, jonas@perch.ndb.mysql.com +10 -1
    add remove LCP stuff

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.35.2.3, 2007-05-14 10:34:20+02:00, jonas@perch.ndb.mysql.com +4 -0
    add remove LCP stuff

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.4, 2007-05-14 10:34:20+02:00, jonas@perch.ndb.mysql.com +87 -0
    remove each LCP file regardless if present or not

ChangeSet@1.2486, 2007-05-14 09:02:40+02:00, tnurnberg@blasphemy.mysql.com +2 -0
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
  
  mysqldump generated output that set OLD_SQL_MODE twice, to different values
  (for triggers), or not at all (for routines) in some cases.
  ---
  Merge blasphemy.mysql.com:/home/tnurnberg/28223/50-28223
  into  blasphemy.mysql.com:/home/tnurnberg/28223/51-28223

  client/mysqldump.c@1.278, 2007-05-14 09:02:36+02:00, tnurnberg@blasphemy.mysql.com +8 -2
    Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
    
    Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
    it's already been saved in write_header(). Likewise for dumpe_routines,
    where it was never saved.

  mysql-test/r/mysqldump.result@1.149, 2007-05-14 09:02:37+02:00, tnurnberg@blasphemy.mysql.com +4 -4
    Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
    
    mysqldump output has subtly changed. Adjust test-results. This also shows
    OLD_SQL_MODE is always set exactly once now.
    ---
    manual merge

ChangeSet@1.1810.2908.10, 2007-05-14 10:56:23+04:00, kostja@vajra.(none) +1 -0
  Fix a warning.

  sql/sql_insert.cc@1.146.1.88, 2007-05-14 10:56:18+04:00, kostja@vajra.(none) +6 -6
    Fix a compile-time warning (log_on is not used in embedded).

ChangeSet@1.2475.38.13, 2007-05-11 23:22:56-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix

  mysql-test/r/grant.result@1.78, 2007-05-11 23:22:54-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix

ChangeSet@1.1810.2927.8, 2007-05-11 19:37:32-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #28375: a query with an NOT IN subquery predicate may cause
  a crash when the left operand of the predicate is evaluated to NULL.
  It happens when the rows from the inner tables (tables from the subquery)
  are accessed by index methods with key values obtained by evaluation of
  the left operand of the subquery predicate. When this predicate is
  evaluated to NULL an alternative access with full table scan is used
  to check whether the result set returned by the subquery is empty or not.
  The crash was due to the fact the info about the access methods used for
  regular key values was not properly restored after a switch back from the
  full scan access method had occurred.
  The patch restores this info properly.
  The same problem existed for queries with IN subquery predicates if they
  were used not at the top level of the queries.

  mysql-test/r/subselect3.result@1.1.1.9, 2007-05-11 19:37:30-07:00, igor@olga.mysql.com +31 -0
    Added a test case for bug #28375.

  mysql-test/t/subselect3.test@1.10, 2007-05-11 19:37:30-07:00, igor@olga.mysql.com +25 -0
    Added a test case for bug #28375.

  sql/item_subselect.cc@1.113.1.45, 2007-05-11 19:37:30-07:00, igor@olga.mysql.com +4 -2
    Fixed bug #28375: a query with an NOT IN subquery predicate may cause
    a crash when the left operand of the predicate is evaluated to NULL.
    It happens when the rows from the inner tables (tables from the subquery)
    are accessed by index methods with key values obtained by evaluation of
    the left operand of the subquery predicate. When this predicate is
    evaluated to NULL an alternative access with full table scan is used
    to check whether the result set returned by the subquery is empty or not.
    The crash was due to the fact the info about the access methods used for
    regular key values was not properly restored after a switch back from the
    full scan access method had occurred.
    The patch restores this info properly.

  sql/sql_select.h@1.92.1.27, 2007-05-11 19:37:30-07:00, igor@olga.mysql.com +7 -0
    Fixed bug #28375: a query with an NOT IN subquery predicate may cause
    a crash when the left operand of the predicate is evaluated to NULL.
    In the JOIN_TAB structure two fields have been added to save info about
    index methods used to access the subquery rows. The saved info is used
    after a switch back from the alternative full scan access method has 
    occurred. The full scan is used when the left operand of the subquery
    predicate is evaluated to NULL.

ChangeSet@1.1810.2933.2, 2007-05-12 00:46:07+04:00, evgen@moonbone.local +2 -0
  grant.result, grant.test:
    Corrected test case for the bug#27878.

  mysql-test/r/grant.result@1.37.1.29, 2007-05-12 00:45:44+04:00, evgen@moonbone.local +1 -1
    Corrected test case for the bug#27878.

  mysql-test/t/grant.test@1.41.1.15, 2007-05-12 00:45:22+04:00, evgen@moonbone.local +1 -1
    Corrected test case for the bug#27878.

ChangeSet@1.1810.2908.9, 2007-05-12 00:03:50+04:00, dlenev@mockturtle.local +1 -0
  Added missing DBUG_VOID_RETURN to the sp_head::init_sp_name() method.

  sql/sp_head.cc@1.200.7.21, 2007-05-12 00:03:48+04:00, dlenev@mockturtle.local +2 -0
    Added missing DBUG_VOID_RETURN to the sp_head::init_sp_name() method.

ChangeSet@1.2475.38.11, 2007-05-12 00:18:36+05:00, holyfoot@mysql.com +1 -0
  merging fix

  mysql-test/r/grant.result@1.76, 2007-05-12 00:18:34+05:00, holyfoot@mysql.com +88 -2
    merging fix

ChangeSet@1.1810.2932.1, 2007-05-11 23:19:11+04:00, evgen@moonbone.local +4 -0
  Bug#27878: Unchecked privileges on a view referring to a table from another 
  database.
  
  If a user has a right to update anything in the current database then the 
  access was granted and further checks of access rights for underlying tables
  wasn't done correctly. The check is done before a view is opened and thus no
  check of access rights for underlying tables can be carried out.
  This allows a user to update through a view a table from another database for
  which he hasn't enough rights.
  
  Now the mysql_update() and the mysql_test_update() functions are forces
  re-checking of access rights after a view is opened.

  mysql-test/r/grant.result@1.37.1.28, 2007-05-11 23:18:44+04:00, evgen@moonbone.local +19 -0
    Added a test case for the bug#27878: Unchecked privileges on a view referring to a table from another database.

  mysql-test/t/grant.test@1.41.1.14, 2007-05-11 23:18:38+04:00, evgen@moonbone.local +25 -0
    Added a test case for the bug#27878: Unchecked privileges on a view referring to a table from another database.

  sql/sql_prepare.cc@1.142.28.1, 2007-05-11 23:18:53+04:00, evgen@moonbone.local +3 -2
    Bug#27878: Unchecked privileges on a view referring to a table from another 
    database.
    Now the mysql_test_update() function forces re-checking of access rights after
    the view is opened.

  sql/sql_update.cc@1.154.2.63, 2007-05-11 23:18:46+04:00, evgen@moonbone.local +3 -2
    Bug#27878: Unchecked privileges on a view referring to a table from another 
    database.
    Now the mysql_update() function forces re-checking of access rights after 
    the view is opened.

ChangeSet@1.2475.38.9, 2007-05-11 23:37:36+05:00, holyfoot@mysql.com +2 -0
  merging fixes

  mysql-test/r/insert_update.result@1.31, 2007-05-11 23:37:34+05:00, holyfoot@mysql.com +2 -2
    result fixed

  mysql-test/r/type_newdecimal.result@1.56, 2007-05-11 23:37:34+05:00, holyfoot@mysql.com +9 -9
    result fixed

ChangeSet@1.2475.44.1, 2007-05-11 21:51:03+04:00, dlenev@mockturtle.local +17 -0
  Fix for:
    Bug #20662 "Infinite loop in CREATE TABLE IF NOT EXISTS ... SELECT
                with locked tables"
    Bug #20903 "Crash when using CREATE TABLE .. SELECT and triggers"
    Bug #24738 "CREATE TABLE ... SELECT is not isolated properly"
    Bug #24508 "Inconsistent results of CREATE TABLE ... SELECT when
                temporary table exists"
  
  Deadlock occured when one tried to execute CREATE TABLE IF NOT
  EXISTS ... SELECT statement under LOCK TABLES which held
  read lock on target table.
  Attempt to execute the same statement for already existing
  target table with triggers caused server crashes.
  Also concurrent execution of CREATE TABLE ... SELECT statement
  and other statements involving target table suffered from
  various races (some of which might've led to deadlocks).
  Finally, attempt to execute CREATE TABLE ... SELECT in case
  when a temporary table with same name was already present
  led to the insertion of data into this temporary table and
  creation of empty non-temporary table.
   
  All above problems stemmed from the old implementation of CREATE
  TABLE ... SELECT in which we created, opened and locked target
  table without any special protection in a separate step and not
  with the rest of tables used by this statement.
  This underminded deadlock-avoidance approach used in server
  and created window for races. It also excluded target table
  from prelocking causing problems with trigger execution.
  
  The patch solves these problems by implementing new approach to
  handling of CREATE TABLE ... SELECT for base tables.
  We try to open and lock table to be created at the same time as
  the rest of tables used by this statement. If such table does not
  exist at this moment we create and place in the table cache special
  placeholder for it which prevents its creation or any other usage
  by other threads.
  We still use old approach for creation of temporary tables.
  
  Note that we have separate fix for 5.0 since there we use slightly
  different less intrusive approach.

  mysql-test/r/create.result@1.140, 2007-05-11 21:50:59+04:00, dlenev@mockturtle.local +94 -0
    Extended test coverage for CREATE TABLE ... SELECT. In particular added
    tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
    when temporary table exists" and bug #20662 "Infinite loop in CREATE
    TABLE IF NOT EXISTS ... SELECT with locked tables".

  mysql-test/r/create_select-big.result@1.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +164 -0
    New BitKeeper file ``mysql-test/r/create_select-big.result''

  mysql-test/r/create_select-big.result@1.0, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +0 -0

  mysql-test/r/trigger.result@1.64, 2007-05-11 21:50:59+04:00, dlenev@mockturtle.local +35 -0
    Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
    and triggers"

  mysql-test/t/create.test@1.93, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +112 -0
    Extended test coverage for CREATE TABLE ... SELECT. In particular added
    tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
    when temporary table exists" and bug #20662 "Infinite loop in CREATE
    TABLE IF NOT EXISTS ... SELECT with locked tables".

  mysql-test/t/create_select-big.test@1.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +268 -0
    New BitKeeper file ``mysql-test/t/create_select-big.test''

  mysql-test/t/create_select-big.test@1.0, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +0 -0

  mysql-test/t/trigger.test@1.74, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +26 -0
    Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
    and triggers"

  sql/lock.cc@1.107, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +3 -23
    Now for creation of name-lock placeholder lock_table_name() uses
    auxiliary function table_cache_insert_placeholder().

  sql/mysql_priv.h@1.501.3.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +16 -6
    Removed declaration of non-existing build_table_path() routine.
    The former mysql_create_table_internal() was renamed to
    mysql_create_table_no_lock() and now exposed to other modules to
    give them opportunity of creation of tables in cases when name-lock
    is already obtained.
    reopen_name_locked_table() now has 3rd argument which controls linking
    in of table being opened into THD::open_tables (this is useful in
    cases when placeholder used for name-locking is already linked into
    this list).
    Added declaration of auxiliary function table_cache_insert_placeholder()
    which is used for creation of table placeholders for name-locking.
    Added declaration of lock_table_name_if_not_cached() which can be
    used to take an exclusive name-lock on table if there are no records
    for it in table cache.
    Changed signature of unlink_open_table() function to simplify its use
    and make it useful for table placeholders and tables that are only open.
    Added auxiliary drop_open_table() routine.
    Moved declaration of refresh_version to table.h header to make it
    accessible from inline methods of TABLE class.
    MYSQL_OPEN_IGNORE_LOCKED_TABLES flag is no longer used. Instead
    MYSQL_OPEN_TEMPORARY_ONLY option was added.

  sql/sql_base.cc@1.396.1.2, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +408 -41
    Added support for the new approach to the handling of CREATE TABLE
    ... SELECT for base tables.
    
    Now we try to open and lock table to be created at the same time as
    the rest of tables used by this statement. If such table does not
    exist at this moment we create and place in the table cache special
    placeholder for it which prevents its creation or any other usage
    by other threads.
    
    Note significant distinctions of this placeholder from the placeholder
    used for normal name-lock: 1) It is treated like open table by other
    name-locks so it does not allow name-lock taking operations like DROP
    TABLE or RENAME TABLE to proceed. 2) it is linked into THD::open_tables
    list and automatically removed during close_thread_tables() call
      
    open_tables():
      Implemented logic described above. To do this added
      auxiliary check_if_table_exists() function.
      Removed support for MYSQL_OPEN_IGNORE_LOCKED_TABLES option
      which is no longer used.
      Added MYSQL_OPEN_TEMPORARY_ONLY which is used to restrict
      search for temporary tables only.
    close_cached_tables()/close_thread_table()/reopen_tables()/
    close_old_data_files()/table_is_used()/remove_table_from_cache():
      Added support for open placeholders (note that we also use them
      when we need to re-open tables during flush).
    unlink_open_table():
      Changed function signature to simplify its use and to make
      useful for open placeholders and tables which are only
      open and not locked.
    Added auxiliary drop_open_table() routine.
    reopen_name_locked_table():
      Now has 3rd argument which controls linking in of table being
      opened into THD::open_tables (this is useful in cases when
      placeholder used for name-locking is already linked into
      this list).
    Added auxiliary table_cache_insert_placeholder() routine which
    simplifies creation of placeholders used for name-locking.
    Added lock_table_name_if_not_cached() which can be used to take
    an exclusive name-lock on table if there are no records for it
    in table cache.

  sql/sql_handler.cc@1.94, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +16 -9
    Adjusted mysql_ha_mark_tables_for_reopen() routine to properly
    handle placeholders which now can be linked into open tables
    list.

  sql/sql_insert.cc@1.261.2.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +102 -77
    Introduced new approach to handling of base tables in CREATE TABLE
    ... SELECT statement.
    
    Now we try to open and lock table to be created at the same time as
    the rest of tables used by this statement. If such table does not
    exist at this moment we create and place in the table cache special
    placeholder for it which prevents its creation or any other usage
    by other threads. By doing this we avoid races which existed with
    previous approach in which we created, opened and locked target in
    separate step without any special protection.
    This also allows properly calculate prelocking set in cases when
    target table already exists and has some on insert triggers.
    
    Note that we don't employ the same approach for temporary tables
    (this is okay as such tables are unaffected by other threads).
    
    Changed create_table_from_items() and methods of select_create
    class to implement this approach.

  sql/sql_parse.cc@1.662.3.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +17 -1
    The new approach to handling of CREATE TABLE ... SELECT for
    base tables assumes that all tables (including table to be
    created) are opened and (or) locked at the same time.
    So in cases when we create base table we have to pass to
    open_and_lock_tables() table list which includes target table.

  sql/sql_prepare.cc@1.212.1.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +14 -1
    The new approach to handling of CREATE TABLE ... SELECT for
    base tables assumes that all tables (including table to be
    created) are opened and (or) locked at the same time.
    So in cases when we create base table we have to pass to
    open_and_lock_tables() table list which includes target table.

  sql/sql_table.cc@1.413.2.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +149 -79
    Changed mysql_create_table(), mysql_create_like_table() and
    mysql_alter_table() (in rename case) to obtain exclusive name-lock
    on the non-temporary table which is going to be created (to which
    we going to rename). This ensures that not only destination table
    doesn't exist on disk but also that there are no placeholder in 
    table cache for it (i.e. there is no CREATE TABLE ... SELECT operation
    in progress for it). Note that to avoid deadlocks while taking these
    name-locks this code assumes that existence of any record for table in
    table cache (even name-lock) means that table exists. Altough such
    check can lead to false positives these should occur only in case of
    highly concurrent DDL operations on the table and should not break
    binary logging.
    
    Renamed mysql_create_table_internal() to mysql_create_table_no_lock()
    and made it accessible from other files to give them ability to create
    table in situation when name-lock is already obtained or not relevant.
    
    Adjusted calls to reopen_name_locked_table(), which now takes
    extra argument, which controls linking of open table into
    THD::open_tables list.
    
    Removed redundant setting of table's 'version' field before calls
    to close_cached_table(). This function will set it to 0 itself
    anyway. 

  sql/sql_trigger.cc@1.92, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +1 -1
    reopen_name_locked_tables() now has one more argument which controls
    linking of opened table into the THD::open_tables list.

  sql/sql_yacc.yy@1.564.3.1, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +1 -3
    The new approach to handling of CREATE TABLE ... SELECT statement
    for base tables assumes that all tables including table to be
    created are open and (or) locked at the same time. Therefore
    we need to set correct lock for target table.

  sql/table.h@1.166.1.2, 2007-05-11 21:51:00+04:00, dlenev@mockturtle.local +39 -4
    Moved declaration of refresh_version variable from mysql_priv.h
    to make it accessible from inline methods of TABLE class.
    Renamed TABLE::locked_by_flush member to open_placeholder since
    now it is also used for taking exclusive name-lock and not only
    by flush. 
    Introduced TABLE::is_name_opened() helper method which can be used
    to distinguish TABLE instances corresponding to open tables or
    placeholders for them from closed instances (e.g. due to their old
    version). Also introduced TABLE::needs_reopen_or_name_lock() helper
    which allows to check if TABLE instance corresponds to outdated
    version of table or to name-lock placeholder.
    Introduced TABLE_LIST::create member which marks elements of
    table list corresponds to the table to be created.
    Adjusted TABLE_LIST::placeholder() method to take into account 
    name-lock placeholders for tables to be created (this, for example,
    allows to properly handle such placeholders in lock_tables()).
    Finally, moved currently unused TABLE::open_next/open_prev
    members under ifdef NOT_YET.

ChangeSet@1.1810.2931.1, 2007-05-11 20:33:13+04:00, dlenev@mockturtle.local +15 -0
  Fix for:
    Bug #20662 "Infinite loop in CREATE TABLE IF NOT EXISTS ... SELECT
                with locked tables"
    Bug #20903 "Crash when using CREATE TABLE .. SELECT and triggers"
    Bug #24738 "CREATE TABLE ... SELECT is not isolated properly"
    Bug #24508 "Inconsistent results of CREATE TABLE ... SELECT when
                temporary table exists"
   
  Deadlock occured when one tried to execute CREATE TABLE IF NOT
  EXISTS ... SELECT statement under LOCK TABLES which held
  read lock on target table.
  Attempt to execute the same statement for already existing
  target table with triggers caused server crashes.
  Also concurrent execution of CREATE TABLE ... SELECT statement
  and other statements involving target table suffered from
  various races (some of which might've led to deadlocks).
  Finally, attempt to execute CREATE TABLE ... SELECT in case
  when a temporary table with same name was already present
  led to the insertion of data into this temporary table and
  creation of empty non-temporary table.
   
  All above problems stemmed from the old implementation of CREATE
  TABLE ... SELECT in which we created, opened and locked target
  table without any special protection in a separate step and not
  with the rest of tables used by this statement.
  This underminded deadlock-avoidance approach used in server
  and created window for races. It also excluded target table
  from prelocking causing problems with trigger execution.
    
  The patch solves these problems by implementing new approach to
  handling of CREATE TABLE ... SELECT for base tables.
  We try to open and lock table to be created at the same time as
  the rest of tables used by this statement. If such table does not
  exist at this moment we create and place in the table cache special
  placeholder for it which prevents its creation or any other usage
  by other threads.
  
  We still use old approach for creation of temporary tables.
  
  Also note that we decided to postpone introduction of some tests
  for concurrent behaviour of CREATE TABLE ... SELECT till 5.1.
  The main reason for this is absence in 5.0 ability to set @@debug
  variable at runtime, which can be circumvented only by using several
  test files with individual .opt files. Since the latter is likely
  to slowdown test-suite unnecessary we chose not to push this tests
  into 5.0, but run them manually for this version and later push
  their optimized version into 5.1

  mysql-test/r/create.result@1.107.1.20, 2007-05-11 20:33:10+04:00, dlenev@mockturtle.local +94 -0
    Extended test coverage for CREATE TABLE ... SELECT. In particular added
    tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
    when temporary table exists" and bug #20662 "Infinite loop in CREATE
    TABLE IF NOT EXISTS ... SELECT with locked tables".

  mysql-test/r/trigger.result@1.29.11.11, 2007-05-11 20:33:10+04:00, dlenev@mockturtle.local +35 -0
    Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
    and triggers"

  mysql-test/t/create.test@1.71.1.16, 2007-05-11 20:33:10+04:00, dlenev@mockturtle.local +111 -0
    Extended test coverage for CREATE TABLE ... SELECT. In particular added
    tests for bug #24508 "Inconsistent results of CREATE TABLE ... SELECT
    when temporary table exists" and bug #20662 "Infinite loop in CREATE
    TABLE IF NOT EXISTS ... SELECT with locked tables".

  mysql-test/t/trigger.test@1.34.11.12, 2007-05-11 20:33:10+04:00, dlenev@mockturtle.local +26 -0
    Added test case for bug #20903 "Crash when using CREATE TABLE .. SELECT
    and triggers"

  sql/lock.cc@1.64.1.32, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +6 -27
    Now for creation of name-lock placeholder in lock_table_name() we use
    auxiliary function table_cache_insert_placeholder().

  sql/mysql_priv.h@1.290.114.1, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +11 -5
    Made build_table_path() function available outside of sql_table.cc file.
    reopen_name_locked_table() now has 3rd argument which controls linking
    in of table being opened into THD::open_tables (this is useful in
    cases when placeholder used for name-locking is already linked into
    this list).
    Added declaration of auxiliary function table_cache_insert_placeholder()
    which is used for creation of table placeholders for name-locking.
    Added declaration of table_cache_has_open_placeholder() function which
    can be used for checking if table cache contains an open placeholder for
    the table and if this placeholder was created by another thread.
    (This function is needed only in 5.0 where we use it in various versions
     of CREATE TABLE in order to protect it from concurrent CREATE TABLE
     ... SELECT operations for the table. Starting from 5.1 we use different
     approach so it is going to be removed there).
    Made close_old_data_files() static within sql_base.cc file. 
    Added auxiliary drop_open_table() routine.
    Moved declaration of refresh_version to table.h header to make it
    accessible from inline methods of TABLE class.
    MYSQL_OPEN_IGNORE_LOCKED_TABLES flag is no longer used. Instead
    MYSQL_OPEN_TEMPORARY_ONLY option was added.

  sql/sql_base.cc@1.235.1.143, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +388 -32
    Added support for the new approach to the handling of CREATE TABLE
    ... SELECT for base tables.
    
    Now we try to open and lock table to be created at the same time as
    the rest of tables used by this statement. If such table does not
    exist at this moment we create and place in the table cache special
    placeholder for it which prevents its creation or any other usage
    by other threads.
    
    Note significant distinctions of this placeholder from the placeholder
    used for normal name-lock: 1) It is treated like open table by other
    name-locks so it does not allow name-lock taking operations like DROP
    TABLE or RENAME TABLE to proceed. 2) it is linked into THD::open_tables
    list and automatically removed during close_thread_tables() call.
    
    open_tables():
      Implemented logic described above. To do this added
      auxiliary check_if_table_exists() function.
      Removed support for MYSQL_OPEN_IGNORE_LOCKED_TABLES option
      which is no longer used.
      Added MYSQL_OPEN_TEMPORARY_ONLY which is used to restrict
      search for temporary tables only.
    close_cached_tables()/close_thread_table()/reopen_tables()/
    close_old_data_files()/table_is_used()/remove_table_from_cache():
      Added support for open placeholders (note that we also use them
      when we need to re-open tables during flush).
    Added auxiliary drop_open_table() routine.
    reopen_name_locked_table():
      Now has 3rd argument which controls linking in of table being
      opened into THD::open_tables (this is useful in cases when
      placeholder used for name-locking is already linked into
      this list).
    Added auxiliary table_cache_insert_placeholder() routine which
    simplifies creation of placeholders used for name-locking.
    Added table_cache_has_open_placeholder() function which can be
    used for checking if table cache contains an open placeholder for
    the table and if this placeholder was created by another thread.
    (This function is needed only in 5.0 where we use it in various versions
     of CREATE TABLE in order to protect it from concurrent CREATE TABLE
     ... SELECT operations for the table. Starting from 5.1 we use different
     approach so it is going to be removed there).

  sql/sql_handler.cc@1.72.1.15, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +16 -9
    Adjusted mysql_ha_mark_tables_for_reopen() routine to properly
    handle placeholders which now can be linked into open tables
    list.

  sql/sql_insert.cc@1.146.58.1, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +101 -81
    Introduced new approach to handling of base tables in CREATE TABLE
    ... SELECT statement.
    
    Now we try to open and lock table to be created at the same time as
    the rest of tables used by this statement. If such table does not
    exist at this moment we create and place in the table cache special
    placeholder for it which prevents its creation or any other usage
    by other threads. By doing this we avoid races which existed with
    previous approach in which we created, opened and locked target in
    separate step without any special protection.
    This also allows properly calculate prelocking set in cases when
    target table already exists and has some on insert triggers.
      
    Note that we don't employ the same approach for temporary tables
    (this is okay as such tables are unaffected by other threads).
    
    Changed create_table_from_items() and select_create methods to
    implement this approach.

  sql/sql_parse.cc@1.426.1.194, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +11 -1
    The new approach to handling of CREATE TABLE ... SELECT for
    base tables assumes that all tables (including table to be
    created) are opened and (or) locked at the same time.
    So in cases when we create base table we have to pass to
    open_and_lock_tables() table list which includes target table.

  sql/sql_prepare.cc@1.142.27.1, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +14 -1
    The new approach to handling of CREATE TABLE ... SELECT for
    base tables assumes that all tables (including table to be
    created) are opened and (or) locked at the same time.
    So in cases when we create base table we have to pass to
    open_and_lock_tables() table list which includes target table.

  sql/sql_table.cc@1.239.1.104, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +66 -22
    Now mysql_create_table_internal(), mysql_create_like_table() and
    mysql_alter_table() not only check that destination table doesn't
    exist on disk but also check that there is no create placeholder
    in table cache for it (i.e. there is no CREATE TABLE ... SELECT
    operation in progress for it). Note that starting from 5.1 we
    use different approach in order to to protect CREATE TABLE ... SELECT
    from concurrent CREATE TABLE (ALTER TABLE ... RENAME) operations,
    the latter simply take name-locks on table before its creation
    (on target table name before renaming).
    
    Also made build_table_path() available from other files and
    asjusted calls to reopen_name_locked_table(), which now takes
    extra argument, which controls linking of open table into
    THD::open_tables list.

  sql/sql_trigger.cc@1.35.1.32, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +1 -1
    reopen_name_locked_tables() now has one more argument which controls
    linking of opened table into the THD::open_tables list.

  sql/sql_yacc.yy@1.371.106.1, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +1 -3
    The new approach to handling of CREATE TABLE ... SELECT statement
    for base tables assumes that all tables including table to be
    created are open and (or) locked at the same time. Therefore
    we need to set correct lock for target table.

  sql/table.h@1.102.1.40, 2007-05-11 20:33:11+04:00, dlenev@mockturtle.local +38 -2
    Moved declaration of refresh_version variable from mysql_priv.h
    to make it accessible from inline methods of TABLE class. 
    Renamed TABLE::locked_by_flush member to open_placeholder since
    now it is also used for taking exclusive name-lock and not only
    by flush. 
    Introduced TABLE::is_name_opened() helper method which can be used
    to distinguish TABLE instances corresponding to open tables or
    placeholders for them from closed instances (e.g. due to their old
    version). Also introduced TABLE::needs_reopen_or_name_lock() helper
    which allows to check if TABLE instance corresponds to outdated
    version of table or to name-lock placeholder.
    Introduced TABLE_LIST::create member which marks elements of
    table list corresponds to the table to be created.
    Adjusted TABLE_LIST::placeholder() method to take into account 
    name-lock placeholders for tables to be created (this, for example,
    allows to properly handle such placeholders in lock_tables()).

ChangeSet@1.1810.2927.5, 2007-05-11 20:56:22+05:00, holyfoot@mysql.com +4 -0
  merging fixes

  mysql-test/r/type_datetime.result@1.30.1.12, 2007-05-11 20:56:20+05:00, holyfoot@mysql.com +2 -2
    result fixed

  mysql-test/t/type_datetime.test@1.18.1.10, 2007-05-11 20:56:20+05:00, holyfoot@mysql.com +1 -1
    testcase fixed

  sql/item_func.cc@1.270.59.5, 2007-05-11 20:56:20+05:00, holyfoot@mysql.com +6 -3
    my_decimal_length_to_precision used

  sql/my_decimal.h@1.10.1.6, 2007-05-11 20:56:20+05:00, holyfoot@mysql.com +1 -0
    merging fix

ChangeSet@1.1810.2908.7, 2007-05-11 17:26:12+04:00, kostja@vajra.(none) +8 -0
  Cleanup: now that we have Lex_input_stream, finish the transition
  by moving yet another relevant flag to it from struct LEX.

  mysql-test/r/ps.result@1.56.1.34, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +3 -3
    Update result.

  mysql-test/r/ps_1general.result@1.50.1.5, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +3 -3
    Update result.

  mysql-test/t/ps.test@1.56.1.34, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +3 -3
    New error code.

  mysql-test/t/ps_1general.test@1.25.1.6, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +3 -3
    New error code.

  sql/sql_lex.cc@1.142.1.79, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +4 -4
    Move stmt_prepare_mode to Lex_input_stream.

  sql/sql_lex.h@1.175.1.70, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +5 -5
    Move stmt_prepare_mode to class Lex_input_stream

  sql/sql_prepare.cc@1.142.1.58, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +4 -1
    Move stmt_prepare_mode to Lex_input_stream

  sql/sql_yacc.yy@1.371.1.146, 2007-05-11 17:26:09+04:00, kostja@vajra.(none) +0 -15
    Remove dead code.

ChangeSet@1.2475.42.2, 2007-05-11 18:19:47+05:00, holyfoot@mysql.com +4 -0
  merging fixes

  mysql-test/t/view.test@1.198, 2007-05-11 18:19:45+05:00, holyfoot@mysql.com +12 -0
    merging fix

  sql/item_create.cc@1.76.1.2, 2007-05-11 18:19:46+05:00, holyfoot@mysql.com +2 -1
    merging fix

  sql/my_decimal.cc@1.17, 2007-05-11 18:19:46+05:00, holyfoot@mysql.com +11 -0
    merging fix

  sql/my_decimal.h@1.16.1.1, 2007-05-11 18:19:46+05:00, holyfoot@mysql.com +1 -9
    merging fix

ChangeSet@1.1810.2930.1, 2007-05-11 16:05:20+03:00, mhansson@linux-st28.site +3 -0
  bug#28273: GROUP_CONCAT and ORDER BY: No warning when result gets truncated.
  
  When using GROUP_CONCAT with ORDER BY, a tree is used for the sorting, as 
  opposed to normal nested loops join used when there is no ORDER BY. 
  
  The tree traversal that generates the result counts the lines that have been 
  cut down. (as they get cut down to the field's max_size)
  But the check of that count was before the tree traversal, so no 
  warning was generated if the output is truncated.
  
  Fixed by moving the check to after the tree traversal.

  mysql-test/r/func_gconcat.result@1.52.1.17, 2007-05-11 16:05:18+03:00, mhansson@linux-st28.site +26 -0
    bug#28273: correct result

  mysql-test/t/func_gconcat.test@1.44.1.12, 2007-05-11 16:05:18+03:00, mhansson@linux-st28.site +14 -0
    bug#28273: test case

  sql/item_sum.cc@1.170.1.37, 2007-05-11 16:05:18+03:00, mhansson@linux-st28.site +4 -5
    bug#28273: the fix
    
    Moved the code that outputs a warning to after temporary table (tree) is traversed. 

ChangeSet@1.2475.41.2, 2007-05-11 09:19:03+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#25818 No return of NDB share object in failures in open method
  - correct manual/auto merge to 5.1
  

  sql/ha_ndbcluster.cc@1.449, 2007-05-11 09:19:01+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug#25818 No return of NDB share object in failures in open method
    - correct manual/auto merge to 5.1
    

ChangeSet@1.1810.2929.2, 2007-05-11 08:07:42+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#25818 No return of NDB share object in failures in open method
  - make sure resources are release properly on error

  sql/ha_ndbcluster.cc@1.175.1.137, 2007-05-11 08:07:39+02:00, tomas@whalegate.ndb.mysql.com +18 -9
    Bug#25818 No return of NDB share object in failures in open method
    - make sure resources are release properly on error

ChangeSet@1.1810.2927.2, 2007-05-11 03:17:05+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28000.
  Bug occurs in INSERT IGNORE ... SELECT ... ON DUPLICATE KEY UPDATE
  statements, when SELECT returns duplicated values and UPDATE clause
  tries to assign NULL values to NOT NULL fields.
  NOTE: By current design MySQL server treats INSERT IGNORE ... ON
  DUPLICATE statements as INSERT ... ON DUPLICATE with update of
  duplicated records, but MySQL manual lacks this information.
  After this fix such behaviour becomes legalized.
  
  The write_record() function was returning error values even within
  INSERT IGNORE, because ignore_errors parameter of
  the fill_record_n_invoke_before_triggers() function call was
  always set to FALSE. FALSE is replaced by info->ignore.

  mysql-test/r/insert_update.result@1.18.1.8, 2007-05-11 03:14:02+05:00, gshchepa@gleb.loc +35 -0
    Added test case for bug #28000.

  mysql-test/t/insert_update.test@1.20.1.6, 2007-05-11 03:13:29+05:00, gshchepa@gleb.loc +26 -0
    Added test case for bug #28000.

  sql/sql_insert.cc@1.146.57.1, 2007-05-11 03:12:25+05:00, gshchepa@gleb.loc +2 -1
    Fixed bug #28000:
    The write_record() function was returning error values even within
    INSERT IGNORE, because ignore_errors parameter of
    the fill_record_n_invoke_before_triggers() function call was
    always set to FALSE. FALSE is replaced by info->ignore.

ChangeSet@1.2475.1.39, 2007-05-10 20:30:49+05:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/r/binlog_row_blackhole.result@1.12, 2007-05-10 20:30:46+05:00, svoj@mysql.com +3 -0
    After merge fix.

ChangeSet@1.1810.2908.6, 2007-05-10 18:27:36+04:00, kostja@vajra.(none) +2 -0
  Follow the coding style with class names.

  sql/sql_class.h@1.230.1.100, 2007-05-10 18:27:32+04:00, kostja@vajra.(none) +2 -2
    Follow the coding style with class names.

  sql/sql_insert.cc@1.146.1.86, 2007-05-10 18:27:32+04:00, kostja@vajra.(none) +23 -23
    delayed_insert -> Delayed_insert

ChangeSet@1.2475.39.1, 2007-05-10 15:03:38+02:00, thek@adventure.(none) +1 -0
  Fixed error from merge misstake; missing line in debug statement.

  sql/sql_cache.cc@1.107.1.2, 2007-05-10 15:03:36+02:00, thek@adventure.(none) +1 -0
    Fixed error from merge misstake; missing line in debug statement.

ChangeSet@1.1810.2928.1, 2007-05-10 14:54:55+02:00, thek@adventure.(none) +1 -0
  Corrected merge error; missing line in debug statement.

  sql/sql_cache.cc@1.76.1.26, 2007-05-10 14:54:53+02:00, thek@adventure.(none) +1 -0
    Corrected merge error; missing line in debug statement.

ChangeSet@1.1810.2908.4, 2007-05-10 16:18:01+04:00, kostja@vajra.(none) +1 -0
  No semantical change. Move checks of compatibility
  of requested lock type and requested table operation from 
  mysql_insert into a separate function.

  sql/sql_insert.cc@1.146.1.85, 2007-05-10 16:17:58+04:00, kostja@vajra.(none) +126 -50
    Cleanup: move a number of locking related checks from mysql_insert 
    to a separate function.
    Add comments.

ChangeSet@1.1616.2881.95, 2007-05-10 13:28:24+02:00, msvensson@pilot.blaudden +1 -0
  Bug#27344 Total failure to start the server
  - Give some more protection against "too long socket name by setting the max
  length when to use a tmpdir for sockets to 70 

  mysql-test/mysql-test-run.pl@1.8.20.10, 2007-05-10 13:28:23+02:00, msvensson@pilot.blaudden +1 -1
    Give some more protection against "too long socket name by setting the max
    length when to use a tmpdir for sockets to 70 

ChangeSet@1.2475.38.2, 2007-05-10 16:22:38+05:00, holyfoot@mysql.com +2 -0
  bigint.test made ps-protocol consistent

  mysql-test/r/bigint.result@1.38, 2007-05-10 16:22:35+05:00, holyfoot@mysql.com +10 -10
    test result fixed

  mysql-test/t/bigint.test@1.31, 2007-05-10 16:22:35+05:00, holyfoot@mysql.com +6 -4
    testcase made ps-protocol consistent

ChangeSet@1.1810.2927.1, 2007-05-10 00:06:24-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28189: in some rare cases optimizer preferred a more expensive
  ref access to a less expensive range access. 
  This occurred only with InnoDB tables.

  mysql-test/t/innodb_mysql.test@1.3.23.1, 2007-05-10 00:06:21-07:00, igor@olga.mysql.com +54 -0
    Added a test case for bug #28189.

  mysql-test/r/innodb_mysql.result@1.3.4.15, 2007-05-10 00:06:21-07:00, igor@olga.mysql.com +52 -0
    Added a test case for bug #28189.

  sql/sql_select.cc@1.312.1.208, 2007-05-10 00:06:21-07:00, igor@olga.mysql.com +1 -1
    Fixed bug #28189: in some rare cases optimizer preferred a more expensive
    ref access to a less expensive range access. 
    This occurred only with InnoDB tables.

ChangeSet@1.1810.2926.2, 2007-05-10 08:14:53+05:00, holyfoot@mysql.com +1 -0
  bug 27921 (Views ignore precision for CAST)
  test result fixed

  mysql-test/r/cast.result@1.39.2.1, 2007-05-10 08:14:51+05:00, holyfoot@mysql.com +2 -2
    bug 27921 (Views ignore precision for CAST)
    test result fixed

ChangeSet@1.1810.2926.1, 2007-05-10 00:17:21+05:00, holyfoot@mysql.com +9 -0
  Bug #27921 View ignores precision for CAST()
  Item_decimal_typecast::print properly implemented

  mysql-test/r/view.result@1.138.1.62, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +14 -1
    Bug #27921 View ignores precision for CAST()
    test result

  mysql-test/t/view.test@1.126.1.57, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +12 -0
    Bug #27921 View ignores precision for CAST()
    test case

  sql/field.cc@1.256.1.92, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +1 -2
    zero decimals handling unified

  sql/item_create.cc@1.58.1.5, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +11 -5
    Bug #27921 View ignores precision for CAST()
    create_func_cast parameters changed, zero precision handling unified

  sql/item_create.h@1.43.1.4, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +2 -1
    Bug #27921 View ignores precision for CAST()
    create_func_cast parameters changed

  sql/item_func.cc@1.270.62.1, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +18 -1
    Bug #27921 View ignores precision for CAST() 
    Item_decimal_typecast::print properly implemented

  sql/item_func.h@1.136.26.1, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +1 -1
    Bug #27921 View ignores precision for CAST()
    max_length counting fixed

  sql/my_decimal.h@1.10.2.1, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +13 -0
    Bug #27921 View ignores precision for CAST()
    my_decimal_trim() implemented to unify zero precision handling

  sql/sql_yacc.yy@1.371.105.1, 2007-05-10 00:17:20+05:00, holyfoot@mysql.com +3 -9
    Bug #27921 View ignores precision for CAST()
    create_func_cast calls simplified

ChangeSet@1.2475.32.3, 2007-05-09 07:58:35-07:00, omer@linux.site +1 -0
  Correcting the 'partitions' suite name to its 'short' version - 'parts' in the Makefile.am file

  Makefile.am@1.132, 2007-05-09 07:58:31-07:00, omer@linux.site +2 -2
    Correcting the 'partitions' suite name to its 'short' version - 'parts'

ChangeSet@1.1810.2919.7, 2007-05-09 15:03:01+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
  + do this for management server

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.53.1, 2007-05-09 15:02:59+02:00, tomas@whalegate.ndb.mysql.com +10 -0
    enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
    + do this for management server

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.14.1, 2007-05-09 15:02:59+02:00, tomas@whalegate.ndb.mysql.com +4 -9
    enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
    + do this for management server

  ndb/src/ndbapi/ClusterMgr.hpp@1.4.14.1, 2007-05-09 15:02:59+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    enable setting api reg req frequency to be higher than heartbeat setting to ensure we have reasonably up-to-date info from ndb nodes
    + do this for management server

ChangeSet@1.1810.2919.6, 2007-05-09 14:31:22+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #28287 Sign problem in test "ndb_restore_print"
    - corrected previous patch
    - some platforms do strange things with char... use Int8 to be sure of signedness

  ndb/include/ndbapi/NdbRecAttr.hpp@1.15.8.1, 2007-05-09 14:31:20+02:00, tomas@whalegate.ndb.mysql.com +30 -2
    Bug #28287 Sign problem in test "ndb_restore_print"
      - corrected previous patch
      - some platforms do strange things with char... use Int8 to be sure of signedness

  ndb/src/ndbapi/NdbRecAttr.cpp@1.20.17.1, 2007-05-09 14:31:20+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    Bug #28287 Sign problem in test "ndb_restore_print"
      - corrected previous patch
      - some platforms do strange things with char... use Int8 to be sure of signedness

ChangeSet@1.1810.2925.1, 2007-05-09 17:27:14+05:00, holyfoot@mysql.com +7 -0
  Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
  Missing check for overflow added to the Item_decimal_typecast::val_decimal

  include/decimal.h@1.15.1.2, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +1 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    decimal_intg() declaration

  mysql-test/r/cast.result@1.39.1.11, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +3 -1
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    result fixed

  mysql-test/r/type_newdecimal.result@1.36.1.10, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +35 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    test result

  mysql-test/t/type_newdecimal.test@1.33.1.11, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +19 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    test case added

  sql/item_func.cc@1.270.61.1, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +23 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    now we check for possible ovreflow in Item_decimal_typecast::val_decimal

  sql/my_decimal.h@1.10.1.4, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +8 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    my_decimal_intg() implemented

  strings/decimal.c@1.65.1.13, 2007-05-09 17:27:10+05:00, holyfoot@mysql.com +8 -0
    Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
    decimal_intg() implemented

ChangeSet@1.2475.33.5, 2007-05-09 12:51:37+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #27292  	restarting a data node makes sql nodes log event buffer status every few seconds

  sql/ha_ndbcluster_binlog.cc@1.116.1.1, 2007-05-09 12:51:35+02:00, tomas@whalegate.ndb.mysql.com +11 -0
    Bug #27292  	restarting a data node makes sql nodes log event buffer status every few seconds

ChangeSet@1.1810.2905.11, 2007-05-09 14:46:11+04:00, evgen@moonbone.local +2 -0
  loaddata.result, loaddata.test:
    A test case is corrected.

  mysql-test/r/loaddata.result@1.20.1.9, 2007-05-09 14:44:52+04:00, evgen@moonbone.local +2 -2
    A test case is corrected.

  mysql-test/t/loaddata.test@1.15.1.8, 2007-05-09 14:44:36+04:00, evgen@moonbone.local +2 -2
    A test case is corrected.

ChangeSet@1.1810.2922.2, 2007-05-09 10:52:28+02:00, msvensson@pilot.blaudden +1 -0
  Bug#28193 outfile fails randomly in pushbuild
  - Change testcase to use remove_file

  mysql-test/t/outfile.test@1.15.1.2, 2007-05-09 10:52:26+02:00, msvensson@pilot.blaudden +6 -6
    Change "exec rm" to "remove_file"

ChangeSet@1.1616.3042.1, 2007-05-09 10:49:11+02:00, msvensson@pilot.blaudden +1 -0
  Bug #28193  	outfile fails randomly in pushbuild
   - Change "exec rm" to "remove_file"

  mysql-test/t/outfile.test@1.11.1.2, 2007-05-09 10:49:11+02:00, msvensson@pilot.blaudden +4 -4
    Change "exec rm" to "remove_file"

ChangeSet@1.1810.2919.5, 2007-05-09 10:22:26+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28287 Sign problem in test "ndb_restore_print"
  - some platforms do strange things with char... use Int8 to be sure of signedness

  ndb/include/ndbapi/NdbRecAttr.hpp@1.15.7.1, 2007-05-09 10:22:24+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    Bug #28287 Sign problem in test "ndb_restore_print"
    - some platforms do strange things with char... use Int8 to be sure of signedness

ChangeSet@1.2475.1.37, 2007-05-08 17:16:34-07:00, acurtis@xiphis.org +2 -0
  Bug#26241
    "Blackhole tables don't honor table locks"
    Implement neccessary shared lock structure for table locks.
    Imported test case created by Giuseppe Maxia

  storage/blackhole/ha_blackhole.cc@1.50, 2007-05-08 17:16:31-07:00, acurtis@xiphis.org +114 -10
    bug26241 - blackhole locks don't work
      Implement shared structure for table locks.
      Used row-lock code from archive.

  storage/blackhole/ha_blackhole.h@1.15, 2007-05-08 17:16:31-07:00, acurtis@xiphis.org +12 -2
    bug26241 - blackhole locks don't work
      Declare shared structure for table locks.

ChangeSet@1.2475.32.2, 2007-05-08 16:38:34-07:00, omer@linux.site +1 -0
  Added additional QA functional test suites to the test-bt section in the Makefile.am file

  Makefile.am@1.131, 2007-05-08 16:38:30-07:00, omer@linux.site +6 -0
    Added additional QA functional test suites to the test-bt section

ChangeSet@1.1810.2921.1, 2007-05-09 00:23:16+04:00, evgen@moonbone.local +3 -0
  Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
  TIMESTAMP field when no value has been provided.
  
  The LOAD DATA sets the current time in the TIMESTAMP field with
  CURRENT_TIMESTAMP default value when the field is detected as a null.
  But when the LOAD DATA command loads data from a file that doesn't contain
  enough data for all fields then the rest of fields are simply set to null
  without any check. This leads to no value being inserted to such TIMESTAMP
  field.
  
  Now the read_sep_field() and the read_fixed_length() functions set current
  time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
  when a NULL value is loaded to the field.

  mysql-test/r/loaddata.result@1.20.1.8, 2007-05-09 00:15:19+04:00, evgen@moonbone.local +19 -0
    Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
    default value for a TIMESTAMP field when no value has been provided.

  mysql-test/t/loaddata.test@1.15.1.7, 2007-05-09 00:14:47+04:00, evgen@moonbone.local +26 -0
    Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
    default value for a TIMESTAMP field when no value has been provided.

  sql/sql_load.cc@1.78.1.35, 2007-05-09 00:15:49+04:00, evgen@moonbone.local +4 -0
    Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
    TIMESTAMP field when no value has been provided.
    Now the read_sep_field() and the read_fixed_length() functions set current
    time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
    when a NULL value is loaded to the field.

ChangeSet@1.2475.30.3, 2007-05-08 22:28:24+04:00, evgen@moonbone.local +4 -0
  item_cmpfunc.cc, type_datetime.result, type_datetime.test, item_cmpfunc.h:
    After merge fix.

  mysql-test/r/type_datetime.result@1.46, 2007-05-08 22:28:08+04:00, evgen@moonbone.local +2 -2
    After merge fix.

  mysql-test/t/type_datetime.test@1.28, 2007-05-08 22:28:10+04:00, evgen@moonbone.local +1 -1
    After merge fix.

  sql/item_cmpfunc.cc@1.273, 2007-05-08 22:27:55+04:00, evgen@moonbone.local +104 -104
    After merge fix.

  sql/item_cmpfunc.h@1.162, 2007-05-08 22:28:06+04:00, evgen@moonbone.local +3 -31
    After merge fix.

ChangeSet@1.1810.2920.1, 2007-05-08 21:11:46+04:00, kaa@polly.local +4 -0
  Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype
  
  Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.

  configure.in@1.245.85.1, 2007-05-08 21:11:42+04:00, kaa@polly.local +13 -5
    Added a check to define HAVE_ISINF only if it can be used in C++ code as well.

  include/my_global.h@1.96.1.45, 2007-05-08 21:11:42+04:00, kaa@polly.local +5 -6
    Define my_isinf() as an alias to isinf(), if it is available in both C and C++ code. Otherwise, define it to a workaround implementation.

  sql/item_func.cc@1.270.60.1, 2007-05-08 21:11:42+04:00, kaa@polly.local +2 -2
    Replaced isinf() with my_isinf().

  strings/strtod.c@1.26, 2007-05-08 21:11:42+04:00, kaa@polly.local +1 -1
    Replaced isinf() with my_isinf().

ChangeSet@1.2475.33.4, 2007-05-08 19:07:36+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  correcting previous commit

  mysql-test/ndb/ndb_config_1_node.ini@1.6, 2007-05-08 19:07:33+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    correcting previous commit

  mysql-test/ndb/ndb_config_4_node.ini@1.6, 2007-05-08 19:07:33+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    correcting previous commit

ChangeSet@1.2475.33.3, 2007-05-08 19:03:33+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  increase heartbeat interval to avoid load related start up issues in mysql-test-run

  BitKeeper/etc/ignore@1.291, 2007-05-08 19:03:31+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    Added libmysqld/ha_ndbcluster_cond.cc to the ignore list

  mysql-test/ndb/ndb_config_1_node.ini@1.5, 2007-05-08 19:03:30+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    increase heartbeat interval to avoid load related start up issues in mysql-test-run

  mysql-test/ndb/ndb_config_4_node.ini@1.5, 2007-05-08 19:03:30+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    increase heartbeat interval to avoid load related start up issues in mysql-test-run

ChangeSet@1.1810.2919.4, 2007-05-08 18:30:03+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  increate hearbeat interval to avoid load related start up issues in mysql-test-run

  mysql-test/ndb/ndb_config_1_node.ini@1.1.1.1, 2007-05-08 18:30:02+02:00, tomas@whalegate.ndb.mysql.com +3 -1
    increate hearbeat interval to avoid load related start up issues in mysql-test-run

  mysql-test/ndb/ndb_config_4_node.ini@1.1.1.1, 2007-05-08 18:30:02+02:00, tomas@whalegate.ndb.mysql.com +3 -1
    increate hearbeat interval to avoid load related start up issues in mysql-test-run

  mysql-test/ndb/ndb_config_2_node.ini@1.15.1.2, 2007-05-08 18:30:02+02:00, tomas@whalegate.ndb.mysql.com +3 -1
    increate hearbeat interval to avoid load related start up issues in mysql-test-run

ChangeSet@1.1810.2871.36, 2007-05-08 09:18:51-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #23294: Detection of sem_xxx functions on NetBSD broken and \
  	DragonflyBSD misc patches
  
  Add the original intended test, since our current test for sched_yield
  is insufficient to copy.

  configure.in@1.245.1.198, 2007-05-08 09:18:49-04:00, cmiller@zippy.cornsilk.net +3 -0
    We can't check for sched_yield, as that is in libc on FBSD.
    
    Re-add the check for sem_init in librt.

ChangeSet@1.2403.18.47, 2007-05-08 14:59:57+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - bug#20535
    set null bits on delete+insert

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.50.1.7, 2007-05-08 14:59:54+02:00, jonas@perch.ndb.mysql.com +10 -0
    set null bits on delete+insert

  storage/ndb/test/ndbapi/testBasic.cpp@1.17.1.3, 2007-05-08 14:59:54+02:00, jonas@perch.ndb.mysql.com +89 -0
    set null bits on delete+insert
    20535

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.3, 2007-05-08 14:59:54+02:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.1810.2126.62, 2007-05-08 12:53:12+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27437
    redo extra verification code so that tupkeyref is reset just before tupkeyreq

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.50.1, 2007-05-08 12:53:11+02:00, jonas@perch.ndb.mysql.com +13 -4
    redo extra verification code so that tupkeyref is reset just before tupkeyreq

ChangeSet@1.2469.214.6, 2007-05-08 11:56:47+02:00, thek@adventure.(none) +2 -0
  Corrected test case for 5.1 requirements

  mysql-test/r/query_cache.result@1.86.1.2, 2007-05-08 11:56:45+02:00, thek@adventure.(none) +1 -1
    Corrected test case for 5.1 requirements

  mysql-test/t/query_cache.test@1.69, 2007-05-08 11:56:45+02:00, thek@adventure.(none) +1 -1
    Corrected test case for 5.1 requirements

ChangeSet@1.1810.2883.5, 2007-05-08 11:24:07+02:00, thek@adventure.(none) +5 -0
  4.1 -> 5.0 Manual merge for Bug #27792 

  mysql-test/r/query_cache.result@1.65.7.2, 2007-05-08 11:24:05+02:00, thek@adventure.(none) +94 -0
    Added 5.0 testcase

  mysql-test/t/query_cache.test@1.49.1.10, 2007-05-08 11:24:05+02:00, thek@adventure.(none) +72 -0
    Added 5.0 test case

  sql/mysql_priv.h@1.290.110.3, 2007-05-08 11:24:05+02:00, thek@adventure.(none) +1 -0
    Added support for div_precision_increment

  sql/set_var.cc@1.125.27.2, 2007-05-08 11:24:05+02:00, thek@adventure.(none) +5 -0
    - Added query cache flush when system variable ft_boolean_syntax is
      updated since this also invalidates all cached result sets using this
      variable.

  sql/sql_cache.cc@1.76.1.25, 2007-05-08 11:24:05+02:00, thek@adventure.(none) +14 -5
    - Added the local system variable div_precision_increment as an identification flag
      for cached queries.

ChangeSet@1.2475.1.36, 2007-05-08 11:16:41+02:00, jbruehe@mysql.com +1 -0
  Raise version number after cloning 5.1.18-beta

  configure.in@1.456.1.3, 2007-05-08 11:15:34+02:00, jbruehe@mysql.com +1 -1
    Raise version number after cloning 5.1.18-beta

ChangeSet@1.1616.3041.1, 2007-05-08 09:09:25+02:00, thek@adventure.(none) +5 -0
  Bug #27792 query cache returns wrong result, with certain system variables
   - Queries in the query cache are identified by the individual 
     characters in the query statement, the current database and 
     the current environment expressed as a set of system variable
     flags.
   - Since the set of environment flags didn't properly describe the
     current environment unexpected results were returned from the 
     query cache.
   - Query cache is now cleared when the variable ft_boolean_syntax is 
     updated.
   - An identification flag for the variable default_week_format is 
     added to the query cache record.
   
  Thanks to Martin Friebe who has supplied significant parts of this patch.

  mysql-test/r/query_cache.result@1.26.1.37, 2007-05-08 09:09:24+02:00, thek@adventure.(none) +52 -0
    Added test case

  mysql-test/t/query_cache.test@1.24.1.25, 2007-05-08 09:09:24+02:00, thek@adventure.(none) +46 -0
    Added test case

  sql/mysql_priv.h@1.186.91.62, 2007-05-08 09:09:24+02:00, thek@adventure.(none) +1 -0
    - Added missing flags to reflect the significant local environment
      settings of the cached query.

  sql/set_var.cc@1.34.52.47, 2007-05-08 09:09:24+02:00, thek@adventure.(none) +6 -2
    - Added query cache flush when system variable ft_boolean_syntax is
      updated since this also invalidates all cached result sets using this
      variable.

  sql/sql_cache.cc@1.46.14.1, 2007-05-08 09:09:24+02:00, thek@adventure.(none) +2 -0
    - Added another local system variable as an identification flag
      for cached queries.

ChangeSet@1.2475.30.1, 2007-05-08 11:42:40+05:00, holyfoot@mysql.com +1 -0
  warning eliminated

  sql/item_func.cc@1.380.3.3, 2007-05-08 11:42:38+05:00, holyfoot@mysql.com +2 -2
    warning eliminated

ChangeSet@1.1810.2126.61, 2007-05-08 07:49:05+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#27437
    bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
    this was however "normally" shadowed, but made LQH crash when LCP was about to start

  mysql-test/r/ndb_basic.result@1.28.4.1, 2007-05-08 07:49:02+02:00, jonas@perch.ndb.mysql.com +6 -0
    testcase

  mysql-test/t/ndb_basic.test@1.32.3.1, 2007-05-08 07:49:02+02:00, jonas@perch.ndb.mysql.com +15 -0
    testcase

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.19.1, 2007-05-08 07:49:02+02:00, jonas@perch.ndb.mysql.com +3 -0
    add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.48.1, 2007-05-08 07:49:03+02:00, jonas@perch.ndb.mysql.com +17 -0
    add extra variable to make sure TUPKEYREF is not received twice (VM_TRACE)

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.9.1, 2007-05-08 07:49:03+02:00, jonas@perch.ndb.mysql.com +5 -1
    make sure TUPKEYREF is not sent twice in case of "error" in interpreted program

ChangeSet@1.1810.2905.9, 2007-05-07 16:58:38-07:00, igor@olga.mysql.com +1 -0
  Adjusted results after the latest addition of test cases.

  mysql-test/r/type_datetime.result@1.30.1.11, 2007-05-07 16:58:36-07:00, igor@olga.mysql.com +6 -0
    Adjusted results after the latest addition of test cases.

ChangeSet@1.1810.2918.1, 2007-05-08 00:08:00+04:00, evgen@moonbone.local +2 -0
  Additional fix for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.

  mysql-test/t/type_datetime.test@1.18.1.9, 2007-05-08 00:01:10+04:00, evgen@moonbone.local +2 -0
    Additional test case for the bug#27759.

  sql/item_func.h@1.136.2.30, 2007-05-08 00:01:44+04:00, evgen@moonbone.local +1 -0
    Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
    Now the Item_func_min_max::result_as_longlong() returns TRUE when LEAST()
    compares DATE/DATETIME values. This allows caller to obtain correct integer
    values through the val_int() function.

ChangeSet@1.1810.2917.1, 2007-05-08 00:24:25+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #27954.
  This bug affects multi-row INSERT ... ON DUPLICATE into table
  with PRIMARY KEY of AUTO_INCREMENT field and some additional UNIQUE indices.
  If the first row in multi-row INSERT contains duplicated values of UNIQUE
  indices, then following rows of multi-row INSERT (with either duplicated or
  unique key field values) may me applied to _arbitrary_ records of table as
  updates.
  This bug was introduced in 5.0. Related code was widely rewritten in 5.1, and
  5.1 is already free of this problem. 4.1 was not affected too.
  
  When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
  restore_auto_increment(), which set next_insert_id back to 0, but we
  forgot to set clear_next_insert_id back to 0.
  restore_auto_increment() function has been fixed.

  mysql-test/r/insert_update.result@1.18.1.7, 2007-05-08 00:20:42+05:00, gshchepa@gleb.loc +22 -0
    Added test case for bug #27954.

  mysql-test/t/insert_update.test@1.20.1.5, 2007-05-08 00:20:34+05:00, gshchepa@gleb.loc +17 -0
    Added test case for bug #27954.

  sql/handler.cc@1.167.1.66, 2007-05-08 00:12:13+05:00, gshchepa@gleb.loc +7 -0
    Fixed bug #27954.
    When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
    restore_auto_increment(), which set next_insert_id back to 0, but we
    forgot to set clear_next_insert_id back to 0.
    restore_auto_increment() function has been fixed.

  sql/sql_class.h@1.230.64.1, 2007-05-08 00:10:29+05:00, gshchepa@gleb.loc +4 -0
    Fixed bug #27954.
    Added commentary for THD::clear_next_insert_id variable.

ChangeSet@1.1810.2916.1, 2007-05-07 22:20:43+04:00, evgen@moonbone.local +5 -0
  Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
  
  The IN function was comparing DATE/DATETIME values either as ints or as
  strings. Both methods have their disadvantages and may lead to a wrong
  result.
  
  Now IN function checks whether all of its arguments has the STRING result
  types and at least one of them is a DATE/DATETIME item. If so it uses either
  an object of the in_datetime class or an object of the cmp_item_datetime
  class to perform its work. If the IN() function arguments are rows then
  row columns are checked whether the DATE/DATETIME comparator should be used
  to compare them.
  The in_datetime class is used to find occurence of the item to be checked
  in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
  class is used to compare items one by one in the DATE/DATETIME context.
  Both classes obtain values from items with help of the get_datetime_value()
  function and cache the left item if it is a constant one.
  

  mysql-test/r/func_in.result@1.28.1.7, 2007-05-07 22:19:37+04:00, evgen@moonbone.local +1 -0
    A test case result is corrected after the fix for the bug#28133.

  mysql-test/r/type_datetime.result@1.30.3.1, 2007-05-07 22:19:36+04:00, evgen@moonbone.local +46 -0
    Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.

  mysql-test/t/type_datetime.test@1.18.3.1, 2007-05-07 22:19:34+04:00, evgen@moonbone.local +19 -0
    Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.

  sql/item_cmpfunc.cc@1.187.33.6, 2007-05-07 22:19:44+04:00, evgen@moonbone.local +208 -46
    Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
    Now IN function checks whether all of its arguments has the STRING result
    types and at least one of them is a DATE/DATETIME item. If so it uses either
    an object of the in_datetime class or an object of the cmp_item_datetime
    class to perform its work. If the IN() function arguments are rows then
    row columns are checked whether the DATE/DATETIME comparator should be used
    to compare them.

  sql/item_cmpfunc.h@1.122.2.28, 2007-05-07 22:19:37+04:00, evgen@moonbone.local +77 -25
    Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
    Two DATE/DATETIME comparison classes are added.
    The in_datetime class is used to find occurence of the item to be checked
    in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
    class is used to compare items one by one in the DATE/DATETIME context.
    Both classes obtain values from items with help of the get_datetime_value()
    function and cache the left item if it is a constant one.

ChangeSet@1.1810.2913.2, 2007-05-07 12:38:43-04:00, cmiller@zippy.cornsilk.net +1 -0
  Fix new error message list in v5.

  mysql-test/r/repair.result@1.18.1.6, 2007-05-07 12:38:41-04:00, cmiller@zippy.cornsilk.net +1 -1
    New error listing in v5.

ChangeSet@1.1810.2905.5, 2007-05-07 18:24:46+04:00, evgen@moonbone.local +1 -0
  item_func.cc:
    Fixed compiler warnings.

  sql/item_func.cc@1.270.59.2, 2007-05-07 18:23:46+04:00, evgen@moonbone.local +3 -3
    Fixed compiler warnings.

ChangeSet@1.2475.28.3, 2007-05-07 16:07:04+02:00, mikron@mikael-ronstr-ms-dator.local +3 -0
  Jamming

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp@1.19, 2007-05-07 16:07:00+02:00, mikron@mikael-ronstr-ms-dator.local +8 -0
    Added signal names to signal logging

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.132, 2007-05-07 16:07:00+02:00, mikron@mikael-ronstr-ms-dator.local +428 -252
    Jamming

  storage/ndb/src/kernel/blocks/lgman.cpp@1.28, 2007-05-07 16:07:00+02:00, mikron@mikael-ronstr-ms-dator.local +5 -2
    Jamming

ChangeSet@1.2403.18.44, 2007-05-07 16:02:57+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#27942
    Increase size of memory channel

  storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp@1.11, 2007-05-07 16:02:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    increase size of memchannel to prevent crashes (for DD)

ChangeSet@1.2475.28.2, 2007-05-07 15:46:29+02:00, mikron@mikael-ronstr-ms-dator.local +1 -0
  Manual merge

  sql/Makefile.am@1.185, 2007-05-07 15:46:26+02:00, mikron@mikael-ronstr-ms-dator.local +1 -1
    Manual merge

ChangeSet@1.1810.2915.2, 2007-05-07 15:33:27+02:00, mikron@mikael-ronstr-ms-dator.local +3 -0
  New SCI Transporter Build scripts

  BUILD/Makefile.am@1.10.1.3, 2007-05-07 15:33:25+02:00, mikron@mikael-ronstr-ms-dator.local +2 -0
    New SCI Transporter Build scripts

  BUILD/compile-amd64-max-sci@1.1, 2007-05-07 15:32:25+02:00, mikron@mikael-ronstr-ms-dator.local +8 -0
    New SCI Transporter Build scripts

  BUILD/compile-amd64-max-sci@1.0, 2007-05-07 15:32:25+02:00, mikron@mikael-ronstr-ms-dator.local +0 -0

  BUILD/compile-pentium64-max-sci@1.1, 2007-05-07 15:32:18+02:00, mikron@mikael-ronstr-ms-dator.local +9 -0
    New SCI Transporter Build scripts

  BUILD/compile-pentium64-max-sci@1.0, 2007-05-07 15:32:18+02:00, mikron@mikael-ronstr-ms-dator.local +0 -0

ChangeSet@1.1810.2915.1, 2007-05-07 15:25:24+02:00, mikron@mikael-ronstr-ms-dator.local +5 -0
  Fix SCI Transporter

  config/ac-macros/ha_ndbcluster.m4@1.5.1.5, 2007-05-07 15:23:45+02:00, mikron@mikael-ronstr-ms-dator.local +1 -1
    Fix SCI Transporter build part

  libmysqld/Makefile.am@1.55.1.19, 2007-05-07 15:23:45+02:00, mikron@mikael-ronstr-ms-dator.local +1 -1
    Fix SCI Transporter build part

  libmysqld/examples/Makefile.am@1.31.1.4, 2007-05-07 15:23:45+02:00, mikron@mikael-ronstr-ms-dator.local +2 -1
    Fix SCI Transporter build part

  ndb/src/common/transporter/SCI_Transporter.cpp@1.7.5.1, 2007-05-07 15:23:46+02:00, mikron@mikael-ronstr-ms-dator.local +47 -169
    Fix SCI Transporter

  ndb/src/common/transporter/SCI_Transporter.hpp@1.4.3.1, 2007-05-07 15:23:46+02:00, mikron@mikael-ronstr-ms-dator.local +3 -15
    Fix SCI Transporter

ChangeSet@1.2475.27.2, 2007-05-07 14:53:55+02:00, jonas@perch.ndb.mysql.com +1 -0
  Fix compile error with some compilers

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.66, 2007-05-07 14:53:52+02:00, jonas@perch.ndb.mysql.com +9 -7
    Fix compile error with some compilers

ChangeSet@1.2475.27.1, 2007-05-07 13:48:27+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#28276
    Fix DeleteRead in multi-operation
      Dont use setup_read, as it will (correctly) find that tuple is deleted

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.65, 2007-05-07 13:48:24+02:00, jonas@perch.ndb.mysql.com +11 -10
    Fix multi-op DeleteRead

  storage/ndb/test/ndbapi/testBasic.cpp@1.23, 2007-05-07 13:48:24+02:00, jonas@perch.ndb.mysql.com +25 -11
    Fix multi-op DeleteRead

ChangeSet@1.2475.26.1, 2007-05-07 11:50:38+02:00, msvensson@pilot.blaudden +1 -0
  Bug #28267  	Cannot build with OpenSSL
  - Fix use of uninitialized variable in config/ac-macros/ssl.m4

  config/ac-macros/ssl.m4@1.5, 2007-05-07 11:50:35+02:00, msvensson@pilot.blaudden +1 -1
    Use of uninitialized variable caused $openssl_includes to be set to -I
    when configuring mysql to compile with openSSL

ChangeSet@1.1810.2914.1, 2007-05-07 10:23:10+02:00, thek@adventure.(none) +4 -0
  Bug#26977 exception handlers never hreturn
    - In some cases, flow control optimization implemented in sp::optimize
      removes hreturn instructions, causing SQL exception handlers to:
        * never return
        * execute wrong logic
    - This patch overrides default short cut optimization on hreturn instructions
      to avoid this problem.

  mysql-test/r/sp-code.result@1.5.1.6, 2007-05-07 10:23:08+02:00, thek@adventure.(none) +113 -0
    Added test case

  mysql-test/t/sp-code.test@1.6.1.1, 2007-05-07 10:23:09+02:00, thek@adventure.(none) +75 -0
    Added test case

  sql/sp_head.cc@1.200.7.20, 2007-05-07 10:23:09+02:00, thek@adventure.(none) +13 -3
    Override opt_mark to get correct execution paths without jump short cut 
    optimization.

  sql/sp_head.h@1.79.1.19, 2007-05-07 10:23:09+02:00, thek@adventure.(none) +6 -0
    Added override sp_instr_hreturn::opt_shortcut_jump so that jump short cuts aren't
    performed on hreturn instructions operating on handlers which are set to CONTINUE
    after interruption.

ChangeSet@1.2475.7.13, 2007-05-07 11:15:59+05:00, holyfoot@mysql.com +2 -0
  bug #28005 (Partitions can't use -922337...)
  one more test added

  mysql-test/r/bigint.result@1.37, 2007-05-07 11:15:57+05:00, holyfoot@mysql.com +10 -0
    test result

  mysql-test/t/bigint.test@1.30, 2007-05-07 11:15:57+05:00, holyfoot@mysql.com +5 -0
    testcase

ChangeSet@1.2475.7.12, 2007-05-06 23:40:16+05:00, holyfoot@mysql.com +3 -0
  Bug #28005 Partitions: can't use -9223372036854775808
  the Item_neg changes INT_RESULT with DECIMAL_RESULT when
  it gets this border value, what is not necessary.

  mysql-test/r/partition.result@1.63, 2007-05-06 23:40:13+05:00, holyfoot@mysql.com +2 -0
    result added

  mysql-test/t/partition.test@1.57, 2007-05-06 23:40:13+05:00, holyfoot@mysql.com +6 -0
    testcase

  sql/item_func.cc@1.380.2.2, 2007-05-06 23:40:14+05:00, holyfoot@mysql.com +1 -1
    we can handle '==' case in ordinary way - no need to use DECIMAL_RESULT

ChangeSet@1.1616.3039.1, 2007-05-04 17:38:29-04:00, cmiller@zippy.cornsilk.net +2 -0
  Bug #27976: Misleading error message, 'Sort buffer to small'
  
  The message is gramatically wrong, and factually wrong.
  
  Change it to refer to the myisam_sort_buffer_size variable and change
  "to" to "too".

  mysql-test/r/repair.result@1.14.1.7, 2007-05-04 17:38:28-04:00, cmiller@zippy.cornsilk.net +1 -1
    Refer to the correct variable.  Message changed.

  myisam/sort.c@1.35.1.16, 2007-05-04 17:38:28-04:00, cmiller@zippy.cornsilk.net +4 -4
    Change error messages to be gramatically correct and to refer to the
    correct variable.

ChangeSet@1.2475.23.1, 2007-05-04 21:28:04+02:00, joerg@trift2. +1 -0
  win/Makefile.am  :    No trailing blank after a continuation line marker !

  win/Makefile.am@1.7, 2007-05-04 21:27:58+02:00, joerg@trift2. +1 -1
    No trailing blank after a continuation line marker !

ChangeSet@1.1616.3038.1, 2007-05-04 13:17:07-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #27173: "Enabling keys got errno ..." does not say which table
  
  Warnings may show up in the error log that complain about a table, yet
  don't tell us which table.
  
  Add the database and table names to the message.

  sql/ha_myisam.cc@1.115.1.53, 2007-05-04 13:17:06-04:00, cmiller@zippy.cornsilk.net +4 -4
    Add the database and table names to the warning message.

ChangeSet@1.2475.19.12, 2007-05-04 09:42:46+02:00, df@pippilotta.erinye.com +1 -0
  BUG#24732 manifest file was not included in VS2005 amd64 builds (5.1 tree version)

  CMakeLists.txt@1.30, 2007-05-04 09:42:44+02:00, df@pippilotta.erinye.com +5 -0
    BUG#24732 prevent VS2005 from overwriting our generated manifest

ChangeSet@1.1810.2906.7, 2007-05-04 09:37:50+02:00, df@pippilotta.erinye.com +1 -0
  BUG#24732 manifest file was not included in VS2005 amd64 builds

  CMakeLists.txt@1.1.20.1, 2007-05-04 09:37:49+02:00, df@pippilotta.erinye.com +5 -0
    BUG#24732 prevent VS2005 from overwriting our generated manifest

ChangeSet@1.1810.2871.31, 2007-05-02 12:41:36-04:00, iggy@recycle.(none) +1 -0
  Minor fix.

  scripts/CMakeLists.txt@1.3.1.1, 2007-05-02 12:41:34-04:00, iggy@recycle.(none) +12 -2
    Fix broken bk native builds.

ChangeSet@1.1810.2871.30, 2007-05-02 14:25:11+02:00, msvensson@pilot.blaudden +1 -0
  Bug#27994 Expose counter for stored procedure calls in Com_% status
   - Expose the already existing counter for number of stored procedure calls

  sql/mysqld.cc@1.439.1.170, 2007-05-02 14:25:09+02:00, msvensson@pilot.blaudden +1 -0
    Expose counter for "Com_call_procedure"

ChangeSet@1.2475.18.1, 2007-05-02 13:02:07+02:00, msvensson@pilot.blaudden +1 -0
  Add atrt.hpp to EXTRA_DIST

  storage/ndb/test/run-test/Makefile.am@1.29, 2007-05-02 13:02:04+02:00, msvensson@pilot.blaudden +1 -1
    Add atrt.hpp to EXTRA_DIST

ChangeSet@1.2403.18.43, 2007-05-01 20:48:39+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - dynarr256
    fix release iterator

  storage/ndb/src/kernel/vm/DynArr256.cpp@1.2.1.1, 2007-05-01 20:48:37+02:00, jonas@perch.ndb.mysql.com +55 -46
    fix release

  storage/ndb/src/kernel/vm/DynArr256.hpp@1.3, 2007-05-01 20:48:37+02:00, jonas@perch.ndb.mysql.com +9 -3
    fix release

ChangeSet@1.2469.214.4, 2007-04-30 15:36:29-06:00, malff@weblab.(none) +2 -0
  fix merge issues

  mysql-test/r/sp.result@1.267.2.3, 2007-04-30 15:36:25-06:00, malff@weblab.(none) +7 -0
    manual merge

  sql/sql_lex.cc@1.236.1.4, 2007-04-30 15:36:25-06:00, malff@weblab.(none) +1 -1
    merge typo

ChangeSet@1.1616.3029.6, 2007-04-28 14:37:40+05:00, svoj@mysql.com +3 -0
  BUG#27998 - mysqld crashed when executing INSERT DELAYED
              on a BLACKHOLE table
  
  Using INSERT DELAYED on BLACKHOLE tables could lead to server
  crash.
  
  This happens because delayed thread wants to upgrade a lock,
  but BLACKHOLE tables do not have locks at all.
  
  This patch rejects attempts to use INSERT DELAYED on MERGE
  tables.

  mysql-test/t/blackhole.test@1.4.6.1, 2007-04-28 14:37:39+05:00, svoj@mysql.com +9 -0
    A test case for BUG#27998.

  mysql-test/r/blackhole.result@1.2.1.3, 2007-04-28 14:37:39+05:00, svoj@mysql.com +4 -0
    A test case for BUG#27998.

  sql/ha_blackhole.h@1.3.1.3, 2007-04-28 14:37:39+05:00, svoj@mysql.com +1 -2
    Removed HA_CAN_INSERT_DELAYED flag from table_flags().
    The insert delayed thread upgrades the lock. Hence it is
    incapable to handle BLACKHOLE tables, which do not have
    locks at all.

ChangeSet@1.2469.181.10, 2007-04-28 10:32:14+08:00, Justin.He@dev3-240.dev.cn.tlan +5 -0
  Bug#19710
  revert patch because these two test cases still fail on Solaris & Power BE machines

  BitKeeper/deleted/.del-rpl_ndb_innodb2ndb.result@1.2, 2007-04-28 10:29:16+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0
    Delete: mysql-test/r/rpl_ndb_innodb2ndb.result

  BitKeeper/deleted/.del-rpl_ndb_myisam2ndb.result@1.2, 2007-04-28 10:29:09+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0
    Delete: mysql-test/r/rpl_ndb_myisam2ndb.result

  mysql-test/t/disabled.def@1.243.2.2, 2007-04-28 10:32:12+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -0
    revert patch

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt@1.5, 2007-04-28 10:32:12+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    revert patch

  mysql-test/t/rpl_ndb_myisam2ndb-slave.opt@1.5, 2007-04-28 10:32:12+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    revert patch

ChangeSet@1.1810.2883.3, 2007-04-27 17:14:25-06:00, malff@weblab.(none) +5 -0
  Bug#21513 (SP having body starting with quoted label rendered unusable)
  
  Before this fix, the parser would sometime change where a token starts by
  altering Lex_input_string::tok_start, which later confused the code in
  sql_yacc.yy that needs to capture the source code of a SQL statement,
  like to represent the body of a stored procedure.
  
  This line of code in sql_lex.cc :
  
  case MY_LEX_USER_VARIABLE_DELIMITER:
    lip->tok_start= lip->ptr; // Skip first `
  
  would <skip the first back quote> ... and cause the bug reported.
  
  In general, the responsibility of sql_lex.cc is to *find* where token are
  in the SQL text, but is *not* to make up fake or incomplete tokens.
  With a quoted label like `my_label`, the token starts on the first quote.
  Extracting the token value should not change that (it did).
  
  With this fix, the lexical analysis has been cleaned up to not change
  lip->tok_start (in the case found for this bug).
  
  The functions get_token() and get_quoted_token() now have an extra
  parameters, used when some characters from the beginning of the token need
  to be skipped when extracting a token value, like when extracting 'AB' from
  '0xAB', for example, for a HEX_NUM token.
  
  This exposed a bad assumption in Item_hex_string and Item_bin_string,
  which has been fixed:
  
  The assumption was that the string given, 'AB', was in fact preceded in
  memory by '0x', which might be false (it can be preceded by "x'" and
  followed by "'" -- or not be preceded by valid memory at all)
  
  If a name is needed for Item_hex_string or Item_bin_string, the name is
  taken from the original and true source code ('0xAB'), and assigned in
  the select_item rule, instead of relying on assumptions related to how
  memory is used.

  mysql-test/r/sp.result@1.170.28.13, 2007-04-27 17:14:22-06:00, malff@weblab.(none) +7 -0
    Lex_input_stream::tok_start must point at the real start of a token.

  mysql-test/t/sp.test@1.174.38.1, 2007-04-27 17:14:22-06:00, malff@weblab.(none) +11 -0
    Lex_input_stream::tok_start must point at the real start of a token.

  sql/item.cc@1.113.84.1, 2007-04-27 17:14:22-06:00, malff@weblab.(none) +0 -2
    Lex_input_stream::tok_start must point at the real start of a token.

  sql/sql_lex.cc@1.142.41.3, 2007-04-27 17:14:23-06:00, malff@weblab.(none) +30 -34
    Lex_input_stream::tok_start must point at the real start of a token.

  sql/sql_yacc.yy@1.371.1.145, 2007-04-27 17:14:23-06:00, malff@weblab.(none) +8 -6
    Lex_input_stream::tok_start must point at the real start of a token.

ChangeSet@1.1810.2893.1, 2007-04-27 15:33:48+02:00, msvensson@pilot.blaudden +2 -0
  Remove dangerous "remove warning" hack, cast to long
  will truncate the time value on systems where "long" are 32bit,
  instead use time_t as datatype
    

  sql/log.cc@1.158.1.52, 2007-04-27 15:33:46+02:00, msvensson@pilot.blaudden +1 -1
    Remove dangerous "remove warning" hack, cast to long
    will truncate the time value on systems where "long" are 32bit,
    instead use time_t as datatype
      

  sql/mysqld.cc@1.439.1.169, 2007-04-27 15:33:46+02:00, msvensson@pilot.blaudden +1 -1
    Remove dangerous "remove warning" hack, cast to long
    will truncate the time value on systems where "long" are 32bit,
    instead use time_t as datatype
      

ChangeSet@1.2469.214.2, 2007-04-25 21:38:12-06:00, malff@weblab.(none) +18 -0
  manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/event_data_objects.cc@1.97, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +19 -10
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/ha_ndbcluster.cc@1.438.3.1, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +1 -1
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/ha_ndbcluster_binlog.cc@1.114.2.1, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +2 -1
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/log_event.cc@1.276.1.2, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +3 -2
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/mysql_priv.h@1.497.1.4, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +4 -2
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/slave.cc@1.307, 2007-04-25 21:37:59-06:00, malff@weblab.(none) +2 -1
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sp.cc@1.147.1.2, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +7 -2
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sp_head.cc@1.268, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +6 -21
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sp_head.h@1.105, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +3 -1
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_class.h@1.357, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +11 -0
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_lex.cc@1.236.1.2, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +151 -133
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_lex.h@1.271.2.3, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +57 -14
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_parse.cc@1.659.2.2, 2007-04-25 21:38:00-06:00, malff@weblab.(none) +70 -33
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_partition.cc@1.100.1.3, 2007-04-25 21:38:01-06:00, malff@weblab.(none) +5 -1
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_prepare.cc@1.212, 2007-04-25 21:38:01-06:00, malff@weblab.(none) +6 -2
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_trigger.cc@1.91, 2007-04-25 21:38:01-06:00, malff@weblab.(none) +7 -3
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_view.cc@1.131.1.2, 2007-04-25 21:38:01-06:00, malff@weblab.(none) +7 -3
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

  sql/sql_yacc.yy@1.563.3.2, 2007-04-25 21:38:01-06:00, malff@weblab.(none) +116 -68
    manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I

ChangeSet@1.1810.2883.2, 2007-04-25 11:38:11-06:00, malff@weblab.(none) +3 -0
  code review fix

  sql/sql_lex.cc@1.142.41.2, 2007-04-25 11:38:08-06:00, malff@weblab.(none) +3 -3
    code review fix

  sql/sql_lex.h@1.175.1.69, 2007-04-25 11:38:08-06:00, malff@weblab.(none) +4 -1
    code review fix

  sql/sql_parse.cc@1.426.151.2, 2007-04-25 11:38:09-06:00, malff@weblab.(none) +5 -4
    code review fix

ChangeSet@1.2469.213.1, 2007-04-25 14:39:16+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#27207 Return correct error message when ndb_mgmd start with wrong config.ini parameter in TCP section

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.101.4.1, 2007-04-25 14:39:10+00:00, lzhou@dev3-63.(none) +29 -4
    return false when configuration is wrong in TCP section 

ChangeSet@1.2469.181.6, 2007-04-25 15:57:42+08:00, gni@dev3-221.dev.cn.tlan +2 -0
  BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.128, 2007-04-25 15:57:40+08:00, gni@dev3-221.dev.cn.tlan +2 -1
    When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.

  storage/ndb/src/ndbapi/ndberror.c@1.87.1.2, 2007-04-25 15:57:40+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error

ChangeSet@1.2469.212.1, 2007-04-25 09:56:04+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -0
  Bug#25431, Adding index to table with BLOB is not done on-line
  add a new method is_equal in class Field_blob to compare BLOB field when alter table

  sql/field.cc@1.382.5.1, 2007-04-25 09:56:01+08:00, Justin.He@dev3-240.dev.cn.tlan +25 -5
    add a method compare_str_field_flags in class Field_str
    add a method is_equal in class Field_blob to compare BLOB field when alter table

  sql/field.h@1.216.5.1, 2007-04-25 09:56:02+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -0
    add corresponding declaration of new method in class definition

ChangeSet@1.1810.2882.1, 2007-04-24 09:24:21-06:00, malff@weblab.(none) +16 -0
  Bug#25411 (trigger code truncated), PART I
  
  The issue found with bug 25411 is due to the function skip_rear_comments()
  which damages the source code while implementing a work around.
  The root cause of the problem is in the lexical analyser, which does not
  process special comments properly.
  For special comments like :
  [1] aaa /*!50000 bbb */ ccc
  since 5.0 is a version older that the current code, the parser is in lining
  the content of the special comment, so that the query to process is
  [2] aaa bbb ccc
  However, the text of the query captured when processing a stored procedure,
  stored function or trigger (or event in 5.1), can be after rebuilding it:
  [3] aaa bbb */ ccc
  which is wrong.
  
  To fix bug 25411 properly, the lexical analyser needs to return [2] when
  in lining special comments.
  In order to implement this, some preliminary cleanup is required in the code,
  which is implemented by this patch.
  
  Before this change, the structure named LEX (or st_lex) contains attributes
  that belong to lexical analysis, as well as attributes that represents the
  abstract syntax tree (AST) of a statement.
  Creating a new LEX structure for each statements (which makes sense for the
  AST part) also re-initialized the lexical analysis phase each time, which
  is conceptually wrong.
  
  With this patch, the previous st_lex structure has been split in two:
  - st_lex represents the Abstract Syntax Tree for a statement. The name "lex"
  has not been changed to avoid a bigger impact in the code base.
  - class lex_input_stream represents the internal state of the lexical
    analyser, which by definition should *not* be reinitialized when parsing
    multiple statements from the same input stream.
  
  This change is a pre-requisite for bug 25411, since the implementation of
  lex_input_stream will later improve to deal properly with special comments,
  and this processing can not be done with the current implementation of
  sp_head::reset_lex and sp_head::restore_lex, which interfere with the lexer.
  
  This change set alone does not fix bug 25411.

  sql/item_func.cc@1.270.54.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +1 -1
    Refactoring, separate lex_input_stream from st_lex.

  sql/log_event.cc@1.174.18.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +6 -3
    Refactoring, separate lex_input_stream from st_lex.

  sql/mysql_priv.h@1.290.109.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +4 -2
    Refactoring, separate lex_input_stream from st_lex.

  sql/slave.cc@1.241.20.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +2 -1
    Refactoring, separate lex_input_stream from st_lex.

  sql/sp.cc@1.82.27.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +7 -2
    Refactoring, separate lex_input_stream from st_lex.

  sql/sp_head.cc@1.200.16.2, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +9 -22
    Refactoring, separate lex_input_stream from st_lex.

  sql/sp_head.h@1.79.1.18, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +4 -2
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_class.cc@1.223.30.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +1 -1
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_class.h@1.230.63.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +10 -0
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_lex.cc@1.142.40.1, 2007-04-24 09:24:18-06:00, malff@weblab.(none) +160 -141
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_lex.h@1.175.39.1, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +55 -15
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_parse.cc@1.426.150.1, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +70 -33
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_prepare.cc@1.142.26.1, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +6 -2
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_trigger.cc@1.35.1.31, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +6 -2
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_view.cc@1.78.22.1, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +9 -5
    Refactoring, separate lex_input_stream from st_lex.

  sql/sql_yacc.yy@1.371.1.144, 2007-04-24 09:24:19-06:00, malff@weblab.(none) +108 -63
    Refactoring, separate lex_input_stream from st_lex.

ChangeSet@1.2469.206.1, 2007-04-24 09:45:15+08:00, gni@dev3-221.dev.cn.tlan +3 -0
  BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them.

  storage/ndb/tools/restore/consumer_restore.cpp@1.41.2.1, 2007-04-24 09:45:13+08:00, gni@dev3-221.dev.cn.tlan +32 -3
    1)Assign the correct array type for varchar and varbinary type when creating them in NDB kernel
    2)Replace the max length defined with the real length used for var data

  storage/ndb/tools/restore/consumer_restore.hpp@1.18, 2007-04-24 09:45:13+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    Add the "m_no_upgrade" member variable to decide if upgrading array type for var type

  storage/ndb/tools/restore/restore_main.cpp@1.53.1.1, 2007-04-24 09:45:13+08:00, gni@dev3-221.dev.cn.tlan +12 -1
    Add --no-upgrade(-u) option for ndb_restore to decide if upgrade array type for var data.
    The default is false, it should be used with --skip-table-check(-s) option when -u option is unused.

ChangeSet@1.2469.181.2, 2007-04-20 12:36:10+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#26675 remove additional varialbes definations in mysqld.cc and add NDBCLUSTER macro in set_var.cc

  sql/mysqld.cc@1.621.18.1, 2007-04-20 12:36:03+00:00, lzhou@dev3-63.(none) +1 -6
    remove additional variables defination in none-ndbcluster engines.

  sql/set_var.cc@1.224.3.2, 2007-04-20 12:36:03+00:00, lzhou@dev3-63.(none) +7 -0
    add NDBCLUSTER macro

ChangeSet@1.2469.175.1, 2007-04-16 15:15:47+08:00, gni@dev3-221.dev.cn.tlan +6 -0
  BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code 

  mysql-test/r/ndb_autodiscover.result@1.32, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    changes ndbd error code 4009 to mysqld error code 157 when no cluster connection

  sql/ha_ndbcluster.cc@1.411.1.15, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +3 -3
    define return codes to ndbcluster_table_exists_in_engine to something useful

  sql/handler.cc@1.295.6.3, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +18 -13
    define return codes to ha_table_exists_in_engine to something useful

  sql/sql_plugin.cc@1.44.3.1, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +1 -0
    Add a comment

  sql/sql_table.cc@1.393.3.4, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +17 -7
    clearly define what happens on create table if exists/not exists/not connected to engine

  storage/ndb/src/ndbapi/ndberror.c@1.87.1.1, 2007-04-16 15:15:44+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    map 4009 ndb error code to 157 mysqld error code

ChangeSet@1.2469.38.7, 2007-04-06 16:33:21+08:00, Justin.He@dev3-240.dev.cn.tlan +5 -0
  BUG#19710 Cluster replication to partition table fails on DELETE FROM statement
  update rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb testcase's option and result

  mysql-test/r/rpl_ndb_innodb2ndb.result@1.1, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +855 -0
    get the test result by 'mysql-test-run.pl --record rpl_ndb_innodb2ndb'

  mysql-test/r/rpl_ndb_innodb2ndb.result@1.0, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  mysql-test/r/rpl_ndb_myisam2ndb.result@1.1, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +855 -0
    get the test result by 'mysql-test-run.pl --record rpl_ndb_myisam2ndb'

  mysql-test/r/rpl_ndb_myisam2ndb.result@1.0, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  mysql-test/t/disabled.def@1.237.1.1, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -2
    recover test case 'rpl_ndb_innodb2ndb' and 'rpl_ndb_myisam2ndb'

  mysql-test/t/rpl_ndb_innodb2ndb-slave.opt@1.4, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"

  mysql-test/t/rpl_ndb_myisam2ndb-slave.opt@1.4, 2007-04-06 16:33:18+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"

ChangeSet@1.2469.47.2, 2007-03-23 11:52:45+01:00, istruewing@chilla.local +2 -0
  Bug#17332 - changing key_buffer_size on a running server
              can crash under load
  After review fixes

  mysys/mf_keycache.c@1.67, 2007-03-23 11:52:35+01:00, istruewing@chilla.local +86 -133
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    After review fixes

  storage/myisam/mi_preload.c@1.15, 2007-03-23 11:52:36+01:00, istruewing@chilla.local +9 -31
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    After review fixes

ChangeSet@1.1810.2652.2, 2007-03-12 18:08:35+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#26675 Add ndb_connectstring in "show global variables".

  sql/ha_ndbcluster.h@1.82.8.1, 2007-03-12 18:08:30+00:00, lzhou@dev3-63.(none) +1 -0
    Extern opt_ndb_constrbuf array from mysqld

  sql/set_var.cc@1.125.24.1, 2007-03-12 18:08:30+00:00, lzhou@dev3-63.(none) +4 -0
    Add ndb_connectstring to sys variable

ChangeSet@1.2403.11.1, 2007-01-31 18:49:07+01:00, istruewing@chilla.local +7 -0
  Bug#17332 - changing key_buffer_size on a running server
              can crash under load
  
  Resizing a key cache while it was in heavy use could crash the
  server. There were several race conditions.
  
  I reworked some of the algorithms to fix the race conditions.
  
  No test case. Repeating the crashes requires heavy concurrent
  load on the key cache. A test script is attached to the bug report.
  
  More explanations to the changes are contained in a text file
  attached to the bug report.

  include/keycache.h@1.8, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +6 -0
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Added KEY_CACHE components in_resize and waiting_for_resize_cnt.

  mysys/mf_keycache.c@1.62.1.1, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +2088 -466
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    
    Changed resize_key_cache() to not disable the key cache
    after the flush phase. Changed queue handling to use
    standard functions. Wake all threads waiting on resize_queue.
    We can now have read/write threads waiting there (see below).
    
    Combined add_to_queue() and the wait loops that were always
    following it to the new function wait_on_queue().
    Combined release_queue() and the condition that was always
    preceding it to the new function release_whole_queue().
    
    Added code to flag and respect the exceptional situation
    BLOCK_IN_EVICTION.
    
    Rewrote the resize branch of find_key_block().
    
    Added code to the eviction handling in find_key_block()
    to catch more exceptional cases.
    
    Changed key_cache_read(), key_cache_insert() and key_cache_write()
    so that they lock keycache->cache_lock whenever the key cache is
    initialized. Checking for a disabled cache and incrementing and
    decrementing the "resize counter" is always done within the lock.
    Locking and unlocking as well as counting the "resize counter" is
    now done once outside the loop. All three functions can now handle
    a NULL return from find_key_block. This happens in the flush phase
    of a resize and demands direct file I/O. Care is taken for
    secondary requests (PAGE_WAIT_TO_BE_READ) to wait in any case.
    Moved block status changes behind the copying of buffer data.
    key_cache_insert() does now read the block if the caller did
    supply less data than a full cache block.
    key_cache_write() does now take care of parallel running flushes
    (BLOCK_FOR_UPDATE, BLOCK_IN_FLUSHWRITE).
    
    Changed free_block() to un-initialize block variables in the
    correct order and respect an exceptional BLOCK_IN_EVICTION state.
    
    Changed flushing to take care for parallel running writes.
    Changed flushing to avoid freeing blocks in eviction.
    Changed flushing to consider that parallel writes can move blocks
    from the file_blocks hash to the changed_blocks hash.
    Changed flushing to take care for other parallel flushes.
    Changed flushing to assure that it ends with everything flushed.
    
    Added some comments and debugging statements. ;-)

  mysys/my_static.c@1.20, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +0 -3
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Removed an unused global variable.

  sql/handler.cc@1.290.1.1, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +2 -2
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Changed types of local variables to match their use
    for init_key_cache().

  sql/sql_table.cc@1.382.3.1, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +6 -1
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Changed TL_READ to TL_READ_NO_INSERT in mysql_preload_keys.

  storage/myisam/ha_myisam.cc@1.206.3.1, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +1 -1
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Moved an automatic (stack) variable to the scope where it is used.

  storage/myisam/mi_preload.c@1.14, 2007-01-31 18:49:03+01:00, istruewing@chilla.local +27 -0
    Bug#17332 - changing key_buffer_size on a running server
                can crash under load
    Added some preliminary code to
    - allow LOAD INDEX to load indexes of different block size,
    - align load chunks to key cache blocks.

ChangeSet@1.1810.2433.1, 2006-12-12 09:43:12-05:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#23294: Detection of sem_xxx functions on NetBSD broken and DragonflyBSD \
  	misc patches
  
  Patch from community member Juan RP.  "dragonfly" os name should be synonymous
  with netbsd and sem_* functions may also be found in librt.

  configure.in@1.245.71.6, 2006-12-12 09:43:11-05:00, cmiller@zippy.cornsilk.net +4 -2
    Detect OS name of DragonFlyBSD.
    
    Search for semaphor functions in librt also.

ChangeSet@1.2303.105.1, 2006-11-14 15:58:06+08:00, dli@dev3-76.dev.cn.tlan +2 -0
  ndb - fix for BUG#23137, ha_ndbcluster.m4 bug.
  
  Because NDB_CXXFLAGS is just used in ndb engine, moved NDB_CXXFLAGS from ha_ndbcluster.m4 to ndb/config/common.mk.am.

  config/ac-macros/ha_ndbcluster.m4@1.19.1.1, 2006-11-14 15:58:03+08:00, dli@dev3-76.dev.cn.tlan +0 -1
    removed NDB_CXXFLAGS.

  storage/ndb/config/common.mk.am@1.11, 2006-11-14 15:58:03+08:00, dli@dev3-76.dev.cn.tlan +2 -0
    Added NDB_CXXFLAGS to AM_CXXFLAGS.

