ChangeSet@1.2512, 2007-06-26 13:15:43+02:00, tsmith@maint1.mysql.com +26 -0
  Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1
  
  Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/backup.result@1.25, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/events_bugs.result@1.34, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +8 -8
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/events_trans.result@1.3, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/ndb_dd_basic.result@1.18, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +3 -3
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/ndb_dd_ddl.result@1.15, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/ndb_gis.result@1.22, 2007-06-26 13:15:01+02:00, tsmith@maint1.mysql.com +2 -2
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/ndb_row_format.result@1.4, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_extraCol_innodb.result@1.6, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +14 -14
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_extraCol_myisam.result@1.6, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +14 -14
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_incident.result@1.8, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +2 -2
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_ndb_extraCol.result@1.7, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +14 -14
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.14, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +8 -8
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.11, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +8 -8
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/rpl_sp.result@1.40, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/select.result@1.160, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/show_check.result@1.114, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/sp.result@1.279, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +4 -4
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/sp_gis.result@1.8, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +2 -2
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/sp_trans.result@1.21, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/type_timestamp.result@1.38, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +7 -7
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/warnings.result@1.59, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/r/xml.result@1.25, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +9 -9
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/t/grant.test@1.62, 2007-06-26 13:15:02+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  mysql-test/t/partition_grant.test@1.4, 2007-06-26 13:15:03+02:00, tsmith@maint1.mysql.com +2 -2
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  sql/mysql_priv.h@1.524, 2007-06-26 13:15:03+02:00, tsmith@maint1.mysql.com +1 -1
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

  sql/share/errmsg.txt@1.160, 2007-06-26 13:15:03+02:00, tsmith@maint1.mysql.com +38 -30
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1

ChangeSet@1.1810.3074.2, 2007-06-22 20:08:19+02:00, joerg@trift2. +1 -0
  Add the "nist" suite to the "test-bt" target,
  to be run only if it is available on the machine.

  Makefile.am@1.68.1.38, 2007-06-22 20:08:16+02:00, joerg@trift2. +8 -0
    Add the "nist" suite to the "test-bt" target,
    to be run only if it is available on the machine.

ChangeSet@1.2504.1.5, 2007-06-22 11:22:29+02:00, tsmith@maint1.mysql.com +1 -0
  binlog_innodb.result:
    post-merge fix

  mysql-test/r/binlog_innodb.result@1.4, 2007-06-22 11:21:14+02:00, tsmith@maint1.mysql.com +12 -12
    post-merge fix

ChangeSet@1.1810.3073.2, 2007-06-21 21:39:52-04:00, dkatz@damien-katzs-computer.local +2 -0
  Bug #29138  'kill' fails in pushbuild
  
  The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
  
  Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.

  mysql-test/r/kill.result@1.16.1.3, 2007-06-21 21:39:48-04:00, dkatz@damien-katzs-computer.local +1 -1
    We use a much longer running query that doesn't have a chance to fully complete before the reap happens.

  mysql-test/t/kill.test@1.23.1.4, 2007-06-21 21:39:48-04:00, dkatz@damien-katzs-computer.local +3 -1
    We use a much longer running query that doesn't have a chance to fully complete before the reap happens.

ChangeSet@1.2495.1.40, 2007-06-21 22:07:21+02:00, lars@mysql.com +1 -0
  Disabled new test cases that are not 100% stable yet

  mysql-test/t/disabled.def@1.266, 2007-06-21 22:07:18+02:00, lars@mysql.com +3 -0
    Disabled new test cases that are not 100% stable yet

ChangeSet@1.1810.3072.1, 2007-06-21 12:45:56-04:00, iggy@amd64.(none) +4 -0
  Bug#27029 alter table ... enable keys crashes mysqld on large table
  - When creating an index for the sort, the number of rows plus 1 is used 
  to allocate a buffer.  In this test case, the number of rows 4294967295 
  is the max value of an unsigned integer, so when 1 was added to it, a 
  buffer of size 0 was allocated causing the crash.
  - Create new test suite for this bug's test suite as per QA.

  mysql-test/suite/large_tests/README.TXT@1.1, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +13 -0
    Bug#27029 alter table ... enable keys crashes mysqld on large table
    - New testsuite for large tests.
    - Added mtr hint for potential testers.

  mysql-test/suite/large_tests/README.TXT@1.0, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +0 -0

  mysql-test/suite/large_tests/r/alter_table.result@1.1, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +37 -0
    Bug#27029 alter table ... enable keys crashes mysqld on large table
    - New testsuite for large tests.
    - Added results for bug.

  mysql-test/suite/large_tests/r/alter_table.result@1.0, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +0 -0

  mysql-test/suite/large_tests/t/alter_table.test@1.1, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +47 -0
    Bug#27029 alter table ... enable keys crashes mysqld on large table
    - New testsuite for large tests.
    - Added test for bug.

  mysql-test/suite/large_tests/t/alter_table.test@1.0, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +0 -0

  myisam/sort.c@1.45.20.1, 2007-06-21 12:45:54-04:00, iggy@amd64.(none) +3 -2
    Bug#27029 alter table ... enable keys crashes mysqld on large table
    - Check to make sure the value of records is < UINT_MAX32 to avoid a 
    false positive on the remaining condition.

ChangeSet@1.2495.1.37, 2007-06-21 17:09:19+02:00, lars@mysql.com +1 -0
  merge rpl 5.0->5.1

  mysql-test/r/rpl_grant.result@1.3, 2007-06-21 17:09:16+02:00, lars@mysql.com +7 -2
    merge rpl 5.0->5.1

ChangeSet@1.1810.2871.55, 2007-06-21 16:55:52+02:00, lars@mysql.com +2 -0
  Test fix

  mysql-test/r/rpl_grant.result@1.2, 2007-06-21 16:55:48+02:00, lars@mysql.com +16 -16
    Test fix

  mysql-test/t/rpl_grant.test@1.2, 2007-06-21 16:55:49+02:00, lars@mysql.com +8 -4
    Test fix

ChangeSet@1.1810.3064.9, 2007-06-21 16:37:13+02:00, msvensson@pilot.(none) +1 -0
  Add name of test that generated the warning to "warnings" file

  mysql-test/lib/mtr_report.pl@1.21.3.2, 2007-06-21 16:37:12+02:00, msvensson@pilot.(none) +6 -1
    Add name of test that generated the warning to "warnings" file

ChangeSet@1.2495.1.35, 2007-06-21 14:39:40+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Test case fix to replication team tree.

  mysql-test/extra/rpl_tests/rpl_deadlock.test@1.22, 2007-06-21 14:39:33+02:00, mats@kindahl-laptop.dnsalias.net +15 -3
    Restoring old test code, but masking out offending columns

  mysql-test/r/rpl_deadlock_innodb.result@1.23, 2007-06-21 14:39:33+02:00, mats@kindahl-laptop.dnsalias.net +16 -16
    Result change

ChangeSet@1.2495.14.2, 2007-06-21 09:31:19+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing result mismatch in rpl_deadlock_innodb result file.

  mysql-test/extra/rpl_tests/rpl_deadlock.test@1.21, 2007-06-21 09:31:15+02:00, mats@kindahl-laptop.dnsalias.net +3 -15
    Using include/show_slave_status.inc to get correct masking of columns.

  mysql-test/r/rpl_deadlock_innodb.result@1.22, 2007-06-21 09:31:15+02:00, mats@kindahl-laptop.dnsalias.net +20 -20
    result change

ChangeSet@1.1810.3070.2, 2007-06-21 08:58:39+02:00, df@pippilotta.erinye.com +1 -0
  Steal part of fix for bug#25621 from monty for 5.0.44.

  libmysql/libmysql.c@1.233.1.24, 2007-06-21 08:58:36+02:00, df@pippilotta.erinye.com +15 -0
    mysql_server_end() can be called multiple times.

ChangeSet@1.1810.3064.6, 2007-06-21 04:30:10+02:00, tnurnberg@sin.intern.azundris.com +2 -0
  Bug#24924: shared-memory-base-name that is too long causes buffer overflow
  
  long shared-memory-base-names could overflow a static internal buffer
  and thus crash mysqld and various clients.  change both to dynamic
  buffers, show everything but overflowing those buffers still works.
  
  The test case for this would pretty much amount to
  mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
  mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
  
  Unfortunately, we can't just use an .opt file for the
  server. The .opt file is used at start-up, before any
  include in the actual test can tell mysqltest to skip
  this one on non-Windows. As a result, such a test would
  break on unices.
  
  Fixing mysql-test-run.pl to export full path for master
  and slave would enable us to start a server from within
  the test which is ugly and, what's more, doesn't work as
  the server blocks (mysqltest offers no fire-and-forget
  fork-and-exec), and mysqladmin never gets run.
  
  Making the test rpl_windows_shm or some such so we can
  is beyond ugly. As is introducing another file-name based
  special case (run "win*.test" only when on Windows). As is
  (yuck) coding half the test into mtr (as in, having it
  hand out a customized environment conductive to the shm-
  thing on Win only).
  
  Situation is exacerbated by the fact that .sh is not
  necessary run as expected on Win.
  
  In short, it's just not worth it. No test-case until we
  have a new-and-improved test framework.

  sql-common/client.c@1.83.1.32, 2007-06-21 04:30:08+02:00, tnurnberg@sin.intern.azundris.com +9 -1
    Bug#24924: shared-memory-base-name that is too long causes buffer overflow
    
    compose shared memory name in dynamic rather than static buffer to prevent
    overflows (clients)

  sql/mysqld.cc@1.439.1.178, 2007-06-21 04:30:08+02:00, tnurnberg@sin.intern.azundris.com +10 -1
    Bug#24924: shared-memory-base-name that is too long causes buffer overflow
    
    compose shared memory name in dynamic rather than static buffer to prevent
    overflows (server)

ChangeSet@1.2495.13.8, 2007-06-20 19:14:59+04:00, kostja@bodhi.(none) +1 -0
  Enable the disabled test case for Bug#28075 (pushbuild by now
  should be fixed).

  tests/mysql_client_test.c@1.245, 2007-06-20 19:14:56+04:00, kostja@bodhi.(none) +0 -4
    Enable the disabled test case for Bug#28075 (pushbuild by now
    should be fixed).

ChangeSet@1.1810.3071.1, 2007-06-20 14:24:31+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#29030 (DROP USER command that errors still gets written to binary log
  and replicated):
  
  A DROP USER statement with a non-existing user was correctly written to
  the binary log (there might be users that were removed, but not all),
  but the error code was not set, which caused the slave to stop with an
  error.
  
  The error reporting code was moved to before the statement was logged
  to ensure that the error information for the thread was correctly set
  up. This works since my_error() will set the fields net.last_errno and
  net.last_error for the thread that is reporting the error, and this
  will then be picked up when the Query_log_event is created and written
  to the binary log.

  mysql-test/r/rpl_grant.result@1.1, 2007-06-20 14:24:28+02:00, mats@kindahl-laptop.dnsalias.net +77 -0
    New BitKeeper file ``mysql-test/r/rpl_grant.result''

  mysql-test/r/rpl_grant.result@1.0, 2007-06-20 14:24:28+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_grant.test@1.1, 2007-06-20 14:24:28+02:00, mats@kindahl-laptop.dnsalias.net +38 -0
    New BitKeeper file ``mysql-test/t/rpl_grant.test''

  mysql-test/t/rpl_grant.test@1.0, 2007-06-20 14:24:28+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/sql_acl.cc@1.128.1.94, 2007-06-20 14:24:27+02:00, mats@kindahl-laptop.dnsalias.net +6 -2
    Moving error reporting code to ensure that thd->net.last_err{or,no} is
    set and adding debug printout.

ChangeSet@1.2495.13.6, 2007-06-20 16:05:57+04:00, kostja@bodhi.(none) +1 -0
  Disable randomly failing tests:
  rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
  warning in pushbuild
  rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
  ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
  pushbuild

  mysql-test/t/disabled.def@1.262.1.2, 2007-06-20 16:05:55+04:00, kostja@bodhi.(none) +3 -0
    Disable randomly failing tests rpl_udf, rpl_ndb_circular, 
    ndb_dd_sql_features

ChangeSet@1.1810.3070.1, 2007-06-20 14:00:28+02:00, kent@mysql.com +4 -0
  configure.in:
    Added --with-system-type=<systype> and --with-machine-type=<machtype>
    options, to be able to override the one detected, for --version strings
  field.cc, field.h, listener.cc:
    C++ compatibility change for IBM VisualAge 6 and i5/OS

  configure.in@1.245.98.1, 2007-06-20 13:57:47+02:00, kent@mysql.com +12 -4
    Added --with-system-type=<systype> and --with-machine-type=<machtype>
    options, to be able to override the one detected, for --version strings

  server-tools/instance-manager/listener.cc@1.24.1.7, 2007-06-20 13:59:59+02:00, kent@mysql.com +3 -1
    C++ compatibility change for IBM VisualAge 6 and i5/OS

  sql/field.cc@1.256.56.2, 2007-06-20 13:59:59+02:00, kent@mysql.com +1 -0
    C++ compatibility change for IBM VisualAge 6 and i5/OS

  sql/field.h@1.153.27.6, 2007-06-20 13:59:59+02:00, kent@mysql.com +1 -1
    C++ compatibility change for IBM VisualAge 6 and i5/OS

ChangeSet@1.1810.2871.53, 2007-06-20 13:21:16+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  Bug #27583 slave sql fails to read from iocache when slave got stopped at pos==4
  
  forgotten merge with 5.0. There can be some bugs waiting for this fix in 5.0 like Bug@29232

  sql/log_event.cc@1.174.1.60, 2007-06-20 13:21:14+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -0
    file name is changed in step with the position.

ChangeSet@1.2495.13.5, 2007-06-20 14:04:53+04:00, kostja@bodhi.(none) +1 -0
  Fix a typo.

  mysql-test/t/query_cache.test@1.72, 2007-06-20 14:04:51+04:00, kostja@bodhi.(none) +1 -1
    Fix a typo.

ChangeSet@1.1810.3069.1, 2007-06-20 11:47:55+02:00, msvensson@pilot.(none) +3 -0
  Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step
   - Improve shutdown algorithm 
   - Wait up to 5 seconds for processes to exit after their port is free

  mysql-test/lib/mtr_process.pl@1.25.2.30, 2007-06-20 11:47:54+02:00, msvensson@pilot.(none) +81 -88
    Improve shutdown algorithm, shutdown the server hard
    if it hasn't responded to "mysqladmin shutdown" and it's port is free.
    Print error to servers error log indicating "hard shutdown"
    Give processes up to 5 seconds to exit after their port is free

  mysql-test/lib/mtr_report.pl@1.21.3.1, 2007-06-20 11:47:54+02:00, msvensson@pilot.(none) +1 -1
    Indicate in what file the warning was found

  mysql-test/mysql-test-run.pl@1.30.88.3, 2007-06-20 11:47:54+02:00, msvensson@pilot.(none) +3 -0
    Pass path of process error log to 'mtr_check_stop_servers'

ChangeSet@1.2495.14.1, 2007-06-20 11:38:51+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Adding missing DROP TABLE statement to ndb_backup_print.test since it
  causes later tests to fail.

  mysql-test/r/ndb_backup_print.result@1.3, 2007-06-20 11:37:47+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result change.

  mysql-test/t/ndb_backup_print.test@1.3, 2007-06-20 11:38:47+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Adding missing drop table at the end of the test.

ChangeSet@1.2403.18.68, 2007-06-20 05:41:54+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29229 memory corruption in dbtup

  storage/ndb/src/kernel/vm/RWPool.cpp@1.5, 2007-06-20 05:41:52+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29229 memory corruption in dbtup

ChangeSet@1.2495.1.29, 2007-06-19 22:18:16+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Some test case fixes.

  mysql-test/r/binlog_multi_engine.result@1.5, 2007-06-19 22:18:09+02:00, mats@kindahl-laptop.dnsalias.net +40 -24
    Result change

  mysql-test/t/binlog_multi_engine.test@1.5, 2007-06-19 22:18:09+02:00, mats@kindahl-laptop.dnsalias.net +22 -5
    Fixing test case. Keeping some bad statements in the test since I don't
    want to disable the entire test. Have marked the offending statement
    so that they can easily be found.

ChangeSet@1.2495.13.4, 2007-06-19 18:04:42+04:00, kostja@bodhi.(none) +1 -0
  Fix a merge mistake.

  mysql-test/r/query_cache.result@1.92, 2007-06-19 18:04:40+04:00, kostja@bodhi.(none) +6 -6
    Fix a merge mistake.

ChangeSet@1.1810.2974.15, 2007-06-19 13:56:02+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

  sql/ha_ndbcluster_cond.h@1.2.1.2, 2007-06-19 13:56:00+02:00, tomas@whalegate.ndb.mysql.com +1 -5
    Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

ChangeSet@1.2495.10.5, 2007-06-19 16:06:11+05:00, ramil@mysql.com +6 -0
  Fix for bug #28772: rpl_row_until fails in pushbuild
  
  Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
  which is buggy, wasteful of time, platform dependant etc.
  Fix: use include/wait_for_slave_***.inc's where it's possible instead.

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.2, 2007-06-19 16:06:09+05:00, ramil@mysql.com +1 -1
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - changed to use query_vertical so that it is easier to read the output.

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.2, 2007-06-19 16:06:09+05:00, ramil@mysql.com +3 -3
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - changed to use query_vertical so that it is easier to read the output.

  mysql-test/include/wait_for_slave_to_start.inc@1.2, 2007-06-19 16:06:09+05:00, ramil@mysql.com +1 -1
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - changed to use query_vertical so that it is easier to read the output.

  mysql-test/include/wait_for_slave_to_stop.inc@1.2, 2007-06-19 16:06:10+05:00, ramil@mysql.com +1 -1
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - changed to use query_vertical so that it is easier to read the output.

  mysql-test/t/rpl_row_until.test@1.3.1.1, 2007-06-19 16:06:10+05:00, ramil@mysql.com +4 -8
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
        include/wait_for_slave_sql_to_stop.inc to be more predictable.

  mysql-test/t/rpl_stm_until.test@1.25.1.1, 2007-06-19 16:06:10+05:00, ramil@mysql.com +4 -8
    Fix for bug #28772: rpl_row_until fails in pushbuild
      - 'sleep 2; wait_for_slave_to_stop;' replaced with sourcing
        include/wait_for_slave_sql_to_stop.inc to be more predictable.

ChangeSet@1.1810.2974.14, 2007-06-19 12:14:02+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

  sql/ha_ndbcluster_cond.h@1.2.1.1, 2007-06-19 12:14:00+02:00, tomas@whalegate.ndb.mysql.com +18 -2
    Bug #29185 Large IN list crashes mysqld with cluster and condition pushdown

ChangeSet@1.1810.3067.1, 2007-06-19 12:03:10+02:00, df@pippilotta.erinye.com +1 -0
  try again.

  configure.in@1.245.96.1, 2007-06-18 07:55:01+02:00, df@pippilotta.erinye.com +2 -2
    Raise version number after cloning 5.0.44

ChangeSet@1.2482.8.33, 2007-06-19 11:38:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  corrected typo

  mysql-test/include/ndb_not_readonly.inc@1.5, 2007-06-19 11:38:04+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    corrected typo

ChangeSet@1.2495.11.2, 2007-06-19 11:31:25+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  WL#3303
  - get the ndb flags right, so that the behaviour is as before

  sql/ha_ndbcluster.cc@1.461, 2007-06-19 11:31:23+02:00, tomas@whalegate.ndb.mysql.com +15 -2
    WL#3303
    - get the ndb flags right, so that the behaviour is as before

ChangeSet@1.2482.8.32, 2007-06-19 11:25:19+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  turn off binlogging of the updates during wait for not_readonly

  mysql-test/include/ndb_not_readonly.inc@1.4, 2007-06-19 11:25:16+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    turn off binlogging of the updates during wait for not_readonly

ChangeSet@1.2495.1.26, 2007-06-19 11:09:22+02:00, mats@kindahl-laptop.dnsalias.net +7 -0
  Fixes to tests and test results.

  mysql-test/r/binlog_unsafe.result@1.3, 2007-06-19 11:09:16+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_loaddata_fatal.result@1.4, 2007-06-19 11:09:16+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_udf.result@1.6, 2007-06-19 11:09:16+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Result change

  mysql-test/t/binlog_innodb.test@1.2, 2007-06-19 11:09:16+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Test requires binary log

  mysql-test/t/binlog_unsafe.test@1.3, 2007-06-19 11:09:17+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Test requires binary log

  mysql-test/t/multi_update.test@1.55, 2007-06-19 11:09:17+02:00, mats@kindahl-laptop.dnsalias.net +4 -3
    Test requires binary log.
    Error changed for a statement.

  mysql-test/t/rpl_row_basic_11bugs.test@1.17, 2007-06-19 11:09:17+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Error changed for a statement.

ChangeSet@1.1616.3058.2, 2007-06-19 11:06:02+02:00, msvensson@pilot.(none) +2 -0
  WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file>
   - Add test case for this already existing feature 

  mysql-test/r/mysqltest.result@1.3.1.26, 2007-06-19 11:06:02+02:00, msvensson@pilot.(none) +1 -0
    Update result file

  mysql-test/t/mysqltest.test@1.3.1.31, 2007-06-19 11:06:02+02:00, msvensson@pilot.(none) +4 -0
    Add test case for this feature

ChangeSet@1.1810.3049.2, 2007-06-19 09:56:19+02:00, msvensson@pilot.(none) +4 -0
  Bug#28769 Test case "innodb" fails with --skip-log-bin
   - Move binlog related tests to binlog_innodb.test
   - Remove "source include/have_log_bin.inc" from innodb.test

  mysql-test/r/binlog_innodb.result@1.1, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +23 -0
    Move binlog related tests to binlog_innodb.test

  mysql-test/r/binlog_innodb.result@1.0, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/binlog_innodb.test@1.1, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +39 -0
    Move binlog related tests to binlog_innodb.test

  mysql-test/t/binlog_innodb.test@1.0, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/r/innodb.result@1.145.7.1, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +2 -25
    Move binlog related tests to binlog_innodb.test

  mysql-test/t/innodb.test@1.118.8.2, 2007-06-19 09:56:18+02:00, msvensson@pilot.(none) +0 -35
    Move binlog related tests to binlog_innodb.test

ChangeSet@1.2495.10.4, 2007-06-18 21:11:10-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #28921  	Queries containg UDF functions are cached
  
  Additional edits to the 5.0 ChangeSet|1.2519 that are necessary for the fix to work with the new code structure in 5.1.

  sql/item_create.cc@1.80.1.3, 2007-06-18 21:11:07-04:00, dkatz@damien-katzs-computer.local +1 -0
    Added line to prevent a query that contains a UDF from being cached. In 5.0 this was handled in sql_yacc.cc but now the the individual Create_func builders will be responsible for clearing the flag.

ChangeSet@1.1810.3064.3, 2007-06-18 17:55:12-04:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #28921  Queries containing UDF functions are cached
  
  Fixed runtime to no longer allow the caching of queries with UDF calls.

  mysql-test/r/udf.result@1.3.1.10, 2007-06-18 17:55:07-04:00, dkatz@damien-katzs-computer.local +23 -0
    Added a test that turns on caching and checks that querys calling UDFs don't get cached.

  mysql-test/t/udf.test@1.8.1.5, 2007-06-18 17:55:07-04:00, dkatz@damien-katzs-computer.local +24 -0
    Added a test that turns on caching and checks that querys calling UDFs don't get cached.

  sql/sql_yacc.yy@1.371.1.153, 2007-06-18 17:55:08-04:00, dkatz@damien-katzs-computer.local +2 -2
    Fixed code to set safe_to_cache_query=0 regardless if the function call is a UDF or SP. Where it was placed previously -- at the very end of the else testing for UDFs -- it only executed the statement if the function call was a stored procedure call.

ChangeSet@1.1810.3065.1, 2007-06-18 17:16:20-04:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #29053  	SQL_CACHE in UNION causes non-deterministic functions to be cached
  
  Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug. 

  mysql-test/r/query_cache.result@1.65.1.17, 2007-06-18 17:16:16-04:00, dkatz@damien-katzs-computer.local +52 -1
    Added non-bug specific tests that ensure that only SQL_CACHE in the first SELECT is respected when encountered by the parser. These tests validate what is already documented, that only the outer most SELECTS can use the SQL_CACHE option to turn on caching. Because it would break existing SQL applications, we do not return an error if the SQL_CACHE expression is found in nested SELECTs. Also added test to validate nested SELECT can contain SQL_NO_CACHE and it will always turn off caching for the whole query. 
    
    Also added a bug specific test case to validate that the buggy behavior as reported has been fixed.

  mysql-test/t/query_cache.test@1.49.1.12, 2007-06-18 17:16:16-04:00, dkatz@damien-katzs-computer.local +34 -0
    Added non-bug specific tests that ensure that only SQL_CACHE in the first SELECT is respected when encountered by the parser. These tests validate what is already documented, that only the outer most SELECTS can use the SQL_CACHE option to turn on caching. Because it would break existing SQL applications, we do not return an error if the SQL_CACHE expression is found in nested SELECTs. Also added test to validate nested SELECT can contain SQL_NO_CACHE and it will always turn off caching for the whole query. 
    
    Also added a bug specific test case to validate that the buggy behavior as reported has been fixed.

  sql/sql_yacc.yy@1.371.112.1, 2007-06-18 17:16:16-04:00, dkatz@damien-katzs-computer.local +6 -2
    Added an explicit check to make sure "SELECT SQL_CACHE" only works on the first select in a query.
    
    The parser will always hit the outermost SELECT first, and if the SQL_CACHE option is found it sets the safe_to_query flag in the lex. Then, if there are subseqent "uncachable" subqueries or functions, as it parses those elements it sets the safe_to_query to 0. However, this cause problems if nested SELECTs also used the SQL_CACHE option, because then it would set back safe_to_query to 1, even though there are uncacheable expressions previously parsed.
    
    By adding the check to ensure only the first SELECT can turn caching on, it means a subsequent SQL_CACHE option can't turn caching back on after a uncacheable subsequery was already encountered.

ChangeSet@1.1616.3061.5, 2007-06-18 20:13:33+02:00, df@pippilotta.erinye.com +1 -0
  don't use bk cset in commit e-mails

  BitKeeper/triggers/post-commit@1.22.1.16, 2007-06-18 20:13:30+02:00, df@pippilotta.erinye.com +2 -2
    don't use bk cset in commit e-mails

ChangeSet@1.2495.4.4, 2007-06-18 22:22:31+05:00, ramil@mysql.com +3 -0
  Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
  
  FLUSH LOGS should ignore SET GLOBAL READ_ONLY.

  sql/lock.cc@1.108.1.2, 2007-06-18 22:22:29+05:00, ramil@mysql.com +6 -5
    Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - ignore SET GLOBAL READ_ONLY if MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY is set.

  sql/mysql_priv.h@1.516.3.2, 2007-06-18 22:22:29+05:00, ramil@mysql.com +1 -0
    Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - MYSQL_LOCK_IGNORE_GLOBAL_READ_ONLY added.

  sql/sql_base.cc@1.408.1.2, 2007-06-18 22:22:29+05:00, ramil@mysql.com +3 -2
    Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - ignore SET GLOBAL READ_ONLY as well if called form a logger.

ChangeSet@1.2482.8.30, 2007-06-18 17:57:16+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  check for different error message

  mysql-test/include/ndb_not_readonly.inc@1.3, 2007-06-18 17:57:14+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    check for different error message

ChangeSet@1.2475.80.1, 2007-06-18 17:46:29+02:00, thek@adventure.(none) +3 -0
  Bug#28211 RENAME DATABASE and query cache don't play nicely together
  When all table blocks were removed from the query cache the client session
  hung in a tight loop waiting on an impossible condition while consuming a lot
  of CPU.
  
  This patch also corrects an error which caused valid tables to sometimes be
  removed from the query cache.

  mysql-test/r/query_cache.result@1.89.1.1, 2007-06-18 17:46:27+02:00, thek@adventure.(none) +48 -0
    Added test case to make sure server doesn't hang in a tight loop if last
    table block is removed from the cache.

  mysql-test/t/query_cache.test@1.69.1.1, 2007-06-18 17:46:27+02:00, thek@adventure.(none) +45 -0
    Added test case to make sure server doesn't hang in a tight loop if last
    table block is removed from the cache.

  sql/sql_cache.cc@1.109.2.1, 2007-06-18 17:46:27+02:00, thek@adventure.(none) +52 -27
    - Refactored loop over table blocks. The invalidate_table() function effects
      the elements over which we iterate. The previous stop condition was broken
      due to a compiler optimization error probably caused by the goto-statement
      pointing out of the loop. The effect being that tables_blocks was never
      checked for null values and thus the loop never terminated.
    - The new implementation uses two while loops instead of a goto-statement.
      The tables_blocks is a circular list which becomes null if the last table
      block is removed from the list.

ChangeSet@1.2403.18.67, 2007-06-18 16:03:41+02:00, pekka@clam.ndb.mysql.com +1 -0
  ndb - bug#29176 missing stack pruning in drop_page

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.6, 2007-06-18 16:02:23+02:00, pekka@clam.ndb.mysql.com +18 -0
    missing stack pruning in drop_page

ChangeSet@1.2482.8.29, 2007-06-18 15:41:02+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correction

  sql/ha_ndbcluster_binlog.cc@1.118.1.3, 2007-06-18 15:41:00+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    correction

ChangeSet@1.2482.8.28, 2007-06-18 15:38:37+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28989 hpux11 ps_row warnings
  - also remove printout for error 4009

  sql/ha_ndbcluster_binlog.cc@1.118.1.2, 2007-06-18 15:38:35+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #28989 hpux11 ps_row warnings
    - also remove printout for error 4009

ChangeSet@1.2482.8.27, 2007-06-18 15:36:10+02:00, tomas@whalegate.ndb.mysql.com +80 -0
  fixes Bug #25305 (and several other similar test tailures with the same symptom)
  - make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_commit_after_flush.test@1.2, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_delete_no_where.test@1.2, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_insert_ignore.test@1.2, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_log.test@1.45.1.1, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_multi_update2.test@1.2, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_multi_update3.test@1.4, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_relayrotate.test@1.3, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_001.test@1.4, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -3
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_UUID.test@1.6, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.5.1.1, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -3
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_blob.test@1.8, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_charset.test@1.7, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_func003.test@1.5, 2007-06-18 15:36:05+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_sp003.test@1.4, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    make tests wait until ndb connects properly

  mysql-test/extra/rpl_tests/rpl_row_sp006.test@1.5, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    make tests wait until ndb connects properly

  mysql-test/include/have_multi_ndb.inc@1.5.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -4
    make tests wait until ndb connects properly

  mysql-test/include/have_ndb.inc@1.16.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -4
    make tests wait until ndb connects properly

  mysql-test/include/ndb_master-slave.inc@1.1, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +12 -0
    New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''

  mysql-test/include/ndb_master-slave.inc@1.0, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/include/ndb_not_readonly.inc@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +20 -24
    make tests wait until ndb connects properly

  mysql-test/t/rpl_commit_after_flush.test@1.11, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_delete_no_where.test@1.4, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_insert_ignore.test@1.7, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_multi_update2.test@1.9, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_multi_update3.test@1.9, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_2innodb.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_2myisam.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_UUID.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_auto_inc.test@1.5, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_bank.test@1.9.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_basic.test@1.10.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_blob.test@1.5, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_blob2.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_charset.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_circular.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_circular_simplex.test@1.5, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_commit_afterflush.test@1.3.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_dd_advance.test@1.12, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_dd_basic.test@1.7, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_dd_partitions.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_ddl.test@1.3.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_delete_nowhere.test@1.4, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_do_db.test@1.3, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_do_table.test@1.3.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_extraCol.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_func003.test@1.3, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_idempotent.test@1.6.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_innodb2ndb.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +2 -4
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_innodb_trans.test@1.1.1.1, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_insert_ignore.test@1.4, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_load.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_log.test@1.2, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_multi.test@1.5, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_multi_update2.test@1.3, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_multi_update3.test@1.3, 2007-06-18 15:36:06+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_myisam2ndb.test@1.2, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -4
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_relayrotate.test@1.2, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_rep_ignore.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_row_001.test@1.2, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_sp003.test@1.2, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_sp006.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_stm_innodb.test@1.1.1.1, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_sync.test@1.11.1.1, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndb_trig004.test@1.2, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_ndbapi_multi.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

  mysql-test/t/rpl_relayrotate.test@1.20, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_001.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_UUID.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_basic_2myisam.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_basic_3innodb.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_basic_7ndb.test@1.4, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_blob_innodb.test@1.4, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_blob_myisam.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_charset.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_func003.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_log.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_log_innodb.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_sp003.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_row_sp006_InnoDB.test@1.3, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_stm_log.test@1.4, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    make tests wait until ndb connects properly

  mysql-test/t/rpl_truncate_7ndb.test@1.8, 2007-06-18 15:36:07+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make tests wait until ndb connects properly

ChangeSet@1.2482.78.14, 2007-06-18 11:29:32+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixes to make team-tree green.

  mysql-test/r/binlog_multi_engine.result@1.4, 2007-06-18 11:29:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -14
    Result change

  mysql-test/t/binlog_multi_engine.test@1.4, 2007-06-18 11:29:28+02:00, mats@kindahl-laptop.dnsalias.net +14 -2
    Commenting out statements that generate non-deterministic results.

ChangeSet@1.2482.100.1, 2007-06-18 07:48:59+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#29167
    Fix case where all node in node group dies before they saved sysfile (wrt gcp)
    and Qmgr incorrectly thinks that "node group is missing"

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.40, 2007-06-18 07:48:55+02:00, jonas@perch.ndb.mysql.com +3 -1
    code

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.124, 2007-06-18 07:48:55+02:00, jonas@perch.ndb.mysql.com +13 -0
    fix

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.14, 2007-06-18 07:48:56+02:00, jonas@perch.ndb.mysql.com +48 -0
    test

  storage/ndb/test/run-test/daily-basic-tests.txt@1.92.2.1, 2007-06-18 07:48:56+02:00, jonas@perch.ndb.mysql.com +4 -0
    test

ChangeSet@1.1810.2974.13, 2007-06-17 22:04:01+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  correct test and result

  mysql-test/r/ndb_restore.result@1.4.1.5, 2007-06-17 22:03:59+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct test and result

  mysql-test/t/ndb_restore.test@1.9.1.5, 2007-06-17 22:03:59+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct test and result

ChangeSet@1.2482.8.23, 2007-06-17 19:47:20+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #28989 hpux11 ps_row warnings
  - do not print 701 dictionary busy error

  sql/ha_ndbcluster.cc@1.457.1.1, 2007-06-17 19:47:17+02:00, tomas@whalegate.ndb.mysql.com +53 -10
    save the ndb error such that it can be traced

  sql/ha_ndbcluster.h@1.180.1.1, 2007-06-17 19:47:17+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    save the ndb error such that it can be traced

  sql/ha_ndbcluster_binlog.cc@1.118.1.1, 2007-06-17 19:47:17+02:00, tomas@whalegate.ndb.mysql.com +39 -12
    use the traced ndb error to determine if it is an error that should be printed

ChangeSet@1.1810.3057.3, 2007-06-17 19:27:20+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  BUG#27640
  - correct test and result file

  mysql-test/r/ndb_restore.result@1.4.1.4, 2007-06-17 19:27:18+02:00, tomas@whalegate.ndb.mysql.com +7 -0
    BUG#27640
    - correct test and result file

  mysql-test/t/ndb_restore.test@1.9.1.4, 2007-06-17 19:27:18+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    BUG#27640
    - correct test and result file

ChangeSet@1.2495.4.2, 2007-06-17 10:07:58+05:00, ramil@mysql.com +3 -0
  after-merge fix.

  mysql-test/r/rpl_log_pos.result@1.49.1.2, 2007-06-17 10:07:56+05:00, ramil@mysql.com +69 -16
    after-merge fix.

  mysql-test/r/rpl_ssl.result@1.8.1.2, 2007-06-17 10:07:56+05:00, ramil@mysql.com +1 -0
    after-merge fix.

  mysql-test/t/rpl_log_pos.test@1.39.1.2, 2007-06-17 10:07:56+05:00, ramil@mysql.com +1 -1
    after-merge fix.

ChangeSet@1.2495.5.1, 2007-06-17 09:56:33+05:00, ramil@mysql.com +5 -0
  Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
  
  The log tables are by nature PERFORMANCE_SCHEMA tables,
  which should not be affected by SET GLOBAL READ_ONLY or FLUSH TABLES
  WITH READ LOCK.
  
  The implementation of FLUSH TABLES WITH READ LOCK already ignored log tables.
  Now with this patch, the implementation of LOCK TABLE also ignore a
  global read lock for log tables, which was the missing symmetry.

  mysql-test/r/flush.result@1.17, 2007-06-17 09:56:31+05:00, ramil@mysql.com +16 -0
    Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - test result.

  mysql-test/t/flush.test@1.24, 2007-06-17 09:56:31+05:00, ramil@mysql.com +25 -1
    Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - test case.

  sql/lock.cc@1.108.1.1, 2007-06-17 09:56:31+05:00, ramil@mysql.com +1 -3
    Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - logger.is_privileged_thread() used.

  sql/log.h@1.26, 2007-06-17 09:56:31+05:00, ramil@mysql.com +6 -0
    Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - LOGGER::is_privileged_thread() introduced that returns TRUE if a given thread 
        is either a general_log or a slow_log or a privileged thread.

  sql/sql_base.cc@1.408.1.1, 2007-06-17 09:56:31+05:00, ramil@mysql.com +6 -2
    Fix for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock
      - pass MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK to the mysql_lock_tables() in case of 
        call from a logger in order not to honor the GLOBAL READ LOCK 
        and to avoid possible deadlocks.

ChangeSet@1.2482.8.21, 2007-06-16 11:16:02+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28949
  - handler binlog's must be shutdoem before logger.cleanup_base

  sql/mysqld.cc@1.645.5.1, 2007-06-16 11:15:59+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #28949
    - handler binlog's must be shutdoem before logger.cleanup_base

ChangeSet@1.1810.2871.43, 2007-06-15 23:57:53+02:00, tsmith@quadxeon.mysql.com +2 -0
  binlog.result, binlog.test:
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

  mysql-test/t/binlog.test@1.4.8.1, 2007-06-15 23:57:23+02:00, tsmith@quadxeon.mysql.com +2 -2
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

  mysql-test/r/binlog.result@1.4.6.1, 2007-06-15 23:57:23+02:00, tsmith@quadxeon.mysql.com +2 -2
    Post-merge fix: replace xid=* with XID to isolate from number of transactions

ChangeSet@1.2482.81.11, 2007-06-15 15:38:25-06:00, malff@weblab.(none) +1 -0
  Manual merge

  tests/mysql_client_test.c@1.243, 2007-06-15 15:38:22-06:00, malff@weblab.(none) +56 -2
    Manual merge

ChangeSet@1.2495.3.1, 2007-06-15 14:32:16-04:00, iggy@alf. +16 -0
  Embedded Server doesn't build on Windows.
  - Add build configuration parameter EMBEDDED_ONLY which will configure 
  the VS solution to produce only mysql embedded binary.
  - Make necessary updates to successfully compile solution.

  BitKeeper/etc/ignore@1.294, 2007-06-15 14:31:53-04:00, iggy@alf. +3 -0
    Embedded Server doesn't build on Windows.
    - Ignore CMake's default configuration output directories.
    - Ignore autogenerated cmake_dummy.c file.

  CMakeLists.txt@1.30.1.2, 2007-06-15 14:31:52-04:00, iggy@alf. +45 -26
    Embedded Server doesn't build on Windows.
    - Remove leading space from various definitions.
    - Remove optimizations from RelWithDebInfo configuration for debugging.
    - Conditionally add the necessary build directories based on 
    EMBEDDED_ONLY flag.

  libmysql/client_settings.h@1.38, 2007-06-15 14:31:54-04:00, iggy@alf. +1 -1
    Embedded Server doesn't build on Windows.
    - Build fixup

  libmysqld/CMakeLists.txt@1.14, 2007-06-15 14:31:55-04:00, iggy@alf. +60 -44
    Embedded Server doesn't build on Windows.
    - Update for recent changes.

  libmysqld/examples/CMakeLists.txt@1.5, 2007-06-15 14:31:57-04:00, iggy@alf. +13 -1
    Embedded Server doesn't build on Windows.
    - Updated include directories.
    - test_libmysqld fixup.
    - Added mysqltest_embedded and mysql_client_test_embedded exes needed for
    testing.

  libmysqld/libmysqld.def@1.20, 2007-06-15 14:31:56-04:00, iggy@alf. +8 -0
    Embedded Server doesn't build on Windows.
    - Export necessary methods.

  sql-common/client.c@1.136, 2007-06-15 14:32:00-04:00, iggy@alf. +1 -1
    Embedded Server doesn't build on Windows.
    - Build fixup.

  sql/mysqld.cc@1.646.6.1, 2007-06-15 14:31:58-04:00, iggy@alf. +2 -0
    Embedded Server doesn't build on Windows.
    - Build fixup.

  sql/sql_binlog.cc@1.13, 2007-06-15 14:31:59-04:00, iggy@alf. +2 -0
    Embedded Server doesn't build on Windows.
    - Build fixup.

  storage/federated/CMakeLists.txt@1.4, 2007-06-15 14:32:01-04:00, iggy@alf. +3 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  storage/heap/CMakeLists.txt@1.8, 2007-06-15 14:32:02-04:00, iggy@alf. +3 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  storage/innobase/CMakeLists.txt@1.12, 2007-06-15 14:32:03-04:00, iggy@alf. +3 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  storage/myisam/CMakeLists.txt@1.10, 2007-06-15 14:32:04-04:00, iggy@alf. +4 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  storage/myisam/ha_myisam.cc@1.221.2.1, 2007-06-15 14:32:05-04:00, iggy@alf. +2 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  storage/myisammrg/CMakeLists.txt@1.9, 2007-06-15 14:32:06-04:00, iggy@alf. +3 -0
    Embedded Server doesn't build on Windows.
    - Define USE_TLS for embedded only builds.

  win/configure.js@1.8, 2007-06-15 14:32:07-04:00, iggy@alf. +1 -0
    Embedded Server doesn't build on Windows.
    - Add EMBEDDED_ONLY build configuration.

ChangeSet@1.1810.3044.4, 2007-06-15 11:15:22-06:00, malff@weblab.(none) +3 -0
  Fixed warnings raised from mysqltest (unknown -- commands)

  mysql-test/t/greedy_optimizer.test@1.7.1.1, 2007-06-15 11:15:21-06:00, malff@weblab.(none) +2 -2
    Fixed warnings raised from mysqltest (unknown -- commands)

  mysql-test/t/join.test@1.32.1.6, 2007-06-15 11:15:21-06:00, malff@weblab.(none) +4 -2
    Fixed warnings raised from mysqltest (unknown -- commands)

  mysql-test/t/ndb_index_ordered.test@1.25.1.4, 2007-06-15 11:15:21-06:00, malff@weblab.(none) +1 -1
    Fixed warnings raised from mysqltest (unknown -- commands)

ChangeSet@1.1810.3044.3, 2007-06-15 10:59:40-06:00, malff@weblab.(none) +1 -0
  manual merge

  tests/mysql_client_test.c@1.167.1.66, 2007-06-15 09:48:20-06:00, malff@weblab.(none) +54 -0
    manual merge

ChangeSet@1.2482.78.13, 2007-06-15 17:21:56+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Disabling test case awaiting reply

  mysql-test/t/disabled.def@1.263, 2007-06-15 17:21:49+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Disabling innodb.test since it requires changes.

ChangeSet@1.2482.99.1, 2007-06-15 13:50:56+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#29130 (The logic for using delete_all_rows() is wrong):
  Correcting the logic for deciding when to use delete_all_rows() so that
  the behavior of TRUNCATE to not be dependent on binary logging
  format in effect.
  
  A TRUNCATE statement is always logged as a statement, so in this case,
  delete_all_rows() can always be used provided the other logic is correct.
  If a DELETE FROM without a WHERE clause is used, and row-based binlogging
  is used, the rows has to be deleted from the table on a per-row basis.

  sql/sql_delete.cc@1.222, 2007-06-15 13:50:51+02:00, mats@kindahl-laptop.dnsalias.net +16 -4
    The logic for deciding when to use delete_all_rows() was altered so that
    the format used for binary logging does not affect how TRUNCATE is
    handled.

ChangeSet@1.1810.3025.20, 2007-06-15 16:09:28+05:00, ramil@mysql.com +5 -0
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
  
  Problem: show slave status may return different Slave_IO_Running values running some tests.
  Fix: wait for a certain slave state if needed to get tests more predictable.

  mysql-test/include/wait_for_slave_param.inc@1.1, 2007-06-15 16:09:26+05:00, ramil@mysql.com +26 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_param.inc''
    
    allow to wait until SHOW SLAVE STATUS has returned a spicified value.
    

  mysql-test/include/wait_for_slave_param.inc@1.0, 2007-06-15 16:09:26+05:00, ramil@mysql.com +0 -0

  mysql-test/r/rpl_log_pos.result@1.42.1.1, 2007-06-15 16:09:26+05:00, ramil@mysql.com +67 -16
    Fix for bug #28144: "Slave_IO_Running" differs in replication tests
      - test result adjusted.

  mysql-test/r/rpl_ssl.result@1.1.1.3, 2007-06-15 16:09:26+05:00, ramil@mysql.com +1 -0
    Fix for bug #28144: "Slave_IO_Running" differs in replication tests
      - test result adjusted.

  mysql-test/t/rpl_log_pos.test@1.34.1.1, 2007-06-15 16:09:26+05:00, ramil@mysql.com +15 -18
    Fix for bug #28144: "Slave_IO_Running" differs in replication tests
      - test has been rewritten to get certain slave state, now we use wait_for_slave_param.inc
        to ensure we get proper IO/SQL slave's threads states.

  mysql-test/t/rpl_ssl.test@1.1.1.3, 2007-06-15 16:09:26+05:00, ramil@mysql.com +3 -0
    Fix for bug #28144: "Slave_IO_Running" differs in replication tests
      - wait_for_slave_to_start.inc used to get certain slave states in order 
        to be more predictable.

ChangeSet@1.1810.3058.2, 2007-06-15 11:28:15+02:00, df@pippilotta.erinye.com +1 -0
  follow-up fix

  include/violite.h@1.46.2.6, 2007-06-15 11:28:13+02:00, df@pippilotta.erinye.com +2 -0
    this may already be defined

ChangeSet@1.1810.3025.19, 2007-06-15 13:53:36+05:00, ramil@mysql.com +4 -0
  Backport of
  mysql-test/include/wait_for_slave_io_to_stop.inc
  mysql-test/include/wait_for_slave_sql_to_stop.inc
  mysql-test/include/wait_for_slave_to_start.inc
  mysql-test/include/wait_for_slave_to_stop.inc
  from 5.1

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.1, 2007-06-15 13:53:34+05:00, ramil@mysql.com +33 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_io_to_stop.inc''

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.0, 2007-06-15 13:53:34+05:00, ramil@mysql.com +0 -0

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.1, 2007-06-15 13:53:34+05:00, ramil@mysql.com +30 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_stop.inc''

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.0, 2007-06-15 13:53:34+05:00, ramil@mysql.com +0 -0

  mysql-test/include/wait_for_slave_to_start.inc@1.1, 2007-06-15 13:53:34+05:00, ramil@mysql.com +35 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_to_start.inc''

  mysql-test/include/wait_for_slave_to_start.inc@1.0, 2007-06-15 13:53:34+05:00, ramil@mysql.com +0 -0

  mysql-test/include/wait_for_slave_to_stop.inc@1.1, 2007-06-15 13:53:34+05:00, ramil@mysql.com +37 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_to_stop.inc''

  mysql-test/include/wait_for_slave_to_stop.inc@1.0, 2007-06-15 13:53:34+05:00, ramil@mysql.com +0 -0

ChangeSet@1.2482.81.9, 2007-06-15 12:40:30+04:00, kostja@bodhi.(none) +1 -0
  Another attempt to fix the valgrind warning in SHOW PROCESSLIST
  (event_bugs.test)

  sql/event_data_objects.cc@1.105, 2007-06-15 12:40:28+04:00, kostja@bodhi.(none) +3 -0
    SHOW PROCESSLIST tries to read thd->query without a mutex.
    If we do not reset it, it points to free()d contents of stack variable
    sp_sql.

ChangeSet@1.2482.88.11, 2007-06-15 09:52:58+02:00, df@pippilotta.erinye.com +1 -0
  BUG#27861 merge to 5.1

  client/CMakeLists.txt@1.19.1.1, 2007-06-15 09:52:56+02:00, df@pippilotta.erinye.com +52 -13
    BUG#27861 merge to 5.1

ChangeSet@1.2482.78.11, 2007-06-15 09:32:54+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixing typo in test case.

  mysql-test/t/loaddata_autocom_ndb.test@1.3, 2007-06-15 09:32:48+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Typo

ChangeSet@1.1810.3058.1, 2007-06-15 09:18:58+02:00, georg@bing.site +1 -0
  Added yassl and taocrypt sources to mysqlclientlib

  client/CMakeLists.txt@1.1.8.1, 2007-06-15 09:18:56+02:00, georg@bing.site +53 -14
    Fix for bug #27861: unresolved externals (yassl and taocrypt)

ChangeSet@1.2482.85.4, 2007-06-15 11:53:46+05:00, bar@mysql.com +2 -0
  Additional fix for bug N26402:
  An attempt to open file with name '????????.frm'
  can produce different errors:
  - ER_NO_SUCH_TABLE on Unix
  - ER_FILE_NOT_FOUND on Windows
  because QUESTION MARK has special meaning on Windows.
  Make sure that any of these two errors happens.

  mysql-test/r/show_check.result@1.113, 2007-06-15 11:53:44+05:00, bar@mysql.com +1 -1
    Additional fix for bug N26402

  mysql-test/t/show_check.test@1.76.1.2, 2007-06-15 11:53:44+05:00, bar@mysql.com +1 -1
    Additional fix for bug N26402

ChangeSet@1.1810.3024.5, 2007-06-15 11:19:35+05:00, bar@mysql.com +3 -0
    Bug#28862 Extended Latin1 characters get lost in CVS engine
    Problem: Temporary buffer which is used for quoting and escaping
    was initialized to character set utf8, and thus didn't allow
    to store data in other character sets.
    Fix: changing character set of the buffer to be able to
    store any arbitrary sequence of bytes.

  mysql-test/r/csv.result@1.4.1.4, 2007-06-15 11:19:33+05:00, bar@mysql.com +21 -0
    Adding test case

  mysql-test/t/csv.test@1.5.1.6, 2007-06-15 11:19:34+05:00, bar@mysql.com +18 -0
    Adding test case

  sql/examples/ha_tina.cc@1.10.9.1, 2007-06-15 11:19:34+05:00, bar@mysql.com +2 -2
    Changing character set of the buffer to "binary".

ChangeSet@1.2482.81.8, 2007-06-14 17:43:19-06:00, malff@weblab.(none) +1 -0
  build warning

  sql/log.cc@1.283.1.2, 2007-06-14 17:43:15-06:00, malff@weblab.(none) +1 -1
    build warning

ChangeSet@1.1810.2871.38, 2007-06-14 14:24:59-04:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#21723: Should be able to dump core after setuid() under Linux
  
  In many cases, binaries can no longer dump core after calling setuid().
  
  Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
  to tell the kernel that it's allowed to dump the core of the server.

  configure.in@1.245.1.200, 2007-06-14 14:24:57-04:00, cmiller@zippy.cornsilk.net +1 -0
    Test system for "sys/prctl.h", to get access to prctl().

  sql/mysqld.cc@1.439.120.1, 2007-06-14 14:24:57-04:00, cmiller@zippy.cornsilk.net +12 -0
    Add a process-control operation that tells the Linux kernel that it 
    is allowed to dump core after setuid().

ChangeSet@1.2482.93.5, 2007-06-14 22:14:52+04:00, anozdrin@ibm. +3 -0
  Part of patch for BUG#11986: make sp_head::m_body_begin pointer
  private and provide a setter for it. The setter will be used to
  construct UTF-query in the following patches.

  sql/sp_head.cc@1.275.1.4, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +7 -0
    Make sp_head::m_body_begin pointer private.

  sql/sp_head.h@1.108.1.3, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +5 -0
    Make sp_head::m_body_begin pointer private.

  sql/sql_yacc.yy@1.576.1.6, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +4 -4
    Make sp_head::m_body_begin pointer private.

ChangeSet@1.1810.3057.2, 2007-06-14 18:40:32+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
  - correction, missing node id

  mysql-test/r/ndb_backup_print.result@1.2, 2007-06-14 18:40:30+02:00, tomas@whalegate.ndb.mysql.com +4 -4
    Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
    - correction, missing node id

  mysql-test/t/ndb_backup_print.test@1.2, 2007-06-14 18:40:30+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
    - correction, missing node id

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.43.2, 2007-06-14 18:40:30+02:00, tomas@whalegate.ndb.mysql.com +58 -38
    Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
    - correction, missing node id

ChangeSet@1.2482.96.5, 2007-06-14 20:33:57+05:00, holyfoot@mysql.com +1 -0
  fix the binlog-stm_ps.test for the embedded-server

  mysql-test/t/binlog_stm_ps.test@1.2, 2007-06-14 20:33:55+05:00, holyfoot@mysql.com +1 -0
    embedded server doesn't have binlogs

ChangeSet@1.2482.93.4, 2007-06-14 19:23:55+04:00, anozdrin@ibm. +9 -0
  This the 4-th patch in scope of CS patch (BUG#11986).
  
  The patch contains the following changes:
    - Introduce auxilary functions to convenient work with character sets:
      - resolve_charset();
      - resolve_collation();
      - get_default_db_collation();
    - Introduce lex_string_set();
    - Refactor Table_trigger_list::process_triggers() &
      sp_head::execute_trigger() to be consistent with other code;
    - Move reusable code from add_table_for_trigger() into
      build_trn_path(), check_trn_exists() and load_table_name_for_trigger()
      to be used in the following patch.
    - Rename triggers_file_ext and trigname_file_ext into TRN_EXT and
      TRG_EXT respectively.

  include/my_sys.h@1.223, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +8 -0
    Introduced auxilary functions (to be used in the following patch).

  mysys/charset.c@1.151.1.1, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +64 -0
    Introduced auxilary functions (to be used in the following patch).

  sql/handler.cc@1.310.3.1, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +2 -2
    Rename triggers_file_ext -> TRG_EXT;
    Rename trigname_file_ext -> TRN_EXT.

  sql/mysql_priv.h@1.519, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +10 -3
    1. Fix typo;
    2. Introduce auxilary functions (set_lex_string() will  be used
       in the following patch);
    3. Rename triggers_file_ext -> TRG_EXT;
       Rename trigname_file_ext -> TRN_EXT.

  sql/sp_head.cc@1.275.1.3, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +66 -20
    Make sp_head::execute_trigger() consistent with
    sp_head::execute_function() and sp_head::execute_procedure().

  sql/sp_head.h@1.108.1.2, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +4 -2
    Make sp_head::execute_trigger() consistent with
    sp_head::execute_function() and sp_head::execute_procedure().

  sql/sql_db.cc@1.154, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +36 -13
    1. Introduce auxilary function.
    2. Polishing.

  sql/sql_trigger.cc@1.97, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +181 -129
    1. Move common code from add_table_for_trigger() into
       - build_trn_path();
       - check_trn_exists();
       - load_table_name_for_trigger();
    2. Polishing.

  sql/sql_trigger.h@1.31, 2007-06-14 19:23:52+04:00, anozdrin@ibm. +15 -4
    1. Move common code from add_table_for_trigger() into
       - build_trn_path();
       - check_trn_exists();
       - load_table_name_for_trigger();
    2. Polishing.

ChangeSet@1.2482.93.3, 2007-06-14 18:49:17+04:00, anozdrin@ibm. +4 -0
  This is the 3-rd part of patch for BUG#11986:
  remove redundant "body" from Event_parse_data (use sp_head::m_body).

  sql/event_data_objects.cc@1.104, 2007-06-14 18:49:14+04:00, anozdrin@ibm. +57 -104
    Use sp_head::m_body to store SQL-statement.
    Polishing.

  sql/event_data_objects.h@1.25, 2007-06-14 18:49:14+04:00, anozdrin@ibm. +5 -9
    Use sp_head::m_body to store SQL-statement.
    Polishing.

  sql/event_db_repository.cc@1.31, 2007-06-14 18:49:14+04:00, anozdrin@ibm. +21 -7
    Use sp_head::m_body to store SQL-statement.

  sql/sql_yacc.yy@1.576.1.5, 2007-06-14 18:49:14+04:00, anozdrin@ibm. +1 -4
    Use sp_head::m_body to store SQL-statement.

ChangeSet@1.2482.93.2, 2007-06-14 18:35:59+04:00, anozdrin@ibm. +9 -0
  The second cleanup patch in scope of BUG#11986.
  
  1. Introduce parse_sql() as a high-level replacement for MYSQLparse().
  parse_sql() is responsible to switch and restore "parser context"
  (THD::m_lip for now).
  
  2. Fix typo in sp.cc: THD::spcont should be reset *before* calling
  the parser.

  sql/event_data_objects.cc@1.103, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +1 -3
    Use parse_sql() instead of MYSQLparse().

  sql/mysql_priv.h@1.518, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +2 -1
    Introduce parse_sql() instead of auto-generated MYSQLparse.

  sql/sp.cc@1.156, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +20 -20
    1. Use parse_sql() instead of MYSQLparse().
    2. THD::spcont should be reset before calling the parser.

  sql/sql_class.cc@1.337.1.2, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +2 -1
    Reset THD::m_lip.

  sql/sql_parse.cc@1.679, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +36 -8
    1. Introduce parse_sql() instead of auto-generated MYSQLparse().
    2. Backup, switch and restore THD::m_lip inside parse_sql().
    3. Use parse_sql() instead of MYSQLparse().

  sql/sql_partition.cc@1.106.1.1, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +1 -2
    Use parse_sql() instead of MYSQLparse().

  sql/sql_prepare.cc@1.221.1.1, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +3 -4
    Use parse_sql() instead of MYSQLparse().

  sql/sql_trigger.cc@1.96, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +1 -3
    Use parse_sql() instead of MYSQLparse().

  sql/sql_view.cc@1.138.1.2, 2007-06-14 18:35:56+04:00, anozdrin@ibm. +3 -4
    Use parse_sql() instead of MYSQLparse().

ChangeSet@1.2403.18.66, 2007-06-14 16:10:13+02:00, tomas@whalegate.ndb.mysql.com +8 -0
  bug#29099 - slow backup for disk data
  - implement read ahead during disk data scan

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.9, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    maximum read ahead

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.35.2.5, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +12 -0
    maximum read ahead should not be larger than page buffer size
    maximum aslo set to 32 pages

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.5, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +63 -1
    read ahead for disk data scan

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.5, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    set higher max_io_waits for read ahead
    round off upwards in page_buffer size

  storage/ndb/src/kernel/vm/SimulatedBlock.cpp@1.42, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    add null callback to be used for read ahead (no callback needed)

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp@1.32, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +4 -0
    add null callback to be used for read ahead (no callback needed)

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.57.2.2, 2007-06-14 16:10:10+02:00, tomas@whalegate.ndb.mysql.com +0 -3
    remove the debug trace, not needed any more

  storage/ndb/test/tools/hugoFill.cpp@1.9, 2007-06-14 16:10:11+02:00, tomas@whalegate.ndb.mysql.com +3 -1
    allow setting database in hugoFill

ChangeSet@1.1810.2974.9, 2007-06-14 16:01:51+02:00, mskold@mysql.com +1 -0
  Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix

  ndb/src/ndbapi/Ndb.cpp@1.49.28.1, 2007-06-14 16:01:39+02:00, mskold@mysql.com +2 -2
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix

ChangeSet@1.2482.98.1, 2007-06-14 15:15:45+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct warning

  extra/perror.c@1.50.1.2, 2007-06-14 15:15:42+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct warning

ChangeSet@1.1810.3021.21, 2007-06-14 15:38:52+03:00, gkodinov@magare.gmz +1 -0
  corrected valgrind problems for bug 28505 and 28934

  tests/mysql_client_test.c@1.167.1.64, 2007-06-14 15:38:50+03:00, gkodinov@magare.gmz +21 -108
    corrected valgrind problems for bug 28505 and 28934

ChangeSet@1.2482.97.2, 2007-06-14 20:25:45+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -0
  Bug#27640, backup id not dispalyed in the output of "ndb_mgm start backup wait completed"
  correct related sourcecode after merge from 5.0

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@1.94, 2007-06-14 20:25:42+08:00, Justin.He@dev3-240.dev.cn.tlan +35 -313
    correct something to ensure only related sourcecode are merged

ChangeSet@1.1810.2683.14, 2007-06-14 19:40:44+08:00, Justin.He@dev3-240.dev.cn.tlan +5 -0
  Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed"

  mysql-test/r/ndb_backup_print.result@1.1, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +64 -0
    testcase result for ndb_backup_print
    produced by mysql_test_run.pl

  mysql-test/r/ndb_backup_print.result@1.0, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  mysql-test/t/ndb_backup_print.test@1.1, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +66 -0
    add testcase for ndb_mgm -e "start backup", check outupt format

  mysql-test/t/ndb_backup_print.test@1.0, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +0 -0

  ndb/include/debugger/EventLogger.hpp@1.9.2.1, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +1 -1
    add definition for new printLogEvent() function in CommandInterpreter.cpp

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.42.1, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +189 -69
    add a printLogEvent() function to print log event;
    filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
    filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
    and make executeStartBackup() same in both 5.0 and 5.1

  ndb/src/mgmclient/Makefile.am@1.17.2.1, 2007-06-14 19:40:43+08:00, Justin.He@dev3-240.dev.cn.tlan +2 -1
    add link to use ndb_logevent_get_next()

ChangeSet@1.2482.95.1, 2007-06-14 13:33:31+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  Temporarily using thd_tx_isolation() until decision is made on how to
  get the isolation level.

  mysql-test/r/binlog_tx_isolation.result@1.1, 2007-06-14 13:33:26+02:00, mats@kindahl-laptop.dnsalias.net +48 -0
    New BitKeeper file ``mysql-test/r/binlog_tx_isolation.result''

  mysql-test/r/binlog_tx_isolation.result@1.0, 2007-06-14 13:33:26+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  storage/innobase/handler/ha_innodb.cc@1.341, 2007-06-14 13:33:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Using thd_tx_isolation() instead of direct access to variable.

ChangeSet@1.2482.94.1, 2007-06-14 16:28:33+05:00, bar@mysql.com +5 -0
  Bug#26402 Server crashes with old-style named table
    Problem: crash on attempt to open a table
    having "#mysql50#" prefix in db or table name.
    Fix: This prefix is reserved for "mysql_upgrade"
    to access 5.0 tables  whose file names are not encoded
    according to "5.1 tablename to filename encoded".
    Don't try open tables whose db name or table name
    has this prefix.

  mysql-test/r/show_check.result@1.112, 2007-06-14 16:28:31+05:00, bar@mysql.com +2 -0
    Adding test case.

  mysql-test/t/show_check.test@1.76.1.1, 2007-06-14 16:28:31+05:00, bar@mysql.com +6 -0
    Adding test case.

  sql/mysql_priv.h@1.516.2.1, 2007-06-14 16:28:31+05:00, bar@mysql.com +4 -0
    Moving 5.0 prefix declarations into mysql_priv.h

  sql/sql_table.cc@1.427.1.5, 2007-06-14 16:28:31+05:00, bar@mysql.com +0 -4
    Moving 5.0 prefix declarations into mysql_priv.h

  sql/table.cc@1.291.1.1, 2007-06-14 16:28:31+05:00, bar@mysql.com +17 -2
    Don't try to do "normal" open of tables having '#mysql50#' prefix in
    db or table name. This prefix is reserved to access to unencoded
    table names when upgrading from 5.0 to 5.1.

ChangeSet@1.1810.3024.4, 2007-06-14 16:18:01+05:00, svoj@mysql.com +2 -0
  BUG#26976 - Missing table in merge not noted in related error msg +
              SHOW CREATE TABLE fails
  Addition to the fix: report db name + table name instead of table path.
  This solves embedded merge test failure.

  mysql-test/r/merge.result@1.43.1.19, 2007-06-14 16:18:00+05:00, svoj@mysql.com +4 -4
    BUG#26976 - Missing table in merge not noted in related error msg +
                SHOW CREATE TABLE fails
    Addition to the fix: report db name + table name instead of table path.

  sql/ha_myisammrg.cc@1.59.17.1, 2007-06-14 16:18:00+05:00, svoj@mysql.com +12 -1
    BUG#26976 - Missing table in merge not noted in related error msg +
                SHOW CREATE TABLE fails
    Addition to the fix: report db name + table name instead of table path.

ChangeSet@1.2482.59.25, 2007-06-14 12:57:32+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Makefile.am:
    new public file needs to get into distribution

  storage/ndb/include/Makefile.am@1.23, 2007-06-14 12:57:10+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    new public file needs to get into distribution

ChangeSet@1.2482.59.24, 2007-06-14 12:51:13+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  

  mysql-test/r/ndb_restore.result@1.24, 2007-06-14 12:51:10+02:00, tomas@whalegate.ndb.mysql.com +10 -10
    Bug #29103 ndb_restore segfaults on NULL var[char|binary]
    - add extra row with NULL value to test

  mysql-test/t/ndb_restore.test@1.26.1.1, 2007-06-14 12:51:10+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29103 ndb_restore segfaults on NULL var[char|binary]
    - add extra row with NULL value to test

  storage/ndb/tools/restore/consumer_restore.cpp@1.47.1.1, 2007-06-14 12:51:10+02:00, tomas@whalegate.ndb.mysql.com +16 -13
    Bug #29103 ndb_restore segfaults on NULL var[char|binary]
    - check that the attribute is not null

ChangeSet@1.2482.59.23, 2007-06-14 12:35:35+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  get mgmapi error codes into perror

  extra/perror.c@1.50.1.1, 2007-06-14 12:35:33+02:00, tomas@whalegate.ndb.mysql.com +18 -2
    get mgmapi error codes into perror

  storage/ndb/include/mgmapi/mgmapi.h@1.67, 2007-06-14 12:35:33+02:00, tomas@whalegate.ndb.mysql.com +1 -99
    get mgmapi error codes into perror

  storage/ndb/include/mgmapi/mgmapi_error.h@1.1, 2007-06-14 12:35:33+02:00, tomas@whalegate.ndb.mysql.com +121 -0
    New BitKeeper file ``storage/ndb/include/mgmapi/mgmapi_error.h''

  storage/ndb/include/mgmapi/mgmapi_error.h@1.0, 2007-06-14 12:35:33+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.2482.83.4, 2007-06-14 12:53:13+03:00, gkodinov@magare.gmz +1 -0
  Bug #28991: rpl_events failure in pushbuild
  
  In tests waiting on a timeout is not deterministic enough
  to make sure that an event actually finished executing.
  Fixed the test by waiting in a loop and checking the effect
  that the event is supposed to produce.

  mysql-test/include/rpl_events.inc@1.5, 2007-06-14 12:53:12+03:00, gkodinov@magare.gmz +3 -0
    Bug #28991: wait until event has taken effect

ChangeSet@1.2482.93.1, 2007-06-14 13:51:35+04:00, kostja@bodhi.(none) +1 -0
  Add a missing wait_condition call.

  mysql-test/t/events_restart_phase3.test@1.4, 2007-06-14 13:51:32+04:00, kostja@bodhi.(none) +1 -0
    Add a missing wait.

ChangeSet@1.2482.59.22, 2007-06-14 11:26:54+02:00, tomas@whalegate.ndb.mysql.com +4 -0
  move all error codes to ndberror.c
  - step 1 mgmtsrvr error codes

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.131, 2007-06-14 11:26:52+02:00, tomas@whalegate.ndb.mysql.com +1 -75
    move all error codes to ndberror.c
    - step 1 mgmtsrvr error codes

  storage/ndb/src/mgmsrv/MgmtSrvr.hpp@1.56, 2007-06-14 11:26:52+02:00, tomas@whalegate.ndb.mysql.com +0 -39
    move all error codes to ndberror.c
    - step 1 mgmtsrvr error codes

  storage/ndb/src/mgmsrv/ndb_mgmd_error.h@1.1, 2007-06-14 11:26:52+02:00, tomas@whalegate.ndb.mysql.com +33 -0
    New BitKeeper file ``storage/ndb/src/mgmsrv/ndb_mgmd_error.h''

  storage/ndb/src/mgmsrv/ndb_mgmd_error.h@1.0, 2007-06-14 11:26:52+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  storage/ndb/src/ndbapi/ndberror.c@1.92, 2007-06-14 11:26:52+02:00, tomas@whalegate.ndb.mysql.com +30 -0
    move all error codes to ndberror.c
    - step 1 mgmtsrvr error codes

ChangeSet@1.2482.78.9, 2007-06-14 11:05:48+02:00, mats@kindahl-laptop.dnsalias.net +70 -0
  WL#3303 (RBR: Engine-controlled logging format):
  Test case fixes.

  mysql-test/r/binlog_multi_engine.result@1.3, 2007-06-14 11:05:23+02:00, mats@kindahl-laptop.dnsalias.net +2 -7
    Result change.

  mysql-test/r/rpl_ndb_stm_innodb.result@1.2, 2007-06-14 11:05:23+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Result change.

  mysql-test/t/binlog_multi_engine.test@1.3, 2007-06-14 11:05:24+02:00, mats@kindahl-laptop.dnsalias.net +2 -5
    NDB tests only work in MIXED or ROW mode. Adding some cleanup actions.

  mysql-test/t/loaddata_autocom_ndb.test@1.2, 2007-06-14 11:05:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode.

  mysql-test/t/ndb_alter_table.test@1.38, 2007-06-14 11:05:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_alter_table2.test@1.4, 2007-06-14 11:05:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_alter_table3.test@1.11, 2007-06-14 11:05:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_autodiscover.test@1.26, 2007-06-14 11:05:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_autodiscover2.test@1.10, 2007-06-14 11:05:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_autodiscover3.test@1.12, 2007-06-14 11:05:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_basic.test@1.56.1.1, 2007-06-14 11:05:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_binlog_log_bin.test@1.3, 2007-06-14 11:05:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_binlog_multi.test@1.9, 2007-06-14 11:05:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_bitfield.test@1.7, 2007-06-14 11:05:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_blob.test@1.21, 2007-06-14 11:05:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_blob_partition.test@1.4, 2007-06-14 11:05:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_cache.test@1.7, 2007-06-14 11:05:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_cache2.test@1.6, 2007-06-14 11:05:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_cache_multi.test@1.5, 2007-06-14 11:05:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_cache_multi2.test@1.7, 2007-06-14 11:05:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_charset.test@1.13.1.1, 2007-06-14 11:05:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_condition_pushdown.test@1.24, 2007-06-14 11:05:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_config.test@1.15, 2007-06-14 11:05:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_config2.test@1.2, 2007-06-14 11:05:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_cursor.test@1.3, 2007-06-14 11:05:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_database.test@1.4, 2007-06-14 11:05:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_alter.test@1.6, 2007-06-14 11:05:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_backuprestore.test@1.9, 2007-06-14 11:05:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_basic.test@1.13, 2007-06-14 11:05:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_ddl.test@1.13, 2007-06-14 11:05:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_disk2memory.test@1.5, 2007-06-14 11:05:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_dump.test@1.6, 2007-06-14 11:05:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_dd_sql_features.test@1.4, 2007-06-14 11:05:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_gis.test@1.7, 2007-06-14 11:05:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_index.test@1.6, 2007-06-14 11:05:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_index_ordered.test@1.34, 2007-06-14 11:05:33+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_index_unique.test@1.28.1.1, 2007-06-14 11:05:33+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_insert.test@1.14.2.1, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_limit.test@1.5, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_loaddatalocal.test@1.3, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_lock.test@1.19, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_minmax.test@1.5, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_multi.test@1.19, 2007-06-14 11:05:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_partition_error.test@1.3, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_partition_key.test@1.4, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_partition_list.test@1.3, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_partition_range.test@1.3, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_read_multi_range.test@1.16, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_rename.test@1.2, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_replace.test@1.8.1.1, 2007-06-14 11:05:35+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_restore.test@1.27, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_restore_partition.test@1.2, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_restore_print.test@1.4, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_row_format.test@1.3, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_single_user.test@1.8, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_sp.test@1.3, 2007-06-14 11:05:36+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_subquery.test@1.8, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_temporary.test@1.2, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_transaction.test@1.7, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_trigger.test@1.4, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_truncate.test@1.5, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_types.test@1.8, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_update.test@1.10.1.1, 2007-06-14 11:05:37+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndb_view.test@1.2, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ndbapi.test@1.3, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/ps_7ndb.test@1.7, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/rpl_ndb_commit_afterflush.test@1.4, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/rpl_ndb_innodb_trans.test@1.2, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

  mysql-test/t/rpl_ndb_stm_innodb.test@1.2, 2007-06-14 11:05:38+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
    We need MIXED mode on slave since it is necessary to let the slave
    switch to row format when executing replicated statements.

  mysql-test/t/strict_autoinc_5ndb.test@1.2, 2007-06-14 11:05:39+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    NDB requires MIXED or ROW mode, but will switch to row format
    automatically, so we only run these tests under ROW mode.

ChangeSet@1.2497, 2007-06-14 08:48:00+02:00, msvensson@pilot.(none) +1 -0
  Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
   - touch up

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.2, 2007-06-14 08:47:59+02:00, msvensson@pilot.(none) +1 -3
    Update comment
    Remove superfluous variable assignments

ChangeSet@1.2482.81.5, 2007-06-13 22:05:22-06:00, malff@weblab.(none) +3 -0
  Bug#27857 (Log tables supplies the wrong value for generating AUTO_INCREMENT
  numbers)
  
  Before this patch, the code in the class Log_to_csv_event_handler, which is
  used by the global LOGGER object to write to the tables mysql.slow_log and
  mysql_general_log, was supporting only records of the format defined for
  these tables in the database creation scripts.
  
  Also before this patch, the server would allow, with certain limitations,
  to perform ALTER TABLE on the LOG TABLES.
  
  As implemented, the behavior of the server, with regards to LOG TABLES,
  is inconsistent:
  - either ALTER TABLES on LOG TABLES should be prohibited,
  and the code writing to these tables can make assumptions on the record
  format,
  - or ALTER TABLE on LOG TABLES is permitted, in which case the code
  writing a record to these tables should be more flexible and honor
  new fields.
  
  In particular, adding an AUTO_INCREMENT column to the logs,
  does not work as expected (per the bug report).
  
  Given that the ALTER TABLE on log tables statement has been explicitly
  implemented to check that the log should be off to perform the operation,
  and that current test cases already cover this, the user expectation is
  already set that this is a "feature" and should be supported.
  
  With this patch, the server will:
  - populate AUTO INCREMENT columns if present,
  - populate any additional column with it's default value
  when writing a record to the LOG TABLES.
  
  Tests are provided, that detail the precise sequence of statements
  a SUPER user might want to perform to add more columns to the log tables.

  mysql-test/r/log_tables.result@1.18, 2007-06-13 17:34:41-06:00, malff@weblab.(none) +68 -0
    Test case for bug#27857

  mysql-test/t/log_tables.test@1.16, 2007-06-13 17:34:41-06:00, malff@weblab.(none) +70 -0
    Test case for bug#27857

  sql/log.cc@1.283.1.1, 2007-06-13 17:34:41-06:00, malff@weblab.(none) +11 -0
    Set extra fields in log tables with default values.

ChangeSet@1.2482.59.21, 2007-06-14 11:59:25+10:00, stewart@willster.(none) +1 -0
  fix build of mgm client with history - caught by pb.

  storage/ndb/src/mgmclient/main.cpp@1.30.1.2, 2007-06-14 11:59:21+10:00, stewart@willster.(none) +6 -0
    fix build issues only caught by pb (mgm client history related)

ChangeSet@1.2495, 2007-06-13 17:25:16-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #28897  	UUID() returns non-unique values when query cache is enabled
  
  Removed the ability to cache queries with UUID() and UUID_SHORT().

  sql/item_create.cc@1.80.1.2, 2007-06-13 17:25:13-04:00, dkatz@damien-katzs-computer.local +2 -0
      Removed the ability to cache queries with UUID() and UUID_SHORT().

ChangeSet@1.2482.92.1, 2007-06-13 16:24:21-04:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #28953  	Using events in a replication let the slave crash.
  
  Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.

  mysql-test/r/rpl_events.result@1.6, 2007-06-13 16:24:16-04:00, dkatz@damien-katzs-computer.local +6 -0
    test that "alter event" replicates without crashing the slave

  mysql-test/t/rpl_events.test@1.2, 2007-06-13 16:24:16-04:00, dkatz@damien-katzs-computer.local +23 -0
    test that "alter event" replicates without crashing the slave

  sql/sql_parse.cc@1.675.4.1, 2007-06-13 16:24:16-04:00, dkatz@damien-katzs-computer.local +1 -1
    Added a check for lex->spd, which isn't set on an "alter event" command

ChangeSet@1.1810.3055.1, 2007-06-13 14:23:25-04:00, dkatz@damien-katzs-computer.local +3 -0
  Bug #28897  	UUID() returns non-unique values when query cache is enabled
  
  Removed the ability to cache queries containing "UUID()".

  mysql-test/r/query_cache.result@1.65.1.16, 2007-06-13 14:23:22-04:00, dkatz@damien-katzs-computer.local +7 -0
    Added test to ensure "select UUID(), a from t1" is different each time.

  mysql-test/t/query_cache.test@1.49.1.11, 2007-06-13 14:23:22-04:00, dkatz@damien-katzs-computer.local +24 -0
    Added test to ensure "select UUID(), a from t1" is different each time.

  sql/item_create.cc@1.58.1.6, 2007-06-13 14:23:22-04:00, dkatz@damien-katzs-computer.local +1 -0
    Removed the ability to cache queries with UUID().

ChangeSet@1.2493, 2007-06-13 19:52:42+02:00, jmiller@mysql.com +1 -0
  rpl_known_bugs_detection.test:
    Updated to use new tool(s):Missed on call, resubmitting

  mysql-test/t/rpl_known_bugs_detection.test@1.5, 2007-06-13 19:52:29+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s):Missed on call, resubmitting

ChangeSet@1.1616.3061.3, 2007-06-13 19:23:13+02:00, df@pippilotta.erinye.com +1 -0
  fix.

  BitKeeper/triggers/post-commit@1.22.1.15, 2007-06-13 19:23:12+02:00, df@pippilotta.erinye.com +6 -4
    send to correct address.

ChangeSet@1.1810.3048.6, 2007-06-13 19:19:11+02:00, df@pippilotta.erinye.com +1 -0
  fix make_win_bin_dist typo

  scripts/make_win_bin_dist@1.1.13.3, 2007-06-13 19:19:09+02:00, df@pippilotta.erinye.com +1 -1
    add missing backslash

ChangeSet@1.1810.3021.20, 2007-06-13 09:32:36-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) 
  was erroneously converted to double, while the result of
  ROUND(<decimal expr>, <int literal>) was preserved as decimal.
  As a result of such a conversion the value of ROUND(D,A) could
  differ from the value of ROUND(D,val(A)) if D was a decimal expression.
  
  Now the result of the ROUND function is never converted to 
  double if the first argument is decimal.  

  mysql-test/r/type_decimal.result@1.38.1.5, 2007-06-13 09:32:34-07:00, igor@olga.mysql.com +9 -0
    Added a test case for bug #28980.

  mysql-test/t/type_decimal.test@1.33, 2007-06-13 09:32:34-07:00, igor@olga.mysql.com +14 -0
    Added a test case for bug #28980.

  sql/item_func.cc@1.270.1.79, 2007-06-13 09:32:34-07:00, igor@olga.mysql.com +7 -1
    Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>) 
    was erroneously converted to double, while the result of
    ROUND(<decimal expr>, <int literal>) was preserved as decimal.
    As a result of such a conversion the value of ROUND(D,A) could
    differ from the value of ROUND(D,val(A)) if D was a decimal expression.
    
    Now the result of the ROUND function is never converted to 
    double if the first argument is decimal.  

ChangeSet@1.2489.1.1, 2007-06-13 17:43:31+02:00, jmiller@mysql.com +1 -0
  rpl_known_bugs_detection.test:
    Updated to use new tool(s)

  mysql-test/t/rpl_known_bugs_detection.test@1.4, 2007-06-13 17:43:06+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

ChangeSet@1.2482.59.20, 2007-06-13 23:53:01+10:00, stewart@flamingspork.com +1 -0
  [PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples
  
  Index: ndb-merge/storage/ndb/MAINTAINERS
  ===================================================================

  storage/ndb/MAINTAINERS@1.2, 2007-06-13 23:52:18+10:00, stewart@flamingspork.com +6 -0
    add knielsen as MAINTAINER of NDBAPI NdbRecord examples

ChangeSet@1.2482.59.19, 2007-06-13 23:52:47+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Add MAINTAINERS file for NDB
  
  Index: ndb-merge/storage/ndb/MAINTAINERS
  ===================================================================

  storage/ndb/MAINTAINERS@1.1, 2007-06-13 23:52:06+10:00, stewart@flamingspork.com +157 -0
    Add MAINTAINERS file for NDB

  storage/ndb/MAINTAINERS@1.0, 2007-06-13 23:52:06+10:00, stewart@flamingspork.com +0 -0

ChangeSet@1.2482.59.18, 2007-06-13 23:34:36+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter
  
  Index: ndb-work/storage/ndb/tools/ndb_error_reporter
  ===================================================================

  storage/ndb/tools/ndb_error_reporter@1.2, 2007-05-19 01:31:01+10:00, stewart@flamingspork.com +2 -2
    BUG#29074 preserve file timestamps in ndb_error_reporter

ChangeSet@1.2482.59.17, 2007-06-13 23:34:22+10:00, stewart@flamingspork.com +2 -0
  [PATCH] Enable test for (Closed) bug 16445
  
  Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
  since global dict cache rewrite. This test should probably be enabled then.
  
  Index: ndb-work/mysql-test/t/ndb_basic.test
  ===================================================================

  mysql-test/r/ndb_basic.result@1.57, 2007-05-11 14:56:15+10:00, stewart@flamingspork.com +7 -0
    Enable test for (Closed) bug 16445

  mysql-test/t/ndb_basic.test@1.58, 2007-05-11 14:51:06+10:00, stewart@flamingspork.com +10 -10
    Enable test for (Closed) bug 16445

ChangeSet@1.2482.59.16, 2007-06-13 23:34:09+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29073 Store history for ndb_mgm
  
  Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
  ===================================================================

  storage/ndb/src/mgmclient/main.cpp@1.30.1.1, 2007-05-11 20:57:22+10:00, stewart@flamingspork.com +21 -0
    BUG#29073 Store history for ndb_mgm

ChangeSet@1.2482.59.15, 2007-06-13 23:33:51+10:00, stewart@flamingspork.com +2 -0
  [PATCH] Add tests for ndb variables (related to BUG#26675)
  
  This is somewhat related to BUG#26675 (ndb_connectstring not reported
  in show global variables)
  
  Index: ndb-work/mysql-test/r/ndb_basic.result
  ===================================================================

  mysql-test/r/ndb_basic.result@1.56, 2007-05-16 15:25:33+10:00, stewart@flamingspork.com +21 -0
    Add tests for ndb variables (related to BUG#26675)

  mysql-test/t/ndb_basic.test@1.57, 2007-05-16 15:19:49+10:00, stewart@flamingspork.com +8 -0
    Add tests for ndb variables (related to BUG#26675)

ChangeSet@1.2482.59.14, 2007-06-13 23:33:37+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Disable mysql_upgrade test (Bug#28560)
  
  Index: ndb-work/mysql-test/t/disabled.def
  ===================================================================

  mysql-test/t/disabled.def@1.253.4.1, 2007-06-04 15:48:52+10:00, stewart@flamingspork.com +1 -0
    Disable mysql_upgrade test (Bug#28560)

ChangeSet@1.2482.81.4, 2007-06-13 07:31:41-06:00, malff@weblab.(none) +1 -0
  Fixed valgrind error, caused by incorrect pointer arithetic

  sql/sql_yacc.yy@1.576.1.4, 2007-06-13 07:31:37-06:00, malff@weblab.(none) +2 -4
    Fixed valgrind error: the same buffer (preprocessed) should be used when extracting the text of expr

ChangeSet@1.2482.91.1, 2007-06-13 15:16:33+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  Fixing some trivial test problems.

  mysql-test/r/rpl_loaddata_fatal.result@1.3, 2007-06-13 15:16:25+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Result change

  mysql-test/r/rpl_slave_skip.result@1.3, 2007-06-13 15:16:26+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Result change

  mysql-test/t/rpl_loaddata_fatal.test@1.2, 2007-06-13 15:16:26+02:00, mats@kindahl-laptop.dnsalias.net +10 -0
    Test only valid for debug build
    Adding shutdown sequence.

  mysql-test/t/rpl_slave_skip.test@1.2, 2007-06-13 15:16:26+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Masking out new columns.

  sql/log_event.cc@1.285, 2007-06-13 15:16:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Freeing memory to keep valgrind silent.

ChangeSet@1.2482.59.13, 2007-06-13 22:54:14+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly
  
  correctly divide timeout by 1000 to convert to seconds for SocketClient
  
  Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
  ===================================================================

  storage/ndb/src/mgmapi/mgmapi.cpp@1.95, 2007-06-13 16:03:11+10:00, stewart@flamingspork.com +1 -1
    BUG#29063 mgmapi: connect timeout set incorrectly

ChangeSet@1.2482.59.12, 2007-06-13 22:54:00+10:00, stewart@flamingspork.com +2 -0
  [PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
  
  Add test to testMgm for Connect timeout. add to autotest.
  
  Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
  ===================================================================

  storage/ndb/test/ndbapi/testMgm.cpp@1.16, 2007-06-13 15:05:32+10:00, stewart@flamingspork.com +75 -0
    BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly

  storage/ndb/test/run-test/daily-basic-tests.txt@1.92.1.1, 2007-06-13 15:04:54+10:00, stewart@flamingspork.com +4 -0
    BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly

ChangeSet@1.1616.3062.1, 2007-06-13 13:33:00+02:00, joerg@trift2. +1 -0
  sql/item_func.cc
      Improved check for thread identity in the "embedded" case,
      provided by Monty.
      
      This finishes the fixes for bug#27078.

  sql/item_func.cc@1.124.42.25, 2007-06-13 13:32:58+02:00, joerg@trift2. +1 -1
    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.

ChangeSet@1.2482.78.7, 2007-06-13 12:28:35+02:00, mats@kindahl-laptop.dnsalias.net +7 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  
  Post-merge fixes.

  BitKeeper/deleted/.del-ndb_binlog_basic2.result@1.2, 2007-06-13 08:55:15+02:00, mats@kindahl-laptop.dnsalias.net +0 -0
    Delete: mysql-test/r/ndb_binlog_basic2.result

  BitKeeper/deleted/.del-ndb_binlog_basic2.test@1.2.1.1, 2007-06-13 08:55:09+02:00, mats@kindahl-laptop.dnsalias.net +0 -0
    Delete: mysql-test/t/ndb_binlog_basic2.test

  mysql-test/r/binlog_innodb.result@1.2, 2007-06-13 12:28:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/binlog_multi_engine.result@1.2, 2007-06-13 12:28:28+02:00, mats@kindahl-laptop.dnsalias.net +10 -9
    Result change

  mysql-test/t/binlog_multi_engine.test@1.2, 2007-06-13 12:28:28+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Changed error code

  mysql-test/t/partition_hash.test@1.9, 2007-06-13 12:28:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Changed error code

  sql/sql_class.h@1.369, 2007-06-13 12:28:28+02:00, mats@kindahl-laptop.dnsalias.net +4 -3
    Fixes to select_create constructor argument list.

ChangeSet@1.2491, 2007-06-13 14:59:31+05:00, ramil@mysql.com +1 -0
  after-merge fix.

  mysql-test/r/func_in.result@1.43, 2007-06-13 14:59:29+05:00, ramil@mysql.com +0 -6
    After-merge fix.
      - result adjusted.

ChangeSet@1.1616.3059.1, 2007-06-13 11:44:58+02:00, df@pippilotta.erinye.com +1 -0
  BK changes for
  https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally

  BitKeeper/triggers/post-commit@1.22.1.14, 2007-06-13 11:44:57+02:00, df@pippilotta.erinye.com +35 -21
    1) Add additional method of detecting merge changesets.
    2) Remove code sending e-mail to dev-public@ or dev-bugs@.
    3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.

ChangeSet@1.1616.3058.1, 2007-06-13 10:35:20+02:00, msvensson@pilot.(none) +1 -0
  Bug#29065 mysql-test-run.pl aborts execution on missing log file from test tool
   - Make tesingt continue even if test log file does not exists

  mysql-test/mysql-test-run.pl@1.8.20.13, 2007-06-13 10:35:19+02:00, msvensson@pilot.(none) +7 -4
    Allow execution to continue even if no log file has been
    generated by the test tool - it's not a critical error

ChangeSet@1.2487.1.1, 2007-06-13 05:52:43+02:00, jmiller@mysql.com +14 -0
  Updated patch for Bug#28497 based off of Magnus's review

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.1, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +33 -0
    Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.

  mysql-test/include/wait_for_slave_io_to_stop.inc@1.0, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.1, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +30 -0
    Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.

  mysql-test/include/wait_for_slave_sql_to_stop.inc@1.0, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/wait_for_slave_to_start.inc@1.1, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +35 -0
    Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.

  mysql-test/include/wait_for_slave_to_start.inc@1.0, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/wait_for_slave_to_stop.inc@1.1, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +37 -0
    Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.

  mysql-test/include/wait_for_slave_to_stop.inc@1.0, 2007-06-13 05:41:56+02:00, jmiller@mysql.com +0 -0

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3, 2007-06-13 05:50:32+02:00, jmiller@mysql.com +9 -9
    Updated to use new tool(s)

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.9, 2007-06-13 05:50:46+02:00, jmiller@mysql.com +4 -4
    Updated to use new tool(s)

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.8, 2007-06-13 05:50:56+02:00, jmiller@mysql.com +5 -5
    Updated to use new tool(s)

  mysql-test/extra/rpl_tests/rpl_stm_000001.test@1.48, 2007-06-13 05:51:11+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

  mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test@1.4, 2007-06-13 05:51:21+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

  mysql-test/t/rpl_critical_errors.test@1.2, 2007-06-13 05:43:36+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

  mysql-test/t/rpl_dual_pos_advance.test@1.3, 2007-06-13 05:46:45+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

  mysql-test/t/rpl_known_bugs_detection.test@1.3, 2007-06-13 05:47:22+02:00, jmiller@mysql.com +2 -2
    Updated to use new tool(s)

  mysql-test/t/rpl_rotate_logs.test@1.72, 2007-06-13 05:47:36+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

  mysql-test/t/rpl_row_inexist_tbl.test@1.2.1.1, 2007-06-13 05:48:11+02:00, jmiller@mysql.com +1 -1
    Updated to use new tool(s)

ChangeSet@1.2482.85.1, 2007-06-12 19:28:05-07:00, antony@ppcg5.local +1 -0
  Bug#25800
    "Embedded server requires mysql.plugin"
    Embedded builds should not print any error when the mysql.plugin
    table does not exist. This is achieved by checking for the existance
    of the mysql.plugin table before attempting to open it and proceed
    silently if it does not exist.

  sql/sql_plugin.cc@1.67.1.1, 2007-06-12 19:28:00-07:00, antony@ppcg5.local +22 -0
    bug25800
      Embedded builds should not print any error when the mysql.plugin
      table does not exist. This is achieved by checking for the existance
      of the mysql.plugin table before attempting to open it and proceed
      silently if it does not exist.

ChangeSet@1.2482.81.3, 2007-06-12 15:23:58-06:00, malff@weblab.(none) +16 -0
  Bug#25411 (trigger code truncated), PART II
  Bug 28127 (Some valid identifiers names are not parsed correctly)
  Bug 26302 (MySQL server cuts off trailing "*/" from comments in SP/func)
  
  This patch is the second part of a major cleanup, required to fix
  Bug 25411 (trigger code truncated).
  
  The root cause of the issue stems from the function skip_rear_comments,
  which was a work around to remove "extra" "*/" characters from the query
  text, when parsing a query and reusing the text fragments to represent a
  view, trigger, function or stored procedure.
  The reason for this work around is that "special comments",
  like /*!50002 XXX */, were not parsed properly, so that a query like:
    AAA /*!50002 BBB */ CCC
  would be seen by the parser as "AAA BBB */ CCC" when the current version
  is greater or equal to 5.0.2
  
  The root cause of this stems from how special comments are parsed.
  Special comments are really out-of-bound text that appear inside a query,
  that affects how the parser behave.
  In nature, /*!50002 XXX */ in MySQL is similar to the C concept
  of preprocessing :
    #if VERSION >= 50002
    XXX
    #endif
  
  Depending on the current VERSION of the server, either the special comment
  should be expanded or it should be ignored, but in all cases the "text" of
  the query should be re-written to strip the "/*!50002" and "*/" markers,
  which does not belong to the SQL language itself.
  
  Prior to this fix, these markers would leak into :
  - the storage format for VIEW,
  - the storage format for FUNCTION,
  - the storage format for FUNCTION parameters, in mysql.proc (param_list),
  - the storage format for PROCEDURE,
  - the storage format for PROCEDURE parameters, in mysql.proc (param_list),
  - the storage format for TRIGGER,
  - the binary log used for replication.
  
  In all cases, not only this cause format corruption, but also provide a vector
  for dormant security issues, by allowing to tunnel code that will be activated
  after an upgrade.
  
  The proper solution is to deal with special comments strictly during parsing,
  when accepting a query from the outside world.
  Once a query is parsed and an object is created with a persistant
  representation, this object should not arbitrarily mutate after an upgrade.
  In short, special comments are a useful but limited feature for MYSQLdump,
  when used at an *interface* level to facilitate import/export,
  but bloating the server *internal* storage format is *not* the proper way
  to deal with configuration management of the user logic.
  
  With this fix:
  - the Lex_input_stream class now acts as a comment pre-processor,
  and either expands or ignore special comments on the fly.
  - MYSQLlex and sql_yacc.yy have been cleaned up to strictly use the
  public interface of Lex_input_stream. In particular, how the input stream
  accepts or rejects a character is private to Lex_input_stream, and the
  internal buffer pointers of that class are strictly private, and should not
  be tempered with during parsing.
  
  This caused many changes mostly in sql_lex.cc.
  
  During the code cleanup in case MY_LEX_NUMBER_IDENT,
  Bug 28127 (Some valid identifiers names are not parsed correctly)
  was found and fixed.
  
  By parsing special comments properly, and removing the function
  'skip_rear_comments' [sic],
  Bug 26302 (MySQL server cuts off trailing "*/" from comments in SP/func)
  has been fixed as well.

  mysql-test/r/comments.result@1.7, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +11 -1
    Bug#25411 (trigger code truncated)

  mysql-test/r/sp.result@1.275.2.1, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +127 -1
    Bug#25411 (trigger code truncated)
    Bug 26302 (MySQL server cuts off trailing "*/" from comments in SP/func)

  mysql-test/r/trigger.result@1.67.1.1, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +16 -0
    Bug#25411 (trigger code truncated)

  mysql-test/r/varbinary.result@1.22, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +16 -0
    Bug 28127 (Some valid identifiers names are not parsed correctly)

  mysql-test/t/comments.test@1.7, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +15 -0
    Bug#25411 (trigger code truncated)

  mysql-test/t/sp.test@1.241.1.1, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +80 -1
    Bug#25411 (trigger code truncated)
    Bug 26302 (MySQL server cuts off trailing "*/" from comments in SP/func)

  mysql-test/t/trigger.test@1.77.1.1, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +27 -0
    Bug#25411 (trigger code truncated)

  mysql-test/t/varbinary.test@1.14, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +19 -0
    Bug 28127 (Some valid identifiers names are not parsed correctly)

  sql/event_data_objects.cc@1.102, 2007-06-12 11:04:18-06:00, malff@weblab.(none) +3 -53
    Cleanup of the code that extracts the query text

  sql/sp.cc@1.155, 2007-06-12 11:04:18-06:00, malff@weblab.(none) +8 -4
    Cleanup of the code that extracts the query text

  sql/sp_head.cc@1.275.1.2, 2007-06-12 11:04:18-06:00, malff@weblab.(none) +8 -11
    Cleanup of the code that extracts the query text

  sql/sql_lex.cc@1.245.1.2, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +323 -235
    Implemented comment pre-processing in Lex_input_stream,
    major cleanup of the lex/yacc code to not use Lex_input_stream private members.

  sql/sql_lex.h@1.280.1.5, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +314 -20
    Implemented comment pre-processing in Lex_input_stream,
    major cleanup of the lex/yacc code to not use Lex_input_stream private members.

  sql/sql_trigger.cc@1.95, 2007-06-12 11:04:18-06:00, malff@weblab.(none) +17 -5
    Cleanup of the code that extracts the query text

  sql/sql_view.cc@1.138.1.1, 2007-06-12 11:04:18-06:00, malff@weblab.(none) +6 -5
    Cleanup of the code that extracts the query text

  sql/sql_yacc.yy@1.576.1.3, 2007-06-12 15:22:37-06:00, malff@weblab.(none) +2 -2
    post merge fix : view_check_options must be parsed before signaling the end of the query

  sql/sql_yacc.yy@1.576.1.2, 2007-06-12 11:14:36-06:00, malff@weblab.(none) +70 -51
    Implemented comment pre-processing in Lex_input_stream,
    major cleanup of the lex/yacc code to not use Lex_input_stream private members.

ChangeSet@1.2469.212.14, 2007-06-12 21:47:00+02:00, mats@kindahl-laptop.dnsalias.net +7 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based
  replication):
  
  Patch to add binlog format capabilities to the InnoDB storage engine.
  The engine will not allow statement format logging when in READ COMMITTED
  or READ UNCOMMITTED transaction isolation level.
  
  In addition, an error is generated when trying to use READ COMMITTED
  or READ UNCOMMITTED transaction isolation level in STATEMENT binlog
  mode.

  mysql-test/r/binlog_innodb.result@1.1, 2007-06-12 21:46:56+02:00, mats@kindahl-laptop.dnsalias.net +114 -0
    New BitKeeper file ``mysql-test/r/binlog_innodb.result''

  mysql-test/r/binlog_innodb.result@1.0, 2007-06-12 21:46:56+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/binlog_innodb.test@1.1, 2007-06-12 21:46:56+02:00, mats@kindahl-laptop.dnsalias.net +95 -0
    New BitKeeper file ``mysql-test/t/binlog_innodb.test''

  mysql-test/t/binlog_innodb.test@1.0, 2007-06-12 21:46:56+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/handler.h@1.256.3.3, 2007-06-12 21:46:54+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Adding declaration of already global arrays.

  sql/share/errmsg.txt@1.154.1.3, 2007-06-12 21:46:55+02:00, mats@kindahl-laptop.dnsalias.net +2 -6
    Adding error messages for invalid changes of transaction isolation level
    and binlog mode switch.  Removing messages that are not needed any more
    (this cset it pushed together with the cset that introduced these
    messages, so it is safe to remove the messages).

  sql/sql_base.cc@1.396.4.4, 2007-06-12 21:46:55+02:00, mats@kindahl-laptop.dnsalias.net +9 -4
    Some changes to error reporting code to get more informative messages.

  storage/innobase/handler/ha_innodb.cc@1.331.2.1, 2007-06-12 21:46:55+02:00, mats@kindahl-laptop.dnsalias.net +40 -0
    Adding capabilities to storage engine.
    
    Ha_innobase:table_flags() now compute flags on a per-statement basis
    and the statement capabilities flag is just set if the transaction
    isolation level is below READ COMMITTED.
    
    An informative message is printed in the event that the transaction
    isolation level is below READ COMMITTED and the binlog mode is STATEMENT.

  storage/innobase/handler/ha_innodb.h@1.136.2.1, 2007-06-12 21:46:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Accomodating to changes in the server code that switched from ulong
    to Table_flags as type for the table flags.

ChangeSet@1.1810.3048.1, 2007-06-12 19:49:02+02:00, kent@mysql.com +1 -0
  make_win_bin_dist:
    Aligned headers to include with Unix 'make install'

  scripts/make_win_bin_dist@1.1.13.2, 2007-06-12 19:48:53+02:00, kent@mysql.com +32 -12
    Aligned headers to include with Unix 'make install'

ChangeSet@1.2482.84.2, 2007-06-12 18:41:56+03:00, gkodinov@magare.gmz +3 -0
  5.0-opt -> 5.1-opt merge

  sql/item_func.cc@1.404, 2007-06-12 18:41:54+03:00, gkodinov@magare.gmz +3 -3
    5.0-opt -> 5.1-opt merge

  sql/sql_insert.cc@1.272.2.4, 2007-06-12 18:41:54+03:00, gkodinov@magare.gmz +2 -2
    5.0-opt -> 5.1-opt merge

  sql/sql_plugin.h@1.17, 2007-06-12 18:41:54+03:00, gkodinov@magare.gmz +2 -1
    5.0-opt -> 5.1-opt merge

ChangeSet@1.2482.82.1, 2007-06-12 17:53:16+05:00, holyfoot@mysql.com +2 -0
  Bug #28757 Test program / embedded server crash in test "unsafe_binlog_innodb"
  
  the reported test failure is fixed by the patch to 28333,
  but there's a bit more to fix in the test itself - to
  drop tables created in this test at the test's beginning.

  mysql-test/include/unsafe_binlog.inc@1.5, 2007-06-12 17:53:14+05:00, holyfoot@mysql.com +11 -11
    remove tables created later in this test
    number error codes changed with the appropriate ER_something

  mysql-test/r/unsafe_binlog_innodb.result@1.5, 2007-06-12 17:53:14+05:00, holyfoot@mysql.com +1 -1
    test result fixed

ChangeSet@1.1616.3055.3, 2007-06-12 08:47:36-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#28984: crasher on connect with out of range password length in \
  	protocol
  
  Fixed duplicated code, same as last commit.
  
  One could send a malformed packet that caused the server to SEGV.  In 
  recent versions of the password protocol, the client tells the server 
  what length the ciphertext is (almost always 20).  If that length was
  large enough to overflow a signed char, then the number would jump to 
  very large after being casted to unsigned int.
  
  Instead, cast the *passwd char to uchar.

  sql/sql_parse.cc@1.271.134.3, 2007-06-12 08:47:34-04:00, cmiller@zippy.cornsilk.net +4 -1
    Additional location of signed-char casted to uint.

ChangeSet@1.2482.52.28, 2007-06-12 15:10:33+03:00, mhansson@linux-st28.site +2 -0
  Bug#27634: group_by test fails
  
  On many architectures, e.g. 68000, x86, the double registers have higher precision 
  than the IEEE standard prescribes. When compiled with flags -O and higher, some double's 
  go into registers and therefore have higher precision. In one test case the cost 
  information of the best and second-best key were close enough to be influenced by this 
  effect, causing a failed test in distribution builds.
  
  Fixed by removing some rows from the table in question so that cost information is not
  influenced by decimals beyond standard definition of double.

  mysql-test/r/group_by.result@1.84, 2007-06-12 15:10:27+03:00, mhansson@linux-st28.site +23 -23
    Bug#27634: Altered test reslut. The only difference in the results is in the 'rows' column.

  mysql-test/t/group_by.test@1.66, 2007-06-12 15:10:27+03:00, mhansson@linux-st28.site +1 -1
    Bug#27634: Altered test case to avoid the corner case where excess precision causes 
    non-minimum costs to appear minimal.

ChangeSet@1.1810.3021.19, 2007-06-12 14:45:30+03:00, gkodinov@magare.gmz +1 -0
  removed compilation warning

  tests/mysql_client_test.c@1.167.1.63, 2007-06-12 14:45:29+03:00, gkodinov@magare.gmz +0 -1
    removed compilation warning

ChangeSet@1.1810.3046.1, 2007-06-12 14:35:36+03:00, gkodinov@magare.gmz +3 -0
  Bug #28992: trigger fails in pushbuild
   - fixed wrong test case for bug 20903
   - closed the dangling connections in trigger.test
   - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
   - fixed an omission in GET_LOCK() : assign the thread_id when
      acquiring the lock.

  mysql-test/r/trigger.result@1.29.11.14, 2007-06-12 14:35:35+03:00, gkodinov@magare.gmz +9 -6
    Bug #28992: test case updated

  mysql-test/t/trigger.test@1.34.11.15, 2007-06-12 14:35:35+03:00, gkodinov@magare.gmz +16 -5
    Bug #28992: test case updated. dangling connections closed.

  sql/item_func.cc@1.270.1.78, 2007-06-12 14:35:35+03:00, gkodinov@magare.gmz +28 -13
    Bug #28992: 
     - GET_LOCK() and RELEASE_LOCK() now produce more detailed log
     - fixed an omission in GET_LOCK() : assign the thread_id when
        acquiring the lock.

ChangeSet@1.2403.18.65, 2007-06-12 10:35:21+02:00, tomas@whalegate.ndb.mysql.com +5 -0
  Bug#29044 - memory buddy allocator "unoptimal" memory handling
  - add config param to have better behavior with large tables

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.34, 2007-06-12 10:35:19+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    Bug#29044 - memory buddy allocator "unoptimal" memory handling
    - add config param to have better behavior with large tables

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.8, 2007-06-12 10:35:19+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug#29044 - memory buddy allocator "unoptimal" memory handling
    - add config param to have better behavior with large tables

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@1.35.2.4, 2007-06-12 10:35:19+02:00, tomas@whalegate.ndb.mysql.com +6 -0
    Bug#29044 - memory buddy allocator "unoptimal" memory handling
    - add config param to have better behavior with large tables

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@1.10.1.3, 2007-06-12 10:35:19+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug#29044 - memory buddy allocator "unoptimal" memory handling
    - add config param to have better behavior with large tables

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.96.2.4, 2007-06-12 10:35:19+02:00, tomas@whalegate.ndb.mysql.com +12 -0
    Bug#29044 - memory buddy allocator "unoptimal" memory handling
    - add config param to have better behavior with large tables

ChangeSet@1.1616.3056.7, 2007-06-12 10:25:24+02:00, joerg@trift2. +1 -0
  VC++Files/sql/mysqld.vcproj
      Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.
  TAG: mysql-4.1.23

  VC++Files/sql/mysqld.vcproj@1.1.1.3, 2007-06-12 10:25:22+02:00, joerg@trift2. +41 -5
    Ensure ".pdb" and ".map" files are created for the MySQL server, in all configurations.

ChangeSet@1.2403.18.64, 2007-06-12 10:06:20+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  extend backup dump to give more info

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.62.1.3, 2007-06-12 10:06:18+02:00, tomas@whalegate.ndb.mysql.com +35 -0
    extend backup dump to give more info

ChangeSet@1.1810.3045.1, 2007-06-12 11:02:34+03:00, gkodinov@magare.gmz +2 -0
  Bug #28934: server crash when receiving malformed com_execute packets
   Sometimes a parameter slot may not get a value because of the protocol
   data being plain wrong.
   Such cases should be detected and handled by returning an error.
   Fixed by checking data stream constraints where possible (like maximum
   length) and reacting to the case where a value cannot be constructed.

  sql/sql_prepare.cc@1.142.29.1, 2007-06-12 11:02:33+03:00, gkodinov@magare.gmz +10 -0
    Bug #28934: 
     - check for a parameter slot not being set because 
        of wrong data
     - check if the length read from the stream is not
        greater than the maximum length of the field

  tests/mysql_client_test.c@1.167.1.62, 2007-06-12 11:02:33+03:00, gkodinov@magare.gmz +83 -0
    Bug #28934: test case

ChangeSet@1.2482.78.5, 2007-06-12 09:38:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Adding new files to CMakeLists.txt to make it build on Windows.

  sql/CMakeLists.txt@1.40, 2007-06-12 09:38:21+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding new files

ChangeSet@1.2403.18.63, 2007-06-12 09:13:42+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#29044
    Improve buddy high order allocation
    Make removeCommonArea O(1) instead of O(N)
    Add limit to left/right search

  storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp@1.14.1.2, 2007-06-12 09:13:39+02:00, jonas@perch.ndb.mysql.com +40 -7
    Add info to buddy module test about 
    1) loops being made in buddy
    2) how much was allocated
    

  storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp@1.10.1.1, 2007-06-12 09:13:40+02:00, jonas@perch.ndb.mysql.com +43 -18
    1) make removeCommonArea o(1) - as list is (after fix) double linked anyway
    2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea
    3) add max loops in search left/right
    4) add more debug info

ChangeSet@1.2482.81.2, 2007-06-11 18:08:51-06:00, malff@weblab.(none) +3 -0
  Resolved merge conflicts

  sql/field.cc@1.391.1.4, 2007-06-11 18:08:48-06:00, malff@weblab.(none) +1 -1
    Resolved merge conflicts

  sql/field.h@1.234, 2007-06-11 18:08:48-06:00, malff@weblab.(none) +1 -1
    Resolved merge conflicts

  sql/sql_lex.h@1.280.1.4, 2007-06-11 18:08:48-06:00, malff@weblab.(none) +27 -10
    Resolved merge conflicts

ChangeSet@1.1616.3056.6, 2007-06-12 01:33:23+02:00, kent@mysql.com +1 -0
  libmysqld.def:
    Corrected name of mysql_thread_{init,end} (bug#29007)

  libmysqld/libmysqld.def@1.10.1.1, 2007-06-12 01:30:59+02:00, kent@mysql.com +2 -2
    Corrected name of mysql_thread_{init,end} (bug#29007)

ChangeSet@1.1810.3021.16, 2007-06-12 01:41:23+04:00, evgen@moonbone.local +3 -0
  Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
  
  When the INSERT .. ON DUPLICATE KEY UPDATE has to update a matched row but
  the new data is the same as in the record then it returns as if
  no rows were inserted or updated. Nevertheless the row is silently
  updated. This leads to a situation when zero updated rows are reported 
  in the case when data has actually been changed.
  
  Now the write_record function updates a row only if new data differs from
  that in the record.

  mysql-test/r/insert_update.result@1.18.1.10, 2007-06-12 01:41:11+04:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently
    updating rows when it shouldn't.

  mysql-test/t/insert_update.test@1.20.1.7, 2007-06-12 01:41:11+04:00, evgen@moonbone.local +16 -0
    Added a test case for the bug#28904: INSERT .. ON DUPLICATE was silently
    updating rows when it shouldn't.

  sql/sql_insert.cc@1.146.1.95, 2007-06-12 01:41:09+04:00, evgen@moonbone.local +13 -13
    Bug#28904: INSERT .. ON DUPLICATE was silently updating rows when it shouldn't.
    Now the write_record function updates a row only if new data differs from
    that in the record.

ChangeSet@1.2482.76.4, 2007-06-11 15:20:46-06:00, malff@weblab.(none) +2 -0
  Manual merge of Bug 27592 (5.0-runtime to 5.1-runtime)

  sql/field.cc@1.390.2.3, 2007-06-11 15:20:42-06:00, malff@weblab.(none) +14 -10
    Manual merge of Bug#27592 (5.0-runtime to 5.1-runtime)

  tests/mysql_client_test.c@1.238.1.2, 2007-06-11 15:20:42-06:00, malff@weblab.(none) +54 -0
    Manual merge of Bug#27592 (5.0-runtime to 5.1-runtime)

ChangeSet@1.2482.11.46, 2007-06-11 22:15:39+02:00, mats@kindahl-laptop.dnsalias.net +69 -0
  BUG#24954 (Last_errno and Last_error not set after master_retry_count has
  been reached):
  
  Post-merge patch to handle all the changes to the tree since the tree
  was cloned.

  mysql-test/extra/rpl_tests/rpl_log.test@1.46, 2007-06-11 22:15:16+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/extra/rpl_tests/rpl_max_relay_size.test@1.24, 2007-06-11 22:15:16+02:00, mats@kindahl-laptop.dnsalias.net +9 -27
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/extra/rpl_tests/rpl_reset_slave.test@1.13, 2007-06-11 22:15:16+02:00, mats@kindahl-laptop.dnsalias.net +4 -12
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/include/show_slave_status.inc@1.2, 2007-06-11 22:15:17+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Column change.

  mysql-test/r/rpl_000015.result@1.47, 2007-06-11 22:15:17+02:00, mats@kindahl-laptop.dnsalias.net +118 -11
    Result file change.

  mysql-test/r/rpl_change_master.result@1.26, 2007-06-11 22:15:17+02:00, mats@kindahl-laptop.dnsalias.net +78 -6
    Result file change.

  mysql-test/r/rpl_empty_master_crash.result@1.17, 2007-06-11 22:15:17+02:00, mats@kindahl-laptop.dnsalias.net +1 -2
    Result file change.

  mysql-test/r/rpl_extraCol_innodb.result@1.5, 2007-06-11 22:15:17+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result file change.

  mysql-test/r/rpl_extraCol_myisam.result@1.5, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result file change.

  mysql-test/r/rpl_flushlog_loop.result@1.32, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result file change.

  mysql-test/r/rpl_incident.result@1.7, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
    Result file change.

  mysql-test/r/rpl_known_bugs_detection.result@1.6, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Result file change.

  mysql-test/r/rpl_loaddata.result@1.46, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result file change.

  mysql-test/r/rpl_loaddata_fatal.result@1.2, 2007-06-11 22:15:18+02:00, mats@kindahl-laptop.dnsalias.net +8 -6
    Result file change.

  mysql-test/r/rpl_log_pos.result@1.51, 2007-06-11 22:15:19+02:00, mats@kindahl-laptop.dnsalias.net +156 -12
    Result file change.

  mysql-test/r/rpl_ndb_basic.result@1.13, 2007-06-11 22:15:19+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result file change.

  mysql-test/r/rpl_ndb_circular.result@1.2, 2007-06-11 22:15:19+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
    Result file change.

  mysql-test/r/rpl_ndb_extraCol.result@1.6, 2007-06-11 22:15:19+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result file change.

  mysql-test/r/rpl_ndb_idempotent.result@1.8, 2007-06-11 22:15:19+02:00, mats@kindahl-laptop.dnsalias.net +32 -6
    Result file change.

  mysql-test/r/rpl_ndb_log.result@1.27, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +39 -3
    Result file change.

  mysql-test/r/rpl_ndb_sync.result@1.12, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +38 -2
    Result file change.

  mysql-test/r/rpl_rbr_to_sbr.result@1.9, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result file change.

  mysql-test/r/rpl_redirect.result@1.19, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Result file change.

  mysql-test/r/rpl_replicate_do.result@1.41, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +39 -3
    Result file change.

  mysql-test/r/rpl_rotate_logs.result@1.77.1.2, 2007-06-11 22:15:20+02:00, mats@kindahl-laptop.dnsalias.net +117 -9
    Result file change.

  mysql-test/r/rpl_row_inexist_tbl.result@1.9, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Result file change.

  mysql-test/r/rpl_row_log.result@1.19, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +39 -3
    Result file change.

  mysql-test/r/rpl_row_log_innodb.result@1.19, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +39 -3
    Result file change.

  mysql-test/r/rpl_row_max_relay_size.result@1.11, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result file change.

  mysql-test/r/rpl_row_reset_slave.result@1.7, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +156 -12
    Result file change.

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.13, 2007-06-11 22:15:21+02:00, mats@kindahl-laptop.dnsalias.net +5 -5
    Result file change.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.10, 2007-06-11 22:15:22+02:00, mats@kindahl-laptop.dnsalias.net +5 -5
    Result file change.

  mysql-test/r/rpl_row_until.result@1.8, 2007-06-11 22:15:22+02:00, mats@kindahl-laptop.dnsalias.net +35 -19
    Result file change.

  mysql-test/r/rpl_server_id1.result@1.17, 2007-06-11 22:15:22+02:00, mats@kindahl-laptop.dnsalias.net +38 -2
    Result file change.

  mysql-test/r/rpl_server_id2.result@1.18, 2007-06-11 22:15:23+02:00, mats@kindahl-laptop.dnsalias.net +38 -2
    Result file change.

  mysql-test/r/rpl_slave_skip.result@1.2, 2007-06-11 22:15:23+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
    Result file change.

  mysql-test/r/rpl_ssl.result@1.9, 2007-06-11 22:15:23+02:00, mats@kindahl-laptop.dnsalias.net +8 -0
    Result file change.

  mysql-test/r/rpl_ssl1.result@1.19, 2007-06-11 22:15:23+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Result file change.

  mysql-test/r/rpl_stm_log.result@1.81, 2007-06-11 22:15:24+02:00, mats@kindahl-laptop.dnsalias.net +39 -3
    Result file change.

  mysql-test/r/rpl_stm_max_relay_size.result@1.32, 2007-06-11 22:15:24+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result file change.

  mysql-test/r/rpl_stm_reset_slave.result@1.20, 2007-06-11 22:15:24+02:00, mats@kindahl-laptop.dnsalias.net +156 -12
    Result file change.

  mysql-test/r/rpl_stm_until.result@1.32, 2007-06-11 22:15:24+02:00, mats@kindahl-laptop.dnsalias.net +15 -15
    Result file change.

  mysql-test/t/rpl_000015.test@1.41.1.2, 2007-06-11 22:15:24+02:00, mats@kindahl-laptop.dnsalias.net +4 -12
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_change_master.test@1.19, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Column position change.
    Making result of SHOW SLAVE STATUS vertical.

  mysql-test/t/rpl_empty_master_crash.test@1.15, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -2
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_log_pos.test@1.41, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +4 -12
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_ndb_basic.test@1.13, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Column position change.

  mysql-test/t/rpl_ndb_idempotent.test@1.8, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.

  mysql-test/t/rpl_ndb_sync.test@1.13, 2007-06-11 22:15:25+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.
    Making result of SHOW SLAVE STATUS vertical.

  mysql-test/t/rpl_redirect.test@1.17, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_replicate_do.test@1.32, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.
    Making result of SHOW SLAVE STATUS vertical.

  mysql-test/t/rpl_rotate_logs.test@1.69.1.2, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +3 -9
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_row_inexist_tbl.test@1.4, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_row_until.test@1.5, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +5 -12
    Replacing SHOW SLAVE STATUS with include file.

  mysql-test/t/rpl_server_id1.test@1.10, 2007-06-11 22:15:26+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.
    Making result of SHOW SLAVE STATUS vertical.

  mysql-test/t/rpl_server_id2.test@1.11, 2007-06-11 22:15:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.
    Making result of SHOW SLAVE STATUS vertical.

  mysql-test/t/rpl_slave_status.test@1.12, 2007-06-11 22:15:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Column position change.

  mysql-test/t/rpl_ssl.test@1.7, 2007-06-11 22:15:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Column position change.

  mysql-test/t/rpl_ssl1.test@1.29, 2007-06-11 22:15:27+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Column position change.

  mysql-test/t/rpl_stm_until.test@1.27, 2007-06-11 22:15:27+02:00, mats@kindahl-laptop.dnsalias.net +5 -12
    Replacing SHOW SLAVE STATUS with include file.

  sql/log_event.cc@1.283, 2007-06-11 22:15:28+02:00, mats@kindahl-laptop.dnsalias.net +41 -24
    Using member function last_error() instead of member variable.
    Replacing use of 'table' with 'm_table'.
    Suppressing warnings in debug printout.
    Setting thd->net.last_error on error return from unpack_row() to get
    a non-zero error message.  The error codes for are being harmonized
    in another worklog.
    Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().

  sql/rpl_mi.h@1.6, 2007-06-11 22:15:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Moving order of include files since they are dependent (!).

  sql/rpl_record.cc@1.4, 2007-06-11 22:15:28+02:00, mats@kindahl-laptop.dnsalias.net +6 -5
    Adding missing include file.
    Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().

  sql/rpl_record_old.cc@1.4, 2007-06-11 22:15:28+02:00, mats@kindahl-laptop.dnsalias.net +6 -5
    Adding missing include file.
    Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().

  sql/rpl_reporting.cc@1.2, 2007-06-11 22:15:28+02:00, mats@kindahl-laptop.dnsalias.net +5 -4
    Adding const modifier to member function.
    Using renamed member variable m_last_error.

  sql/rpl_reporting.h@1.2, 2007-06-11 22:15:29+02:00, mats@kindahl-laptop.dnsalias.net +11 -4
    Adding missing constant MAX_SLAVE_ERRMSG.
    Adding const modifier to Slave_reporting_capability::report().
    Hiding and renaming member variable last_error and incorporating
    member function for access in order to make it mutable.

  sql/rpl_rli.h@1.16, 2007-06-11 22:15:29+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Moving constant MAX_SLAVE_ERRMSG.

  sql/rpl_utility.cc@1.8, 2007-06-11 22:15:29+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding missing include file rpl_rli.h.

  sql/slave.cc@1.312, 2007-06-11 22:15:29+02:00, mats@kindahl-laptop.dnsalias.net +17 -17
    Replacing use of member variable last_error with call to member function
    last_error().
    Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().

ChangeSet@1.2486, 2007-06-11 16:03:05-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug#28984: crasher on connect with out of range password length in \
  	protocol
  
  Update for function moved to new file in 5.1.
  
  One could send a malformed packet that caused the server to SEGV.  In 
  recent versions of the password protocol, the client tells the server 
  what length the ciphertext is (almost always 20).  If that length was
  large enough to overflow a signed char, then the number would jump to 
  very large after being casted to unsigned int.
    
  Instead, cast the *passwd char to uchar.

  sql/sql_connect.cc@1.7, 2007-06-11 16:03:03-04:00, cmiller@zippy.cornsilk.net +4 -1
    Update for function moved to new file in 5.1.

ChangeSet@1.1810.3019.3, 2007-06-11 23:06:20+04:00, kaa@polly.local +5 -0
  Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
  
  In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.

  mysql-test/r/long_tmpdir.result@1.1, 2007-06-11 23:06:18+04:00, kaa@polly.local +3 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

  mysql-test/r/long_tmpdir.result@1.0, 2007-06-11 23:06:18+04:00, kaa@polly.local +0 -0

  mysql-test/t/long_tmpdir-master.opt@1.1, 2007-06-11 23:06:18+04:00, kaa@polly.local +1 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

  mysql-test/t/long_tmpdir-master.opt@1.0, 2007-06-11 23:06:18+04:00, kaa@polly.local +0 -0

  mysql-test/t/long_tmpdir-master.sh@1.1, 2007-06-11 23:06:18+04:00, kaa@polly.local +3 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

  mysql-test/t/long_tmpdir-master.sh@1.0, 2007-06-11 23:06:18+04:00, kaa@polly.local +0 -0

  mysql-test/t/long_tmpdir.test@1.1, 2007-06-11 23:06:18+04:00, kaa@polly.local +9 -0
    Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

  mysql-test/t/long_tmpdir.test@1.0, 2007-06-11 23:06:18+04:00, kaa@polly.local +0 -0

  sql/sql_select.cc@1.312.159.1, 2007-06-11 23:06:18+04:00, kaa@polly.local +12 -8
    In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.

ChangeSet@1.2482.52.27, 2007-06-11 22:55:21+04:00, evgen@moonbone.local +1 -0
  grant2.result:
    Post merge fix.

  mysql-test/r/grant2.result@1.38, 2007-06-11 22:55:09+04:00, evgen@moonbone.local +18 -18
    Post merge fix.

ChangeSet@1.2482.59.9, 2007-06-11 17:50:39+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  make function static

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.89, 2007-06-11 17:50:36+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make function static

  storage/ndb/src/ndbapi/ndb_internal.hpp@1.3, 2007-06-11 17:50:36+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    make function static

ChangeSet@1.2482.59.8, 2007-06-11 17:28:52+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  change include file

  storage/ndb/src/ndbapi/ndb_internal.hpp@1.2, 2007-06-11 17:28:50+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    change include file

ChangeSet@1.2482.59.7, 2007-06-11 17:19:20+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/include/ndbapi/Ndb.hpp@1.63.1.1, 2007-06-11 17:19:18+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.88, 2007-06-11 17:19:18+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/src/ndbapi/ndb_internal.hpp@1.1, 2007-06-11 17:19:18+02:00, tomas@whalegate.ndb.mysql.com +27 -0
    New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''

  storage/ndb/src/ndbapi/ndb_internal.hpp@1.0, 2007-06-11 17:19:18+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.2482.52.25, 2007-06-11 17:02:16+04:00, evgen@moonbone.local +4 -0
  error_simulation.result, item.cc, subselect.result, error_simulation.test:
    Post merge fix.

  mysql-test/r/error_simulation.result@1.2, 2007-06-11 17:02:04+04:00, evgen@moonbone.local +1 -1
    Post merge fix.

  mysql-test/r/subselect.result@1.193, 2007-06-11 17:02:00+04:00, evgen@moonbone.local +6 -6
    Post merge fix.

  mysql-test/t/error_simulation.test@1.2, 2007-06-11 17:01:49+04:00, evgen@moonbone.local +1 -0
    Post merge fix.

  sql/item.cc@1.269.1.2, 2007-06-11 17:02:05+04:00, evgen@moonbone.local +1 -1
    Post merge fix.

ChangeSet@1.2482.52.23, 2007-06-11 13:38:37+04:00, evgen@moonbone.local +5 -0
  item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:
    Post merge fix.

  sql/field.cc@1.391.2.2, 2007-06-11 13:38:23+04:00, evgen@moonbone.local +2 -2
    Post merge fix.

  sql/item_cmpfunc.cc@1.280.1.2, 2007-06-11 13:38:21+04:00, evgen@moonbone.local +1 -0
    Post merge fix.

  sql/sql_class.h@1.366.1.1, 2007-06-11 13:38:19+04:00, evgen@moonbone.local +1 -0
    Post merge fix.

  sql/sql_insert.cc@1.272.2.2, 2007-06-11 13:38:17+04:00, evgen@moonbone.local +1 -0
    Post merge fix.

  sql/sql_yacc.yy@1.574.1.2, 2007-06-11 13:38:08+04:00, evgen@moonbone.local +4 -2
    Post merge fix.

ChangeSet@1.1616.3056.5, 2007-06-10 19:07:18+02:00, kent@mysql.com +2 -0
  mysqldemb.vcproj:
    Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)
  mysql.sln:
    Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
    not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)

  VC++Files/mysql.sln@1.1.1.4, 2007-06-10 18:54:06+02:00, kent@mysql.com +1 -0
    Let 'mysqlserver' project also depend on 'vio', else "vio.lib" will
    not be linked into the "mysqlserver.lib" static embedded lib (bug#29007)

  VC++Files/mysqldemb/mysqldemb.vcproj@1.1.5.1, 2007-06-10 18:56:23+02:00, kent@mysql.com +577 -1
    Added lots of missing files to make "mysqlserver.lib" complete (bug#29007)

ChangeSet@1.2482.76.2, 2007-06-10 14:43:57+04:00, kostja@bodhi.(none) +20 -0
  Follow up after work on Bug 4968
  Coding style: classes start with a capital letter.
  Rename some classes related to parsing:
  create_field -> Create_field
  foreign_key -> Foreign_key
  key_part_spec -> Key_part_spec

  sql/field.cc@1.390.2.1, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +18 -18
    create_field -> Create_field

  sql/field.h@1.228.2.1, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +15 -15
    create_field -> Create_field

  sql/item.h@1.244.1.1, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +1 -1
    create_field -> Create_field

  sql/item_sum.cc@1.219.1.2, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +2 -2
    create_field -> Create_field

  sql/mysql_priv.h@1.509.4.1, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +6 -6
    create_field -> Create_field

  sql/sp_head.cc@1.272.1.2, 2007-06-10 14:43:53+04:00, kostja@bodhi.(none) +4 -4
    create_field -> Create_field

  sql/sp_head.h@1.108.1.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +2 -2
    create_field -> Create_field

  sql/sp_pcontext.cc@1.35, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +1 -1
    create_field -> Create_field

  sql/sp_pcontext.h@1.33, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +2 -2
    create_field -> Create_field

  sql/sp_rcontext.cc@1.45, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +1 -1
    create_field -> Create_field

  sql/sql_class.cc@1.337.1.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +7 -7
    create_field -> Create_field
    key_part_spec -> Key_part_spec
    foreign_key -> Foreign_key

  sql/sql_class.h@1.363.1.2, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +18 -18
    create_field -> Create_field
    key_part_spec -> Key_part_spec
    foreign_key -> Foreign_key

  sql/sql_insert.cc@1.272.1.2, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +3 -3
    create_field -> Create_field

  sql/sql_lex.cc@1.244.1.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +1 -1
    Coding style: classes start with a capital, create_field -> Create_field

  sql/sql_lex.h@1.280.2.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +4 -4
    create_field -> Create_field
    key_part_spec -> Key_part_spec

  sql/sql_parse.cc@1.675.3.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +4 -4
    create_field -> Create_field
    key_part_spec -> Key_part_spec

  sql/sql_select.cc@1.521.4.1, 2007-06-10 14:43:54+04:00, kostja@bodhi.(none) +3 -3
    create_field -> Create_field

  sql/sql_table.cc@1.424.2.1, 2007-06-10 14:43:55+04:00, kostja@bodhi.(none) +30 -30
    create_field -> Create_field

  sql/sql_yacc.yy@1.573.2.1, 2007-06-10 14:43:55+04:00, kostja@bodhi.(none) +14 -14
    create_field -> Create_field
    key_part_spec -> Key_part_spec
    foreign_key -> Foreign_key

  sql/unireg.cc@1.103, 2007-06-10 14:43:55+04:00, kostja@bodhi.(none) +27 -27
    create_field -> Create_field

ChangeSet@1.2482.76.1, 2007-06-10 13:16:02+04:00, kostja@bodhi.(none) +1 -0
  Fix for Bug#28963 "Missing DBUG_RETURN message when stopping event 
  scheduler".
  Add missing DBUG_VOID_RETURN

  sql/event_scheduler.cc@1.45, 2007-06-10 13:15:57+04:00, kostja@bodhi.(none) +2 -0
    Fix for Bug#28963 "Missing DBUG_RETURN message when stopping event scheduler"

ChangeSet@1.1810.3021.15, 2007-06-09 18:18:34+05:00, gluh@mysql.com +1 -0
  compiler warning fix

  sql/item_strfunc.cc@1.261.1.41, 2007-06-09 18:18:32+05:00, gluh@mysql.com +1 -1
    compiler warning fix

ChangeSet@1.1810.3038.2, 2007-06-09 17:46:09+05:00, gluh@mysql.com +4 -0
  Bug#28149 overflow in some "SHOW STATUS"-variables
  changed bytes_received, bytes_sent status variables to longlong

  sql/mysqld.cc@1.439.118.1, 2007-06-09 17:46:08+05:00, gluh@mysql.com +2 -2
    changed bytes_received, bytes_sent status variables to longlong

  sql/sql_class.h@1.230.1.105, 2007-06-09 17:46:08+05:00, gluh@mysql.com +2 -2
    changed bytes_received, bytes_sent status variables to longlong

  sql/sql_show.cc@1.253.52.3, 2007-06-09 17:46:08+05:00, gluh@mysql.com +2 -0
    changed bytes_received, bytes_sent status variables to longlong

  sql/structs.h@1.53.3.2, 2007-06-09 17:46:08+05:00, gluh@mysql.com +2 -1
    changed bytes_received, bytes_sent status variables to longlong

ChangeSet@1.1810.3039.1, 2007-06-09 17:13:33+05:00, ramil@mysql.com +2 -0
  Fix for bug #28748: "Select" returning one value too few
  
  Problem: we may get unexpected results comparing [u]longlong values as doubles.
  Fix: adjust the test to use integer comparators.
  Note: it's not a real fix, we have to implement some new comparators 
  to completely solve the original problem (see my comment in the bug report).

  mysql-test/r/func_in.result@1.28.1.8, 2007-06-09 17:13:26+05:00, ramil@mysql.com +18 -9
    Fix for bug #28748: "Select" returning one value too few
      - result adjusted.

  mysql-test/t/func_in.test@1.22.1.7, 2007-06-09 17:13:27+05:00, ramil@mysql.com +19 -10
    Fix for bug #28748: "Select" returning one value too few
      - test adjusted to use integer comparisons.

ChangeSet@1.1810.3038.1, 2007-06-09 16:52:37+05:00, gluh@mysql.com +5 -0
  Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong
  IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
  the algorithm is not 'temporary'.

  mysql-test/r/information_schema.result@1.87.1.35, 2007-06-09 16:52:36+05:00, gluh@mysql.com +11 -0
    test result

  mysql-test/r/view.result@1.138.37.1, 2007-06-09 16:52:36+05:00, gluh@mysql.com +13 -0
    test result

  mysql-test/t/information_schema.test@1.65.1.26, 2007-06-09 16:52:36+05:00, gluh@mysql.com +15 -0
    test case

  mysql-test/t/view.test@1.126.1.61, 2007-06-09 16:52:36+05:00, gluh@mysql.com +4 -0
    test case

  sql/sql_show.cc@1.253.52.2, 2007-06-09 16:52:36+05:00, gluh@mysql.com +29 -1
    IS_UPDATABLE flag is set to 'yes' when the view has at least one updatable column and
    the algorithm is not 'temporary'.

ChangeSet@1.2482.52.20, 2007-06-09 16:05:43+05:00, gluh@mysql.com +10 -0
  compilation error fix

  mysql-test/include/have_archive.inc@1.4, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_blackhole.inc@1.3, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_csv.inc@1.3, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_exampledb.inc@1.3, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_federated_db.inc@1.4, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_innodb.inc@1.5, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/include/have_multi_ndb.inc@1.6, 2007-06-09 16:05:41+05:00, gluh@mysql.com +2 -2
    test fix(according to new 'support' column values)

  mysql-test/include/have_ndb.inc@1.17, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    test fix(according to new 'support' column values)

  mysql-test/r/information_schema.result@1.155, 2007-06-09 16:05:41+05:00, gluh@mysql.com +1 -1
    result fix

  sql/sql_show.cc@1.412.1.5, 2007-06-09 16:05:41+05:00, gluh@mysql.com +2 -2
    compilation error fix

ChangeSet@1.2343.60.1, 2007-06-09 07:19:37+02:00, mats@kindahl-laptop.dnsalias.net +73 -0
  BUG#24954 (Last_errno and Last_error not set after master_retry_count was reached):
  Adding new fields Last_{IO,SQL}_Errno and Last_{IO,SQL}_Error to output
  of SHOW SLAVE STATUS to hold errors from I/O and SQL thread respectively.
  Old fields Last_Error and Last_Errno are aliases for Last_SQL_Error and
  Last_SQL_Errno respectively.
  
  Fields are added last to output of SHOW SLAVE STATUS to allow old applications
  to use the same positional arguments into the row, while allowing new
  application to benefit from the added information.
  
  In addition, some new error codes are added (especially for the I/O
  thread) to be able to provide sensible error message.

  mysql-test/extra/rpl_tests/rpl_max_relay_size.test@1.21.1.1, 2007-06-09 07:19:19+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/include/show_slave_status.inc@1.1, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +6 -0
    New BitKeeper file ``mysql-test/include/show_slave_status.inc''

  mysql-test/include/show_slave_status.inc@1.0, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/r/binlog_row_mix_innodb_myisam.result@1.15.1.1, 2007-06-09 07:19:19+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_000015.result@1.40.1.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result change

  mysql-test/r/rpl_change_master.result@1.20.3.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Result change

  mysql-test/r/rpl_deadlock_innodb.result@1.16.3.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Result change

  mysql-test/r/rpl_empty_master_crash.result@1.14.1.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change

  mysql-test/r/rpl_extraCol_innodb.result@1.1.1.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +39 -7
    Result change
    ---
    Result change.

  mysql-test/r/rpl_extraCol_myisam.result@1.1.1.1, 2007-06-09 07:19:20+02:00, mats@kindahl-laptop.dnsalias.net +39 -7
    Result change
    ---
    Result change.

  mysql-test/r/rpl_flushlog_loop.result@1.26.3.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Result change

  mysql-test/r/rpl_loaddata.result@1.37.3.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result change

  mysql-test/r/rpl_loaddata_fatal.result@1.1, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +85 -0
    New BitKeeper file ``mysql-test/r/rpl_loaddata_fatal.result''

  mysql-test/r/rpl_loaddata_fatal.result@1.0, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/r/rpl_log_pos.result@1.44.3.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result change

  mysql-test/r/rpl_ndb_basic.result@1.4.4.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Result change

  mysql-test/r/rpl_ndb_extraCol.result@1.1.1.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +39 -7
    Result change
    ---
    Result change.

  mysql-test/r/rpl_ndb_idempotent.result@1.5.1.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result change

  mysql-test/r/rpl_ndb_log.result@1.16.4.1, 2007-06-09 07:19:21+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_rbr_to_sbr.result@1.3.3.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Result change

  mysql-test/r/rpl_redirect.result@1.16.1.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change

  mysql-test/r/rpl_replicate_do.result@1.37.2.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_rotate_logs.result@1.73.3.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Result change

  mysql-test/r/rpl_row_inexist_tbl.result@1.2.3.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Result change

  mysql-test/r/rpl_row_log.result@1.12.3.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_row_log_innodb.result@1.12.3.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_row_max_relay_size.result@1.5.3.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +24 -0
    Result change

  mysql-test/r/rpl_row_reset_slave.result@1.1.3.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result change

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.7.1.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +28 -4
    Result change
    ---
    Result change.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.4.1.1, 2007-06-09 07:19:23+02:00, mats@kindahl-laptop.dnsalias.net +28 -4
    Result change
    ---
    Result change.

  mysql-test/r/rpl_row_until.result@1.1.3.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result change

  mysql-test/r/rpl_server_id1.result@1.11.3.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_server_id2.result@1.12.3.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_slave_status.result@1.8.2.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Result change

  mysql-test/r/rpl_openssl.result@1.14.1.1, 2007-06-09 07:19:22+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Result change

  mysql-test/r/rpl_stm_log.result@1.73.4.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change

  mysql-test/r/rpl_stm_max_relay_size.result@1.26.3.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +24 -0
    Result change
    ---
    Result change.

  mysql-test/r/rpl_stm_reset_slave.result@1.14.3.1, 2007-06-09 07:19:24+02:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result change

  mysql-test/r/rpl_stm_until.result@1.26.3.1, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +16 -0
    Result change

  mysql-test/t/binlog_row_mix_innodb_myisam.test@1.4.1.1, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Test fixed.

  mysql-test/t/rpl_000015.test@1.38.3.1, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_change_master.test@1.18, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_empty_master_crash.test@1.14, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_flushlog_loop.test@1.16.1.1, 2007-06-09 07:19:25+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_loaddata_fatal-slave.opt@1.1, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/t/rpl_loaddata_fatal-slave.opt''

  mysql-test/t/rpl_loaddata_fatal-slave.opt@1.0, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_loaddata_fatal.test@1.1, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +19 -0
    New BitKeeper file ``mysql-test/t/rpl_loaddata_fatal.test''

  mysql-test/t/rpl_loaddata_fatal.test@1.0, 2007-06-09 07:19:31+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_log_pos.test@1.36.2.1, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_ndb_bank.test@1.8.1.1, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_ndb_basic.test@1.8.2.1, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_ndb_idempotent.test@1.7, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_ndb_sync.test@1.12, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_rbr_to_sbr.test@1.6.1.1, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_redirect.test@1.16, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_replicate_do.test@1.29.1.1, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_rotate_logs.test@1.67.3.1, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_row_inexist_tbl.test@1.3, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_row_until.test@1.2.1.1, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_server_id1.test@1.9, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_server_id2.test@1.10, 2007-06-09 07:19:27+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_slave_status.test@1.9.1.1, 2007-06-09 07:19:28+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_openssl.test@1.20.1.1, 2007-06-09 07:19:26+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  mysql-test/t/rpl_stm_until.test@1.26, 2007-06-09 07:19:28+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Commenting out irrelevant fields Last_IO_Error and Last_IO_Errno

  sql/Makefile.am@1.167.2.1, 2007-06-09 07:19:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Adding new files

  sql/log_event.cc@1.256.1.1, 2007-06-09 07:19:28+02:00, mats@kindahl-laptop.dnsalias.net +89 -75
    Changes to use Slave_reporting_capability for reporting errors.
    
    Adding debug variable to stop slave with an out-of-memory error or with
    a fatal error. The checks are put both in the new Execute_load_query_
    log_event and in the old Load_log_event which is used for Execute_load_
    log_event.
    
    Adding code to generate fatal error message.
    
    Eliminating redundant arguments when printing ER_NO_DEFAULT_FOR_FIELD
    message.

  sql/rpl_mi.cc@1.1.1.1, 2007-06-09 07:19:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Using Slave_reporting_capability for error reporting.

  sql/rpl_mi.h@1.1.1.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +3 -1
    Using Slave_reporting_capability to handle I/O thread errors and other messages.

  sql/rpl_reporting.cc@1.1, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +47 -0
    New BitKeeper file ``sql/rpl_reporting.cc''

  sql/rpl_reporting.cc@1.0, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/rpl_reporting.h@1.1, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +78 -0
    New BitKeeper file ``sql/rpl_reporting.h''

  sql/rpl_reporting.h@1.0, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/rpl_rli.cc@1.2.2.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +4 -13
    Using Slave_reporting_capability to handle SQL thread errors and other messages.

  sql/rpl_rli.h@1.7.2.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +3 -6
    Changes to use Slave_reporting_capability for reporting SQL thread error and other messages.

  sql/rpl_utility.cc@1.3.2.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +14 -10
    Changes to use Slave_reporting_capability for reporting errors.

  sql/share/errmsg.txt@1.137.1.1, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +12 -2
    New error messages.
    
    Making message for ER_NO_DEFAULT_FOR_FIELD consistent over languages
    (actually restoring old message).
    
    Adding argument to ER_SLAVE_FATAL_ERROR message.

  sql/slave.cc@1.293.17.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +87 -118
    Changes to use Slave_reporting_capability for reporting errors.

  sql/slave.h@1.102.6.1, 2007-06-09 07:19:29+02:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing slave_print_msg()

  sql/sql_repl.cc@1.157.1.1, 2007-06-09 07:19:30+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Using new names for thread masks.

ChangeSet@1.1616.3038.3, 2007-06-08 16:10:53-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #28984: crasher on connect with out of range password length in \
  	protocol
  
  One could send a malformed packet that caused the server to SEGV.  In 
  recent versions of the password protocol, the client tells the server 
  what length the ciphertext is (almost always 20).  If that length was
  large enough to overflow a signed char, then the number would jump to 
  very large after being casted to unsigned int.
  
  Instead, cast the *passwd char to uchar. 
  

  sql/sql_parse.cc@1.271.134.2, 2007-06-08 16:10:51-04:00, cmiller@zippy.cornsilk.net +4 -1
    Cast *passwd to get rid of the sign, so that sign extension doesn't
    cause the sequence 125, 126, 127, 4294967169, 4294967170.
    

ChangeSet@1.1810.3037.1, 2007-06-09 00:39:23+05:00, holyfoot@mysql.com +1 -0
  Bug #28333 Test "flush" tries to create a new thread - on only one platform
  
  on PPC/Debian Linux default stack size for a thread is too big.
  As we use default thread settings in mysqltest, the
  thread creation fails if we create lots of threads (as it
  happens in flush.test). So now stack size is explicitly specified
  for the mysqltest

  client/mysqltest.c@1.155.34.1, 2007-06-09 00:39:21+05:00, holyfoot@mysql.com +11 -1
    Bug #28333 Test "flush" tries to create a new thread - on only one platform
    
    specify appropriate stack size for the 'query' thread

ChangeSet@1.1616.3056.3, 2007-06-08 17:02:48+02:00, joerg@trift2. +1 -0
  Add a cast, needed by some platforms.
  Still part of the fix for bug#27078.

  libmysqld/lib_sql.cc@1.75.1.65, 2007-06-08 17:02:45+02:00, joerg@trift2. +1 -1
    Some platforms need a cast.
    Still part of the fix for bug#27078.

ChangeSet@1.1810.3025.13, 2007-06-08 16:20:24+02:00, msvensson@pilot.(none) +1 -0
  Turn off use of bin log when running with embedded server 

  mysql-test/mysql-test-run.pl@1.30.88.1, 2007-06-08 16:20:23+02:00, msvensson@pilot.(none) +3 -0
    Turn off use of bin log when running with embedded server 

ChangeSet@1.2482.74.1, 2007-06-08 17:12:42+03:00, gkodinov@magare.gmz +4 -0
  Bug #27816: Log tables ran with partitions crashes the server 
   when logging is enabled.
  Currently the partition engine doesn't allow log tables to
  be partitioned. But this was not checked and the server crashed.
  Fixed by adding a check in ALTER TABLE to disable partitioning the
  log tables.
  While working on the cause of the problem improved the way the log
  thread structures are initialized before opening the log tables.

  mysql-test/r/partition.result@1.65, 2007-06-08 17:12:40+03:00, gkodinov@magare.gmz +8 -0
    Bug #27816: test case

  mysql-test/t/partition.test@1.59, 2007-06-08 17:12:40+03:00, gkodinov@magare.gmz +14 -0
    Bug #27816: test case

  sql/log.cc@1.284, 2007-06-08 17:12:40+03:00, gkodinov@magare.gmz +2 -0
    Bug #27816: optional
     Improved initialization of the log threads before opening 
     the log table.
     Remedies problems that arise from open_table() et. al. 
     depending on a correctly initialized thd.
     Prerequisite for handling partitioned log tables :
     they call the parser while reading the .frm file.

  sql/sql_table.cc@1.431, 2007-06-08 17:12:40+03:00, gkodinov@magare.gmz +23 -13
    Bug #27816: throw an error when paritioning the log tables : 
     not supported by the partition engine.

ChangeSet@1.2482.52.19, 2007-06-08 18:17:51+05:00, gluh@mysql.com +2 -0
  Bug#27684 undocumented difference between SHOW ENGINES and I_S.ENGINES
  Changed SHOW ENGINES to work in the same way as I_S.ENGINES.
  For this: removed the functions mysqld_show_storage_engines and show_handlerton, and
  made SHOW ENGINES work via the common function iter_schema_engines.
  There in no test case because an engine (except of MyISAM) may be not compiled or disabled
  which may affect the test result.

  sql/sql_parse.cc@1.675.2.1, 2007-06-08 18:17:49+05:00, gluh@mysql.com +1 -3
    Changed SHOW ENGINES to work in the same way as I_S.ENGINES.

  sql/sql_show.cc@1.412.1.4, 2007-06-08 18:17:49+05:00, gluh@mysql.com +5 -56
    Changed SHOW ENGINES to work in the same way as I_S.ENGINES.
    For this: removed the functions mysqld_show_storage_engines and show_handlerton, and
    made SHOW ENGINES work via the common function iter_schema_engines.

ChangeSet@1.1810.3036.2, 2007-06-08 13:42:10+03:00, gkodinov@magare.gmz +1 -0
  Bug #28754: RPM builds differ from tar.gz in "ALTER ... RENAME" on views
   When constructing the path to the original .frm file ALTER .. RENAME
   was unnecessary (and incorrectly) lowercasing the whole path when not 
   on a case-insensitive filesystem.
   This path should not be modified because of lower_case_table_names
   as it is already in the correct case according to that setting.
   Fixed by removing the lowercasing.
   Unfortunately testing this would require running the tests on a case
   sensitive filesystem in a directory that has uppercase letters.
   This cannot be guaranteed in all setups so no test case added.

  sql/sql_table.cc@1.239.57.1, 2007-06-08 13:42:09+03:00, gkodinov@magare.gmz +0 -2
    Bug #28754: don't downcase the .frm path

ChangeSet@1.2482.59.6, 2007-06-08 12:27:52+02:00, pekka@clam.ndb.mysql.com +3 -0
  ndb - bug#28724 for blobs, op flag to not set error on trans (fix, recommit)

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.45, 2007-06-08 12:25:19+02:00, pekka@clam.ndb.mysql.com +7 -0
    add NdbOperation option m_noErrorPropagation.
    If AO_IgnoreError and it are set then operation error does not set error code on transaction.
    Private, and used by NdbBlob.cpp only.

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.57.1.1, 2007-06-08 12:25:19+02:00, pekka@clam.ndb.mysql.com +3 -0
    add NdbOperation option m_noErrorPropagation.
    If AO_IgnoreError and it are set then operation error does not set error code on transaction.
    Private, and used by NdbBlob.cpp only.

  storage/ndb/src/ndbapi/NdbOperation.cpp@1.23, 2007-06-08 12:25:19+02:00, pekka@clam.ndb.mysql.com +6 -2
    add NdbOperation option m_noErrorPropagation.
    If AO_IgnoreError and it are set then operation error does not set error code on transaction.
    Private, and used by NdbBlob.cpp only.

ChangeSet@1.1810.2976.20, 2007-06-08 14:51:32+05:00, bar@mysql.com +1 -0
  Makefile.am:
    Installing the new file required for tests.

  mysql-test/Makefile.am@1.66.1.26, 2007-06-08 14:51:17+05:00, bar@mysql.com +2 -0
    Installing the new file required for tests.

ChangeSet@1.1810.3036.1, 2007-06-08 14:42:08+05:00, gluh@mysql.com +3 -0
  Bug#18660 Can't grant any privileges on single table in database with underscore char
  In case of database level grant the database name may be a pattern,
  in case of table|column level grant the database name can not be a pattern.
  We use 'dont_check_global_grants' as a flag to determine
  if it's database level grant command 
  (see SQLCOM_GRANT case, mysql_execute_command() function) and
  set db_is_pattern according to 'dont_check_global_grants' value.

  mysql-test/r/grant2.result@1.25.2.10, 2007-06-08 14:42:07+05:00, gluh@mysql.com +18 -0
    test result

  mysql-test/t/grant2.test@1.31.2.9, 2007-06-08 14:42:07+05:00, gluh@mysql.com +30 -0
    test case

  sql/sql_parse.cc@1.426.155.1, 2007-06-08 14:42:07+05:00, gluh@mysql.com +11 -1
    In case of database level grant the database name may be a pattern,
    in case of table|column level grant the database name can not be a pattern.
    We use 'dont_check_global_grants' as a flag to determine
    if it's database level grant command 
    (see SQLCOM_GRANT case, mysql_execute_command() function) and
    set db_is_pattern according to 'dont_check_global_grants' value.

ChangeSet@1.1810.3025.12, 2007-06-08 11:30:03+02:00, msvensson@pilot.(none) +3 -0
  Bug#28369 rpl test cases fail with binlog disabled
  - Backport include/show_binlog_events.inc from 5.1 and use it to make
  the test output consistent results

  mysql-test/include/show_binlog_events.inc@1.1, 2007-06-08 11:30:02+02:00, msvensson@pilot.(none) +4 -0
    New BitKeeper file ``mysql-test/include/show_binlog_events.inc''

  mysql-test/include/show_binlog_events.inc@1.0, 2007-06-08 11:30:02+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.11.1, 2007-06-08 11:30:01+02:00, msvensson@pilot.(none) +13 -37
    Backport include/show_binlog_events.inc from 5.1 and use it to make
    the test output consistent results

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.8.1, 2007-06-08 11:30:01+02:00, msvensson@pilot.(none) +15 -15
    Backport include/show_binlog_events.inc from 5.1 and use it to make
    the test output consistent results

ChangeSet@1.2482.66.4, 2007-06-08 11:20:50+05:00, svoj@mysql.com +6 -0
  BUG#26976 - Missing table in merge not noted in related error msg +
              SHOW CREATE TABLE fails
  
  After merge fixes.

  mysql-test/r/backup.result@1.24, 2007-06-08 11:20:47+05:00, svoj@mysql.com +14 -26
    Fixed test result.

  mysql-test/r/sp.result@1.275.1.2, 2007-06-08 11:20:47+05:00, svoj@mysql.com +20 -21
    Fixed test result.

  sql/sql_table.cc@1.427.1.4, 2007-06-08 11:20:47+05:00, svoj@mysql.com +7 -1
    Fixed wrongly merged line. Moved "deprecated" warnings from sql_yacc.yy
    to mysql_backup_tables/mysql_restore_table.

  sql/sql_yacc.yy@1.577, 2007-06-08 11:20:47+05:00, svoj@mysql.com +0 -4
    Moved "deprecated" warnings from sql_yacc.yy to
    mysql_backup_tables/mysql_restore_table.

  storage/myisam/ha_myisam.cc@1.223, 2007-06-08 11:20:48+05:00, svoj@mysql.com +2 -11
    Do not report the same error twice.

  storage/myisammrg/ha_myisammrg.cc@1.122, 2007-06-08 11:20:48+05:00, svoj@mysql.com +0 -1
    Removed wrongly merged line.

ChangeSet@1.1810.3021.9, 2007-06-07 22:35:31-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28811: crash for a query containing a subquery with 
  ORDER BY and LIMIT 1. 
  The bug was introduced by the patch for bug 21727. The patch
  erroneously skipped initialization of the array of headers
  for sorted records for non-first evaluations of the subquery.
  
  To fix the problem a new parameter has been added to the
  function make_char_array that performs the initialization.
  Now this function is called for any invocation of the 
  filesort procedure. Yet it allocates the buffer for sorted
  records only if this parameter is NULL.

  mysql-test/r/subselect.result@1.134.1.60, 2007-06-07 22:35:28-07:00, igor@olga.mysql.com +26 -0
    Added a test case for bug #28811.

  mysql-test/t/subselect.test@1.129.1.27, 2007-06-07 22:35:28-07:00, igor@olga.mysql.com +32 -0
    Added a test case for bug #28811.

  sql/filesort.cc@1.105.1.16, 2007-06-07 22:35:28-07:00, igor@olga.mysql.com +11 -8
    Fixed bug #28811: crash for a query containing a subquery with 
    ORDER BY and LIMIT 1. 
    The bug was introduced by the patch for bug 21727. The patch
    erroneously skipped initialization of the array of headers
    for sorted records for non-first evaluations of the subquery.
    
    To fix the problem a new parameter has been added to the
    function make_char_array that performs the initialization.
    Now this function is called for any invocation of the 
    filesort procedure. Yet it allocates the buffer for sorted
    records only if this parameter is NULL.

ChangeSet@1.2482.67.15, 2007-06-08 07:19:17+02:00, msvensson@pilot.(none) +1 -0
  Use same abbrevation for statemtn in mboth mtr_cases.pl and mysql-test-run.pl
  to crrectly filter tests to run

  mysql-test/mysql-test-run.pl@1.302.2.10, 2007-06-08 07:19:15+02:00, msvensson@pilot.(none) +1 -1
    Use same abbrevation for statemtn in mboth mtr_cases.pl and mysql-test-run.pl
    to crrectly filter tests to run

ChangeSet@1.1810.3025.11, 2007-06-08 07:16:36+02:00, msvensson@pilot.(none) +3 -0
  Bug#28369 rpl test cases fail with binlog disabled

  mysql-test/t/binlog.test@1.4.6.1, 2007-06-08 07:16:35+02:00, msvensson@pilot.(none) +2 -2
    Update result after adding "one more select"

  mysql-test/lib/mtr_cases.pl@1.12.1.29, 2007-06-08 07:16:35+02:00, msvensson@pilot.(none) +6 -3
    Don't turn off binlog in versions prior to 5.0

  mysql-test/r/binlog.result@1.4.4.1, 2007-06-08 07:16:35+02:00, msvensson@pilot.(none) +2 -2
    Update result after adding "one more select"

ChangeSet@1.1810.3021.8, 2007-06-07 15:04:39-07:00, igor@olga.mysql.com +1 -0
  Correction to remove compilee warnings and compiler errors on Windows.

  sql/field.h@1.153.32.2, 2007-06-07 15:04:37-07:00, igor@olga.mysql.com +1 -0
    Correction to remove compilee warnings and compiler errors on Windows.

ChangeSet@1.1810.3025.10, 2007-06-07 23:18:19+02:00, msvensson@pilot.(none) +1 -0
  Bug#28718 Running backup testcase fails in mysql testsuite of MySQL-enterprise-5.0.40
   - Fix test to work on OS where backslashes are forward

  mysql-test/include/uses_vardir.inc@1.2, 2007-06-07 23:18:18+02:00, msvensson@pilot.(none) +2 -3
    Make the test work on windows too

ChangeSet@1.1616.3056.2, 2007-06-07 23:05:18+02:00, joerg@trift2. +1 -0
  Do not use the "thd" pointer to identify a thread in the embedded lib,
  but rather use the "thread_id" counter.
  
  Fixes bug#27078:
  Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision

  libmysqld/lib_sql.cc@1.75.1.64, 2007-06-07 23:05:16+02:00, joerg@trift2. +1 -1
    Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
    Do not use the "thd" pointer to identify a thread in the embedded lib,
    but rather use the "thread_id" counter.
    
    Patch is proposed by Monty.  Fixes bug#27078.

ChangeSet@1.1810.3035.1, 2007-06-08 00:33:03+04:00, evgen@moonbone.local +5 -0
  Bug#28763: Selecting geometry fields in UNION caused server crash.
  
  This bug was introduced by the fix for the bug#27300. In this fix a section
  of code was added to the Item::tmp_table_field_from_field_type method.
  This section intended to create Field_geom fields for the Item_geometry_func
  class and its descendants. In order to get the geometry type of the current
  item it casted "this" to the Item_geometry_func* type. But the
  Item::tmp_table_field_from_field_type method is also used for creation of
  fields for UNION and in this case this method is called for an object of the
  Item_type_holder class and the cast to the Item_geometry_func* type causes 
  a server crash.
  
  Now the Item::tmp_table_field_from_field_type method correctly works when it's
  called for both the Item_type_holder and the Item_geometry_func classes.
  The new geometry_type variable is added to the Item_type_holder class.
  The new method called get_geometry_type is added to the Item_field
  and the Field classes. It returns geometry type from the field for the
  Item_field and the Field_geom classes and fails an assert for other Field
  descendants.

  mysql-test/r/gis.result@1.35.1.9, 2007-06-08 00:32:55+04:00, evgen@moonbone.local +21 -0
    Added a test case for the bug#28763: Selecting geometry fields in UNION caused server crash.

  mysql-test/t/gis.test@1.29.1.8, 2007-06-08 00:32:55+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#28763: Selecting geometry fields in UNION caused server crash.

  sql/field.h@1.153.32.1, 2007-06-08 00:32:53+04:00, evgen@moonbone.local +6 -1
    Bug#28763: Selecting geometry fields in UNION caused server crash.
    The new method called get_geometry_type is added to the Field class.
    It returns geometry type of the field for the Field_geom class
    and fails an assert for other Field descendants.

  sql/item.cc@1.113.92.1, 2007-06-08 00:32:54+04:00, evgen@moonbone.local +7 -1
    Bug#28763: Selecting geometry fields in UNION caused server crash.
    Now the Item::tmp_table_field_from_field_type method correctly works when it's
    called for both the Item_type_holder and the Item_geometry_func classes.

  sql/item.h@1.183.35.1, 2007-06-08 00:32:55+04:00, evgen@moonbone.local +7 -0
    Bug#28763: Selecting geometry fields in UNION caused server crash.
    The new method called get_geometry_type is added to the Item_field class.
    It returns geometry type from the field.
    The new geometry_type variable is added to the Item_type_holder class.

ChangeSet@1.1810.3025.9, 2007-06-07 22:23:47+02:00, msvensson@pilot.(none) +2 -0
  Remove "is_debug_build.inc" and use already existing "have-debug.inc"

  BitKeeper/deleted/.del-is_debug_build.inc@1.2, 2007-06-07 22:23:25+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/include/is_debug_build.inc -> BitKeeper/deleted/.del-is_debug_build.inc

  mysql-test/t/sp-code.test@1.6.1.2, 2007-06-07 22:23:46+02:00, msvensson@pilot.(none) +1 -1
    Remove "is_debug_build.inc" and use already existing "have-debug.inc"

ChangeSet@1.2482.67.13, 2007-06-07 20:35:32+02:00, msvensson@pilot.(none) +1 -0
  Add "have_log_bin" requirement for fast skip when running without binlog

  mysql-test/include/have_binlog_format_mixed_or_statement.inc@1.2, 2007-06-07 20:35:30+02:00, msvensson@pilot.(none) +3 -0
    Add "have_log_bin" requirement for fast skip when running without binlog

ChangeSet@1.1810.3025.8, 2007-06-07 20:25:22+02:00, msvensson@pilot.(none) +4 -0
  Fix typo
  Mark one more test as needing binlog

  mysql-test/include/master-slave.inc@1.12.1.3, 2007-06-07 20:25:21+02:00, msvensson@pilot.(none) +1 -1
    Fix typo

  mysql-test/lib/mtr_cases.pl@1.12.1.28, 2007-06-07 20:25:21+02:00, msvensson@pilot.(none) +1 -1
    Fix typo

  mysql-test/r/have_log_bin.require@1.1.1.1, 2007-06-07 20:25:21+02:00, msvensson@pilot.(none) +1 -1
    Fix typo

  mysql-test/t/binlog_killed.test@1.6.1.2, 2007-06-07 20:25:21+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

ChangeSet@1.2482.67.10, 2007-06-07 19:59:06+02:00, msvensson@pilot.(none) +1 -0
  Remove last line, making it possible to merge

  BitKeeper/triggers/pre-commit@1.2.1.2, 2007-06-07 19:59:05+02:00, msvensson@pilot.(none) +0 -1
    Remove last line, making it possible to merge

ChangeSet@1.2482.72.2, 2007-06-07 19:20:49+02:00, msvensson@pilot.(none) +9 -0
  Bug#28369 rpl test cases fail with binlog disabled
   - Additional tests in 5.1 that need binlog
   - Mark more test to need binlog

  mysql-test/t/ndb_binlog_basic2.test@1.1.1.1, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/include/have_binlog_format_mixed.inc@1.2, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_mixed_or_row.inc@1.2, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_row.inc@1.2, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_statement.inc@1.2, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/r/date_formats.result@1.42.1.1, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +3 -9
    Show only the variables affected by the testcase to avoid it fails
    when running without binlog

  mysql-test/t/date_formats.test@1.32.1.1, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +3 -3
    Show only the variables affected by the testcase to avoid it fails
    when running without binlog

  mysql-test/t/ps.test@1.116.1.1, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/rpl_sf.test@1.2, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +2 -0
    Nedd binlog

ChangeSet@1.1810.3033.1, 2007-06-07 19:18:01+02:00, msvensson@pilot.(none) +25 -0
  Bug#28369 rpl test cases fail with binlog disabled
   - Turn on binlog only for tests that need it
   - Skip those tests if --skip-binlog is used

  BitKeeper/deleted/.del-ctype_cp932_notembedded.result@1.1.3.1, 2007-06-07 19:17:43+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/ctype_cp932_notembedded.result -> BitKeeper/deleted/.del-ctype_cp932_notembedded.result

  BitKeeper/deleted/.del-ctype_cp932_notembedded.test@1.1.2.1, 2007-06-07 19:17:43+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/ctype_cp932_notembedded.test -> BitKeeper/deleted/.del-ctype_cp932_notembedded.test

  mysql-test/r/sp_trans_log.result@1.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +20 -0
    New BitKeeper file ``mysql-test/r/sp_trans_log.result''

  mysql-test/r/sp_trans_log.result@1.0, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/sp_trans_log.test@1.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +33 -0
    New BitKeeper file ``mysql-test/t/sp_trans_log.test''

  mysql-test/t/sp_trans_log.test@1.0, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/binlog.test@1.4.5.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/blackhole.test@1.4.12.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/ctype_cp932_binlog.test@1.2.6.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/ctype_ucs_binlog.test@1.5.3.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/drop_temp_table.test@1.8.2.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +2 -2
    Need binlog

  mysql-test/t/insert_select-binlog.test@1.2.2.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.10.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -3
    Need binlog

  mysql-test/include/master-slave.inc@1.12.1.2, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +3 -0
    Need binlog

  mysql-test/lib/mtr_cases.pl@1.12.1.27, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +17 -0
    Turn on binlog only for tests that need it
    Skip those tests if --skip-binlog is used

  mysql-test/r/sp_trans.result@1.7.1.7, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +0 -20
    Moved to "sp_binlog"

  mysql-test/t/flush_block_commit_notembedded.test@1.1.1.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -1
    Need binlog

  mysql-test/t/innodb.test@1.118.8.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/mysqlbinlog-cp932.test@1.1.2.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/mysqlbinlog.test@1.21.9.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -2
    Need binlog

  mysql-test/t/mysqlbinlog2.test@1.7.2.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -2
    Need binlog

  mysql-test/t/mysqldump.test@1.76.20.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/rpl000017.test@1.13.1.3, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/t/rpl000015.test@1.31.8.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/t/rpl_rotate_logs.test@1.63.1.6, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/t/sp_trans.test@1.9.3.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +0 -28
    Moved to "sp_binlog"

  mysql-test/t/user_var-binlog.test@1.3.2.1, 2007-06-07 19:18:00+02:00, msvensson@pilot.(none) +1 -2
    Need binlog

ChangeSet@1.1810.3013.7, 2007-06-07 20:46:35+04:00, anozdrin@ibm. +1 -0
  Fix Windows failure.

  tests/mysql_client_test.c@1.167.33.2, 2007-06-07 20:46:32+04:00, anozdrin@ibm. +6 -6
    Fix Windows failure.

ChangeSet@1.2482.67.8, 2007-06-07 11:00:35-05:00, "Reggie"@xp. +1 -0
  reverting this file to Unix line ending so it will work on Windows

  BitKeeper/triggers/pre-commit@1.2.1.1, 2007-06-07 10:02:08-05:00, "Reggie"@xp. +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet@1.1810.3032.1, 2007-06-07 19:35:29+04:00, anozdrin@ibm. +1 -0
  Add test case for BUG#27592: stack overrun when storing datetime
  value using prepared statements.

  tests/mysql_client_test.c@1.167.33.1, 2007-06-07 19:35:26+04:00, anozdrin@ibm. +54 -0
    Test case.

ChangeSet@1.1810.3025.6, 2007-06-07 10:14:47-05:00, Reggie@xp. +1 -0
  setting pre-commit to be Unix only line endings so it will work on Windows

  BitKeeper/triggers/pre-commit@1.3, 2007-06-07 09:12:45-05:00, "Reggie"@xp. +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet@1.1810.3031.1, 2007-06-07 09:13:56-05:00, "Reggie"@xp. +1 -0
  Bug #24731 Shared memory connections do not work with MySql ran as service on Vista
  
  The events were not being opened in the global namespace.

  sql-common/client.c@1.83.1.31, 2007-06-07 07:27:07-05:00, Reggie@xp. +3 -3
    Add Global\\ to the event names so they are opened in the global namespace

ChangeSet@1.1810.3030.1, 2007-06-07 17:55:55+05:00, bar@mysql.com +9 -0
  Bug#28916 LDML doesn't work for utf8
  and is not described in the manual
  - Adding missing initialization for utf8 collations
  - Minor code clean-ups: renaming variables,
    moving code into a new separate function.
  - Adding test, to check that both ucs2 and utf8 user
    defined collations work (ucs2_test_ci and utf8_test_ci)
  - Adding Vietnamese collation as a complex user defined
    collation example.

  include/m_ctype.h@1.114.1.14, 2007-06-07 17:55:53+05:00, bar@mysql.com +2 -1
    Renaming variable names to match collation names (for convenience).

  mysql-test/r/ctype_ldml.result@1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +296 -0
    Adding test case

  mysql-test/r/ctype_ldml.result@1.0, 2007-06-07 17:55:53+05:00, bar@mysql.com +0 -0

  mysql-test/std_data/Index.xml@1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +71 -0
    Adding Index.xml example with user defined collations.

  mysql-test/std_data/Index.xml@1.0, 2007-06-07 17:55:53+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_ldml-master.opt@1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +2 -0
    Adding OPT file for the test case,
    to use the example Index.xml file.

  mysql-test/t/ctype_ldml-master.opt@1.0, 2007-06-07 17:55:53+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_ldml.test@1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +63 -0
    Adding test case

  mysql-test/t/ctype_ldml.test@1.0, 2007-06-07 17:55:53+05:00, bar@mysql.com +0 -0

  mysys/charset-def.c@1.15.1.2, 2007-06-07 17:55:53+05:00, bar@mysql.com +2 -4
    - Removing redundant declarations for variables declared in m_ctype.h
    - Renaming variable names to match collation names (for convenience).

  mysys/charset.c@1.150.1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +25 -11
    - Renaming "new" to "newcs", to avoid using C reserved word as a variable name
    - Moving UCA initialization code into a separate function
    - The bug fix itself: adding initialization of utf8 collations

  strings/ctype-uca.c@1.45.1.1, 2007-06-07 17:55:53+05:00, bar@mysql.com +2 -2
    Renaming variable names to match collation names (for convenience).

  strings/ctype.c@1.63.1.2, 2007-06-07 17:55:53+05:00, bar@mysql.com +1 -1
    Increasing buffer size to fit tailoring for languages
    with complex rules (e.g. Vietnamese).

ChangeSet@1.1810.3029.1, 2007-06-07 14:25:17+02:00, msvensson@pilot.(none) +3 -0
  Bug#28718 Running backup testcase fails in mysql testsuite
   - Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

  mysql-test/t/blackhole.test@1.4.11.1, 2007-06-07 14:25:16+02:00, msvensson@pilot.(none) +5 -1
    Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

  mysql-test/include/uses_vardir.inc@1.1, 2007-06-07 14:25:16+02:00, msvensson@pilot.(none) +15 -0
    New BitKeeper file ``mysql-test/include/uses_vardir.inc''

  mysql-test/include/uses_vardir.inc@1.0, 2007-06-07 14:25:16+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/t/backup.test@1.16.2.5, 2007-06-07 14:25:16+02:00, msvensson@pilot.(none) +5 -0
    Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR

ChangeSet@1.1616.3056.1, 2007-06-07 12:59:31+02:00, joerg@trift2. +27 -0
  netware/*.def  :  Allocate 128K stack for all executables (bug#23504)

  netware/comp_err.def@1.2.1.1, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/isamchk.def@1.5.1.1, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/isamlog.def@1.4.1.1, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/libmysql.def@1.4.1.2, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/my_print_defaults.def@1.4.1.2, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/myisam_ftdump.def@1.2.1.1, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/myisamchk.def@1.5.1.2, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/myisamlog.def@1.5.1.2, 2007-06-07 12:59:28+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/myisampack.def@1.5.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysql.def@1.4.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysql_install_db.def@1.4.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysql_test_run.def@1.4.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysql_waitpid.def@1.2.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqladmin.def@1.4.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqlbinlog.def@1.5.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqlcheck.def@1.5.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqld.def@1.3.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqld_safe.def@1.3.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqldump.def@1.5.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqlimport.def@1.5.1.3, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqlshow.def@1.4.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/mysqltest.def@1.4.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/pack_isam.def@1.4.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/perror.def@1.4.1.2, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/replace.def@1.4.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

  netware/resolve_stack_dump.def@1.2.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -1
    Allocate 128K stack for all executables (bug#23504)

  netware/resolveip.def@1.4.1.1, 2007-06-07 12:59:29+02:00, joerg@trift2. +1 -0
    Allocate 128K stack for all executables (bug#23504)

ChangeSet@1.2482.70.1, 2007-06-07 15:50:13+05:00, ramil@mysql.com +3 -0
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
  
  Problem: getting an autoincrement value for a partition table in the ::info() method we call
  the get_auto_increment() for all partitions. That may cause a problem for at least MyISAM
  tables that rely on some table state (in this particular case table->naxt_nuber_field is 
  set to 0 in the mysql_insert() and we get a crash). 
  Moreover, calling get_auto_increment() is superfluous there.
  
  Fix: use ::info(HA_STATUS_AUTO) calls to get autoincrement values for partitions instead of
  get_auto_increment() ones in the ha_partition::info().

  mysql-test/r/partition.result@1.63.1.1, 2007-06-07 15:50:07+05:00, ramil@mysql.com +14 -0
    Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
      - test result.

  mysql-test/t/partition.test@1.57.1.1, 2007-06-07 15:50:07+05:00, ramil@mysql.com +17 -0
    Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
      - test case.

  sql/ha_partition.cc@1.94, 2007-06-07 15:50:07+05:00, ramil@mysql.com +8 -14
    Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
      - use info(HA_STATUS_AUTO) calls to get autoincrement values for partitions,
        set the auto_increment_value as the biggest one.

ChangeSet@1.1810.3013.5, 2007-06-07 13:50:22+04:00, anozdrin@ibm. +3 -0
  Fix for BUG#27592: stack overrun when storing datetime value
  using prepared statements.

  sql/field.cc@1.256.55.1, 2007-06-07 13:50:19+04:00, anozdrin@ibm. +14 -10
    Using MAX_DATETIME_WIDTH or MAX_DATETIME_COMPRESSED_WIDTH
    constants for the length of DATETIME fields.
    
    Using MAX_DATE_STRING_REP_LENGTH for allocating buffers
    for date/time/... string representation.

  sql/item_timefunc.cc@1.100.32.1, 2007-06-07 13:50:19+04:00, anozdrin@ibm. +21 -11
    Using MAX_DATETIME_WIDTH or MAX_DATETIME_COMPRESSED_WIDTH
    constants for the length of DATETIME fields.
    
    Using MAX_DATE_STRING_REP_LENGTH for allocating buffers
    for date/time/... string representation.

  sql/unireg.h@1.39.1.9, 2007-06-07 13:50:20+04:00, anozdrin@ibm. +1 -0
    Introduce a constant for length of datetime compressed
    format (YYYYMMDDHHMMSS).

ChangeSet@1.2482.52.18, 2007-06-07 14:03:43+05:00, holyfoot@mysql.com +3 -0
  bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?
    
  If we have lower_case_table_names == 2 (usually on case insensitive file
  systems) we sometimes make 'homedir' part of the path sent to the
  handler into lowercase. So in this case HEAP engine couldn't properly
  find and remove HP_SHARE, what caused the bug.

  sql/handler.cc@1.310.1.1, 2007-06-07 14:03:41+05:00, holyfoot@mysql.com +24 -23
    bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?
        
    we don't turn homedirectory part of the path into lowercase

  sql/mysql_priv.h@1.509.1.4, 2007-06-07 14:03:41+05:00, holyfoot@mysql.com +1 -0
    bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?
        
    mysql_data_home_len introduced

  sql/mysqld.cc@1.646.5.1, 2007-06-07 14:03:41+05:00, holyfoot@mysql.com +4 -0
    bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?
        
    mysql_data_home_len value is set with the mysql_data_home

ChangeSet@1.2482.64.2, 2007-06-07 12:45:37+04:00, kaa@polly.local +1 -0
  Fixed tests that relied on broken behavior in acl_getroot_no_password(). 
  
  This is to fix PB failures introduced by the patch for bug #28895.

  mysql-test/r/view_grant.result@1.35, 2007-06-07 12:45:32+04:00, kaa@polly.local +6 -6
    Fixed tests that relied on broken behavior in acl_getroot_no_password().

ChangeSet@1.1810.2988.12, 2007-06-07 13:16:49+05:00, bar@mysql.com +6 -0
  Bug#26711 "Binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load"
  Problem: "SELECT INTO OUTFILE" created incorrect dumps for BLOBs,
  so "LOAD DATA" later incorrectly interpreted 0x5C as the second
  byte of a multi-byte sequence, instead of escape character.
  Fix: adding escaping of multi-byte heads.

  mysql-test/r/ctype_big5.result@1.12, 2007-06-07 13:16:47+05:00, bar@mysql.com +13 -0
    Adding test case

  mysql-test/t/ctype_big5.test@1.12, 2007-06-07 13:16:47+05:00, bar@mysql.com +17 -1
    Adding test case

  sql/sql_class.cc@1.223.1.48, 2007-06-07 13:16:47+05:00, bar@mysql.com +53 -6
    Add escape characters before multi-byte heads.

  strings/ctype-big5.c@1.80.1.12, 2007-06-07 13:16:48+05:00, bar@mysql.com +2 -2
    Flagging character set as dangerous for escaping.

  strings/ctype-gbk.c@1.78.1.4, 2007-06-07 13:16:48+05:00, bar@mysql.com +2 -2
    Flagging character set as dangerous for escaping.

  strings/ctype-sjis.c@1.88.1.6, 2007-06-07 13:16:48+05:00, bar@mysql.com +2 -2
    Flagging character set as dangerous for escaping.

ChangeSet@1.1810.3028.1, 2007-06-07 00:59:08-07:00, igor@olga.mysql.com +4 -0
  Fixed bug #28449: a crash may happen at some rare conditions when
  a temporary table has grown out of heap memory reserved for it and 
  the remaining disk space is not big enough to store the table as
  a MyISAM table.
  
  The crash happens because the function create_myisam_from_heap
  does not handle safely the mem_root structure associated 
  with the converted table in the case when an error has occurred.

  mysql-test/r/error_simulation.result@1.1, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +19 -0
    New BitKeeper file ``mysql-test/r/error_simulation.result''
    
    Added a test case for bug #28449.

  mysql-test/r/error_simulation.result@1.0, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +0 -0

  mysql-test/t/error_simulation-master.opt@1.1, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/error_simulation-master.opt''

  mysql-test/t/error_simulation-master.opt@1.0, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +0 -0

  mysql-test/t/error_simulation.test@1.1, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +29 -0
    New BitKeeper file ``mysql-test/t/error_simulation.test''
    
    Added a test case for bug #28449.

  mysql-test/t/error_simulation.test@1.0, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +0 -0

  sql/sql_select.cc@1.312.158.1, 2007-06-07 00:59:06-07:00, igor@olga.mysql.com +5 -2
    Fixed bug #28449: a crash may happen at some rare conditions when
    a temporary table has grown out of heap memory reserved for it and 
    the remaining disk space is not big enough to store the table as
    a MyISAM table.
    
    The crash happens because the function create_myisam_from_heap
    does not handle safely the mem_root structure associated 
    with the converted table in the case when an error has occurred.
    
    As it's hard to create a sitiation that would throw an error 
    a special code has been added that raises an error for a newly 
    created test called error_simulation.

ChangeSet@1.1810.3027.1, 2007-06-07 09:48:37+02:00, msvensson@pilot.(none) +1 -0
  Bug#28690 mysql-enterprise-gpl-5.0.40-linux-i686-glibc won't start on Debian Sarge
   - Only use the "hack for bug in NTPL" if using NTPL, by dynamically
     checking the thd_lib_detected flag

  mysys/my_thr_init.c@1.31.1.14, 2007-06-07 09:48:36+02:00, msvensson@pilot.(none) +24 -20
    Only start the "dummy thread hack for bug in NPTL" - if using NPTL.
    If the system uses LinuxThreads it's not needed, it actually causes 
    the "pthread manager" to be started as root and thus all subsequent
    threads will also run as root although mysqld drops root privileges, 
    this in turns causes mysqld to deadlock since the mysqlds main thread
    running as <user> can't send signals to a process owned by root.

ChangeSet@1.1810.3026.1, 2007-06-07 10:08:44+03:00, gkodinov@magare.gmz +3 -0
  Bug#28878: InnoDB tables with UTF8 character set and indexes cause 
  wrong result for DML
  When making key reference buffers over CHAR fields whitespace (0x20) 
  must be used to fill in the remaining space in the field's buffer.
  This is what Field_string::store() does.
  Fixed Field_string::get_key_image() to do the same.

  mysql-test/t/innodb_mysql.test@1.3.26.1, 2007-06-07 10:08:43+03:00, gkodinov@magare.gmz +31 -0
    Bug#28878: test case

  mysql-test/r/innodb_mysql.result@1.3.13.1, 2007-06-07 10:08:43+03:00, gkodinov@magare.gmz +36 -0
    Bug#28878: test case

  sql/field.cc@1.256.54.2, 2007-06-07 10:08:43+03:00, gkodinov@magare.gmz +2 -1
    Bug#28878: Fill with space instead of binary zeros.

ChangeSet@1.1810.3021.4, 2007-06-07 00:30:00+04:00, evgen@moonbone.local +2 -0
  Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS
  flag is set.
  
  When the CLIENT_FOUND_ROWS flag is set then the server should return
  found number of rows independently whether they were updated or not.
  But this wasn't the case for the INSERT statement which always returned
  number of rows that were actually changed thus providing wrong info to
  the user.
  
  Now the select_insert::send_eof method and the mysql_insert function
  are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.

  sql/sql_insert.cc@1.146.1.94, 2007-06-07 00:29:51+04:00, evgen@moonbone.local +10 -4
    Bug#28505: mysql_affected_rows() may return wrong result if CLIENT_FOUND_ROWS
    flag is set.
    Now the select_insert::send_eof method and the mysql_insert function
    are sending the number of touched rows if the CLIENT_FOUND_ROWS flag is set.

  tests/mysql_client_test.c@1.167.1.61, 2007-06-07 00:29:48+04:00, evgen@moonbone.local +64 -0
    Added a test case for the bug#28505: mysql_affected_rows() may return wrong result
    if CLIENT_FOUND_ROWS flag is set.

ChangeSet@1.2482.1.63, 2007-06-06 10:57:07-07:00, jimw@rama.(none) +58 -0
  Bug #28842  Different 'duplicate key' error code between 5.0 and 5.1
  
    The patch for WL 1563 added a new duplicate key error message so that the
    key name could be provided instead of the key number. But the error code
    for the new message was used even though that did not need to change.
  
    This could cause unnecessary problems for applications that used the old
    ER_DUP_ENTRY error code to detect duplicate key errors.

  mysql-test/extra/binlog_tests/insert_select-binlog.test@1.7.1.1, 2007-06-06 10:48:49-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.38.1.1, 2007-06-06 10:48:49-07:00, jimw@rama.(none) +9 -9
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_auto_increment.test@1.7, 2007-06-06 10:48:51-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_foreign_key.test@1.7, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_insert_delayed.test@1.5, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_insert_id.test@1.17, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_insert_id_pk.test@1.4, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.8, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +3 -3
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.6, 2007-06-06 10:48:52-07:00, jimw@rama.(none) +3 -3
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test@1.3, 2007-06-06 10:48:53-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/extra/rpl_tests/rpl_trig004.test@1.5, 2007-06-06 10:48:53-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/include/mix1.inc@1.35, 2007-06-06 10:48:33-07:00, jimw@rama.(none) +7 -7
    Update ER_DUP_ENTRY-related error message values

  mysql-test/include/mix2.inc@1.7, 2007-06-06 10:48:33-07:00, jimw@rama.(none) +14 -14
    Update ER_DUP_ENTRY-related error message values

  mysql-test/include/ps_modify.inc@1.8, 2007-06-06 10:48:33-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/include/query_cache.inc@1.18, 2007-06-06 10:48:33-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/include/varchar.inc@1.10, 2007-06-06 10:48:34-07:00, jimw@rama.(none) +6 -6
    Update ER_DUP_ENTRY-related error message values

  mysql-test/r/create.result@1.144, 2007-06-06 10:48:21-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/r/rpl_sp.result@1.39, 2007-06-06 10:48:28-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/r/sp.result@1.276, 2007-06-06 10:48:29-07:00, jimw@rama.(none) +8 -8
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/auto_increment.test@1.31, 2007-06-06 10:48:04-07:00, jimw@rama.(none) +5 -5
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/create.test@1.96, 2007-06-06 10:48:05-07:00, jimw@rama.(none) +10 -10
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/create_select_tmp.test@1.16, 2007-06-06 10:48:05-07:00, jimw@rama.(none) +4 -4
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ctype_ucs2_def.test@1.8, 2007-06-06 10:48:06-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ctype_utf8.test@1.106, 2007-06-06 10:48:06-07:00, jimw@rama.(none) +45 -45
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/delayed.test@1.20, 2007-06-06 10:48:06-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/heap.test@1.38, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +14 -14
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/heap_btree.test@1.27, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/heap_hash.test@1.15, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +3 -3
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/innodb.test@1.162.1.1, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +14 -14
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/insert_select.test@1.41, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/insert_update.test@1.28, 2007-06-06 10:48:07-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/join_outer.test@1.44, 2007-06-06 10:48:08-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/key.test@1.37, 2007-06-06 10:48:08-07:00, jimw@rama.(none) +6 -6
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/merge.test@1.54, 2007-06-06 10:48:08-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/myisam.test@1.86, 2007-06-06 10:48:08-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_basic.test@1.54.1.1, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +3 -3
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_charset.test@1.14, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +9 -9
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_index_unique.test@1.29, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +7 -7
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_insert.test@1.14.1.1, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_replace.test@1.9, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/ndb_update.test@1.11, 2007-06-06 10:48:09-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/replace.test@1.15, 2007-06-06 10:48:10-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/rpl_err_ignoredtable.test@1.29, 2007-06-06 10:48:11-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/rpl_ndb_do_table.test@1.4, 2007-06-06 10:48:12-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/rpl_row_create_table.test@1.13, 2007-06-06 10:48:13-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/rpl_sp.test@1.33, 2007-06-06 10:48:14-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/show_check.test@1.77, 2007-06-06 10:48:14-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/sp-error.test@1.122, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/sp.test@1.242, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +11 -11
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/sp_trans.test@1.16.1.1, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/sp_trans_log.test@1.5, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/temp_table.test@1.19, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/type_binary.test@1.6, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/type_bit.test@1.21, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/type_bit_innodb.test@1.7, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/type_blob.test@1.36, 2007-06-06 10:48:15-07:00, jimw@rama.(none) +2 -2
    Update ER_DUP_ENTRY-related error message values

  mysql-test/t/type_varchar.test@1.16, 2007-06-06 10:48:16-07:00, jimw@rama.(none) +1 -1
    Update ER_DUP_ENTRY-related error message values

  sql/handler.cc@1.311, 2007-06-06 10:49:26-07:00, jimw@rama.(none) +2 -3
    Restore use of ER_DUP_ENTRY error code even when ER_DUP_ENTRY_WITH_KEY_NAME
    error message is being used. (Bug #28842)

ChangeSet@1.1810.3021.3, 2007-06-06 18:55:21+05:00, gluh@mysql.com +4 -0
  after merge fix

  mysql-test/r/subselect.result@1.134.1.59, 2007-06-06 18:55:20+05:00, gluh@mysql.com +0 -3
    after merge fix

  mysql-test/r/subselect_notembedded.result@1.2, 2007-06-06 18:55:20+05:00, gluh@mysql.com +2 -0
    after merge fix

  mysql-test/t/subselect.test@1.129.1.26, 2007-06-06 18:55:20+05:00, gluh@mysql.com +0 -8
    after merge fix

  mysql-test/t/subselect_notembedded.test@1.2, 2007-06-06 18:55:20+05:00, gluh@mysql.com +4 -3
    after merge fix

ChangeSet@1.1616.3054.1, 2007-06-06 18:29:15+05:00, gluh@mysql.com +3 -0
  Bug#28553 mysqld crash in "purge master log before(select time from information_schema)"
  forbid the use of subselect in PURGE LOGS BEFORE command

  mysql-test/r/subselect.result@1.67.1.122, 2007-06-06 18:29:14+05:00, gluh@mysql.com +2 -0
    test result

  mysql-test/t/subselect.test@1.58.1.107, 2007-06-06 18:29:14+05:00, gluh@mysql.com +4 -3
    test case

  sql/sql_yacc.yy@1.203.1.202, 2007-06-06 18:29:14+05:00, gluh@mysql.com +5 -3
    forbid the use of subselect in PURGE LOGS BEFORE command

ChangeSet@1.1616.3053.1, 2007-06-06 15:22:06+02:00, joerg@mysql.com +1 -0
  Raise version number after cloning 4.1.23

  configure.in@1.201.74.1, 2007-06-06 15:21:55+02:00, joerg@mysql.com +2 -2
    Raise version number after cloning 4.1.23

ChangeSet@1.2482.52.17, 2007-06-06 17:47:02+05:00, gluh@mysql.com +5 -0
  Bug#28007 Wrong default value for I_S.PARTITIONS.PARTITION_COMMENT
  The value of the PARTITION_COMMENT column is an empty string if there is no partition comment.

  mysql-test/r/information_schema_part.result@1.7, 2007-06-06 17:47:01+05:00, gluh@mysql.com +27 -27
    result fix

  mysql-test/r/ndb_dd_alter.result@1.7, 2007-06-06 17:47:01+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/ndb_dd_backuprestore.result@1.12, 2007-06-06 17:47:01+05:00, gluh@mysql.com +30 -30
    result fix

  mysql-test/r/ndb_partition_range.result@1.5, 2007-06-06 17:47:01+05:00, gluh@mysql.com +3 -3
    result fix

  sql/sql_show.cc@1.412.1.3, 2007-06-06 17:47:01+05:00, gluh@mysql.com +1 -1
    The value of the PARTITION_COMMENT column is an empty string if there is no partition comment.

ChangeSet@1.2482.11.40, 2007-06-06 14:34:17+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  yellow warnings on pb. Setting the plug of a harmless warning.

  mysql-test/lib/mtr_report.pl@1.49.1.1, 2007-06-06 14:34:13+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -1
    yellow warnings on pb: Statement is not safe to log in statement format is harmless
    
     

ChangeSet@1.2482.52.16, 2007-06-06 15:59:20+05:00, gluh@mysql.com +3 -0
  Bug#28580 Repeatation of status variables
  removed duplicated variable declarations

  mysql-test/r/variables.result@1.99, 2007-06-06 15:59:18+05:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/variables.test@1.71, 2007-06-06 15:59:18+05:00, gluh@mysql.com +6 -0
    test case

  sql/set_var.cc@1.236.2.1, 2007-06-06 15:59:18+05:00, gluh@mysql.com +0 -2
    removed duplicated variable declarations

ChangeSet@1.2482.52.15, 2007-06-06 14:23:56+05:00, holyfoot@mysql.com +1 -0
  merging fix

  sql/sql_table.cc@1.430, 2007-06-06 14:23:54+05:00, holyfoot@mysql.com +1 -1
    merging fix

ChangeSet@1.2482.1.62, 2007-06-06 03:49:24+02:00, tsmith@quadxeon.mysql.com +1 -0
  mtr_report.pl:
    Add another exception to the acceptable mysqld errors, for test case for bug 28436

  mysql-test/lib/mtr_report.pl@1.50, 2007-06-06 03:49:12+02:00, tsmith@quadxeon.mysql.com +5 -1
    Add another exception to the acceptable mysqld errors, for test case for bug 28436

ChangeSet@1.1810.3022.1, 2007-06-06 04:42:41+05:00, svoj@mysql.com +20 -0
  BUG#26976 - Missing table in merge not noted in related error msg +
              SHOW CREATE TABLE fails
  
  Underlying table names, that merge engine fails to open were not
  reported.
  
  With this fix CHECK TABLE issued against merge table reports all
  underlying table names that it fails to open. Other statements
  are unaffected, that is underlying table names are not included
  into error message.
  
  This fix doesn't solve SHOW CREATE TABLE issue.

  mysql-test/r/backup.result@1.11.1.2, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -4
    Updated test result.

  mysql-test/r/key_cache.result@1.19.1.3, 2007-06-06 04:42:39+05:00, svoj@mysql.com +1 -3
    Updated test result - removed duplicate error.

  mysql-test/r/lock.result@1.17.1.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -1
    Updated test result - added summary row.

  mysql-test/r/merge.result@1.43.1.18, 2007-06-06 04:42:39+05:00, svoj@mysql.com +32 -0
    A test case for BUG#26976.

  mysql-test/r/preload.result@1.11.1.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +5 -8
    Updated test result - removed duplicate error, added summary row.

  mysql-test/r/ps.result@1.56.16.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +12 -18
    Updated test result - removed duplicate error, added summary row.

  mysql-test/r/repair.result@1.18.1.7, 2007-06-06 04:42:39+05:00, svoj@mysql.com +4 -6
    Updated test result - removed duplicate error, added summary row.

  mysql-test/r/rpl_failed_optimize.result@1.4.1.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -3
    Updated test result - removed duplicate error, added summary row.

  mysql-test/r/sp.result@1.170.41.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +18 -15
    Updated test result - removed duplicate error, added summary row.

  mysql-test/r/view.result@1.138.36.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +33 -25
    Updated test result - removed duplicate error, added summary row.

  mysql-test/t/merge.test@1.37.1.14, 2007-06-06 04:42:39+05:00, svoj@mysql.com +21 -0
    A test case for BUG#26976.

  sql/share/errmsg.txt@1.42.1.37, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -1
    Added ER_ADMIN_WRONG_MRG_TABLE errno. It is used instead
    of ER_WRONG_MRG_TABLE in case HA_OPEN_FOR_REPAIR is
    passed to merge engine handler open function.

  sql/sql_error.cc@1.36.1.4, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -2
    warning_level_* are now public. It is required by mysql_admin_table to
    report message level.

  sql/sql_error.h@1.1.1.2, 2007-06-06 04:42:39+05:00, svoj@mysql.com +2 -0
    warning_level_* are now public. It is required by mysql_admin_table to
    report message level.

  sql/sql_table.cc@1.239.56.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +24 -25
    Reorder mysql_admin_table arguments to meet it's definition.
    
    Report errors that are pending in thd->warn_list as results of
    admin function.

  sql/ha_myisam.cc@1.147.19.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +10 -11
    Do not report same error twice.

  sql/ha_myisammrg.cc@1.59.16.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +24 -2
    If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
    report names of tables that we fail to open.
    
    Added dummy ha_myisammrg::check to not confuse users with
    "not implemented" error in case all underlying tables are
    fine.

  sql/ha_myisammrg.h@1.40.5.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +1 -0
     Added ha_myisammrg::check declaration.

  myisammrg/myrg_def.h@1.11.3.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +4 -1
    Added myrg_print_wrong_table declaration.

  myisammrg/myrg_open.c@1.27.12.1, 2007-06-06 04:42:39+05:00, svoj@mysql.com +12 -0
    If HA_OPEN_FOR_REPAIR is passed to merge engine open function,
    report names of tables that we fail to open.

ChangeSet@1.2482.1.61, 2007-06-06 00:22:35+02:00, tsmith@quadxeon.mysql.com +1 -0
  ctype-bin.c:
    Post-merge fix warning

  strings/ctype-bin.c@1.78, 2007-06-06 00:22:24+02:00, tsmith@quadxeon.mysql.com +2 -1
    Post-merge fix warning

ChangeSet@1.2482.1.60, 2007-06-05 23:56:02+02:00, tsmith@quadxeon.mysql.com +1 -0
  sql_prepare.cc:
    Post-merge fix (byte -> uchar)

  sql/sql_prepare.cc@1.221, 2007-06-05 23:55:51+02:00, tsmith@quadxeon.mysql.com +1 -1
    Post-merge fix (byte -> uchar)

ChangeSet@1.1810.3021.1, 2007-06-06 00:25:06+04:00, evgen@moonbone.local +3 -0
  Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an
  integer constants.
  
  This bug is introduced by the fix for bug#16377. Before the fix the 
  Item_func_between::fix_length_and_dec method converted the second and third
  arguments to the type of the first argument if they were constant and the first
  argument is of the DATE/DATETIME type. That approach worked well for integer
  constants and sometimes produced bad result for string constants. The fix for
  the bug#16377 wrongly removed that code at all and as a result of this the
  comparison of a DATETIME field and an integer constant was carried out in a
  wrong way and sometimes led to wrong result sets.
  
  Now the Item_func_between::fix_length_and_dec method converts the second and
  third arguments to the type of the first argument if they are constant, the
  first argument is of the DATE/DATETIME type and the DATETIME comparator isn't
  applicable.

  mysql-test/r/type_datetime.result@1.30.1.16, 2007-06-06 00:25:01+04:00, evgen@moonbone.local +16 -0
    Added a test case for the bug#28778: Wrong result of BETWEEN when comparing a DATETIME
    field with an integer constants.

  mysql-test/t/type_datetime.test@1.18.1.14, 2007-06-06 00:25:02+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#28778: Wrong result of BETWEEN when comparing a DATETIME
    field with an integer constants.

  sql/item_cmpfunc.cc@1.187.41.2, 2007-06-06 00:24:11+04:00, evgen@moonbone.local +17 -0
    Bug#28778: Wrong result of BETWEEN when comparing a DATETIME field with an
    integer constants.
    Now the Item_func_between::fix_length_and_dec method converts the second and
    third arguments to the type of the first argument if they are constant, the
    first argument is of the DATE/DATETIME type and the DATETIME comparator isn't
    applicable.

ChangeSet@1.2482.11.39, 2007-06-05 23:59:05+04:00, skozlov@mysql.com +2 -0
  WL#3694, fix for events

  mysql-test/r/rpl_invoked_features.result@1.3, 2007-06-05 23:58:46+04:00, skozlov@mysql.com +5 -0
    updated result

  mysql-test/t/rpl_invoked_features.test@1.4, 2007-06-05 23:58:46+04:00, skozlov@mysql.com +5 -0
    updated test case

ChangeSet@1.1810.3019.2, 2007-06-05 22:18:07+04:00, kaa@polly.local +2 -0
  Fix for bug #28895 "Test 'information_schema_db' fails on i5/OS 32 bit".
  
  In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.

  mysql-test/r/view_grant.result@1.8.1.17, 2007-06-05 22:17:58+04:00, kaa@polly.local +2 -2
    Fixed the testcase for bug #14875 which relied on broken behavior. sctx->master_access and sctx->priv_user were being set to the last entry in the acl_users list. That does not happen after the patch for bug #28895, so we get a different warning message.

  sql/sql_acl.cc@1.128.44.1, 2007-06-05 22:17:58+04:00, kaa@polly.local +7 -6
    In acl_getroot_no_password(), use a separate variable for traversing the acl_users list so that the last entry is not used when no matching entries are found.

ChangeSet@1.2403.26.2, 2007-06-05 17:29:50+02:00, tomas@poseidon.mysql.com +18 -0
  Bug #28751  	Lots of memory locked in memory causes high kswapd
  - add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
  - writing odirect removes need for kernel write buffers avoiding kswapd to kick in

  mysql-test/ndb/ndb_config_2_node.ini@1.20.2.1, 2007-06-05 17:29:31+02:00, tomas@poseidon.mysql.com +1 -0
    run mysql-test-run using ODirect

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.31.1.2, 2007-06-05 17:29:31+02:00, tomas@poseidon.mysql.com +2 -0
    add new config parameter to choose ODirect

  storage/ndb/include/ndb_global.h.in@1.16.1.1, 2007-06-05 17:29:31+02:00, tomas@poseidon.mysql.com +2 -0
    specify alignment needed for odirect

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.62.1.2, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +42 -7
    read odirect config param
    open LCP and Backup datafiles with odirect if specified
    insert empty padding record if odirect is used
    allocate buffers aligned to be able to use odirect

  storage/ndb/src/kernel/blocks/backup/Backup.hpp@1.28, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +2 -1
    odirect and padding options

  storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp@1.10, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +9 -1
    add empty_record in file format

  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp@1.27, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +5 -2
    read odirect config and allocate aligned

  storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp@1.9, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +14 -10
    correct debug printouts

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.57.3.1, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +2 -3
    read odirect config param and align buffers

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.22.2.1, 2007-06-05 17:29:32+02:00, tomas@poseidon.mysql.com +9 -5
    read odirect config param and align buffers

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.4.1, 2007-06-05 17:29:34+02:00, tomas@poseidon.mysql.com +11 -3
    read config params and open redo log files with odirect if set

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.39, 2007-06-05 17:29:34+02:00, tomas@poseidon.mysql.com +114 -37
    aligned writing for odirect
    correct odirect open options with test+fallback if odirect fails

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.9.1.1, 2007-06-05 17:29:34+02:00, tomas@poseidon.mysql.com +4 -0
    align + odirect check

  storage/ndb/src/kernel/blocks/restore.cpp@1.12.1.2, 2007-06-05 17:29:35+02:00, tomas@poseidon.mysql.com +3 -0
    restor block to ignore new lcp padding empty_record

  storage/ndb/src/kernel/vm/SimulatedBlock.cpp@1.41, 2007-06-05 17:29:35+02:00, tomas@poseidon.mysql.com +22 -3
    alligend log buffer allocation for odirect

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp@1.31, 2007-06-05 17:29:35+02:00, tomas@poseidon.mysql.com +1 -0
    alligend log buffer allocation for odirect

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.96.3.2, 2007-06-05 17:29:35+02:00, tomas@poseidon.mysql.com +12 -0
    new config param for odirect, default false

  storage/ndb/tools/restore/Restore.cpp@1.44.2.1, 2007-06-05 17:29:35+02:00, tomas@poseidon.mysql.com +24 -5
    ndb_restore to skip empty_record alignment padding in backup file 

ChangeSet@1.2403.26.1, 2007-06-05 17:06:33+02:00, tomas@poseidon.mysql.com +10 -0
  Bug #28899  	not possible to set separate watchdog timeout at startup

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.31.1.1, 2007-06-05 17:06:23+02:00, tomas@poseidon.mysql.com +2 -0
    add new configuration parameter TimeBetweenWatchDogCheckInitial

  storage/ndb/include/portlib/NdbTick.h@1.6, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +0 -4
    enable timing code

  storage/ndb/src/common/portlib/NdbTick.c@1.7.1.1, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +1 -3
    enable timing code

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.42.4.1, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +8 -0
    read watchdog timeout to set it after malloc

  storage/ndb/src/kernel/vm/Configuration.cpp@1.56.1.1, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +10 -2
    read initial watchdog timeout and set it in the beginning

  storage/ndb/src/kernel/vm/Configuration.hpp@1.23, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +1 -0
    read initial watchdog timeout and set it in the beginning

  storage/ndb/src/kernel/vm/SimulatedBlock.cpp@1.40, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +13 -5
    introduce new state for "action" malloc of memory

  storage/ndb/src/kernel/vm/SimulatedBlock.hpp@1.30, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +2 -1
    introduce new state for "action" malloc of memory

  storage/ndb/src/kernel/vm/WatchDog.cpp@1.6.1.3, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +100 -56
    rewrite watchdog to check every 100ms for being stuch, but keep shutdown after 3 * interval
    for "action" == 9 (malloc)  keep old behavior and only output every interval

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.96.3.1, 2007-06-05 17:06:24+02:00, tomas@poseidon.mysql.com +12 -0
    add new configuration parameter TimeBetweenWatchDogCheckInitial

ChangeSet@1.2482.11.38, 2007-06-05 03:02:59+02:00, lars@mysql.com +1 -0
  Manual merge

  sql/item_create.cc@1.82, 2007-06-05 03:02:54+02:00, lars@mysql.com +1 -1
    Manual merge

ChangeSet@1.1810.3007.3, 2007-06-05 03:16:02+05:00, svoj@mysql.com +1 -0
  BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug mode
  
  Original problem was fixed by Magnus (see BUG25807).
  
  Currently only windows debug build causes assertion failure. This patch assures
  that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro.

  mysys/my_seek.c@1.11.1.12, 2007-06-05 03:16:00+05:00, svoj@mysql.com +1 -0
    Added assertion in case my_tell gets wrong file descriptor.

ChangeSet@1.2482.11.35, 2007-06-04 20:44:25+04:00, skozlov@mysql.com +2 -0
  WL#3694

  mysql-test/r/rpl_invoked_features.result@1.2, 2007-06-04 20:44:16+04:00, skozlov@mysql.com +6 -2
    updated result

  mysql-test/t/rpl_invoked_features.test@1.3, 2007-06-04 20:44:16+04:00, skozlov@mysql.com +9 -2
    updated test

ChangeSet@1.2482.51.5, 2007-06-04 18:56:29+03:00, gkodinov@macbook.gmz +5 -0
  Bug #28488: Incorrect information in file: './test/t1_test#.frm'
  While executing ALTER TABLE ... PARTITION the server uses 
  a temporary "shadow" table to create the updated table.
  This shadow table then gets renamed as the original table.
  The shadow table was not prefixed with the special prefix that
  marks temporary tables so it was picked up by SHOW TABLE STATUS.
  Fixed by isolating the code to create the shadow table name in a
  separate function and prefixing the shadow table name with the
  special prefix to exclude it from the list of user tables.
  See bug 18775 and WL1324 for details.

  mysql-test/r/partition.result@1.64, 2007-06-04 18:56:05+03:00, gkodinov@macbook.gmz +10 -0
    Bug #28488: test case

  mysql-test/t/partition.test@1.58, 2007-06-04 18:56:06+03:00, gkodinov@macbook.gmz +17 -0
    Bug #28488: test case

  sql/mysql_priv.h@1.509.3.1, 2007-06-04 18:56:08+03:00, gkodinov@macbook.gmz +2 -0
    Bug #28488: prefix shadow file with the temp prefix

  sql/sql_partition.cc@1.103.1.2, 2007-06-04 18:56:09+03:00, gkodinov@macbook.gmz +3 -6
    Bug #28488: prefix shadow file with the temp prefix

  sql/sql_table.cc@1.416.1.6, 2007-06-04 18:56:11+03:00, gkodinov@macbook.gmz +26 -2
    Bug #28488: prefix shadow file with the temp prefix

ChangeSet@1.1616.3052.1, 2007-06-04 16:42:42+02:00, msvensson@pilot.(none) +2 -0
  Bug#10218 Command line recall rolls into Segmentation Fault(coredump)'
   - Declare 'tgoto' if not already declared in system header files. 

  cmd-line-utils/libedit/el_term.h@1.2, 2007-06-04 16:42:35+02:00, msvensson@pilot.(none) +10 -0
    Declare 'tgoto' if not already declared in system header files. Failing
    to declare it will cause the pointer returned to be truncated
    to 32-bit integer which is no a valid pointer - in most cases. 

  configure.in@1.201.73.1, 2007-06-04 16:42:35+02:00, msvensson@pilot.(none) +13 -0
    Add check to see if 'tgoto' is declared in system header files

ChangeSet@1.2482.52.11, 2007-06-04 05:55:27-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/subselect.result@1.190, 2007-06-04 05:55:24-07:00, igor@olga.mysql.com +3 -3
    Post-merge fix.

ChangeSet@1.2482.11.34, 2007-06-04 16:50:29+04:00, skozlov@mysql.com +1 -0
  WL#3694, updated by pushbuild errors

  mysql-test/t/rpl_invoked_features.test@1.2, 2007-06-04 16:50:24+04:00, skozlov@mysql.com +6 -0
    Disable warnings for some queries 

ChangeSet@1.2482.60.2, 2007-06-04 14:29:54+02:00, df@pippilotta.erinye.com +1 -0
  BUG#28860 port to 5.1

  client/CMakeLists.txt@1.20, 2007-06-04 14:29:52+02:00, df@pippilotta.erinye.com +4 -0
    Use USE_TLS for mysqlclient.lib

ChangeSet@1.1810.2999.8, 2007-06-04 14:12:31+02:00, df@pippilotta.erinye.com +1 -0
  BUG#28860 USE_TLS not defined for mysqlclient.lib

  client/CMakeLists.txt@1.1.7.1, 2007-06-04 14:12:30+02:00, df@pippilotta.erinye.com +4 -0
    Bug#28860 Define USE_TLS for mysqlclient.lib

ChangeSet@1.2482.11.32, 2007-06-04 15:02:40+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +7 -0
  Bug #27716  	multi-update did partially and has not binlogged
  
  manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.

  mysql-test/r/innodb.result@1.195, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +36 -3
    results changed because of some more queries are added

  mysql-test/r/multi_update.result@1.49, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +5 -4
    results changed

  mysql-test/r/rpl_row_basic_11bugs.result@1.17, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +24 -0
    results changed

  mysql-test/t/innodb.test@1.164, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -2
    error code is diff in 5.0

  mysql-test/t/multi_update.test@1.54, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +10 -5
    making explicit comments and forcing execution in mixed (stmt) mode.

  mysql-test/t/rpl_row_basic_11bugs.test@1.16, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +39 -0
    checking how binlogging works when a query on non-ta table completed partly.

  sql/sql_update.cc@1.239.1.5, 2007-06-04 15:02:37+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +3 -3
    manual merge after authomatic one failed (semantic drift)

ChangeSet@1.2482.58.4, 2007-06-04 14:45:36+04:00, skozlov@mysql.com +2 -0
  WL#3694, Added option files for master/slave

  mysql-test/t/rpl_invoked_features-master.opt@1.1, 2007-06-04 14:45:04+04:00, skozlov@mysql.com +1 -0
    Option file for master

  mysql-test/t/rpl_invoked_features-master.opt@1.0, 2007-06-04 14:45:04+04:00, skozlov@mysql.com +0 -0

  mysql-test/t/rpl_invoked_features-slave.opt@1.1, 2007-06-04 14:45:04+04:00, skozlov@mysql.com +1 -0
    Option file for slave

  mysql-test/t/rpl_invoked_features-slave.opt@1.0, 2007-06-04 14:45:04+04:00, skozlov@mysql.com +0 -0

ChangeSet@1.2482.58.3, 2007-06-04 14:39:34+04:00, skozlov@mysql.com +2 -0
  WL#3694, Result file for test case moved to proper directory

  BitKeeper/deleted/.del-rpl_invoked_features.result@1.2, 2007-06-04 14:36:34+04:00, skozlov@mysql.com +0 -0
    Delete: mysql-test/t/rpl_invoked_features.result

  mysql-test/r/rpl_invoked_features.result@1.1, 2007-06-04 14:38:50+04:00, skozlov@mysql.com +442 -0
    Result file for test case

  mysql-test/r/rpl_invoked_features.result@1.0, 2007-06-04 14:38:50+04:00, skozlov@mysql.com +0 -0

ChangeSet@1.2482.58.2, 2007-06-04 14:18:22+04:00, skozlov@mysql.com +2 -0
  WL#3694 Replication of Invocation and Invoked Features Testing

  mysql-test/t/rpl_invoked_features.result@1.1, 2007-06-04 14:18:04+04:00, skozlov@mysql.com +442 -0
    result file

  mysql-test/t/rpl_invoked_features.result@1.0, 2007-06-04 14:18:04+04:00, skozlov@mysql.com +0 -0

  mysql-test/t/rpl_invoked_features.test@1.1, 2007-06-04 14:18:04+04:00, skozlov@mysql.com +264 -0
    WL#3694 test case

  mysql-test/t/rpl_invoked_features.test@1.0, 2007-06-04 14:18:04+04:00, skozlov@mysql.com +0 -0

ChangeSet@1.2482.52.9, 2007-06-04 03:03:15-07:00, igor@olga.mysql.com +9 -0
  Post-merge fix.

  mysql-test/r/ps_2myisam.result@1.60, 2007-06-04 03:03:12-07:00, igor@olga.mysql.com +16 -16
    Post-merge fix.

  mysql-test/r/ps_3innodb.result@1.63, 2007-06-04 03:03:12-07:00, igor@olga.mysql.com +16 -16
    Post-merge fix.

  mysql-test/r/ps_4heap.result@1.59, 2007-06-04 03:03:12-07:00, igor@olga.mysql.com +16 -16
    Post-merge fix.

  mysql-test/r/ps_5merge.result@1.60, 2007-06-04 03:03:12-07:00, igor@olga.mysql.com +32 -32
    Post-merge fix.

  mysql-test/r/ps_7ndb.result@1.59, 2007-06-04 03:03:13-07:00, igor@olga.mysql.com +16 -16
    Post-merge fix.

  sql/sql_lex.cc@1.245, 2007-06-04 03:03:13-07:00, igor@olga.mysql.com +4 -1
    Post-merge fix.

  sql/sql_lex.h@1.280.1.2, 2007-06-04 03:03:13-07:00, igor@olga.mysql.com +27 -10
    Post-merge fix.

  sql/sql_table.cc@1.426, 2007-06-04 03:03:13-07:00, igor@olga.mysql.com +27 -19
    Post-merge fix.

  sql/sql_view.cc@1.137, 2007-06-04 03:03:13-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

ChangeSet@1.2403.18.61, 2007-06-04 11:58:25+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#28726
    make sure to remove LCP files aswell if specifying --initial

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.42.2.4, 2007-06-04 11:58:23+02:00, jonas@perch.ndb.mysql.com +24 -6
    Add removal of LCP/X directories

ChangeSet@1.2482.59.3, 2007-06-04 10:32:32+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    update dl145a config for autotest

  storage/ndb/test/run-test/conf-dl145a.cnf@1.2, 2007-06-04 10:32:29+02:00, jonas@perch.ndb.mysql.com +3 -0
    update dl145a config for autotest

ChangeSet@1.2403.18.60, 2007-06-04 10:27:10+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - make size of redo log files (fragment log files) configurable
    using new config variable FragmentLogFileSize (4M - 1G)

  mysql-test/ndb/ndb_config_1_node.ini@1.4.1.1, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +2 -1
    change log file size (test)

  mysql-test/ndb/ndb_config_2_node.ini@1.20.1.1, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +2 -1
    change log file size (test)

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@1.32, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new confif parameter

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.57.1.4, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +7 -6
    make logfile size configurable

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.22.1.2, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +3 -0
    make logfile size configurable

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.2.12, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +167 -115
    make logfile size configurable

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@1.96.2.2, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +12 -0
    add new config variable

  storage/ndb/src/ndbapi/ndberror.c@1.82.1.6, 2007-06-04 10:27:07+02:00, jonas@perch.ndb.mysql.com +1 -1
    update error message

ChangeSet@1.2482.1.54, 2007-06-04 11:52:14+05:00, ramil@mysql.com +1 -0
  after-merge fix.

  mysql-test/r/innodb_mysql.result@1.33.2.2, 2007-06-04 11:52:12+05:00, ramil@mysql.com +1 -1
    result adjusted.

ChangeSet@1.2482.57.7, 2007-06-03 21:52:00+04:00, evgen@moonbone.local +2 -0
  item_func.h, item_func.cc:
    Post merge fix for the bug#28494.

  sql/item_func.cc@1.401, 2007-06-03 21:51:37+04:00, evgen@moonbone.local +17 -0
    Post merge fix for the bug#28494.

  sql/item_func.h@1.173, 2007-06-03 21:51:03+04:00, evgen@moonbone.local +1 -0
    Post merge fix for the bug#28494.

ChangeSet@1.2403.18.59, 2007-06-03 19:30:37+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#20612.

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.4, 2007-06-03 19:30:35+02:00, tomas@whalegate.ndb.mysql.com +7 -0
    a) in one case pl_queue.remove(ptr) was not followed
    by state &= ~ Page_entry::ONQUEUE.
    
    b) when collecting initial hot entries have to remove
    from queue if somehow got there.
    
    b) is easy to get with large buffer cache (256M).
    a) or b) is probably cause of bug#20612.

ChangeSet@1.1810.3016.4, 2007-06-03 15:56:48+04:00, evgen@moonbone.local +3 -0
  user_var.result:
    Corrected test case result for the bug#28494.
  item_func.h, item_func.cc:
    Corrected function names after fix for the bug#28494.

  mysql-test/r/user_var.result@1.37.1.11, 2007-06-03 15:21:20+04:00, evgen@moonbone.local +6 -6
    Corrected test case result for the bug#28494.

  sql/item_func.cc@1.270.1.77, 2007-06-03 15:21:53+04:00, evgen@moonbone.local +2 -2
    Corrected function names after fix for the bug#28494.

  sql/item_func.h@1.136.2.35, 2007-06-03 15:21:32+04:00, evgen@moonbone.local +2 -2
    Corrected function names after fix for the bug#28494.

ChangeSet@1.1810.3016.3, 2007-06-03 14:46:09+04:00, evgen@moonbone.local +2 -0
  user_var.result, user_var.test:
    Extended test case for the bug#28494.

  mysql-test/r/user_var.result@1.37.1.10, 2007-06-03 14:43:04+04:00, evgen@moonbone.local +23 -2
    Extended test case for the bug#28494.

  mysql-test/t/user_var.test@1.35.1.7, 2007-06-03 14:42:34+04:00, evgen@moonbone.local +8 -2
    Extended test case for the bug#28494.

ChangeSet@1.1810.3018.1, 2007-06-03 09:40:00+03:00, gkodinov@macbook.gmz +6 -0
  Bug #26162: Trigger DML ignores low_priority_updates setting
    
  The value of "low-priority-updates" option and the LOW PRIORITY
  prefix was taken into account at parse time.
  This caused triggers (among others) to ignore this flag (if
  supplied for the DML statement).
  Moved reading of the LOW_PRIORITY flag at run time.
  Fixed an incosistency when handling
  SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
  delayed INSERTs.
  Tested by checking the effect of LOW_PRIORITY flag via a 
  trigger.

  include/thr_lock.h@1.17.1.3, 2007-06-03 09:38:52+03:00, gkodinov@macbook.gmz +5 -0
    Bug #26162: moved reading of the LOW PRIORITY flag at run time

  mysql-test/r/trigger.result@1.29.14.1, 2007-06-03 09:38:56+03:00, gkodinov@macbook.gmz +24 -0
    Bug #26162: test case

  mysql-test/t/trigger.test@1.34.17.1, 2007-06-03 09:39:03+03:00, gkodinov@macbook.gmz +55 -0
    Bug #26162: test case

  sql/set_var.cc@1.125.29.1, 2007-06-03 09:39:09+03:00, gkodinov@macbook.gmz +5 -1
    Bug #26162: fixed the handling of the "low-priority-updates" option

  sql/sql_base.cc@1.235.104.2, 2007-06-03 09:39:15+03:00, gkodinov@macbook.gmz +7 -0
    Bug #26162: moved reading of the LOW PRIORITY flag at run time

  sql/sql_yacc.yy@1.371.109.1, 2007-06-03 09:39:22+03:00, gkodinov@macbook.gmz +6 -6
    Bug #26162: moved reading of the LOW PRIORITY flag at run time

ChangeSet@1.1810.3016.2, 2007-06-03 01:24:56+04:00, evgen@moonbone.local +1 -0
  item_func.cc:
    Post fix for bug#28494.
    The Item_func_set_user_var::check method now silently doesn't use result_field
    if it isn't defined.

  sql/item_func.cc@1.270.1.76, 2007-06-03 01:21:14+04:00, evgen@moonbone.local +2 -2
    Post fix for bug#28494.
    The Item_func_set_user_var::check method now silently doesn't use result_field
    if it isn't defined.

ChangeSet@1.1810.3016.1, 2007-06-02 23:17:46+04:00, evgen@moonbone.local +4 -0
  Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
  
  This is an additional fix.
  Item::val_xxx methods are supposed to use original data source and
  Item::val_xxx_result methods to use the item's result field. But for the
  Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
  methods. This leads, in particular, to producing bad sort keys and thus
  wrong order of the result set of queries with group by/order by clauses.
  
  The set of val_xxx_result methods is added to the Item_func_set_user_var
  class. It's the same as the val_xxx set of method but uses the result_field
  to return a value.

  mysql-test/r/user_var.result@1.37.1.9, 2007-06-02 23:17:40+04:00, evgen@moonbone.local +11 -3
    Corrected test case for hte bug#28494.

  mysql-test/t/user_var.test@1.35.1.6, 2007-06-02 23:17:38+04:00, evgen@moonbone.local +3 -2
    Corrected test case for hte bug#28494.

  sql/item_func.cc@1.270.1.75, 2007-06-02 23:17:40+04:00, evgen@moonbone.local +34 -0
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The set of val_xxx_result methods is added to the Item_func_set_user_var
    class. It's the same as the val_xxx set of method but uses the result_field
    to return a value.

  sql/item_func.h@1.136.2.34, 2007-06-02 23:17:40+04:00, evgen@moonbone.local +4 -0
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The set of val_xxx_result methods is added to the Item_func_set_user_var
    class.

ChangeSet@1.2482.58.1, 2007-06-02 21:01:30+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#28752 (binlog_format variable is empty when binlog is turned off):
  Setting MIXED format instead of UNSPECIFIED format when server is
  started without log-bin.

  sql/mysqld.cc@1.645.3.3, 2007-06-02 21:01:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Setting MIXED format instead of UNSPECIFIED format when server is
    started without log-bin.

ChangeSet@1.1810.2976.11, 2007-06-02 11:44:16-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query
  using a derived table over a grouping subselect.
  
  This crash happens only when materialization of the derived tables 
  requires creation of auxiliary temporary table, for example when
  a grouping operation is carried out with usage of a temporary table.
  
  The crash happened because EXPLAIN EXTENDED when printing the query
  expression made an attempt to use the objects created in the mem_root
  of the temporary table which has been already freed by the moment
  when printing is called.
  
  This bug appeared after the method Item_field::print() had been 
  introduced.    

  mysql-test/r/subselect.result@1.134.1.57, 2007-06-02 11:44:11-07:00, igor@olga.mysql.com +10 -0
    Added a test case for bug #28728.

  mysql-test/t/subselect.test@1.129.1.24, 2007-06-02 11:44:11-07:00, igor@olga.mysql.com +14 -0
    Added a test case for bug #28728.

  sql/sql_select.cc@1.312.1.217, 2007-06-02 11:44:12-07:00, igor@olga.mysql.com +11 -0
    Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query
    using a derived table over a grouping subselect.
    The crash happened because EXPLAIN EXTENDED when printing the query
    expression made an attempt to use the objects created in the mem_root
    of the temporary table which has been already freed by the moment
    when printing is accomplished.
    The fix in JOIN::exec() ensures using existing objects when printing 
    subselects for a derived tables by EXPLAIN EXTENDED.
      

ChangeSet@1.2482.57.3, 2007-06-02 21:43:04+04:00, sergefp@mysql.com +1 -0
  BUG#28427: fix typo, s/bool/uint/

  sql/sql_table.cc@1.416.1.5, 2007-06-02 21:42:49+04:00, sergefp@mysql.com +1 -1
    BUG#28427: fix typo, s/bool/uint/

ChangeSet@1.1810.2976.10, 2007-06-01 17:58:46-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  sql/sql_view.cc@1.78.1.35, 2007-06-01 17:58:44-07:00, igor@olga.mysql.com +7 -102
    Post-merge fix.

ChangeSet@1.2482.56.2, 2007-06-01 20:37:45-04:00, iggy@amd64.(none) +1 -0
  Post Merge fixup.

  CMakeLists.txt@1.30.1.1, 2007-06-01 20:37:43-04:00, iggy@amd64.(none) +1 -1
    Post Merge fixup.

ChangeSet@1.2482.57.1, 2007-06-02 01:21:18+04:00, evgen@moonbone.local +3 -0
  Bug#28427: Columns were renamed instead of moving by ALTER TABLE.
  
  To avoid unnecessary work the mysql_alter_table function takes the
  list of table fields and applies all changes to it (drops/moves/renames/etc).
  Then this function compares the new list and the old one. If the changes
  require only .frm to be modified then the actual data isn't copied. To detect
  changes all columns attributes but names are compared. When a column has been
  moved and has replaced another column with the same attributes except name
  the mysql_alter_table function wrongly decides that two fields has been just
  renamed. As a result the data from the moved column and from all columns
  after it is not copied.
  
  Now the mysql_alter_table function forces table data copying by setting
  the need_copy_table flag when it finds a moved column. The flag is set at
  the stage when the modified fields are created.
  

  mysql-test/r/alter_table.result@1.81.1.2, 2007-06-02 01:21:12+04:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.

  mysql-test/t/alter_table.test@1.64.1.2, 2007-06-02 01:21:13+04:00, evgen@moonbone.local +12 -0
    Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.

  sql/sql_table.cc@1.416.1.4, 2007-06-02 01:20:57+04:00, evgen@moonbone.local +4 -1
    Bug#28427: Columns were renamed instead of moving by ALTER TABLE.
    Now the mysql_alter_table function forces table data copying by setting
    the need_copy_table flag when it finds a moved column. The flag is set at
    the stage when the modified fields are created.

ChangeSet@1.1810.3015.1, 2007-06-01 16:48:23-04:00, iggy@amd64.(none) +2 -0
  Bug #24732 Executables do not include Vista manifests
  - Cleanup typo.
  - Make sure to only embedded four part numberic version.

  CMakeLists.txt@1.1.22.1, 2007-06-01 16:48:22-04:00, iggy@amd64.(none) +1 -1
    Bug #24732 Executables do not include Vista manifests
    - Correct typo in manifest detection logic.

  win/create_manifest.js@1.3, 2007-06-01 16:48:22-04:00, iggy@amd64.(none) +5 -1
    Bug #24732 Executables do not include Vista manifests
    - Remove -* from the end of version string before embedding
    into manifest.

ChangeSet@1.2482.54.3, 2007-06-01 21:04:26+02:00, joerg@debian.(none) +1 -0
  Exclude the "row_lock" test suite from a source tarball ("make dist")
  and, as a consequence, from binary packages.
  This is necessary because of entry 28685 in the bugs DB.

  mysql-test/Makefile.am@1.106, 2007-06-01 21:04:17+02:00, joerg@debian.(none) +2 -2
    Exclude the "row_lock" test suite from a source tarball ("make dist")
    and, as a consequence, from binary packages.
    This is necessary because of entry 28685 in the bugs DB.

ChangeSet@1.1616.3050.3, 2007-06-01 19:57:26+02:00, msvensson@pilot.(none) +1 -0
  Move code after variable delcaration

  client/mysqltest.c@1.92.21.68, 2007-06-01 19:57:26+02:00, msvensson@pilot.(none) +1 -1
    Move code after variable delcaration

ChangeSet@1.1810.3014.1, 2007-06-01 22:53:50+05:00, ramil@mysql.com +3 -0
  Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
  
  Problem: we may create a deadlock committing changes in the mysql_alter_table() when 
  LOCK_open is set. Moreover, "in some variants of the ALTER TABLE commit
  happens earlier, outside of LOCK_open, in other later - inside. It's no good, a storage 
  engine code that is called in between could expect a consistency - either there is a 
  transaction or there is not".
  Fix: move the commit to happen earlier and outside of the LOCK_open.

  mysql-test/t/innodb_mysql.test@1.3.25.1, 2007-06-01 22:53:49+05:00, ramil@mysql.com +8 -0
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - test case.

  mysql-test/r/innodb_mysql.result@1.3.4.17, 2007-06-01 22:53:49+05:00, ramil@mysql.com +8 -0
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - test result.

  sql/sql_table.cc@1.239.55.1, 2007-06-01 22:53:49+05:00, ramil@mysql.com +9 -12
    Fix for bug #28652: MySQL (with-debug=full) asserts when alter table operations
      - commit moved to happen earlier in the mysql_alter_table(), 
        now we commit changes at the same time as in case when a temporary 
        table is used.

ChangeSet@1.1810.3013.4, 2007-06-01 20:05:34+04:00, kostja@bodhi.(none) +2 -0
  Fix more mysqltest warnings.

  mysql-test/t/mysqltest.test@1.24.12.2, 2007-06-01 20:05:32+04:00, kostja@bodhi.(none) +3 -8
    Fix more mysqltest warnings.

  mysql-test/t/strict.test@1.19.5.1, 2007-06-01 20:05:33+04:00, kostja@bodhi.(none) +0 -2
    Fix more mysqltest warnings.

ChangeSet@1.2482.54.2, 2007-06-01 17:43:48+02:00, joerg@debian.(none) +1 -0
  Avoid a compile error which arises from a redefinition of "inline":
  If it has been defined (by "configure", in "include/my_config.h"),
  then an "#undef" is needed to avoid a redefinition.
  
  This is needed to prevent a compile error of the debug server on AIX.

  mysys/mf_keycache.c@1.70.1.1, 2007-06-01 17:43:39+02:00, joerg@debian.(none) +3 -0
    It may happen, that "include/my_config.h" already contains a
      #define inline ...
    as created by "configure" (this happens on AIX).
    In this case, an "#undef" is needed to avoid a compile error.

ChangeSet@1.2475.79.1, 2007-06-01 19:44:09+05:00, holyfoot@mysql.com +3 -0
  Bug #28477 innodb assertion and crash during alter table to add/drop partition.
  
  The bug was repeated on MyISAM tables, so isn't InnoDB specific.
  Reason of the bug is that partition-related members of TABLE_SHARE
  wasn't properly updated after ALTER command. So if other thread doesn't
  reread frm file, and just uses cached SHARE, it uses wrong data

  sql/sql_table.cc@1.416.2.3, 2007-06-01 19:44:08+05:00, holyfoot@mysql.com +11 -1
    Bug #28477 innodb assertion and crash during alter table to add/drop partition.
    
    keep share members updated after table modification

  sql/table.cc@1.288.2.1, 2007-06-01 19:44:08+05:00, holyfoot@mysql.com +2 -1
    Bug #28477 innodb assertion and crash during alter table to add/drop partition.
    
    share->partition_info_buffer_size initialization added

  sql/table.h@1.171.1.1, 2007-06-01 19:44:08+05:00, holyfoot@mysql.com +1 -0
    Bug #28477 innodb assertion and crash during alter table to add/drop partition.
    
    partition_info_buffer_size declared in st_table_share to store
    the size of the memory available for partition_info

ChangeSet@1.1810.3013.3, 2007-06-01 18:06:40+04:00, kostja@bodhi.(none) +1 -0
  Do not ignore mysqltest language interpreter warnings.

  BitKeeper/etc/ignore@1.210.1.38, 2007-06-01 18:06:37+04:00, kostja@bodhi.(none) +0 -1
    Do not ignore mysqltest language interpreter warnings.

ChangeSet@1.1810.3013.2, 2007-06-01 18:04:25+04:00, kostja@bodhi.(none) +2 -0
  Fix a typo in the test case.

  mysql-test/r/rpl_loaddata.result@1.28.1.6, 2007-06-01 18:04:23+04:00, kostja@bodhi.(none) +1 -1
    Update result.

  mysql-test/t/rpl_loaddata.test@1.21.1.5, 2007-06-01 18:04:23+04:00, kostja@bodhi.(none) +1 -3
    Fix a typo in the test file.

ChangeSet@1.2482.52.5, 2007-06-01 17:53:38+04:00, kostja@bodhi.(none) +1 -0
  A post-merge fix.

  mysql-test/r/sp.result@1.273, 2007-06-01 17:53:36+04:00, kostja@bodhi.(none) +11 -0
    A post-merge fix.

ChangeSet@1.1810.3013.1, 2007-06-01 17:49:01+04:00, kostja@bodhi.(none) +7 -0
  Fix some mysqltest warnings.

  mysql-test/r/sp.result@1.170.40.1, 2007-06-01 17:48:59+04:00, kostja@bodhi.(none) +11 -0
    Update results.

  mysql-test/t/mysql.test@1.4.1.26, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +1 -1
    Fix a typo.

  mysql-test/t/mysqltest.test@1.24.12.1, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +1 -1
    Fix a typo.

  mysql-test/t/order_by.test@1.41.1.8, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +2 -2
    Fix a typo.

  mysql-test/t/row.test@1.25, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +0 -2
    Remove an unsupported command.

  mysql-test/t/sp.test@1.174.39.1, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +1 -1
    Fix a typo.

  mysql-test/t/subselect3.test@1.10.1.1, 2007-06-01 17:49:00+04:00, kostja@bodhi.(none) +2 -2
    Fix  mysqltest warnings - now it warns when sees some suspicious --
    comment

ChangeSet@1.2482.55.1, 2007-06-01 14:32:26+02:00, msvensson@pilot.(none) +2 -0
  Bug #24168 mysql-test-run not functioning in autotest (cannot use external cluster)
   - Removed the global variable(s) glob_use_running_cluster/slave
     and put a property on each "cluster" called "use_running" which
     is set to 1 if user passed either ndb_connectstring or 
     ndb_connectstring_slave. Thus mtr.pl should not start/stop the
     cluster.

  mysql-test/lib/mtr_process.pl@1.74, 2007-06-01 14:32:25+02:00, msvensson@pilot.(none) +4 -2
    Removed the global variable(s) glob_use_running_cluster/slave
    and put a property on each "cluster" called "use_running" which
    is set to 1 if user passed either ndb_connectstring or 
    ndb_connectstring_slave. Thus mtr.pl should not start/stop the
    cluster

  mysql-test/mysql-test-run.pl@1.302.4.3, 2007-06-01 14:32:25+02:00, msvensson@pilot.(none) +75 -64
    Removed the global variable(s) glob_use_running_cluster/slave
    and put a property on each "cluster" called "use_running" which
    is set to 1 if user passed either ndb_connectstring or 
    ndb_connectstring_slave. Thus mtr.pl should not start/stop the
    cluster

ChangeSet@1.2482.53.3, 2007-06-01 14:12:16+02:00, msvensson@pilot.(none) +1 -0
  Fiux syntax errors in grant.test, connect command with both -- and ;
  only one of those is allowed

  mysql-test/t/grant.test@1.61, 2007-06-01 14:12:13+02:00, msvensson@pilot.(none) +6 -6
    Fiux syntax errors in grant.test, connect command with both -- and ;
    only one of those is allowed

ChangeSet@1.1810.2984.4, 2007-06-01 13:39:54+02:00, msvensson@pilot.(none) +2 -0
  Add missing semicolon after connect command

  mysql-test/t/grant.test@1.41.1.16, 2007-06-01 13:39:53+02:00, msvensson@pilot.(none) +1 -1
    Add missing semicolon after connect command

  mysql-test/t/rpl_packet.test@1.4.2.1, 2007-06-01 13:39:53+02:00, msvensson@pilot.(none) +1 -1
    Add missing semicolon after connect command

ChangeSet@1.1810.2984.3, 2007-06-01 12:38:41+02:00, msvensson@pilot.(none) +1 -0
  Turn query_logging back on to avoid sideeffects in folloing test section

  mysql-test/t/mysqltest.test@1.24.11.2, 2007-06-01 12:38:40+02:00, msvensson@pilot.(none) +1 -0
    Turn query_logging back on to avoid sideeffects in folloing test section

ChangeSet@1.2482.52.3, 2007-06-01 14:17:23+04:00, kostja@bodhi.(none) +1 -0
  Fix a warning.

  sql/sp.cc@1.154, 2007-06-01 14:17:21+04:00, kostja@bodhi.(none) +3 -1
    Fix a warning "field precision should have type "int", 
    but argument 2 has type "size_t"

ChangeSet@1.1616.3047.2, 2007-06-01 12:01:42+02:00, msvensson@pilot.(none) +3 -0
  Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
   - Add funtion "query_get_value to allow reading a fields value
     into a $variable

  client/mysqltest.c@1.92.21.67, 2007-06-01 12:01:42+02:00, msvensson@pilot.(none) +205 -34
    - Add function "let $var= query_get_value(<query>,<colname>,<row>)"
      making it possible to read a value from a specific field in a query 
      into a $variable.

  mysql-test/r/mysqltest.result@1.3.1.25, 2007-06-01 12:01:42+02:00, msvensson@pilot.(none) +39 -0
    Add test cases for "query_get_value"

  mysql-test/t/mysqltest.test@1.3.1.30, 2007-06-01 12:01:42+02:00, msvensson@pilot.(none) +121 -0
    Add test cases for "query_get_value"

ChangeSet@1.2482.52.2, 2007-06-01 13:33:57+04:00, kostja@bodhi.(none) +1 -0
  A post-merge fix.

  sql/sql_table.cc@1.424, 2007-06-01 13:33:54+04:00, kostja@bodhi.(none) +1 -1
    A post-merge fix.

ChangeSet@1.1616.3051.1, 2007-06-01 13:50:13+05:00, svoj@mysql.com +1 -0
  BUG#28574 - repair table causes queries to fail with various
              corruption errors: 126,134,145
  
  When one thread attempts to lock two (or more) tables and another
  thread executes statement that aborts these locks (e.g. REPAIR
  TABLE) we may get a table object with wrong lock type in a table
  cache.
  
  For example if SELECT FROM t1,t2 was aborted, subsequent INSERT
  INTO t1 may be executed under read lock.
  
  As a result we may get various table corruptions and even a server
  crash.
  
  This is fixed by resetting lock type in case lock was aborted by
  another thread.
  
  I failed to create reasonable test case for this bug.

  sql/lock.cc@1.42.1.27, 2007-06-01 13:50:12+05:00, svoj@mysql.com +7 -0
    If thr_multi_lock was aborted by another thread, it unlocks tables
    that were locked before one that was aborted. Lock type for tables
    that were after a table that was aborted preserved. Thus we need
    to reset lock data in case thr_multi_lock was aborted.

ChangeSet@1.1810.3011.1, 2007-06-01 11:14:04+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +5 -0
  Bug #27716  	multi-update did partially and has not binlogged
  
  Implementation of mysql_multi_update did not call multi_update::send_error method in some cases 
  (see the test reported on bug page and test cases in changeset).
  
  Fixed with deploying the method, ::send_error() is refined to get binlogging code which works whenever 
  there is modified non-transactional table.
  thd->no_trans_update.stmt flag is set in to TRUE to ease testing though being the beginning of relative 
  bug#27417 fix (addresses a part of those issues).
  Eliminating two minor issues (small bugs) in multi_update methods.
  This patch for multi-update also addresses a part of the issues reported in bug#13270,bug#23333.

  mysql-test/r/innodb.result@1.145.6.1, 2007-06-01 11:14:01+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +39 -6
    result changed

  mysql-test/r/multi_update.result@1.44.1.2, 2007-06-01 11:14:01+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +34 -0
    results changed

  mysql-test/t/innodb.test@1.118.7.1, 2007-06-01 11:14:01+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +39 -0
    regression test for the bug combining transactional and non-transaction tables

  mysql-test/t/multi_update.test@1.48.1.2, 2007-06-01 11:14:01+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +41 -0
    regression tests added - erred query must be binlogged

  sql/sql_update.cc@1.154.35.1, 2007-06-01 11:14:01+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +76 -14
    making a call to multi_update::send_error when mysql_select return an error;
    deploying binlogging inside of ::send_error;
    refining multi_update::send_eof() to mark binlogging work done when its call to ::do_updates() errs
    and the query is binlogged with the error. ::send_error() will be called after all but
    do not do anything;
    thd->no_trans_update.stmt is corrected to be set to TRUE according to the existed code pattern. 
    Although this part relates to another bugs (bug#27417 etc) it is needed here for testing;
    Eliminating a separate issue in multi_update::do_updates where                
    either one of the class members trans_safe, transactional_tables was          
    set after the per-table loop whereas both should be calculated during         
    looping. 
    Eliminating a separate issue in ::send_eof() where thd->no_trans_update.all won't be set TRUE when
    amoung others there'd be at least one modified transactional table.
    Binlogging is done to satisfy to general character bug#13270,bug#23333 so that those won't have
    fixes specific for multi-update.

ChangeSet@1.2482.50.4, 2007-06-01 08:54:47+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing test case binlog_unsafe.

  mysql-test/r/binlog_unsafe.result@1.2, 2007-06-01 08:54:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/t/binlog_unsafe.test@1.2, 2007-06-01 08:54:38+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Dropping used tables.

ChangeSet@1.2482.51.2, 2007-05-31 23:31:59-07:00, igor@olga.mysql.com +3 -0
  Post-merge fix.

  mysql-test/r/user_var.result@1.46.1.2, 2007-05-31 23:31:57-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

  mysql-test/t/user_var.test@1.42, 2007-05-31 23:31:57-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

  sql/sql_update.cc@1.243, 2007-05-31 23:31:57-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

ChangeSet@1.2482.50.3, 2007-06-01 07:13:20+02:00, mats@romeo.kindahl.net +3 -0
  WL#3339 (Issue warnings when statement-based replication may fail):
  Adding missing test files. Result change in test rpl_udf.

  mysql-test/r/rpl_slave_skip.result@1.1, 2007-06-01 07:13:17+02:00, mats@romeo.kindahl.net +136 -0
    New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''

  mysql-test/r/rpl_slave_skip.result@1.0, 2007-06-01 07:13:17+02:00, mats@romeo.kindahl.net +0 -0

  mysql-test/r/rpl_udf.result@1.5, 2007-06-01 07:13:17+02:00, mats@romeo.kindahl.net +8 -0
    Result change

  mysql-test/t/rpl_slave_skip.test@1.1, 2007-06-01 07:13:17+02:00, mats@romeo.kindahl.net +71 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''

  mysql-test/t/rpl_slave_skip.test@1.0, 2007-06-01 07:13:17+02:00, mats@romeo.kindahl.net +0 -0

ChangeSet@1.1810.3010.1, 2007-06-01 02:25:11+05:00, gshchepa@gleb.loc +1 -0
  sql_view.cc:
    Additional patch for bug #28244 to workaround valgrind warnings.

  sql/sql_view.cc@1.78.23.3, 2007-06-01 02:22:20+05:00, gshchepa@gleb.loc +1 -1
    Additional patch for bug #28244 to workaround valgrind warnings.

ChangeSet@1.1810.3009.1, 2007-06-01 01:17:14+04:00, evgen@moonbone.local +4 -0
  Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
  
  The end_update() function uses the Item::save_org_in_field() function to
  save original values of items into the group buffer. But for the 
  Item_func_set_user_var this method was mapped to the save_in_field method.
  The latter function wrongly decides to use the result_field. This leads to
  saving incorrect value in the grouping buffer and wrong result of the whole
  query.
  
  The can_use_result_field argument of the bool type is added to the
  Item_func_set_user_var::save_in_field() function. If it is set to FALSE
  then the item's result field won't be used. Otherwise it will be detected
  whether the result field will be used (old behaviour).
  Two wrapping functions for the function above are added to the 
  Item_func_set_user_var class:
  the save_in_field(Field *field, bool no_conversions) - it calls the above
  function with the can_use_result_field set to TRUE.
  the save_org_in_field(Field *field) - same, but the can_use_result_field
  is set to FALSE.

  mysql-test/r/user_var.result@1.37.1.8, 2007-06-01 01:17:03+04:00, evgen@moonbone.local +7 -0
    Added a test case for the bug#28494: Grouping by Item_func_set_user_var
    produces incorrect result.

  mysql-test/t/user_var.test@1.35.1.5, 2007-06-01 01:17:01+04:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#28494: Grouping by Item_func_set_user_var
    produces incorrect result.

  sql/item_func.cc@1.270.1.74, 2007-06-01 01:17:03+04:00, evgen@moonbone.local +4 -2
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The can_use_result_field argument of the bool type is added to the
    Item_func_set_user_var::save_in_field() function. If it is set to FALSE
    then the item's result field won't be used. Otherwise it will be detected
    whether the result field will be used (old behaviour).

  sql/item_func.h@1.136.2.33, 2007-06-01 01:17:03+04:00, evgen@moonbone.local +7 -1
    Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
    The can_use_result_field argument of the bool type is added to the
    Item_func_set_user_var::save_in_field() function.
    Two wrapping functions for the function above are added to the 
    Item_func_set_user_var class:
    the save_in_field(Field *field, bool no_conversions) - it calls the above
    function with the can_use_result_field set to TRUE.
    the save_org_in_field(Field *field) - same, but the can_use_result_field
    is set to FALSE.

ChangeSet@1.1810.3008.1, 2007-06-01 02:15:40+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #27827.
  ON conditions from JOIN expression were ignored at CHECK OPTION
  check when updating a multi-table view with CHECK OPTION.
  
  The st_table_list::prep_check_option function has been
  modified to to take into account ON conditions at CHECK OPTION check
  It was also changed to build the check option condition only once
  for any update used in PS/SP.

  mysql-test/r/view.result@1.138.35.1, 2007-06-01 02:14:21+05:00, gshchepa@gleb.loc +61 -0
    Updated test case for bug #27827.

  mysql-test/t/view.test@1.126.30.1, 2007-06-01 02:14:20+05:00, gshchepa@gleb.loc +52 -0
    Updated test case for bug #27827.

  sql/table.cc@1.160.1.91, 2007-06-01 02:14:18+05:00, gshchepa@gleb.loc +62 -17
    Fixed bug #27827.
    The st_table_list::prep_check_option function has been
    modified to to take into account ON conditions at CHECK OPTION check
    It was also changed to build the check option condition only once
    for any update used in PS/SP.

  sql/table.h@1.102.1.42, 2007-06-01 02:14:03+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27827.
    The st_table_list::check_option_processed variable has been added
    to build the check option condition only once for any update used
    in PS/SP.

ChangeSet@1.2482.18.7, 2007-05-31 22:07:44+02:00, istruewing@chilla.local +1 -0
  post-merge fix

  sql/sql_plugin.cc@1.69, 2007-05-31 22:07:39+02:00, istruewing@chilla.local +3 -3
    post-merge fix

ChangeSet@1.1810.2888.9, 2007-05-31 20:04:54+02:00, istruewing@chilla.local +4 -0
  Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
  
  Setting a key_cache_block_size which is not a power of 2
  could corrupt MyISAM tables.
  
  A couple of computations in the key cache code use bit
  operations which do only work if key_cache_block_size
  is a power of 2.
  
  Replaced bit operations by arithmetic operations
  to make key cache able to handle block sizes that are
  not a power of 2.

  include/keycache.h@1.7.2.1, 2007-05-31 20:04:51+02:00, istruewing@chilla.local +0 -1
    Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
    Removed element 'key_cache_shift' from KEY_CACHE after
    the changes in mf_keycache.c made it unused.

  mysql-test/r/key_cache.result@1.19.1.2, 2007-05-31 20:04:51+02:00, istruewing@chilla.local +27 -0
    Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
    Added test result

  mysql-test/t/key_cache.test@1.20, 2007-05-31 20:04:51+02:00, istruewing@chilla.local +27 -0
    Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
    Added test

  mysys/mf_keycache.c@1.55.1.8, 2007-05-31 20:04:51+02:00, istruewing@chilla.local +5 -6
    Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
    Replaced bit operations by arithmetic operations
    to make key cache able to handle block sizes that are
    not a power of 2.

ChangeSet@1.2469.231.1, 2007-05-31 20:01:06+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#28618 (Skipping into the middle of a group with
  SQL_SLAVE_SKIP_COUNTER is possible):
  
  By setting the SQL_SLAVE_SKIP_COUNTER it was possible to start the
  from the middle of a group. This patch adds code so that events that
  do not end a statement are ignored instead of skip counted when the
  slave skip counter is 1.

  sql/log_event.cc@1.276.2.1, 2007-05-31 20:01:02+02:00, mats@kindahl-laptop.dnsalias.net +27 -0
    Adding code so that for rows log events where the STMT_END_F is clear
    and for table map events, the event is ignored when the slave skip
    counter is 1 instead of skip counted, or described another way, the
    slave skip counter can only be decreased from 1 to 0 when the
    STMT_END_F flag is set.

  sql/log_event.h@1.149.2.1, 2007-05-31 20:01:03+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Adding functions Table_map_log_event::do_shall_skip() and
    Rows_log_event::do_shall_skip().

ChangeSet@1.2482.28.13, 2007-05-31 20:32:18+05:00, gshchepa@gleb.loc +1 -0
  sql_select.cc:
    Patch to eliminate compilation error.

  sql/sql_select.cc@1.529, 2007-05-31 20:31:15+05:00, gshchepa@gleb.loc +0 -1
    Patch to eliminate compilation error.

ChangeSet@1.2482.18.4, 2007-05-31 17:45:22+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +25 -0
  Added casts to avoid compiler warnings and fixed a wrong type.
  ---
  Added casts and fixed wrong type.
  ---
  Added casts and fixed wrong type.
  ---
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
  into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
  ---
  Don't give warning that readonly variable is forced to be readonly
  mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
  Fixed wrong reference to the mysql manual
  Fixed wrong prototype that caused some tests to fail on 64 bit platforms
  ---
  Disabled compiler warnings mainly for Win 64.
  ---
  Added casts to remove compiler warnings on windows
  Give warnings also for safe_mutex errors found by test system
  Added some warnings from different machines in pushbuild
  ---
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
  into  mysql.com:/home/my/mysql-5.1
  ---
  Added escapes for double quotes and parenthesis.
  ---
  Archive db fix plus added non-critical warnings
  in ignore list.
  ---
  Fixed previously added patch and added new ignored warning.

  client/mysqltest.c@1.302, 2007-05-31 17:45:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +16 -12
    Added casts to avoid compiler warnings.
    ---
    Added casts to avoid compiler warnings.

  mysql-test/lib/mtr_report.pl@1.47.1.1, 2007-05-31 17:45:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +70 -6
    Test run now fails if we have [Warning] and [ERROR] as tags in .err file
    Added list of all common 'not fatal' errors to ignore error list
    ---
    Give warnings also for safe_mutex errors
    Added some warnings from different machines in pushbuild
    ---
    Added escapes for double quotes and parenthesis.
    ---
    Added non-critical warnings to be ignored.
    ---
    Fixed a wrong regexp
    Added new non-critical warning

  mysql-test/mysql-test-run-shell.sh@1.341, 2007-05-31 17:45:15+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +7 -2
    Fixed some wrong startup options

  mysql-test/r/func_misc.result@1.33, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -2
    Test case for archive db fix.

  mysql-test/t/disabled.def@1.253.3.1, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -0
    Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)

  mysql-test/t/func_misc.test@1.23, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -1
    Test case for archive db fix.

  mysys/array.c@1.19, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +9 -9
    Added casts to avoid compiler warnings.

  mysys/hash.c@1.56, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -3
    Added casts to avoid compiler warnings.

  mysys/my_compress.c@1.17, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Added casts to remove compiler warnings on windows

  mysys/my_conio.c@1.5, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -2
    To avoid a warning from compiler.

  mysys/my_pread.c@1.21, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -0
    Archive db fix.

  mysys/my_quick.c@1.8, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Added cast to avoid compiler warning.
    ---
    Added cast to avoid compiler warning.

  sql/ha_ndbcluster_binlog.cc@1.120, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +10 -10
    Ensure we log all binglog errors with the "NDB Binlog" tag

  sql/ha_partition.cc@1.93, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    result is type bool, so calculation should be forced to
    that also.

  sql/log.cc@1.283, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed compiler problem on Solaris.

  sql/slave.cc@1.309, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Make errors uniform

  sql/sql_class.cc@1.336, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Added cast to remove compiler warnings on windows

  sql/sql_map.cc@1.21, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Added casts to avoid compiler warnings.
    ---
    Added casts to avoid compiler warnings.

  sql/sql_plugin.cc@1.67, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed wrong type.
    ---
    Don't give warning that readonly variable is forced to be readonly

  sql/stacktrace.c@1.29, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -3
    Corrected manual reference

  storage/archive/azio.c@1.19, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +4 -0
    Archive db fix.
    ---
    Fixed previously added patch.

  storage/blackhole/ha_blackhole.cc@1.53, 2007-05-31 17:45:16+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +2 -2
    Fixed wrong prototype that caused test to fail on 64 bit platforms

  storage/example/ha_example.cc@1.58, 2007-05-31 17:45:17+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Fixed wrong prototype that caused test to fail on 64 bit platforms

  strings/ctype-ucs2.c@1.70, 2007-05-31 17:45:17+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +3 -3
    Fixed wrong type.
    ---
    Fixed wrong type.

  support-files/compiler_warnings.supp@1.12, 2007-05-31 17:45:17+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -1
    Added new disabled warnings for Win 64.

ChangeSet@1.1810.3005.2, 2007-05-31 19:06:30+05:00, gshchepa@gleb.loc +1 -0
  sql_view.cc:
    Patch to eliminate compilation warning.

  sql/sql_view.cc@1.78.23.2, 2007-05-31 19:05:02+05:00, gshchepa@gleb.loc +1 -1
    Patch to eliminate warning.

ChangeSet@1.1810.3006.1, 2007-05-31 15:58:22+02:00, msvensson@pilot.(none) +2 -0
  Bug#28373 mysqltest test case fails with binlog disabled
   - Update tests to be independent how the mysqld was started

  mysql-test/r/mysqltest.result@1.24.1.24, 2007-05-31 15:58:21+02:00, msvensson@pilot.(none) +0 -1
    Update result file

  mysql-test/t/mysqltest.test@1.24.10.1, 2007-05-31 15:58:21+02:00, msvensson@pilot.(none) +2 -4
    The purpose of these three test is to check that "sync_with_master"
    detects illegal parameters, the parameter checking is done before
    sending any command to the server and the "save_master_pos" can be
    removed in two cases to make the tests independent of mysqld.
    The thirs test is removed since it's a syntax check that is done
    after the command has been executed and is done for all comands in
    mysqltest - it's tested elsewhere and is not specific to "sync_with_master"  

ChangeSet@1.1810.2936.24, 2007-05-31 17:30:56+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28244.
  When the same VIEW was created at the master side twice,
  malformed (truncated after the word 'AS') query string 
  was forwarded to client side, so error messages on the
  master and client was different, and replication was
  broken.
  
  The mysql_register_view function call failed
  too early: fields of `view' output argument of this 
  function was not filled yet with correct data required
  for query replication.
  The mysql_register_view function also copied pointers to 
  local buffers into a memory allocated by the caller.

  mysql-test/r/rpl_view.result@1.3.1.6, 2007-05-31 17:29:11+05:00, gshchepa@gleb.loc +6 -0
    Updated test case for bug #28244.

  mysql-test/t/rpl_view.test@1.3.1.4, 2007-05-31 17:29:10+05:00, gshchepa@gleb.loc +12 -0
    Updated test case for bug #28244.

  sql/sql_view.cc@1.78.23.1, 2007-05-31 17:16:28+05:00, gshchepa@gleb.loc +72 -57
    Fixed bug #28244.
    Checking of existence of VIEW .frm file has been
    moved down to the place, when `view' argument is
    completely filled with proper data.
    view->query.str and view->query.md5 pointers has been
    set to the NULL before return from the mysql_register_view
    function.

ChangeSet@1.1810.3004.1, 2007-05-31 14:22:21+02:00, mhansson@dl145s.mysql.com +2 -0
  bug#27741: udf test fails on AIX < 5.3
  
  problem #1: udf_example.so does not get built on AIX
  
  solution#1: build it yourself using
  cd sql; gcc  -g -I ../include/ -I /usr/include/ -lpthread  \
  -shared -o udf_example.so udf_example.c; mv udf_example.so \
  .libs/ 
  
  problem#2 (the bug): udf_example fails because it does not
  recognize the variable LD_LIBRARY_PATH when doing dl_open(),
  it looks at LIBPATH
  
  solution#2: add the library path to LIBPATH
  
  problem#3: udf_example returns the wrong result length since 
  it relies on strmov to return a pointer to the end of the 
  string that it copies. On AIX builds, where m_string.h is not
  included (m_string defines a macro expanding strmov to stpcpy),
  there is a macro expanding strmov to strcpy, which returns a 
  pointer to the first character.
  
  solution#3: define strmov as stpcpy.
  
  problem#4: #2 applies on hp-ux as well, but this platform
  looks at SHLIB_PATH
  
  solution#4: added the library path to SHLIB_PATH

  mysql-test/mysql-test-run.pl@1.30.85.1, 2007-05-31 14:22:19+02:00, mhansson@dl145s.mysql.com +11 -0
    bug#27741: Added library paths to LIBPATH ( shared library 
    path environment variable used on AIX) and
    SHLIB_PATH (ditto on hp-ux)

  sql/udf_example.c@1.29.1.6, 2007-05-31 14:22:19+02:00, mhansson@dl145s.mysql.com +2 -1
    bug#27741: define strmov as stpcpy rather than strcpy and 
    include string.h. The definition for strmov in the standalone 
    case was not maintained properly

ChangeSet@1.2482.27.15, 2007-05-31 14:11:58+02:00, df@pippilotta.erinye.com +1 -0
  Fix CMakeLists.txt.

  CMakeLists.txt@1.31, 2007-05-31 14:11:56+02:00, df@pippilotta.erinye.com +1 -1
    Fix.

ChangeSet@1.1810.3001.3, 2007-05-31 14:05:07+02:00, df@pippilotta.erinye.com +2 -0
  fix test case

  mysql-test/t/binlog.test@1.4.4.1, 2007-05-31 14:05:06+02:00, df@pippilotta.erinye.com +2 -2
    transaction ids for ps-protocol increased by one due to have_log_bin.inc

  mysql-test/r/binlog.result@1.4.3.1, 2007-05-31 14:05:06+02:00, df@pippilotta.erinye.com +2 -2
    transaction ids increased by one due to have_log_bin.inc

ChangeSet@1.2482.49.2, 2007-05-31 16:04:58+04:00, kaa@polly.local +4 -0
  Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643.

  mysql-test/r/ctype_ucs2_def.result@1.6, 2007-05-31 16:04:55+04:00, kaa@polly.local +1 -1
    Corrected the error messages for 5.1

  mysql-test/r/heap_hash.result@1.23, 2007-05-31 16:04:55+04:00, kaa@polly.local +2 -2
    Corrected the error messages for 5.1

  mysql-test/t/ctype_ucs2_def.test@1.7, 2007-05-31 16:04:55+04:00, kaa@polly.local +1 -1
    Corrected the error codes for 5.1.

  mysql-test/t/heap_hash.test@1.14, 2007-05-31 16:04:55+04:00, kaa@polly.local +2 -2
    Corrected the error codes for 5.1.

ChangeSet@1.2482.28.12, 2007-05-31 17:01:10+05:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/type_enum.result@1.35, 2007-05-31 17:01:08+05:00, holyfoot@mysql.com +0 -1
    merging

ChangeSet@1.1810.2999.6, 2007-05-31 13:53:44+02:00, georg@bing.mysql.com +1 -0
  fixed not matching if/endif (cmake)

  CMakeLists.txt@1.1.21.1, 2007-05-31 13:53:39+02:00, georg@bing.mysql.com +1 -1
    Fixed not matching if/endif (cmake)

ChangeSet@1.1810.3002.1, 2007-05-31 14:54:44+04:00, kaa@polly.local +8 -0
  Fix for bug #27643 "query failed : 1114 (The table '' is full)
  
  Problem:
  
  HASH indexes on VARCHAR columns with binary collations did not ignore trailing spaces from strings before comparisons. This could result in duplicate records being successfully inserted into a MEMORY table with unique key constraints.
  
  As a direct consequence of the above, internal MEMORY tables used for GROUP BY calculation in testcases for bug #27643 contained duplicate rows which resulted in duplicate key errors when converting those temporary tables to MyISAM. Additionally, that error was incorrectly converted to the 'table is full' error.
  
  Solution:
  
  - ignore trailing spaces in VARCHAR fields with binary collations when calculating hashes.
  - return a proper error from create_myisam_from_heap() when conversion fails.

  mysql-test/r/ctype_ucs2_def.result@1.3.1.1, 2007-05-31 14:54:37+04:00, kaa@polly.local +8 -0
    Added a testcase for bug #27643.

  mysql-test/r/heap_hash.result@1.17.1.4, 2007-05-31 14:54:37+04:00, kaa@polly.local +16 -0
    Added a testcase for bug #27643.

  mysql-test/t/ctype_ucs2_def.test@1.3.1.2, 2007-05-31 14:54:37+04:00, kaa@polly.local +16 -0
    Added a testcase for bug #27643.

  mysql-test/t/heap_hash.test@1.11.1.1, 2007-05-31 14:54:37+04:00, kaa@polly.local +24 -1
    Added a testcase for bug #27643.

  sql/sql_select.cc@1.312.156.1, 2007-05-31 14:54:37+04:00, kaa@polly.local +1 -1
    Return an appropriate error instead of 'table is full' when conversion from MEMORY to MyISAM fails.

  strings/ctype-bin.c@1.66.1.9, 2007-05-31 14:54:38+04:00, kaa@polly.local +24 -1
    Added my_hash_sort_8bit_bin() which ignores trailing spaces when calculating hashes, and is now used for VARCHAR columns instead of my_hash_sort_bin().

  strings/ctype-mb.c@1.47.1.9, 2007-05-31 14:54:38+04:00, kaa@polly.local +7 -0
    Ignore trailing spaces when calculating a string hash in my_hash_sort_mb_bin().

  strings/ctype-ucs2.c@1.50.1.16, 2007-05-31 14:54:38+04:00, kaa@polly.local +4 -1
    Ignore trailing spaces when calculating a string hash in my_hash_sort_ucs2_bin().

ChangeSet@1.1810.3001.2, 2007-05-31 12:21:55+02:00, df@pippilotta.erinye.com +1 -0
  fix test case broken for ps-protocol by previous push

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.9.1, 2007-05-31 12:21:48+02:00, df@pippilotta.erinye.com +10 -10
    have_log_bin.inc increases transaction count by one, modify ps-protocol substitutions accordingly

ChangeSet@1.2482.11.28, 2007-05-31 10:34:22+02:00, lars@mysql.com +1 -0
  Disabled due to valgrind failure (talked to Tomas)

  mysql-test/t/disabled.def@1.260, 2007-05-31 10:34:19+02:00, lars@mysql.com +1 -0
    Disabled due to valgrind failure (talked to Tomas)

ChangeSet@1.2482.27.10, 2007-05-31 10:21:19+02:00, df@pippilotta.erinye.com +6 -0
  after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled

  mysql-test/extra/binlog_tests/blackhole.test@1.19, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +0 -1
    after-merge fix, not needed in 5.1

  mysql-test/extra/binlog_tests/ctype_cp932_binlog.test@1.9.1.2, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +0 -1
    after-merge fix, not needed in 5.1

  mysql-test/extra/binlog_tests/ctype_ucs_binlog.test@1.13, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +0 -1
    after-merge fix, not needed in 5.1

  mysql-test/extra/binlog_tests/drop_temp_table.test@1.13, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +0 -1
    after-merge fix, not needed in 5.1

  mysql-test/extra/binlog_tests/insert_select-binlog.test@1.9, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +0 -1
    after-merge fix, not needed in 5.1

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.40, 2007-05-31 10:21:17+02:00, df@pippilotta.erinye.com +1 -1
    after-merge fix, not needed in 5.1

ChangeSet@1.2482.29.5, 2007-05-31 10:17:16+02:00, rafal@quant.(none) +1 -0
  BUG#21123 (Slave fails to reconnect on update_slave_list):
  
   Fixing comments and adding error message if slave fails to register
   on master.

  sql/slave.cc@1.307.1.2, 2007-05-31 10:17:13+02:00, rafal@quant.(none) +3 -2
    Failing to register on master is a fatal error.

ChangeSet@1.2482.46.2, 2007-05-31 10:07:35+02:00, df@pippilotta.erinye.com +1 -0
  test case ps requires binlog for now

  mysql-test/t/ps.test@1.114.2.1, 2007-05-31 10:07:33+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

ChangeSet@1.1810.2942.4, 2007-05-31 09:34:24+02:00, df@pippilotta.erinye.com +16 -0
  some test cases cannot run with --skip-log-bin

  mysql-test/t/ctype_cp932_notembedded.test@1.1.1.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

  mysql-test/t/binlog.test@1.4.3.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test obviously requires binlog

  mysql-test/t/blackhole.test@1.4.8.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

  mysql-test/t/ctype_cp932_binlog.test@1.2.4.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog

  mysql-test/t/ctype_ucs_binlog.test@1.5.2.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog

  mysql-test/t/drop_temp_table.test@1.8.1.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

  mysql-test/t/insert_select-binlog.test@1.2.1.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.8.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -1
    test requires binlog

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.7.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +15 -15
    have_log_bin.inc increases transaction count by onw

  mysql-test/t/flush_block_commit_notembedded.test@1.2, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +2 -0
    test requires binlog for now

  mysql-test/t/mysqlbinlog-cp932.test@1.1.1.2, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +2 -1
    test requires binlog

  mysql-test/t/mysqlbinlog.test@1.21.1.26, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +2 -0
    test requires binlog

  mysql-test/t/mysqlbinlog2.test@1.7.1.3, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +2 -0
    test requires binlog

  mysql-test/t/mysqltest.test@1.24.9.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +2 -0
    test requires binlog for now

  mysql-test/t/sp_trans.test@1.9.2.1, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

  mysql-test/t/user_var-binlog.test@1.3.1.2, 2007-05-31 09:34:22+02:00, df@pippilotta.erinye.com +1 -0
    test requires binlog for now

ChangeSet@1.1810.3000.1, 2007-05-31 12:10:21+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28598.
  mysqld crashed when a long-running explain query was killed from
  another connection.
  
  When the current thread caught a kill signal executing the function
  best_extension_by_limited_search it just silently returned to  
  the calling function greedy_search without initializing elements of
  the join->best_positions array.
  However, the greedy_search function ignored thd->killed status
  after a calls to the best_extension_by_limited_search function, and
  after several calls the greedy_search function used an uninitialized
  data from the join->best_positions[idx] to search position in the
  join->best_ref array. 
  That search failed, and greedy_search tried to call swap_variables
  function with NULL argument - that caused a crash.

  mysql-test/r/kill.result@1.16.1.2, 2007-05-31 12:10:09+05:00, gshchepa@gleb.loc +2 -0
    Updated test case for bug #28598.

  mysql-test/t/kill.test@1.23.1.3, 2007-05-31 12:10:08+05:00, gshchepa@gleb.loc +53 -0
    Updated test case for bug #28598.

  sql/sql_select.cc@1.312.155.1, 2007-05-31 12:09:53+05:00, gshchepa@gleb.loc +53 -40
    Fixed bug #28598.
    choose_plan(), greedy_search(), best_extension_by_limited_search()
    and find_best() functions have been changed to return TRUE in case
    of fatal error.

ChangeSet@1.2482.28.9, 2007-05-31 00:04:03-07:00, igor@olga.mysql.com +2 -0
  Post merge fix.

  mysql-test/r/view.result@1.228, 2007-05-31 00:03:57-07:00, igor@olga.mysql.com +10 -0
    Post merge fix.

  mysql-test/t/view.test@1.200, 2007-05-31 00:03:58-07:00, igor@olga.mysql.com +19 -0
    Post merge fix.

ChangeSet@1.2482.11.25, 2007-05-30 17:46:28-06:00, malff@weblab.(none) +1 -0
  Build warning cleanup

  sql/sql_acl.cc@1.234.1.4, 2007-05-30 17:46:26-06:00, malff@weblab.(none) +0 -1
    Build warning cleanup

ChangeSet@1.1810.2946.27, 2007-05-31 00:40:56+02:00, tsmith@quadxeon.mysql.com +1 -0
  mysqldump.c:
    Fix harmless typo (caught thanks to warning)

  client/mysqldump.c@1.214.1.51, 2007-05-31 00:40:37+02:00, tsmith@quadxeon.mysql.com +3 -3
    Fix harmless typo (caught thanks to warning)

ChangeSet@1.2482.1.42, 2007-05-31 00:37:41+02:00, tsmith@quadxeon.mysql.com +1 -0
  mysqldump.c:
    Fix harmless typo (caught thanks to warning)

  client/mysqldump.c@1.277.3.2, 2007-05-31 00:37:09+02:00, tsmith@quadxeon.mysql.com +3 -3
    Fix harmless typo (caught thanks to warning)

ChangeSet@1.1616.2881.104, 2007-05-30 22:11:53+02:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Added --with-mysqld-libs configure flag

  configure.in@1.201.64.28, 2007-05-30 22:11:44+02:00, kent@mysql.com +6 -0
    Added --with-mysqld-libs configure flag

  sql/Makefile.am@1.77.1.42, 2007-05-30 22:11:44+02:00, kent@mysql.com +2 -1
    Added --with-mysqld-libs configure flag

ChangeSet@1.1810.2988.9, 2007-05-30 22:29:15+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#22725 
  
  refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server

  mysql-test/t/binlog_killed.test@1.6.1.1, 2007-05-30 22:29:13+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -1
    the test can not pass on embedded server. Setting the include-guard.

ChangeSet@1.1810.2993.8, 2007-05-30 23:28:14+04:00, evgen@moonbone.local +3 -0
  Bug#28729: Field_enum wrongly reported an error while storing an empty string.
  
  ENUM fields internally store their values as integers and may use integer
  values as indexes to their values. Invalid values are mapped to zero value.
  When storing an empty string the ENUM field fails to find an appropriate value
  and tries to convert the provided string to integer. The conversion also
  fails and error is returned even if the thd->count_cuted_fields is set to
  CHECK_FIELD_IGNORE. This makes the range optimizer wrongly decide that an
  impossible range is present.
  
  Now the Field_enum::store() returns error while storing an empty string only
  if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.

  mysql-test/r/type_enum.result@1.27.1.3, 2007-05-30 23:27:52+04:00, evgen@moonbone.local +7 -0
    Added a test case for the bug#28729: Field_enum wrongly reported an error
    while storing an empty string.

  mysql-test/t/type_enum.test@1.16.2.2, 2007-05-30 23:28:00+04:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#28729: Field_enum wrongly reported an error
    while storing an empty string.

  sql/field.cc@1.256.54.1, 2007-05-30 23:27:51+04:00, evgen@moonbone.local +2 -0
    Bug#28729: Field_enum wrongly reported an error while storing an empty string.
    Now the Field_enum::store() returns error while storing an empty string only
    if the thd->count_cuted_fields isn't set to CHECK_FIELD_IGNORE.

ChangeSet@1.1810.2994.2, 2007-05-30 22:47:52+04:00, kaa@polly.local +3 -0
  Got rid of log_01[], because we don't really need it. Division and log_10[] can always be used instead, which is also a more precise way.
  
  This is for bug #28121.

  include/m_string.h@1.37.1.5, 2007-05-30 22:47:50+04:00, kaa@polly.local +0 -1
    Got rid of log_01[], because we don't really need it.

  sql/item_cmpfunc.cc@1.187.1.68, 2007-05-30 22:47:50+04:00, kaa@polly.local +1 -1
    Got rid of log_01[], because we don't really need it.

  strings/strtod.c@1.25.3.5, 2007-05-30 22:47:50+04:00, kaa@polly.local +1 -37
    Got rid of log_01[], because we don't really need it.

ChangeSet@1.2482.28.8, 2007-05-30 20:25:16+04:00, evgen@moonbone.local +2 -0
  sp.result, analyse.result:
    Post merge fix.

  mysql-test/r/analyse.result@1.30, 2007-05-30 20:24:43+04:00, evgen@moonbone.local +12 -12
    Post merge fix.

  mysql-test/r/sp.result@1.270.1.2, 2007-05-30 20:24:27+04:00, evgen@moonbone.local +1 -1
    Post merge fix.

ChangeSet@1.1810.2683.13, 2007-05-30 17:25:22+02:00, tomas@whalegate.ndb.mysql.com +6 -0
  Bug #28443
  - correction of merge error

  ndb/src/common/transporter/Packer.cpp@1.5.6.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #28443
    - correction of merge error

  ndb/src/common/transporter/TCP_Transporter.hpp@1.4.7.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +4 -0
    Bug #28443
    - correction of merge error

  ndb/src/common/transporter/TransporterRegistry.cpp@1.52.19.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +22 -19
    Bug #28443
    - correction of merge error

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.18.28.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +17 -0
    Bug #28443
    - correction of merge error

  ndb/test/ndbapi/testNdbApi.cpp@1.13.12.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +34 -0
    Bug #28443
    - correction of merge error

  ndb/test/run-test/daily-basic-tests.txt@1.27.45.1, 2007-05-30 17:25:19+02:00, tomas@whalegate.ndb.mysql.com +4 -0
    Bug #28443
    - correction of merge error

ChangeSet@1.2482.32.15, 2007-05-30 17:00:48+02:00, lars@mysql.com +2 -0
  Changed to vertical output for rpl_row_until.test

  mysql-test/r/rpl_row_until.result@1.6, 2007-05-30 16:46:30+02:00, lars@mysql.com +140 -12
    Changed to vertical output for rpl_row_until.test

  mysql-test/t/rpl_row_until.test@1.3, 2007-05-30 16:46:30+02:00, lars@mysql.com +4 -4
    Changed to vertical output for rpl_row_until.test

ChangeSet@1.2482.44.1, 2007-05-30 15:56:05+02:00, lars@mysql.com +2 -0
  Masking out error that is not generated by the test (rpl_ndb_basic.test) itself

  mysql-test/r/rpl_ndb_basic.result@1.11, 2007-05-30 15:56:02+02:00, lars@mysql.com +2 -2
    Masking out error that is not generated by the test itself

  mysql-test/t/rpl_ndb_basic.test@1.11, 2007-05-30 15:56:02+02:00, lars@mysql.com +1 -1
    Masking out error that is not generated by the test itself

ChangeSet@1.2482.43.2, 2007-05-30 16:14:55+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#22725
  
  the test is not supposed for row format. the include-guard is set.

  mysql-test/t/binlog_killed.test@1.8, 2007-05-30 16:14:53+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
    the test does not apply to rbr

ChangeSet@1.2482.43.1, 2007-05-30 17:29:05+05:00, bar@mysql.com +1 -0
  CMakeLists.txt:
    Adding strnlen.c into the list of source files.

  strings/CMakeLists.txt@1.8, 2007-05-30 17:28:25+05:00, bar@mysql.com +1 -1
    Adding strnlen.c into the list of source files.

ChangeSet@1.2482.11.23, 2007-05-30 16:24:21+04:00, anozdrin@ibm. +2 -0
  1. Fix memory leak.
  2. Use multibyte-safe constant.

  sql/sp.cc@1.151.1.2, 2007-05-30 16:24:18+04:00, anozdrin@ibm. +3 -3
    Fix memory leak.

  sql/sp_head.cc@1.271.2.4, 2007-05-30 16:24:18+04:00, anozdrin@ibm. +1 -1
    Use multibyte-safe constant.

ChangeSet@1.1810.2995.2, 2007-05-30 17:04:04+05:00, gluh@mysql.com +19 -0
  backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL

  mysql-test/r/ps_6bdb.result@1.27.17.1, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/auto_increment.result@1.34.1.6, 2007-05-30 17:04:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/create.result@1.107.1.21, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/insert.result@1.22.1.7, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/insert_select.result@1.35.1.12, 2007-05-30 17:04:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/insert_update.result@1.18.1.9, 2007-05-30 17:04:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/key.result@1.28.1.10, 2007-05-30 17:04:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/null.result@1.33.1.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +9 -9
    result fix

  mysql-test/r/null_key.result@1.35.1.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ps_2myisam.result@1.39.6.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ps_3innodb.result@1.42.6.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ps_4heap.result@1.38.6.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ps_5merge.result@1.39.6.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/ps_7ndb.result@1.26.8.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/strict.result@1.25.8.3, 2007-05-30 17:04:02+05:00, gluh@mysql.com +9 -9
    result fix

  mysql-test/r/view.result@1.138.34.1, 2007-05-30 17:04:03+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/warnings.result@1.34.1.7, 2007-05-30 17:04:03+05:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/t/strict.test@1.19.1.11, 2007-05-30 17:04:03+05:00, gluh@mysql.com +4 -4
    test fix

  sql/field_conv.cc@1.52.1.14, 2007-05-30 17:04:03+05:00, gluh@mysql.com +1 -2
    backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL

ChangeSet@1.1810.2998.2, 2007-05-30 16:39:25+05:00, gshchepa@gleb.loc +1 -0
  sql_update.cc:
    Fixed bug #28716: additional patch to eliminate compilation
    error under Windows.

  sql/sql_update.cc@1.154.34.2, 2007-05-30 16:37:36+05:00, gshchepa@gleb.loc +3 -2
    Fixed bug #28716: additional patch to eliminate compilation
    error under Windows.

ChangeSet@1.2482.32.11, 2007-05-30 14:29:34+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#17654  --read-from-remote-server causes core
  
  fixing FD event issue that showed up on pb.

  client/mysqlbinlog.cc@1.155.1.2, 2007-05-30 14:29:31+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
    resetting temp_buf specially for FD event to avoid double-freeing

ChangeSet@1.2482.42.1, 2007-05-30 16:02:54+05:00, bar@mysql.com +1 -0
  Define HAVE_STRNLEN correctly.

  include/config-win.h@1.99.3.1, 2007-05-30 16:02:52+05:00, bar@mysql.com +3 -0
    strnlen() presents in the build in library only starting from
    Visual Studio 2005, identified by _MSC_VER 1400.
    Previous versions of Visual Studio didn't have this
    function, so they need the MySQL replacement function to be compiled.

ChangeSet@1.1810.2683.12, 2007-05-30 12:29:19+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28770 file already opened error when corrupt schema file
  - make sure we close the first file, before opening the next

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.40.56.1, 2007-05-30 12:29:17+02:00, tomas@whalegate.ndb.mysql.com +7 -1
    Bug #28770 file already opened error when corrupt schema file
    - make sure we close the first file, before opening the next

ChangeSet@1.2482.41.1, 2007-05-30 15:23:47+05:00, ramil@mysql.com +3 -0
  Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
  
  Problem: there is an ASSERT() in the Log_event::read_log_event() checking the integrity 
  of the event's data that may fail.
  Fix: move the assert's condition to an explicit check.

  mysql-test/r/ctype_cp932_binlog_stm.result@1.9, 2007-05-30 15:23:44+05:00, ramil@mysql.com +4 -0
    Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
      - test result.

  mysql-test/t/ctype_cp932_binlog_stm.test@1.8, 2007-05-30 15:23:44+05:00, ramil@mysql.com +9 -1
    Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
      - test case.

  sql/log_event.cc@1.278.2.1, 2007-05-30 15:23:44+05:00, ramil@mysql.com +2 -3
    Fix for bug #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump
      - assert's condition moved to the explicit integrity check.

ChangeSet@1.2482.32.9, 2007-05-30 11:55:56+02:00, lars@mysql.com +3 -0
  Added extra parenthesis to remove compiler warning
  Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)

  mysql-test/r/rpl_incident.result@1.6, 2007-05-30 11:55:53+02:00, lars@mysql.com +2 -3
    Masking master_log_file since IO thread is not synchronized in rpl_incident.test

  mysql-test/t/rpl_incident.test@1.4, 2007-05-30 11:55:53+02:00, lars@mysql.com +3 -4
    Masking master_log_file since IO thread is not synchronized in rpl_incident.test
    Correcting drop of table so it is synchronized

  sql/log_event.cc@1.278.1.3, 2007-05-30 11:55:53+02:00, lars@mysql.com +1 -1
    Added extra parenthesis to remove compiler warning

ChangeSet@1.2482.32.8, 2007-05-30 14:03:35+05:00, bar@mysql.com +1 -0
  Fixing wrong memory read problem detected by Valgrind in "xml" test.
  The source of the problem was in my_vsnprintf() implementation.

  strings/my_vsnprintf.c@1.38.1.1, 2007-05-30 14:03:33+05:00, bar@mysql.com +1 -2
    Fixing a problem in vsnprintf('%.*s', len, ptr)
    When processing the above format, it's incorrect
    to use strlen() because the string is not necessarily
    a null terminated string.
    Changing strlen() followed by set_if_smaller()
    to strnlen() - which covers both cases - limiting
    by '\0' and by "len".

ChangeSet@1.2482.32.6, 2007-05-30 11:18:55+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#22725
  
  merge 5.0 with 5.1

  mysql-test/t/binlog_killed.test@1.7, 2007-05-30 11:18:52+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -1
    offset change in 5.1

ChangeSet@1.2482.11.22, 2007-05-30 12:06:07+04:00, anozdrin@ibm. +1 -0
  Disable IM tests.

  mysql-test/t/disabled.def@1.257, 2007-05-30 12:06:04+04:00, anozdrin@ibm. +2 -0
    Disable IM tests.

ChangeSet@1.1810.2988.8, 2007-05-30 10:56:18+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -0
  bug#22725
  
  test comments correction

  mysql-test/r/binlog_killed.result@1.6, 2007-05-30 10:54:48+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -1
    changed

  mysql-test/t/binlog_killed.test@1.6, 2007-05-30 10:54:49+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +3 -3
    wrong comments (but important ones) left;
    little refinement in result calc

ChangeSet@1.1810.2983.5, 2007-05-30 11:53:50+04:00, anozdrin@ibm. +1 -0
  Disable IM-tests.

  mysql-test/t/disabled.def@1.2.13.4, 2007-05-30 11:53:48+04:00, anozdrin@ibm. +3 -0
    Disable IM-tests.

ChangeSet@1.2469.228.3, 2007-05-30 12:30:15+05:00, bar@mysql.com +4 -0
  Bug#28600 Yen sign and overline ujis conversion change
  
  Problem: Unicode->UJIS followed incorrect conversion
  rules for U+00A5 YEN SIGN and U+203E OVERLINE,
  so these characters were converted to ujis 0x8E5C
  and 0x8E7E accordingly.
  
  This behaviour would be correct for a JIS-X-0201 based character set,
  but this is wrong for UJIS, which is documented as x-eucjp-unicode-0.9,
  and which is based on ASCII for the range U+0000..U+007F.
  
  Fix:
  removing JIS-X-0201 conversion rules, making UJIS ASCII compatible.
  YEN SIGN and OVERLINE do not have corresponding UJIS characters anymore
  and converted to 0x3F QUESTION MARK, throwing a warning in appropriative cases.
  
  This patch also includes a test covering full UJIS->Unicode->UJIS mapping.

  mysql-test/r/ctype_ujis_ucs2.result@1.1, 2007-05-30 12:30:13+05:00, bar@mysql.com +19159 -0
    New BitKeeper file ``mysql-test/r/ctype_ujis_ucs2.result''

  mysql-test/r/ctype_ujis_ucs2.result@1.0, 2007-05-30 12:30:13+05:00, bar@mysql.com +0 -0

  mysql-test/t/ctype_ujis_ucs2.test@1.1, 2007-05-30 12:30:13+05:00, bar@mysql.com +1306 -0
    New BitKeeper file ``mysql-test/t/ctype_ujis_ucs2.test''

  mysql-test/t/ctype_ujis_ucs2.test@1.0, 2007-05-30 12:30:13+05:00, bar@mysql.com +0 -0

  sql/field.cc@1.385.7.1, 2007-05-30 12:30:12+05:00, bar@mysql.com +17 -5
    Nicer error message format:
    always use HEX notation when printing warnings about UCS2 values -
    this is more readable.

  strings/ctype-ujis.c@1.74.1.1, 2007-05-30 12:30:13+05:00, bar@mysql.com +0 -12
    Removing incorrect Unicode->UJIS mapping.
    MySQL "UJIS" is x-eucjp-unicode-0.9.

ChangeSet@1.1810.2997.1, 2007-05-30 12:21:39+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #28716.
  The result of the CHECK OPTION condition evaluation over an
  updated record and records of merged tables was arbitrary and
  dependant on the order of records in the merged tables during
  the execution of SELECT statement.
  
  The CHECK OPTION expression was evaluated over expired record
  buffers (with arbitrary data in the fields).
  
  Rowids of tables used in the CHECK OPTION expression were
  added to temporary table rows. The multi_update::do_updates()
  method was modified to restore necessary record buffers
  before evaluation of the CHECK OPTION condition.

  mysql-test/r/view.result@1.138.32.1, 2007-05-30 12:21:12+05:00, gshchepa@gleb.loc +17 -0
    Updated test case for bug #28716.

  mysql-test/t/view.test@1.126.29.1, 2007-05-30 12:21:09+05:00, gshchepa@gleb.loc +16 -0
    Updated test case for bug #28716.

  sql/sql_class.h@1.230.68.1, 2007-05-30 12:18:49+05:00, gshchepa@gleb.loc +5 -0
    Fixed bug #29716.
    The multi_update::unupdatable_check_opt_tables variable
    has been added.

  sql/sql_update.cc@1.154.34.1, 2007-05-30 12:18:58+05:00, gshchepa@gleb.loc +112 -29
    Fixed bug #29716.
    Rowids of tables used in the CHECK OPTION expression were
    added to temporary table rows. The multi_update::do_updates()
    method was modified to restore necessary record buffers
    before evaluation of the CHECK OPTION condition.

ChangeSet@1.1810.2992.5, 2007-05-30 09:00:50+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28749    MaxNoOfOpenFiles offset by 1

  ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp@1.14.8.1, 2007-05-30 09:00:48+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #28749    MaxNoOfOpenFiles offset by 1

ChangeSet@1.1810.2996.1, 2007-05-30 09:55:38+03:00, gkodinov@magare.gmz +8 -0
  Bug #28492: subselect returns LONG in >5.0.24a and LONGLONG in <=5.0.24a
  
  Integer values with 10 digits may or may not fit into an int column 
  (e.g. 2147483647 vs 6147483647).
  Thus when creating a temp table column for such an int we must
  use bigint instead.
  Fixed to use bigint.
  Also subsituted a "magic number" with a named constant.

  mysql-test/r/analyse.result@1.25.1.3, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +12 -12
    Bug #28492: Adjusted the results after having fixed the bug

  mysql-test/r/metadata.result@1.16, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +11 -0
    Bug #28492: test case

  mysql-test/r/olap.result@1.33.1.6, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +2 -2
    Bug #28492: Adjusted the results after having fixed the bug

  mysql-test/r/sp.result@1.170.39.1, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +1 -1
    Bug #28492: Adjusted the results after having fixed the bug

  mysql-test/r/view.result@1.138.1.64, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +1 -1
    Bug #28492: Adjusted the results after having fixed the bug

  mysql-test/t/metadata.test@1.7, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +11 -0
    Bug #28492: test case

  sql/field.h@1.153.27.3, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +1 -1
    Bug #28492: Replaced a magic number with a constant

  sql/sql_select.cc@1.312.1.215, 2007-05-30 09:55:36+03:00, gkodinov@magare.gmz +7 -2
    Bug #28492: Treat integers with 10 and more digits as 
    bigint.

ChangeSet@1.2403.18.56, 2007-05-29 23:39:57+02:00, tomas@whalegate.ndb.mysql.com +10 -0
  shorten some files for tar to work

  storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile@1.3, 2007-05-29 23:39:54+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    shorten some files for tar to work

  storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp@1.4, 2007-05-29 23:28:01+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp

  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile@1.4, 2007-05-29 23:39:54+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    shorten some files for tar to work

  storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp@1.5, 2007-05-29 23:28:55+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile@1.2, 2007-05-29 23:39:54+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    shorten some files for tar to work

  storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp@1.3, 2007-05-29 23:36:06+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp

  storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile@1.3, 2007-05-29 23:39:54+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    shorten some files for tar to work

  storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp@1.3.1.1, 2007-05-29 23:24:23+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am@1.10, 2007-05-29 23:39:54+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    shorten some files for tar to work

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp@1.10, 2007-05-29 23:30:29+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp -> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp

ChangeSet@1.1810.2988.7, 2007-05-30 00:22:24+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -0
  bug#22725
  
  combining the final result variable in such way that either option of the test execution
  will yield zero.

  mysql-test/r/binlog_killed.result@1.5, 2007-05-30 00:22:22+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +3 -15
    results changed

  mysql-test/t/binlog_killed.test@1.5, 2007-05-30 00:22:22+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +12 -16
    there are two options for the test passing:
    1. no rows inserted and the INSERT gets killed, then there is no INSERT query in binlog
    2. all rows inserted, then INSERT gets to binlog and error_code is zero

ChangeSet@1.2482.11.20, 2007-05-29 14:52:17-06:00, malff@weblab.(none) +5 -0
  Manual merge

  sql/sp_head.cc@1.271.2.2, 2007-05-29 14:52:15-06:00, malff@weblab.(none) +1 -1
    Manual merge, bug#27876

  sql/sql_lex.cc@1.242.1.4, 2007-05-29 14:52:15-06:00, malff@weblab.(none) +6 -3
    Manual merge, bug#27876

  sql/sql_lex.h@1.280, 2007-05-29 14:52:15-06:00, malff@weblab.(none) +2 -1
    Manual merge, bug#27876

  sql/sql_view.cc@1.133.2.2, 2007-05-29 14:52:15-06:00, malff@weblab.(none) +1 -1
    Manual merge, bug#27876

  tests/mysql_client_test.c@1.236.1.7, 2007-05-29 14:52:15-06:00, malff@weblab.(none) +65 -0
    Manual merge, bug#27876

ChangeSet@1.1810.2995.1, 2007-05-30 00:33:12+04:00, evgen@moonbone.local +4 -0
  Bug#28450: The Item_date_add_interval in select list may fail the field 
  type assertion.
  
  The bug was introduced by the patch for bug #16377.
  The "+ INTERVAL" (Item_date_add_interval) function detects its result type
  by the type of its first argument. But in some cases it returns STRING
  as the result type. This happens when, for example, the first argument is a 
  DATE represented as string. All this makes the get_datetime_value()
  function misinterpret such result and return wrong DATE/DATETIME value.
  To avoid such cases in the fix for #16377 the code that detects correct result
  field type on the first execution was added to the
  Item_date_add_interval::get_date() function. Due to this the result
  field type of the Item_date_add_interval item stored by the send_fields()
  function differs from item's result field type at the moment when
  the item is actually sent. It causes an assertion failure.
  
  Now the get_datetime_value() detects that the DATE value is returned by
  some item not only by checking the result field type but also by comparing
  the returned value with the 100000000L constant - any DATE value should be
  less than this value.
  Removed result field type adjusting code from the
  Item_date_add_interval::get_date() function.

  mysql-test/r/func_date_add.result@1.11, 2007-05-30 00:32:57+04:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#28450: The Item_date_add_interval in select list may fail the field
    type assertion.

  mysql-test/t/func_date_add.test@1.10, 2007-05-30 00:32:58+04:00, evgen@moonbone.local +10 -0
    Added a test case for the bug#28450: The Item_date_add_interval in select list may fail the field
    type assertion.

  sql/item_cmpfunc.cc@1.187.41.1, 2007-05-30 00:32:55+04:00, evgen@moonbone.local +6 -1
    Bug#28450: The Item_date_add_interval in select list may fail the field 
    type assertion.
    Now the get_datetime_value() detects that the DATE value is returned by
    some item not only by checking the result field type but also by comparing
    the returned value with the 100000000L constant - any DATE value should be
    less than this value.

  sql/item_timefunc.cc@1.100.31.2, 2007-05-30 00:32:57+04:00, evgen@moonbone.local +0 -21
    Bug#28450: The Item_date_add_interval in select list may fail the field 
    type assertion.
    Removed result field type adjusting code from the
    Item_date_add_interval::get_date() function.

ChangeSet@1.1810.2988.6, 2007-05-29 23:16:50+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -0
  bug#22725
  
  tests refining, see binlog_killed.test file for details

  mysql-test/r/binlog_killed.result@1.4, 2007-05-29 23:16:47+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -3
    results changed

  mysql-test/t/binlog_killed.test@1.4, 2007-05-29 23:16:47+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +20 -2
    killer conn waits for the first row to appear;
    log-disabling kill query since prey's id is not deterministic;
    correcting pattern to search in binlog for insert query;

ChangeSet@1.2482.32.3, 2007-05-29 22:17:09+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -0
  bug#22725 
  
  merge with 5.0

  sql/sql_class.cc@1.334.2.1, 2007-05-29 22:17:07+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +5 -4
    THD::binlog_query receives killed status arg with default the same for Query_log_event

  sql/sql_class.h@1.362.2.2, 2007-05-29 22:17:07+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +27 -26
    relocation public binlog_query down to the point where killed_state is declared

ChangeSet@1.1810.2988.5, 2007-05-29 21:05:08+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#22725
  
  refining the test.

  mysql-test/t/binlog_killed.test@1.3, 2007-05-29 21:05:06+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
    due to killing reap may catch an error though it's indeterministic.

ChangeSet@1.2482.28.5, 2007-05-29 21:31:45+04:00, sergefp@mysql.com +1 -0
  Added comment for ha_statistics::records

  sql/handler.h@1.258.3.1, 2007-05-29 21:31:39+04:00, sergefp@mysql.com +9 -1
    Added comment for ha_statistics::records

ChangeSet@1.2482.39.1, 2007-05-29 21:22:33+04:00, anozdrin@ibm. +5 -0
  Refactoring patch:
  
  1. Refactor sp_show_create_function() and sp_show_create_procedure()
    into show_create_routine().
  2. Code cleanup: eliminate proxy functions.

  sql/sp.cc@1.151.1.1, 2007-05-29 21:22:31+04:00, anozdrin@ibm. +156 -170
    Code cleanup: eliminate proxy functions.

  sql/sp.h@1.38.1.1, 2007-05-29 21:22:31+04:00, anozdrin@ibm. +6 -23
    Code cleanup: eliminate proxy functions.

  sql/sp_head.cc@1.271.3.1, 2007-05-29 21:22:31+04:00, anozdrin@ibm. +76 -77
    1. Refactor sp_show_create_function() and sp_show_create_procedure()
      into show_create_routine().
    2. Code cleanup: eliminate proxy functions.

  sql/sp_head.h@1.106.1.1, 2007-05-29 21:22:31+04:00, anozdrin@ibm. +2 -5
    1. Refactor sp_show_create_function() and sp_show_create_procedure()
      into show_create_routine().
    2. Code cleanup: eliminate proxy functions.

  sql/sql_parse.cc@1.673, 2007-05-29 21:22:31+04:00, anozdrin@ibm. +23 -17
    Code cleanup: use new functions.

ChangeSet@1.1810.2988.4, 2007-05-29 18:38:47+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  bug#22725
  
  result file updated

  mysql-test/r/binlog_killed.result@1.3, 2007-05-29 18:38:45+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +6 -3
    results updated

ChangeSet@1.2469.212.13, 2007-05-29 17:13:17+02:00, mats@kindahl-laptop.dnsalias.net +7 -0
  WL#3303 (RBR: Engine-controlled logging format):
  
  Moving code to check storage engine capabilities to after tables
  are locked.  Moving code to cache table flags so that table flags
  are read from the storage engine at the beginning of the statement
  in addition to when the storage engine is opened.
  
  To handle CREATE-SELECT, the decision function is called after the
  table is created and it is called with all tables that are in the select
  part of the statement as well as the newly created table.

  sql/handler.cc@1.304.4.1, 2007-05-29 17:13:08+02:00, mats@kindahl-laptop.dnsalias.net +9 -1
    Changing code to cache table flags on a per-statement basis. The table
    flags are now retrieved inside ha_external_lock().

  sql/handler.h@1.256.3.2, 2007-05-29 17:13:08+02:00, mats@kindahl-laptop.dnsalias.net +20 -2
    Extending TABLEOP_HOOKS with postlock() member.

  sql/mysql_priv.h@1.497.3.1, 2007-05-29 17:13:08+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding prototype declaration of decide_logging_format() function.

  sql/sql_base.cc@1.396.4.3, 2007-05-29 17:13:08+02:00, mats@kindahl-laptop.dnsalias.net +94 -68
    Factoring out code to check capabilities into decide_logging_format().
    Moving code to check engine capabilities to after the tables are locked.
    Correcting a bug causing row-based to not be set when the engines
    were not statement-logging capable.

  sql/sql_class.h@1.354.1.2, 2007-05-29 17:13:08+02:00, mats@kindahl-laptop.dnsalias.net +4 -2
    Adding selected tables as select_create::select_tables member variable.

  sql/sql_insert.cc@1.261.4.2, 2007-05-29 17:13:09+02:00, mats@kindahl-laptop.dnsalias.net +23 -5
    Introducing logic to handle post-locking hook.
    select_create::prepare now uses post-lock hook instead of pre-lock hook.
    Deciding on logging format especially for CREATE-SELECT by calling
    decide_logging_format() in the post-lock hook.

  sql/sql_parse.cc@1.659.3.1, 2007-05-29 17:13:09+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding selected tables as argument to select_create constructor.

ChangeSet@1.2409.112.1, 2007-05-29 16:36:05+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -0
  Bug#27044 replicated with unique field ndb table allows duplkey inserts
  The bug in that slave version of a table with unique field still was
  able to execute INSERT query as replace whereas it's impossible on master.
  
  The reason of this artifact is wrong usage of ndb->extra:s.
  
  Fixed with resetting flags at do_after.
  There is open issue with symmetrical resetting
     table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY)
  which i had to hand to bug#27077.
  The test for the current bug was committed in a cset for bug#27320.

  sql/log_event.cc@1.266.8.1, 2007-05-29 16:36:03+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +31 -7
    fixing do_after_row_operation to reset the effect of the extra engine's 
    flags set at do_before;
    comments on meaning of extra flags added;
    execution of table->file->ha_end_bulk_insert() in do_after is not dependant on error;

ChangeSet@1.1810.2988.3, 2007-05-29 16:27:55+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +3 -0
  Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
    
  Refining the tests since pb revealed the older version's fragality - the error from SF() due to killed
  may be different on different env:s.
  DBUG_ASSERT instead of assert.

  mysql-test/r/binlog_killed.result@1.2, 2007-05-29 16:27:52+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +5 -89
    new result file

  mysql-test/t/binlog_killed.test@1.2, 2007-05-29 16:27:52+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +48 -22
    regression for bug#22725 simplified. tests for bug27563, BUG#27565 made inactive.

  sql/sql_insert.cc@1.146.1.93, 2007-05-29 16:27:53+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +1 -1
    DBUG_ASSERT

ChangeSet@1.2482.11.18, 2007-05-29 15:05:35+02:00, thek@adventure.(none) +1 -0
  Undefined unused function causing red in PushBuild.

  tests/mysql_client_test.c@1.236.1.5, 2007-05-29 15:05:34+02:00, thek@adventure.(none) +2 -0
    Undefined unused function causing red in PushBuild.

ChangeSet@1.2482.37.1, 2007-05-29 15:58:18+03:00, gkodinov@macbook.gmz +31 -0
  Bug #27531: 5.1 part of the fix
  - Renamed "Using join cache" to "Using join buffer".
  - "Using join buffer" is now printed on the last
    table that "reads" from the join buffer cache.

  mysql-test/r/archive_gis.result@1.14, 2007-05-29 15:57:09+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/compress.result@1.11, 2007-05-29 15:57:10+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/ctype_utf8.result@1.117, 2007-05-29 15:57:12+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/derived.result@1.60, 2007-05-29 15:57:13+03:00, gkodinov@macbook.gmz +10 -10
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/distinct.result@1.55, 2007-05-29 15:57:14+03:00, gkodinov@macbook.gmz +10 -10
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/func_group.result@1.65, 2007-05-29 15:57:16+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/func_group_innodb.result@1.4, 2007-05-29 15:57:17+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/gis.result@1.49, 2007-05-29 15:57:19+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/greedy_optimizer.result@1.11, 2007-05-29 15:57:20+03:00, gkodinov@macbook.gmz +220 -220
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/group_by.result@1.83, 2007-05-29 15:57:22+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/group_min_max.result@1.32, 2007-05-29 15:57:23+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/index_merge_myisam.result@1.7, 2007-05-29 15:57:24+03:00, gkodinov@macbook.gmz +8 -8
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/information_schema.result@1.154, 2007-05-29 15:57:26+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/innodb_gis.result@1.15, 2007-05-29 15:57:27+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/innodb_mysql.result@1.33.1.1, 2007-05-29 15:57:28+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/join.result@1.49, 2007-05-29 15:57:29+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/join_nested.result@1.28, 2007-05-29 15:57:31+03:00, gkodinov@macbook.gmz +26 -26
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/key_diff.result@1.13, 2007-05-29 15:57:32+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/myisam.result@1.112, 2007-05-29 15:57:33+03:00, gkodinov@macbook.gmz +6 -6
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/ndb_condition_pushdown.result@1.32, 2007-05-29 15:57:35+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/ndb_gis.result@1.21, 2007-05-29 15:57:36+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/range.result@1.63, 2007-05-29 15:57:37+03:00, gkodinov@macbook.gmz +16 -16
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/row.result@1.31, 2007-05-29 15:57:39+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/select.result@1.159, 2007-05-29 15:57:40+03:00, gkodinov@macbook.gmz +16 -16
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/ssl.result@1.9, 2007-05-29 15:57:42+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/ssl_compress.result@1.9, 2007-05-29 15:57:43+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/subselect.result@1.188, 2007-05-29 15:57:44+03:00, gkodinov@macbook.gmz +4 -4
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/subselect3.result@1.16, 2007-05-29 15:57:46+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/union.result@1.100, 2007-05-29 15:57:47+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  mysql-test/r/view.result@1.226, 2007-05-29 15:57:49+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

  sql/sql_select.cc@1.526, 2007-05-29 15:57:51+03:00, gkodinov@macbook.gmz +2 -2
    Bug #27531: renamed "Using join cache" to "Using join buffer"
    and moved to the last table in the batch.

ChangeSet@1.1810.2994.1, 2007-05-29 16:35:55+04:00, kaa@polly.local +1 -0
  Moved size_of() from Field_double to Field_real in order to properly clone Field_float and Field_double. This is to fix PushBuild failures introduced by the patch for bug #28121.

  sql/field.h@1.153.31.2, 2007-05-29 16:35:52+04:00, kaa@polly.local +1 -1
    Moved size_of() from Field_double to Field_real in order to properly clone Field_float and Field_double.

ChangeSet@1.1810.2993.1, 2007-05-29 14:45:30+03:00, gkodinov@magare.gmz +3 -0
  Bug #28605: SHOW CREATE VIEW with views using stored_procedures no 
   longer showing SP names.
  SHOW CREATE VIEW uses Item::print() methods to reconstruct the 
  statement text from the parse tree.
  The print() method for stored procedure calls needs allocate 
  space to print the function's quoted name.
  It was incorrectly calculating the length of the buffer needed 
  (was too short).
  Fixed to reflect the actual space needed.

  mysql-test/r/sp.result@1.170.28.14, 2007-05-29 14:45:29+03:00, gkodinov@magare.gmz +11 -0
    Bug #28605: test case

  mysql-test/t/sp.test@1.174.28.14, 2007-05-29 14:45:29+03:00, gkodinov@magare.gmz +20 -0
    Bug #28605: test case

  sql/item_func.cc@1.270.1.72, 2007-05-29 14:45:29+03:00, gkodinov@magare.gmz +3 -2
    Bug #28605: fixed the string length calculation

ChangeSet@1.2482.35.1, 2007-05-29 13:37:38+02:00, thek@adventure.(none) +2 -0
  Removed broken test from list of test to execute.
  To be restored when PB is patched to ignore 
  requested safemalloc memory dumps.

  mysql-test/t/disabled.def@1.256, 2007-05-29 13:37:35+02:00, thek@adventure.(none) +0 -2
    Restored disabled test file.

  tests/mysql_client_test.c@1.236.1.4, 2007-05-29 13:37:35+02:00, thek@adventure.(none) +3 -2
    Removed broken test from list of test to execute.
    To be restored when PB is patched to ignore 
    requested safemalloc memory dumps.

ChangeSet@1.1810.2976.7, 2007-05-29 14:36:21+03:00, gkodinov@magare.gmz +1 -0
  Bug #28366: multiple load_file('a: ... ') causes entire mysqld process to hang
  
  When a Windows console application that has an open console (e.g. mysqld-nt 
  started with the --console option) encounters certain type of errors 
  (like no floppy disk in a floppy drive) the OS will pop-up an 
  "abort/retry/ignore" dialog and block the application (depending on a 
  registry setting : see http://msdn2.microsoft.com/en-us/embedded/aa731206.aspx
  for details).
  Fixed by disabling the dialog popups for every error except a GPF and
  alignment errors. This is safe to do as the actual error gets reported
  (and handled) to mysqld.

  sql/mysqld.cc@1.439.116.1, 2007-05-29 14:36:20+03:00, gkodinov@magare.gmz +5 -0
    Bug #28366: disable the system error messageboxes.

ChangeSet@1.2482.34.1, 2007-05-29 16:24:12+05:00, ramil@mysql.com +4 -0
  Fix for bug #28631: Bit index creation failure after alter
  
  Problem: altering a bit field we use Field::is_equal() to check if the bit 
  field is changed. Comparing the field type is not enough for bit fields.
  Fix: add proper Field_bit::is_equal() that compares the field lengths as well.
  

  mysql-test/r/type_bit.result@1.26, 2007-05-29 16:24:10+05:00, ramil@mysql.com +26 -0
    Fix for bug #28631: Bit index creation failure after alter
      - test result.

  mysql-test/t/type_bit.test@1.20, 2007-05-29 16:24:10+05:00, ramil@mysql.com +17 -0
    Fix for bug #28631: Bit index creation failure after alter
      - test result.

  sql/field.cc@1.385.1.11, 2007-05-29 16:24:10+05:00, ramil@mysql.com +7 -0
    Fix for bug #28631: Bit index creation failure after alter
      - Field_bit::is_equal() added.

  sql/field.h@1.226.2.3, 2007-05-29 16:24:10+05:00, ramil@mysql.com +1 -0
    Fix for bug #28631: Bit index creation failure after alter
      - Field_bit::is_equal() added.

ChangeSet@1.2482.11.16, 2007-05-29 12:44:44+02:00, andrey@whirlpool.mysql.com +2 -0
  Fix for bug #28310 Server reports events which never were created
  
  Fix a race
  
  Wait at the end of the test for all events to finish.
  Then continue to the next result. This should be done, as the
  server won't be restarted, and although events are dropped with
  drop database, they could still be executing in memory.

  mysql-test/r/events_restart_phase3.result@1.4, 2007-05-29 12:44:38+02:00, andrey@whirlpool.mysql.com +0 -6
    fix result

  mysql-test/t/events_restart_phase3.test@1.3, 2007-05-29 12:44:38+02:00, andrey@whirlpool.mysql.com +4 -2
    Fix a race
    Wait at the end of the test for all events to finish.
    Then continue to the next result. This should be done, as the
    server won't be restarted, and although events are dropped with
    drop database, they could still be executing in memory.

ChangeSet@1.1616.3049.1, 2007-05-29 12:23:49+02:00, df@pippilotta.erinye.com +1 -0
  BUG#17707 check-cpu script doesn't include Turion

  BUILD/check-cpu@1.12.1.4, 2007-05-29 12:23:48+02:00, df@pippilotta.erinye.com +6 -0
    BUG#17707 add Turion (and Opteron)

ChangeSet@1.2482.31.5, 2007-05-29 11:55:12+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #26783  	replication status unknown after cluster or mysqld failure

  mysql-test/t/disabled.def@1.253.2.1, 2007-05-29 11:55:09+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    Bug #26783  	replication status unknown after cluster or mysqld failure

  sql/ha_ndbcluster.cc@1.454.1.1, 2007-05-29 11:55:10+02:00, tomas@whalegate.ndb.mysql.com +0 -2
    Bug #26783  	replication status unknown after cluster or mysqld failure

ChangeSet@1.1616.2769.21, 2007-05-29 07:16:26+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix typo

  ndb/test/run-test/daily-basic-tests.txt@1.13.3.5, 2007-05-29 07:16:25+02:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - fix typo

ChangeSet@1.2482.27.3, 2007-05-28 22:18:51+02:00, kent@mysql.com +7 -0
  Makefile.am:
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  plugin/daemon_example/Makefile.am@1.4, 2007-05-28 22:17:02+02:00, kent@mysql.com +3 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  plugin/fulltext/Makefile.am@1.10, 2007-05-28 22:17:33+02:00, kent@mysql.com +3 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  unittest/Makefile.am@1.14, 2007-05-28 22:17:34+02:00, kent@mysql.com +3 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  unittest/examples/Makefile.am@1.9, 2007-05-28 22:17:34+02:00, kent@mysql.com +2 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  unittest/mysys/Makefile.am@1.8, 2007-05-28 22:17:46+02:00, kent@mysql.com +2 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  unittest/mytap/Makefile.am@1.5, 2007-05-28 22:17:48+02:00, kent@mysql.com +3 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

  unittest/mytap/t/Makefile.am@1.9, 2007-05-28 22:17:49+02:00, kent@mysql.com +2 -0
    Consistent use of '%::SCCS/s.%' to prevent some 'make'
    implementations from trying to update files in SCCS directory

ChangeSet@1.2482.27.2, 2007-05-28 22:14:29+02:00, kent@mysql.com +1 -0
  configure.in:
    After merge changes, removed unneeded Netware specific sprintf case

  configure.in@1.459.2.2, 2007-05-28 22:14:15+02:00, kent@mysql.com +5 -12
    After merge changes, removed unneeded Netware specific sprintf case

ChangeSet@1.1810.2988.2, 2007-05-28 22:20:22+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +7 -0
  Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
    
  The reason for the bug was that replaying of a query on slave could not be possible since its event
  was recorded with the killed error. Due to the specific of handling INSERT, which per-row-while-loop is 
  unbreakable to killing, the query on transactional table should have not appeared in binlog unless
  there was  a call to a stored routine that got interrupted with killing (and then there must be an error
  returned out of the loop).
     
  The offered solution added the following rule for binlogging of INSERT that accounts the above
  specifics:
  For INSERT on transactional-table if the error was not set the only raised flag
  is harmless and is ignored via masking out on time of creation of binlog event.
     
  For both table types the combination of raised error and KILLED flag indicates that there
  was potentially partial execution on master and consistency is under the question.
  In that case the code continues to binlog an event with an appropriate killed error.
   
  The fix relies on the specified behaviour of stored routine that must propagate the error 
  to the top level query handling if the thd->killed flag was raised in the routine execution.
     
  The patch adds an arg with the default killed-status-unset value to Query_log_event::Query_log_event.

  mysql-test/r/binlog_killed.result@1.1, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +106 -0
    new result file

  mysql-test/r/binlog_killed.result@1.0, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +0 -0

  mysql-test/t/binlog_killed.test@1.1, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +206 -0
    regression tests also apply for bug27563, BUG#27565

  mysql-test/t/binlog_killed.test@1.0, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +0 -0

  sql/log_event.cc@1.174.1.59, 2007-05-28 22:20:18+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +24 -5
    killed_status as the value of thd->killed can be passed as an arg to the constructor.
    if the value is different from the default the arg is set to the current thd->killed value.
    A caller might need to masquerade thd->killed with THD::NOT_KILLED.
    So far only mysql_insert() uses such explicit way to tell the constructor about killing status.

  sql/log_event.h@1.122.1.13, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +2 -1
    default arg to the constructor with meaning of killed status of the query. 
    if the arg is not explicitly provided the status of thd->killed will be snapshot 
    inside of the constuctor, which is potentially incorrect (see bug#27571)

  sql/sql_class.h@1.230.1.103, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +10 -2
    extending killed_state with no-state member.

  sql/sql_insert.cc@1.146.1.92, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +27 -1
    ignore the KILLED flag incl KILL_BAD_DATA when the INSERT query event 
    is created without an `error';

  sql/sql_update.cc@1.154.2.64, 2007-05-28 22:20:19+03:00, aelkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi +31 -0
    Suggestion how to fix bug#27571 as comments.

ChangeSet@1.2482.29.4, 2007-05-28 21:14:57+02:00, rafal@quant.(none) +1 -0
  BUG#21132 (Slave fails to reconnect on update_slave_list)
  
  This is a one liner which will fix semantics if SHOW SLAVE HOSTS to 
  display the list of slaves currently registered on the host on which
  it was issued.

  sql/slave.cc@1.307.1.1, 2007-05-28 21:14:52+02:00, rafal@quant.(none) +1 -1
    Remove call to update_slave_list() which was executing "SHOW SLAVE
    HOSTS" on master and populating slave_list based on the output.

ChangeSet@1.1810.2990.3, 2007-05-28 21:43:31+04:00, kaa@polly.local +1 -0
  Don't use log_01[] in my_strtod() to avoid loss of precision.
  
  This is for bug #28121.

  strings/strtod.c@1.25.3.4, 2007-05-28 21:43:27+04:00, kaa@polly.local +2 -2
    Don't use log_01[] in my_strtod() to avoid loss of precision.

ChangeSet@1.1616.3048.1, 2007-05-28 18:03:24+02:00, msvensson@pilot.(none) +1 -0
  Bug #26397  	mysql-test-run.pl --start-dirty removes binary logs
   - Don't delete anything if starting dirty

  mysql-test/mysql-test-run.pl@1.8.24.1, 2007-05-28 18:03:23+02:00, msvensson@pilot.(none) +6 -0
    Don't delete anything if starting dirty

ChangeSet@1.2475.76.1, 2007-05-28 16:46:22+02:00, thek@adventure.(none) +1 -0
  Safemalloc memory dump reported as memory leak although it isn't. Waiting for
  fix in PB.

  mysql-test/t/disabled.def@1.252.1.2, 2007-05-28 16:46:19+02:00, thek@adventure.(none) +3 -0
    Safemalloc memory dump reported as memory leak although it isn't. Waiting for
    fix in PB.

ChangeSet@1.1810.2683.11, 2007-05-28 16:31:31+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  print user and system time at watchdog check

  ndb/src/kernel/vm/WatchDog.cpp@1.3.5.1, 2007-05-28 16:31:29+02:00, tomas@whalegate.ndb.mysql.com +8 -0
    print user and system time at watchdog check

ChangeSet@1.1810.2683.10, 2007-05-28 16:18:04+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  make memeber public

  ndb/test/include/NdbRestarter.hpp@1.4.6.1, 2007-05-28 16:18:02+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    make memeber public

ChangeSet@1.1810.2683.9, 2007-05-28 15:59:02+02:00, tomas@whalegate.ndb.mysql.com +5 -0
  bug#28717, make sure only master updates activeStatus
    so that othernodes dont get confused after having recevied status from master
    and then tries to update it self

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.20.1, 2007-05-28 15:59:00+02:00, tomas@whalegate.ndb.mysql.com +6 -1
    error 1001, delay node_failrep

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.80.1, 2007-05-28 15:59:00+02:00, tomas@whalegate.ndb.mysql.com +7 -1
    bug#28717, make sure only master updates activeStatus
      so that othernodes dont get confused after having recevied status from master
      and then tries to update it self

  ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@1.14.32.1, 2007-05-28 15:59:00+02:00, tomas@whalegate.ndb.mysql.com +7 -0
    error 1001, delay node_failrep

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.28.1, 2007-05-28 15:59:01+02:00, tomas@whalegate.ndb.mysql.com +81 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.27.42.1, 2007-05-28 15:59:01+02:00, tomas@whalegate.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.2482.29.3, 2007-05-28 15:23:12+02:00, lars@mysql.com +1 -0
  Added missing result file

  mysql-test/r/rpl_critical_errors.result@1.1, 2007-05-28 15:23:09+02:00, lars@mysql.com +1 -0
    Missing result file

  mysql-test/r/rpl_critical_errors.result@1.0, 2007-05-28 15:23:09+02:00, lars@mysql.com +0 -0

ChangeSet@1.2482.11.14, 2007-05-28 16:31:16+04:00, kostja@vajra.(none) +1 -0
  Fix a compile-time warning.

  sql/sql_table.cc@1.422, 2007-05-28 16:31:12+04:00, kostja@vajra.(none) +2 -1
    Fix a compile-time warning.

ChangeSet@1.2482.8.15, 2007-05-28 14:13:42+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28719: multi pk update ignore corrupts data
  - 5.1 adoption

  mysql-test/t/ndb_basic.test@1.56, 2007-05-28 14:13:39+02:00, tomas@whalegate.ndb.mysql.com +3 -43
    Bug #28719: multi pk update ignore corrupts data
    - 5.1 adoption

ChangeSet@1.2475.54.24, 2007-05-28 14:08:04+02:00, thek@adventure.(none) +8 -0
  Bug#24988 FLUSH PRIVILEGES causes brief unavailability
  - A race condition caused brief unavailablility when trying to acccess
    a table. 
  - The variable 'grant_option' was removed to resolve the race condition and
    to simplify the design pattern. This flag was originally intended to optimize
    grant checks.

  sql/mysql_priv.h@1.507.1.4, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +1 -1
    - removed 'grant_option' flag.

  sql/sql_acl.cc@1.234.1.2, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +9 -29
    - removed 'grant_option' flag.

  sql/sql_db.cc@1.151.1.1, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +1 -1
    - removed 'grant_option' flag.

  sql/sql_insert.cc@1.269.1.1, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +6 -9
    - removed 'grant_option' flag.

  sql/sql_parse.cc@1.671.1.1, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +47 -74
    - removed 'grant_option' flag.
    - removed unnecessary variables found_access, found

  sql/sql_show.cc@1.409.2.1, 2007-05-28 14:08:01+02:00, thek@adventure.(none) +3 -3
    - removed 'grant_option' flag.

  sql/sql_update.cc@1.239.1.2, 2007-05-28 14:08:02+02:00, thek@adventure.(none) +1 -1
    - removed 'grant_option' flag.

  sql/sql_view.cc@1.133.1.1, 2007-05-28 14:08:02+02:00, thek@adventure.(none) +3 -3
    - removed 'grant_option' flag.

ChangeSet@1.1810.2991.1, 2007-05-28 13:50:33+02:00, thek@adventure.(none) +2 -0
  Bug#24988 FLUSH PRIVILEGES causes brief unavailability
  - A race condition caused brief unavailablility when trying to acccess
    a table.
  - The unprotected variable 'grant_option' wasn't intended to alternate
    during normal execution. Variable initialization moved to grant_init
    a lines responsible for the alternation are removed. 

  sql/mysqld.cc@1.439.114.1, 2007-05-28 13:50:31+02:00, thek@adventure.(none) +9 -1
    - Added documentation to describe grant_option flag.

  sql/sql_acl.cc@1.128.1.92, 2007-05-28 13:50:31+02:00, thek@adventure.(none) +4 -7
    - This patch removes lines which causes grant_option to alternate and moves
      variable initialization to the grant_init()-function.

ChangeSet@1.2482.18.3, 2007-05-28 14:37:39+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +5 -0
  Changed accidently added tabs back into spaces.
  Fixed a bug that came in merge.

  client/mysqltest.c@1.301, 2007-05-28 14:37:32+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Changed accidently added tabs back into spaces.

  mysys/array.c@1.18, 2007-05-28 14:37:32+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +22 -22
    Changed accidently added tabs back into spaces.

  sql/set_var.cc@1.233.1.3, 2007-05-28 14:37:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Changed accidently added tabs back into spaces.

  sql/sql_insert.cc@1.268.1.2, 2007-05-28 14:37:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +0 -1
    Removed accidently included line in merge.

  sql/sql_yacc.yy@1.569.1.3, 2007-05-28 14:37:33+03:00, jani@a88-113-38-195.elisa-laajakaista.fi +1 -1
    Changed accidently added tabs back into spaces.

ChangeSet@1.1810.2990.2, 2007-05-28 15:33:22+04:00, kaa@polly.local +3 -0
  Some Windows-related fixes to make Microsoft compilers happy. This is for bug #28128.

  include/m_string.h@1.37.1.4, 2007-05-28 15:33:17+04:00, kaa@polly.local +2 -2
    Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.

  sql/field.cc@1.256.1.95, 2007-05-28 15:33:17+04:00, kaa@polly.local +1 -1
    Avoid the warning on Windows.

  strings/strtod.c@1.25.3.3, 2007-05-28 15:33:17+04:00, kaa@polly.local +2 -2
    Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.

ChangeSet@1.2482.30.1, 2007-05-28 15:30:01+04:00, kostja@vajra.(none) +17 -0
  5.1 version of a fix and test cases for bugs:
  Bug#4968 ""Stored procedure crash if cursor opened on altered table"
  Bug#6895 "Prepared Statements: ALTER TABLE DROP COLUMN does nothing"
  Bug#19182 "CREATE TABLE bar (m INT) SELECT n FROM foo; doesn't work from 
  stored procedure."
  Bug#19733 "Repeated alter, or repeated create/drop, fails"
  Bug#22060 "ALTER TABLE x AUTO_INCREMENT=y in SP crashes server"
  Bug#24879 "Prepared Statements: CREATE TABLE (UTF8 KEY) produces a 
  growing key length" (this bug is not fixed in 5.0)
  
  Re-execution of CREATE DATABASE, CREATE TABLE and ALTER TABLE 
  statements in stored routines or as prepared statements caused
  incorrect results (and crashes in versions prior to 5.0.25).
  
  In 5.1 the problem occured only for CREATE DATABASE, CREATE TABLE
  SELECT and CREATE TABLE with INDEX/DATA DIRECTOY options).
    
  The problem of bugs 4968, 19733, 19282 and 6895 was that functions
  mysql_prepare_table, mysql_create_table and mysql_alter_table are not
  re-execution friendly: during their operation they modify contents
  of LEX (members create_info, alter_info, key_list, create_list),
  thus making the LEX unusable for the next execution.
  In particular, these functions removed processed columns and keys from
  create_list, key_list and drop_list. Search the code in sql_table.cc 
  for drop_it.remove() and similar patterns to find evidence.
    
  The fix is to supply to these functions a usable copy of each of the
  above structures at every re-execution of an SQL statement. 
    
  To simplify memory management, LEX::key_list and LEX::create_list
  were added to LEX::alter_info, a fresh copy of which is created for
  every execution.
    
  The problem of crashing bug 22060 stemmed from the fact that the above 
  metnioned functions were not only modifying HA_CREATE_INFO structure 
  in LEX, but also were changing it to point to areas in volatile memory
  of the execution memory root.
     
  The patch solves this problem by creating and using an on-stack
  copy of HA_CREATE_INFO in mysql_execute_command.
  
  Additionally, this patch splits the part of mysql_alter_table
  that analizes and rewrites information from the parser into
  a separate function - mysql_prepare_alter_table, in analogy with
  mysql_prepare_table, which is renamed to mysql_prepare_create_table.

  mysql-test/r/ps.result@1.111.1.1, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +168 -0
    Update test results (Bug#19182, Bug#22060, Bug#4968, Bug#6895)

  mysql-test/r/sp.result@1.271, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +17 -0
    Update results (Bug#19733)

  mysql-test/t/ps.test@1.114.1.1, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +194 -0
    Add test cases for Bug#19182, Bug#22060, Bug#4968, Bug#6895

  mysql-test/t/sp.test@1.238, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +28 -0
    Add a test case for Bug#19733

  sql/field.h@1.226.3.1, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +3 -0
    Implement a deep copy constructor for create_field

  sql/mysql_priv.h@1.509.2.3, 2007-05-28 15:29:55+04:00, kostja@vajra.(none) +13 -24
    LEX::key_list and LEX::create_list were moved to LEX::alter_info.
    Update declarations to use LEX::alter_info instead of these two
    members.
    Remove declarations of mysql_add_index, mysql_drop_index.

  sql/sql_class.cc@1.334.1.1, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +34 -0
    Implement deep copy constructors.

  sql/sql_class.h@1.362.1.1, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +49 -12
    Implement (almost) deep copy constructors for key_part_spec, 
    Alter_drop, Alter_column, Key, foreign_key.
    Replace pair<columns, keys> with an instance of Alter_info in
    select_create constructor. We create a new copy of Alter_info
    each time we re-execute SELECT .. CREATE prepared statement.

  sql/sql_insert.cc@1.270, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +8 -9
    Adjust to a new signature of create_table_from_items.

  sql/sql_lex.cc@1.242.1.2, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +47 -0
    Implement Alter_info::Alter_info that would make a "deep" copy
    of all definition lists (keys, columns).
    Move is_partition_management() from sql_partition.cc (feature-based
    file division is evil).

  sql/sql_lex.h@1.278, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +42 -9
    Move key_list and create_list to class Alter_info. Implement
    Alter_info::Alter_info that can be used with PS and SP.
    Get rid of Alter_info::clear() which was an attempt to save on
    matches and always use Alter_info::reset().
    Implement an auxiliary Alter_info::init_for_create_from_alter()
    which is used in mysql_alter_table.

  sql/sql_list.cc@1.13, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +34 -0
      Implement a copy constructor of class List that makes a deep copy
      of all list nodes.

  sql/sql_list.h@1.46.1.1, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +70 -9
    Implement a way to make a deep copy of all list nodes.

  sql/sql_parse.cc@1.672, 2007-05-28 15:29:56+04:00, kostja@vajra.(none) +130 -118
    Adjust to new signatures of mysql_create_table, mysql_alter_table,
    select_create. Functions mysql_create_index and mysql_drop_index has
    become identical after initialization of alter_info was moved to the 
    parser, and were merged. Flag enable_slow_log was not updated for 
    SQLCOM_DROP_INDEX, which was a bug.
    Just like CREATE INDEX, DROP INDEX is currently done via complete 
    table rebuild and is rightfully a slow administrative statement.

  sql/sql_partition.cc@1.105, 2007-05-28 15:29:57+04:00, kostja@vajra.(none) +5 -34
    Move is_partition_management() to sql_lex.cc
    Adjust code to the new Alter_info.

  sql/sql_table.cc@1.421, 2007-05-28 15:29:57+04:00, kostja@vajra.(none) +727 -820
    Adjust mysql_alter_table, mysql_recreate_table, mysql_create_table,
    mysql_prepare_table to new signatures.
    Rename mysql_prepare_table to mysql_prepare_create_table. Make
    sure it follows the convention and returns FALSE for success and
    TRUE for error.
    Move parts of mysql_alter_table to mysql_prepare_alter_table.
    Move the first invokation of mysql_prepare_table from mysql_alter_table
    to compare_tables, as it was needed only for the purpose
    of correct comparison.
    Since now Alter_info itself is created in the runtime mem root,
    adjust mysql_prepare_table to always allocate memory in the
    runtime memory root.
    Remove dead code.

  sql/sql_yacc.yy@1.572, 2007-05-28 15:29:57+04:00, kostja@vajra.(none) +33 -29
    LEX::key_list and LEX::create_list moved to class Alter_info

ChangeSet@1.1810.2974.7, 2007-05-28 13:23:11+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #28719: multi pk update ignore corrupts data
  - check multi update as well as update
  - this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs

  mysql-test/r/ndb_basic.result@1.28.1.10, 2007-05-28 13:23:09+02:00, tomas@whalegate.ndb.mysql.com +71 -0
    Bug #28719: multi pk update ignore corrupts data
    - add test + backport some tests from 5.1

  mysql-test/t/ndb_basic.test@1.32.1.8, 2007-05-28 13:23:09+02:00, tomas@whalegate.ndb.mysql.com +40 -0
    Bug #28719: multi pk update ignore corrupts data
    - add test + backport some tests from 5.1

  sql/ha_ndbcluster.cc@1.175.81.4, 2007-05-28 13:23:09+02:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #28719: multi pk update ignore corrupts data
    - check multi update as well as update
    - this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs

ChangeSet@1.2482.8.13, 2007-05-28 13:05:05+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, backport to 5.0

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.27, 2007-05-28 13:05:02+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, backport to 5.0

ChangeSet@1.1810.2974.6, 2007-05-28 12:56:48+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, backport to 5.0

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.14.6.1, 2007-05-28 12:56:46+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, backport to 5.0

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.52.1, 2007-05-28 12:56:46+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, backport to 5.0

ChangeSet@1.2469.230.1, 2007-05-28 12:50:29+02:00, mats@kindahl-laptop.dnsalias.net +18 -0
  WL#3303 (RBR: Engine-controlled logging format):
  
  Adding support to allow engines to tell what formats they can handle.
  The server will generate an error if it is not possible to log the
  statement according to the logging mode in effect.
  
  Adding flags to several storage engines to state what they can handle.
  
  Changes to NDB handler removing code that forces row-based mode and
  adding flag saying that NDB can only handle row format.
  
  Adding check that binlog flags are only used for real tables that are
  opened for writing.

  BitKeeper/deleted/.del-binlog_row_blackhole.result@1.11.1.1, 2007-05-28 11:57:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0
    Rename: mysql-test/r/binlog_row_blackhole.result -> BitKeeper/deleted/.del-binlog_row_blackhole.result

  BitKeeper/deleted/.del-binlog_row_blackhole.test@1.3, 2007-05-28 11:57:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0
    Rename: mysql-test/t/binlog_row_blackhole.test -> BitKeeper/deleted/.del-binlog_row_blackhole.test

  mysql-test/r/binlog_multi_engine.result@1.1, 2007-05-28 12:50:25+02:00, mats@kindahl-laptop.dnsalias.net +86 -0
    New BitKeeper file ``mysql-test/r/binlog_multi_engine.result''

  mysql-test/r/binlog_multi_engine.result@1.0, 2007-05-28 12:50:25+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/binlog_multi_engine.test@1.1, 2007-05-28 12:50:25+02:00, mats@kindahl-laptop.dnsalias.net +59 -0
    New BitKeeper file ``mysql-test/t/binlog_multi_engine.test''

  mysql-test/t/binlog_multi_engine.test@1.0, 2007-05-28 12:50:25+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/partition_hash.test@1.6.1.1, 2007-05-28 12:50:21+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding error check for statement that might fail.

  sql/ha_ndbcluster.cc@1.438.4.1, 2007-05-28 12:50:21+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Removing statements that switch to row-based format.
    Adding row capabilities.

  sql/handler.h@1.256.3.1, 2007-05-28 12:50:22+02:00, mats@kindahl-laptop.dnsalias.net +19 -4
    Adding handler/table flags to indicate that the engine is row- and/or
    statement-logging capable.
    
    Adding typedef for table_flags type.

  sql/set_var.cc@1.229.4.1, 2007-05-28 12:50:22+02:00, mats@kindahl-laptop.dnsalias.net +0 -10
    Removing code that prevents changing binlog format when NDB is active.

  sql/share/errmsg.txt@1.154.1.2, 2007-05-28 12:50:23+02:00, mats@kindahl-laptop.dnsalias.net +6 -0
    Adding error messages for when row- and/or statement-based logging
    formats cannot be used.

  sql/sql_base.cc@1.396.4.2, 2007-05-28 12:50:23+02:00, mats@kindahl-laptop.dnsalias.net +85 -6
    Adding business logic in lock_tables() to decide when an error should
    be thrown because logging is not possible.
    Add logic to switch to row format when that is allowed and needed.
    ---
    Binlog flags should only be checked for real tables that are opened for
    writing. Adding code to check that.

  storage/archive/ha_archive.h@1.63.1.1, 2007-05-28 12:50:23+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding row- and statement-logging capabilities to engine.

  storage/blackhole/ha_blackhole.h@1.14.2.1, 2007-05-28 12:50:23+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Blackhole can handle statement-format only.

  storage/csv/ha_tina.h@1.28.1.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding row- and statement-logging capabilities to engine.

  storage/example/ha_example.h@1.22.1.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +6 -1
    For the example engine, we arbitrarily decided that it only can handle
    row format.

  storage/federated/ha_federated.h@1.45.1.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding row- and statement-logging capabilities to engine.

  storage/heap/ha_heap.h@1.52.1.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Heap can handle both row- and statement-based logging format.

  storage/myisam/ha_myisam.cc@1.217.3.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    MyISAM can handle both row- and statement-based logging format.

  storage/myisammrg/ha_myisammrg.h@1.52.1.1, 2007-05-28 12:50:24+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    MyISAM can handle both row- and statement-based logging format.

ChangeSet@1.2475.75.2, 2007-05-28 14:22:21+04:00, kaa@polly.local +1 -0
  Changed the warning messages in the testcase to match 5.1 text.
  
  This is for bug #28121.

  mysql-test/r/type_float.result@1.56, 2007-05-28 14:22:16+04:00, kaa@polly.local +4 -4
    Changed the warning messages in the testcase to match 5.1 text.

ChangeSet@1.2403.25.5, 2007-05-28 12:20:34+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28525 Node failures in PGMAN at ndbrequire (line 430)
  (part 2)

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.3, 2007-05-28 12:20:32+02:00, tomas@whalegate.ndb.mysql.com +12 -12
    Bug #28525 Node failures in PGMAN at ndbrequire (line 430)
    (part 2)

ChangeSet@1.1810.2989.1, 2007-05-28 12:44:59+04:00, kaa@polly.local +10 -0
  Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
  
  When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31.
  
  This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store().

  include/m_string.h@1.37.1.3, 2007-05-28 12:44:57+04:00, kaa@polly.local +4 -0
    Added declarations for log_10 and log_01 from strtod.c

  mysql-test/r/type_float.result@1.42.1.9, 2007-05-28 12:44:57+04:00, kaa@polly.local +33 -0
    Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"

  mysql-test/t/type_float.test@1.29.1.4, 2007-05-28 12:44:57+04:00, kaa@polly.local +20 -0
    Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"

  sql/field.cc@1.256.53.1, 2007-05-28 12:44:57+04:00, kaa@polly.local +60 -91
    Moved common code from Field_float::store() and Field_double:store() to Field_real::truncate()
    Fixed the algorithm to not truncate large input numbers if the field length is greater than 31.
    Fixed rounding to not depend on FLT_MAX/DBL_MAX constants.

  sql/field.h@1.153.30.1, 2007-05-28 12:44:57+04:00, kaa@polly.local +9 -10
    Moved not_fixed member from Field_double to Field_real to allow code reuse between Field_float::store() and Field_double::store()
    Added truncate() method to Field_real which is used by both Field_float and Field_double

  sql/init.cc@1.16.1.4, 2007-05-28 12:44:57+04:00, kaa@polly.local +0 -13
    log_10[] and log_01[] are now defined as statical arrays in strtod.c, no need to pre-computed them.

  sql/item_cmpfunc.cc@1.187.40.1, 2007-05-28 12:44:57+04:00, kaa@polly.local +1 -1
    log_01[] now starts from 1e0, not from 1e-1 for consistency.

  sql/mysql_priv.h@1.290.121.1, 2007-05-28 12:44:57+04:00, kaa@polly.local +0 -2
    Moved log_10[] and log_01[] from mysqld.cc to libmystrings.

  sql/mysqld.cc@1.439.112.1, 2007-05-28 12:44:57+04:00, kaa@polly.local +0 -2
    Moved log_10[] and log_01[] from mysqld.cc to libmystrings.

  strings/strtod.c@1.25.4.1, 2007-05-28 12:44:58+04:00, kaa@polly.local +72 -15
    Define and use log_10[] and log_01[] as static arrays of constants instead of values pre-computed at startup.

ChangeSet@1.2482.26.2, 2007-05-28 13:27:26+05:00, svoj@mysql.com +2 -0
  BUG#18839 - return value of parser->parse() is ignored
  
  Check value returned by parser->parse(). Better handle situations
  when it fails.

  storage/myisam/ft_boolean_search.c@1.107.1.1, 2007-05-28 13:27:24+05:00, svoj@mysql.com +31 -20
    Check value returned by parser->parse().

  storage/myisam/ft_nlq_search.c@1.46.1.1, 2007-05-28 13:27:24+05:00, svoj@mysql.com +6 -2
    Check value returned by parser->parse().

ChangeSet@1.1810.2976.6, 2007-05-27 20:14:50-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  sql/sql_table.cc@1.239.1.107, 2007-05-27 20:14:46-07:00, igor@olga.mysql.com +2 -1
    Post-merge fix.

ChangeSet@1.2482.27.1, 2007-05-27 23:21:03+02:00, kent@mysql.com +6 -0
  sql_parse.cc, config-win.h, config-netware.h:
    Don't try determine stack direction at configure time
  compiler_flag.m4:
    Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
  misc.m4, configure.in:
    Use fourth argument to AC_TRY_RUN, to be used in cross compilation
    Don't try determine stack direction at configure time

  config/ac-macros/compiler_flag.m4@1.5, 2007-05-27 23:16:56+02:00, kent@mysql.com +1 -1
    Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible

  config/ac-macros/misc.m4@1.18, 2007-05-27 23:16:58+02:00, kent@mysql.com +3 -24
    Use fourth argument to AC_TRY_RUN, to be used in cross compilation
    Don't try determine stack direction at configure time

  configure.in@1.459.2.1, 2007-05-27 23:16:09+02:00, kent@mysql.com +4 -3
    Use fourth argument to AC_TRY_RUN, to be used in cross compilation
    Don't try determine stack direction at configure time

  include/config-netware.h@1.24, 2007-05-27 23:16:58+02:00, kent@mysql.com +0 -3
    Don't try determine stack direction at configure time

  include/config-win.h@1.99.2.1, 2007-05-27 23:17:09+02:00, kent@mysql.com +0 -2
    Don't try determine stack direction at configure time

  sql/sql_parse.cc@1.668.4.1, 2007-05-27 23:17:14+02:00, kent@mysql.com +3 -6
    Don't try determine stack direction at configure time

ChangeSet@1.2469.227.2, 2007-05-27 22:20:01+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  WL#3339 (Issue warnings when statement-based replication may fail):
  Fixing case where a false warning could be printed in mixed mode.
  Also fixing some test cases that generated different result files as
  a consequence of the patch.

  mysql-test/r/check.result@1.7, 2007-05-27 22:19:57+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change.

  mysql-test/t/check.test@1.10, 2007-05-27 22:19:57+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Dropping all views created in the test before trying to execute test.

  mysql-test/t/func_misc.test@1.21.1.1, 2007-05-27 22:19:57+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Disabling warning for unsafe statement since test is not concerned with
    this and there are tests that test this.

  sql/sql_class.cc@1.331.1.2, 2007-05-27 22:19:57+02:00, mats@kindahl-laptop.dnsalias.net +21 -17
    Moving code to print warning for unsafe statement to look at logging
    *mode* instead of logging *format*. The latter one can print a false
    warning when executing in mixed mode and part of the statement is
    written in statement format (i.e., CREATE-SELECT).

ChangeSet@1.2475.63.15, 2007-05-28 01:08:35+05:00, gshchepa@gleb.loc +2 -0
  view.result, mysqldump.result:
    Merge with 5.0-opt.

  mysql-test/r/mysqldump.result@1.148.1.2, 2007-05-28 01:07:08+05:00, gshchepa@gleb.loc +1 -1
    Merge with 5.0-opt.

  mysql-test/r/view.result@1.225, 2007-05-28 01:07:00+05:00, gshchepa@gleb.loc +10 -10
    Merge with 5.0-opt.

ChangeSet@1.1810.2946.24, 2007-05-27 11:50:10-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #24733  	RESET MASTER run before dump with --delete-master-logs
    
    fixed by using flush logs, dumping, then doing PURGE MASTER LOGS TO 'binfile', instead
  of deleting the log files at the beginning.
    
    NOTE: previously the delete-master-logs  would reset the log names back to
  filename.00001. Now the trailing number doesn't get reset. This may need to be
  documented. 

  client/mysqldump.c@1.214.1.50, 2007-05-27 11:50:07-04:00, dkatz@damien-katzs-computer.local +53 -4
    changed the code the --delete-master-logs option is used from this:
        
        take locks
        delete bin logs
        do dump (if this is a lock-based dump)
        release locks
        do dump (if this is a consistent-read-dump)
        
     to this:
        
        take locks
        flush logs
        remember the name of the new log
        do dump (if this is a lock-based dump)
        release locks
        do dump (if this is a consistent-read-dump)
        fflush output sql file if specified, to ensure the backup is commited to disk
        --- yes, dump succeeded ---
        do PURGE MASTER LOGS TO up to the new log

ChangeSet@1.1810.2936.23, 2007-05-26 13:19:36-07:00, igor@olga.mysql.com +1 -0
  Avoided warnings on Windows.

  sql/sql_select.cc@1.312.1.214, 2007-05-26 13:19:34-07:00, igor@olga.mysql.com +5 -5
    Avoided warnings on Windows.

ChangeSet@1.1810.2987.1, 2007-05-26 10:33:01-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28571. Outer join queries with ON conditions over
  constant outer tables did not return null complemented
  rows when conditions were evaluated to FALSE.
  Wrong results were returned because the conditions over constant
  outer tables, when being pushed down, were erroneously enclosed 
  into the guard function used for WHERE conditions.

  mysql-test/r/join_outer.result@1.44.1.11, 2007-05-26 10:32:59-07:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #28571.

  mysql-test/t/join_outer.test@1.37.1.4, 2007-05-26 10:32:59-07:00, igor@olga.mysql.com +16 -0
    Added a test case for bug #28571.

  sql/sql_select.cc@1.312.1.213, 2007-05-26 10:32:59-07:00, igor@olga.mysql.com +29 -25
    Fixed bug #28571. Outer join queries with ON conditions over
    constant outer tables did not return null complemented
    rows when conditions were evaluated to FALSE.
    Wrong results were returned because the conditions over constant
    outer tables, when being pushed down, were erroneously enclosed 
    into the guard function used for WHERE conditions.
    The problem is fixed in the function make_join_select. Now the
    conditions over constant tables from ON expressions are pushed
    down after the conditions from WHERE has been pushed down.

ChangeSet@1.2482.11.12, 2007-05-26 16:36:38+02:00, andrey@whirlpool.mysql.com +10 -0
  Fix for
  bug#26338 events_bugs.test fail on Debian
  and
  bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist"

  mysql-test/r/events_bugs.result@1.33, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +1 -1
    uppercase

  mysql-test/t/events.test@1.48, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +14 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_bugs.test@1.30, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +9 -1
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_grant.test@1.5, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +8 -2
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_logs_tests.test@1.18, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +6 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_scheduling.test@1.16, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +10 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_stress.test@1.10, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +1 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_time_zone.test@1.3, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +5 -1
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_trans.test@1.3, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +6 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

  mysql-test/t/events_trans_notembedded.test@1.2, 2007-05-26 16:36:32+02:00, andrey@whirlpool.mysql.com +5 -0
    wait at the end of the script for event which haven't
    finished their execution. This should solve
    bug#26338 events_bugs.test fail on Debian
    and
    bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist" 

ChangeSet@1.2482.25.1, 2007-05-25 16:40:24-07:00, acurtis@xiphis.org +1 -0
  Missing functionality in WL#2936:
    String variables not readable by using @@name.
    Required for WL1722.

  sql/set_var.cc@1.233.3.1, 2007-05-25 16:40:20-07:00, acurtis@xiphis.org +19 -0
    Missing functionality in WL2936:
      String variables not readable by using @@name.

ChangeSet@1.1810.2983.3, 2007-05-25 16:17:20-06:00, malff@weblab.(none) +1 -0
  Code review comments

  sql/sql_lex.cc@1.142.1.81, 2007-05-25 16:17:18-06:00, malff@weblab.(none) +2 -2
    Fixed parenthese typo, found during code review

ChangeSet@1.1810.2983.2, 2007-05-25 14:36:01-06:00, malff@weblab.(none) +5 -0
  Bug#27876 (SF with cyrillic variable name fails during execution (regression))
  
  The root cause of this bug is related to the function skip_rear_comments,
  in sql_lex.cc
  
  Recent code changes in skip_rear_comments changed the prototype from
  "const uchar*" to "const char*", which had an unforseen impact on this test:
    (endp[-1] < ' ')
  With unsigned characters, this code filters bytes of value [0x00 - 0x20]
  With *signed* characters, this also filters bytes of value [0x80 - 0xFF].
  
  This caused the regression reported, considering cyrillic characters in the
  parameter name to be whitespace, and truncated.
  Note that the regression is present both in 5.0 and 5.1.
  
  With this fix:
  - [0x80 - 0xFF] bytes are no longer considered whitespace.
  This alone fixes the regression.
  
  In addition, filtering [0x00 - 0x20] was found bogus and abusive,
  so that the code now filters uses my_isspace when looking for whitespace.
  
  Note that this fix is only addressing the regression affecting UTF-8
  in general, but does not address a more fundamental problem with
  skip_rear_comments: parsing a string *backwards*, starting at end[-1],
  is not safe with multi-bytes characters, so that end[-1] can confuse the
  last byte of a multi-byte characters with a characters to filter out.
  
  The only known impact of this remaining issue affects objects that have to
  meet all the conditions below:
  
  - the object is a FUNCTION / PROCEDURE / TRIGGER / EVENT / VIEW
  - the body consist of only *1* instruction, and does *not* contain a
    BEGIN-END block
  - the instruction ends, lexically, with <ident> <whitespace>* ';'?
    For example, "select <ident>;" or "return <ident>;"
  - The last character of <ident> is a multi-byte character
  - the last byte of this character is ';' '*', '/' or whitespace
  
  In this case, the body of the object will be truncated after parsing,
  and stored in an invalid format.
  
  This last issue has not been fixed in this patch, since the real fix
  will be implemented by Bug 25411 (trigger code truncated), which is caused
  by the very same code.
  The real problem is that the function skip_rear_comments is only a
  work-around, and should be removed entirely: see the proposed patch for
  bug 25411 for details.

  sql/sp_head.cc@1.200.19.1, 2007-05-25 14:35:58-06:00, malff@weblab.(none) +1 -1
    In skip_rear_comments,
    Filter out only whitespace, not other (non ascii or control) valid characters

  sql/sql_lex.cc@1.142.1.80, 2007-05-25 14:35:58-06:00, malff@weblab.(none) +5 -3
    In skip_rear_comments,
    Filter out only whitespace, not other (non ascii or control) valid characters

  sql/sql_lex.h@1.175.1.72, 2007-05-25 14:35:58-06:00, malff@weblab.(none) +1 -1
    In skip_rear_comments,
    Filter out only whitespace, not other (non ascii or control) valid characters

  sql/sql_view.cc@1.78.1.33, 2007-05-25 14:35:58-06:00, malff@weblab.(none) +2 -1
    In skip_rear_comments,
    Filter out only whitespace, not other (non ascii or control) valid characters

  tests/mysql_client_test.c@1.167.1.60, 2007-05-25 14:35:58-06:00, malff@weblab.(none) +64 -0
    Bug#27876 (SF with cyrillic variable name fails during execution (regression))

ChangeSet@1.1810.2936.21, 2007-05-26 00:44:13+05:00, gshchepa@gleb.loc +1 -0
  field.h:
    Warnings elimination.

  sql/field.h@1.153.29.1, 2007-05-26 00:43:36+05:00, gshchepa@gleb.loc +1 -1
    Warnings elimination.

ChangeSet@1.1810.2986.1, 2007-05-25 20:52:01+04:00, kaa@polly.local +1 -0
  Fix for bug #24611 "mysqld crashes when connecting from remote host, and compiled from source".
  
  On some Linux distributions with both LinuxThreads and NPTL glibc versions available, statically built binaries can crash, because linker defaults to LinuxThreads when linking statically, but calls to external libraries (like libnss) are resolved to NPTL versions.
  
  Since there is nothing we can do in the code to work that around, just give user an advice on how to fix that, if a crash happened on such a binary/OS combination.

  sql/mysqld.cc@1.439.1.171, 2007-05-25 20:51:57+04:00, kaa@polly.local +10 -0
    Advise a user on possible solutions in case of a crash in a statically built binary on a system with both LinuxThreads and NPTL available.

ChangeSet@1.1810.2946.23, 2007-05-25 16:47:43+02:00, msvensson@pilot.blaudden +1 -0
  Bug#26664 test suite times out on OS X 64bit
   - Add checks to make sure net has a vio assigned
   - For example bootstrap will create a fake "net" with vio
     set to 0 

  sql/net_serv.cc@1.88.1.14, 2007-05-25 16:47:40+02:00, msvensson@pilot.blaudden +4 -2
    Add checks to make sure net has a vio assigned

ChangeSet@1.2482.22.2, 2007-05-25 14:46:22+02:00, andrey@whirlpool.mysql.com +3 -0
  Fix for bug#28666 CREATE EVENT ... EVERY 0 SECOND let server crash
  
  A missing check for zero value of interval was added.

  mysql-test/r/events_bugs.result@1.32, 2007-05-25 14:46:18+02:00, andrey@whirlpool.mysql.com +29 -0
    update result file

  mysql-test/t/events_bugs.test@1.29, 2007-05-25 14:46:18+02:00, andrey@whirlpool.mysql.com +38 -0
    add test case for bug#28666 CREATE EVENT ... EVERY 0 SECOND let server crash

  sql/event_data_objects.cc@1.99.1.1, 2007-05-25 14:46:18+02:00, andrey@whirlpool.mysql.com +2 -1
    add a missing check about zero value for interval

ChangeSet@1.2482.24.1, 2007-05-25 17:24:45+05:00, ramil@mysql.com +4 -0
  Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

  mysql-test/r/binlog_stm_ps.result@1.1, 2007-05-25 17:24:43+05:00, ramil@mysql.com +20 -0
    New BitKeeper file ``mysql-test/r/binlog_stm_ps.result''

  mysql-test/r/binlog_stm_ps.result@1.0, 2007-05-25 17:24:43+05:00, ramil@mysql.com +0 -0

  mysql-test/r/rpl_user_variables.result@1.25, 2007-05-25 17:24:43+05:00, ramil@mysql.com +0 -25
    Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

  mysql-test/t/binlog_stm_ps.test@1.1, 2007-05-25 17:24:43+05:00, ramil@mysql.com +25 -0
    New BitKeeper file ``mysql-test/t/binlog_stm_ps.test''
    

  mysql-test/t/binlog_stm_ps.test@1.0, 2007-05-25 17:24:43+05:00, ramil@mysql.com +0 -0

  mysql-test/t/rpl_user_variables.test@1.24, 2007-05-25 17:24:43+05:00, ramil@mysql.com +0 -25
    Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row.

ChangeSet@1.1810.2985.1, 2007-05-25 17:24:17+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #28522:
  sometimes `mysqldump --hex-blob' overruned output buffer by '\0' byte.
  
  The dump_table() function has been fixed to reserve 1 byte more for the
  last '\0' byte of dumped string.

  client/mysqldump.c@1.214.24.1, 2007-05-25 17:21:06+05:00, gshchepa@gleb.loc +5 -2
    Fixed bug #28522.
    The dump_table() function has been fixed to reserve 1 byte more for the
    last '\0' byte of dumped string.

  mysql-test/r/mysqldump.result@1.83.18.1, 2007-05-25 17:21:20+05:00, gshchepa@gleb.loc +11 -0
    Updated test case for bug #28522.

  mysql-test/t/mysqldump.test@1.76.18.1, 2007-05-25 17:21:18+05:00, gshchepa@gleb.loc +7 -0
    Updated test case for bug #28522.

ChangeSet@1.2403.25.4, 2007-05-25 12:25:15+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #28525 Node failures in PGMAN at ndbrequire (line 430)

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.2, 2007-05-25 12:25:12+02:00, tomas@whalegate.ndb.mysql.com +65 -4
    Under heavy insert PGMAN can run out of page entries
    even when set to 100 times page cache entries.
    
    In this use pattern the extra entries remain idle
    on LIRS stack.  Only ONSTACK is set.  There is not
    enough activity to free them the normal way.
    
    A study of PGMAN / DBTUP behaviour is needed.
    
    This patch adds new sublist SL_IDLE.  When page entry
    pool is empty, an idle entry is released from SL_IDLE
    front if there is any.  Otherwise, we still crash.
    
    The factor above is set from 100 to 10 (still high).

  storage/ndb/src/kernel/blocks/pgman.hpp@1.11, 2007-05-25 12:25:12+02:00, tomas@whalegate.ndb.mysql.com +4 -2
    Under heavy insert PGMAN can run out of page entries
    even when set to 100 times page cache entries.
    
    In this use pattern the extra entries remain idle
    on LIRS stack.  Only ONSTACK is set.  There is not
    enough activity to free them the normal way.
    
    A study of PGMAN / DBTUP behaviour is needed.
    
    This patch adds new sublist SL_IDLE.  When page entry
    pool is empty, an idle entry is released from SL_IDLE
    front if there is any.  Otherwise, we still crash.
    
    The factor above is set from 100 to 10 (still high).

ChangeSet@1.1810.2946.22, 2007-05-25 11:38:23+02:00, msvensson@pilot.blaudden +1 -0
  Bug #26664  	test suite times out on OS X 64bit
   - Make the two "my_net_set*" function only visible when included
     from my_global.h

  include/mysql_com.h@1.100.1.14, 2007-05-25 11:38:19+02:00, msvensson@pilot.blaudden +2 -0
    Make the two "my_net_set*" functions only
    visible when included from my_global.h

ChangeSet@1.2482.15.2, 2007-05-25 10:13:27+05:00, ramil@mysql.com +5 -0
  after-merge fix

  mysql-test/r/ctype_cp932_binlog_stm.result@1.8, 2007-05-25 10:13:25+05:00, ramil@mysql.com +7 -8
    after-merge fix

  mysql-test/r/rpl_switch_stm_row_mixed.result@1.22, 2007-05-25 10:13:25+05:00, ramil@mysql.com +12 -24
    after-merge fix

  mysql-test/r/rpl_user_variables.result@1.24, 2007-05-25 10:13:25+05:00, ramil@mysql.com +37 -3
    after-merge fix

  mysql-test/t/ctype_cp932_binlog_stm.test@1.7, 2007-05-25 10:13:25+05:00, ramil@mysql.com +1 -1
    after-merge fix

  mysql-test/t/rpl_user_variables.test@1.23, 2007-05-25 10:13:25+05:00, ramil@mysql.com +39 -6
    after-merge fix

ChangeSet@1.2482.22.1, 2007-05-25 00:41:27+04:00, kostja@vajra.(none) +2 -0
  Fix warnings.

  sql/item_func.h@1.165.1.12, 2007-05-25 00:41:18+04:00, kostja@vajra.(none) +1 -1
    Resolve a warning (wrong initialization order).

  sql/sql_lex.cc@1.242.1.1, 2007-05-25 00:41:18+04:00, kostja@vajra.(none) +0 -2
    Make -ansi mode compile.

ChangeSet@1.2482.11.9, 2007-05-24 22:13:49+02:00, mleich@four.local.lan +11 -0
  This changeset belongs to the fix of Bug#735 Prepared Statements: there is no support for Query Cache
    
  - Create "--ps-protocol" and no "--<whatever>-protocol" variants of the former tests
    t/grant_cache.test and t/query_cache_sql_prepare.test.
  - Some additional subtest and fixes of bugs
  - Minor improvements 

  mysql-test/include/grant_cache.inc@1.22, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +59 -41
    - Rename mysql-test/t/grant_cache.test to include/grant_cache.inc
    - Toplevel scripts running variants of this test are
         t/grant_cache_ps_prot.test (runs only with "--ps-protocol")
         t/grant_cache_no_prot.test (skipped if any protocol is assigned)
    - Modifications to include/grant_cache.inc:
      - Minor improvements like replace --error <number> by --error <name>
      - enable that some subtests are run with "--ps-protocol"

  mysql-test/include/grant_cache.inc@1.21, 2007-05-24 16:51:06+02:00, mleich@four.local.lan +0 -0
    Rename: include/grant_cache.inc -> mysql-test/include/grant_cache.inc

  include/grant_cache.inc@1.20, 2007-05-24 16:49:53+02:00, mleich@four.local.lan +0 -0
    Rename: mysql-test/t/grant_cache.test -> include/grant_cache.inc

  mysql-test/include/query_cache_sql_prepare.inc@1.5, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +147 -22
    - Rename t/query_cache_sql_prepare.test to include/query_cache_sql_prepare.inc
    - Toplevel scripts running variants of this test are
         query_cache_ps_ps_prot.test (skipped if other protocol than --ps-protocol is used.)
         query_cache_ps_no_prot.test (skipped if --<whatever>-protocol is used)   
    - Modifications to include/query_cache_sql_prepare.inc:
    - Minor improvements like add drop table
    - Add tests checking that 
      - another connection gets the same amount of QC hits
      - statements running via ps-protocol do not hit QC results of preceding sql EXECUTEs

  mysql-test/include/query_cache_sql_prepare.inc@1.4, 2007-05-24 17:05:40+02:00, mleich@four.local.lan +0 -0
    Rename: mysql-test/t/query_cache_sql_prepare.test -> mysql-test/include/query_cache_sql_prepare.inc

  mysql-test/r/grant_cache_no_prot.result@1.19, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +8 -0
    Updated result

  mysql-test/r/grant_cache_no_prot.result@1.18, 2007-05-24 16:56:39+02:00, mleich@four.local.lan +0 -0
    Rename: mysql-test/r/grant_cache.result -> mysql-test/r/grant_cache_no_prot.result

  mysql-test/r/grant_cache_ps_prot.result@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +218 -0
    New BitKeeper file ``mysql-test/r/grant_cache_ps_prot.result''

  mysql-test/r/grant_cache_ps_prot.result@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/query_cache_ps_no_prot.result@1.3, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +192 -34
    Updated result

  mysql-test/r/query_cache_ps_no_prot.result@1.2, 2007-05-24 17:51:23+02:00, mleich@four.local.lan +0 -0
    Rename: mysql-test/r/query_cache_sql_prepare.result -> mysql-test/r/query_cache_ps_no_prot.result

  mysql-test/r/query_cache_ps_ps_prot.result@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +362 -0
    New BitKeeper file ``mysql-test/r/query_cache_ps_ps_prot.result''

  mysql-test/r/query_cache_ps_ps_prot.result@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/grant_cache_no_prot.test@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +25 -0
    Variant of the test grant_cache to be run without any "--<whatever>-protocol"

  mysql-test/t/grant_cache_no_prot.test@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/grant_cache_ps_prot.test@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +24 -0
    Variant of the test grant_cache to be run with "--ps-protocol" only

  mysql-test/t/grant_cache_ps_prot.test@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/query_cache_ps_no_prot.test@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +26 -0
    Variant of the test query_cache_sql_prepare to be run without any "--<whatever>-protocol"

  mysql-test/t/query_cache_ps_no_prot.test@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/query_cache_ps_ps_prot.test@1.1, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +25 -0
    Variant of the test query_cache_sql_prepare to be run with "--ps-protocol" only

  mysql-test/t/query_cache_ps_ps_prot.test@1.0, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +0 -0

  tests/mysql_client_test.c@1.236.1.3, 2007-05-24 22:13:47+02:00, mleich@four.local.lan +4 -2
    - correct wrong sized "for" loop
    - add some missing tests of query cache hit numbers

ChangeSet@1.1810.2974.5, 2007-05-24 21:02:01+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.32.21.1, 2007-05-24 21:01:59+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.14.5.1, 2007-05-24 21:01:59+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.66.51.1, 2007-05-24 21:01:59+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

ChangeSet@1.2482.21.1, 2007-05-24 20:57:10+02:00, msvensson@pilot.blaudden +1 -0
  Rename two occurences of net_set_*_timeout that has changed file
  between 5.0 and 5.1 and thus missed the merge

  sql/sql_connect.cc@1.4.1.1, 2007-05-24 20:57:08+02:00, msvensson@pilot.blaudden +4 -4
    Rename two occurences of net_set_*_timeout that has changed file
    between 5.0 and 5.1 and thus missed the merge

ChangeSet@1.2482.19.1, 2007-05-24 10:39:24-07:00, antony@ppcg5.local +1 -0
  Bug#27836
    "sql_plugin.cc, dynamic_array is not dynamic"
    When the DYNAMIC_ARRAYs were resized, pointers became invalid.
    Solved by only storing pointers within the DYNAMIC_ARRAYs.

  sql/sql_plugin.cc@1.64.1.1, 2007-05-24 10:39:20-07:00, antony@ppcg5.local +32 -24
    Bug27836
      Store pointers to data structures in dynamic arrays: plugin_dl_array, plugin_array
      Allocate data structures in plugin_mem_root

ChangeSet@1.2482.16.2, 2007-05-24 19:47:58+03:00, jani@linux-th5m.site +15 -0
  Merged from main 5.1

  mysys/hash.c@1.55, 2007-05-24 19:47:53+03:00, jani@linux-th5m.site +2 -2
    Merged from main 5.1

  mysys/typelib.c@1.24, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +2 -2
    Merged from main 5.1

  sql/field.cc@1.390, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +1 -1
    Merged from main 5.1

  sql/field.h@1.228, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +3 -3
    Merged from main 5.1

  sql/ha_ndbcluster.cc@1.452.1.2, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +1 -1
    Merged from main 5.1

  sql/item_cmpfunc.cc@1.279, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +2 -2
    Merged from main 5.1

  sql/item_cmpfunc.h@1.164, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +4 -1
    Merged from main 5.1

  sql/key.cc@1.53, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +2 -2
    Merged from main 5.1

  sql/set_var.cc@1.233.1.2, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +1 -14
    Merged from main 5.1

  sql/set_var.h@1.108, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +4 -4
    Merged from main 5.1

  sql/sql_base.cc@1.405, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +1 -1
    Merged from main 5.1

  sql/sql_plugin.cc@1.66, 2007-05-24 19:47:54+03:00, jani@linux-th5m.site +33 -33
    Merged from main 5.1

  sql/sql_yacc.yy@1.569.1.2, 2007-05-24 19:47:55+03:00, jani@linux-th5m.site +2 -1
    Merged from main 5.1

  sql/table.cc@1.290, 2007-05-24 19:47:55+03:00, jani@linux-th5m.site +1 -1
    Merged from main 5.1

  storage/blackhole/ha_blackhole.cc@1.52, 2007-05-24 19:47:55+03:00, jani@linux-th5m.site +7 -7
    Merged from main 5.1

ChangeSet@1.2482.18.1, 2007-05-24 17:35:22+02:00, jbruehe@mysql.com +1 -0
  Raise version number after cloning 5.1.19-beta

  configure.in@1.459.1.8, 2007-05-24 17:35:06+02:00, jbruehe@mysql.com +1 -1
    Raise version number after cloning 5.1.19-beta

ChangeSet@1.2403.25.3, 2007-05-24 16:50:38+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, use recomputed _actual_ redobuffer

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.3.3, 2007-05-24 16:50:35+02:00, tomas@whalegate.ndb.mysql.com +5 -5
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

ChangeSet@1.2403.25.2, 2007-05-24 16:40:05+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #28653  	Fast GCP + high load + high RedoBuffer causes ndbrequire
  - parameterize on RedoBuffer

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.57.2.1, 2007-05-24 16:40:03+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #28653  	Fast GCP + high load + high RedoBuffer causes ndbrequire
    - parameterize on RedoBuffer

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.22.1.1, 2007-05-24 16:40:03+02:00, tomas@whalegate.ndb.mysql.com +2 -2
    Bug #28653  	Fast GCP + high load + high RedoBuffer causes ndbrequire
    - parameterize on RedoBuffer

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.3.2, 2007-05-24 16:40:03+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #28653  	Fast GCP + high load + high RedoBuffer causes ndbrequire
    - parameterize on RedoBuffer

ChangeSet@1.1616.3043.2, 2007-05-24 13:11:45+02:00, thek@adventure.(none) +2 -0
  Bug#28644 Memory status report confused with memory leak
  
  This patch removes a false memory leak error report from the test suite.
  There is a test case that puposely provokes a SAFEMALLOC leak report,
  even though there is no actual leak.

  mysql-test/lib/mtr_report.pl@1.11.2.11, 2007-05-24 13:11:44+02:00, thek@adventure.(none) +14 -0
    There is a test case that purposely provokes a SAFEMALLOC leak report,
    even though there is no actual leak. We need to detect this, and ignore the
    warning in that case.

  sql/sql_test.cc@1.30.1.6, 2007-05-24 13:11:45+02:00, thek@adventure.(none) +2 -0
    Added tags to surround memory dump status report to help the test
    suite to determine that this isn't a memory leak

ChangeSet@1.1810.2981.1, 2007-05-24 15:35:43+05:00, ramil@mysql.com +6 -0
  Fix for
  bug #26842: master binary log contains invalid queries - replication fails
  bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
  
  Problem:  
  binlogging PS' we may produce syntacticly incorrect queries in the binlog replacing 
  some parameters with variable names (instead of variable values).
  E.g. in the reported case of "limit ?" clause: replacing "?" with "@var"
  produces "limit @var" which is not a correct SQL syntax. 
  Also it may lead to different query execution on slave if we
  set and use a variable in the same statement, e.g.
  "insert into t1 values (@x:=@x+1, ?)"
  
  Fix: make the stored statement string created upon its execution use variable values
  (instead of names) to fill placeholders.

  mysql-test/r/ctype_cp932_notembedded.result@1.1.2.1, 2007-05-24 15:35:42+05:00, ramil@mysql.com +1 -2
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - result adjusted.

  mysql-test/t/ctype_cp932_binlog.test@1.2.3.1, 2007-05-24 15:35:42+05:00, ramil@mysql.com +1 -1
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - test adjusted.

  mysql-test/r/ctype_cp932_binlog.result@1.2.5.1, 2007-05-24 15:35:42+05:00, ramil@mysql.com +7 -8
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - result adjusted.

  mysql-test/r/rpl_user_variables.result@1.14.1.5, 2007-05-24 15:35:42+05:00, ramil@mysql.com +37 -3
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - test result.

  mysql-test/t/rpl_user_variables.test@1.12.1.4, 2007-05-24 15:35:42+05:00, ramil@mysql.com +39 -6
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - test case.

  sql/sql_prepare.cc@1.142.1.61, 2007-05-24 15:35:42+05:00, ramil@mysql.com +12 -25
    Fix for
    bug #26842: master binary log contains invalid queries - replication fails
    bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements
      - set val to the variable's value (escaped if needed) then insert it into the query
        string in the position of the placeholder. We don't need to call
        get_var_with_binlog() here as there is no trace of the variable's name in the binlog.

ChangeSet@1.2482.12.1, 2007-05-24 11:27:59+02:00, knielsen@ymer.(none) +1 -0
  Fix comments and option description in mysqlslap.

  client/mysqlslap.c@1.54.1.1, 2007-05-24 11:27:54+02:00, knielsen@ymer.(none) +3 -2
    Fix comments and option description in mysqlslap.

ChangeSet@1.1810.2980.1, 2007-05-24 11:21:27+02:00, msvensson@pilot.blaudden +13 -0
  Bug#26664 test suite times out on OS X 64bit
   - The "mysql client in mysqld"(which is used by
     replication and federated) should use alarms instead of setting
     socket timeout value if the rest of the server uses alarm. By
     always calling 'my_net_set_write_timeout'
     or 'my_net_set_read_timeout' when changing the timeout value(s), the
     selection whether to use alarms or timeouts will be handled by
     ifdef's in those two functions. 
   - Move declaration of 'vio_timeout' into "vio_priv.h"

  include/mysql_com.h@1.100.1.13, 2007-05-24 11:21:20+02:00, msvensson@pilot.blaudden +3 -0
    Move the net_set_*_timeout function declarations to mysql_com.h and
    rename to my_net_set_*_timeout to avoid name clashes

  include/violite.h@1.46.2.5, 2007-05-24 11:21:22+02:00, msvensson@pilot.blaudden +0 -1
    Move declaration of 'vio_timeout' to vio_priv.h (to make
    the function as private as possible)

  libmysql/libmysql.c@1.233.14.1, 2007-05-24 11:21:23+02:00, msvensson@pilot.blaudden +2 -4
    Use my_net_read_timeout or my_net_write_timeout when setting
    the timeouts. Move the global variables for my_net_read/my_write_timeout
    into the only place where they are used. Thus removing them...

  server-tools/instance-manager/mysql_connection.cc@1.14.1.6, 2007-05-24 11:21:23+02:00, msvensson@pilot.blaudden +2 -2
    Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql-common/client.c@1.83.17.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +2 -4
    Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql/mysql_priv.h@1.290.119.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +0 -3
    Move the net_set_*_timeout function declarations to mysql_com.h

  sql/net_serv.cc@1.88.5.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +8 -8
    No need to cast the net->write_timeout value from "uint" to "uint"

  sql/set_var.cc@1.125.28.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +2 -2
    Rename net_set_*_timeout to my_net_set_*_timeout

  sql/sql_client.cc@1.9, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +5 -2
    Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql/sql_parse.cc@1.426.153.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +6 -6
    Rename net_set_*_timeout to my_net_set_*_timeout

  sql/sql_repl.cc@1.133.8.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +2 -2
    Rename net_set_*_timeout to my_net_set_*_timeout

  vio/vio_priv.h@1.8.1.1, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +1 -0
    Move declaration of 'vio_timeout' to vio_priv.h

  vio/viosocket.c@1.37.1.8, 2007-05-24 11:21:24+02:00, msvensson@pilot.blaudden +27 -15
    Cleanup 'vio_timeout'
     - Use "const void*" on POSIX and "const char*" on windows for
       setsockopt
     - Add DBUG_PRINT's
     - Add comment about why we don't have an implementation of
      vio_timeout for platforms not supporting SO_SNDTIMEO or SO_RCVTIMEO  

ChangeSet@1.1810.2979.1, 2007-05-23 19:04:12-07:00, igor@olga.mysql.com +3 -0
  Fixed bug #28561: assertion abort for update on multi-table view with
  CHECK OPTION and a subquery in WHERE condition.
  The abort was triggered by setting the value of join->tables for
  subqueries in the function JOIN::cleanup. This function was called
  after an invocation of the JOIN::join_free method for subqueries
  used in WHERE condition.

  mysql-test/r/view.result@1.138.1.63, 2007-05-23 19:04:09-07:00, igor@olga.mysql.com +10 -0
    Added a test case for bug #28561.

  mysql-test/t/view.test@1.126.1.58, 2007-05-23 19:04:09-07:00, igor@olga.mysql.com +19 -0
    Added a test case for bug #28561.

  sql/sql_select.cc@1.312.1.212, 2007-05-23 19:04:10-07:00, igor@olga.mysql.com +0 -1
    Fixed bug #28561: assertion abort for update on multi-table view with
    CHECK OPTION and a subquery in WHERE condition.
    The abort was triggered by setting the value of join->tables for
    subqueries in the function JOIN::cleanup. This function was called
    after an invocation of the JOIN::join_free method for subqueries
    used in WHERE condition.
    Setting the value of join->tables to for a subquery created serious
    problems for checking WHERE condition after update of the multi-table
    view as this check is performed in the do_select function right
    after a call of the JOIN::join_free method.
    In fact setting join->tables to 0 in JOIN::cleanup is not needed 
    anywhere in the current code.

ChangeSet@1.1810.2941.10, 2007-05-23 23:24:16+04:00, evgen@moonbone.local +5 -0
  Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
  
  If a stored function or a trigger was killed it had aborted but no error
  was thrown. This allows the caller statement to continue without a notice.
  This may lead to a wrong data being inserted/updated to/deleted as in such
  cases the correct result of a stored function isn't guaranteed. In the case
  of triggers it allows the caller statement to ignore kill signal and to
  waste time because of re-evaluation of triggers that always will fail
  because thd->killed flag is still on.
  
  Now the Item_func_sp::execute() and the sp_head::execute_trigger() functions
  check whether a function or a trigger were killed during execution and
  throws an appropriate error if so.
  Now the fill_record() function stops filling record if an error was reported
  through thd->net.report_error.

  mysql-test/r/kill.result@1.16.1.1, 2007-05-23 23:23:33+04:00, evgen@moonbone.local +82 -0
    Added a test case for the bug#27563: Stored functions and triggers wasn't
    throwing an error when killed.

  mysql-test/t/kill.test@1.23.1.2, 2007-05-23 23:23:43+04:00, evgen@moonbone.local +132 -0
    Added a test case for the bug#27563: Stored functions and triggers wasn't
    throwing an error when killed.

  sql/item_func.cc@1.270.66.1, 2007-05-23 23:23:12+04:00, evgen@moonbone.local +2 -0
    Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
    Now the Item_func_sp::execute() function checks whether a trigger was killed
    during execution and throws an appropriate error if so.

  sql/sp_head.cc@1.200.18.1, 2007-05-23 23:23:20+04:00, evgen@moonbone.local +3 -0
    Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
    Now the sp_head::execute_trigger() function checks whether a function was
    killed during execution and throws an appropriate error if so.

  sql/sql_base.cc@1.235.103.1, 2007-05-23 23:23:26+04:00, evgen@moonbone.local +1 -1
    Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
    Now the fill_record() function stops filling record if an error was reported
    through thd->net.report_error.

ChangeSet@1.1810.2978.1, 2007-05-23 14:43:06+02:00, mhansson@dl145s.mysql.com +2 -0
  Bug #28250: Run-Time Check Failure #3 - The variable 'value' is 
  being used without being def
  
  Inside method Item_func_unsigned::val_int, the variable value 
  can be returned without being initialized when the CAST argument
  is of type DECIMAL and has a NULL value. This gives a run-time 
  error when building debug binaries using Visual C++ 2005.
  
  Solution: Initialize value to 0

  mysql-test/t/cast.test@1.31.1.5, 2007-05-23 14:43:02+02:00, mhansson@dl145s.mysql.com +7 -1
    bug#28250: There is no need for an extra test case, but we
    recognize that this one catches the bug.

  sql/item_func.cc@1.270.65.1, 2007-05-23 14:43:04+02:00, mhansson@dl145s.mysql.com +2 -0
    bug#28250: initialization of value.

ChangeSet@1.1810.2919.4, 2007-05-23 17:32:40+05:00, bar@mysql.com +1 -0
  Bug#27636 mysqlbinlog-cp932 and ctype_cp932 tests fails if LC_* variables set to *_*.UTF-8
  
  As MySQL character set tests can print results in many character sets
  (latin1, utf8-8, sjis, cp932 and others) - its output can be incompatible
  with the current locale settings, which makes PERL confuse.
  
  Fix: reset LC_ALL and LC_CTYPE to "C", which is compatible with
  any character set.

  mysql-test/mysql-test-run.pl@1.30.82.1, 2007-05-23 17:32:39+05:00, bar@mysql.com +12 -0
    Ignore current locale settings, because "mysqltest" output
    can be not compatible with the locale.

ChangeSet@1.2475.63.13, 2007-05-23 15:45:37+04:00, evgen@moonbone.local +1 -0
  sql_table.cc:
    After merge fix.

  sql/sql_table.cc@1.416.2.2, 2007-05-23 15:45:24+04:00, evgen@moonbone.local +2 -1
    After merge fix.

ChangeSet@1.2475.73.1, 2007-05-23 15:26:16+04:00, dlenev@mockturtle.local +14 -0
  5.1 version of fix for:
    Bug #23667 "CREATE TABLE LIKE is not isolated from alteration
                by other connections"
    Bug #18950 "CREATE TABLE LIKE does not obtain LOCK_open"
  As well as:
    Bug #25578 "CREATE TABLE LIKE does not require any privileges
                on source table".
  
  The first and the second bugs resulted in various errors and wrong
  binary log order when one tried to execute concurrently CREATE TABLE LIKE
  statement and DDL statements on source table or DML/DDL statements on its
  target table.
  
  The problem was caused by incomplete protection/table-locking against
  concurrent statements implemented in mysql_create_like_table() routine.
  We solve it by simply implementing such protection in proper way.
  Most of actual work for 5.1 was already done by fix for bug 20662 and
  preliminary patch changing locking in ALTER TABLE.
  
  The third bug allowed user who didn't have any privileges on table create
  its copy and therefore circumvent privilege check for SHOW CREATE TABLE.
  
  This patch solves this problem by adding privilege check, which was missing.
  
  Finally it also removes some duplicated code from mysql_create_like_table()
  and thus fixes bug #26869 "TABLE_LIST::table_name_length inconsistent with
  TABLE_LIST::table_name".

  mysql-test/r/create-big.result@1.4, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +83 -0
    Added test coverage for concurrency-related issues with CREATE TABLE LIKE.

  mysql-test/r/create-big.result@1.3, 2007-05-23 12:18:30+04:00, dlenev@mockturtle.local +0 -0
    Rename: mysql-test/t/create-big.result -> mysql-test/r/create-big.result

  mysql-test/t/create-big.result@1.2, 2007-05-23 12:18:05+04:00, dlenev@mockturtle.local +0 -0
    Rename: mysql-test/r/create_select-big.result -> mysql-test/t/create-big.result

  mysql-test/r/create.result@1.142, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +1 -1
    Adjusted error-code in the test case after refactoring code that
    implements CREATE TABLE ... LIKE.

  mysql-test/r/grant2.result@1.35, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +23 -0
    Added test for bug#25578 "CREATE TABLE LIKE does not require any privileges
    on source table".

  mysql-test/t/create-big.test@1.3, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +128 -4
    Added test coverage for concurrency-related issues with CREATE TABLE LIKE.

  mysql-test/t/create-big.test@1.2, 2007-05-23 12:17:44+04:00, dlenev@mockturtle.local +0 -0
    Rename: mysql-test/t/create_select-big.test -> mysql-test/t/create-big.test

  mysql-test/t/create.test@1.95, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +1 -1
    Adjusted error-code in the test case after refactoring code that
    implements CREATE TABLE ... LIKE.

  mysql-test/t/disabled.def@1.252.1.1, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +0 -1
    Recent code changes ensured that CREATE TABLE LIKE statement is properly
    isolated against other statements, so synchronization.test should no
    longer fail (see fix for bug 20662 and preliminary patch for bug 23667
    changing ALTER TABLE locking).

  mysql-test/t/grant2.test@1.42, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +41 -0
    Added test for bug#25578 "CREATE TABLE LIKE does not require any privileges
    on source table".

  sql/handler.h@1.259, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +1 -0
    Introduced new flag for HA_CREATE_INFO::options in order to be able to
    distinguish CREATE TABLE ... LIKE from other types of CREATE TABLE.

  sql/mysql_priv.h@1.507.1.2, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +2 -3
    mysql_create_like_table() now takes source table name not as a
    Table_ident object but as regular table list element.

  sql/sql_lex.h@1.277, 2007-05-23 15:26:10+04:00, dlenev@mockturtle.local +0 -1
    Removed LEX::like_name member. Now we use special flag in
    LEX::create_info::options for distinguishing CREATE TABLE ... LIKE
    from other types of CREATE TABLE and store name of source table as
    regular element in statement's table list.

  sql/sql_parse.cc@1.668.1.1, 2007-05-23 15:26:11+04:00, dlenev@mockturtle.local +29 -9
    CREATE TABLE ... LIKE implementation now uses statement's table list
    for storing information about the source table. We also use flag
    in LEX::create_info.options for distinguishing it from other types
    of CREATE TABLE.
    Finally CREATE TABLE ... LIKE now requires the same privileges on
    the source tables as SHOW CREATE TABLE. Moved this privilege check
    to check_show_create_table_access() function.

  sql/sql_partition.cc@1.104, 2007-05-23 15:26:11+04:00, dlenev@mockturtle.local +6 -11
    Now we use special flag in LEX::create_info::options for distinguishing
    CREATE TABLE ... LIKE from other types of CREATE TABLE and store name
    of source table as regular element in statement's table list.

  sql/sql_table.cc@1.418, 2007-05-23 15:26:11+04:00, dlenev@mockturtle.local +45 -92
    mysql_create_like_table():  
     - Commented and cleaned-up a bit code which is responsible for achieving
       isolation from concurrent statements. Most of actual work was done by
       fix for bug 20662 and preliminary patch changing locking locking in
       ALTER TABLE, so here we do minor things like relaxing locking on
       source table (we don't need lock on it, to have it open is enough) and
       adjusting code to make it more friendly against code implementing I_S.
     - Get rid of duplicated code related to source database/table name
       handling. All these operations are already done in
       st_select_lex::add_table_to_list(), so we achieve the same effect
       by including source table into the statement's table list.

  sql/sql_yacc.yy@1.570, 2007-05-23 15:26:11+04:00, dlenev@mockturtle.local +4 -18
    Now we use special flag in LEX::create_info::options for distinguishing
    CREATE TABLE ... LIKE from other types of CREATE TABLE and store name
    of source table as regular element in statement's table list.

ChangeSet@1.1810.2943.7, 2007-05-23 15:22:13+04:00, dlenev@mockturtle.local +7 -0
  5.0 version of fix for:
   Bug #23667 "CREATE TABLE LIKE is not isolated from alteration
               by other connections"
   Bug #18950 "CREATE TABLE LIKE does not obtain LOCK_open"
  As well as:
   Bug #25578 "CREATE TABLE LIKE does not require any privileges
               on source table".
  
  The first and the second bugs resulted in various errors and wrong
  binary log order when one tried to execute concurrently CREATE TABLE LIKE
  statement and DDL statements on source table or DML/DDL statements on its
  target table.
  
  The problem was caused by incomplete protection/table-locking against
  concurrent statements implemented in mysql_create_like_table() routine.
  We solve it by simply implementing such protection in proper way (see
  comment for sql_table.cc for details).
  
  The third bug allowed user who didn't have any privileges on table create
  its copy and therefore circumvent privilege check for SHOW CREATE TABLE.
  
  This patch solves this problem by adding privilege check, which was missing.
  
  Finally it also removes some duplicated code from mysql_create_like_table().
  
  Note that, altough tests covering concurrency-related aspects of CREATE TABLE
  LIKE behaviour will only be introduced in 5.1, they were run manually for
  this patch as well.

  mysql-test/r/grant2.result@1.25.2.9, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +24 -0
    Added test for bug#25578 "CREATE TABLE LIKE does not require any privileges
    on source table".

  mysql-test/t/grant2.test@1.31.2.8, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +44 -0
    Added test for bug#25578 "CREATE TABLE LIKE does not require any privileges
    on source table".

  sql/handler.h@1.138.17.1, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +1 -0
    Introduced new flag for HA_CREATE_INFO::options in order to be able to
    distinguish CREATE TABLE ... LIKE from other types of CREATE TABLE.

  sql/mysql_priv.h@1.290.118.1, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +2 -3
    mysql_create_like_table() now takes source table name not as a
    Table_ident object but as regular table list element.

  sql/sql_parse.cc@1.426.1.196, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +29 -8
    CREATE TABLE ... LIKE implementation now uses statement's table list
    for storing information about the source table. We also use flag
    in LEX::create_info.options for distinguishing it from other types
    of CREATE TABLE.
    Finally CREATE TABLE ... LIKE now requires the same privileges on
    the source tables as SHOW CREATE TABLE. Moved this privilege check
    to check_show_create_table_access() function.

  sql/sql_table.cc@1.239.54.1, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +42 -49
    mysql_create_like_table():
     - Provided proper protection from concurrent statements.
       This is achieved by keeping name-lock on the source table and holding
       LOCK_open mutex during whole operation. This gives protection against
       concurrent DDL on source table. Also holding this mutex makes copying
       of .frm file, call to ha_create_table() and binlogging atomic against
       concurrent DML and DDL operations on target table.
     - Get rid of duplicated code related to source database/table name
       handling. All these operations are already done in
       st_select_lex::add_table_to_list(), so we achieve the same effect
       by including source table into the statement's table list.

  sql/sql_yacc.yy@1.371.1.149, 2007-05-23 15:22:09+04:00, dlenev@mockturtle.local +4 -17
    Now we use special flag in LEX::create_info::options for distinguishing
    CREATE TABLE ... LIKE from other types of CREATE TABLE and store name
    of source table as regular element in statement's table list.

ChangeSet@1.2475.54.20, 2007-05-23 13:04:49+02:00, thek@adventure.(none) +1 -0
  - Corrected type misstake in debug statement.

  sql/sql_cache.cc@1.111, 2007-05-23 13:04:47+02:00, thek@adventure.(none) +1 -1
    - Corrected type misstake in debug statement.

ChangeSet@1.2469.229.1, 2007-05-23 12:54:15+02:00, thek@adventure.(none) +2 -0
  - This patch addesses the performance issues with invalidating the entire
    cache by changing the behavior of the query cache resize-method.
  - set query_cache_size=<new_size>; is significantly faster than RESET QUERY
    CACHE as it simply destroys and recreates the query cache, whereas
    RESET QUERY CACHE keeps its internal structure aligned with server 
    load profile.

  sql/set_var.cc@1.224.4.1, 2007-05-23 12:54:13+02:00, thek@adventure.(none) +11 -4
    Refactored behavior of function. Instead of setting the global variable
    from within the class method scope we return the new cache size as a 
    result of the method call.

  sql/sql_cache.cc@1.106.2.1, 2007-05-23 12:54:13+02:00, thek@adventure.(none) +30 -45
    - Changed behavior of resize-method. Now, the cache will be cleared as one
      single block of data instead of an iteration over all cached statements.

ChangeSet@1.2482.9.4, 2007-05-23 15:49:17+05:00, ramil@mysql.com +1 -0
  after-merge fix: adjusted test results.

  mysql-test/r/ps.result@1.113, 2007-05-23 15:49:15+05:00, ramil@mysql.com +1 -1
    after-merge fix: adjusted test results.

ChangeSet@1.1616.3020.2, 2007-05-23 12:13:49+02:00, msvensson@shellback.(none) +1 -0
  Bug#27396 Wrong check for root priveledge
   - Check that filemode was set to 0000

  mysql-test/mysql-test-run.pl@1.8.23.1, 2007-05-23 12:13:37+02:00, msvensson@shellback.(none) +10 -3
    Checking for "running as root" should also read the filemode to see it 
    was properly set to 0000

ChangeSet@1.1810.2929.11, 2007-05-23 12:00:18+02:00, mhansson@dl145s.mysql.com +1 -0
  Bug #23856: GROUP_CONCAT and ORDER BY: junk from previous 
  rows for query on I_S
  
  This is a patch to get rid of some warnings about comparisons
  between singed and unsigned ints, which turn up on sapsrv1 and
  sapsrv2.

  sql/field.h@1.153.28.2, 2007-05-23 12:00:16+02:00, mhansson@dl145s.mysql.com +1 -1
    Bug#23856: Changed the type of MAX_SIZE to unsigned int.

ChangeSet@1.2469.228.1, 2007-05-23 12:34:47+05:00, bar@mysql.com +3 -0
  Bug#28558 UpdateXML called with garbage crashes server
  Problem: Memory overrun happened in attempts to generate
  error messages (e.g. in case of incorrect XPath syntax).
  Reason: set_if_bigger() was used instead of set_if_smaller().
  Change: replacing wrong set_if_bigger() to set_if_smaller(),
  and making minor additional code clean-ups.

  mysql-test/r/xml.result@1.24, 2007-05-23 12:34:44+05:00, bar@mysql.com +6 -0
    Adding test cases for all pieces of code with
    set_if_smaller() followed by my_printf_error().

  mysql-test/t/xml.test@1.22, 2007-05-23 12:34:44+05:00, bar@mysql.com +10 -0
    Adding test cases for all pieces of code with
    set_if_smaller() followed by my_printf_error().

  sql/item_xmlfunc.cc@1.29, 2007-05-23 12:34:44+05:00, bar@mysql.com +5 -7
    - fixing incorrect set_if_bigger to set_if_smaller in two places
    - getting read of unnesessary "char context[32]" variable and
      using '%.*s' instead if '%s' in the error format.

ChangeSet@1.2482.10.1, 2007-05-23 12:15:47+05:00, ramil@mysql.com +2 -0
  Fix for bug #23810: Server crashes on various "show status ..." commands
  
  We access some variable values using casts like *(long *) buff
  that may cause crashes on some platforms (e.g. solaris 64) if buff is
  not properly aligned.
  Fix: align the buffer used.

  include/my_global.h@1.170, 2007-05-23 12:15:46+05:00, ramil@mysql.com +3 -0
    Fix for bug #23810: Server crashes on various "show status ..." commands
      - MY_DIV_UP(A, B) macro introduced, which devides A then rounds up by B.
      - MY_ALIGNED_BYTE_ARRAY(N, S, T) macro introduced, which declares an S-byte long
        (aligned) N array of type T.

  sql/sql_show.cc@1.413, 2007-05-23 12:15:46+05:00, ramil@mysql.com +3 -1
    Fix for bug #23810: Server crashes on various "show status ..." commands
      - align the buffer used.

ChangeSet@1.1810.2974.3, 2007-05-23 07:53:16+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  remove some not used code

  sql/ha_ndbcluster.cc@1.175.81.3, 2007-05-23 07:53:14+02:00, tomas@whalegate.ndb.mysql.com +0 -20
    remove some not used code

ChangeSet@1.2475.54.18, 2007-05-22 16:19:36-06:00, malff@weblab.(none) +4 -0
  build break cleanup

  include/config-win.h@1.99.1.1, 2007-05-22 16:19:32-06:00, malff@weblab.(none) +0 -9
    cleanup, windows build break

  include/my_pthread.h@1.113.1.2, 2007-05-22 16:19:32-06:00, malff@weblab.(none) +8 -0
    cleanup, windows build break

  sql/event_queue.cc@1.35, 2007-05-22 16:19:32-06:00, malff@weblab.(none) +3 -5
    warnings cleanup, unititialized waiting_on_cond

  tests/mysql_client_test.c@1.236.1.2, 2007-05-22 16:19:32-06:00, malff@weblab.(none) +0 -1
    warnings cleanup

ChangeSet@1.2475.71.1, 2007-05-22 13:41:40-06:00, malff@weblab.(none) +8 -0
  Bug#21554 (sp_cache.cc: violates C++ aliasing rules)
  
  The problem reported is a compile bug,
  reported by the development GCC team with GCC 4.2.
  
  The original issue can no longer be reproduced in MySQL 5.1,
  since the configure script no longer define HAVE_ATOMIC_ADD,
  which caused the Linux atomic functions to be used (and cause a problem
  with an invalid cast).
  
  This patch implements some code cleanup for 5.1 only, which was identified
  during the investigation of this issue.
  
  With this patch, statistics maintained in THD::status_var are by definition
  owned by the running thread, and do not need to be protected against race
  conditions. These statistics are maintained by the status_var_* helpers,
  which do not require any lock.

  include/my_global.h@1.168.1.1, 2007-05-22 13:41:35-06:00, malff@weblab.(none) +4 -11
    General cleanup of thread_safe_increment / statistic_increment

  include/my_pthread.h@1.113.1.1, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +41 -14
    General cleanup of thread_safe_increment / statistic_increment

  sql/filesort.cc@1.127.2.1, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +3 -4
    General cleanup of thread_safe_increment / statistic_increment

  sql/handler.cc@1.308, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +9 -10
    General cleanup of thread_safe_increment / statistic_increment

  sql/sql_insert.cc@1.269, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +1 -1
    General cleanup of thread_safe_increment / statistic_increment

  sql/sql_parse.cc@1.669, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +16 -25
    General cleanup of thread_safe_increment / statistic_increment

  sql/sql_prepare.cc@1.218, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +6 -6
    General cleanup of thread_safe_increment / statistic_increment

  sql/sql_select.cc@1.519.1.1, 2007-05-22 13:41:36-06:00, malff@weblab.(none) +7 -13
    General cleanup of thread_safe_increment / statistic_increment

ChangeSet@1.2475.54.16, 2007-05-22 18:18:39+02:00, andrey@whirlpool.mysql.com +1 -0
  Test case for bug#28075

  tests/mysql_client_test.c@1.236.1.1, 2007-05-22 18:18:37+02:00, andrey@whirlpool.mysql.com +23 -0
    Add a test case for bug#28075 - just send COM_DEBUG and check whether
    the server is still alive.

ChangeSet@1.2469.212.9, 2007-05-22 10:50:32-04:00, cbell@mysql_cab. +3 -0
  BUG#17654 : --read-from-remote-server causes core
  
  This patch corrects a problem encountered when reading the binlog from a remote
  host. The application was crashing because the buffer variable (temp_buf) in 
  log_event was not pointing to the incoming data. For a normal file read, this 
  buffer is allocated by a previous call of read_log_event. However, when reading
  from a remote host, the first call to read_log_event is not executed therefore
  no buffer is allocated. Furthermore, there is no need to allocate a new buffer 
  because the incoming stream is what needs to be read. 
  
  This patch adds the call to initialize the temp_buf variable if reading from a 
  remote host. It also adds a check at destroy time to ensure the temp_buf is not
  freed if reading from a remote host.

  client/mysqlbinlog.cc@1.155.1.1, 2007-05-22 10:50:26-04:00, cbell@mysql_cab. +14 -0
    BUG#17654 : --read-from-remote-server causes core
    
    This patch corrects a problem when reading from a remote host. The temp_buf 
    variable of the log_event class is undefined. This patch assigns the temp_buf
    variable to the address of the incoming stream. This allows the print functions
    to print the binlog events correctly.

  mysql-test/r/rpl_row_mysqlbinlog.result@1.5, 2007-05-22 10:50:27-04:00, cbell@mysql_cab. +76 -0
    BUG#17654 : --read-from-remote-server causes core
    
    This patch adds the results for the test that were disabled when the bug report
    was investigated. The patch also adds an additional test was added to ensure 
    the output of reading from a remote host is the same as reading from a local file.

  mysql-test/t/rpl_row_mysqlbinlog.test@1.4.1.1, 2007-05-22 10:50:28-04:00, cbell@mysql_cab. +67 -40
    BUG#17654 : --read-from-remote-server causes core
    
    This patch enables the portions of the test that were disabled when the bug report
    was investigated. The patch also adds an additional test was added to ensure 
    the output of reading from a remote host is the same as reading from a local file.

ChangeSet@1.1810.2970.1, 2007-05-22 15:58:30+03:00, gkodinov@magare.gmz +7 -0
  Bug #28476: force index on a disabled myisam index gives error 124
  When processing the USE/FORCE index hints
  the optimizer was not checking if the indexes 
  specified are enabled (see ALTER TABLE).
  Fixed by:
   Backporting the fix for bug 20604 to 5.0

  mysql-test/r/key.result@1.28.1.9, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +8 -0
    Test for BUG 20604.
    The important part of the test is the explain output that 
    tests what indexes are used.

  mysql-test/r/myisam.result@1.71.1.29, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +26 -0
    Bug #28476: test cases

  mysql-test/t/key.test@1.24.1.6, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +12 -0
    Bug 20604: 
    The minimal test case that reveals the bug. The optimizer for 
    aggregates relies on keys disabled with ALTER TABLE ... DISABLE KEYS
    not being in the set TABLE::keys_in_use_for_query.
    When the execution engine tries to use a disabled index, MyISAM
    returns an error.

  mysql-test/t/myisam.test@1.55.1.25, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +16 -0
    Bug #28476: test cases

  sql/sql_base.cc@1.235.101.1, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +6 -1
    Bug #28476: 
     - Ignore disabled indexes in USE/FORCE index

  sql/sql_select.cc@1.312.154.1, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +4 -3
    Bug 20604 : The intersection operation between table->s->keys_in_use 
    and table->keys_in_use_for_query is no longer necessary.
    We can trust that the latter is a subset of the former.

  sql/table.h@1.102.16.1, 2007-05-22 15:58:29+03:00, gkodinov@magare.gmz +21 -2
    Bug 20604:
    Added comments to TABLE_SHARE::keys_in_use and
    TABLE::keys_in_use_for_query.

ChangeSet@1.1810.2969.3, 2007-05-22 11:16:29+05:00, ramil@mysql.com +1 -0
  Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small
  
  Increase STACK_BUFF_ALLOC to avoid execution_constants test failure on the hpita2.

  sql/mysql_priv.h@1.290.1.163, 2007-05-22 11:16:28+05:00, ramil@mysql.com +1 -1
    Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small
      - due to the failing execution_constants test on the hpita2, 
        increase STACK_BUFF_ALLOC, that is used in the Item_func::fix_fields() to 
        allocate on the stack a "dummy" buffer large enough for the corresponding exec.

ChangeSet@1.1810.2936.15, 2007-05-21 16:44:36-07:00, igor@olga.mysql.com +1 -0
  Added initializations to avoid compiler warnings.

  sql/sql_table.cc@1.239.1.106, 2007-05-21 16:44:34-07:00, igor@olga.mysql.com +2 -2
    Added initializations to avoid compiler warnings.

ChangeSet@1.1810.2936.14, 2007-05-22 00:22:53+04:00, evgen@moonbone.local +3 -0
  Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE
  mode.
  
  When a new DATE/DATETIME field without default value is being added by the
  ALTER TABLE the '0000-00-00' value is used as the default one. But it wasn't
  checked whether such value was allowed by the set sql mode. Due to this
  '0000-00-00' values was allowed for DATE/DATETIME fields even in the
  NO_ZERO_DATE mode.
  
  Now the mysql_alter_table() function checks whether the '0000-00-00' value
  is allowed for DATE/DATETIME fields by the set sql mode.
  The new error_if_not_empty flag is used in the mysql_alter_table() function
  to indicate that it should abort if the table being altered isn't empty.
  The new new_datetime_field field is used in the mysql_alter_table() function
  for error throwing purposes. 
  The new error_if_not_empty parameter is added to the copy_data_between_tables()
  function to indicate the it should return error if the source table isn't empty.

  mysql-test/r/alter_table.result@1.49.1.17, 2007-05-22 00:20:29+04:00, evgen@moonbone.local +19 -0
    Added a test case for the bug#27507: Wrong DATETIME value was allowed by
    ALTER TABLE in the NO_ZERO_DATE mode.

  mysql-test/t/alter_table.test@1.36.1.17, 2007-05-22 00:18:34+04:00, evgen@moonbone.local +22 -0
    Added a test case for the bug#27507: Wrong DATETIME value was allowed by
    ALTER TABLE in the NO_ZERO_DATE mode.

  sql/sql_table.cc@1.239.1.105, 2007-05-22 00:21:13+04:00, evgen@moonbone.local +69 -3
    Bug#27507: Wrong DATETIME value was allowed by ALTER TABLE in the NO_ZERO_DATE
    mode.
    Now the mysql_alter_table() function checks whether the '0000-00-00' value
    is allowed for DATE/DATETIME fields by the set sql mode.
    The new error_if_not_empty flag is used in the mysql_alter_table() function
    to indicate that it should abort if the table being altered isn't empty.
    The new new_datetime_field field is used in the mysql_alter_table() function
    for error throwing purposes. 
    The new error_if_not_empty parameter is added to the copy_data_between_tables()
    function to indicate the it should return error if the source table isn't empty.

ChangeSet@1.1810.2967.1, 2007-05-21 22:22:47+05:00, holyfoot@mysql.com +3 -0
  Bug #27984 Long Decimal Maths produces truncated results.
  decimal_round failed to perform a correct rounding 
  of a decimal number if its first nine digits were '9'.
  It just sets those digits to 0.

  mysql-test/r/type_newdecimal.result@1.36.4.1, 2007-05-21 22:22:46+05:00, holyfoot@mysql.com +3 -0
    Bug #27984 Long Decimal Maths produces truncated results.
    test result

  mysql-test/t/type_newdecimal.test@1.33.6.1, 2007-05-21 22:22:46+05:00, holyfoot@mysql.com +5 -0
    Bug #27984 Long Decimal Maths produces truncated results.
    test case

  strings/decimal.c@1.65.1.15, 2007-05-21 22:22:46+05:00, holyfoot@mysql.com +2 -1
    Bug #27984 Long Decimal Maths produces truncated results.
    when to == from we break the data if we do to->buf[0]=0
    So now doing this after the data is moved and only
    if we really need to set to->buf[0] to zero

ChangeSet@1.1810.2966.2, 2007-05-21 17:53:55+05:00, holyfoot@mysql.com +1 -0
  test result fixed

  mysql-test/r/ps_6bdb.result@1.27.14.1, 2007-05-21 17:53:54+05:00, holyfoot@mysql.com +16 -16
    test result fixed

ChangeSet@1.1810.2946.17, 2007-05-21 11:33:58+02:00, msvensson@pilot.blaudden +2 -0
  Bug#27438  rpl_rotate_logs fails on Windows
   - Fix test case to work also when filesystem time differs
     from mysqld' time. I.e when running with data files on a
     network share.

  mysql-test/r/rpl_rotate_logs.result@1.72.1.1, 2007-05-21 11:33:57+02:00, msvensson@pilot.blaudden +4 -1
    Update result file

  mysql-test/t/rpl_rotate_logs.test@1.63.1.5, 2007-05-21 11:33:57+02:00, msvensson@pilot.blaudden +12 -3
    Calculate time to use in "purge master logs before" by taking
    last modification time of t2 and adding 1 second
    This is done in order to handle the case where file system time differs
    from mysqld's time

ChangeSet@1.2475.54.15, 2007-05-21 10:51:11+02:00, andrey@whirlpool.mysql.com +4 -0
  Fix for bug#28075 COM_DEBUG crashes mysqld
  
  Uninitialized in the constructor member variables were
  pointing to nirvana and causing a crash when debug information
  of the Event Scheduler was dumped in result to COM_DEBUG
  packet sent to the server.

  sql/event_queue.cc@1.34, 2007-05-21 10:49:51+02:00, andrey@whirlpool.mysql.com +11 -4
    Initialize member variables or they will point to
    nirvana and could possible cause a crash during
    dumping of debug information.

  sql/event_queue.h@1.18, 2007-05-21 10:49:51+02:00, andrey@whirlpool.mysql.com +0 -1
    remove unneeded line

  sql/event_scheduler.cc@1.44, 2007-05-21 10:49:51+02:00, andrey@whirlpool.mysql.com +7 -2
    Initialize member variables or they will point to
    nirvana and could possible cause a crash during
    dumping of debug information.

  sql/event_scheduler.h@1.23, 2007-05-21 10:49:51+02:00, andrey@whirlpool.mysql.com +1 -2
    remove unneeded state

ChangeSet@1.1810.2929.10, 2007-05-21 10:27:33+02:00, mhansson@dl145s.mysql.com +6 -0
  bug#23856

  mysql-test/r/func_gconcat.result@1.52.4.1, 2007-05-21 10:27:30+02:00, mhansson@dl145s.mysql.com +47 -0
    bug#23856

  mysql-test/t/func_gconcat.test@1.44.5.1, 2007-05-21 10:27:31+02:00, mhansson@dl145s.mysql.com +32 -0
    bug#23856

  sql/field.h@1.153.28.1, 2007-05-21 10:27:31+02:00, mhansson@dl145s.mysql.com +5 -0
    bug#23856

  sql/field_conv.cc@1.52.1.13, 2007-05-21 10:27:31+02:00, mhansson@dl145s.mysql.com +14 -0
    bug#23856

  sql/item_sum.cc@1.170.26.1, 2007-05-21 10:27:31+02:00, mhansson@dl145s.mysql.com +10 -4
    bug#23856

  sql/sql_select.cc@1.312.153.1, 2007-05-21 10:27:31+02:00, mhansson@dl145s.mysql.com +3 -2
    bug#23856

ChangeSet@1.1810.2966.1, 2007-05-21 13:02:03+05:00, holyfoot@mysql.com +5 -0
  Bug #28361 Buffer overflow in DECIMAL code on Windows 
  result max length changed for the 'decimal' fields
  so test results have to be fixed

  mysql-test/r/ps_2myisam.result@1.39.7.1, 2007-05-21 13:02:01+05:00, holyfoot@mysql.com +16 -16
    Bug #28361 Buffer overflow in DECIMAL code on Windows 
    test result fixed

  mysql-test/r/ps_3innodb.result@1.42.7.1, 2007-05-21 13:02:01+05:00, holyfoot@mysql.com +16 -16
    Bug #28361 Buffer overflow in DECIMAL code on Windows 
    test result fixed

  mysql-test/r/ps_4heap.result@1.38.7.1, 2007-05-21 13:02:01+05:00, holyfoot@mysql.com +16 -16
    Bug #28361 Buffer overflow in DECIMAL code on Windows 
    test result fixed

  mysql-test/r/ps_5merge.result@1.39.7.1, 2007-05-21 13:02:01+05:00, holyfoot@mysql.com +32 -32
    Bug #28361 Buffer overflow in DECIMAL code on Windows 
    test result fixed

  mysql-test/r/ps_7ndb.result@1.26.9.1, 2007-05-21 13:02:01+05:00, holyfoot@mysql.com +16 -16
    Bug #28361 Buffer overflow in DECIMAL code on Windows 
    test result fixed

ChangeSet@1.1810.2936.9, 2007-05-20 21:22:57+05:00, holyfoot@mysql.com +3 -0
  bug #28361 Buffer overflow in DECIMAL code on Windows
  
  my_decimal in some cases can contain more decimal digits than
  is officially supported (DECIMAL_MAX_PRECISION), so we need to
  prepare bigger buffer for the resulting string.

  mysql-test/r/type_newdecimal.result@1.36.1.11, 2007-05-20 21:22:55+05:00, holyfoot@mysql.com +3 -0
    bug #28361 Buffer overflow in DECIMAL code on Windows
    test result

  mysql-test/t/type_newdecimal.test@1.33.1.12, 2007-05-20 21:22:55+05:00, holyfoot@mysql.com +8 -0
    bug #28361 Buffer overflow in DECIMAL code on Windows
    test case
    This test case doesn't fall in most cases even without the fix
    Still valgrind shows the problemn

  sql/my_decimal.h@1.10.6.1, 2007-05-20 21:22:55+05:00, holyfoot@mysql.com +7 -3
    bug #28361 Buffer overflow in DECIMAL code on Windows
    DECIMAL_MAX_POSSIBLE_PRECISION introduced to be used in places,
    when we need to check for the number of digits technicaly possible
    in my_decimal.
    DECIMAL_MAX_STR_LENGTH fixed as it has to fit for the MAX_POSSIBLE_PRECISION

ChangeSet@1.2482.1.19, 2007-05-19 18:55:38+02:00, msvensson@pilot.blaudden +3 -0
  Bug#28521 Upgrade from 5.1.17 to 5.1.18 breaks events
   - Add test for upgrading from 5.1.17 - it's a beta but anyway
     good to have a check oif upgrading new system tables for 5.1
   - Always put the "originator" column after "comment" to get correct
    order of columns in "events" table  

  mysql-test/t/system_mysql_db_fix50117-master.opt@1.1, 2007-05-19 18:55:36+02:00, msvensson@pilot.blaudden +1 -0
    New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117-master.opt''

  mysql-test/t/system_mysql_db_fix50117-master.opt@1.0, 2007-05-19 18:55:36+02:00, msvensson@pilot.blaudden +0 -0

  mysql-test/t/system_mysql_db_fix50117.test@1.1, 2007-05-19 18:55:36+02:00, msvensson@pilot.blaudden +104 -0
    New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117.test''

  mysql-test/t/system_mysql_db_fix50117.test@1.0, 2007-05-19 18:55:36+02:00, msvensson@pilot.blaudden +0 -0

  scripts/mysql_system_tables_fix.sql@1.63, 2007-05-19 18:55:36+02:00, msvensson@pilot.blaudden +1 -1
    Make sure the "originator" column ands up after "comment" to get
    correct order of the columns in event table

ChangeSet@1.2475.64.1, 2007-05-19 10:49:56+04:00, dlenev@mockturtle.local +9 -0
  Patch changing how ALTER TABLE implementation handles table locking
  and invalidation in the most general case (non-temporary table and
  not simple RENAME or ENABLE/DISABLE KEYS or partitioning command).
  
  See comment for sql/sql_table.cc for more information.
  
  These changes are prerequisite for 5.1 version of fix for bug #23667
  "CREATE TABLE LIKE is not isolated from alteration by other connections"

  mysql-test/include/mix1.inc@1.31.1.1, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +29 -0
    Extended coverage for behavior of ALTER TABLE statement under LOCK TABLES,
    which should be consistent across all platforms and for all engines.

  mysql-test/r/alter_table-big.result@1.3, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +40 -1
    Changed test for bug #25044 to use @@debug and injected sleeps
    infrastructure. Extended test coverage for ALTER TABLE's behavior
    under concurrency.

  mysql-test/r/alter_table.result@1.82, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +53 -0
    Extended coverage for behavior of ALTER TABLE statement under LOCK TABLES,
    which should be consistent across all platforms and for all engines.

  mysql-test/r/innodb_mysql.result@1.32.1.1, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +24 -0
    Extended coverage for behavior of ALTER TABLE statement under LOCK TABLES,
    which should be consistent across all platforms and for all engines.

  mysql-test/t/alter_table-big.test@1.3, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +72 -18
    Changed test for bug #25044 to use @@debug and injected sleeps
    infrastructure. Extended test coverage for ALTER TABLE's behavior
    under concurrency.

  mysql-test/t/alter_table.test@1.65, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +52 -1
    Extended coverage for behavior of ALTER TABLE statement under LOCK TABLES,
    which should be consistent across all platforms and for all engines.

  sql/mysql_priv.h@1.507.1.1, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +4 -1
    Made functions reopen_table() and close_handle_and_leave_table_as_lock()
    available outside of sql_base.cc file.
    Changed close_data_tables() in such way that after closing handler
    for the table it leaves TABLE object for it in table cache not as
    placeholder for ordinary name-lock but as placeholder for an exclusive
    name-lock. Renamed this routine to close_data_files_and_morph_locks().

  sql/sql_base.cc@1.401.2.1, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +38 -11
    Made functions reopen_table() and close_handle_and_leave_table_as_lock()
    available outside of sql_base.cc file.
    Changed close_data_tables() in such way that after closing handler
    for the table it leaves TABLE object for it in table cache not as
    placeholder for ordinary name-lock but as placeholder for an exclusive
    name-lock. Renamed this routine to close_data_files_and_morph_locks().
    Also adjusted it so it can work properly not only in LOCK TABLES mode.

  sql/sql_table.cc@1.417, 2007-05-19 10:49:52+04:00, dlenev@mockturtle.local +86 -140
    Changed the way in which ALTER TABLE implementation handles table
    locking and invalidation in the most general case (non-temporary table
    and not simple RENAME or ENABLE/DISABLE KEYS or partitioning command)
    
    Now after preparing new version of the table we:
    1) Wait until all other threads close old version of table.
    2) Close instances of table open by this thread and replace them
       with exclusive name-locks.
    3) Rename the old table to a temp name, rename the new one to the
       old name.
    4) If we are under LOCK TABLES and don't do ALTER TABLE ... RENAME
       we reopen new version of table.
    5) Write statement to the binary log.
    6) If we are under LOCK TABLES and do ALTER TABLE ... RENAME we
       remove name-locks from list of open tables and table cache.
    7) If we are not not under LOCK TABLES we rely on close_thread_tables()
       call to remove name-locks from table cache and list of open table. 
    
    Such approach:
    a) Eliminates possibility for concurrent statement to sneak in and get
       access to the new version of the table before ALTER TABLE gets logged
       into binary log.
    b) Ensures that ALTER TABLE behaves under LOCK TABLES in the same way
       on all platforms and for all engines (in 5.0 this was not true) 
    c) Preserves nice invariant that if table is open in some connection
       there is a guarantee that .FRM file for this table exists and is
       properly named.

ChangeSet@1.1810.2964.1, 2007-05-18 18:16:51+05:00, ramil@mysql.com +3 -0
  Fox for bug #28509: strange behaviour: passing a decimal value to PS
  
  Set parameter's type to Item::DECIMAL_ITEM assigning a decimal value.

  mysql-test/r/ps.result@1.56.14.1, 2007-05-18 18:16:49+05:00, ramil@mysql.com +9 -0
    Fox for bug #28509: strange behaviour: passing a decimal value to PS
      - test result.

  mysql-test/t/ps.test@1.56.15.1, 2007-05-18 18:16:49+05:00, ramil@mysql.com +8 -0
    Fox for bug #28509: strange behaviour: passing a decimal value to PS
      - test case.

  sql/item.cc@1.113.89.1, 2007-05-18 18:16:49+05:00, ramil@mysql.com +2 -4
    Fox for bug #28509: strange behaviour: passing a decimal value to PS
      - set Item_param::item_type to Item::DECIMAL_ITEM in case of DECIMAL_RESULT variable.
      - removed redundant item_result_type assignments as it's set before.

ChangeSet@1.2475.61.1, 2007-05-18 12:44:03+02:00, thek@adventure.(none) +12 -0
  Bug#26277 User variable returns one type in SELECT @v and other for CREATE as SELECT @v
  
  - Adding variable m_cached_result_type to keep the variable type consistent
    during the execution of a statement.
  - Before each result set is returned to the client the description of each
    column is sent as meta data.
    Previously the result type for a column could change if the hash variable
    entry changed between statements. This caused the result set of the query
    to alternate column types in certain cases which is not supported by MySQL
    client-server protocol. Example:
    Previously this sequence:
      SET @a:=1;
      SELECT @a:="text", @a;
    would return "text", "text";
   
    After the change the SELECT returns "text", 0
    The reson for this is that previously the result set from 'SELECT @a;'
    would always be of the type STRING, whereas now the type of the variable
    is taken from the last SET statement. However, 'SELECT @a:="text"' will
    return type of STRING since the right side of the assignment is used.

  mysql-test/r/ps_2myisam.result@1.54.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +256 -256
    Changed test result because SQL type of a user variable now
    more accurately represents its Item type: since Item type of a variable
    can be either STRING, INT, DECIMAL or DOUBLE, SQL type of the
    result set metadata now can be either MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_LONGLONG, MYSQL_TYPE_NEWDECIMAL or MYSQL_TYPE_DOUBLE.
    
    Previously it was always MYSQL_TYPE_VARCHAR.
    
    In particular, integer variables now have changed from
    MYSQL_TYPE_VARCHAR to MYSQL_TYPE_LONGLONG.

  mysql-test/r/ps_3innodb.result@1.57.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +256 -256
    Changed test result because SQL type of a user variable now
    more accurately represents its Item type: since Item type of a variable
    can be either STRING, INT, DECIMAL or DOUBLE, SQL type of the
    result set metadata now can be either MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_LONGLONG, MYSQL_TYPE_NEWDECIMAL or MYSQL_TYPE_DOUBLE.
    
    Previously it was always MYSQL_TYPE_VARCHAR.
    
    In particular, integer variables now have changed from
    MYSQL_TYPE_VARCHAR to MYSQL_TYPE_LONGLONG.

  mysql-test/r/ps_4heap.result@1.53.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +256 -256
    Changed test result because SQL type of a user variable now
    more accurately represents its Item type: since Item type of a variable
    can be either STRING, INT, DECIMAL or DOUBLE, SQL type of the
    result set metadata now can be either MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_LONGLONG, MYSQL_TYPE_NEWDECIMAL or MYSQL_TYPE_DOUBLE.
    
    Previously it was always MYSQL_TYPE_VARCHAR.
    
    In particular, integer variables now have changed from
    MYSQL_TYPE_VARCHAR to MYSQL_TYPE_LONGLONG.

  mysql-test/r/ps_5merge.result@1.54.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +512 -512
    Changed test result because SQL type of a user variable now
    more accurately represents its Item type: since Item type of a variable
    can be either STRING, INT, DECIMAL or DOUBLE, SQL type of the
    result set metadata now can be either MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_LONGLONG, MYSQL_TYPE_NEWDECIMAL or MYSQL_TYPE_DOUBLE.
    
    Previously it was always MYSQL_TYPE_VARCHAR.
    
    In particular, integer variables now have changed from
    MYSQL_TYPE_VARCHAR to MYSQL_TYPE_LONGLONG.

  mysql-test/r/ps_7ndb.result@1.53.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +256 -256
    Changed test result because SQL type of a user variable now
    more accurately represents its Item type: since Item type of a variable
    can be either STRING, INT, DECIMAL or DOUBLE, SQL type of the
    result set metadata now can be either MYSQL_TYPE_VARCHAR,
    MYSQL_TYPE_LONGLONG, MYSQL_TYPE_NEWDECIMAL or MYSQL_TYPE_DOUBLE.
    
    Previously it was always MYSQL_TYPE_VARCHAR.
    
    In particular, integer variables now have changed from
    MYSQL_TYPE_VARCHAR to MYSQL_TYPE_LONGLONG.

  mysql-test/r/sp-vars.result@1.10.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +26 -0
    Added test case. Previously variables could change their variable type during 
    the execution of a statement.
    Which variable type to use in the statement is specified in
    any previous statement.

  mysql-test/r/type_date.result@1.18.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +18 -9
    This test case result is changed because it is no longer allowed for user
    variables to change their variable type during the execution of a statement.
    The determination of which variable type to use in the statement is specified in
    any previous statement.

  mysql-test/r/user_var.result@1.47, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +1 -1
    This test case result is changed because it is no longer allowed for user
    variables to change their variable type during the execution of a statement.
    The determination of which variable type to use in the statement is specified in
    any previous statement.

  mysql-test/t/sp-vars.test@1.6.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +36 -0
    Added test case. Previously variables could change their variable type during 
    the execution of a statement.
    Which variable type to use in the statement is specified in
    any previous statement.

  mysql-test/t/type_date.test@1.15.1.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +6 -3
    This test case result is changed because it is no longer allowed for user
    variables to change their variable type during the execution of a statement.
    The determination of which variable type to use in the statement is specified in
    any previous statement.

  sql/item_func.cc@1.380.9.1, 2007-05-18 12:44:01+02:00, thek@adventure.(none) +16 -12
    Adding variable m_cached_result_type to keep the variable type consistent
    during the execution of a statement.
    Previously the result type could change if the hash variable entry changed
    between statements. This caused the result set of the query to alternate
    column types in certain cases.

  sql/item_func.h@1.165.5.1, 2007-05-18 12:44:02+02:00, thek@adventure.(none) +2 -3
    Adding variable m_cached_result_type to keep the variable type consistent
    during the execution of a statement.
    Previously the result type could change if the hash variable entry changed
    between statements. This caused the result set of the query to alternate
    column types in certain cases.

ChangeSet@1.1810.2943.6, 2007-05-18 12:29:06+04:00, kostja@vajra.(none) +7 -0
  Bug #27907 "Misleading error message when opening/locking tables"
  
  Adjust the check that defines the error message to be returned.

  mysql-test/r/sp-error.result@1.102.1.11, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +3 -3
    Update results (more accurate error code)

  mysql-test/r/sp-prelocking.result@1.2.1.4, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +13 -0
    Update results (more accurate error code)

  mysql-test/r/trigger.result@1.29.11.12, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +2 -2
    Update results (more accurate error code)

  mysql-test/t/sp-error.test@1.100.1.14, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +3 -3
    ER_NOT_LOCKED -> ER_NO_SUCH_TABLE

  mysql-test/t/sp-prelocking.test@1.2.1.5, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +31 -0
    Add a test case for Bug#27907

  mysql-test/t/trigger.test@1.34.11.13, 2007-05-18 12:29:02+04:00, kostja@vajra.(none) +2 -2
    ER_NOT_LOCKED -> ER_NO_SUCH_TABLE

  sql/sql_base.cc@1.235.100.1, 2007-05-18 12:29:03+04:00, kostja@vajra.(none) +10 -3
    Adjust the check for where-we-are for a better error message.

ChangeSet@1.1810.2962.1, 2007-05-18 12:08:07+05:00, ramil@mysql.com +5 -0
  Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
  
  Problem: we may get syntactically incorrect queries in the binary log 
  if we use a string value user variable executing a PS which 
  contains '... limit ?' clause, e.g.
  prepare s from "select 1 limit ?"; 
  set @a='qwe'; execute s using @a;
    
  Fix: raise an error in such cases.

  mysql-test/r/limit.result@1.12, 2007-05-18 12:08:05+05:00, ramil@mysql.com +11 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - test result

  mysql-test/t/limit.test@1.13.1.1, 2007-05-18 12:08:05+05:00, ramil@mysql.com +17 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - test case

  sql/item.cc@1.113.88.2, 2007-05-18 12:08:05+05:00, ramil@mysql.com +3 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - if Item_param::strict_type is set, check given and required types,
        return an error if not equal.

  sql/item.h@1.183.34.2, 2007-05-18 12:08:05+05:00, ramil@mysql.com +8 -1
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - bool strict_type introduced, which indicates that a parameter value must be of 
        the required_result_type type.
      - set_strict_type() function introduced to set required type.

  sql/sql_yacc.yy@1.371.107.1, 2007-05-18 12:08:05+05:00, ramil@mysql.com +3 -0
    Fix for bug #28464: a string argument to 'limit ?' PS - replication fails
      - as we accept only INTs in the 'limit' clause set parameter's required type.

ChangeSet@1.1810.2957.1, 2007-05-17 19:38:34+03:00, gkodinov@macbook.gmz +3 -0
  Bug#22855:
  Conversion errors when constructing the condition for an
  IN predicates were treated as if the affected column contains
  NULL. If such a IN predicate is inside NOT we get wrong 
  results.
  Corrected the handling of conversion errors in an IN predicate 
  that is resolved by unique_subquery (through 
  subselect_uniquesubquery_engine).

  mysql-test/r/subselect3.result@1.1.4.1, 2007-05-17 19:38:26+03:00, gkodinov@macbook.gmz +18 -0
    Bug#22855: test case

  mysql-test/t/subselect3.test@1.7.1.1, 2007-05-17 19:38:27+03:00, gkodinov@macbook.gmz +18 -0
    Bug#22855: test case

  sql/item_subselect.cc@1.113.18.1, 2007-05-17 19:38:27+03:00, gkodinov@macbook.gmz +74 -7
    Bug#22855: corrected the handling of conversion errors and
    NULL key values in IN predicate that is resolved by index
    lookup.

ChangeSet@1.1616.3044.1, 2007-05-16 17:09:49-04:00, iggy@amd64.(none) +1 -0
  Bug#24400 Source files for Server: Visual Studio Workspace contains a small config bug
  - Correct bad path in project files.

  VC++Files/sql/mysqld.dsp@1.17.1.21, 2007-05-16 17:09:48-04:00, iggy@amd64.(none) +1 -1
    Bug#24400 Source files for Server: Visual Studio Workspace contains a small config bug
    - Correct bad path.

ChangeSet@1.1810.2888.8, 2007-05-16 20:00:23+02:00, istruewing@chilla.local +1 -0
  Bug#23068 - key_cache_block_size is not set or displayes correctly
  
  Command line and configuration file option 'key_cache_block_size'
  was reduced by MALLOC_OVERHEAD (8 in a production server, 36 in a
  debug server) from the user supplied value and restricted it to
  the greatest multiple of 512 less or equal to the reduced value.
  
  This patch changes option 'key_cache_block_size' to not deduce
  MALLOC_OVERHEAD from the input value. However, the restriction
  to a multiple of 512 is still done.

  sql/mysqld.cc@1.439.111.1, 2007-05-16 20:00:20+02:00, istruewing@chilla.local +1 -1
    Bug#23068 - key_cache_block_size is not set or displayes correctly
    Changed option 'key_cache_block_size' to not deduce
    MALLOC_OVERHEAD from the input value.

ChangeSet@1.1810.2942.3, 2007-05-15 12:22:53+02:00, df@pippilotta.erinye.com +1 -0
  BUG#28372 mysqldump test case fails with binlog disabled

  mysql-test/t/mysqldump.test@1.76.1.40, 2007-05-15 12:22:51+02:00, df@pippilotta.erinye.com +3 -0
    BUG#28372 don't run this test case if binlog is disabled

ChangeSet@1.1810.2942.2, 2007-05-15 11:32:33+02:00, df@pippilotta.erinye.com +3 -0
  BUG#28370 federated test cases fail with binlog disabled

  mysql-test/include/federated.inc@1.3.1.1, 2007-05-15 11:32:31+02:00, df@pippilotta.erinye.com +1 -0
    BUG#28370 all federated tests require --log-bin for now

  mysql-test/mysql-test-run.pl@1.30.80.1, 2007-05-15 11:32:31+02:00, df@pippilotta.erinye.com +1 -2
    BUG#28370 detect --skip-log-bin option in mtr's --mysqld option

  mysql-test/r/have_log_bin.require@1.2, 2007-05-15 11:32:31+02:00, df@pippilotta.erinye.com +1 -1
    the variable is really called log_bin

ChangeSet@1.2475.43.4, 2007-05-15 10:56:39+02:00, df@pippilotta.erinye.com +2 -0
  BUG#28439 date_formats test case fails with binlog disabled

  mysql-test/r/date_formats.result@1.39.1.1, 2007-05-15 10:56:36+02:00, df@pippilotta.erinye.com +3 -6
    BUG#28439 remove binlog_format from SHOW VARIABLES statements

  mysql-test/t/date_formats.test@1.29.1.1, 2007-05-15 10:56:36+02:00, df@pippilotta.erinye.com +3 -6
    BUG#28439 don't select binlog_format in SHOW VARIABLES

ChangeSet@1.1810.2940.1, 2007-05-14 16:04:36+02:00, msvensson@pilot.blaudden +1 -0
  Bug#27597 mysqld-debug broken
  - Send errors from RTC(Runtime Error Check) to stderr instead of
  popping up an MessageBox asking to debug

  mysys/my_init.c@1.44.1.5, 2007-05-14 16:04:34+02:00, msvensson@pilot.blaudden +36 -0
    Initialize a handler for RTC errors that write the problem
    description to stderr instead of popping up an MessageBox
    asking to debug

ChangeSet@1.2469.227.1, 2007-05-14 14:45:38+02:00, mats@romeo.kindahl.net +13 -0
  WL#3339 (Issue warnings when statement-based replication may fail):
  Replacing binlog_row_based_if_mixed with variable binlog_stmt_flags
  holding several flags and adding member functions to manipulate the
  flags.
  
  Added code to generate a warning when an attempt to log an unsafe
  statement to the binary log was made. The warning is both pushed to the
  SHOW WARNINGS table and written to the error log. The prevent flooding
  the error log, the warning is just written to the error log once per
  open session.

  mysql-test/r/binlog_unsafe.result@1.1, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +13 -0
    New BitKeeper file ``mysql-test/r/binlog_unsafe.result''

  mysql-test/r/binlog_unsafe.result@1.0, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +0 -0

  mysql-test/t/binlog_unsafe.test@1.1, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +16 -0
    New BitKeeper file ``mysql-test/t/binlog_unsafe.test''

  mysql-test/t/binlog_unsafe.test@1.0, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +0 -0

  sql/item_create.cc@1.76.3.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +2 -2
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

  sql/share/errmsg.txt@1.154.1.1, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +3 -0
    Adding error message to indicate that an attempt to log an unsafe
    statement was made.

  sql/sp_head.cc@1.265.1.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +1 -1
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

  sql/sp_head.h@1.103.2.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +1 -1
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

  sql/sql_base.cc@1.396.4.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +2 -2
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

  sql/sql_class.cc@1.331.1.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +18 -1
    Adding THD::binlog_flags to store thread-specific binary log state.
    Adding code to push a warning and write an entry into the error log
    when an attempt is made to log an unsafe statement.

  sql/sql_class.h@1.354.1.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +12 -0
    Adding THD::binlog_flags to store thread-specific binary log state.
    Adding BINLOG_FLAG_UNSAFE_STMT_PRINTED to denote that a warning for
    an unsafe statement has already been generated for this thread.

  sql/sql_insert.cc@1.261.4.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +1 -0
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

  sql/sql_lex.cc@1.236.2.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +1 -1
    Replacing binlog_row_based_if_mixed with a variable binlog_stmt_flags
    holding several flags.

  sql/sql_lex.h@1.271.4.1, 2007-05-14 14:45:34+02:00, mats@romeo.kindahl.net +36 -8
    Replacing binlog_row_based_if_mixed with a variable binlog_stmt_flags
    holding several flags.

  sql/sql_view.cc@1.129.1.1, 2007-05-14 14:45:35+02:00, mats@romeo.kindahl.net +2 -2
    Using {is,set,clear}_stmt_unsafe() member functions instead of
    binlog_row_based_if_mixed member variable.

ChangeSet@1.1810.2919.3, 2007-05-11 14:13:20-04:00, cbell@suse.vabb.com +1 -0
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
    
  This patch enables the NDB test ndb_load that was previously disabled
  as a result of the LOAD DATA INFILE bug reported in BUG#17233.

  mysql-test/t/disabled.def@1.2.4.27, 2007-05-11 14:13:16-04:00, cbell@suse.vabb.com +0 -1
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
      
    This patch enables the NDB test ndb_load that was previously disabled
    as a result of the LOAD DATA INFILE bug reported in BUG#17233.

ChangeSet@1.2469.212.8, 2007-05-11 11:48:34+04:00, skozlov@mysql.com +1 -0
  WL#3702

  mysql-test/mysql-test-run.pl@1.293.2.2, 2007-05-11 11:48:29+04:00, skozlov@mysql.com +9 -7
    WL#3702

ChangeSet@1.2475.1.29, 2007-05-10 12:59:39+03:00, monty@mysql.com +474 -0
  WL#3817: Simplify string / memory area types and make things more consistent (first part)
  
  The following type conversions was done:
  
  - Changed byte to uchar
  - Changed gptr to uchar*
  - Change my_string to char *
  - Change my_size_t to size_t
  - Change size_s to size_t
  
  Removed declaration of byte, gptr, my_string, my_size_t and size_s. 
  
  Following function parameter changes was done:
  - All string functions in mysys/strings was changed to use size_t
    instead of uint for string lengths.
  - All read()/write() functions changed to use size_t (including vio).
  - All protocoll functions changed to use size_t instead of uint
  - Functions that used a pointer to a string length was changed to use size_t*
  - Changed malloc(), free() and related functions from using gptr to use void *
    as this requires fewer casts in the code and is more in line with how the
    standard functions work.
  - Added extra length argument to dirname_part() to return the length of the
    created string.
  - Changed (at least) following functions to take uchar* as argument:
    - db_dump()
    - my_net_write()
    - net_write_command()
    - net_store_data()
    - DBUG_DUMP()
    - decimal2bin() & bin2decimal()
  - Changed my_compress() and my_uncompress() to use size_t. Changed one
    argument to my_uncompress() from a pointer to a value as we only return
    one value (makes function easier to use).
  - Changed type of 'pack_data' argument to packfrm() to avoid casts.
  - Changed in readfrm() and writefrom(), ha_discover and handler::discover()
    the type for argument 'frmdata' to uchar** to avoid casts.
  - Changed most Field functions to use uchar* instead of char* (reduced a lot of
    casts).
  - Changed field->val_xxx(xxx, new_ptr) to take const pointers.
  
  Other changes:
  - Removed a lot of not needed casts
  - Added a few new cast required by other changes
  - Added some cast to my_multi_malloc() arguments for safety (as string lengths
    needs to be uint, not size_t).
  - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
    explicitely as this conflict was often hided by casting the function to
    hash_get_key).
  - Changed some buffers to memory regions to uchar* to avoid casts.
  - Changed some string lengths from uint to size_t.
  - Changed field->ptr to be uchar* instead of char*. This allowed us to
    get rid of a lot of casts.
  - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
  - Include zlib.h in some files as we needed declaration of crc32()
  - Changed MY_FILE_ERROR to be (size_t) -1.
  - Changed many variables to hold the result of my_read() / my_write() to be
    size_t. This was needed to properly detect errors (which are
    returned as (size_t) -1).
  - Removed some very old VMS code
  - Changed packfrm()/unpackfrm() to not be depending on uint size
    (portability fix)
  - Removed windows specific code to restore cursor position as this
    causes slowdown on windows and we should not mix read() and pread()
    calls anyway as this is not thread safe. Updated function comment to
    reflect this. Changed function that depended on original behavior of
    my_pwrite() to itself restore the cursor position (one such case).
  - Added some missing checking of return value of malloc().
  - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
  - Changed type of table_def::m_size from my_size_t to ulong to reflect that
    m_size is the number of elements in the array, not a string/memory
    length.
  - Moved THD::max_row_length() to table.cc (as it's not depending on THD).
    Inlined max_row_length_blob() into this function.
  - More function comments
  - Fixed some compiler warnings when compiled without partitions.
  - Removed setting of LEX_STRING() arguments in declaration (portability fix).
  - Some trivial indentation/variable name changes.
  - Some trivial code simplifications:
    - Replaced some calls to alloc_root + memcpy to use
      strmake_root()/strdup_root().
    - Changed some calls from memdup() to strmake() (Safety fix)
    - Simpler loops in client-simple.c

  BitKeeper/etc/ignore@1.290.1.1, 2007-05-10 12:59:20+03:00, monty@mysql.com +3 -0
    added libmysqld/ha_ndbcluster_cond.cc
    ---
    added debian/defs.mk debian/control

  client/completion_hash.cc@1.13, 2007-05-10 12:59:20+03:00, monty@mysql.com +1 -1
    Remove not needed casts

  client/my_readline.h@1.8, 2007-05-10 12:59:20+03:00, monty@mysql.com +1 -1
    Remove some old types

  client/mysql.cc@1.263.1.1, 2007-05-10 12:59:20+03:00, monty@mysql.com +64 -64
    Simplify types

  client/mysql_upgrade.c@1.37, 2007-05-10 12:59:20+03:00, monty@mysql.com +10 -9
    Remove some old types
    Update call to dirname_part

  client/mysqladmin.cc@1.121, 2007-05-10 12:59:20+03:00, monty@mysql.com +32 -32
    Remove some old types

  client/mysqlbinlog.cc@1.156, 2007-05-10 12:59:20+03:00, monty@mysql.com +43 -43
    Remove some old types
    Change some buffers to be uchar to avoid casts

  client/mysqlcheck.c@1.64, 2007-05-10 12:59:20+03:00, monty@mysql.com +30 -30
    Remove some old types

  client/mysqldump.c@1.278, 2007-05-10 12:59:20+03:00, monty@mysql.com +92 -92
    Remove some old types
    Remove some not needed casts
    Change some string lengths to size_t

  client/mysqlimport.c@1.83, 2007-05-10 12:59:20+03:00, monty@mysql.com +40 -40
    Remove some old types

  client/mysqlshow.c@1.54, 2007-05-10 12:59:20+03:00, monty@mysql.com +26 -25
    Remove some old types

  client/mysqlslap.c@1.55, 2007-05-10 12:59:20+03:00, monty@mysql.com +62 -61
    Remove some old types
    Remove some not needed casts

  client/mysqltest.c@1.296.1.1, 2007-05-10 12:59:21+03:00, monty@mysql.com +106 -105
    Removed some old types
    Removed some not needed casts
    Updated hash-get-key function arguments
    Updated parameters to dirname_part()

  client/readline.cc@1.14, 2007-05-10 12:59:22+03:00, monty@mysql.com +17 -17
    Removed some old types
    Removed some not needed casts
    Changed some string lengths to use size_t

  client/sql_string.cc@1.30, 2007-05-10 12:59:24+03:00, monty@mysql.com +4 -4
    Removed some old types

  dbug/dbug.c@1.37, 2007-05-10 12:59:24+03:00, monty@mysql.com +18 -17
    Removed some old types
    Changed some string lengths to use size_t
    Changed some prototypes to avoid casts

  extra/comp_err.c@1.33.1.1, 2007-05-10 12:59:24+03:00, monty@mysql.com +31 -31
    Removed some old types

  extra/innochecksum.c@1.7, 2007-05-10 12:59:24+03:00, monty@mysql.com +7 -7
    Removed some old types

  extra/my_print_defaults.c@1.28, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types

  extra/mysql_waitpid.c@1.9, 2007-05-10 12:59:24+03:00, monty@mysql.com +1 -1
    Removed some old types

  extra/perror.c@1.51, 2007-05-10 12:59:24+03:00, monty@mysql.com +5 -5
    Removed some old types

  extra/replace.c@1.24, 2007-05-10 12:59:24+03:00, monty@mysql.com +52 -51
    Removed some old types
    Updated parameters to dirname_part()

  extra/resolve_stack_dump.c@1.19, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types

  extra/resolveip.c@1.27, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Removed some old types

  include/config-win.h@1.100, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -3
    Removed some old types

  include/decimal.h@1.18, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Changed binary strings to be uchar* instead of char*

  include/ft_global.h@1.32, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -3
    Removed some old types

  include/hash.h@1.19.1.1, 2007-05-10 12:59:24+03:00, monty@mysql.com +15 -14
    Removed some old types

  include/heap.h@1.34, 2007-05-10 12:59:24+03:00, monty@mysql.com +27 -27
    Removed some old types
    Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable

  include/keycache.h@1.7.1.1, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types

  include/m_ctype.h@1.136, 2007-05-10 12:59:24+03:00, monty@mysql.com +117 -114
    Removed some old types
    Changed some string lengths to use size_t
    Changed character length functions to return uint
    unsigned char -> uchar

  include/m_string.h@1.47, 2007-05-10 12:59:24+03:00, monty@mysql.com +28 -27
    Removed some old types
    Changed some string lengths to use size_t

  include/my_alloc.h@1.7, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Changed some string lengths to use size_t

  include/my_base.h@1.101, 2007-05-10 12:59:24+03:00, monty@mysql.com +1 -1
    Removed some old types

  include/my_dbug.h@1.28, 2007-05-10 12:59:24+03:00, monty@mysql.com +4 -4
    Removed some old types
    Changed some string lengths to use size_t
    Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage

  include/my_getopt.h@1.19.1.1, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -3
    Removed some old types

  include/my_global.h@1.163.1.5, 2007-05-10 12:59:24+03:00, monty@mysql.com +67 -84
    Removed old types:
    my_size_t -> size_t
    byte -> uchar
    gptr -> uchar *

  include/my_list.h@1.10, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Removed some old types

  include/my_nosys.h@1.7, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -2
    Removed some old types

  include/my_pthread.h@1.114, 2007-05-10 12:59:24+03:00, monty@mysql.com +1 -1
    Removed some old types

  include/my_sys.h@1.217.1.4, 2007-05-10 12:59:24+03:00, monty@mysql.com +138 -137
    Removed some old types
    Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read()
    Changed some string lengths to use size_t
    my_malloc() / my_free() now uses void *
    Updated parameters to dirname_part() & my_uncompress()

  include/my_tree.h@1.22, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Removed some old types

  include/my_trie.h@1.3, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types

  include/my_user.h@1.3, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -3
    Changed some string lengths to use size_t

  include/my_vle.h@1.4, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Removed some old types

  include/my_xml.h@1.6, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types
    Changed some string lengths to use size_t

  include/myisam.h@1.83, 2007-05-10 12:59:24+03:00, monty@mysql.com +20 -20
    Removed some old types

  include/myisammrg.h@1.20, 2007-05-10 12:59:24+03:00, monty@mysql.com +11 -11
    Removed some old types

  include/mysql.h@1.177.1.2, 2007-05-10 12:59:24+03:00, monty@mysql.com +7 -8
    Removed some old types
    Changed byte streams to use uchar* instead of char*

  include/mysql_com.h@1.121, 2007-05-10 12:59:24+03:00, monty@mysql.com +7 -7
    Removed some old types
    Changed some string lengths to use size_t
    Changed some buffers to be uchar* to avoid casts

  include/queues.h@1.15, 2007-05-10 12:59:24+03:00, monty@mysql.com +6 -6
    Removed some old types

  include/sql_common.h@1.20, 2007-05-10 12:59:24+03:00, monty@mysql.com +3 -3
    Removed some old types

  include/sslopt-longopts.h@1.14, 2007-05-10 12:59:24+03:00, monty@mysql.com +7 -7
    Removed some old types

  include/violite.h@1.55, 2007-05-10 12:59:24+03:00, monty@mysql.com +10 -10
    Removed some old types
    Changed some string lengths to use size_t

  libmysql/client_settings.h@1.37, 2007-05-10 12:59:24+03:00, monty@mysql.com +1 -1
    Removed some old types

  libmysql/libmysql.c@1.276, 2007-05-10 12:59:24+03:00, monty@mysql.com +5 -5
    Removed some old types

  libmysql/manager.c@1.17, 2007-05-10 12:59:24+03:00, monty@mysql.com +2 -2
    Removed some old types

  libmysqld/emb_qcache.cc@1.11, 2007-05-10 12:59:24+03:00, monty@mysql.com +8 -8
    Removed some old types

  libmysqld/emb_qcache.h@1.5, 2007-05-10 12:59:24+03:00, monty@mysql.com +4 -4
    Removed some old types

  libmysqld/lib_sql.cc@1.135, 2007-05-10 12:59:25+03:00, monty@mysql.com +13 -13
    Removed some old types
    Removed some not needed casts
    Changed some buffers to be uchar* to avoid casts
    true -> TRUE, false -> FALSE

  mysys/array.c@1.13.1.2, 2007-05-10 12:59:25+03:00, monty@mysql.com +9 -9
    Removed some old types

  mysys/charset.c@1.151, 2007-05-10 12:59:25+03:00, monty@mysql.com +10 -10
    Changed some string lengths to use size_t

  mysys/checksum.c@1.11, 2007-05-10 12:59:25+03:00, monty@mysql.com +5 -4
    Include zlib to get definition for crc32
    Removed some old types

  mysys/default.c@1.95, 2007-05-10 12:59:25+03:00, monty@mysql.com +12 -11
    Removed some old types
    Changed some string lengths to use size_t

  mysys/default_modify.c@1.14, 2007-05-10 12:59:25+03:00, monty@mysql.com +6 -7
    Changed some string lengths to use size_t
    Removed some not needed casts

  mysys/hash.c@1.50.1.2, 2007-05-10 12:59:25+03:00, monty@mysql.com +33 -32
    Removed some old types
    Changed some string lengths to use size_t
    Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function.
    hash_element now takes 'ulong' as the index type (cleanup)
    

  mysys/list.c@1.14, 2007-05-10 12:59:25+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/mf_cache.c@1.14, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Changed some string lengths to use size_t

  mysys/mf_dirname.c@1.16, 2007-05-10 12:59:25+03:00, monty@mysql.com +19 -9
    Removed some old types
    Changed some string lengths to use size_t
    Added argument to dirname_part() to avoid calculation of length for 'to'

  mysys/mf_fn_ext.c@1.10, 2007-05-10 12:59:25+03:00, monty@mysql.com +6 -5
    Removed some old types
    Updated parameters to dirname_part()

  mysys/mf_format.c@1.24, 2007-05-10 12:59:25+03:00, monty@mysql.com +19 -17
    Removed some old types
    Changed some string lengths to use size_t

  mysys/mf_getdate.c@1.9, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/mf_iocache.c@1.70, 2007-05-10 12:59:25+03:00, monty@mysql.com +127 -126
    Removed some old types
    Changed some string lengths to use size_t
    Changed calculation of 'max_length' to be done the same way in all functions

  mysys/mf_iocache2.c@1.34, 2007-05-10 12:59:25+03:00, monty@mysql.com +57 -48
    Removed some old types
    Changed some string lengths to use size_t
    Clean up comments
    Removed not needed indentation

  mysys/mf_keycache.c@1.65.1.2, 2007-05-10 12:59:25+03:00, monty@mysql.com +23 -23
    Removed some old types

  mysys/mf_keycaches.c@1.10, 2007-05-10 12:59:25+03:00, monty@mysql.com +22 -22
    Removed some old types

  mysys/mf_loadpath.c@1.11, 2007-05-10 12:59:25+03:00, monty@mysql.com +2 -2
    Removed some old types

  mysys/mf_pack.c@1.24, 2007-05-10 12:59:25+03:00, monty@mysql.com +50 -134
    Removed some old types
    Changed some string lengths to use size_t
    Removed some not needed casts
    Removed very old VMS code
    Updated parameters to dirname_part()
    Use result of dirnam_part() to remove call to strcat()

  mysys/mf_path.c@1.13, 2007-05-10 12:59:25+03:00, monty@mysql.com +7 -5
    Removed some old types

  mysys/mf_radix.c@1.6, 2007-05-10 12:59:25+03:00, monty@mysql.com +2 -2
    Removed some old types

  mysys/mf_same.c@1.7, 2007-05-10 12:59:25+03:00, monty@mysql.com +3 -2
    Removed some old types

  mysys/mf_sort.c@1.8, 2007-05-10 12:59:25+03:00, monty@mysql.com +4 -4
    Removed some old types

  mysys/mf_soundex.c@1.11, 2007-05-10 12:59:25+03:00, monty@mysql.com +2 -2
    Removed some old types

  mysys/mf_strip.c@1.8, 2007-05-10 12:59:25+03:00, monty@mysql.com +6 -6
    Removed some old types

  mysys/mf_tempdir.c@1.13, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/mf_unixpath.c@1.6, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/mf_wfile.c@1.11, 2007-05-10 12:59:25+03:00, monty@mysql.com +7 -7
    Removed some old types

  mysys/mulalloc.c@1.8, 2007-05-10 12:59:25+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/my_alloc.c@1.40, 2007-05-10 12:59:25+03:00, monty@mysql.com +31 -31
    Removed some old types
    Changed some string lengths to use size_t
    Use void* as type for allocated memory area
    Removed some not needed casts
    Changed argument 'Size' to 'length' according coding guidelines

  mysys/my_chsize.c@1.21, 2007-05-10 12:59:25+03:00, monty@mysql.com +4 -4
    Changed some buffers to be uchar* to avoid casts

  mysys/my_compress.c@1.16, 2007-05-10 12:59:25+03:00, monty@mysql.com +97 -63
    More comments
    Removed some old types
    Changed string lengths to use size_t
    Changed arguments to my_uncompress() to make them easier to understand
    Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix)
    Changed type of 'pack_data' argument to packfrm() to avoid casts.

  mysys/my_conio.c@1.4, 2007-05-10 12:59:25+03:00, monty@mysql.com +6 -6
    Changed some string lengths to use size_t

  mysys/my_create.c@1.18, 2007-05-10 12:59:25+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/my_div.c@1.8, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/my_error.c@1.26, 2007-05-10 12:59:25+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/my_fopen.c@1.19, 2007-05-10 12:59:25+03:00, monty@mysql.com +2 -2
    Removed some old types

  mysys/my_fstream.c@1.12, 2007-05-10 12:59:25+03:00, monty@mysql.com +52 -38
    Removed some old types
    Changed some string lengths to use size_t
    writen -> written

  mysys/my_getopt.c@1.66.1.1, 2007-05-10 12:59:25+03:00, monty@mysql.com +9 -9
    Removed some old types

  mysys/my_getwd.c@1.23, 2007-05-10 12:59:25+03:00, monty@mysql.com +25 -13
    Removed some old types
    More comments

  mysys/my_init.c@1.57, 2007-05-10 12:59:25+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/my_largepage.c@1.3, 2007-05-10 12:59:25+03:00, monty@mysql.com +13 -13
    Removed some old types
    Changed some string lengths to use size_t

  mysys/my_lib.c@1.31, 2007-05-10 12:59:25+03:00, monty@mysql.com +11 -11
    Removed some old types

  mysys/my_lockmem.c@1.6, 2007-05-10 12:59:25+03:00, monty@mysql.com +9 -9
    Removed some old types

  mysys/my_malloc.c@1.18, 2007-05-10 12:59:25+03:00, monty@mysql.com +19 -19
    Removed some old types
    Changed malloc(), free() and related functions to use void *
    Changed all functions to use size_t

  mysys/my_memmem.c@1.6, 2007-05-10 12:59:25+03:00, monty@mysql.com +2 -1
    Indentation cleanup

  mysys/my_once.c@1.11, 2007-05-10 12:59:25+03:00, monty@mysql.com +13 -13
    Removed some old types
    Changed malloc(), free() and related functions to use void *

  mysys/my_open.c@1.33, 2007-05-10 12:59:25+03:00, monty@mysql.com +4 -4
    Removed some old types

  mysys/my_pread.c@1.20, 2007-05-10 12:59:25+03:00, monty@mysql.com +72 -79
    Removed some old types
    Changed all functions to use size_t
    Added comment for how my_pread() / my_pwrite() are supposed to work.
    Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe.
    (If we ever would really need this, it should be enabled only with a flag argument)

  mysys/my_quick.c@1.7, 2007-05-10 12:59:25+03:00, monty@mysql.com +9 -9
    Removed some old types
    Changed all functions to use size_t

  mysys/my_read.c@1.20, 2007-05-10 12:59:25+03:00, monty@mysql.com +13 -12
    Removed some old types
    Changed all functions to use size_t

  mysys/my_realloc.c@1.12, 2007-05-10 12:59:25+03:00, monty@mysql.com +5 -5
    Removed some old types
    Use void* as type for allocated memory area
    Changed all functions to use size_t

  mysys/my_static.c@1.19.1.4, 2007-05-10 12:59:26+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/my_static.h@1.21, 2007-05-10 12:59:26+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/my_vle.c@1.5, 2007-05-10 12:59:26+03:00, monty@mysql.com +10 -10
    Removed some old types

  mysys/my_wincond.c@1.13, 2007-05-10 12:59:26+03:00, monty@mysql.com +1 -1
    Removed some old types

  mysys/my_windac.c@1.3, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -4
    Removed some old types

  mysys/my_write.c@1.16, 2007-05-10 12:59:26+03:00, monty@mysql.com +13 -13
    Removed some old types
    Changed all functions to use size_t

  mysys/ptr_cmp.c@1.11, 2007-05-10 12:59:26+03:00, monty@mysql.com +13 -13
    Removed some old types
    Changed all functions to use size_t

  mysys/queues.c@1.20, 2007-05-10 12:59:26+03:00, monty@mysql.com +18 -18
    Removed some old types

  mysys/safemalloc.c@1.33, 2007-05-10 12:59:26+03:00, monty@mysql.com +36 -36
    Removed some old types
    Changed malloc(), free() and related functions to use void *
    Changed all functions to use size_t

  mysys/string.c@1.17, 2007-05-10 12:59:26+03:00, monty@mysql.com +22 -18
    Removed some old types
    Changed all functions to use size_t

  mysys/testhash.c@1.11, 2007-05-10 12:59:26+03:00, monty@mysql.com +3 -3
    Removed some old types

  mysys/thr_alarm.c@1.63, 2007-05-10 12:59:26+03:00, monty@mysql.com +6 -6
    Removed some old types

  mysys/thr_lock.c@1.60, 2007-05-10 12:59:26+03:00, monty@mysql.com +2 -2
    Removed some old types

  mysys/tree.c@1.34, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -4
    Removed some old types

  mysys/trie.c@1.3, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -4
    Removed some old types

  mysys/typelib.c@1.18.1.4, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -3
    Removed some old types

  plugin/daemon_example/daemon_example.cc@1.6, 2007-05-10 12:59:26+03:00, monty@mysql.com +3 -3
    Removed some old types

  regex/reginit.c@1.9, 2007-05-10 12:59:26+03:00, monty@mysql.com +1 -1
    Removed some old types

  server-tools/instance-manager/buffer.cc@1.14, 2007-05-10 12:59:26+03:00, monty@mysql.com +5 -5
    Changed some string lengths to use size_t
    Changed buffer to be of type uchar*

  server-tools/instance-manager/buffer.h@1.11, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -4
    Changed some string lengths to use size_t
    Changed buffer to be of type uchar*

  server-tools/instance-manager/commands.cc@1.46, 2007-05-10 12:59:26+03:00, monty@mysql.com +19 -18
    Removed some old types
    Changed some string lengths to use size_t
    Changed buffer to be of type uchar*

  server-tools/instance-manager/instance_map.cc@1.37, 2007-05-10 12:59:26+03:00, monty@mysql.com +14 -14
    Removed some old types
    Changed some string lengths to use size_t
    Changed buffer to be of type uchar*

  server-tools/instance-manager/instance_options.cc@1.46, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -8
    Changed buffer to be of type uchar*
    Replaced alloc_root + strcpy() with strdup_root()

  server-tools/instance-manager/mysql_connection.cc@1.29, 2007-05-10 12:59:26+03:00, monty@mysql.com +10 -9
    Changed buffer to be of type uchar*

  server-tools/instance-manager/options.cc@1.41, 2007-05-10 12:59:26+03:00, monty@mysql.com +37 -37
    Removed some old types

  server-tools/instance-manager/parse.cc@1.21, 2007-05-10 12:59:26+03:00, monty@mysql.com +5 -5
    Changed some string lengths to use size_t

  server-tools/instance-manager/parse.h@1.12, 2007-05-10 12:59:26+03:00, monty@mysql.com +5 -5
    Removed some old types
    Changed some string lengths to use size_t

  server-tools/instance-manager/protocol.cc@1.18, 2007-05-10 12:59:26+03:00, monty@mysql.com +16 -12
    Changed some buffers to be uchar* to avoid casts
    Changed some string lengths to use size_t

  server-tools/instance-manager/protocol.h@1.10, 2007-05-10 12:59:26+03:00, monty@mysql.com +4 -3
    Changed some string lengths to use size_t

  server-tools/instance-manager/user_map.cc@1.27, 2007-05-10 12:59:26+03:00, monty@mysql.com +8 -8
    Removed some old types
    Changed some string lengths to use size_t

  sql-common/client.c@1.133, 2007-05-10 12:59:30+03:00, monty@mysql.com +12 -12
    Removed some old types
    Changed some memory areas to use uchar*

  sql-common/my_user.c@1.3, 2007-05-10 12:59:30+03:00, monty@mysql.com +3 -3
    Changed some string lengths to use size_t

  sql-common/pack.c@1.7, 2007-05-10 12:59:30+03:00, monty@mysql.com +1 -3
    Changed some buffers to be uchar* to avoid casts

  sql/derror.cc@1.23.1.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +19 -15
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Changed some string lengths to use size_t

  sql/discover.cc@1.8, 2007-05-10 12:59:26+03:00, monty@mysql.com +8 -10
    Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts
    Changed some string lengths to use size_t
    Changed some buffers to be uchar* to avoid casts

  sql/event_data_objects.cc@1.96.1.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +7 -6
    Removed some old types
    Added missing casts for alloc() and sprintf()

  sql/event_db_repository.cc@1.30, 2007-05-10 12:59:26+03:00, monty@mysql.com +7 -6
    Changed some buffers to be uchar* to avoid casts
    Added missing casts for sprintf()

  sql/event_queue.cc@1.32.1.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/field.cc@1.388, 2007-05-10 12:59:26+03:00, monty@mysql.com +300 -283
    Removed some old types
    Changed memory buffers to be uchar*
    Changed some string lengths to use size_t
    Removed a lot of casts
    Safety fix in Field_blob::val_decimal() to not access zero pointer

  sql/field.h@1.222.2.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +197 -191
    Removed some old types
    Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). 
    Changed some string lengths to use size_t
    Removed some not needed casts
    Changed val_xxx(xxx, new_ptr) to take const pointers

  sql/field_conv.cc@1.71, 2007-05-10 12:59:26+03:00, monty@mysql.com +19 -14
    Removed some old types
    Added casts required because memory area pointers are now uchar*

  sql/filesort.cc@1.128, 2007-05-10 12:59:26+03:00, monty@mysql.com +41 -41
    Initalize variable that was used unitialized in error conditions

  sql/gen_lex_hash.cc@1.77, 2007-05-10 12:59:26+03:00, monty@mysql.com +2 -2
    Removed some old types
    Changed memory buffers to be uchar*
    Changed some string lengths to use size_t
    Removed a lot of casts
    Safety fix in Field_blob::val_decimal() to not access zero pointer

  sql/gstream.h@1.8, 2007-05-10 12:59:26+03:00, monty@mysql.com +1 -1
    Added required cast

  sql/ha_ndbcluster.cc@1.443.5.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +148 -144
    Removed some old types
    Updated hash-get-key function arguments
    Changed some buffers to be uchar* to avoid casts
    Added required casts
    Removed some not needed casts

  sql/ha_ndbcluster.h@1.178.1.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +42 -42
    Removed some old types

  sql/ha_ndbcluster_binlog.cc@1.116.2.1, 2007-05-10 12:59:26+03:00, monty@mysql.com +41 -38
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake()
    Changed some string lengths to use size_t
    Added missing casts for alloc() and sprintf()

  sql/ha_ndbcluster_binlog.h@1.25, 2007-05-10 12:59:27+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/ha_ndbcluster_cond.cc@1.6, 2007-05-10 12:59:27+03:00, monty@mysql.com +4 -4
    Removed some old types
    Removed some not needed casts

  sql/ha_ndbcluster_cond.h@1.4, 2007-05-10 12:59:27+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/ha_partition.cc@1.88.1.2, 2007-05-10 12:59:27+03:00, monty@mysql.com +46 -46
    Removed some old types
    Changed prototype for change_partition() to avoid casts

  sql/ha_partition.h@1.35.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +34 -34
    Removed some old types

  sql/handler.cc@1.304.3.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +35 -35
    Removed some old types
    Changed some string lengths to use size_t

  sql/handler.h@1.256.2.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +39 -39
    Removed some old types
    Changed some string lengths to use size_t
    Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts

  sql/hash_filo.h@1.15, 2007-05-10 12:59:27+03:00, monty@mysql.com +4 -4
    Removed some old types
    Changed all functions to use size_t

  sql/hostname.cc@1.38, 2007-05-10 12:59:27+03:00, monty@mysql.com +5 -5
    Removed some old types

  sql/item.cc@1.268, 2007-05-10 12:59:27+03:00, monty@mysql.com +27 -27
    Removed some old types
    Changed some string lengths to use size_t
    Use strmake() instead of memdup() to create a null terminated string.
    Updated calls to new Field()

  sql/item.h@1.240.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +54 -54
    Removed some old types
    Changed malloc(), free() and related functions to use void *
    Changed some buffers to be uchar* to avoid casts

  sql/item_cmpfunc.cc@1.270.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +22 -22
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/item_cmpfunc.h@1.160.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +29 -29
    Removed some old types

  sql/item_create.cc@1.76.1.2, 2007-05-10 12:59:27+03:00, monty@mysql.com +8 -7
    Removed some old types

  sql/item_func.cc@1.380.1.5, 2007-05-10 12:59:27+03:00, monty@mysql.com +57 -57
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts
    Added test for failing alloc() in init_result_field()
    Remove old confusing comment
    Fixed compiler warning

  sql/item_func.h@1.168, 2007-05-10 12:59:27+03:00, monty@mysql.com +38 -38
    Removed some old types

  sql/item_row.cc@1.36, 2007-05-10 12:59:27+03:00, monty@mysql.com +2 -2
    Removed some old types

  sql/item_row.h@1.25, 2007-05-10 12:59:27+03:00, monty@mysql.com +2 -2
    Removed some old types

  sql/item_strfunc.cc@1.323, 2007-05-10 12:59:27+03:00, monty@mysql.com +3 -2
    Include zlib (needed becasue we call crc32)
    Removed some old types

  sql/item_strfunc.h@1.129, 2007-05-10 12:59:27+03:00, monty@mysql.com +18 -18
    Removed some old types
    Changed some types to match new function prototypes

  sql/item_subselect.cc@1.153.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/item_subselect.h@1.96, 2007-05-10 12:59:27+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/item_sum.cc@1.214.1.10, 2007-05-10 12:59:27+03:00, monty@mysql.com +24 -24
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/item_sum.h@1.119, 2007-05-10 12:59:27+03:00, monty@mysql.com +11 -11
    Removed some old types

  sql/item_timefunc.cc@1.164, 2007-05-10 12:59:27+03:00, monty@mysql.com +4 -4
    Removed some old types
    Changed some string lengths to use size_t

  sql/item_timefunc.h@1.85, 2007-05-10 12:59:27+03:00, monty@mysql.com +30 -30
    Removed some old types

  sql/item_xmlfunc.cc@1.26.2.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +4 -4
    Changed some string lengths to use size_t

  sql/item_xmlfunc.h@1.8, 2007-05-10 12:59:27+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/key.cc@1.49.1.2, 2007-05-10 12:59:27+03:00, monty@mysql.com +18 -17
    Removed some old types
    Removed some not needed casts

  sql/lock.cc@1.107, 2007-05-10 12:59:27+03:00, monty@mysql.com +21 -21
    Removed some old types
    Added some cast to my_multi_malloc() arguments for safety

  sql/log.cc@1.279.2.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +57 -44
    Removed some old types
    Changed some string lengths to use size_t
    Changed some buffers to be uchar* to avoid casts
    Changed usage of pwrite() to not assume it holds the cursor position for the file
    Made usage of my_read() safer

  sql/log_event.cc@1.277.1.1, 2007-05-10 12:59:27+03:00, monty@mysql.com +210 -204
    Removed some old types
    Added checking of return value of malloc() in pack_info()
    Changed some buffers to be uchar* to avoid casts
    Removed some 'const' to avoid casts
    Added missing casts for alloc() and sprintf()
    Added required casts
    Removed some not needed casts
    Added some cast to my_multi_malloc() arguments for safety

  sql/log_event.h@1.150, 2007-05-10 12:59:28+03:00, monty@mysql.com +35 -34
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/log_event_old.cc@1.4, 2007-05-10 12:59:28+03:00, monty@mysql.com +8 -9
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/log_event_old.h@1.4, 2007-05-10 12:59:28+03:00, monty@mysql.com +3 -3
    Changed some buffers to be uchar* to avoid casts

  sql/mf_iocache.cc@1.30, 2007-05-10 12:59:28+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/my_decimal.cc@1.17, 2007-05-10 12:59:28+03:00, monty@mysql.com +2 -2
    Changed memory area to use uchar*

  sql/my_decimal.h@1.16, 2007-05-10 12:59:28+03:00, monty@mysql.com +4 -5
    Changed memory area to use uchar*

  sql/mysql_priv.h@1.501.1.4, 2007-05-10 12:59:28+03:00, monty@mysql.com +37 -37
    Removed some old types
    Changed malloc(), free() and related functions to use void *
    Changed some string lengths to use size_t
    Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow
    Changed some buffers to be uchar* to avoid casts

  sql/mysqld.cc@1.638.1.2, 2007-05-10 12:59:28+03:00, monty@mysql.com +414 -414
    Removed some old types

  sql/net_serv.cc@1.111, 2007-05-10 12:59:28+03:00, monty@mysql.com +71 -68
    Removed some old types
    Changed some string lengths to use size_t
    Changed some buffers to be uchar* to avoid casts
    Ensure that vio_read()/vio_write() return values are stored in a size_t variable
    Removed some not needed casts

  sql/opt_range.cc@1.272.1.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +117 -112
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/opt_range.h@1.78.1.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +20 -20
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/opt_sum.cc@1.62, 2007-05-10 12:59:28+03:00, monty@mysql.com +6 -6
    Removed some old types
    Removed some not needed casts

  sql/parse_file.cc@1.29, 2007-05-10 12:59:28+03:00, monty@mysql.com +32 -35
    Removed some old types
    Changed some string lengths to use size_t
    Changed alloc_root + memcpy + set end 0 -> strmake_root()

  sql/parse_file.h@1.16, 2007-05-10 12:59:28+03:00, monty@mysql.com +5 -5
    Removed some old types

  sql/partition_info.cc@1.39, 2007-05-10 12:59:28+03:00, monty@mysql.com +19 -18
    Removed some old types
    Added missing casts for alloc()
    Changed some buffers to be uchar* to avoid casts

  sql/partition_info.h@1.23, 2007-05-10 12:59:28+03:00, monty@mysql.com +6 -6
    Changed some buffers to be uchar* to avoid casts

  sql/protocol.cc@1.128, 2007-05-10 12:59:28+03:00, monty@mysql.com +59 -55
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/protocol.h@1.41, 2007-05-10 12:59:28+03:00, monty@mysql.com +13 -13
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Changed some string lengths to use size_t

  sql/records.cc@1.50, 2007-05-10 12:59:28+03:00, monty@mysql.com +5 -5
    Removed some old types

  sql/repl_failsafe.cc@1.77, 2007-05-10 12:59:28+03:00, monty@mysql.com +8 -8
    Removed some old types
    Changed some string lengths to use size_t
    Added required casts

  sql/rpl_filter.cc@1.8, 2007-05-10 12:59:28+03:00, monty@mysql.com +11 -11
    Removed some old types
    Updated hash-get-key function arguments
    Changed some string lengths to use size_t

  sql/rpl_filter.h@1.10, 2007-05-10 12:59:28+03:00, monty@mysql.com +1 -1
    Changed some string lengths to use size_t

  sql/rpl_injector.h@1.12, 2007-05-10 12:59:28+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/rpl_record.cc@1.3, 2007-05-10 12:59:28+03:00, monty@mysql.com +12 -12
    Removed some old types
    Removed some not needed casts
    Changed some buffers to be uchar* to avoid casts

  sql/rpl_record.h@1.2, 2007-05-10 12:59:28+03:00, monty@mysql.com +4 -4
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/rpl_record_old.cc@1.3, 2007-05-10 12:59:28+03:00, monty@mysql.com +12 -12
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/rpl_record_old.h@1.3, 2007-05-10 12:59:28+03:00, monty@mysql.com +5 -5
    Removed some old types
    Changed some buffers to be uchar* to avoid cast

  sql/rpl_rli.cc@1.11, 2007-05-10 12:59:28+03:00, monty@mysql.com +3 -2
    Removed some old types

  sql/rpl_tblmap.cc@1.4, 2007-05-10 12:59:28+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/rpl_tblmap.h@1.4, 2007-05-10 12:59:28+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/rpl_utility.cc@1.6, 2007-05-10 12:59:28+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/rpl_utility.h@1.4.1.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +6 -7
    Removed some old types
    Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length

  sql/set_var.cc@1.229.3.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +78 -77
    Removed some old types
    Updated parameters to dirname_part()

  sql/set_var.h@1.102.1.3, 2007-05-10 12:59:28+03:00, monty@mysql.com +47 -47
    Removed some old types

  sql/slave.cc@1.305.1.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +15 -15
    Removed some old types
    Changed some string lengths to use size_t

  sql/slave.h@1.107, 2007-05-10 12:59:28+03:00, monty@mysql.com +8 -8
    Removed some old types

  sql/sp.cc@1.148.1.1, 2007-05-10 12:59:28+03:00, monty@mysql.com +38 -30
    Removed some old types
    Added missing casts for printf()

  sql/sp.h@1.39, 2007-05-10 12:59:28+03:00, monty@mysql.com +2 -1
    Removed some old types
    Updated hash-get-key function arguments

  sql/sp_cache.cc@1.19, 2007-05-10 12:59:29+03:00, monty@mysql.com +7 -7
    Removed some old types
    Added missing casts for printf()
    Updated hash-get-key function arguments

  sql/sp_head.cc@1.266.1.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +17 -17
    Removed some old types
    Added missing casts for alloc() and printf()
    Added required casts
    Updated hash-get-key function arguments

  sql/sp_head.h@1.103.1.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +2 -2
    Removed some old types

  sql/sp_pcontext.cc@1.34, 2007-05-10 12:59:29+03:00, monty@mysql.com +10 -10
    Removed some old types

  sql/sp_pcontext.h@1.32, 2007-05-10 12:59:29+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/sql_acl.cc@1.235, 2007-05-10 12:59:29+03:00, monty@mysql.com +72 -71
    Removed some old types
    Changed some string lengths to use size_t
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts
    Added required casts

  sql/sql_analyse.cc@1.76, 2007-05-10 12:59:29+03:00, monty@mysql.com +2 -2
    Changed some buffers to be uchar* to avoid casts

  sql/sql_analyse.h@1.24, 2007-05-10 12:59:29+03:00, monty@mysql.com +2 -2
    Changed some buffers to be uchar* to avoid casts

  sql/sql_array.h@1.4, 2007-05-10 12:59:29+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/sql_base.cc@1.396.1.2, 2007-05-10 12:59:29+03:00, monty@mysql.com +51 -50
    Removed some old types
    Updated hash-get-key function arguments

  sql/sql_binlog.cc@1.12, 2007-05-10 12:59:29+03:00, monty@mysql.com +4 -4
    Removed some old types
    Added missing casts for printf()

  sql/sql_cache.cc@1.107.2.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +92 -94
    Removed some old types
    Updated hash-get-key function arguments
    Removed some not needed casts
    Changed some string lengths to use size_t

  sql/sql_cache.h@1.38, 2007-05-10 12:59:29+03:00, monty@mysql.com +17 -19
    Removed some old types
    Removed reference to not existing function cache_key()
    Updated hash-get-key function arguments

  sql/sql_class.cc@1.332.2.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +77 -99
    Removed some old types
    Updated hash-get-key function arguments
    Added missing casts for alloc()
    Updated hash-get-key function arguments
    Moved THD::max_row_length() to table.cc (as it's not depending on THD)
    Removed some not needed casts

  sql/sql_class.h@1.355.3.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +29 -40
    Removed some old types
    Changed malloc(), free() and related functions to use void *
    Removed some not needed casts
    Changed some string lengths to use size_t
    Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD

  sql/sql_connect.cc@1.1.1.2, 2007-05-10 12:59:29+03:00, monty@mysql.com +9 -9
    Removed some old types
    Added required casts

  sql/sql_db.cc@1.152, 2007-05-10 12:59:29+03:00, monty@mysql.com +27 -30
    Removed some old types
    Removed some not needed casts
    Added some cast to my_multi_malloc() arguments for safety
    Added missing casts for alloc()

  sql/sql_delete.cc@1.219.1.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/sql_handler.cc@1.94, 2007-05-10 12:59:29+03:00, monty@mysql.com +15 -15
    Removed some old types
    Updated hash-get-key function arguments
    Added some cast to my_multi_malloc() arguments for safety

  sql/sql_help.cc@1.60, 2007-05-10 12:59:29+03:00, monty@mysql.com +5 -5
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/sql_insert.cc@1.261.1.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +13 -11
    Removed some old types
    Added missing casts for alloc() and printf()

  sql/sql_lex.cc@1.237.2.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/sql_lex.h@1.271.3.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +6 -6
    Removed some old types
    Removed some not needed casts

  sql/sql_list.h@1.47, 2007-05-10 12:59:29+03:00, monty@mysql.com +5 -5
    Removed some old types
    Removed some not needed casts

  sql/sql_load.cc@1.123.2.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +20 -20
    Removed some old types
    Removed compiler warning

  sql/sql_manager.cc@1.11, 2007-05-10 12:59:29+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/sql_map.cc@1.20, 2007-05-10 12:59:29+03:00, monty@mysql.com +4 -4
    Removed some old types

  sql/sql_map.h@1.9, 2007-05-10 12:59:29+03:00, monty@mysql.com +6 -6
    Removed some old types

  sql/sql_olap.cc@1.26, 2007-05-10 12:59:29+03:00, monty@mysql.com +2 -2
    Removed some old types

  sql/sql_parse.cc@1.662.3.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +37 -36
    Removed some old types
    Trivial move of code lines to make things more readable
    Changed some string lengths to use size_t
    Added missing casts for alloc()

  sql/sql_partition.cc@1.100.3.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +40 -40
    Removed some old types
    Removed compiler warnings about not used functions
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/sql_partition.h@1.15, 2007-05-10 12:59:29+03:00, monty@mysql.com +6 -6
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/sql_plugin.cc@1.47.2.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +14 -14
    Removed some old types
    Added missing casts for alloc()
    Updated hash-get-key function arguments

  sql/sql_prepare.cc@1.210.1.1, 2007-05-10 12:59:29+03:00, monty@mysql.com +12 -11
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Added missing casts for alloc() and printf()

  sql/sql_repl.cc@1.167.1.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +11 -9
    Added required casts
    Changed some buffers to be uchar* to avoid casts
    Changed some string lengths to use size_t

  sql/sql_select.cc@1.515.2.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +59 -60
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some old types

  sql/sql_select.h@1.121.1.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +20 -19
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  sql/sql_servers.cc@1.11, 2007-05-10 12:59:30+03:00, monty@mysql.com +14 -14
    Removed some old types
    Updated hash-get-key function arguments

  sql/sql_show.cc@1.408.1.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +13 -12
    Removed some old types
    Added missing casts for alloc()
    Removed some not needed casts

  sql/sql_string.cc@1.103, 2007-05-10 12:59:30+03:00, monty@mysql.com +4 -4
    Removed some old types
    Added required casts

  sql/sql_table.cc@1.413.2.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +21 -19
    Removed some old types
    Removed compiler warning about not used variable
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts

  sql/sql_test.cc@1.53, 2007-05-10 12:59:30+03:00, monty@mysql.com +2 -2
    Removed some old types

  sql/sql_trigger.cc@1.89.1.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +13 -13
    Removed some old types
    Added missing casts for alloc()

  sql/sql_udf.cc@1.76, 2007-05-10 12:59:30+03:00, monty@mysql.com +11 -11
    Removed some old types
    Updated hash-get-key function arguments

  sql/sql_union.cc@1.150, 2007-05-10 12:59:30+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/sql_update.cc@1.240, 2007-05-10 12:59:30+03:00, monty@mysql.com +5 -5
    Removed some old types
    Removed some not needed casts

  sql/sql_view.cc@1.132.1.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +6 -6
    Removed some old types

  sql/sql_yacc.yy@1.564.2.1, 2007-05-10 12:59:30+03:00, monty@mysql.com +14 -11
    Removed some old types
    Changed some string lengths to use size_t
    Added missing casts for alloc()

  sql/stacktrace.c@1.28, 2007-05-10 12:59:30+03:00, monty@mysql.com +3 -3
    Removed some old types

  sql/stacktrace.h@1.11, 2007-05-10 12:59:30+03:00, monty@mysql.com +1 -1
    Removed some old types

  sql/structs.h@1.65.1.2, 2007-05-10 12:59:30+03:00, monty@mysql.com +6 -6
    Removed some old types

  sql/table.cc@1.286.1.2, 2007-05-10 12:59:30+03:00, monty@mysql.com +94 -63
    Removed some old types
    Updated hash-get-key function arguments
    Changed some buffers to be uchar* to avoid casts
    Removed setting of LEX_STRING() arguments in declaration
    Added required casts
    More function comments
    Moved max_row_length() here from sql_class.cc/sql_class.h

  sql/table.h@1.166.1.2, 2007-05-10 12:59:30+03:00, monty@mysql.com +22 -17
    Removed some old types
    Changed some string lengths to use size_t

  sql/thr_malloc.cc@1.16, 2007-05-10 12:59:30+03:00, monty@mysql.com +15 -16
    Use void* as type for allocated memory area
    Changed all functions to use size_t

  sql/tzfile.h@1.3, 2007-05-10 12:59:30+03:00, monty@mysql.com +8 -8
    Changed some buffers to be uchar* to avoid casts

  sql/tztime.cc@1.55, 2007-05-10 12:59:30+03:00, monty@mysql.com +35 -32
    Changed some buffers to be uchar* to avoid casts
    Updated hash-get-key function arguments
    Added missing casts for alloc()
    Removed some not needed casts

  sql/uniques.cc@1.29, 2007-05-10 12:59:30+03:00, monty@mysql.com +9 -10
    Removed some old types
    Removed some not needed casts

  sql/unireg.cc@1.101, 2007-05-10 12:59:30+03:00, monty@mysql.com +34 -33
    Removed some old types
    Changed some buffers to be uchar* to avoid casts
    Removed some not needed casts
    Added missing casts for alloc()

  storage/archive/archive_reader.c@1.9, 2007-05-10 12:59:30+03:00, monty@mysql.com +7 -7
    Removed some old types

  storage/archive/azio.c@1.18, 2007-05-10 12:59:30+03:00, monty@mysql.com +13 -13
    Removed some old types
    Removed some not needed casts

  storage/archive/ha_archive.cc@1.139, 2007-05-10 12:59:31+03:00, monty@mysql.com +50 -51
    Removed some old types
    Changed type for 'frmblob' in archive_discover() to match handler
    Updated hash-get-key function arguments
    Removed some not needed casts

  storage/archive/ha_archive.h@1.64, 2007-05-10 12:59:31+03:00, monty@mysql.com +17 -17
    Removed some old types

  storage/blackhole/ha_blackhole.cc@1.49.1.1, 2007-05-10 12:59:31+03:00, monty@mysql.com +11 -11
    Removed some old types

  storage/blackhole/ha_blackhole.h@1.14.1.1, 2007-05-10 12:59:31+03:00, monty@mysql.com +11 -11
    Removed some old types

  storage/csv/ha_tina.cc@1.77, 2007-05-10 12:59:31+03:00, monty@mysql.com +26 -26
    Removed some old types
    Updated hash-get-key function arguments
    Changed some buffers to be uchar* to avoid casts

  storage/csv/ha_tina.h@1.29, 2007-05-10 12:59:31+03:00, monty@mysql.com +11 -11
    Removed some old types
    Removed some not needed casts

  storage/csv/transparent_file.cc@1.2, 2007-05-10 12:59:31+03:00, monty@mysql.com +21 -23
    Removed some old types
    Changed type of 'bytes_read' to be able to detect read errors
    Fixed indentation

  storage/csv/transparent_file.h@1.2, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/example/ha_example.cc@1.55.1.1, 2007-05-10 12:59:31+03:00, monty@mysql.com +18 -18
    Removed some old types
    Updated hash-get-key function arguments

  storage/example/ha_example.h@1.23, 2007-05-10 12:59:31+03:00, monty@mysql.com +11 -11
    Removed some old types

  storage/federated/ha_federated.cc@1.99.1.1, 2007-05-10 12:59:31+03:00, monty@mysql.com +27 -27
    Removed some old types
    Updated hash-get-key function arguments
    Removed some not needed casts

  storage/federated/ha_federated.h@1.46, 2007-05-10 12:59:31+03:00, monty@mysql.com +13 -13
    Removed some old types

  storage/heap/_check.c@1.24, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Changed some buffers to be uchar* to avoid casts

  storage/heap/_rectest.c@1.9, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/ha_heap.cc@1.111.1.1, 2007-05-10 12:59:31+03:00, monty@mysql.com +14 -14
    Removed some old types

  storage/heap/ha_heap.h@1.53, 2007-05-10 12:59:31+03:00, monty@mysql.com +14 -14
    Removed some old types

  storage/heap/heapdef.h@1.20, 2007-05-10 12:59:31+03:00, monty@mysql.com +26 -26
    Removed some old types

  storage/heap/hp_block.c@1.12, 2007-05-10 12:59:31+03:00, monty@mysql.com +12 -11
    Removed some old types
    Changed some string lengths to use size_t

  storage/heap/hp_clear.c@1.13, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/heap/hp_close.c@1.11, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/hp_create.c@1.28, 2007-05-10 12:59:31+03:00, monty@mysql.com +10 -10
    Removed some old types

  storage/heap/hp_delete.c@1.23, 2007-05-10 12:59:31+03:00, monty@mysql.com +5 -5
    Removed some old types

  storage/heap/hp_hash.c@1.51, 2007-05-10 12:59:31+03:00, monty@mysql.com +24 -24
    Removed some old types

  storage/heap/hp_info.c@1.13, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/hp_open.c@1.27, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/heap/hp_rfirst.c@1.17, 2007-05-10 12:59:31+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/heap/hp_rkey.c@1.23, 2007-05-10 12:59:31+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/heap/hp_rlast.c@1.13, 2007-05-10 12:59:31+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/heap/hp_rnext.c@1.15, 2007-05-10 12:59:31+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/heap/hp_rprev.c@1.11, 2007-05-10 12:59:31+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/heap/hp_rrnd.c@1.14, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/heap/hp_rsame.c@1.9, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/hp_scan.c@1.10, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/hp_test1.c@1.20, 2007-05-10 12:59:31+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/heap/hp_test2.c@1.30, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/heap/hp_update.c@1.15, 2007-05-10 12:59:31+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/heap/hp_write.c@1.38, 2007-05-10 12:59:31+03:00, monty@mysql.com +16 -16
    Removed some old types
    Changed some string lengths to use size_t

  storage/innobase/handler/ha_innodb.cc@1.333.1.3, 2007-05-10 12:59:31+03:00, monty@mysql.com +22 -23
    Removed some old types
    Updated hash-get-key function arguments
    Added missing casts for alloc() and printf()
    Removed some not needed casts

  storage/innobase/handler/ha_innodb.h@1.136.1.3, 2007-05-10 12:59:32+03:00, monty@mysql.com +20 -20
    Removed some old types

  storage/myisam/ft_boolean_search.c@1.108, 2007-05-10 12:59:32+03:00, monty@mysql.com +18 -17
    Removed some old types

  storage/myisam/ft_nlq_search.c@1.47, 2007-05-10 12:59:32+03:00, monty@mysql.com +5 -5
    Removed some old types

  storage/myisam/ft_parser.c@1.59, 2007-05-10 12:59:32+03:00, monty@mysql.com +15 -14
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  storage/myisam/ft_static.c@1.37, 2007-05-10 12:59:32+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/ft_stopwords.c@1.27, 2007-05-10 12:59:32+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/ft_update.c@1.47, 2007-05-10 12:59:32+03:00, monty@mysql.com +14 -14
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  storage/myisam/ftdefs.h@1.41, 2007-05-10 12:59:32+03:00, monty@mysql.com +16 -16
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  storage/myisam/fulltext.h@1.13, 2007-05-10 12:59:32+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/myisam/ha_myisam.cc@1.217.2.1, 2007-05-10 12:59:32+03:00, monty@mysql.com +27 -27
    Removed some old types

  storage/myisam/ha_myisam.h@1.85, 2007-05-10 12:59:32+03:00, monty@mysql.com +17 -17
    Removed some old types

  storage/myisam/mi_cache.c@1.18, 2007-05-10 12:59:32+03:00, monty@mysql.com +3 -3
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  storage/myisam/mi_check.c@1.161, 2007-05-10 12:59:32+03:00, monty@mysql.com +73 -73
    Removed some old types

  storage/myisam/mi_checksum.c@1.12, 2007-05-10 12:59:32+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/myisam/mi_close.c@1.26, 2007-05-10 12:59:32+03:00, monty@mysql.com +5 -5
    Removed some old types

  storage/myisam/mi_create.c@1.70, 2007-05-10 12:59:32+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/mi_delete.c@1.46, 2007-05-10 12:59:32+03:00, monty@mysql.com +34 -34
    Removed some old types

  storage/myisam/mi_delete_all.c@1.22, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_dynrec.c@1.60, 2007-05-10 12:59:32+03:00, monty@mysql.com +82 -81
    Removed some old types

  storage/myisam/mi_extra.c@1.55, 2007-05-10 12:59:32+03:00, monty@mysql.com +5 -5
    Removed some old types

  storage/myisam/mi_key.c@1.58, 2007-05-10 12:59:32+03:00, monty@mysql.com +28 -28
    Removed some old types

  storage/myisam/mi_locking.c@1.53, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_log.c@1.16, 2007-05-10 12:59:32+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/myisam/mi_open.c@1.125, 2007-05-10 12:59:32+03:00, monty@mysql.com +25 -24
    Removed some old types
    Removed some not needed casts
    Check argument of my_write()/my_pwrite() in functions returning int
    Added casting of string lengths to size_t

  storage/myisam/mi_packrec.c@1.48, 2007-05-10 12:59:32+03:00, monty@mysql.com +50 -49
    Removed some old types
    Changed some buffers to be uchar* to avoid casts

  storage/myisam/mi_page.c@1.29, 2007-05-10 12:59:32+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/myisam/mi_preload.c@1.13.1.1, 2007-05-10 12:59:32+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/myisam/mi_range.c@1.25, 2007-05-10 12:59:32+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/mi_rfirst.c@1.8, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rkey.c@1.35, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rlast.c@1.8, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rnext.c@1.19, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rnext_same.c@1.24, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rprev.c@1.16, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rrnd.c@1.10, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rsame.c@1.11, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_rsamepos.c@1.11, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_scan.c@1.8, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_search.c@1.67, 2007-05-10 12:59:32+03:00, monty@mysql.com +12 -12
    Removed some old types

  storage/myisam/mi_static.c@1.22, 2007-05-10 12:59:32+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/mi_statrec.c@1.18, 2007-05-10 12:59:32+03:00, monty@mysql.com +13 -13
    Removed some old types

  storage/myisam/mi_test1.c@1.35, 2007-05-10 12:59:32+03:00, monty@mysql.com +18 -18
    Removed some old types

  storage/myisam/mi_test2.c@1.36, 2007-05-10 12:59:33+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/myisam/mi_test3.c@1.22, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/mi_unique.c@1.33, 2007-05-10 12:59:33+03:00, monty@mysql.com +8 -8
    Removed some old types

  storage/myisam/mi_update.c@1.28, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/mi_write.c@1.68, 2007-05-10 12:59:33+03:00, monty@mysql.com +28 -28
    Removed some old types

  storage/myisam/myisam_ftdump.c@1.45, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/myisamchk.c@1.128, 2007-05-10 12:59:33+03:00, monty@mysql.com +46 -46
    Removed some old types

  storage/myisam/myisamdef.h@1.101, 2007-05-10 12:59:33+03:00, monty@mysql.com +59 -58
    Removed some old types

  storage/myisam/myisamlog.c@1.37, 2007-05-10 12:59:33+03:00, monty@mysql.com +31 -29
    Removed some old types
    Indentation fix

  storage/myisam/myisampack.c@1.65, 2007-05-10 12:59:33+03:00, monty@mysql.com +59 -59
    Removed some old types

  storage/myisam/rt_index.c@1.26, 2007-05-10 12:59:33+03:00, monty@mysql.com +16 -16
    Removed some old types

  storage/myisam/rt_split.c@1.22, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisam/sort.c@1.65.1.1, 2007-05-10 12:59:33+03:00, monty@mysql.com +31 -31
    Removed some old types

  storage/myisam/sp_defs.h@1.6, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisam/sp_key.c@1.13, 2007-05-10 12:59:33+03:00, monty@mysql.com +7 -7
    Removed some old types

  storage/myisammrg/ha_myisammrg.cc@1.118.1.1, 2007-05-10 12:59:33+03:00, monty@mysql.com +19 -19
    Removed some old types

  storage/myisammrg/ha_myisammrg.h@1.53, 2007-05-10 12:59:33+03:00, monty@mysql.com +14 -14
    Removed some old types

  storage/myisammrg/myrg_close.c@1.10, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisammrg/myrg_def.h@1.16, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisammrg/myrg_delete.c@1.12, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisammrg/myrg_open.c@1.37, 2007-05-10 12:59:33+03:00, monty@mysql.com +7 -6
    Removed some old types
    Updated parameters to dirname_part()

  storage/myisammrg/myrg_queue.c@1.17, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rfirst.c@1.13, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rkey.c@1.26, 2007-05-10 12:59:33+03:00, monty@mysql.com +5 -5
    Removed some old types

  storage/myisammrg/myrg_rlast.c@1.12, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rnext.c@1.18, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rnext_same.c@1.10, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rprev.c@1.17, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/myisammrg/myrg_rrnd.c@1.18, 2007-05-10 12:59:33+03:00, monty@mysql.com +6 -6
    Removed some old types

  storage/myisammrg/myrg_rsame.c@1.11, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisammrg/myrg_update.c@1.11, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/myisammrg/myrg_write.c@1.10, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/ndb/include/util/ndb_opts.h@1.21, 2007-05-10 12:59:33+03:00, monty@mysql.com +11 -11
    Removed some old types

  storage/ndb/src/cw/cpcd/main.cpp@1.14, 2007-05-10 12:59:33+03:00, monty@mysql.com +6 -6
    Removed some old types

  storage/ndb/src/kernel/vm/Configuration.cpp@1.57, 2007-05-10 12:59:33+03:00, monty@mysql.com +8 -8
    Removed some old types

  storage/ndb/src/mgmclient/main.cpp@1.31, 2007-05-10 12:59:33+03:00, monty@mysql.com +2 -2
    Removed some old types

  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp@1.32.1.3, 2007-05-10 12:59:33+03:00, monty@mysql.com +8 -28
    Removed some old types
    Removed old disabled code

  storage/ndb/src/mgmsrv/main.cpp@1.55, 2007-05-10 12:59:33+03:00, monty@mysql.com +7 -7
    Removed some old types

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.58, 2007-05-10 12:59:33+03:00, monty@mysql.com +4 -3
    Removed some old types

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.32, 2007-05-10 12:59:33+03:00, monty@mysql.com +0 -1
    Removed not used variable

  storage/ndb/src/ndbapi/NdbOperationInt.cpp@1.21, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Added required casts

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.117, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Added required casts

  storage/ndb/tools/delete_all.cpp@1.27, 2007-05-10 12:59:33+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/ndb/tools/desc.cpp@1.33, 2007-05-10 12:59:33+03:00, monty@mysql.com +4 -4
    Removed some old types

  storage/ndb/tools/drop_index.cpp@1.23, 2007-05-10 12:59:33+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/ndb/tools/drop_tab.cpp@1.22, 2007-05-10 12:59:34+03:00, monty@mysql.com +1 -1
    Removed some old types

  storage/ndb/tools/listTables.cpp@1.34, 2007-05-10 12:59:34+03:00, monty@mysql.com +6 -6
    Removed some old types

  storage/ndb/tools/ndb_config.cpp@1.23, 2007-05-10 12:59:34+03:00, monty@mysql.com +11 -11
    Removed some old types

  storage/ndb/tools/restore/consumer_restore.cpp@1.46.1.1, 2007-05-10 12:59:34+03:00, monty@mysql.com +6 -5
    Changed some buffers to be uchar* to avoid casts with new defintion of packfrm()

  storage/ndb/tools/restore/restore_main.cpp@1.55.1.1, 2007-05-10 12:59:34+03:00, monty@mysql.com +27 -27
    Removed some old types

  storage/ndb/tools/select_all.cpp@1.31, 2007-05-10 12:59:34+03:00, monty@mysql.com +13 -13
    Removed some old types

  storage/ndb/tools/select_count.cpp@1.26, 2007-05-10 12:59:34+03:00, monty@mysql.com +3 -3
    Removed some old types

  storage/ndb/tools/waiter.cpp@1.30, 2007-05-10 12:59:34+03:00, monty@mysql.com +4 -4
    Removed some old types

  strings/bchange.c@1.8, 2007-05-10 12:59:34+03:00, monty@mysql.com +3 -3
    Changed function to use uchar * and size_t

  strings/bcmp.c@1.10, 2007-05-10 12:59:34+03:00, monty@mysql.com +4 -2
    Changed function to use uchar * and size_t

  strings/bmove512.c@1.9, 2007-05-10 12:59:34+03:00, monty@mysql.com +1 -1
    Changed function to use uchar * and size_t

  strings/bmove_upp.c@1.7, 2007-05-10 12:59:34+03:00, monty@mysql.com +2 -1
    Changed function to use uchar * and size_t

  strings/ctype-big5.c@1.92, 2007-05-10 12:59:34+03:00, monty@mysql.com +28 -27
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-bin.c@1.76, 2007-05-10 12:59:34+03:00, monty@mysql.com +88 -87
    Changed functions to use size_t

  strings/ctype-cp932.c@1.17, 2007-05-10 12:59:34+03:00, monty@mysql.com +27 -24
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-czech.c@1.65, 2007-05-10 12:59:34+03:00, monty@mysql.com +18 -18
    Fixed indentation
    Changed functions to use size_t

  strings/ctype-euc_kr.c@1.72, 2007-05-10 12:59:34+03:00, monty@mysql.com +7 -6
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-eucjpms.c@1.18, 2007-05-10 12:59:34+03:00, monty@mysql.com +14 -13
    Changed functions to use size_t
    Changed character length functions to return uint
    unsigned char -> uchar

  strings/ctype-gb2312.c@1.69, 2007-05-10 12:59:34+03:00, monty@mysql.com +5 -5
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-gbk.c@1.83, 2007-05-10 12:59:34+03:00, monty@mysql.com +24 -23
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-latin1.c@1.53, 2007-05-10 12:59:34+03:00, monty@mysql.com +19 -19
    Changed functions to use size_t
    Changed character length functions to return uint
    unsigned char -> uchar

  strings/ctype-mb.c@1.57, 2007-05-10 12:59:34+03:00, monty@mysql.com +48 -44
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-simple.c@1.86, 2007-05-10 12:59:34+03:00, monty@mysql.com +109 -99
    Changed functions to use size_t
    Simpler loops for caseup/casedown
    unsigned int -> uint
    unsigned char -> uchar

  strings/ctype-sjis.c@1.94, 2007-05-10 12:59:34+03:00, monty@mysql.com +27 -26
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-tis620.c@1.96, 2007-05-10 12:59:34+03:00, monty@mysql.com +21 -21
    Changed functions to use size_t
    Changed character length functions to return uint
    unsigned char -> uchar

  strings/ctype-uca.c@1.46, 2007-05-10 12:59:34+03:00, monty@mysql.com +47 -46
    Changed functions to use size_t
    unsigned char -> uchar

  strings/ctype-ucs2.c@1.69, 2007-05-10 12:59:34+03:00, monty@mysql.com +87 -86
    Moved inclusion of stdarg.h to other includes
    usigned char -> uchar
    Changed functions to use size_t
    Changed character length functions to return uint

  strings/ctype-ujis.c@1.75, 2007-05-10 12:59:34+03:00, monty@mysql.com +18 -16
    Changed functions to use size_t
    Changed character length functions to return uint
    unsigned char -> uchar

  strings/ctype-utf8.c@1.115, 2007-05-10 12:59:34+03:00, monty@mysql.com +41 -36
    Changed functions to use size_t
    unsigned char -> uchar
    Indentation fixes

  strings/ctype-win1250ch.c@1.59, 2007-05-10 12:59:34+03:00, monty@mysql.com +17 -17
    Indentation fixes
    Changed functions to use size_t

  strings/ctype.c@1.66, 2007-05-10 12:59:34+03:00, monty@mysql.com +9 -8
    Changed functions to use size_t

  strings/decimal.c@1.83, 2007-05-10 12:59:34+03:00, monty@mysql.com +8 -8
    Changed type for memory argument to uchar *

  strings/do_ctype.c@1.8, 2007-05-10 12:59:34+03:00, monty@mysql.com +8 -8
    Indentation fixes

  strings/my_strtoll10.c@1.15, 2007-05-10 12:59:34+03:00, monty@mysql.com +1 -1
    unsigned char -> uchar

  strings/my_vsnprintf.c@1.39, 2007-05-10 12:59:34+03:00, monty@mysql.com +14 -11
    Changed functions to use size_t

  strings/r_strinstr.c@1.9, 2007-05-10 12:59:35+03:00, monty@mysql.com +6 -6
    Removed some old types
    Changed functions to use size_t

  strings/str_test.c@1.11, 2007-05-10 12:59:35+03:00, monty@mysql.com +3 -3
    Removed some old types

  strings/strappend.c@1.7, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Changed functions to use size_t

  strings/strcont.c@1.7, 2007-05-10 12:59:35+03:00, monty@mysql.com +2 -2
    Removed some old types

  strings/strfill.c@1.7, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Removed some old types

  strings/strinstr.c@1.8, 2007-05-10 12:59:35+03:00, monty@mysql.com +5 -5
    Changed functions to use size_t

  strings/strlen.c@1.5, 2007-05-10 12:59:35+03:00, monty@mysql.com +4 -4
    Changed functions to use size_t

  strings/strmake.c@1.9, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Changed functions to use size_t

  strings/strnlen.c@1.9, 2007-05-10 12:59:35+03:00, monty@mysql.com +2 -2
    Changed functions to use size_t

  strings/strnmov.c@1.7, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Changed functions to use size_t

  strings/strto.c@1.20, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    unsigned char -> uchar

  strings/strtod.c@1.25.1.1, 2007-05-10 12:59:35+03:00, monty@mysql.com +4 -3
    Changed functions to use size_t

  strings/strxnmov.c@1.9, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Changed functions to use size_t

  strings/xml.c@1.15, 2007-05-10 12:59:35+03:00, monty@mysql.com +28 -27
    Changed functions to use size_t
    Indentation fixes

  tests/mysql_client_test.c@1.237, 2007-05-10 12:59:35+03:00, monty@mysql.com +18 -18
    Removed some old types

  tests/thread_test.c@1.18, 2007-05-10 12:59:35+03:00, monty@mysql.com +14 -14
    Removed some old types

  vio/test-ssl.c@1.12, 2007-05-10 12:59:35+03:00, monty@mysql.com +13 -13
    Removed some old types

  vio/test-sslclient.c@1.11, 2007-05-10 12:59:35+03:00, monty@mysql.com +3 -3
    Removed some old types

  vio/test-sslserver.c@1.13, 2007-05-10 12:59:35+03:00, monty@mysql.com +4 -4
    Removed some old types

  vio/vio.c@1.34, 2007-05-10 12:59:35+03:00, monty@mysql.com +2 -2
    Removed some old types

  vio/vio_priv.h@1.9, 2007-05-10 12:59:35+03:00, monty@mysql.com +2 -2
    Removed some old types
    Changed vio_read()/vio_write() to work with size_t

  vio/viosocket.c@1.50, 2007-05-10 12:59:35+03:00, monty@mysql.com +49 -46
    Changed vio_read()/vio_write() to work with size_t
    Indentation fixes

  vio/viossl.c@1.47, 2007-05-10 12:59:35+03:00, monty@mysql.com +13 -13
    Changed vio_read()/vio_write() to work with size_t
    Indentation fixes

  vio/viosslfactories.c@1.41, 2007-05-10 12:59:35+03:00, monty@mysql.com +1 -1
    Removed some old types

  vio/viotest-ssl.c@1.10, 2007-05-10 12:59:35+03:00, monty@mysql.com +13 -13
    Removed some old types

  win/README@1.11, 2007-05-10 12:59:35+03:00, monty@mysql.com +11 -7
    More explanations

ChangeSet@1.2475.38.2, 2007-05-09 17:09:06+02:00, mskold@mysql.com +3 -0
  Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc:
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment

  sql/ha_ndbcluster.cc@1.443.4.3, 2007-05-09 17:06:05+02:00, mskold@mysql.com +3 -2
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment

  storage/ndb/include/ndbapi/Ndb.hpp@1.65, 2007-05-09 17:06:06+02:00, mskold@mysql.com +7 -4
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment

  storage/ndb/src/ndbapi/Ndb.cpp@1.94, 2007-05-09 17:06:06+02:00, mskold@mysql.com +70 -24
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment

ChangeSet@1.1810.2925.1, 2007-05-09 14:14:27+02:00, mskold@mysql.com +7 -0
  Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  mysql-test/r/ndb_insert.result@1.8.1.4, 2007-05-09 14:14:12+02:00, mskold@mysql.com +169 -0
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  mysql-test/t/ndb_insert.test@1.12.1.2, 2007-05-09 14:14:12+02:00, mskold@mysql.com +137 -0
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  sql/ha_ndbcluster.cc@1.175.1.137, 2007-05-09 14:14:12+02:00, mskold@mysql.com +11 -7
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  sql/handler.cc@1.167.33.1, 2007-05-09 14:14:12+02:00, mskold@mysql.com +4 -2
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  sql/handler.h@1.138.2.46, 2007-05-09 14:14:12+02:00, mskold@mysql.com +2 -1
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  ndb/include/ndbapi/Ndb.hpp@1.39.13.1, 2007-05-09 14:14:12+02:00, mskold@mysql.com +6 -3
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

  ndb/src/ndbapi/Ndb.cpp@1.49.27.1, 2007-05-09 14:14:12+02:00, mskold@mysql.com +73 -24
    Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb

ChangeSet@1.1810.2871.37, 2007-05-08 18:19:36-04:00, cmiller@zippy.cornsilk.net +1 -0
  Bug #23294: Detection of sem_xxx functions on NetBSD broken and \
  	DragonflyBSD misc patches
  
  The bug reporter anticipated a problem, instead of experiencing one.
  
  IRC conversation:
  <xtraeme> sem_init is defined in librt on NetBSD
  	solaris uses libposix4 iirc
  	that's why I sent a patch
  <chadmiller> xtraeme: Agreed.  But, AFAICT, mysql doesn't use 
  	sem_init() anywhere.  Thus my confusion.
  <xtraeme> I didn't verify that, but I saw that sem_init wasn't detected 
  	correctly...
  	why are you checking for sem_init if it's unused then? :-)
  <chadmiller> xtraeme: In recent autoconf scripts, we change it to test 
  	for sched_yield() .
  <xtraeme> that's ok then
  	sched_yield is in libc
  	feel free to close the bug report then :-)

  configure.in@1.245.1.199, 2007-05-08 18:19:34-04:00, cmiller@zippy.cornsilk.net +0 -3
    Remove useless test for sem_init() .

ChangeSet@1.2469.226.1, 2007-05-08 10:17:00-04:00, cbell@mysql_cab. +3 -0
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
  
  This patch corrects a bug involving a LOAD DATA INFILE operation on a 
  transactional table. It corrects a problem in the error handler by moving
  the transactional table check and autocommit_or_rollback operation to the 
  end of the error handler. 
  
  The problem was an assert was thrown after the operation completed. The 
  assert found a non-sunk event in the transaction cache. The events in the 
  transaction cache were added after commit_or_rollack and thereafter nothing 
  removed them.
  
  An additional test case was added to detect this
  condition.

  mysql-test/extra/rpl_tests/rpl_loaddata.test@1.7, 2007-05-08 10:16:55-04:00, cbell@mysql_cab. +12 -0
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
        
    This patch adds an additional test to rpl_loaddata for handling the
    duplicate key error on LOAD DATA INFILE.

  mysql-test/r/rpl_loaddata.result@1.42, 2007-05-08 10:16:55-04:00, cbell@mysql_cab. +4 -0
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
        
    This patch adds the results for the additional test for properly handling the
    duplicate key error on LOAD DATA INFILE.

  sql/sql_load.cc@1.124, 2007-05-08 10:16:56-04:00, cbell@mysql_cab. +3 -3
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
    
    This patch moves the check for a transactional table and rollback in the
    error handler for mysql_load(). The patch moves the transactional table
    check to the end of the error handler matching the implementation for other
    similar operations (see sql_insert).

ChangeSet@1.1810.2919.2, 2007-05-08 17:04:56+05:00, bar@mysql.com +1 -0
  Fixing crash when compiled using -DNEW_HASH_FUNCTIONS
  (an experimental feature).

  heap/hp_hash.c@1.38.10.1, 2007-05-08 17:04:54+05:00, bar@mysql.com +17 -8
    Fixing crash when compiled using -DNEW_HASH_FUNCTIONS
    (an experimental feature).

ChangeSet@1.2469.225.1, 2007-05-08 13:32:29+05:00, bar@mysql.com +3 -0
  Bug#26518 XPath and variables problem
  Problem: XPath variables didn't work.
  Fix: adding variables support,
  both user-defined and sp local variables are now supported by XPath.

  mysql-test/r/xml.result@1.21.1.1, 2007-05-08 13:32:28+05:00, bar@mysql.com +115 -0
    Adding test case

  mysql-test/t/xml.test@1.19.1.1, 2007-05-08 13:32:28+05:00, bar@mysql.com +72 -0
    Adding test case

  sql/item_xmlfunc.cc@1.26.1.1, 2007-05-08 13:32:28+05:00, bar@mysql.com +66 -9
    Adding variables support:
    - SP variables with standard XPath syntax:  $i
    - User variables with non-standard syntax:  $@i

ChangeSet@1.1810.2919.1, 2007-05-07 20:43:19-04:00, cbell@mysql_cab. +3 -0
  BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
  
  This patch corrects a bug involving a LOAD DATA INFILE operation on a 
  transactional table. It corrects a problem in the error handler moving
  the transactional table check and autocommit_or_rollback operation to the 
  end of the error handler. An additional test case was added to detect this
  condition.

  mysql-test/r/rpl_loaddata.result@1.28.1.5, 2007-05-07 20:43:15-04:00, cbell@mysql_cab. +4 -0
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
    
    This patch adds the results for the additional test for properly handling the
    duplicate key error on LOAD DATA INFILE.

  mysql-test/t/rpl_loaddata.test@1.21.1.4, 2007-05-07 20:43:15-04:00, cbell@mysql_cab. +12 -0
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
    
    This patch adds an additional test to rpl_loaddata for handling the
    duplicate key error on LOAD DATA INFILE.

  sql/sql_load.cc@1.78.1.35, 2007-05-07 20:43:16-04:00, cbell@mysql_cab. +3 -3
    BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
    
    This patch moves the check for a transactional table and rollback in the
    error handler for mysql_load(). The patch moves the transactional table
    check to the end of the error handler matching the implementation for other
    similar operations (see sql_insert).

ChangeSet@1.2475.19.4, 2007-05-04 19:06:36-06:00, tsmith@siva.hindu.god +1 -0
  Bug #4858: mysql_safe logs to syslog instead of stderr
  
  mysqld_safe.sh: Overhaul the logging design, to allow logging
  mysqld messages to syslog.  Add --syslog and --skip-syslog
  arguments for mysqld_safe.

  scripts/mysqld_safe.sh@1.88, 2007-05-04 19:06:29-06:00, tsmith@siva.hindu.god +153 -102
    Overhaul the logging design, to allow logging mysqld messages to syslog.
    
    Add two new options:  --syslog and --skip-syslog.  --syslog is the default,
    unless --log-error is also specified.
    
    If --log-error is specified (for mysqld_safe, mysqld, server, etc. - any
    group which mysqld_safe checks for arguments), then syslog is turned off.
    This is because mysqld will get the --log-error argument and log to a file
    anyways, which will be confusing to the user.  If the user requests both
    --syslog and --log-error, a warning is printed (to mysqld_safe's stderr and
    to syslog), and we then behave as if --skip-syslog had been specified.
    
    Also, logging messages have been normalized somewhat: mysqld_safe now always
    prefixes messages with '<TIMESTAMP> mysqld_safe '.  All messages go to the
    the console (stdout or stderr, depending on if it's a notice or an error) and
    to (the error log OR syslog).
    
    Also, a few cleanups while I'm here.

ChangeSet@1.2469.223.1, 2007-05-04 09:59:36-04:00, cbell@mysql_cab_desk. +1 -0
  BUG#18980 : Test 'rpl_row_blob_innodb' fails randomly
  
  Failure was not reproduced under testing with the latest clone.
  This patch re-enables the test.

  mysql-test/t/disabled.def@1.247.1.2, 2007-05-04 09:58:27-04:00, cbell@mysql_cab_desk. +1 -1
    BUG#18980 : Test 'rpl_row_blob_innodb' fails randomly
    
    This patch enables the test.

ChangeSet@1.2469.212.4, 2007-05-02 13:18:07+05:00, bar@mysql.com +3 -0
  Bug#27898 UPDATEXML Crashes the Server!
  Problem: when replacing the root element, UpdateXML
  erroneously tried to mix old XML content with the
  replacement string, which led to crash.
  Fix: don't use the old XML content in these cases,
  just return the replacement string.

  mysql-test/r/xml.result@1.22, 2007-05-02 13:18:03+05:00, bar@mysql.com +7 -0
    Adding test case

  mysql-test/t/xml.test@1.20, 2007-05-02 13:18:03+05:00, bar@mysql.com +7 -0
    Adding test case

  sql/item_xmlfunc.cc@1.27, 2007-05-02 13:18:03+05:00, bar@mysql.com +10 -0
    Adding special code to handle replacements of the root element -
    the replacing content is just copied to the result,
    the previous content of the XML value is removed.

ChangeSet@1.2469.218.1, 2007-04-27 01:12:09+03:00, monty@mysql.com +11 -0
  Added sql_mode PAD_CHAR_TO_FULL_LENGTH (WL#921)
  This pads the value of CHAR columns with spaces up to full column length (according to ANSI)
  It's not makde part of oracle or ansi mode yet, as this would cause a notable behaviour change.
  Added uuid_short(), a generator for increasing 'unique' longlong integers (8 bytes)   

  mysql-test/r/func_misc.result@1.32, 2007-04-27 01:12:06+03:00, monty@mysql.com +3 -0
    Update results

  mysql-test/r/sql_mode.result@1.40, 2007-04-27 01:12:06+03:00, monty@mysql.com +17 -2
    Update results

  mysql-test/t/func_misc.test@1.22, 2007-04-27 01:12:06+03:00, monty@mysql.com +4 -0
    Added test for uuid_short()

  mysql-test/t/sql_mode.test@1.20, 2007-04-27 01:12:06+03:00, monty@mysql.com +12 -1
    Added test for sql_mode=PAD_CHAR_TO_FULL_LENGTH (#WL921)

  sql/field.cc@1.386, 2007-04-27 01:12:06+03:00, monty@mysql.com +6 -1
    Added sql_mode PAD_CHAR_TO_FULL_LENGTH

  sql/item.cc@1.263.1.2, 2007-04-27 01:12:06+03:00, monty@mysql.com +1 -0
    Initialize uuid_short()

  sql/item_create.cc@1.76.1.1, 2007-04-27 01:12:06+03:00, monty@mysql.com +24 -0
    Added creation of uuid_short()

  sql/item_func.cc@1.377.4.1, 2007-04-27 01:12:06+03:00, monty@mysql.com +37 -0
    Added uuid_short()

  sql/item_func.h@1.166, 2007-04-27 01:12:06+03:00, monty@mysql.com +15 -0
    Added uuid_short()

  sql/mysql_priv.h@1.497.2.1, 2007-04-27 01:12:06+03:00, monty@mysql.com +2 -0
    Added sql_mode PAD_CHAR_TO_FULL_LENGTH

  sql/mysqld.cc@1.631.3.1, 2007-04-27 01:12:06+03:00, monty@mysql.com +5 -1
    Added sql_mode PAD_CHAR_TO_FULL_LENGTH

ChangeSet@1.2469.212.3, 2007-04-26 17:49:50+02:00, mleich@four.local.lan +1 -0
  Minor improvement to save some testing runtime (~ 2 minutes).
  Reason:
     This test executes DML statements on a NDB table to detect if some SQL statements of special interest commits the ongoing transaction.
     When running in MIXED mode, automatic switching from statement-based to row-based replication takes place when a DML statement
     updates an NDB table.
     That means running this test on NDB with binlog-format=mixed and binlog-format=row mostly checks the same routines twice.
     Therefore we skip the variant with binlog-format=mixed.

  mysql-test/t/rpl_ndb_ddl.test@1.5, 2007-04-26 17:30:01+02:00, mleich@four.local.lan +1 -1
    Prevent the execution of this test if replication format is statement or mixed.

ChangeSet@1.2469.212.2, 2007-04-25 11:23:41+02:00, mleich@four.local.lan +1 -0
  The combination NDB and statement based replication is extreme slow and this fails usually because of testing timeout.

  mysql-test/t/rpl_ndb_ddl.test@1.4, 2007-04-25 11:23:38+02:00, mleich@four.local.lan +1 -0
    Avoid execution of this test with statement based replication because it is far way too slow.

ChangeSet@1.2469.212.1, 2007-04-24 19:05:19+02:00, mleich@four.local.lan +1 -0
  The fix for   Bug#18946: Test case rpl_ndb_ddl disabled   pushed around end of March 2007 enabled this testcase.
  It was later disabled because the test failed with timeout on one testing box.
  The reason for this failing test could not be found because we do not have informations about the conditions on the box during this test.
  Jeb and I tried this test on other boxes and it passed.
  My experience is that
  - tests using NDB need in general often significant more runtime
    than comparable tests of other storage engines
  - the actual load of the box where the test is running and the
    filesystem (nfs could be extreme slow) where the tests are
    executed might have a huge impact on the test performance 
    (runtime * 2 till 3)
  - there are sometimes problems with the ports most probably
    caused by OS properties (NDB+RPL need many ports) or
    parallel tests accidently running with the same ports.
  AFAIK these are the reasons why the NDB tests fail sometimes with timeout.
  Conclusion: We enable rpl_ndb_ddl again because the failure happens in rare cases
  and seems not to be caused by errors within the server or test code. 

  mysql-test/t/disabled.def@1.247.1.1, 2007-04-24 19:05:17+02:00, mleich@four.local.lan +0 -1
    Enable t/rpl_ndb_ddl.test again

