ChangeSet@1.2651.1.1, 2008-01-29 21:32:43+01:00, joerg@trift2. +1 -0
  Ensure that man pages for "embedded" are included in the source.tar.gz
  This fixes bug#34145.

  BUILD/compile-dist@1.20, 2008-01-29 21:32:38+01:00, joerg@trift2. +2 -0
    If the call to "configure" does not specify the "embedded" server,
    all man pages for "embedded" will be deleted:
    Re-add "--with-embedded-server".
    
    This fixes bug#34145.

ChangeSet@1.2648.1.5, 2008-01-15 17:01:58+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#33375 all_set corrupted on table object
   - make sure to reset the read and write sets
  
  
  handler.cc, log_event.cc:
    - make sure to reset the read and write sets
  TAG: clone-5.1.23-build

  sql/handler.cc@1.331, 2008-01-15 17:00:59+01:00, msvensson@pilot.mysql.com +2 -0
    - make sure to reset the read and write sets

  sql/log_event.cc@1.313, 2008-01-15 17:01:06+01:00, msvensson@pilot.mysql.com +13 -7
    - make sure to reset the read and write sets

ChangeSet@1.2648.1.4, 2008-01-15 15:01:21+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#30366 NDB fails to start on OS X, PPC, 64 bit
     - The errno variable should only be used when the previous socket
       write failed, it should be regarded as undefined at other times
  
  OutputStream.cpp:
    Only use "errno" after the attempt to write to the socket has failed

  storage/ndb/src/common/util/OutputStream.cpp@1.11, 2008-01-15 14:59:29+01:00, msvensson@pilot.mysql.com +2 -2
    Only use "errno" after the attempt to write to the socket has failed

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

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

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

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

ChangeSet@1.1810.3546.4, 2008-01-10 18:54:34+03:00, evgen@moonbone.local +1 -0
  filesort.cc:
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.
    Free smaller buffer before allocating bigger one.

  sql/filesort.cc@1.105.1.21, 2008-01-10 18:52:24+03:00, evgen@moonbone.local +6 -2
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.
    Free smaller buffer before allocating bigger one.

ChangeSet@1.2635.5.22, 2008-01-10 15:07:55+03:00, kaa@kaamos.(none) +1 -0
  Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

  sql/filesort.cc@1.138, 2008-01-10 15:07:54+03:00, kaa@kaamos.(none) +6 -6
    Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.

ChangeSet@1.2635.5.19, 2008-01-09 18:00:12+02:00, gkodinov@macbook.gmz +1 -0
  merge of the fix for bug 33133 to 5.1-opt

  mysql-test/r/func_group.result@1.70, 2008-01-09 18:00:08+02:00, gkodinov@macbook.gmz +2 -2
    merge of the fix for bug 33133 to 5.1-opt

ChangeSet@1.1810.3547.1, 2008-01-09 16:49:13+02:00, gkodinov@macbook.gmz +3 -0
  Bug #33133: Views are not transparent
  
  When resolving references we need to take into consideration
  the view "fields" and allow qualified access to them.
  Fixed by extending the reference resolution to process view
  fields correctly.

  mysql-test/r/func_group.result@1.49.1.16, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +12 -0
    Bug #33133: test case

  mysql-test/t/func_group.test@1.48.1.12, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +15 -0
    Bug #33133: test case

  sql/sql_base.cc@1.235.117.1, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +30 -1
    Bug #33133: allow qualified alias refs to view fields

ChangeSet@1.1810.3546.2, 2008-01-09 00:40:41+03:00, evgen@moonbone.local +3 -0
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  
  The filesort implementation has an optimization for subquery execution which
  consists of reusing previously allocated buffers. In particular the call to
  the read_buffpek_from_file function might be skipped when a big enough buffer
  for buffer descriptors (buffpeks) is already allocated. Beside allocating
  memory for buffpeks this function fills allocated buffer with data read from
  disk. Skipping it might led to using an arbitrary memory as fields' data and
  finally to a crash.
  
  Now the read_buffpek_from_file function is always called. It allocates
  new buffer only when necessary, but always fill it with correct data.

  mysql-test/r/subselect.result@1.134.1.69, 2008-01-09 00:39:19+03:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#33675: Usage of an uninitialized memory by
    filesort in a subquery caused server crash.

  mysql-test/t/subselect.test@1.129.1.32, 2008-01-09 00:39:53+03:00, evgen@moonbone.local +22 -0
    Added a test case for the bug#33675: Usage of an uninitialized memory by
    filesort in a subquery caused server crash.

  sql/filesort.cc@1.105.1.20, 2008-01-09 00:39:02+03:00, evgen@moonbone.local +13 -9
    Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
    server crash.Now the read_buffpek_from_file function is always called. It allocates
    new buffer only when necessary, but always fill it with correct data.

ChangeSet@1.2635.5.17, 2008-01-08 12:27:15+02:00, gkodinov@macbook.gmz +1 -0
  merge of bug 33256 5.0-opt -> 5.1-opt

  sql/field.h@1.255, 2008-01-08 12:27:12+02:00, gkodinov@macbook.gmz +3 -3
    merge of bug 33256 5.0-opt -> 5.1-opt

ChangeSet@1.2650, 2007-12-28 16:10:17+01:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh
      After-merge fix for bug#33536: The target to copy to is now called "$DEST".

  scripts/make_binary_distribution.sh@1.162.1.2, 2007-12-28 16:10:09+01:00, joerg@trift2. +1 -1
    After-merge fix for bug#33536: The target to copy to is now called "$DEST".

ChangeSet@1.1616.3130.1, 2007-12-27 19:51:06+01:00, joerg@trift2. +1 -0
  scripts/make_binary_distribution.sh:
  
  Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
  to provide this information does not cause any problems.
  
  This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

  scripts/make_binary_distribution.sh@1.55.8.10, 2007-12-27 19:51:03+01:00, joerg@trift2. +6 -4
    The (old) code to get the "libgcc" file name does not really work when using Intel's ICC.
    ICC accepts the "--print-libgcc-file" option but ignores it, does not produce any output.
    
    However, ICC tricks automake into taking it for a GCC ("GXX" variable is set, see
    http://www.gnu.org/software/autoconf/manual/html_node/C_002b_002b-Compiler.html#C_002b_002b-Compiler
    and its discussion of the "AC_PROG_CXX" macro).
    
    There are two possible approaches:
    a) Check "$CC" or "$CXX" to tell ICC from GCC, and do not ask ICC for the "libgcc" file name.
    b) Just ask it, but protect that code so that its failure does not cause any damage.
    
    This patch takes the second route:
    1) Put the call "@CC@ ... --print-libgcc-file" into a pipeline, followed by "|| true",
       so that (for the shell semantics) the command cannot fail.
       (ICC will exit non-zero because it is not given a source file.)
    2) Explicitly redirect any error messages.
    3) Do not use the compiler's return code but rather the (non)empty variable to check success.
    4) Ensure that the contents really is a file before taking it as a file name.
    
    Item 1) is especially important when the tool gets a "set -e" (this happens in 5.1, currently)
    which would make the failing compiler call a fatal thing.
    
    This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

ChangeSet@1.1810.3541.11, 2007-12-24 17:42:13+03:00, kaa@polly.(none) +5 -0
  Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading
                      to be compiled in
  
  The problem was that on a statically built server an attempt to create
  a UDF resulted in a different, but reasonable error ("Can't open shared
  library" instead of "UDFs are unavailable with the --skip-grant-tables
  option"), which caused a failure for the test case for bug #32020.
  
  Fixed by moving the test case for bug #32020 from skip_grants.test to a
  separate test to ensure that it is only run when the server is built
  with support for dynamically loaded libraries.

  mysql-test/r/skip_grants.result@1.10.1.2, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -4
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +5 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/r/udf_skip_grants.result@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/skip_grants.test@1.6.1.8, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -10
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +1 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants-master.opt@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/udf_skip_grants.test@1.1, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +28 -0
    Moved the test case for bug #32020 to a separate test.

  mysql-test/t/udf_skip_grants.test@1.0, 2007-12-24 17:42:07+03:00, kaa@polly.(none) +0 -0

ChangeSet@1.1810.3544.2, 2007-12-21 12:44:24+02:00, gkodinov@macbook.gmz +6 -0
  Bug #33256: CREATE ... SELECT creates obsolete table 
   w/ Field_date instead of Field_newdate
    
  Field_date was still used in temp table creation.
  Fixed by using Field_newdate consistently throughout the server
  except when reading tables defined with older MySQL version.
  No test suite is possible because both Field_date and Field_newdate
  return the same values in all the metadata calls. 

  mysql-test/r/type_decimal.result@1.38.1.11, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +0 -4
    Bug #33256: removed redundant warnings

  sql/field.h@1.153.36.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +4 -0
    Bug #33256: Add a constructor similar to Field_date::Field_date()

  sql/item.cc@1.113.1.183, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_sum.cc@1.170.1.48, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_timefunc.cc@1.100.39.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +1 -1
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

  sql/item_timefunc.h@1.63.9.1, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +3 -3
    Bug #33256: Use Field_newdate instead of Field_date 
    for all temp tables and CREATE .. SELECT

ChangeSet@1.1810.3545.1, 2007-12-20 21:37:21+01:00, df@pippilotta.erinye.com +1 -0
  BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump

  client/mysql.cc@1.199.34.1, 2007-12-20 21:37:19+01:00, df@pippilotta.erinye.com +1 -3
    BUG#33057, avoid calling strlen() *for every single character* in the client's input

ChangeSet@1.2573.25.2, 2007-12-20 12:23:35-08:00, brian@zim.(none) +2 -0
  client_priv.h:
    Removed dead option
  mysqlslap.c:
    Updates from Paul for help.
    Removed dead option

  client/client_priv.h@1.74.3.1, 2007-12-20 12:18:49-08:00, brian@zim.(none) +0 -1
    Removed dead option

  client/mysqlslap.c@1.62.1.2, 2007-12-20 12:18:18-08:00, brian@zim.(none) +24 -25
    Updates from Paul for help.
    Removed dead option

ChangeSet@1.1810.3528.2, 2007-12-20 10:58:21+01:00, mhansson@linux-st28.site +1 -0
  Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 
  
  Warnings elimination

  sql/sql_select.cc@1.312.182.2, 2007-12-20 10:58:19+01:00, mhansson@linux-st28.site +1 -1
    Bug#32848: Warnings elimination

ChangeSet@1.2604.63.3, 2007-12-20 08:15:34+01:00, tnurnberg@mysql.com +1 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  post-merge fixes

  mysql-test/r/type_date.result@1.29.1.2, 2007-12-20 08:15:32+01:00, tnurnberg@mysql.com +5 -0
    post-merge fixes: test results

ChangeSet@1.1810.3543.3, 2007-12-17 18:56:39+02:00, gkodinov@magare.gmz +2 -0
  Bug #19390: Test 'rpl_trigger' fails, might be random
  
  The checks in the test for bug #12480 were too wide and
  made the test to depend on the procedures and triggers
  present in the server.
  Corrected the test to check only for the procedure and 
  trigger it creates.

  mysql-test/r/rpl_trigger.result@1.4.1.8, 2007-12-17 18:56:38+02:00, gkodinov@magare.gmz +8 -4
    Bug #19390: corrected the test to check for its procedure only

  mysql-test/t/rpl_trigger.test@1.4.1.7, 2007-12-17 18:56:38+02:00, gkodinov@magare.gmz +8 -4
    Bug #19390: corrected the test to check for its procedure only

ChangeSet@1.1616.3124.3, 2007-12-17 12:09:21+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  fix test program

  client/mysqltest.c@1.92.21.69, 2007-12-17 12:09:21+01:00, tnurnberg@mysql.com +2 -2
    fix buffer off-by-ones in test program

ChangeSet@1.2635.8.2, 2007-12-17 10:43:19+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  build fixes

  strings/strmake.c@1.11, 2007-12-17 10:43:18+01:00, tnurnberg@mysql.com +1 -1
    build fix

ChangeSet@1.1616.3129.1, 2007-12-17 06:13:26+01:00, tnurnberg@mysql.com +1 -0
  Bug#32350: mysqldump should show more version information in output
  
  show version of mysqldump, release of server et al., and version of
  current server in mysqldumps.

  client/mysqldump.c@1.143.16.1, 2007-12-17 06:13:25+01:00, tnurnberg@mysql.com +3 -1
    show version of mysqldump, release of server et al., and version of
    current server in mysqldumps.

ChangeSet@1.2635.1.11, 2007-12-15 22:24:01+03:00, kostja@bodhi.(none) +1 -0
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests on sapsrv1.

  sql/ha_ndbcluster_binlog.cc@1.140, 2007-12-15 22:23:55+03:00, kostja@bodhi.(none) +6 -3
    Try to fix assertion failures at slave shutdown when running
    rpl_ndb tests. If the binlog thread is killed, which happens during
    shutdown, open_tables returns error without setting an error
    in THD. Therefore one can't access thd->main_da.message() if thd->killed.

ChangeSet@1.2635.4.8, 2007-12-14 17:46:24-07:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  WL#4165 (Prepared statements: validation)
  
  Adding the tests cases alone for WL#4165, disabled

  mysql-test/r/ps_ddl.result@1.1, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +2329 -0
    WL#4165 (Prepared statements: validation)

  mysql-test/r/ps_ddl.result@1.0, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +0 -0

  mysql-test/t/disabled.def@1.288, 2007-12-14 17:46:21-07:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    WL#4165 (Prepared statements: validation)

  mysql-test/t/ps_ddl.test@1.1, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +1851 -0
    WL#4165 (Prepared statements: validation)

  mysql-test/t/ps_ddl.test@1.0, 2007-12-14 17:46:22-07:00, malff@lambda.hsd1.co.comcast.net. +0 -0

ChangeSet@1.1810.3540.1, 2007-12-14 13:42:46-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #27848.
  In a union without braces, the order by at the end is applied to the 
  overall union. It therefore should not interfere with the individual
  select parts of the union.
  
  Fixed by changing our parser rules appropriately.

  mysql-test/r/union.result@1.80.6.1, 2007-12-14 13:42:41-08:00, igor@olga.mysql.com +51 -0
    Added a test case for bug #27848.

  mysql-test/t/union.test@1.97.3.1, 2007-12-14 13:42:41-08:00, igor@olga.mysql.com +44 -0
    Added a test case for bug #27848.

  sql/sql_yacc.yy@1.371.1.172, 2007-12-14 13:42:42-08:00, igor@olga.mysql.com +10 -1
    Fixed bug #27848.
    In a union without braces, the order by at the end is applied to the 
    overall union. It therefore should not interfere with the individual
    select parts of the union.
    
    Fixed by changing our parser rules appropriately.

ChangeSet@1.2642, 2007-12-14 15:49:51-05:00, iggy@amd64.(none) +1 -0
  Bug#26811 Symbolic links don't work in Windows Vista
  - Enable check for symbolic link files.

  sql/sql_table.cc@1.454.2.1, 2007-12-14 15:49:49-05:00, iggy@amd64.(none) +6 -1
    Bug#26811 Symbolic links don't work in Windows Vista
    - On systems that support symbolic link files, make sure to check for them.

ChangeSet@1.1810.3539.2, 2007-12-14 21:38:58+01:00, kent@mysql.com +1 -0
  sp_head.cc:
    Corrected typo

  sql/sp_head.cc@1.200.7.34, 2007-12-14 21:03:30+01:00, kent@mysql.com +1 -1
    Corrected typo

ChangeSet@1.1810.3539.1, 2007-12-14 18:23:11+01:00, kent@mysql.com +3 -0
  sp_head.cc:
    Made sp_head::operator delete() match prototype, added throw()
  mysql_test_run.c, mysqld_safe.c:
    Include "mysql_version.h" to get MYSQL_PORT defined

  netware/mysql_test_run.c@1.18.2.3, 2007-12-14 18:22:06+01:00, kent@mysql.com +1 -0
    Include "mysql_version.h" to get MYSQL_PORT defined

  netware/mysqld_safe.c@1.12, 2007-12-14 18:22:44+01:00, kent@mysql.com +1 -0
    Include "mysql_version.h" to get MYSQL_PORT defined

  sql/sp_head.cc@1.200.7.33, 2007-12-14 18:21:18+01:00, kent@mysql.com +1 -1
    Made sp_head::operator delete() match prototype, added throw()

ChangeSet@1.1810.3534.6, 2007-12-14 16:58:12+01:00, kent@mysql.com +1 -0
  Raise version number after cloning 5.0.54

  configure.in@1.245.1.221, 2007-12-14 16:58:00+01:00, kent@mysql.com +2 -2
    Raise version number after cloning 5.0.54

ChangeSet@1.1810.3514.7, 2007-12-14 15:43:54+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -0
  post-commit:
    Rationalise setting $FROM.

  BitKeeper/triggers/post-commit@1.26.1.20, 2007-12-14 15:42:40+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -2
    Rationalise setting $FROM.

ChangeSet@1.2573.106.2, 2007-12-14 13:35:52+01:00, mhansson@linux-st28.site +1 -0
  Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by 
  a column with null values
  
  Post-merge fix

  sql/item_sum.cc@1.231.1.2, 2007-12-14 13:35:49+01:00, mhansson@linux-st28.site +1 -1
    Bug#32798:Post-merge fix

ChangeSet@1.1810.3538.1, 2007-12-14 12:24:20+01:00, mhansson@linux-st28.site +4 -0
  Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by a column 
  with null values
  
  For queries containing GROUP_CONCAT(DISTINCT fields ORDER BY fields), there 
  was a limitation that the DISTINCT fields had to be the same as ORDER BY 
  fields, owing to the fact that one single sorted tree was used for keeping 
  track of tuples, ordering and uniqueness. Fixed by introducing a second 
  structure to handle uniqueness so that the original structure has only to 
  order the result.

  mysql-test/r/func_gconcat.result@1.52.5.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +62 -1
    Bug#32798:
    - Wrong test result turned correct after fix.
    - Correct test result

  mysql-test/t/func_gconcat.test@1.44.6.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +43 -0
    Bug#32798: Test case

  sql/item_sum.cc@1.170.29.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +80 -72
    Bug#32798: Implementation of fix. Dead code removal.
    
    - removed comment describing this bug
    - replaced body of function group_concat_key_cmp_with_distinct
    - removed function group_concat_key_cmp_with_distinct_and_order
    - Added a Unique object to maintain uniqueness of values.

  sql/item_sum.h@1.102.1.12, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +18 -10
    Bug#32798: Declarations and comments.

ChangeSet@1.1810.3537.2, 2007-12-14 10:51:05+01:00, df@pippilotta.erinye.com +1 -0
  typo

  mysql-test/mysql-test-run.pl@1.30.49.113, 2007-12-14 10:51:04+01:00, df@pippilotta.erinye.com +1 -1
    typo

ChangeSet@1.1810.3537.1, 2007-12-14 10:47:01+01:00, df@pippilotta.erinye.com +1 -0
  BUG#31880 make test failure from public bk tree

  mysql-test/mysql-test-run.pl@1.30.49.112, 2007-12-14 10:46:59+01:00, df@pippilotta.erinye.com +4 -8
    BUG#31880 make test failure from public bk tree
    
    Instead of handling "MTR_BUILD_THREAD set" and "MTR_BUILD_THREAD not set" differently, use the same subroutine to set up the port numbers. The addition of a second master apparently broke the old static port numbers.

ChangeSet@1.2635.4.5, 2007-12-14 02:23:42+03:00, kostja@bodhi.(none) +2 -0
  Remove an unused argument of sql_update::do_updates().

  sql/sql_class.h@1.412, 2007-12-14 02:23:35+03:00, kostja@bodhi.(none) +1 -1
    Remove an unused argument.

  sql/sql_update.cc@1.264, 2007-12-14 02:23:35+03:00, kostja@bodhi.(none) +3 -4
    Remove an unused argument.

ChangeSet@1.2635.3.8, 2007-12-13 23:58:55+03:00, kostja@bodhi.(none) +6 -0
  Fix broken embedded build (broken by the patch for Bug#12713, first part).

  client/mysqltest.c@1.321.1.1, 2007-12-13 23:58:52+03:00, kostja@bodhi.(none) +0 -1
    Remove a call to my_message() (server call) in case of a client error.
    It asserts in the embedded build now, since is called after send_ok().

  libmysqld/emb_qcache.cc@1.11.1.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +1 -1
    Use net_send_eof (embedded implementation) in embedded query cache/
    send result to client, since send_eof currently does not
    send anything. 

  libmysqld/emb_qcache.h@1.5.1.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +1 -0
    Declare net_send_eof.

  libmysqld/lib_sql.cc@1.145, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +2 -0
    Fix the main loop of the embedded server to use the new Diagnostics_area
    API.

  sql/log.cc@1.303, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +39 -28
    Silence errors of open_performance_schema_table. This function
    is called for general logging, and it happens after the error
    has been sent to the client, and thus triggers an assert.

  storage/myisam/ha_myisam.cc@1.235.1.1, 2007-12-13 23:58:53+03:00, kostja@bodhi.(none) +0 -2
    Remove an old hack that broke repair.test in embedded build:
    unless we clear an error here, the server attempts to send OK after
    ERROR. This currently asserts.

ChangeSet@1.1810.3536.1, 2007-12-13 21:31:38+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
  - during commit deadlock timeout needs to be at least 5 times db hearbeat

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.28.1, 2007-12-13 21:31:36+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
    - during commit deadlock timeout needs to be at least 5 times db hearbeat

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.54.1, 2007-12-13 21:31:36+01:00, tomas@whalegate.ndb.mysql.com +13 -4
    Bug #33168 Incorrectly handled parameters can make the TC crash during node failure
    - during commit deadlock timeout needs to be at least 5 times db hearbeat

ChangeSet@1.1810.3534.5, 2007-12-13 23:46:29+04:00, gluh@mysql.com +1 -0
  additional fix
  TAG: clone-5.0.54-build

  sql/ha_blackhole.cc@1.21.8.1, 2007-12-13 23:46:28+04:00, gluh@mysql.com +1 -1
    additional fix

ChangeSet@1.2635.5.5, 2007-12-13 21:34:05+04:00, gluh@mysql.com +4 -0
  additional after merge fix

  mysql-test/r/partition_range.result@1.24, 2007-12-13 21:34:03+04:00, gluh@mysql.com +0 -20
    removed fix for bug#30573

  mysql-test/suite/parts/r/rpl_partition.result@1.5, 2007-12-13 21:34:03+04:00, gluh@mysql.com +1 -1
    updated result file

  mysql-test/t/partition_range.test@1.20, 2007-12-13 21:34:03+04:00, gluh@mysql.com +18 -18
    removed test case for bug#30573

  sql/ha_partition.cc@1.114, 2007-12-13 21:34:03+04:00, gluh@mysql.com +1 -1
    removed fix for bug#30573

ChangeSet@1.1810.3534.4, 2007-12-13 21:13:08+04:00, gluh@mysql.com +1 -0
  valgrind error fix

  sql/ha_blackhole.cc@1.21.7.1, 2007-12-13 21:13:06+04:00, gluh@mysql.com +9 -1
    valgrind error fix

ChangeSet@1.2635.5.4, 2007-12-13 18:26:27+04:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc@1.709.1.2, 2007-12-13 18:26:24+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.2635.5.3, 2007-12-13 16:43:38+04:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/range.result@1.65, 2007-12-13 16:43:36+04:00, gluh@mysql.com +14 -14
    after merge fix

  tests/mysql_client_test.c@1.260, 2007-12-13 16:43:36+04:00, gluh@mysql.com +2 -0
    after merge fix

ChangeSet@1.1810.3534.3, 2007-12-13 15:47:23+04:00, gluh@mysql.com +3 -0
  after merge fix

  mysql-test/r/delayed.result@1.12.2.4, 2007-12-13 15:47:21+04:00, gluh@mysql.com +0 -16
    after merge fix

  mysql-test/r/func_misc.result@1.21.1.12, 2007-12-13 15:47:21+04:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/t/func_misc.test@1.21.2.6, 2007-12-13 15:47:21+04:00, gluh@mysql.com +1 -2
    after merge fix

ChangeSet@1.1810.3453.20, 2007-12-13 12:03:11+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #33206  	signal not reset properly in ndb

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.17.14.1, 2007-12-13 12:03:09+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    Bug #33206  	signal not reset properly in ndb

ChangeSet@1.1810.3533.1, 2007-12-13 13:38:22+03:00, sergefp@mysql.com +4 -0
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable

  mysql-test/r/range.result@1.44.1.15, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +18 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Testcase

  mysql-test/t/range.test@1.37.1.12, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +20 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Testcase

  sql/field.cc@1.256.1.111, 2007-12-13 13:38:19+03:00, sergefp@mysql.com +3 -0
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Added comments

  sql/opt_range.cc@1.159.41.7, 2007-12-13 13:38:20+03:00, sergefp@mysql.com +26 -1
    BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
    - Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable

ChangeSet@1.1810.3532.1, 2007-12-13 11:19:05+01:00, mhansson@linux-st28.site +5 -0
  Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take 
  subselects into account
  
  It is forbidden to use the SELECT INTO construction inside UNION statements
  unless on the last SELECT of the union. The parser records whether it 
  has seen INTO or not when parsing a UNION statement. But if the INTO was
  legally used in an outer query, an error is thrown if UNION is seen in a
  subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
  mitigate the error unless it collides with the UNION.

  mysql-test/r/union.result@1.80.5.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +42 -0
    Bug#32858: Test result

  mysql-test/t/union.test@1.97.2.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +59 -0
    Bug#32858: Test case

  sql/sql_class.cc@1.223.35.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +1 -0
    Bug#32858: Initializing new member

  sql/sql_class.h@1.230.84.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +34 -3
    Bug#32858: Added property nest_level to select_result class.

  sql/sql_yacc.yy@1.371.133.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +16 -9
    Bug#32858: The fix.

ChangeSet@1.2635.3.7, 2007-12-13 05:37:38+03:00, kostja@bodhi.(none) +2 -0
  Fix a compilation warning and a subtle bug with truncation of the 
  last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.cc@1.354, 2007-12-13 05:37:34+03:00, kostja@bodhi.(none) +1 -1
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.h@1.411, 2007-12-13 05:37:35+03:00, kostja@bodhi.(none) +3 -3
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

ChangeSet@1.2635.2.4, 2007-12-12 19:14:28-07:00, tsmith@ramayana.hindu.god +1 -0
  Bug #33192: mysql_install_db bad merge, corrupt code == appears to succeed but does nothing
  
  Repair a bad merge that made mysql_install_db silently fail, doing nothing.

  scripts/mysql_install_db.sh@1.95, 2007-12-12 19:14:27-07:00, tsmith@ramayana.hindu.god +17 -3
    Repair a bad merge that left out some code changes.

ChangeSet@1.2635.3.6, 2007-12-13 04:33:54+03:00, kostja@bodhi.(none) +1 -0
  Silence a new warning printed by rpl_row_tabledefs_3innodb test execution.

  mysql-test/lib/mtr_report.pl@1.66, 2007-12-13 04:33:51+03:00, kostja@bodhi.(none) +1 -0
    Silence a new warning printed by rpl_row_tabledefs_3innodb test execution.

ChangeSet@1.2635.3.5, 2007-12-13 04:19:23+03:00, kostja@bodhi.(none) +1 -0
  Fix a compilation error.

  sql/protocol.cc@1.133.1.3, 2007-12-13 04:19:15+03:00, kostja@bodhi.(none) +0 -1
    Fix a compilation error.

ChangeSet@1.2604.71.1, 2007-12-12 19:44:14-02:00, davi@mysql.com +11 -0
  Bug#32395 Alter table under a impending global read lock causes a server crash
  
  The problem is that some DDL statements (ALTER TABLE, CREATE
  TRIGGER, FLUSH TABLES, ...) when under LOCK TABLES need to
  momentarily drop the lock, reopen the table and grab the write
  lock again (using reopen_tables). When grabbing the lock again,
  reopen_tables doesn't pass a flag to mysql_lock_tables in
  order to ignore the impending global read lock, which causes a
  assertion because LOCK_open is being hold. Also dropping the
  lock must not signal to any threads that the table has been
  relinquished (related to the locking/flushing protocol).
  
  The solution is to correct the way the table is reopenned
  and the locks grabbed. When reopening the table and under
  LOCK TABLES, the table version should be set to 0 so other
  threads have to wait for the table. When grabbing the lock,
  any other flush should be ignored because it's theoretically
  a atomic operation. The chosen solution also fixes a potential
  discrepancy between binlog and GRL (global read lock) because
  table placeholders were being ignored, now a FLUSH TABLES WITH
  READ LOCK will properly for table with open placeholders.
  
  It's also important to mention that this patch doesn't fix
  a potential deadlock if one uses two GRLs under LOCK TABLES
  concurrently.

  mysql-test/r/lock_multi.result@1.32, 2007-12-12 19:44:11-02:00, davi@mysql.com +30 -0
    Add test case result for Bug#32395

  mysql-test/r/trigger_notembedded.result@1.16, 2007-12-12 19:44:11-02:00, davi@mysql.com +14 -0
    Add test case result for Bug#32395

  mysql-test/t/lock_multi.test@1.34, 2007-12-12 19:44:11-02:00, davi@mysql.com +97 -1
    Add test case for Bug#32395

  mysql-test/t/trigger_notembedded.test@1.18, 2007-12-12 19:44:11-02:00, davi@mysql.com +3 -3
    Enable test case for Bug#32395

  sql/ha_ndbcluster.cc@1.473.1.1, 2007-12-12 19:44:11-02:00, davi@mysql.com +2 -2
    Update close_cached_tables usage.

  sql/ha_ndbcluster_binlog.cc@1.136.2.1, 2007-12-12 19:44:11-02:00, davi@mysql.com +6 -6
    Update close_cached_tables usage.

  sql/mysql_priv.h@1.556, 2007-12-12 19:44:11-02:00, davi@mysql.com +2 -1
    Update close_cache_tables prototype.

  sql/set_var.cc@1.252.6.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +1 -1
    Update close_cached_tables usage and set flag to wait for
    tables with placeholders. This is one of the places where
    a GRL can be obtained.

  sql/sql_base.cc@1.421.22.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +46 -23
    Preserve old version for write locked tables and ignore
    pending flushes and update close_cache_tables to take
    into account name locked tables.

  sql/sql_parse.cc@1.700.16.3, 2007-12-12 19:44:12-02:00, davi@mysql.com +4 -3
    Update close_cached_tables usage and pass flag so that
    name locked tables are waited for.

  sql/sql_table.cc@1.446.17.1, 2007-12-12 19:44:12-02:00, davi@mysql.com +1 -1
    Protect the table against a impending GRL if under LOCK TABLES.

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

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

ChangeSet@1.2604.70.1, 2007-12-12 13:05:32-05:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29993	Default value of log_output should be 'FILE', not 'TABLE'
  
  Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.

  sql/mysqld.cc@1.687.2.1, 2007-12-12 13:05:25-05:00, dkatz@damien-katzs-computer.local +2 -2
    Bug #29993	Default value of log_output should be 'FILE', not 'TABLE'
    
    Ensure default logging is "file" logging, for additional ways the option can be turned on. Verified on OS X, but not tested automatically.

ChangeSet@1.2604.69.1, 2007-12-12 18:21:01+03:00, kostja@bodhi.(none) +51 -0
  Bug#12713 "Error in a stored function called from a SELECT doesn't 
  cause ROLLBACK of statement", part 1. Review fixes.
  
  Do not send OK/EOF packets to the client until we reached the end of 
  the current statement.
  This is a consolidation, to keep the functionality that is shared by all 
  SQL statements in one place in the server.
  Currently this functionality includes:
  - close_thread_tables()
  - log_slow_statement().
  
  After this patch and the subsequent patch for Bug#12713, it shall also include:
  - ha_autocommit_or_rollback()
  - net_end_statement()
  - query_cache_end_of_result().
  
  In future it may also include:
  - mysql_reset_thd_for_next_command().

  include/mysql_com.h@1.127, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +9 -10
    Rename now unused members of NET: no_send_ok, no_send_error, report_error.
    These were server-specific variables related to the client/server
    protocol. They have been made obsolete by this patch.
    
    Previously the same members of NET were used to store the error message
    both on the client and on the server. 
    The error message was stored in net.last_error (client: mysql->net.last_error,
    server: thd->net.last_error).
    The error code was stored in net.last_errno (client: mysql->net.last_errno,
    server: thd->net.last_errno).
    The server error code and message are now stored elsewhere 
    (in the Diagnostics_area), thus NET members are no longer used by the
    server.
    Rename last_error to client_last_error, last_errno to client_last_errno
    to avoid potential bugs introduced by merges.

  include/mysql_h.ic@1.15, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +5 -5
    Update the ABI file to reflect a rename. 
    Renames do not break the binary compatibility.

  libmysql/libmysql.c@1.305, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +22 -18
    Rename last_error to client_last_error, last_errno to client_last_errno.
    This is necessary to ensure no unnoticed bugs introduced by merged
    changesets.
    
    Remove net.report_error, net.no_send_ok, net.no_send_error.

  libmysql/manager.c@1.19, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +1 -1
    Rename net.last_errno to net.client_last_errno.

  libmysqld/lib_sql.cc@1.144, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +56 -31
    Rename net.last_errno to net.client_last_errno.
    
    Update the embedded implementation of the client-server protocol to
    reflect the refactoring of protocol.cc.

  libmysqld/libmysqld.c@1.76, 2007-12-12 18:20:53+03:00, kostja@bodhi.(none) +3 -2
    Rename net.last_errno to net.client_last_errno.

  mysql-test/r/events.result@1.56, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -1
    Update to reflect the change in mysql_rm_db(). Now we drop stored
    routines and events for a given database name only if there
    is a directory for this database name. ha_drop_database() and
    query_cache_invalidate() are called likewise. 
    Previously we would attempt to drop routines/events even if database
    directory was not found (it worked, since routines and events are stored
    in tables). This fixes Bug 29958 "Weird message on DROP DATABASE if mysql.proc
    does not exist".
    The change was done because the previous code used to call send_ok()
    twice, which led to an assertion failure when asserts against it were
    added by this patch.

  mysql-test/r/grant.result@1.83.1.4, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -3
    Fix the patch for Bug 16470, now FLUSH PRIVILEGES produces an error 
    if mysql.procs_priv is missing.
    This fixes the assert that send_ok() must not called after send_error()
    (the original patch for Bug 16470 was prone to this).

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.28, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -2
    Produce a more detailed error message.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.25, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -2
    Produce a more detailed error message.

  mysql-test/t/grant.test@1.63.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -0
    Update the test, now FLUSH PRIVILEGES returns an error if mysql.procs_priv
    is missing.

  server-tools/instance-manager/mysql_connection.cc@1.31, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -1
    Rename net.last_errno to net.client_last_errno.

  sql-common/client.c@1.149, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +38 -36
    Rename last_error to client_last_error, last_errno to client_last_errno.

  sql/ha_ndbcluster_binlog.cc@1.136.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +21 -4
    Add asserts. 
    
    Use getters to access statement status information.
    
    Add a comment why run_query() is broken. Reset the diagnostics area
    in the end of run_query() to fulfill the invariant that the diagnostics_area
    is never assigned twice per statement (see the comment in the code
    when this can happen). We still do not clear thd->is_fatal_error and
    thd->is_slave_error, which may lead to bugs, I consider the whole affair
    as something to be dealt with separately.

  sql/ha_partition.cc@1.109.2.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -0
    fatal_error() doesn't set an error by itself. Perhaps we should
    remove this method altogether and instead add a flag to my_error 
    to set thd->is_fatal_error property.
    
    Meanwhile, this change is a part of inspection made to the entire source
    code with the goal to ensure that fatal_error()
    is always accompanied by my_error().

  sql/item_func.cc@1.434, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +0 -1
    There is no net.last_error anymore. Remove the obsolete assignment.

  sql/log_event.cc@1.312, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +31 -21
    Use getters to access statement error status information.

  sql/log_event_old.cc@1.12, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +8 -8
    Use getters to access statement error status information.

  sql/mysqld.cc@1.687.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +31 -19
    Previously, if a continue handler for an error was found, my_message_sql() 
    would not set an error in THD. Since the current statement
    must be aborted in any case, find_handler() had a hack to assign 
    thd->net.report_error to 1.
    
    Remove this hack. Set an error in my_message_sql() even if the continue
    handler is found. The error will be cleared anyway when the handler
    is executed. This is one action among many in this patch to ensure the 
    invariant that whenever thd->is_error() is TRUE, we have a message in 
    thd->main_da.message().

  sql/net_serv.cc@1.116, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +29 -29
    Use a full-blown my_error() in net_serv.cc to report an error,
    instead of just setting net->last_errno. This ensures the invariant that
    whenever thd->is_error() returns TRUE, we have a message in 
    thd->main_da.message().
    
    Remove initialization of removed NET members.

  sql/opt_range.cc@1.289.2.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +1 -1
    Use my_error() instead of just raising thd->net.report_error. 
    This ensures the invariant that whenever thd->is_error() returns TRUE, 
    there is a message in thd->main_da.message().

  sql/opt_sum.cc@1.66, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -0
    Move invocation of fatal_error() right next to the place where
    we set the error message. That makes it easier to track that whenever
    fatal_error() is called, there is a message in THD.

  sql/protocol.cc@1.133.1.2, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +155 -72
    Rename send_ok() and send_eof() to net_send_ok() and net_send_eof() 
    respectively. These functions write directly to the network and are not 
    for use anywhere outside the client/server protocol code. 
    
    Remove the code that was responsible for cases when either there is 
    no error code, or no error message, or both.
    Instead the calling code ensures that they are always present. Asserts
    are added to enforce the invariant.
    
    Instead of a direct access to thd->server_status and thd->total_warn_count
    use function parameters, since these from now on don't always come directly
    from THD.
    
    Introduce net_end_statement(), the single-entry-point replacement API for 
    send_ok(), send_eof() and net_send_error().
    
    Implement Protocol::end_partial_result_set to use in select_send::abort()
    when there is a continue handler. 

  sql/protocol.h@1.44, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +2 -3
    Update declarations.

  sql/repl_failsafe.cc@1.78.1.1, 2007-12-12 18:20:54+03:00, kostja@bodhi.(none) +3 -1
    Use getters to access statement status information in THD.
    Rename net.last_error to net.client_last_error.

  sql/rpl_record.cc@1.17, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Set an error message in prepare_record() if there is no default
    value for the field -- later we do print this message to the client.

  sql/rpl_rli.cc@1.15, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +2 -2
    Use getters to access statement status information in THD.

  sql/slave.cc@1.328, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +36 -24
    In create_table_from_dump() (a common function that is used in 
    LOAD MASTER TABLE SQL statement and COM_LOAD_MASTER_DATA), instead of hacks
    with no_send_ok, clear the diagnostics area when mysql_rm_table() succeeded.
    
    Update has_temporary_error() to work correctly when no error is set.
    This is the case when Incident_log_event is executed: it always returns
    an error but does not set an error message.
    
    Use getters to access error status information.

  sql/sp_head.cc@1.299, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +9 -7
    Instead of hacks with no_send_error, work through the diagnostics area 
    interface to suppress sending of OK/ERROR packets to the client.
    
    Move query_cache_end_of_result before log_slow_statement(), similarly
    to how it's done in dispatch_command().

  sql/sp_rcontext.cc@1.49, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +1 -21
    Remove hacks with assignment of thd->net.report_error, they are not
    necessary any more (see the changes in mysqld.cc).

  sql/sql_acl.cc@1.253.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -6
    Use getters to access error status information in THD.

  sql/sql_base.cc@1.421.1.22, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +28 -5
    Access thd->main_da.sql_errno() only if there is an error. This fixes
    a bug when auto-discovery, that was effectively disabled under pre-locking.

  sql/sql_binlog.cc@1.16, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +0 -16
    Remove hacks with no_send_ok/no_send_error, they are not necessary 
    anymore: the caller is responsible for network communication.

  sql/sql_cache.cc@1.130, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +1 -0
    Disable sending of OK/ERROR/EOF packet in the end of dispatch_command
    if the response has been served from the query cache. This raises the 
    question whether we should store EOF packet in the query cache at all,
    or generate it anew for each statement (we should generate it anew), but
    this is to be addressed separately.

  sql/sql_class.cc@1.353, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +131 -24
    Implement class Diagnostics_area. Please see comments in sql_class.h
    for details.
    
    Fix a subtle coding mistake in select_send::send_data: when on slave, 
    an error in Item::send() was ignored.
    The problem became visible due to asserts that the diagnostics area is
    never double assigned.
    
    Remove initialization of removed NET members.
    
    In select_send::abort() do not call select_send::send_eof(). This is
    not inheritance-safe. Even if a stored procedure continue handler is
    found, the current statement is aborted, not succeeded.
    Instead introduce a Protocol API to send the required response, 
    Protocol::end_partial_result_set().
    
    This simplifies implementation of select_send::send_eof(). No need
    to add more asserts that there is no error, there is an assert inside
    Diagnostics_area::set_ok_status() already.
    
    Leave no trace of no_send_* in the code.

  sql/sql_class.h@1.408.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +153 -6
    Declare class Diagnostics_area. 
    
    Remove the hack with no_send_ok from
    Substatement_state.
    
    Provide inline implementations of send_ok/send_eof.
    
    Add commetns.

  sql/sql_connect.cc@1.20, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +10 -23
    Remove hacks with no_send_error. 
    
    Since now an error in THD is always set if net->error, it's not necessary
    to check both net->error and thd->is_error() in the do_command loop.
    
    Use thd->main_da.message() instead of net->last_errno.
    
    Remove the hack with is_slave_error in sys_init_connect. Since now we do not
    reset the diagnostics area in net_send_error (it's reset at the beginning
    of the next statement), we can access it safely even after 
    execute_init_command.

  sql/sql_db.cc@1.165, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Update the code to satisfy the invariant that the diagnostics area is never
    assigned twice.
    Incidentally, this fixes Bug 29958 "Weird message on DROP DATABASE if 
    mysql.proc does not exist".

  sql/sql_delete.cc@1.235, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +8 -0
    Change multi-delete to abort in abort(), as per select_send protocol.
    Fixes the merge error with the test for Bug 29136

  sql/sql_derived.cc@1.84, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +3 -2
    Use getters to access error information.

  sql/sql_insert.cc@1.306.1.1, 2007-12-12 18:20:55+03:00, kostja@bodhi.(none) +10 -6
    Use getters to access error information.

  sql/sql_parse.cc@1.700.17.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +61 -65
    Remove hacks with no_send_error. Deploy net_end_statement().
    
    The story of COM_SHUTDOWN is interesting. Long story short, the server 
    would become on its death's door, and only no_send_ok/no_send_error assigned
    by send_ok()/net_send_error() would hide its babbling from the client.
    
    First of all, COM_QUIT does not require a response. So, the comment saying
    "Let's send a response to possible COM_QUIT" is not only groundless 
    (even mysqladmin shutdown/mysql_shutdown() doesn't send COM_QUIT after 
    COM_SHUTDOWN), it's plainly incorrect.
    
    Secondly, besides this additional 'OK' packet to respond to a hypothetical
    COM_QUIT, there was the following code in dispatch_command():
    
    if (thd->killed)
      thd->send_kill_message();
    if (thd->is_error()
      net_send_error(thd);
    
    This worked out really funny for the thread through which COM_SHUTDOWN
    was delivered: we would get COM_SHUTDOWN, say okay, say okay again, 
    kill everybody, get the kill signal ourselves, and then attempt to say 
    "Server shutdown in progress" to the client that is very likely long gone.
    
    This all became visible when asserts were added that the Diagnostics_area
    is not assigned twice.
    
    Move query_cache_end_of_result() to the end of dispatch_command(), since
    net_send_eof() has been moved there. This is safe, query_cache_end_of_result()
    is a no-op if there is no started query in the cache.
    
    Consistently use select_send interface to call abort() or send_eof()
    depending on the operation result.
    
    Remove thd->fatal_error() from reset_master(), it was a no-op. 
    in hacks with no_send_error woudl save us
    from complete breakage of the client/server protocol.
    
    Consistently use select_send::abort() whenever there is an error, 
    and select_send::send_eof() in case of success.
    The issue became visible due to added asserts.

  sql/sql_partition.cc@1.120.1.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -0
    Always set an error in THD whenever there is a call to fatal_error().

  sql/sql_prepare.cc@1.237, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +17 -10
    Deploy class Diagnostics_area.
    Remove the unnecessary juggling with the protocol in 
    Select_fetch_protocol_binary::send_eof(). EOF packet format is 
    protocol-independent.

  sql/sql_select.cc@1.566.1.10, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Call fatal_error() directly in opt_sum_query.
    Call my_error() whenever we call thd->fatal_error().

  sql/sql_servers.cc@1.17, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Use getters to access error information in THD.

  sql/sql_show.cc@1.444, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +32 -23
    Use getters to access error information in THD.
    
    Add comments.
    
    Call my_error() whenever we call fatal_error().

  sql/sql_table.cc@1.446.16.1, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +23 -9
    Replace hacks with no_send_ok with the interface of the diagnostics area.
    
    Clear the error if ENOENT error in ha_delete_table().

  sql/sql_update.cc@1.263, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +4 -0
    Introduce multi_update::abort(), which is the proper way to abort a
    multi-update. This fixes the merge conflict between this patch and
    the patch for Bug 29136.

  sql/table.cc@1.307.1.9, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +14 -13
    Use a getter to access error information in THD.

  sql/tztime.cc@1.60, 2007-12-12 18:20:56+03:00, kostja@bodhi.(none) +1 -1
    Use a getter to access error information in THD.

ChangeSet@1.2604.65.3, 2007-12-11 17:30:42-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #30651	Problems with thread_handling system variable
  
  Changed thread_handling variable to a global only, read only variable, as it is currently used.

  mysql-test/r/no-threads.result@1.3, 2007-12-11 17:30:36-05:00, dkatz@damien-katzs-computer.local +4 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  mysql-test/t/no-threads.test@1.3, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +10 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  sql/set_var.cc@1.252.5.1, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +8 -1
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

  sql/set_var.h@1.110.2.1, 2007-12-11 17:30:37-05:00, dkatz@damien-katzs-computer.local +18 -0
    Bug #30651	Problems with thread_handling system variable
    
    Changed thread_handling variable to a global only, read only variable, as it is currently used.

ChangeSet@1.2628.1.5, 2007-12-11 20:32:38+01:00, joerg@debian.(none) +1 -0
  Merge debian.(none):/MySQL/M50/indent-5.0
  into  debian.(none):/MySQL/M51/indent-5.1
  
  Manual merge of a formatting change.

  Makefile.am@1.147.1.1, 2007-12-11 20:32:30+01:00, joerg@debian.(none) +40 -40
    Manual merge of the formatting change in 5.0,
    the test actions differ so much that automerge doesn't work.

ChangeSet@1.1810.3528.1, 2007-12-11 20:15:03+01:00, mhansson@linux-st28.site +6 -0
  Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38
  
  There were two problems when inferring the correct field types resulting from
  UNION queries.
  - If the type is NULL for all corresponding fields in the UNION, the resulting 
    type would be NULL, while the type is BINARY(0) if there is just a single 
    SELECT NULL.
  - If one SELECT in the UNION uses a subselect, a temporary table is created
    to represent the subselect, and the result type defaults to a STRING type,
    hiding the fact that the type was unknown(just a NULL value).
  Fixed by remembering whenever a field was created from a NULL value and pass
  type NULL to the type coercion if that is the case, and creating a string field
  as result of UNION only if the type would otherwise be NULL.

  mysql-test/r/union.result@1.80.1.12, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +24 -0
    Bug#32848: Test result

  mysql-test/t/union.test@1.97.1.3, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +24 -0
    Bug#32848: Test case

  sql/field.cc@1.256.67.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +2 -1
    Bug#32848: Initialization of new field

  sql/field.h@1.153.35.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +10 -0
    Bug#32848: New member to record when a field was created from a NULL value.

  sql/item.cc@1.113.104.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +4 -0
    Bug#32848: 
    A field created from a NULL value will submit NULL as type to the 
    type coercion procedure.
    If Item_type_holder has not inferred the correct type after processing all
    SELECTs in a UNION, a string field is created.

  sql/sql_select.cc@1.312.182.1, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +2 -0
    Bug#32848: Recording when a field is created from a NULL value.

ChangeSet@1.2604.46.27, 2007-12-11 19:57:26+01:00, tomas@whalegate.ndb.mysql.com +5 -0
  move randomly failing tests to ndb_team suite

  mysql-test/suite/ndb/t/disabled.def@1.10, 2007-12-11 19:57:23+01:00, tomas@whalegate.ndb.mysql.com +0 -2
    move randomly failing tests to ndb_team suite

  mysql-test/suite/ndb_team/r/ndb_backup_print.result@1.6, 2007-12-11 19:55:57+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_backup_print.result -> mysql-test/suite/ndb_team/r/ndb_backup_print.result

  mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result@1.14, 2007-12-11 19:55:13+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result

  mysql-test/suite/ndb_team/t/ndb_backup_print.test@1.6, 2007-12-11 19:56:08+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_backup_print.test -> mysql-test/suite/ndb_team/t/ndb_backup_print.test

  mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test@1.13, 2007-12-11 19:55:02+01:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test

ChangeSet@1.2604.46.26, 2007-12-11 19:52:35+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  add capability to run certain testsuites optionally depending on name of clone

  mysql-test/mysql-test-run.pl@1.341, 2007-12-11 19:52:32+01:00, tomas@whalegate.ndb.mysql.com +24 -2
    add capability to run certain testsuites optionally depending on name of clone

ChangeSet@1.2604.46.25, 2007-12-11 19:51:44+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  remove memleak cased by dynamic variables being lost

  sql/ha_ndbcluster_binlog.cc@1.138, 2007-12-11 19:51:41+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    remove memleak cased by dynamic variables being lost

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

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

ChangeSet@1.2604.67.3, 2007-12-11 16:04:33+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  bug#33142: access after free() for blob replication and online alter table

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@1.90, 2007-12-11 16:04:31+01:00, tomas@whalegate.ndb.mysql.com +12 -0
    bug#33142: access after free() for blob replication and online alter table

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

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

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

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

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

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

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

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

ChangeSet@1.2604.67.2, 2007-12-11 15:19:37+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  compile error fix for osx

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.134, 2007-12-11 15:19:34+01:00, tomas@whalegate.ndb.mysql.com +0 -1
    compile error fix for osx

ChangeSet@1.2604.67.1, 2007-12-11 15:08:00+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  bug#32759 already fixed

  mysql-test/suite/ndb/t/disabled.def@1.9, 2007-12-11 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +0 -1
    bug#32759 already fixed
    - see rev 1.131.1.6 of sql/ha_ndbcluster_binlog.cc

ChangeSet@1.2604.66.1, 2007-12-11 11:51:14+01:00, mskold@mysql.com +2 -0
  Enabled test rpl_ndb_ddl

  mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result@1.5, 2007-12-11 11:51:00+01:00, mskold@mysql.com +26 -14
    Enabled test rpl_ndb_ddl

  mysql-test/suite/rpl_ndb/t/disabled.def@1.16, 2007-12-11 11:51:00+01:00, mskold@mysql.com +0 -1
    Enabled test rpl_ndb_ddl

ChangeSet@1.1810.3453.18, 2007-12-11 11:41:19+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  remoce compiler warnings

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.11.1, 2007-12-11 11:41:16+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    remoce compiler warnings

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.7.1, 2007-12-11 11:41:16+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    remoce compiler warnings

ChangeSet@1.1810.3515.4, 2007-12-11 10:12:05+01:00, tnurnberg@mysql.com +8 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
  This happened because DATE-cast object did not overload get_time() method
  in superclass Item. The default method was inappropriate here and
  misinterpreted the data.
  
  Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
  on NULL input, 0 otherwise. This coincides with the way DATE-columns
  behave.
  
  Also fixes similar bug in Date-Field now.

  mysql-test/r/cast.result@1.39.3.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +24 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/r/type_date.result@1.13.7.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +5 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-fields.

  mysql-test/t/cast.test@1.31.3.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +22 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/t/type_date.test@1.14.6.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +8 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-fields.

  sql/field.cc@1.256.66.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-field object to overload
    the method in Field superclass that would return spurious
    results. Return zero-result.

  sql/field.h@1.153.34.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to date-field class

  sql/item_timefunc.cc@1.100.38.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-cast object to overload
    the method in Item superclass that would return spurious
    results. Return zero-result; flag NULL if input was NULL.

  sql/item_timefunc.h@1.63.8.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.1810.3449.40, 2007-12-10 19:23:17+01:00, joerg@debian.(none) +1 -0
  Makefile.am
      Formatting change to improve readability of the "test-*" targets.

  Makefile.am@1.68.11.1, 2007-12-10 19:23:09+01:00, joerg@debian.(none) +17 -17
    Formatting change to improve readability:
    
    In multi-line actions, indent the continuation lines
    so that the start of the next statement is better visible.
    This affects only "test-*" targets.

ChangeSet@1.1810.3526.2, 2007-12-10 16:16:21+01:00, thek@adventure.(none) +2 -0
  Test fails because of non deterministric function: show grants for current_user()

  mysql-test/r/read_only.result@1.4.1.2, 2007-12-10 16:16:20+01:00, thek@adventure.(none) +0 -5
    Removing non deterministic test results from test.

  mysql-test/t/read_only.test@1.1.1.5, 2007-12-10 16:16:20+01:00, thek@adventure.(none) +0 -1
    Removing non deterministic test results from test.

ChangeSet@1.2541.9.42, 2007-12-10 13:29:23+01:00, tomas@whalegate.ndb.mysql.com +6 -0
  backport test for bug#30674
  (bug not present in 5.1)

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +1 -8
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/ndb/r/ndb_blob.result@1.24, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +21 -0
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/ndb/t/ndb_blob.test@1.25, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +20 -0
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +36 -33
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.3.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +36 -33
    backport test for bug#30674
    (bug not present in 5.1)

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.1.1.1, 2007-12-10 13:29:20+01:00, tomas@whalegate.ndb.mysql.com +6 -4
    backport test for bug#30674
    (bug not present in 5.1)

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

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

ChangeSet@1.1810.3524.1, 2007-12-10 09:17:18+01:00, tnurnberg@mysql.com +3 -0
  Bug#32770: LAST_DAY() returns a DATE, but somehow internally keeps track of the TIME.
  
  LAST_DAY() says it returns a DATE, not a DATETIME, but didn't zero the time fields.
  Adapted from a patch kindly supplied by Claudio Cherubino.

  mysql-test/r/func_time.result@1.47.1.39, 2007-12-10 09:17:16+01:00, tnurnberg@mysql.com +3 -0
    show that LAST_DAY() returns only a DATE, not a DATETIME

  mysql-test/t/func_time.test@1.41.1.32, 2007-12-10 09:17:17+01:00, tnurnberg@mysql.com +7 -0
    show that LAST_DAY() returns only a DATE, not a DATETIME

  sql/item_timefunc.cc@1.100.37.1, 2007-12-10 09:17:17+01:00, tnurnberg@mysql.com +2 -0
    zero time-fields as we return only a DATE

ChangeSet@1.2604.63.1, 2007-12-10 08:12:41+01:00, tnurnberg@mysql.com +4 -0
  Bug #31177: Server variables can't be set to their current values
  
  fixes for SLES10

  mysql-test/r/change_user.result@1.3, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +2 -2
    It's unsigned.

  mysys/my_getopt.c@1.80, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +0 -2
    Failsafe no longer needed, we handle signedness correctly now.

  sql/set_var.cc@1.252.4.3, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +1 -1
    ha_rows can be derived from all kinds of types, but
    they're all unsigned. Display it as such.

  tests/mysql_client_test.c@1.255.5.1, 2007-12-10 08:12:40+01:00, tnurnberg@mysql.com +11 -0
    cannot easily check this here due to types.
    check with Alik whether we need this on top
    of change_user.test.

ChangeSet@1.1810.3395.58, 2007-12-09 11:53:07-08:00, igor@olga.mysql.com +1 -0
  Forced compilers to remove the warning appeared after the patch
  with a fix for bug 32694. 

  sql/item_cmpfunc.cc@1.187.46.5, 2007-12-09 11:53:05-08:00, igor@olga.mysql.com +1 -0
    Forced compilers to remove the warning appeared after the patch
    with a fix for bug 32694. 

ChangeSet@1.2604.14.63, 2007-12-08 23:54:07+02:00, timour@lapi.mysql.com +2 -0
  BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

  BitKeeper/etc/ignore@1.300.1.4, 2007-12-08 23:54:05+02:00, timour@lapi.mysql.com +1 -0
    Added ylwrap to the ignore list

  mysql-test/r/type_datetime.result@1.60, 2007-12-08 23:54:03+02:00, timour@lapi.mysql.com +12 -12
    BUG#32694 post-merge adjustment of EXPLAIN results for 5.1.

ChangeSet@1.1810.3523.1, 2007-12-08 23:05:00+02:00, timour@lapi.mysql.com +3 -0
  Fix for BUG#32694 "NOT NULL table field in a subquery produces invalid results"
    
  The problem was that when convert_constant_item is called for subqueries,
  this happens when we already started executing the top-level query, and
  the field argument of convert_constant_item pointed to a valid table row.
  In turn convert_constant_item used the field buffer to compute the value
  of its item argument. This copied the item's value into the field,
  and made equalities with outer references always true.
    
  The fix saves/restores the original field's value when it belongs to an
  outer table.

  mysql-test/r/type_datetime.result@1.30.1.21, 2007-12-08 23:04:56+02:00, timour@lapi.mysql.com +55 -0
    Test for BUG#32694.

  mysql-test/t/type_datetime.test@1.18.10.1, 2007-12-08 23:04:58+02:00, timour@lapi.mysql.com +37 -0
    Test for BUG#32694.

  sql/item_cmpfunc.cc@1.187.46.4, 2007-12-08 23:04:58+02:00, timour@lapi.mysql.com +41 -26
    - Changed convert_constant_item() so that it doesn't destroy the contents
      of its field argument when the field originates from table in an outer
      query.

ChangeSet@1.1810.3395.56, 2007-12-07 23:36:58-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #27545.
  Both arguments of the function NAME_CONST must be constant expressions.
  This constraint is checked in the Item_name_const::fix_fields method. 
  Yet if the argument of the function was not a constant expression no
  error message was reported. As a result the client hanged waiting for a
  response.
  Now the function Item_name_const::fix_fields reports an error message
  when any of the additional context conditions imposed on the function
  NAME_CONST is not satisfied. 

  mysql-test/r/func_misc.result@1.21.5.1, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +5 -0
    Added a test case for bug #26545.

  mysql-test/t/func_misc.test@1.21.5.1, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +13 -0
    Added a test case for bug #26545.

  sql/item.cc@1.113.1.180, 2007-12-07 23:36:53-08:00, igor@olga.mysql.com +7 -7
    Fixed bug #27545.
    Both arguments of the function NAME_CONST must be constant expressions.
    This constraint is checked in the Item_name_const::fix_fields method. 
    Yet if the argument of the function was not a constant expression no
    error message was reported. As a result the client hanged waiting for a
    response.
    Now the function Item_name_const::fix_fields reports an error message
    when any of the additional context conditions imposed on the function
    NAME_CONST is not satisfied. 

ChangeSet@1.1810.3522.1, 2007-12-07 17:14:59-08:00, igor@olga.mysql.com +3 -0
  Fixed bug #32815.
  The index (key_part_1, key_part-2) was erroneously considered as compatible
  with the required ordering in the function test_test_if_order_by_key when 
  a query with an ORDER BY clause contained a condition of the form
    key_part_1=const OR key_part_1 IS NULL 
  and the order list contained only key_part_2. This happened because the value
  of the const_key_parts field in the KEYUSE structure was not formed correctly
  for the keys that could be used for ref_or_null access. 
  This was fixed in the code of the update_ref_and_keys function.
  The problem could not manifest itself for MyISAM databases because the
  implementation of the keys_to_use_for_scanning() handler function always
  returns an empty bitmap for the MyISAM engine.

  mysql-test/t/innodb_mysql.test@1.3.51.1, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +15 -0
    Added a test case for bug #32815.

  mysql-test/r/innodb_mysql.result@1.3.25.2, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +12 -0
    Added a test case for bug #32815.

  sql/sql_select.cc@1.312.173.10, 2007-12-07 17:14:54-08:00, igor@olga.mysql.com +1 -1
    Fixed bug #32815.
    The index (key_part_1, key_part-2) was erroneously considered as compatible
    with the required ordering in the function test_test_if_order_by_key when 
    a query with an ORDER BY clause contained a condition of the form
      key_part_1=const OR key_part_1 IS NULL 
    and the order list contained only key_part_2. This happened because the value
    of the const_key_parts field in the KEYUSE structure was not formed correctly
    for the keys that could be used for ref_or_null access. 
    This was fixed in the code of the update_ref_and_keys function.

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

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

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

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

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

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

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

ChangeSet@1.2604.62.1, 2007-12-07 22:54:47+03:00, evgen@moonbone.local +3 -0
  Bug#32482: Crash for a query with ORDER BY a user variable.
  
  The Item_func_set_user_var::register_field_in_read_map() did not check 
  that the result_field was null.This caused server crashes for queries that
  required order by such a field and were executed without using a temporary
  table.
  
  The Item_func_set_user_var::register_field_in_read_map() now checks the
  result_field to be not null.

  mysql-test/r/user_var.result@1.48.1.1, 2007-12-07 22:53:53+03:00, evgen@moonbone.local +7 -0
    Added a test case for the bug#32482: Crash for a query with ORDER BY a user variable.

  mysql-test/t/user_var.test@1.44.1.1, 2007-12-07 22:53:30+03:00, evgen@moonbone.local +8 -0
    Added a test case for the bug#32482: Crash for a query with ORDER BY a user variable.

  sql/item_func.cc@1.427.4.1, 2007-12-07 22:54:15+03:00, evgen@moonbone.local +6 -3
    Bug#32482: Crash for a query with ORDER BY a user variable.
    The Item_func_set_user_var::register_field_in_read_map() now checks the
    result_field to be not null.

ChangeSet@1.1810.3505.2, 2007-12-07 15:39:41+01:00, thek@adventure.(none) +3 -0
  Bug #27440 read_only allows create and drop database
  
  When read_only option was enabled, a user without SUPER privilege could
  perform CREATE DATABASE and DROP DATABASE operations.
  
  This patch adds a check to make sure this isn't possible. It also attempts to 
  simplify the logic used to determine if relevant tables are updated,
  making it more human readable.

  mysql-test/r/read_only.result@1.4.1.1, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +31 -0
    Updated result file

  mysql-test/t/read_only.test@1.1.1.4, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +34 -0
    A test case is added which shows that it is not possible to drop or create a
    database in read-only mode despite having the GRANT permissions to do so,
    SUPER user excepted. 

  sql/sql_parse.cc@1.426.164.4, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +69 -8
    - Simplified complex predicate by grouping it in a read friendly way.
    - Added predicate to fail on database updates while running in read-only
      mode.

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

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

ChangeSet@1.2541.9.41, 2007-12-07 14:06:44+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.467.3.15, 2007-12-07 14:06:38+01:00, mskold@mysql.com +1 -1
    Removed illegal cast

ChangeSet@1.1810.3202.28, 2007-12-07 14:03:54+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.175.86.9, 2007-12-07 14:03:41+01:00, mskold@mysql.com +1 -1
    Removed illegal cast

ChangeSet@1.1810.3202.27, 2007-12-07 13:42:44+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

  sql/ha_ndbcluster.cc@1.175.86.8, 2007-12-07 13:42:38+01:00, mskold@mysql.com +2 -2
    Removed illegal cast

ChangeSet@1.2541.9.38, 2007-12-07 12:20:04+01:00, mskold@mysql.com +1 -0
  bug#21072 Duplicate key error in NDB references wrong key: regenerated result

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.5.1.1, 2007-12-07 12:19:32+01:00, mskold@mysql.com +2 -2
    bug#21072 Duplicate key error in NDB references wrong key: regenerated result

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

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

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

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

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

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

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

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

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

ChangeSet@1.2541.9.37, 2007-12-07 11:05:19+01:00, mskold@mysql.com +7 -0
  bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_charset.result@1.17, 2007-12-07 11:05:12+01:00, mskold@mysql.com +4 -4
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_index_unique.result@1.36, 2007-12-07 11:05:12+01:00, mskold@mysql.com +7 -7
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  mysql-test/suite/ndb/r/ndb_update.result@1.25, 2007-12-07 11:05:13+01:00, mskold@mysql.com +3 -3
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  sql/ha_ndbcluster.cc@1.467.3.12, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/include/ndbapi/NdbDictionary.hpp@1.95, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -5
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/src/ndbapi/NdbDictionary.cpp@1.73, 2007-12-07 11:05:12+01:00, mskold@mysql.com +0 -9
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.31, 2007-12-07 11:05:12+01:00, mskold@mysql.com +1 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

ChangeSet@1.1810.3202.26, 2007-12-07 10:33:50+01:00, mskold@mysql.com +3 -0
  bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  sql/ha_ndbcluster.cc@1.175.86.7, 2007-12-07 10:33:45+01:00, mskold@mysql.com +0 -2
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.53.2, 2007-12-07 10:33:45+01:00, mskold@mysql.com +1 -5
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.30.2, 2007-12-07 10:33:45+01:00, mskold@mysql.com +0 -1
    bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes

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

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

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

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

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

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

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

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

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

ChangeSet@1.2604.56.4, 2007-12-06 22:17:42+04:00, holyfoot@mysql.com +2 -0
  partition_archive tests added

  mysql-test/r/partition_archive.result@1.2, 2007-12-06 22:17:39+04:00, holyfoot@mysql.com +78 -0
    test results

  mysql-test/t/partition_archive.test@1.2, 2007-12-06 22:17:39+04:00, holyfoot@mysql.com +75 -0
    tests added

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

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

ChangeSet@1.2604.14.57, 2007-12-06 18:03:30+01:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#31177: Server variables can't be set to their current values
  
  initialise limits properly for getopt_ll_limit()
  (fixes falcon_opt test)

  sql/sql_plugin.cc@1.75.1.5, 2007-12-06 18:03:24+01:00, tnurnberg@sin.intern.azundris.com +2 -0
    initialise limits properly for getopt_ll_limit()

ChangeSet@1.1810.3202.25, 2007-12-06 17:15:21+01:00, mskold@mysql.com +13 -0
  bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_charset.result@1.5.1.5, 2007-12-06 17:15:10+01:00, mskold@mysql.com +4 -4
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_index_unique.result@1.16.1.6, 2007-12-06 17:15:10+01:00, mskold@mysql.com +7 -7
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  mysql-test/r/ndb_update.result@1.5.3.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +1 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  sql/ha_ndbcluster.cc@1.175.86.6, 2007-12-06 17:15:11+01:00, mskold@mysql.com +22 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/kernel/signaldata/TcKeyRef.hpp@1.1.2.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +2 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/kernel/signaldata/TcRollbackRep.hpp@1.2.2.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +2 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/include/ndbapi/NdbDictionary.hpp@1.48.12.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +6 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.27.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +1 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.53.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +20 -1
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbDictionary.cpp@1.34.9.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +9 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbOperationExec.cpp@1.18.6.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +7 -0
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.30.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +11 -2
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  ndb/src/ndbapi/ndberror.c@1.30.42.1, 2007-12-06 17:15:10+01:00, mskold@mysql.com +0 -2
    bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

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

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

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

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

ChangeSet@1.2573.104.1, 2007-12-06 16:39:42+04:00, holyfoot@mysql.com +6 -0
  Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
  
  ha_partition::update_create_info() just calls update_create_info
  of a first partition, so only get the autoincrement maximum
  of the first partition, so SHOW CREATE TABLE can show
  small AUTO_INCREMENT parameters.
  Fixed by implementing ha_partition::update_create_info() in a way
  other handlers work.
  HA_ARCHIVE:stats.auto_increment handling made consistent with other engines

  mysql-test/r/archive.result@1.36.2.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +1 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result fixed

  mysql-test/r/partition.result@1.69.5.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +15 -0
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.2.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +1 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test result fixed

  mysql-test/t/partition.test@1.63.5.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +21 -0
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    test added as rpl_innodb_bug28430 is INNOBASE specific while
    the bug is not

  sql/ha_partition.cc@1.106.2.1, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +5 -1
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    ha_partition::update_create_info() implemented

  storage/archive/ha_archive.cc@1.145, 2007-12-06 16:39:40+04:00, holyfoot@mysql.com +14 -23
    Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table).
    
    ha_archive.stats.auto_increment now contains next (not last used) value
    of auto_increment to be consistent with other engines

ChangeSet@1.1616.3124.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +4 -0
  Bug#31752: check strmake() bounds
  
  post-fixes: prevent semi-related overflow, additional comments

  mysys/mf_pack.c@1.21.2.1, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +2 -2
    extra comments

  sql/log.cc@1.108.9.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +1 -1
    prevent overflow (length parameter of strmake() should
    never become < 0)

  sql/sql_show.cc@1.122.1.90, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +3 -2
    additional comments

  sql/unireg.cc@1.43.3.2, 2007-12-06 11:48:27+01:00, tnurnberg@mysql.com +5 -0
    additional comments

ChangeSet@1.1810.3515.3, 2007-12-06 01:28:01+01:00, tnurnberg@mysql.com +11 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for BDB and correct assignment of both signed
  and unsigned 64-bit data to unsigned system variables

  mysql-test/r/ps_6bdb.result@1.27.23.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_2myisam.result@1.39.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_3innodb.result@1.42.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_4heap.result@1.38.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysql-test/r/ps_5merge.result@1.39.9.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +16 -16
    account for UNSIGNED_FLAG

  mysql-test/r/ps_7ndb.result@1.26.13.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +8 -8
    account for UNSIGNED_FLAG

  mysys/my_getopt.c@1.55.1.11, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +0 -2
    We have correct signed/unsigned information now, so we no longer
    need to err on the side of caution.

  sql/item_func.cc@1.270.80.2, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +2 -0
    Copy unsigned info over from entry so the item's data
    correctly describe it.

  sql/mysqld.cc@1.439.137.1, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +1 -1
    BDB log buffer size: default can't be less than minimum

  sql/set_var.cc@1.125.5.53, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +24 -8
    Handle signedness of in-values correctly when assigning to
    unsigned types, all the way up to 64-bit. Use handler from
    all three unsigned sysvar types.

  sql/set_var.h@1.68.6.2, 2007-12-06 01:27:59+01:00, tnurnberg@mysql.com +1 -0
    thd_ulonglong: Override default check with one for unsigned types

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

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

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

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

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

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

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

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

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

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

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

ChangeSet@1.1810.3514.6, 2007-12-04 12:57:16+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -0
  post-commit:
    Use $BK_USER, if set, in preference to $USER

  BitKeeper/triggers/post-commit@1.26.1.19, 2007-12-04 12:56:36+00:00, jperkin@chorlton.adsl.perkin.org.uk +10 -3
    Use $BK_USER, if set, in preference to $USER

ChangeSet@1.2604.57.1, 2007-12-04 12:48:11+04:00, gluh@mysql.com +2 -0
  test case fix

  mysql-test/r/information_schema.result@1.175, 2007-12-04 12:48:09+04:00, gluh@mysql.com +1 -0
    test case fix

  mysql-test/t/information_schema.test@1.116.1.2, 2007-12-04 12:48:09+04:00, gluh@mysql.com +1 -0
    test case fix

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

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

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

ChangeSet@1.2604.56.1, 2007-12-04 01:17:52+01:00, tnurnberg@mysql.com +3 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for 64-bit
  ---
  Merge mysql.com:/misc/mysql/31177/50-31177
  into  mysql.com:/misc/mysql/31177/51-31177
  ---
  Bug#31177: Server variables can't be set to their current values
  
  additional 5.1 fixes (for plugins)

  mysql-test/t/variables.test@1.82, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +1 -1
    replace 32-bit and 64-bit values
    ---
    manual merge

  mysys/my_getopt.c@1.78, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +3 -1
    'mod' no longer used.
    on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
    in classes using longlong.

  sql/sql_plugin.cc@1.75.1.4, 2007-12-04 01:17:50+01:00, tnurnberg@mysql.com +21 -2
    handle signedness in plugin-vars so we won't hit an assert()
    in getopt_*_limit_value()

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

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

ChangeSet@1.2541.9.35, 2007-12-03 14:31:17+01:00, jonas@perch.ndb.mysql.com +7 -0
  ndb - testNodeRestart -n Bug27466 T1
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@1.68, 2007-12-03 14:31:13+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.139, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.132, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +29 -8
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.172, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.157, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +5 -3
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.66, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +3 -2
    make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.62, 2007-12-03 14:31:14+01:00, jonas@perch.ndb.mysql.com +2 -0
    soem more printout

ChangeSet@1.2403.18.98, 2007-12-03 12:43:50+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#26457
      Fix bug in bug fix, causing random test-failure

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.11, 2007-12-03 12:43:48+01:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - bug#26457
        Fix bug in bug fix, causing random test-failure

ChangeSet@1.2573.103.2, 2007-12-03 11:39:49+01:00, mhansson@linux-st28.site +2 -0
  Bug#30234: Post-null-merge fix
  Restores files that were automerged during null merge.

  mysql-test/r/delete.result@1.31.1.2, 2007-12-03 11:39:47+01:00, mhansson@linux-st28.site +37 -0
    Bug#30234: Post-null-merge fix

  mysql-test/t/delete.test@1.29.1.2, 2007-12-03 11:39:47+01:00, mhansson@linux-st28.site +44 -0
    Bug#30234: Post-null-merge fix

ChangeSet@1.1810.3521.1, 2007-12-03 10:08:58+01:00, mhansson@linux-st28.site +3 -0
  Bug#30234: Unexpected behavior using DELETE with AS and USING
  
  Anti-patch. This patch undoes the previously pushed patch. It is 
  null-merged in versions 5.1 and above since there the original 
  patch is still desired.

  mysql-test/r/delete.result@1.31.1.1, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +0 -37
    Bug#30234: Anti-patch 

  mysql-test/t/delete.test@1.29.1.1, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +0 -44
    Bug#30234: Anti-patch 

  sql/sql_yacc.yy@1.371.128.3, 2007-12-03 10:08:56+01:00, mhansson@linux-st28.site +2 -17
    Bug#30234: Anti-patch 

ChangeSet@1.1810.3515.2, 2007-12-03 10:01:56+01:00, tnurnberg@mysql.com +2 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for 64-bit

  mysql-test/t/variables.test@1.51.10.2, 2007-12-03 10:01:55+01:00, tnurnberg@mysql.com +1 -1
    replace 32-bit and 64-bit values

  mysys/my_getopt.c@1.55.1.10, 2007-12-03 10:01:55+01:00, tnurnberg@mysql.com +3 -1
    'mod' no longer used.
    on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
    in classes using longlong.

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

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

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

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

ChangeSet@1.2604.14.53, 2007-12-02 05:18:34+01:00, tnurnberg@mysql.com +1 -0
  Bug#31177: Server variables can't be set to their current values
  
  extra 5.1 fixes

  mysql-test/t/order_fill_sortbuf-master.opt@1.4, 2007-12-02 05:18:32+01:00, tnurnberg@mysql.com +1 -1
    If we set the variable below minimum, we'll get a warning
    at start-up that we don't want in the tests.

ChangeSet@1.2573.102.2, 2007-12-01 19:55:06+01:00, tnurnberg@mysql.com +8 -0
  Bug#31177: Server variables can't be set to their current values
  
  5.1+ specific fixes (plugins etc.)

  include/my_getopt.h@1.26, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -1
    make both ull and ll global

  mysql-test/r/index_merge_myisam.result@1.8.1.1, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -0
    we throw warnings to the client, yea, verily

  mysql-test/r/innodb.result@1.202.3.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +2 -2
    we throw warnings to the client, yea, verily

  mysql-test/r/variables.result@1.108, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +30 -4
    we throw warnings to the client, yea, verily

  mysql-test/t/variables.test@1.78.1.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +1 -1
    correct result, is multiple of variable's block_size now

  mysys/my_getopt.c@1.77, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +35 -13
    export getopt_ll_limit_value(), check for integer wrap-around
    in it, same as in ull variant.  Only print warnings to reporter
    when caller didn't ask for diagnostics, otherwise assume caller
    will handle any warnings (id est, throw them client-wards)

  sql/mysqld.cc@1.679.3.2, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +1 -1
    correct signedness of "concurrent-insert"

  sql/sql_plugin.cc@1.75.3.1, 2007-12-01 19:55:04+01:00, tnurnberg@mysql.com +31 -4
    Throw sys-var out-of-range warnings client-wards for
    plugins, too.

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

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

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

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

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

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

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

ChangeSet@1.2604.14.49, 2007-12-01 13:07:28+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/federated.result@1.55, 2007-12-01 13:07:25+04:00, holyfoot@mysql.com +1 -1
    merging

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

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

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

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

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

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

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

ChangeSet@1.2573.101.1, 2007-11-30 22:17:11+04:00, holyfoot@mysql.com +4 -0
  Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
  
  PS-protocol data is stored in different format - the MYSQL_RECORDS->data
  contains the link to the record content, not to array of the links to
  the field's contents. So we have to handle it separately for
  embedded-server query cache.

  libmysqld/emb_qcache.cc@1.12, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +69 -34
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    ps_protocol data now stored in it's particular way.

  libmysqld/emb_qcache.h@1.6, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +2 -2
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    Querycache_stream::load_char/store_char  ->
      load_uchar/store_uchar

  mysql-test/r/func_misc.result@1.38.1.1, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +1 -1
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    test result

  mysql-test/t/func_misc.test@1.29.1.1, 2007-11-30 22:17:10+04:00, holyfoot@mysql.com +1 -1
    Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc...
    
    the test uses t2 table, so let's make sure it doesn't exist befor the start

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

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

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

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

ChangeSet@1.1810.3518.1, 2007-11-30 19:16:13+04:00, holyfoot@mysql.com +2 -0
  Bug #26921 Problem in mysql_insert_id() Embedded C API function.
  
  client library only sets mysql->insert_id when query returned
  no recordset. So the embedded library should behave the same way

  libmysqld/lib_sql.cc@1.107.9.1, 2007-11-30 19:16:12+04:00, holyfoot@mysql.com +5 -3
    Bug #26921 Problem in mysql_insert_id() Embedded C API function.
    
    only set 'affected_rows' and 'insert_id' fields when query
    didn't return a recordset

  tests/mysql_client_test.c@1.167.41.1, 2007-11-30 19:16:12+04:00, holyfoot@mysql.com +11 -0
    Bug #26921 Problem in mysql_insert_id() Embedded C API function.
    
    testcase added

ChangeSet@1.2604.14.44, 2007-11-30 18:48:22+04:00, gluh@mysql.com +4 -0
  Bug#32775 problems with SHOW EVENTS and Information_Schema
  removed unnecessary privilege checks for I_S schema

  mysql-test/r/information_schema.result@1.174, 2007-11-30 18:48:20+04:00, gluh@mysql.com +7 -0
    test result

  mysql-test/t/information_schema.test@1.116.1.1, 2007-11-30 18:48:20+04:00, gluh@mysql.com +8 -0
    test case

  sql/events.cc@1.85.2.2, 2007-11-30 18:48:20+04:00, gluh@mysql.com +2 -2
    There is no events in I_S so we don't need to execute check_access here.

  sql/sql_parse.cc@1.700.12.2, 2007-11-30 18:48:20+04:00, gluh@mysql.com +0 -4
    removed unnecessary check

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

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

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

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

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

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

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

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

ChangeSet@1.1810.3517.1, 2007-11-30 17:08:00+04:00, holyfoot@mysql.com +4 -0
  Bug #32374 crash with filesort when selecting from federated table and view.
  
  filesort() uses file->estimate_rows_upper_bound() call to allocate
  internal buffers. If this function returns a value smaller than
  a number of row that will be returned later in find_all_keys(),
  that can cause server crash.
  Fixed by implementing ha_federated::estimate_rows_upper_bound() to
  return maximum possible number of rows.
  Present estimation for FEDERATED always returns 0 if the linked to the VIEW.

  mysql-test/r/federated.result@1.25.11.3, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +111 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    test result

  mysql-test/t/federated.test@1.19.9.3, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +31 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    test case

  sql/ha_federated.cc@1.24.32.1, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +18 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    ha_federated::estimate_rows_upper_bound() implemented

  sql/ha_federated.h@1.18.10.1, 2007-11-30 17:07:58+04:00, holyfoot@mysql.com +1 -0
    Bug #32374 crash with filesort when selecting from federated table and view.
    
    ha_federated::estimate_rows_upper_bound() interface

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

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

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

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

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

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

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

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

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

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

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

ChangeSet@1.1810.3515.1, 2007-11-30 06:32:04+01:00, tnurnberg@mysql.com +21 -0
  Bug#31177: Server variables can't be set to their current values
  
  Default values of variables were not subject to upper/lower bounds
  and step, while setting variables was. Bounds and step are also
  applied to defaults now; defaults are corrected quietly, values
  given by the user are corrected, and a correction-warning is thrown
  as needed. Lastly, very large values could wrap around, starting
  from 0 again. They are bounded at the maximum value for the
  respective data-type now if no lower maximum is specified in the
  variable's definition.

  mysql-test/r/index_merge.result@1.19.4.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  client/mysql.cc@1.199.33.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +7 -6
    correct maxima in options array

  client/mysqltest.c@1.155.37.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    adjust minimum for "sleep" option so default value is no longer
    out of bounds.

  include/m_string.h@1.37.1.6, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -0
    ullstr() - the unsigned brother of llstr()

  include/my_getopt.h@1.19.2.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -1
    Flag if we bounded the value (that is, correct anything aside from
    making value a multiple of block-size)

  mysql-test/r/delayed.result@1.12.4.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +16 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/innodb.result@1.145.8.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +4 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/innodb_mysql.result@1.3.25.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/key_cache.result@1.19.1.4, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/packet.result@1.8, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +8 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/ps.result@1.56.17.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/subselect.result@1.134.27.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +4 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/type_bit.result@1.14.3.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/type_bit_innodb.result@1.3.1.4, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +2 -0
    We throw a warning now when we adjust out of range parameters.

  mysql-test/r/variables.result@1.76.1.20, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +28 -2
    correct results: bounds and step apply to variables' default values, too

  mysql-test/t/variables.test@1.51.10.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    correct results: bounds and step apply to variables' default values, too

  mysys/my_getopt.c@1.55.1.9, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +127 -48
    - apply bounds/step to default values of variables (based on work by serg)
    - print complaints about incorrect values for variables (truncation etc.,
      by requestion of consulting)
    - if no lower maximum is specified in variable definition, bound unsigned
      values at their maximum to prevent wrap-around
    - some calls to error_reporter had a \n, some didn't. remove \n from calls,
      let reporter-function handle it, so the default reporter behaves like that
      in mysqld

  sql/mysql_priv.h@1.290.126.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +1 -1
    correct RANGE_ALLOC_BLOCK_SIZE (cleared with monty)

  sql/mysqld.cc@1.439.135.1, 2007-11-30 06:32:02+01:00, tnurnberg@mysql.com +41 -39
    correct maxima to correct data-type.
    correct minima where higher than default.
    correct range-alloc-block-size.
    correct inno variables so GET_* corresponds to actual variable's type.

  sql/set_var.cc@1.125.5.52, 2007-11-30 06:32:03+01:00, tnurnberg@mysql.com +48 -22
    When the new value for a variable is out of bounds, we'll send the
    client a warning (but not if the value was simply not a multiple of
    'blocksize').  sys_var_thd_ulong had this, sys_var_long_ptr_global
    didn't; broken out and streamlined to avoid duplication of code.

  strings/llstr.c@1.9, 2007-11-30 06:32:03+01:00, tnurnberg@mysql.com +6 -0
    ullstr() - the unsigned brother of llstr()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet@1.1616.3126.1, 2007-11-29 14:52:36+04:00, holyfoot@mysql.com +1 -0
  Bug #29085 A small double precision number becomes zero.
  
  Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
  So we need to enable specific mode for them so IRIX will do use
  software round to handle such numbers. 

  sql/mysqld.cc@1.356.117.4, 2007-11-29 14:52:36+04:00, holyfoot@mysql.com +17 -3
    Bug #29085 A small double precision number becomes zero.
    
    reset_floating_point_exeption() renamed as set_proper_floating_point_mode()
    #ifdef __sgi code added to enable denormalized DOUBLE-s on IRIX

ChangeSet@1.1810.3494.4, 2007-11-29 10:37:07+04:00, holyfoot@mysql.com +3 -0
  Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
  
  server status wasn't properly sent to the client after the error
  by the embedded server. Wasn't noticed before as one usually stopped
  retrieving results after he gets an error.

  libmysqld/lib_sql.cc@1.107.1.23, 2007-11-29 10:37:05+04:00, holyfoot@mysql.com +2 -0
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    server status transferred to the client after errors

  sql/protocol.cc@1.111.6.3, 2007-11-29 10:37:06+04:00, holyfoot@mysql.com +3 -2
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    set server status before net_send_error_packet() call as this
    function sends it to the client in the embedded server

  tests/mysql_client_test.c@1.167.39.2, 2007-11-29 10:37:06+04:00, holyfoot@mysql.com +14 -0
    Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.
    
    testcase added

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

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

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

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

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

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

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

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

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

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

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

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

ChangeSet@1.2604.47.1, 2007-11-28 15:37:00+04:00, gluh@mysql.com +3 -0
  Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
  added new func mysql_create_like_schema_frm() which creates frm file based on I_S table

  mysql-test/r/create.result@1.155.2.1, 2007-11-28 15:36:58+04:00, gluh@mysql.com +38 -0
    test result

  mysql-test/t/create.test@1.105.2.1, 2007-11-28 15:36:58+04:00, gluh@mysql.com +13 -0
    test case

  sql/sql_table.cc@1.446.11.5, 2007-11-28 15:36:58+04:00, gluh@mysql.com +58 -1
    added new func mysql_create_like_schema_frm() which creates frm file based on I_S table

ChangeSet@1.2604.46.1, 2007-11-28 10:00:23+01:00, istruewing@stella.local +2 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Moved disabling to rpl suite.
  Bug#32801 wait_timeout.test fails randomly
  Disabled test case.

  mysql-test/suite/rpl/t/disabled.def@1.22, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.

  mysql-test/t/disabled.def@1.281.1.21, 2007-11-28 10:00:21+01:00, istruewing@stella.local +1 -1
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Moved disabling to rpl suite.
    Bug#32801 wait_timeout.test fails randomly
    Disabled test case.

ChangeSet@1.1810.3449.37, 2007-11-28 09:48:06+01:00, istruewing@stella.local +1 -0
  Bug#29149 Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.2.4.35, 2007-11-28 09:48:04+01:00, istruewing@stella.local +1 -0
    Bug#29149 Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2604.28.9, 2007-11-28 09:03:21+01:00, thek@adventure.(none) +1 -0
  Error number increased; fixing broken number.

  mysql-test/r/grant.result@1.83.1.3, 2007-11-28 09:03:18+01:00, thek@adventure.(none) +1 -1
    Error number increased; fixing broken number.

ChangeSet@1.1810.3511.1, 2007-11-28 10:55:13+04:00, ramil@mysql.com +9 -0
  Fix for bug #32726: crash with cast in order by clause and cp932 charset
    - fix for #31070 (missed during merging) applied for cp932 charset.
    - tests/results adjusted.

  mysql-test/t/ctype_cp932.test@1.8.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/include/ctype_common.inc@1.4, 2007-11-28 10:55:11+04:00, ramil@mysql.com +2 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_big5.result@1.16, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_euckr.result@1.2.1.3, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gb2312.result@1.5, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_gbk.result@1.7, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_uca.result@1.21.2.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +4 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  mysql-test/r/ctype_cp932.result@1.6.7.1, 2007-11-28 10:55:11+04:00, ramil@mysql.com +74 -0
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - tests/results adjusted.

  strings/ctype-cp932.c@1.11.1.7, 2007-11-28 10:55:12+04:00, ramil@mysql.com +2 -2
    Fix for bug #32726: crash with cast in order by clause and cp932 charset
      - fix for #31070 (missed during merging) applied for cp932.
     

ChangeSet@1.2618, 2007-11-27 17:38:21-07:00, tsmith@ramayana.hindu.god +1 -0
  Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686
  
  This change isn't correct, and the correct one will be pulled in from another
  repository.

  client/mysql.cc@1.272.5.2, 2007-11-27 17:38:16-07:00, tsmith@ramayana.hindu.god +0 -0
    Exclude

ChangeSet@1.2604.14.42, 2007-11-28 03:02:05+03:00, sergefp@mysql.com +3 -0
  BUG#32772: partition crash 1: enum column
  The bug was that for ordered index scans, ha_partition::index_init() did
  not put index columns into table->read_set if the underlying storage 
  engine did not have HA_PARTIAL_COLUMN_READ flag. 
  This was causing assertion failure when handle_ordered_index_scan() tried
  to sort the records according to index order.
  
  Fixed by making ha_partition::index_init() put index columns into table->read_set
  for all ordered scans. 

  mysql-test/r/partition.result@1.75.1.1, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +13 -0
    BUG#32772: partition crash 1: enum column
    - Testcase

  mysql-test/t/partition.test@1.68.2.1, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +20 -0
    BUG#32772: partition crash 1: enum column
    - Testcase

  sql/ha_partition.cc@1.111, 2007-11-28 03:02:02+03:00, sergefp@mysql.com +9 -6
    BUG#32772: partition crash 1: enum column
    - Make ha_partition::index_init() include index columns in the read_set
      whenever an ordered scan is initialized, no matter if
      HA_PARTIAL_COLUMN_READ is set or not.

ChangeSet@1.1810.3510.2, 2007-11-27 21:30:00+04:00, ramil@mysql.com +2 -0
  after-merge fixup: archive test/result adjusted.

  mysql-test/r/archive.result@1.13.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

  mysql-test/t/archive.test@1.14.1.8, 2007-11-27 21:29:58+04:00, ramil@mysql.com +1 -1
    after-merge fixup: archive test/result adjusted.

ChangeSet@1.1616.3122.4, 2007-11-27 18:24:24+01:00, tnurnberg@mysql.com +1 -0
  Bug#32707: misdimensioned buffer in protocol layer
  
  Miscalculation in protocol-layer: size buffer correctly so
  even really long error messages cannot overflow our buffer.

  sql/protocol.cc@1.56.1.51, 2007-11-27 18:24:24+01:00, tnurnberg@mysql.com +4 -1
    size buffer correctly so really long error messages cannot overflow it.

ChangeSet@1.1810.3449.34, 2007-11-27 17:28:55+01:00, istruewing@stella.local +1 -0
  Bug#8693 Test 'rpl_log_pos' fails sometimes
  Disabled the test case.

  mysql-test/t/disabled.def@1.2.4.34, 2007-11-27 17:28:54+01:00, istruewing@stella.local +1 -0
    Bug#8693 Test 'rpl_log_pos' fails sometimes
    Disabled the test case.

ChangeSet@1.1810.3494.3, 2007-11-27 17:16:52+02:00, gkodinov@magare.gmz +6 -0
  Bug #30355: Incorrect ordering of UDF results
  
  There's currently no way of knowing the determinicity of an UDF.
  And the optimizer and the sequence() UDFs were making wrong
  assumptions about what the is_const member means.
  Plus there was no implementation of update_system_tables()
  causing the optimizer to overwrite the information returned by
  the <udf>_init function.
  
  Fixed by equating the assumptions about the semantics of 
  is_const and providing a implementation of update_used_tables().
  Added a TODO item for the UDF API change needed to make a better 
  implementation.

  include/mysql_com.h@1.100.7.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +4 -0
    Bug #30355: comment added

  mysql-test/r/udf.result@1.3.1.13, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +27 -0
    Bug #30355: test case

  mysql-test/t/udf.test@1.8.1.8, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +21 -0
    Bug #30355: test case

  sql/item_func.cc@1.270.83.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +6 -0
    Bug #30355: keep const_item_cache and used_tables_cache in sync

  sql/item_func.h@1.136.30.1, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +50 -0
    Bug #30355: 
     - a better implementation of update_used_tables()
     - keep const_item_cache and used_tables_cache in sync

  sql/udf_example.c@1.29.1.9, 2007-11-27 17:16:51+02:00, gkodinov@magare.gmz +4 -6
    Bug #30355: Wrong value for const_item fixed.

ChangeSet@1.1810.3508.1, 2007-11-27 19:14:48+04:00, gshchepa@gleb.loc +1 -0
  Fixed bug #32403: query causes a crash due to stack and
                    memory corruptions.
  
  The right pointer field of the SEL_ARG structure was not
  initialized in the constructor and sometimes that led to
  server crashes.
  
  There is no testcase because the bug occurs only when
  uninitialized memory has particular values, which can't be
  re-created in the test suite.

  sql/opt_range.cc@1.159.42.1, 2007-11-27 19:14:11+04:00, gshchepa@gleb.loc +4 -1
    Fixed bug #32403.
    
    The eq_tree function requires that SEL_ARG::left and
    SEL_ARG::right are equal to null pointer if SEL_ARG
    type is MAYBE_KEY, but SEL_ARG::right was not initialized
    and contained garbage.

ChangeSet@1.2604.27.12, 2007-11-27 11:02:00+01:00, mkindahl@dl145h.mysql.com +3 -0
  Disabling several tests that fail and reported as errors.

  mysql-test/suite/ndb/t/disabled.def@1.6.1.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/disabled.def@1.20, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/rpl_ssl.test@1.11.1.1, 2007-11-27 11:01:55+01:00, mkindahl@dl145h.mysql.com +6 -1
    Disabling part of test that fails.

ChangeSet@1.2604.44.1, 2007-11-27 14:01:11+04:00, svoj@mysql.com +2 -0
  BUG#32050 - table logging gone wrong.
  
  INSERT/UPDATE against CSV table created by MySQL earlier than 5.1.23
  with NULL-able column results in server crash in debug builds.
  
  Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
  but it is still possible to get such table from older MySQL versions.
  
  Fixed by removing excessive DBUG_ASSERT().

  scripts/mysql_system_tables_fix.sql@1.66, 2007-11-27 14:01:02+04:00, svoj@mysql.com +16 -0
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns.
    Alter system CSV tables structure so that all columns are NOT NULL.

  storage/csv/ha_tina.cc@1.84.1.2, 2007-11-27 14:01:02+04:00, svoj@mysql.com +0 -8
    Starting with 5.1.23 CSV doesn't permit creation of NULL-able columns,
    but it is still possible to get such table from older MySQL versions.
    
    Removed excessive DBUG_ASSERT().

ChangeSet@1.2604.43.2, 2007-11-27 12:28:08+04:00, ramil@mysql.com +4 -0
  after-merge fix:
    - archive test/result adjusted.
    - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.

  mysql-test/r/archive.result@1.36.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/r/partition.result@1.76.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +10 -0
    after-merge fix:
      - test case added.

  mysql-test/t/archive.test@1.35.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +1 -1
    after-merge fix:
      - archive test/result adjusted.

  mysql-test/t/partition.test@1.69.1.1, 2007-11-27 12:28:05+04:00, ramil@mysql.com +15 -0
    after-merge fix:
      - test case added.

ChangeSet@1.2604.1.57, 2007-11-27 09:25:45+01:00, istruewing@stella.local +7 -0
  Bug#32754 - InnoDB tests do not prepare or clean up correctly
  
  Some test cases were missing preparation to deal with failed
  predecessor test cases.
  
  Added preparation (drop table if exists) to some test cases.

  mysql-test/include/innodb_rollback_on_timeout.inc@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/r/innodb-semi-consistent.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb-ucs2.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_mysql.result@1.60.1.5, 2007-11-27 09:25:44+01:00, istruewing@stella.local +3 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/r/innodb_timeout_rollback.result@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +1 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Fixed test result.

  mysql-test/t/innodb-semi-consistent.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

  mysql-test/t/innodb-ucs2.test@1.2, 2007-11-27 09:25:44+01:00, istruewing@stella.local +4 -0
    Bug#32754 - InnoDB tests do not prepare or clean up correctly
    Added preparation (drop table if exists).

ChangeSet@1.1810.3506.1, 2007-11-27 09:36:43+04:00, ramil@mysql.com +4 -0
  Fix for bug #32559: connection hangs on query with name_const
  
  Problem: passing a non-constant name to the NAME_CONST function results in a crash.
  
  Fix: check the NAME_CONST name argument; return fake item type if we got
  non-constant argument(s).

  mysql-test/r/func_misc.result@1.21.1.9, 2007-11-27 09:36:40+04:00, ramil@mysql.com +7 -0
    Fix for bug #32559: connection hangs on query with name_const
      - test result.

  mysql-test/t/func_misc.test@1.21.2.3, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - test case.

  sql/item.cc@1.113.103.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +11 -1
    Fix for bug #32559: connection hangs on query with name_const
      - Item_name_const::type() now returns NULL_ITEM if non-constant arguments 
        were used to create the item to avoid wrong type casting.

  sql/item.h@1.183.43.1, 2007-11-27 09:36:40+04:00, ramil@mysql.com +3 -1
    Fix for bug #32559: connection hangs on query with name_const
      - NAME_CONST name argument checked for invariability.

ChangeSet@1.2613.1.2, 2007-11-26 22:50:12+01:00, hhunger@hh-nb.hhunger +2 -0
  post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.12, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +1192 -1184
    post merge fix for bug#32496.

  mysql-test/suite/funcs_1/r/ndb_views.result@1.6, 2007-11-26 22:50:08+01:00, hhunger@hh-nb.hhunger +11 -4
    post merge fix for bug#32496.

ChangeSet@1.1810.3495.2, 2007-11-26 21:28:01+01:00, hhunger@hh-nb.hhunger +5 -0
  patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  BitKeeper/etc/ignore@1.210.1.45, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +2 -0
    Added scripts/make_win_src_distribution_old server-tools/instance-manager/net_serv.cc to the ignore list

  mysql-test/suite/funcs_1/r/innodb_views.result@1.1.2.2, 2007-11-26 21:27:58+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/memory_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +11 -4
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/r/myisam_views.result@1.1.2.2, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +1158 -1150
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

  mysql-test/suite/funcs_1/views/views_master.inc@1.1.2.1, 2007-11-26 21:27:59+01:00, hhunger@hh-nb.hhunger +9 -0
    patch for bug#32496 (2nd) with ansi conformant and Mysql test case.

ChangeSet@1.2604.14.40, 2007-11-26 22:21:46+03:00, evgen@moonbone.local +4 -0
  Many files:
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/r/subselect.result@1.207, 2007-11-26 22:20:54+03:00, evgen@moonbone.local +0 -101
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/r/subselect_notembedded.result@1.3, 2007-11-26 22:21:29+03:00, evgen@moonbone.local +101 -0
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/t/subselect.test@1.160.1.10, 2007-11-26 22:21:34+03:00, evgen@moonbone.local +0 -94
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

  mysql-test/t/subselect_notembedded.test@1.3, 2007-11-26 22:21:36+03:00, evgen@moonbone.local +96 -0
    Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

ChangeSet@1.2604.27.11, 2007-11-26 20:05:52+01:00, msvensson@pilot.mysql.com +1 -0
  Remove disabling of testcases

  mysql-test/suite/rpl/t/disabled.def@1.19, 2007-11-26 20:05:50+01:00, msvensson@pilot.mysql.com +0 -2
    Remove disabling of testcases

ChangeSet@1.2604.27.10, 2007-11-26 19:50:43+01:00, msvensson@pilot.mysql.com +3 -0
  Bug#25146 Some warnings/errors not shown when using --show-warnings
   - Additional patch to fix compiler warnings

  client/mysql.cc@1.278, 2007-11-26 19:50:40+01:00, msvensson@pilot.mysql.com +3 -2
    Initialize warnings to 0 to avid compiler warning
    Call 'print_warnings' also when error occured

  mysql-test/r/mysql.result@1.43, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

  mysql-test/t/mysql.test@1.52, 2007-11-26 19:50:41+01:00, msvensson@pilot.mysql.com +1 -1
    Change test to make is possible to see that second set of warnings
    are from second invocation of mysql 

ChangeSet@1.2604.27.9, 2007-11-26 19:42:07+01:00, msvensson@pilot.mysql.com +1 -0
  Revert

  client/mysql.cc@1.277, 2007-11-26 19:42:05+01:00, msvensson@pilot.mysql.com +1 -1
    Revert

ChangeSet@1.1810.3449.32, 2007-11-26 19:16:23+01:00, istruewing@stella.local +2 -0
  Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
  Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
  Fixed wrong variable assignment.

  mysql-test/r/delayed.result@1.12.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

  mysql-test/t/delayed.test@1.11.3.1, 2007-11-26 19:16:21+01:00, istruewing@stella.local +8 -8
    Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
    Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
    Fixed wrong variable assignment.

ChangeSet@1.2573.100.1, 2007-11-26 19:09:40+01:00, thek@adventure.(none) +4 -0
  Bug#16470 crash on grant if old grant tables
  
  Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
  This caused the server to crash on any attempt to store new grants because
  of uninitialized structures.
  
  This patch breaks up the grant loading function into two phases to allow
  for procs_priv table to fail with an warning instead of crashing the server.

  mysql-test/r/grant.result@1.81.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +19 -0
    Test case

  mysql-test/t/grant.test@1.62.1.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +20 -0
    Test case making sure that FLUSH PRIVILEGES doesn't crash the server if
    procs_priv is removed.

  sql/sql_acl.cc@1.243.4.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +202 -112
    - Refactored grant_reload into two phases: 1. open and lock tables_priv and 
      columns_priv tables, read the data, close tables. 2. open and lock
      procs_priv, read data, close table. Since the tables are independant of
      each other there will be no race conditions and it will be possible to
      handle situations where the procs_priv table isn't present.
    - Refactored the helper function grant_load into new grant_load (without
      procs_priv table) and grant_load_procs_priv.
      

  sql/sql_parse.cc@1.700.14.1, 2007-11-26 19:09:38+01:00, thek@adventure.(none) +15 -16
    - Changed comment style to doxygen style.

ChangeSet@1.2615, 2007-11-26 18:46:05+01:00, msvensson@pilot.mysql.com +1 -0
  Use myisam as default storage engine when running mysqld in --bootstrap
  mode

  scripts/mysql_install_db.sh@1.88.1.1, 2007-11-26 18:46:02+01:00, msvensson@pilot.mysql.com +1 -0
    Bug#31315 mysql_install_db fails if a default table type of NDB is set in my.cnf
     - Use myisam as default storage engine when running mysqld in --bootstrap
     mode

ChangeSet@1.2604.1.55, 2007-11-26 17:31:53+01:00, istruewing@stella.local +4 -0
  Moved disabling of tests to the respective suites.

  mysql-test/suite/binlog/t/disabled.def@1.4, 2007-11-26 17:31:51+01:00, istruewing@stella.local +1 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/ndb/t/disabled.def@1.7, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/suite/rpl/t/disabled.def@1.11.1.3, 2007-11-26 17:31:51+01:00, istruewing@stella.local +2 -0
    Moved disabling of tests to the respective suites.

  mysql-test/t/disabled.def@1.281.1.19, 2007-11-26 17:31:51+01:00, istruewing@stella.local +0 -6
    Moved disabling of tests to the respective suites.

ChangeSet@1.1810.3505.1, 2007-11-26 14:09:37-02:00, davi@mysql.com +5 -0
  Bug#29592 SQL Injection issue
  
  Remove the mysql_odbc_escape_string() function. The function
  has multi-byte character escaping issues, doesn't honor the
  NO_BACKSLASH_ESCAPES mode and is not used anymore by the
  Connector/ODBC as of 3.51.17.

  include/mysql.h@1.154.7.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -10
    Remove mysql_odbc_escape_string() prototype.

  include/mysql_h.ic@1.3.1.6, 2007-11-26 14:09:35-02:00, davi@mysql.com +233 -235
    Update abi check file, mostly line changes and mysql_odbc_escape_string
    removal.

  libmysql/libmysql.c@1.233.1.16, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -72
    Remove mysql_odbc_escape_string() body.

  libmysql/libmysql.def@1.43.1.3, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

  libmysqld/libmysqld.def@1.14.1.4, 2007-11-26 14:09:35-02:00, davi@mysql.com +0 -1
    Remove mysql_odbc_escape_string()

ChangeSet@1.1810.3418.4, 2007-11-26 18:58:54+03:00, kaa@polly.(none) +6 -0
  Fix for bug #28837: MyISAM storage engine error (134) doing delete with
  self-join
  
  When doing DELETE with self-join on a MyISAM or MERGE table, it could
  happen that a record being retrieved in join_read_next_same() has
  already been deleted by previous iterations. That caused the engine's
  index_next_same() method to fail with HA_ERR_RECORD_DELETED error and
  the whole DELETE query to be aborted with an error.
  
  Fixed by suppressing the HA_ERR_RECORD_DELETED error in
  hy_myisam::index_next_same() and ha_myisammrg::index_next_same(). Since
  HA_ERR_RECORD_DELETED can only be returned by MyISAM, there is no point
  in filtering this error in the SQL layer.

  mysql-test/r/merge.result@1.43.4.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +37 -0
    Added a test case for bug #28837.

  mysql-test/r/myisam.result@1.71.14.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +22 -0
    Added a test case for bug #28837.

  mysql-test/t/merge.test@1.37.3.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +22 -0
    Added a test case for bug #28837.

  mysql-test/t/myisam.test@1.55.13.1, 2007-11-26 18:58:50+03:00, kaa@polly.(none) +17 -0
    Added a test case for bug #28837.

  sql/ha_myisam.cc@1.147.26.1, 2007-11-26 18:58:51+03:00, kaa@polly.(none) +6 -2
    Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().

  sql/ha_myisammrg.cc@1.59.18.1, 2007-11-26 18:58:51+03:00, kaa@polly.(none) +6 -2
    Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().

ChangeSet@1.2604.27.8, 2007-11-26 16:45:58+01:00, msvensson@pilot.mysql.com +1 -0
  Fix warning about possibly uninitialized variable "warnings"

  client/mysql.cc@1.276, 2007-11-26 16:45:56+01:00, msvensson@pilot.mysql.com +1 -1
    Fix warning about possibly uninitialized variable "warnings"

ChangeSet@1.1810.3504.1, 2007-11-26 18:36:05+03:00, kaa@polly.(none) +3 -0
  5.0 version of the fix for bug #9481: mysql_insert_id() returns 0 after
  insert ... select.
  
  The 5.0 manual page for mysql_insert_id() does not mention anything
  about INSERT ... SELECT, though its current behavior is incosistent
  with what the manual says about the plain INSERT.
  
  Fixed by changing the AUTO_INCREMENT and mysql_insert_id() handling
  logic in INSERT ... SELECT to be consistent with the INSERT behavior,
  the manual, and the changes in 5.1 introduced by WL3146:
  
  
  - mysql_insert_id() now returns the first automatically generated
  AUTO_INCREMENT value that was successfully inserted by INSERT ... SELECT
  
  -  if an INSERT ... SELECT statement is executed, and no automatically
  generated value is successfully inserted, mysql_insert_id() now returns
  the ID of the last inserted row.

  sql/sql_class.h@1.230.83.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +2 -1
    Replaced last_insert_id with autoinc_value_of_last_inserted_row to be
    consistent with 5.1 code.

  sql/sql_insert.cc@1.146.71.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +40 -8
    Revised the AUTO_INCREMENT and mysql_insert_id() handling logic in
    INSERT ... SELECT to be consistent with INSERT behavior, the manual, and
    changes in 5.1 introduced by WL3146:
    
    - mysql_insert_id() now returns the first automatically generated
    AUTO_INCREMENT value that was successfully inserted;
    
    -  if an INSERT ... SELECT statement is executed, and no automatically
    generated value is successfully inserted, mysql_insert_id() now returns
    the ID of the last inserted row.

  tests/mysql_client_test.c@1.167.40.1, 2007-11-26 18:36:00+03:00, kaa@polly.(none) +182 -0
    Backported the test cases related to INSERT ... SELECT and
    mysql_insert_id() from WL3146 patch to 5.0.

ChangeSet@1.2604.27.6, 2007-11-26 16:31:35+01:00, msvensson@pilot.mysql.com +1 -0
  Add suppressions for expected warning messages that appears in
  slave's error log when running rpl_extraColmaster_*.test 

  mysql-test/lib/mtr_report.pl@1.62.1.2, 2007-11-26 16:31:33+01:00, msvensson@pilot.mysql.com +9 -1
    Add suppressions for expected warning messages that appears in
    slave's error log when running rpl_extraColmaster_*.test 

ChangeSet@1.2604.41.1, 2007-11-26 16:20:37+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling testcases that have warnings that PB cannot handle.

  mysql-test/suite/rpl/t/disabled.def@1.18, 2007-11-26 16:20:34+01:00, mkindahl@dl145h.mysql.com +2 -0
    Disabling testcases that have warnings that PB cannot handle.

ChangeSet@1.2604.27.5, 2007-11-26 16:19:34+01:00, msvensson@pilot.mysql.com +1 -0
  Disable combinations processing until next version

  mysql-test/lib/mtr_cases.pl@1.70, 2007-11-26 16:19:31+01:00, msvensson@pilot.mysql.com +1 -1
    Disable combinations processing until next version

ChangeSet@1.2604.1.54, 2007-11-26 16:17:26+01:00, istruewing@stella.local +1 -0
  Bug#30751: rpl_ndb_multi missing row in output
  Disabled the test case.

  mysql-test/t/disabled.def@1.281.1.18, 2007-11-26 16:17:24+01:00, istruewing@stella.local +1 -0
    Bug#30751: rpl_ndb_multi missing row in output
    Disabled the test case.

ChangeSet@1.2604.1.53, 2007-11-26 16:12:14+01:00, istruewing@stella.local +1 -0
  Bug#32724: innodb_mysql.test fails randomly
  Disabled test case.

  mysql-test/t/disabled.def@1.281.1.17, 2007-11-26 16:12:13+01:00, istruewing@stella.local +1 -0
    Bug#32724: innodb_mysql.test fails randomly
    Disabled test case.

ChangeSet@1.2604.1.52, 2007-11-26 16:04:29+01:00, istruewing@stella.local +1 -0
  Bug#32723: grant3.test fails
  Disabled test case.

  mysql-test/t/disabled.def@1.281.1.16, 2007-11-26 16:04:27+01:00, istruewing@stella.local +1 -0
    Bug#32723: grant3.test fails
    Disabled test case.

ChangeSet@1.1810.3476.2, 2007-11-26 15:44:05+01:00, thek@adventure.(none) +1 -0
  Bug #32436 KILL QUERY completely deadlocks mysqld
  
  Sending several "KILL QUERY" statements to target a connection running
  "SELECT SLEEP" could freeze the server.
  
  The locking order in Item_func_sleep was wrong and this could lead to a
  dead lock.
  
  This patch solves the issue by resolving the locking order properly.

  sql/item_func.cc@1.270.82.1, 2007-11-26 15:44:04+01:00, thek@adventure.(none) +1 -2
    - Moved LOCK_user_locks critical region so that it doesn't share space with
      mysys_var->mutex region; this can lead to deadlock.

ChangeSet@1.2604.1.51, 2007-11-26 15:40:08+01:00, istruewing@stella.local +1 -0
  Bug#29149: Test "kill" fails on Windows
  Disabled test case.

  mysql-test/t/disabled.def@1.281.1.15, 2007-11-26 15:40:06+01:00, istruewing@stella.local +1 -0
    Bug#29149: Test "kill" fails on Windows
    Disabled test case.

ChangeSet@1.2604.27.4, 2007-11-26 15:36:23+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling failing test that has been reported as bug.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.15, 2007-11-26 15:36:20+01:00, mkindahl@dl145h.mysql.com +1 -0
    Disabling failing test.

ChangeSet@1.2604.14.38, 2007-11-26 16:06:46+02:00, gkodinov@magare.gmz +1 -0
  merge of 5.0-opt to 5.1-opt

  mysql-test/r/subselect.result@1.206, 2007-11-26 16:06:45+02:00, gkodinov@magare.gmz +41 -12
    merge of 5.0-opt to 5.1-opt

ChangeSet@1.1810.3449.31, 2007-11-26 14:49:41+01:00, istruewing@stella.local +1 -0
  Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.33, 2007-11-26 14:49:40+01:00, istruewing@stella.local +1 -0
    Bug#32357 - ndb_backup_print test fails sometimes in pushbuild
    Disabled test case

ChangeSet@1.1810.3449.30, 2007-11-26 14:48:49+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Another try to fix a compiler warning on win64.

  myisam/mi_packrec.c@1.30.19.1, 2007-11-26 14:48:48+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Another try to fix a compiler warning on win64.

ChangeSet@1.1616.3125.1, 2007-11-26 16:25:18+04:00, holyfoot@mysql.com +1 -0
  Bug #31900 Wrong confusing comment in mysql_com.h header file.
  
  comment fixed as we truly need const_item to be 1 to mark
  constant function

  include/mysql_com.h@1.67.7.1, 2007-11-26 16:25:18+04:00, holyfoot@mysql.com +5 -5
    Bug #31900 Wrong confusing comment in mysql_com.h header file.
    
    comment fixed

ChangeSet@1.1810.3502.1, 2007-11-26 13:36:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #32036: EXISTS within a WHERE clause with a UNION 
    crashes MySQL 5.122
  There was a difference in how UNIONs are handled
  on top level and when in sub-query.
  Because the rules for sub-queries were syntactically
  allowing cases that are not currently supported by
  the server we had crashes (this bug) or wrong results
  (bug 32051).
  Fixed by making the syntax rules for UNIONs match the 
  ones at top level.
  
  These rules however do not support nesting UNIONs, e.g.
  (SELECT a FROM t1 UNION ALL SELECT b FROM t2) 
   UNION
  (SELECT c FROM t3 UNION ALL SELECT d FROM t4)
  Supports for statements with nested UNIONs will be
  added in a future version.

  mysql-test/r/subselect.result@1.134.26.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +27 -8
    Bug #32036: test case

  mysql-test/t/subselect.test@1.129.17.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +30 -1
    Bug #32036: test case

  sql/sql_yacc.yy@1.371.132.1, 2007-11-26 13:36:22+02:00, gkodinov@magare.gmz +14 -27
    Bug #32036: Make the syntax rules for UNIONs in subqueries the same
    as for top level UNIONs.

ChangeSet@1.1810.3499.2, 2007-11-26 13:29:26+04:00, ramil@mysql.com +3 -0
  Fix for bug #32676: insert delayed crash with wrong column and function specified
  
  Problem: using wrong local lock type value in the mysql_insert() results in a crash. 
  
  Fix: use a proper value.

  mysql-test/r/delayed.result@1.12.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +5 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test result.

  mysql-test/t/delayed.test@1.11.2.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +9 -0
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - test case.

  sql/sql_insert.cc@1.146.70.1, 2007-11-26 13:29:25+04:00, ramil@mysql.com +2 -2
    Fix for bug #32676: insert delayed crash with wrong column and function specified
      - the local lock_type var assigment displaced just after the line 
        where the table_list->lock_type is filnally defined in the mysql_insert() 
        to avoid using its old value.

ChangeSet@1.2604.14.35, 2007-11-26 12:56:31+04:00, gluh@mysql.com +1 -0
  Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file(addon)
  result fix

  mysql-test/r/drop.result@1.35, 2007-11-26 12:56:29+04:00, gluh@mysql.com +2 -0
    result fix

ChangeSet@1.2604.33.3, 2007-11-26 09:38:42+01:00, tnurnberg@mysql.com +1 -0
  Bug#31752: check strmake() bounds
  
  strmake() called with wrong parameters:
  5.1-specific fixes.

  sql/sql_db.cc@1.163.2.1, 2007-11-26 09:38:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length

ChangeSet@1.1810.3450.5, 2007-11-26 09:13:23+01:00, tnurnberg@mysql.com +2 -0
  Bug#31752: check strmake() bounds
  
  strmake() called with wrong parameters:
  5.0-specific fixes.

  client/mysql.cc@1.199.32.1, 2007-11-26 09:13:22+01:00, tnurnberg@mysql.com +4 -1
    In debug-mode, strmake() fills unused part of buffer with
    a test-pattern. This overwrites our previous extra '\0'
    (from previous bzero()).

  sql/sp.cc@1.82.31.1, 2007-11-26 09:13:22+01:00, tnurnberg@mysql.com +1 -1
    off-by-one buffer-size.

ChangeSet@1.1616.3124.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +6 -0
  Bug#31752: check strmake() bounds
  
  strmake() calls are easy to get wrong. Add checks in extra
  debug mode to identify possible exploits.
  
  Remove some dead code.
  
  Remove some off-by-one errors identified with new checks.

  sql/log.cc@1.108.9.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing 

  sql/repl_failsafe.cc@1.32.1.32, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing 

  sql/set_var.cc@1.34.72.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +1 -1
    fix off-by-one buffer-length argument to prevent stack smashing
    (already approved, backports #31588)

  sql/sql_show.cc@1.122.1.89, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +2 -2
    misdimensioned buffers: functions further down the callstack
    expect bufsize of FN_REFLEN

  sql/unireg.cc@1.43.3.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +3 -0
    When EXTRA_DEBUG is enabled, strmake() will write funny patterns to
    buffers it operates on to identify possibly overflows. This leads to
    badness in mysql_create_frm(), so we explicitly put any unused bytes
    (back) into a defined state. Not a bug-fix, but part of the strmake()
    bug detector.

  strings/strmake.c@1.7.1.1, 2007-11-26 08:20:40+01:00, tnurnberg@mysql.com +16 -14
    strmake() takes maximum string length rather than buffer-length
    (string length + 1 to accomodate \0 terminator) as argument.
    Since this is easy to get wrong, add extra debug code to identify
    off-by-ones so we can prevent stack smashing.
    
    Alternative "BAD_STRING_COMPILER" removed after checking
    with Monty.

ChangeSet@1.2604.39.1, 2007-11-26 10:28:25+04:00, ramil@mysql.com +4 -0
  Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
  
  Problems: 
    1. looking for a matching partition we miss the fact that the maximum 
       allowed value is in the PARTITION p LESS THAN MAXVALUE.
    2. one can insert maximum value if numeric maximum value is the last range.
       (should only work if LESS THAN MAXVALUE).
    3. one cannot have both numeric maximum value and MAXVALUE string as ranges 
      (the same value, but different meanings).
  
  Fix: consider the maximum value as a supremum.

  mysql-test/r/partition.result@1.77, 2007-11-26 10:28:24+04:00, ramil@mysql.com +47 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test result.

  mysql-test/t/partition.test@1.70, 2007-11-26 10:28:24+04:00, ramil@mysql.com +39 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - test case.

  sql/partition_info.cc@1.41.1.1, 2007-11-26 10:28:24+04:00, ramil@mysql.com +7 -0
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

  sql/sql_partition.cc@1.121, 2007-11-26 10:28:24+04:00, ramil@mysql.com +9 -3
    Fix for bug #29258: Partitions: search fails for maximum unsigned bigint
      - In case of PARTITION p VALUES LESS THAN MAXVALUE consider the 
        maximium value as a supremum.

ChangeSet@1.1810.3501.2, 2007-11-24 14:57:09+04:00, holyfoot@mysql.com +2 -0
  merging fix

  mysql-test/r/gis.result@1.35.3.2, 2007-11-24 14:57:08+04:00, holyfoot@mysql.com +1 -1
    result fixed

  mysql-test/t/gis.test@1.29.3.2, 2007-11-24 14:57:08+04:00, holyfoot@mysql.com +1 -1
    test fixed

ChangeSet@1.2604.1.46, 2007-11-23 23:21:37+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  The initialization to zero via LINT_INIT made mysql.test fail.
  print_warnings() was suppressed where it should not.
  
  Fixed initialization so that it fakes warnings.

  client/mysql.cc@1.272.4.3, 2007-11-23 23:21:35+01:00, istruewing@stella.local +2 -2
    Bug#32661 - Compiler warning in client/mysql.cc
    Fixed initialization so that it fakes warnings.

ChangeSet@1.2604.1.45, 2007-11-23 18:27:05+01:00, istruewing@stella.local +1 -0
  Bug#32668 rpl_row_charset_innodb.test fails
  Re-enabled test case after fix

  mysql-test/t/disabled.def@1.281.1.12, 2007-11-23 18:27:04+01:00, istruewing@stella.local +0 -1
    Bug#32668 rpl_row_charset_innodb.test fails
    Re-enabled test case after fix

ChangeSet@1.2604.1.44, 2007-11-23 18:05:45+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  
  The test case fails on "vanilla" and "no_innodb" builds.
  These builds do not include InnoDB.
  The test case requires InnoDB.
  
  Added requirement for InnoDB into the test case, so that
  it does not start on those builds.

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.2, 2007-11-23 18:05:43+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Added requirement for InnoDB.

ChangeSet@1.2604.1.43, 2007-11-23 17:54:19+01:00, istruewing@stella.local +1 -0
  Bug#32668 - rpl_row_charset_innodb.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.281.1.11, 2007-11-23 17:54:18+01:00, istruewing@stella.local +1 -0
    Bug#32668 - rpl_row_charset_innodb.test fails
    Disabled test case

ChangeSet@1.2604.1.42, 2007-11-23 17:47:22+01:00, istruewing@stella.local +1 -0
  Bug#32667 lowercase_table3.test reports to error log
  Disabled test case

  mysql-test/t/disabled.def@1.281.1.10, 2007-11-23 17:47:20+01:00, istruewing@stella.local +1 -0
    Bug#32667 lowercase_table3.test reports to error log
    Disabled test case

ChangeSet@1.2604.1.41, 2007-11-23 17:05:16+01:00, istruewing@stella.local +1 -0
  Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
  Disabled the test case

  mysql-test/t/disabled.def@1.281.1.9, 2007-11-23 17:05:14+01:00, istruewing@stella.local +1 -0
    Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows
    Disabled the test case

ChangeSet@1.2604.1.40, 2007-11-23 16:53:31+01:00, istruewing@stella.local +1 -0
  Bug#32664 - events.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.281.1.8, 2007-11-23 16:53:29+01:00, istruewing@stella.local +1 -0
    Bug#32664 - events.test fails randomly
    Disabled test case

ChangeSet@1.2604.1.39, 2007-11-23 16:32:51+01:00, istruewing@stella.local +1 -0
  Bug#32663 binlog_multi_engine.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.281.1.7, 2007-11-23 16:32:50+01:00, istruewing@stella.local +2 -1
    Bug#32663 binlog_multi_engine.test fails randomly
    Disabled test case

ChangeSet@1.2604.1.38, 2007-11-23 16:02:51+01:00, istruewing@stella.local +1 -0
  Bug#32661 - Compiler warning in client/mysql.cc
  
  Compiler warned about possible use of uninitialized variable
  'warnings' in com_go().
  
  Added LINT_INIT for 'warnings'.

  client/mysql.cc@1.272.4.2, 2007-11-23 16:02:49+01:00, istruewing@stella.local +1 -0
    Bug#32661 - Compiler warning in client/mysql.cc
    Added LINT_INIT for 'warnings'.

ChangeSet@1.2604.1.37, 2007-11-23 15:30:04+01:00, istruewing@stella.local +1 -0
  Bug#32659 - ndb_dd_backuprestore.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.281.1.6, 2007-11-23 15:30:02+01:00, istruewing@stella.local +1 -0
    Bug#32659 - ndb_dd_backuprestore.test fails randomly
    Disabled test case

ChangeSet@1.2604.37.1, 2007-11-23 18:21:24+04:00, gluh@mysql.com +5 -0
  Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file
  disable decoding of table name if the table is internal temporary table

  mysql-test/r/drop.result@1.34, 2007-11-23 18:21:22+04:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/drop.test@1.24, 2007-11-23 18:21:22+04:00, gluh@mysql.com +13 -0
    test case

  sql/sql_db.cc@1.163.1.1, 2007-11-23 18:21:22+04:00, gluh@mysql.com +1 -0
    check is the name is internal tmp table name

  sql/sql_table.cc@1.446.11.4, 2007-11-23 18:21:22+04:00, gluh@mysql.com +3 -2
    disable decoding of table name if the table is internal temporary table

  sql/table.h@1.179.5.1, 2007-11-23 18:21:22+04:00, gluh@mysql.com +1 -0
    added flag which is true when table name is the name of internal temporary table

ChangeSet@1.2604.36.1, 2007-11-23 17:51:12+04:00, svoj@mysql.com +3 -0
  BUG#31833 - ORDER BY leads to wrong result when ARCHIVE, BLOB and
              table cache is full
  
  After reading last record from freshly opened archive table
  (e.g. after flush table, or if there is no room in table cache),
  the table is reported as crashed.
  
  The problem was that azio wrongly invalidated azio_stream when it
  meets EOF.

  mysql-test/r/archive.result@1.37, 2007-11-23 17:50:36+04:00, svoj@mysql.com +7 -0
    A test case for BUG#31833.

  mysql-test/t/archive.test@1.36, 2007-11-23 17:50:36+04:00, svoj@mysql.com +9 -0
    A test case for BUG#31833.

  storage/archive/azio.c@1.23, 2007-11-23 17:50:36+04:00, svoj@mysql.com +1 -1
    After azread() successfuly read and inflated data, it calls
    check_header() function. According to the comment it is done
    to detect concatenated .az files.
    
    When we read last record, there are no more bytes left at the
    current offset, all further my_read() calls will return 0. In
    this case check_header() wrongly sets s->z_err to Z_ERRNO,
    indicating that azio_stream is broken.
    
    Following is original condition from gzio:
    len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
    if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
    
    As fread() returns 0 on both EOF and error, the condition states:
    Invalidate gzio_stream if we got an error from last fread().
    
    Applied the same logic to azio.
    
    Note that a test case contains FLUSH TABLE t1 prior to SELECT. It is
    needed because azio doesn't flush buffers immediately. Thus we may
    azread() last record from in-memory buffer. When we read from
    in-memory buffer, EOF is detected by different branch of code in
    azread() and we never enter check_header() in this case.

ChangeSet@1.2609.1.3, 2007-11-23 13:38:59+01:00, df@pippilotta.erinye.com +1 -0
  Fix make distcheck.

  scripts/mysql_install_db.sh@1.89, 2007-11-23 13:38:54+01:00, df@pippilotta.erinye.com +19 -15
    Give precedence to basedir if both basedir and srcdir are specified, but set mysqld_opt, pkgdatadir and scriptdir always from srcdir if it is specified. This is to unbreak out-of-directory builds like make distcheck does, where we don't have binaries in srcdir.

ChangeSet@1.1810.3499.1, 2007-11-23 16:30:06+04:00, ramil@mysql.com +3 -0
  Fix for bug #32560: crash with interval function and count(*)
  
  Problem: INTERVAL function implementation doesn't handle NULL range values.
  
  Fix: skip NULL ranges looking for a proper one.

  mysql-test/r/func_set.result@1.15.1.1, 2007-11-23 16:30:04+04:00, ramil@mysql.com +30 -0
    Fix for bug #32560: crash with interval function and count(*)
      - test result.

  mysql-test/t/func_set.test@1.15, 2007-11-23 16:30:04+04:00, ramil@mysql.com +18 -1
    Fix for bug #32560: crash with interval function and count(*)
      - test case.

  sql/item_cmpfunc.cc@1.187.48.1, 2007-11-23 16:30:04+04:00, ramil@mysql.com +25 -12
    Fix for bug #32560: crash with interval function and count(*)
      - skip NULL ranges calculating INTERVAL(...).

ChangeSet@1.2604.34.1, 2007-11-23 16:27:05+04:00, gluh@mysql.com +2 -0
  Bug#32178 server crash when select from i_s and concurrent partition management
  The crash happens because we change share->partition_info where 'share' is global struct
  (it affects other threads which use the same 'share').
  It causes discrepancy between 'share' and handler data. 
  The fix:
  Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.

  sql/sql_partition.cc@1.119.1.1, 2007-11-23 16:27:03+04:00, gluh@mysql.com +9 -5
    fast_end_partition: added close_thread_tables() for the case when error occures
    fast_alter_partition_table: added close_thread_tables() for the case when error occures

  sql/sql_table.cc@1.446.11.3, 2007-11-23 16:27:03+04:00, gluh@mysql.com +38 -14
    The crash happens because we change share->partition_info where 'share' is global struct.
    It causes discrepancy between 'share' and handler data.
    The fix:
    Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.

ChangeSet@1.1810.3498.3, 2007-11-23 13:03:38+01:00, istruewing@stella.local +1 -0
  Bug#32654: rpl_view.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.32, 2007-11-23 13:03:37+01:00, istruewing@stella.local +1 -0
    Bug#32654: rpl_view.test fails randomly
    Disabled test case

ChangeSet@1.1810.3498.2, 2007-11-23 12:54:05+01:00, istruewing@stella.local +1 -0
  Bug#32653 - rpl_log.test fails randomly
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.31, 2007-11-23 12:54:04+01:00, istruewing@stella.local +1 -0
    Bug#32653 - rpl_log.test fails randomly
    Disabled test case

ChangeSet@1.1810.3498.1, 2007-11-23 12:52:29+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64. Backport from 5.1.

  myisam/mi_packrec.c@1.30.18.1, 2007-11-23 12:52:28+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64. Backport from 5.1.

ChangeSet@1.2604.27.3, 2007-11-23 12:51:14+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge fixes.

  mysql-test/r/innodb.result@1.206, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.3, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +6 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.6, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.6, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +15 -15
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.17, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +0 -3
    Enabling some tests.

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.3, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +1 -0
    Adding missing master-slave.inc, causing previous tests to pollute
    the binary log.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.14, 2007-11-23 12:51:11+01:00, mkindahl@dl145h.mysql.com +3 -5
    Enabling some tests.

ChangeSet@1.2604.14.27, 2007-11-23 13:40:53+02:00, gkodinov@magare.gmz +3 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/r/subselect.result@1.202, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +101 -0
    merge 5.0-opt -> 5.1-opt

  sql/opt_range.cc@1.291, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

  sql/sql_select.cc@1.566.6.6, 2007-11-23 13:40:51+02:00, gkodinov@magare.gmz +1 -1
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3497.2, 2007-11-23 12:28:36+01:00, istruewing@stella.local +1 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  Fixed a compiler warning on win64

  myisam/mi_packrec.c@1.30.17.1, 2007-11-23 12:28:34+01:00, istruewing@stella.local +1 -1
    BUG#31277 - myisamchk --unpack corrupts a table
    Fixed a compiler warning on win64

ChangeSet@1.2403.18.97, 2007-11-23 12:13:10+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#32652
    release subscriber

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.7, 2007-11-23 12:13:07+01:00, jonas@perch.ndb.mysql.com +1 -0
    release subscriber

ChangeSet@1.1810.3497.1, 2007-11-23 12:06:55+01:00, istruewing@stella.local +1 -0
  Bug#32651 - grant_cache.test fails
  Disabled test case

  mysql-test/t/disabled.def@1.2.4.30, 2007-11-23 12:06:53+01:00, istruewing@stella.local +1 -0
    Bug#32651 - grant_cache.test fails
    Disabled test case

ChangeSet@1.2573.76.7, 2007-11-23 13:13:37+03:00, kaa@polly.(none) +1 -0
  Fix for bug #32080: Excessive warnings on Solaris: setrlimit could not
  change the size of core files.
  
  Suppress the 'setrlimit could not change the size of the core files'
  warning in mysql-test-run. We do not want core files on some of the
  PushBuild hosts, and PushBuild itself does not set --core-files, so
  that warning is expected.

  mysql-test/lib/mtr_report.pl@1.61.2.1, 2007-11-23 13:13:27+03:00, kaa@polly.(none) +4 -1
    Suppress the 'setrlimit could not change the size of the core files'
    warning in mysql-test-run. We do not want core files on some of the
    PushBuild machines, and PushBuild itself does not set --core-files, so
    that warning is expected.

ChangeSet@1.2541.44.3, 2007-11-23 10:46:48+01:00, tomas@whalegate.ndb.mysql.com +4 -0
  bug#28445 - Heartbeat does not start until first API_REGREQ is recevied
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.55, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +29 -28
    - make sure qmgr is "fully" informed about connections so that it can handle hb correctly
    - dont allow API/mysqld node to reconnect if we have not started yet (sp 8)

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp@1.24, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +3 -0
    - move api failure handling into own method
    - add START_ORD so that hb checking can start really early

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp@1.15, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +22 -4
    - move api failure handling into own method
    - add START_ORD so that hb checking can start really early
    - Init datastructures in constructor
    - as CONNECT_REP may occur before start phases
     

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@1.57, 2007-11-23 10:46:46+01:00, tomas@whalegate.ndb.mysql.com +189 -173
    - Init datastructures in constructor
    - as CONNECT_REP may occur before start phases
    - start hb handling directly on connect rep (instead of first hb)
    
     

ChangeSet@1.2541.44.2, 2007-11-23 10:25:19+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@1.133, 2007-11-23 10:25:16+01:00, tomas@whalegate.ndb.mysql.com +52 -30
    Bug#29621 - ndb_mgmd can timeout logevent request, making it to fail

ChangeSet@1.2613, 2007-11-23 10:15:55+01:00, kent@mysql.com +4 -0
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.1 of the manual

  Docs/INSTALL-BINARY@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  INSTALL-WIN-SOURCE@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

  support-files/MacOSX/ReadMe.txt@1.3, 2007-11-23 10:14:07+01:00, kent@mysql.com +1 -1
    Updated links to version 5.1 of the manual

ChangeSet@1.1810.3395.39, 2007-11-23 00:16:17+03:00, evgen@moonbone.local +3 -0
  opt_range.cc:
    Fix for the bug#31048 for 64bit platforms.
  subselect.test, subselect.result:
    Corrected text case for the bug#31048.

  mysql-test/r/subselect.result@1.134.25.2, 2007-11-23 00:13:32+03:00, evgen@moonbone.local +6 -9
    Corrected text case for the bug#31048.

  mysql-test/t/subselect.test@1.129.16.2, 2007-11-23 00:12:16+03:00, evgen@moonbone.local +4 -6
    Corrected text case for the bug#31048.

  sql/opt_range.cc@1.159.41.5, 2007-11-23 00:14:47+03:00, evgen@moonbone.local +1 -1
    Fix for the bug#31048 for 64bit platforms.

ChangeSet@1.2604.8.13, 2007-11-22 21:39:28+01:00, istruewing@stella.local +1 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix. The merge test failed on Windows.
  The MoveFile() function returned the error code
  ERROR_ACCESS_DENIED.
  
  The fix is to use a different name for the file to be
  deleted. This is the same trick as we use for the error
  code ERROR_ALREADY_EXISTS.
  
  Added ERROR_ACCESS_DENIED to the list of error codes that
  require to change the name of the file to be deleted.

  mysys/my_delete.c@1.8, 2007-11-22 21:39:27+01:00, istruewing@stella.local +7 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added ERROR_ACCESS_DENIED to the list of error codes that
    require to change the name of the file to be deleted.

ChangeSet@1.1810.3495.1, 2007-11-22 17:48:40+01:00, kent@mysql.com +2 -0
  Makefile.am, configure.in:
    Include "manual.chm" in source TAR if it exists

  Docs/Makefile.am@1.57.1.13, 2007-11-22 17:48:11+01:00, kent@mysql.com +1 -1
    Include "manual.chm" in source TAR if it exists

  configure.in@1.245.104.1, 2007-11-22 17:46:40+01:00, kent@mysql.com +5 -0
    Include "manual.chm" in source TAR if it exists

ChangeSet@1.2573.15.6, 2007-11-22 19:22:54+03:00, kaa@polly.(none) +1 -0
  Fix for bug #29976: Excessive Slave I/O errors in replication tests
  
  Problem:
  
  The "Slave I/O thread couldn't register on master" error sporadically
  occurred in replication tests because the slave I/O thread got
  killed by STOP SLAVE before or while registering on master.
  
  Fixed by checking the state of the I/O thread, and issueing
  the error only if it was not explicitely killed by a user.

  sql/slave.cc@1.315.4.1, 2007-11-22 19:22:47+03:00, kaa@polly.(none) +13 -8
    When the slave I/O thread fails to register on master, issue an error
    message only if it is not explicitely killed by a user with STOP SLAVE.

ChangeSet@1.1810.3450.3, 2007-11-22 17:13:12+03:00, kaa@polly.(none) +1 -0
  Fixed build failures on Windows introduced by the patch for bug #32221.
  We do not have any executables in libmysql/release/ anymore.

  scripts/make_win_bin_dist@1.1.13.8, 2007-11-22 17:13:04+03:00, kaa@polly.(none) +0 -1
    Fixed build failures on Windows introduced by the patch for bug #32221.
    We do not have any executables in libmysql/release/ anymore.

ChangeSet@1.2541.44.1, 2007-11-22 14:59:16+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #29139  	missing error message for 275

  storage/ndb/src/ndbapi/ndberror.c@1.97, 2007-11-22 14:59:13+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #29139  	missing error message for 275

ChangeSet@1.1810.3437.12, 2007-11-22 10:18:19-02:00, davi@endora.local +3 -0
  Bug#32528 Global read lock with a low priority write lock causes a server crash
  
  FLUSH TABLES WITH READ LOCK fails to properly detect write locked
  tables when running under low priority updates.
  
  The problem is that when trying to aspire a global read lock, the
  reload_acl_and_cache() function fails to properly check if the thread
  has a low priority write lock, which later my cause a server crash or
  deadlock.
  
  The solution is to simple check if the thread has any type of the
  possible exclusive write locks.

  mysql-test/r/flush.result@1.16.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +17 -0
    Add test case result for Bug#32528

  mysql-test/t/flush.test@1.22.1.1, 2007-11-22 10:18:18-02:00, davi@endora.local +31 -0
    Add test case for Bug#32528

  sql/sql_parse.cc@1.426.164.3, 2007-11-22 10:18:18-02:00, davi@endora.local +1 -1
    Although it should not matter under LOCK TABLES, use TL_WRITE_ALLOW_WRITE
    to emphasize that it should fail in case of any write lock.

ChangeSet@1.2604.16.7, 2007-11-22 14:48:03+03:00, kostja@bodhi.(none) +2 -0
  Add a test case for Bug#29817. The bug was fixed by the patch for
  Bug#28318.

  mysql-test/r/skip_grants.result@1.12.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

  mysql-test/t/skip_grants.test@1.13.1.1, 2007-11-22 14:48:01+03:00, kostja@bodhi.(none) +6 -0
    Add a test case for Bug#29817

ChangeSet@1.2604.16.6, 2007-11-22 03:48:51+03:00, kostja@bodhi.(none) +2 -0
  Update the failing kill test in the team tree.

  mysql-test/r/kill.result@1.22, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Update the broken result (kill.test fails in the team tree).

  mysql-test/t/kill.test@1.30, 2007-11-22 03:48:48+03:00, kostja@bodhi.(none) +3 -1
    Fix the broken test (team tree)

ChangeSet@1.1810.3395.37, 2007-11-21 22:56:42+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32556: assert in "using index for group-by" :
                    is_last_prefix <= 0, file .\opt_range.cc.
  
  SELECT ... GROUP BY bit field failed with an assertion if the
  bit length of that field was not divisible by 8.
  

  mysql-test/r/type_bit.result@1.14.1.11, 2007-11-21 22:39:16+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32556.

  mysql-test/t/type_bit.test@1.18.1.5, 2007-11-21 22:39:04+04:00, gshchepa@gleb.loc +15 -0
    Added test case for bug #32556.

  sql/key.cc@1.34.1.9, 2007-11-21 22:38:52+04:00, gshchepa@gleb.loc +0 -13
    Fixed bug #32556.
    Copying of "uneven" bits of a bit field was duplicated in the
    key_copy() and in the Field_bit::get_key_image().
    So, instead of copying of the rest of a bit field, 
    Field_bit::get_key_image() copied "uneven" bits to key image again,
    and the lowest field byte was not copied to key at all.
    
    Duplicated code has been removed from the key_copy function.

ChangeSet@1.1810.3491.2, 2007-11-21 19:41:13+01:00, df@pippilotta.erinye.com +1 -0
  add wrong warning to suppression file

  support-files/compiler_warnings.supp@1.2.1.9, 2007-11-21 19:41:11+01:00, df@pippilotta.erinye.com +1 -0
    we want that.

ChangeSet@1.1810.3491.1, 2007-11-21 18:11:08+01:00, df@pippilotta.erinye.com +1 -0
  ignore readline warnings

  support-files/compiler_warnings.supp@1.2.1.8, 2007-11-21 18:11:04+01:00, df@pippilotta.erinye.com +5 -0
    readline is not maintained by us

ChangeSet@1.1810.3490.1, 2007-11-21 20:53:44+04:00, ramil@mysql.com +3 -0
  Fix for bug #32558: group by null-returning expression with rollup causes crash
  
  Problem: setting Item_func_rollup_const::null_value property to argument's null_value
  before (without) the argument evaluation may result in a crash due to wrong null_value.
  
  Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
  the argument if necessary and returns a proper value.

  mysql-test/r/olap.result@1.33.1.8, 2007-11-21 20:53:42+04:00, ramil@mysql.com +8 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test result.

  mysql-test/t/olap.test@1.30, 2007-11-21 20:53:42+04:00, ramil@mysql.com +9 -0
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - test case.

  sql/item_func.h@1.136.2.41, 2007-11-21 20:53:42+04:00, ramil@mysql.com +1 -1
    Fix for bug #32558: group by null-returning expression with rollup causes crash
      - use args[0]->is_null() to obtain Item_func_rollup_const::null_value 
        instead of args[0]->null_value as it's not set in advance in case of 
        constant functions.

ChangeSet@1.2604.25.1, 2007-11-21 18:52:38+02:00, gkodinov@macbook.gmz +1 -0
  Bug #31171: test alter_table, fulltext2, ps, sp fail, 
   "Table is already up to date" vs. "OK"
  
  On MacOSX 10.5 when you cast something to "bool"
  (the built in C type) it takes values 0 or 1 
  instead of 0-255 as it seems to be on older compilers.
  Fixed by removing the typecast (not needed).
  No test case needed : there are tests that test it.

  storage/myisam/mi_open.c@1.127.1.1, 2007-11-21 18:52:37+02:00, gkodinov@macbook.gmz +1 -1
    Bug #31171: don't typecast when not needed

ChangeSet@1.2604.14.22, 2007-11-21 15:56:45+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 30788 to 5.1-opt

  mysql-test/r/subselect.result@1.200, 2007-11-21 15:56:43+02:00, gkodinov@magare.gmz +1 -1
    merge of bug 30788 to 5.1-opt

ChangeSet@1.1810.3489.1, 2007-11-21 14:27:35+01:00, jperkin@mysql.com +1 -0
  configure.in:
    Revert version back to 5.0.52 for release build

  configure.in@1.245.1.218, 2007-11-21 14:26:36+01:00, jperkin@mysql.com +2 -2
    Revert version back to 5.0.52 for release build

ChangeSet@1.1810.3449.22, 2007-11-21 13:50:17+01:00, mleich@five.local.lan +6 -0
  This changeset fixes
     Bug#31567 "datadict" tests (all engines) fail:
               Reference protocol is non-standard build
     Bug#30418 "datadict" tests (all engines) fail:
               Dependency on the host name for ordering   
  Modifications:
     1. The standard builds (build team) do not contain
        the collation 'utf8_general_cs'.
        The common developer builds (compuile-....-max)
        contain this collation.
        Solution fitting to both build variants:
           Exclude the collation 'utf8_general_cs' from
           result sets.
     2. Use mysqltest builtin sorting of result set for
        the statement where the hostname affects the
        row order.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.3, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +7 -5
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc@1.1.2.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -1
    Use mysqltest builtin sorting of result set.

  mysql-test/suite/funcs_1/datadict/datadict_tables.inc@1.1.1.1, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +2 -2
    Exclude collation 'utf8_general_cs' from result set.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.4, 2007-11-21 13:50:16+01:00, mleich@five.local.lan +18 -16
    Updated  results

ChangeSet@1.2604.24.1, 2007-11-21 16:00:09+04:00, ramil@mysql.com +3 -0
  Fix for bug #32557: order by updatexml causes assertion in filesort
  
  Problem: even if an Item_xml_str_func successor returns NULL, it doesn't have 
  a corresponding property (maybe_null) set, that leads to a failed assertion.
  
  Fix: set nullability property of Item_xml_str_func.

  mysql-test/r/xml.result@1.30, 2007-11-21 16:00:05+04:00, ramil@mysql.com +7 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test result.

  mysql-test/t/xml.test@1.24, 2007-11-21 16:00:06+04:00, ramil@mysql.com +8 -0
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - test case.

  sql/item_xmlfunc.h@1.10, 2007-11-21 16:00:06+04:00, ramil@mysql.com +10 -2
    Fix for bug #32557: order by updatexml causes assertion in filesort
      - set Item_xml_str_func::maybe_null.

ChangeSet@1.1810.3488.1, 2007-11-21 11:40:05+02:00, gkodinov@magare.gmz +5 -0
  Bug #30788: Inconsistent retrieval of char/varchar
  
  Index lookup does not always guarantee that we can
  simply remove the relevant conditions from the WHERE
  clause. Reasons can be e.g. conversion errors, 
  partial indexes etc. 
  The optimizer was removing these parts of the WHERE 
  condition without any further checking.
  This leads to "false positives" when using indexes.
  Fixed by checking the index reference conditions
  (using WHERE) when using indexes with sub-queries.

  mysql-test/r/subselect.result@1.134.24.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +39 -8
    Bug #30788: 
     - using where
     - test case

  mysql-test/r/subselect3.result@1.1.1.11, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +1 -1
    Bug #30788: using where

  mysql-test/t/subselect.test@1.129.15.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +25 -0
    Bug #30788: test case

  sql/item.h@1.183.42.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +21 -1
    Bug #30788: 
     - Declare eq() method of Item_cache descendants : this is used in
     test_if_ref()
     - preserve the field that is being cached for type comparisions

  sql/sql_select.cc@1.312.181.1, 2007-11-21 11:40:04+02:00, gkodinov@magare.gmz +15 -11
    Bug #30788: Don't remove the WHERE when using index lookup 
    with subqueries.

ChangeSet@1.1810.3468.3, 2007-11-21 11:11:22+04:00, ramil@mysql.com +3 -0
  Fix for bug #30495: optimize table t1,t2,t3 extended errors
  
  Problem: we have CHECK TABLE options allowed (by accident?) for
  ANALYZE/OPTIMIZE TABLE.
  
  Fix: disable them.
  
  Note: it might require additional fixes in 5.1/6.0

  mysql-test/r/analyze.result@1.7.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +8 -0
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test result.

  mysql-test/t/analyze.test@1.10.1.1, 2007-11-21 11:11:20+04:00, ramil@mysql.com +13 -1
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - test case.

  sql/sql_yacc.yy@1.371.1.169, 2007-11-21 11:11:20+04:00, ramil@mysql.com +2 -2
    Fix for bug #30495: optimize table t1,t2,t3 extended errors
      - opt_mi_check_type (CHECK TABLE options) removed from analyze: and optimize: 

ChangeSet@1.2604.5.18, 2007-11-21 08:01:00+04:00, ramil@mysql.com +4 -0
  Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
    
  Problem: caching 00000000-00000099 dates as integer values we're 
  improperly shifting them up twice in the get_datetime_value().
    
  Fix: don't shift cached DATETIME values up for the second time.

  mysql-test/r/type_date.result@1.26.1.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +7 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test result.

  mysql-test/t/type_date.test@1.23.1.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +10 -0
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - test case.

  sql/item.h@1.270, 2007-11-21 08:00:58+04:00, ramil@mysql.com +16 -1
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - Item_cache::field_type() method added.
      - new Item_cache(enum_field_types) and Item_cache_int(enum_field_types) 
        constructors added.

  sql/item_cmpfunc.cc@1.292.2.1, 2007-11-21 08:00:58+04:00, ramil@mysql.com +6 -3
    Fix for bug #32021: Using Date 000-00-01 in WHERE causes wrong result
      - don't shift cached DATETIME values for the second time in the
        get_datetime_value():
          creating new Item_cache_int set DATETIME filed type,
          check the type before shifting.

ChangeSet@1.2598.11.1, 2007-11-20 17:03:56-07:00, tsmith@ramayana.hindu.god +3 -0
  Bug #25146: Some warnings/errors not shown when using --show-warnings
  
  In several cases, an error when processing the query would cause mysql to
  return to the top level without printing warnings.  Fix is to always
  print any available warnings before returning to the top level.

  client/mysql.cc@1.272.3.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +29 -23
    In com_go(), ensure that warnings are printed even if an error
    occurred when processing the query.  Before this patch, an error
    in several places would return to the top level without printing
    associated warnings.
    
    Attempt to avoid printing the warning, though, if it's a duplicate
    of mysql_error() for the connection handle.

  mysql-test/r/mysql.result@1.40.1.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +7 -0
    Add test for bug 25146

  mysql-test/t/mysql.test@1.49.1.1, 2007-11-20 17:03:55-07:00, tsmith@ramayana.hindu.god +18 -0
    Add test for bug 25146

ChangeSet@1.1810.3485.1, 2007-11-21 02:48:01+03:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Additional stack check for the bug#31048.

  sql/sql_select.cc@1.312.180.1, 2007-11-21 02:47:31+03:00, evgen@moonbone.local +5 -0
    Additional stack check for the bug#31048.

ChangeSet@1.2604.1.29, 2007-11-20 12:51:36-07:00, tsmith@ramayana.hindu.god +1 -0
  Minor update to allowed errors list in mysql-test's mtr_report.pl

  mysql-test/lib/mtr_report.pl@1.62.1.1, 2007-11-20 12:51:34-07:00, tsmith@ramayana.hindu.god +1 -1
    Update 'allowed errors' list to match re-formatted InnoDB error message.

ChangeSet@1.2604.23.2, 2007-11-20 17:45:49-02:00, davi@endora.local +1 -0
  This issue was fixed in Bug 30904 which includes a similar test case.

  mysql-test/t/sp_notembedded.test@1.10, 2007-11-20 17:45:47-02:00, davi@endora.local +1 -22
    Remove test case, it's not needed any more.

ChangeSet@1.2604.1.28, 2007-11-20 12:23:18-07:00, tsmith@ramayana.hindu.god +3 -0
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Fixes the following bug:
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  storage/innobase/dict/dict0dict.c@1.109, 2007-11-20 12:02:16-07:00, tsmith@ramayana.hindu.god +0 -10
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/handler/ha_innodb.cc@1.369, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +66 -47
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)
    
    
    
    Revision r2093:
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.
    
    
    Revision r2089:
    Non-functional change: convert the switch in convert_search_mode_to_innobase()
    to the InnoDB coding style.
    
    
    Revision r2092:
    Remove the unused function innobase_convert_from_filename() that was
    inadvertently added in r590.

  storage/innobase/include/page0cur.h@1.12, 2007-11-20 12:02:17-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.1-ss2093
    
    Revision r2088:
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki (via IM)

ChangeSet@1.1810.3449.21, 2007-11-20 10:53:19-07:00, tsmith@ramayana.hindu.god +12 -0
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Fixes the following bugs:
  
  - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
  
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
  
  - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
  
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.

  sql/ha_innodb.cc@1.202.55.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +37 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki
    
    
    Revision r2095:
    branches/5.0: Merge r2093 from trunk:
    
    convert_search_mode_to_innobase(): Add the missing case label
    HA_READ_MBR_EQUAL that was forgotten in r2088.

  innobase/include/db0err.h@1.10.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +12 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/os0sync.h@1.14.1.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +32 -6
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/page0cur.h@1.6.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2091:
    branches/5.0:
     
    Merge r2088 from trunk:
     
    log for r2088:
    
    Fix Bug#32125 (http://bugs.mysql.com/32125)
    "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
    
    When unknown find_flag is encountered in convert_search_mode_to_innobase()
    do not call assert(0); instead queue a MySQL error using my_error() and
    return the error code PAGE_CUR_UNSUPP. Change the functions that call
    convert_search_mode_to_innobase() to handle that error code by "canceling"
    execution and returning appropriate error code further upstream.
    
    Approved by:	Heikki

  innobase/include/sync0rw.h@1.11.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +11 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0rw.ic@1.9.6.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +6 -0
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/include/sync0sync.ic@1.18.3.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +1 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/os/os0sync.c@1.24.7.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +48 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/srv/srv0srv.c@1.87.13.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +8 -8
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0arr.c@1.20.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +60 -11
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0rw.c@1.19.4.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +17 -1
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

  innobase/sync/sync0sync.c@1.34.6.1, 2007-11-20 10:38:06-07:00, tsmith@ramayana.hindu.god +35 -5
    Applied InnoDB snapshot innodb-5.0-ss2095
    
    Revision r2082:
    branches/5.0:  bug#29560
    
    Fixed a race condition in the rw_lock where an os_event_reset()
    can overwrite an earlier os_event_set() triggering an indefinite
    wait.
    NOTE: This fix for windows is different from that for other platforms.
    NOTE2: This bug is introduced in the scalability fix to the
    sync0arr which was applied to 5.0 only. Therefore, it need not be
    applied to the 5.1 tree. If we decide to port the scalability fix
    to 5.1 then this fix should be ported as well.
    
    Reviewed by: Heikki

ChangeSet@1.1810.3484.1, 2007-11-20 19:18:21+02:00, gkodinov@magare.gmz +11 -0
  Bug #32400: Complex SELECT query returns correct result 
   only on some occasions
  
  Referencing an element from the SELECT list in a WHERE 
  clause is not permitted. The namespace of the WHERE
  clause is the table columns only. This was not enforced
  correctly when resolving outer references in sub-queries.
  
  Fixed by not allowing references to aliases in a 
  sub-query in WHERE.

  mysql-test/r/ps_6bdb.result@1.27.22.1, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/include/ps_query.inc@1.18, 2007-11-20 19:18:19+02:00, gkodinov@magare.gmz +2 -2
    Bug #32400: fixed old test queries

  mysql-test/r/ps_2myisam.result@1.39.6.7, 2007-11-20 19:18:19+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_3innodb.result@1.42.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_4heap.result@1.38.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/r/ps_5merge.result@1.39.6.7, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +12 -12
    Bug #32400: fixed old test queries

  mysql-test/r/subselect.result@1.134.1.65, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +38 -9
    Bug #32400: test case

  mysql-test/r/ps_7ndb.result@1.26.12.1, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +6 -6
    Bug #32400: fixed old test queries

  mysql-test/t/subselect.test@1.129.12.5, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +44 -6
    Bug #32400: test case

  sql/item.cc@1.113.1.179, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +1 -1
    Bug #32400: don't allow references to aliases in WHERE

  tests/mysql_client_test.c@1.167.1.74, 2007-11-20 19:18:20+02:00, gkodinov@magare.gmz +1 -1
    Bug #32400: fixed old test queries

ChangeSet@1.2604.23.1, 2007-11-20 15:17:53-02:00, davi@endora.local +9 -0
  Bug#31397 Inconsistent drop table behavior of handler tables.
  
  The problem is that DROP TABLE and other DDL statements failed to
  automatically close handlers associated with tables that were marked
  for reopen (FLUSH TABLES).
  
  The current implementation fails to properly discard handlers of
  dropped tables (that were marked for reopen) because it searches
  on the open handler tables list and using the current alias of the
  table being dropped. The problem is that it must not use the open
  handler tables list to search because the table might have been
  closed (marked for reopen) by a flush tables command and also it
  must not use the current table alias at all since multiple different
  aliases may be associated with a single table. This is specially
  visible when a user has two open handlers (using alias) of a same
  table and a flush tables command is issued before the table is
  dropped (see test case). Scanning the handler table list is also
  useless for dropping handlers associated with temporary tables,
  because temporary tables are not kept in the THD::handler_tables
  list.
  
  The solution is to simple scan the handlers hash table searching
  for, and deleting all handlers with matching table names if the
  reopen flag is not passed to the flush function, indicating that
  the handlers should be deleted. All matching handlers are deleted
  even if the associated the table is not open.

  mysql-test/include/handler.inc@1.41, 2007-11-20 15:17:51-02:00, davi@endora.local +94 -0
    Add test case for Bug#31397

  mysql-test/r/handler_innodb.result@1.23, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  mysql-test/r/handler_myisam.result@1.36, 2007-11-20 15:17:51-02:00, davi@endora.local +91 -0
    Add test case result for Bug#31397

  sql/mysql_priv.h@1.549.2.1, 2007-11-20 15:17:51-02:00, davi@endora.local +3 -6
    Rename flush functions to better match the intent of the caller and
    update functions prototypes and remove unused flags.

  sql/sql_base.cc@1.421.18.1, 2007-11-20 15:17:51-02:00, davi@endora.local +4 -4
    Rename flush functions to better match the intent of the caller.

  sql/sql_class.cc@1.347.6.1, 2007-11-20 15:17:51-02:00, davi@endora.local +1 -3
    Rename the flush functions to better match the intent of the caller.
    The hash_free function is moved to the cleanup.

  sql/sql_handler.cc@1.105, 2007-11-20 15:17:52-02:00, davi@endora.local +107 -138
    When dropping tables for a final close, scan the handler's hash table since
    the table might not be in the handlers open table list because the table was
    marked for reopen or because it's a temporary table.

  sql/sql_rename.cc@1.48, 2007-11-20 15:17:52-02:00, davi@endora.local +2 -0
    Drop handlers associated with tables that are being renamed.

  sql/sql_table.cc@1.446.12.1, 2007-11-20 15:17:52-02:00, davi@endora.local +6 -12
    Now that temporary tables are properly removed even when opened
    by a SQL HANDLER, enable the assert since this branch can't be taken
    outside of SF/trigger/prelocked mode.

ChangeSet@1.1810.3483.1, 2007-11-20 20:15:20+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32533.
  8bit escape characters, termination and enclosed characters
  were silently ignored by SELECT INTO query, but LOAD DATA INFILE
  algorithm is 8bit-clean, so data was corrupted during 
  encoding.

  mysql-test/r/outfile_loaddata.result@1.2, 2007-11-20 20:14:52+04:00, gshchepa@gleb.loc +18 -0
    Added test case for bug #32533.

  mysql-test/t/outfile_loaddata.test@1.2, 2007-11-20 20:14:51+04:00, gshchepa@gleb.loc +24 -0
    Added test case for bug #32533.

  sql/sql_class.cc@1.223.1.58, 2007-11-20 20:14:49+04:00, gshchepa@gleb.loc +10 -7
    Fixed bug #32533.
    SELECT INTO OUTFILE encoding was not 8bit clear, it
    has been fixed for a symmetry with the LOAD DATA INFILE
    decoding algorithm.

ChangeSet@1.2604.1.25, 2007-11-20 16:04:07+01:00, mleich@five.local.lan +121 -0
  Fixes for the bugs
         Bug#31610 Remove outdated and redundant tests:
                   partition_02myisam partition_03ndb
         Bug#32405 testsuite parts: partition_char_myisam wrong content
  and cleanup of testsuite
     - remove/correct wrong comments
     - remove workarounds for fixed bugs
     - replace error numbers with error names
     - exclude subtests from execution which fail now because of
       new limitations for partitioning functions
     - remove code for the no more intended dual use
       fast test in regression tests/slow test in testsuite
     - analyze and fix problems with partition_char_innodb
     - fix problems caused by last change of error numbers
     - Introduce error name to error number mapping which makes
       maintenance after next error renumbering easier

  BitKeeper/deleted/.del-partition_02myisam.result@1.9, 2007-11-20 16:01:44+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result

  BitKeeper/deleted/.del-partition_02myisam.test@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test

  BitKeeper/deleted/.del-partition_03ndb.result@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result

  BitKeeper/deleted/.del-partition_03ndb.test@1.3, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test

  BitKeeper/deleted/.del-partition_1.inc@1.5, 2007-11-20 16:01:42+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc

  BitKeeper/deleted/.del-partition_char_myisam.result@1.3, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result

  mysql-test/suite/parts/inc/methods1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -47
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc@1.8, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +0 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition.pre@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +98 -59
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_10.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_10.inc -> mysql-test/suite/parts/inc/partition_10.inc

  mysql-test/suite/parts/inc/partition_11.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_11.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_11.inc -> mysql-test/suite/parts/inc/partition_11.inc

  mysql-test/suite/parts/inc/partition_12.inc@1.3, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -8
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_12.inc@1.2, 2007-11-20 16:01:45+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_12.inc -> mysql-test/suite/parts/inc/partition_12.inc

  mysql-test/suite/parts/inc/partition_20.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +5 -10
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter1.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -41
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter2.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -72
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter3.inc@1.6, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +19 -21
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter4.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -22
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +10 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_11.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_13.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -12
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_alter_41.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +6 -14
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_basic.inc@1.5, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_binary.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +9 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_bit.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_blob.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_char.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +4 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check.inc@1.7, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +47 -92
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_drop.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read1.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_check_read2.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_cleanup.inc@1.4, 2007-11-20 16:04:02+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_directory.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -9
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_engine.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -16
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_enum.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +7 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +1 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout.inc@1.4, 2007-11-20 16:01:43+01:00, mleich@five.local.lan +0 -0
    Rename: mysql-test/include/partition_layout.inc -> mysql-test/suite/parts/inc/partition_layout.inc

  mysql-test/suite/parts/inc/partition_layout_check1.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -3
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_layout_check2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods1.inc@1.6, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_methods2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -13
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_set.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -67
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.7, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +12 -20
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_syntax_2.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +3 -11
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_text.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -1
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg1.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -5
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg2.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +4 -4
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_trigg3.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +5 -23
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_value.inc@1.5, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -2
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varbinary.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/inc/partition_varchar.inc@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +2 -0
    Fixes + cleanup

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +336 -341
    Updated result

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +128 -133
    Updated result

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +480 -485
    Updated result

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.4, 2007-11-20 16:04:03+01:00, mleich@five.local.lan +288 -293
    Updated result

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -7
    Updated result

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -5
    Updated result

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +144 -149
    Updated result

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +176 -181
    Updated result

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +205 -210
    Updated result

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +161 -166
    Updated result

  mysql-test/suite/parts/r/partition_bit_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_char_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +674 -1543
    Updated result

  mysql-test/suite/parts/r/partition_char_myisam.result@1.1, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1340 -0
    Updated result
    bk rm + new file is caused by bk complaining about filetype

  mysql-test/suite/parts/r/partition_char_myisam.result@1.0, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +0 -0

  mysql-test/suite/parts/r/partition_datetime_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_decimal_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -1
    Updated result

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +28 -33
    Updated result

  mysql-test/suite/parts/r/partition_float_innodb.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -292
    Updated result

  mysql-test/suite/parts/r/partition_float_myisam.result@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -2
    Updated result

  mysql-test/suite/parts/r/partition_int_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +5 -5
    Updated result

  mysql-test/suite/parts/r/partition_special_myisam.result@1.3, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +4 -4
    Updated result

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +115 -5
    Updated result

  mysql-test/suite/parts/t/disabled.def@1.7, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +0 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_innodb.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_myisam.test@1.6, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test@1.5, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter1_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter2_ndb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter3_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_alter4_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +1 -4
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_innodb.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_myisam.test@1.4, 2007-11-20 16:04:04+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_basic_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +4 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_bit_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -10
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_char_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +15 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_datetime_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_decimal_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -2
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_engine_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +5 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_float_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -3
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -7
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_int_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_innodb.test@1.5, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_special_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +1 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_syntax_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_innodb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_myisam.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +2 -5
    Fixes + cleanup

  mysql-test/suite/parts/t/partition_value_ndb.test@1.4, 2007-11-20 16:04:05+01:00, mleich@five.local.lan +3 -6
    Fixes + cleanup

ChangeSet@1.2541.43.1, 2007-11-20 15:08:48+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#32519
    Add *correct* check when a LCP is restorable
    by looking at maxGciStarted from LCP_FRAG_REP
    (for all fragments)
  
    bug observed by running testSystemRestart -n SR_DD_1_LCP T1
    (causes "incorrect" behaviour in 51-ndb, and crash when using 2 LCP)

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.130, 2007-11-20 15:08:46+01:00, jonas@perch.ndb.mysql.com +14 -4
    ndb - bug#32519
      Add *correct* check when a LCP is restorable
      by looking at maxGciStarted from LCP_FRAG_REP
      (for all fragments)

ChangeSet@1.1810.3482.1, 2007-11-20 16:07:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #32268: Indexed queries give bogus MIN and MAX results
  
  Loose index scan does the grouping so the temp table does 
  not need to do it, even when sorting.
  Fixed by checking if the grouping is already done before
  doing sorting and grouping in a temp table and do only 
  sorting.

  mysql-test/r/group_min_max.result@1.23.1.7, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +46 -0
    Bug #32268: test case

  mysql-test/t/group_min_max.test@1.21.1.8, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +24 -0
    Bug #32268: test case

  sql/sql_select.cc@1.312.173.8, 2007-11-20 16:07:23+02:00, gkodinov@magare.gmz +2 -1
    Bug #32268: don't group in the temp table if already done

ChangeSet@1.2403.29.1, 2007-11-20 15:02:37+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31958  	Slave stuck and stops processing relay logs

  storage/ndb/src/ndbapi/TransporterFacade.cpp@1.57.2.3, 2007-11-20 15:02:34+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31958  	Slave stuck and stops processing relay logs

ChangeSet@1.1810.3481.1, 2007-11-20 17:04:24+04:00, holyfoot@mysql.com +2 -0
  test case added for the bug #31155

  mysql-test/r/gis.result@1.35.1.16, 2007-11-20 17:04:22+04:00, holyfoot@mysql.com +6 -0
    test result complete

  mysql-test/t/gis.test@1.29.1.13, 2007-11-20 17:04:22+04:00, holyfoot@mysql.com +9 -0
    test case added for the bug

ChangeSet@1.2604.21.4, 2007-11-20 15:46:33+04:00, holyfoot@mysql.com +1 -0
  merging

  sql/mysql_priv.h@1.549.1.3, 2007-11-20 15:46:31+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1810.3480.1, 2007-11-20 11:26:16+01:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.52

  configure.in@1.245.1.217, 2007-11-20 11:26:09+01:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.52

ChangeSet@1.2604.20.1, 2007-11-20 11:21:00+01:00, mattiasj@mattias-jonssons-macbook.local +5 -0
  Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
  
  Problem was for LINEAR HASH/KEY. Crashes because of wrong partition id
  returned when creating the new altered partitions. (because of wrong
  linear hash mask)
  
  Solution: Update the linear hash mask before using it for the new
  altered table.

  mysql-test/r/partition_hash.result@1.10, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +12 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    test result

  mysql-test/t/partition_hash.test@1.12, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +16 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentatition fault
    
    test case

  sql/ha_partition.cc@1.108.1.1, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +8 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    Updating the linear hash mask before using it.

  sql/sql_partition.cc@1.118.1.2, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -1
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

  sql/sql_partition.h@1.16, 2007-11-20 11:20:55+01:00, mattiasj@mattias-jonssons-macbook.local +1 -0
    Bug#30822: ALTER TABLE COALESCE PARTITION causes segmentation fault
    
    exporting the set_linear_hash_mask function (static -> non static)

ChangeSet@1.1810.3453.4, 2007-11-20 10:25:07+01:00, guilhem@gbichot4.local +1 -0
  BUG#27850 "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER":
  this has already been closed by a note in the manual, now we
  complete this by a note in "mysqldump --help"

  client/mysqldump.c@1.214.31.1, 2007-11-20 10:25:04+01:00, guilhem@gbichot4.local +6 -2
    mention, in "mysqldump --help", of limitations reported as BUG#27850
    "mysqldump --single-transaction does not work if TRUNCATE/DROP/RENAME/ALTER"
    The new text is inspired from what the "mysqldump" section of the
    manual now says about --single-transaction:
    http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html

ChangeSet@1.2604.14.19, 2007-11-20 05:02:49+03:00, sergefp@mysql.com +3 -0
  BUG#30573: Ordered range scan over partitioned tables returns some rows twice
  The problem: ha_partition::read_range_first() could return a record that is 
  outside of the scanned range. If that record happened to be in the next 
  subsequent range, it would satisfy the WHERE and appear in the output twice.
  (we would get it the second time when scanning the next subsequent range)
  
  Fix: 
  Made ha_partition::read_range_first() check if the returned recod is within
  the scanned range, like other read_range_first() implementations do.

  mysql-test/r/partition_range.result@1.23, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +21 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
     - Testcase

  mysql-test/t/partition_range.test@1.19, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +27 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
     - Testcase

  sql/ha_partition.cc@1.110, 2007-11-20 05:02:43+03:00, sergefp@mysql.com +1 -1
    BUG#30573: Ordered range scan over partitioned tables returns some rows twice
    - Make ha_partition::read_range_first() check if the returned record is 
      within the range.

ChangeSet@1.1810.3478.1, 2007-11-19 21:05:17+00:00, evgen@moonbone.local +2 -0
  Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
  led to creating corrupted index.
  
  Corrected fix. The new method called prepare2 is added to the select_create
  class. As all preparations are done by the select_create::prepare function
  it doesn't do anything. Slightly changed algorithm of calling the 
  start_bulk_insert function. Now it's called from the select_insert::prepare2
  function when the SQL_BUFFER_RESULT flags is set.
  The is_bulk_insert_mode flag is removed as it is not needed anymore.

  sql/sql_class.h@1.230.81.1, 2007-11-19 21:05:04+00:00, evgen@moonbone.local +2 -2
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    Corrected fix. The new method called prepare2 is added to the select_create
    class. As all preparetions are done by the select_create::prepare function
    it doesn't do anything.
    The is_bulk_insert_mode flag is removed as it is not needed anymore.

  sql/sql_insert.cc@1.146.66.5, 2007-11-19 21:05:07+00:00, evgen@moonbone.local +5 -13
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index. Slightly changed algorithm of calling the
    start_bulk_insert function. Now it's called from the select_insert::prepare2
    function when the SQL_BUFFER_RESULT flags is set.
    Corrected fix. The is_bulk_insert_mode flag is removed as it is not needed
    anymore.

ChangeSet@1.2604.1.23, 2007-11-19 21:24:36+01:00, joerg@trift2. +7 -0
  The error number for ER_ILLEGAL_HA_CREATE_OPTION changed from 1477 to 1478,
  this must be reflected in the test result files.

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.6, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.6, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.5, 2007-11-19 21:24:31+01:00, joerg@trift2. +1 -1
    Error number changed, adapt the test result.

ChangeSet@1.1810.3477.1, 2007-11-19 20:00:25+00:00, evgen@moonbone.local +4 -0
  Bug#31048: Many nested subqueries may cause server crash.
  
  This bug is actually two. The first one manifests itself on an EXPLAIN
  SELECT query with nested subqueries that employs the filesort algorithm.
  The whole SELECT under explain is marked as UNCACHEABLE_EXPLAIN to preserve
  some temporary structures for explain. As a side-effect of this values of
  nested subqueries weren't cached and subqueries were re-evaluated many
  times. Each time buffer for filesort was allocated but wasn't freed because
  freeing occurs at the end of topmost SELECT. Thus all available memory was
  eaten up step by step and OOM event occur.
  The second bug manifests itself on SELECT queries with conditions where
  a subquery result is compared with a key field and the subquery itself also
  has such condition. When a long chain of such nested subqueries is present
  the stack overrun occur. This happens because at some point the range optimizer
  temporary puts the PARAM structure on the stack. Its size if about 8K and
  the stack is exhausted very fast.
  
  Now the subselect_single_select_engine::exec function allows subquery result
  caching when the UNCACHEABLE_EXPLAIN flag is set.
  Now the SQL_SELECT::test_quick_select function calls the check_stack_overrun
  function for stack checking purposes to prevent server crash.

  mysql-test/r/subselect.result@1.134.23.1, 2007-11-19 19:55:51+00:00, evgen@moonbone.local +104 -0
    Added a test case for the bug#31048: Many nested subqueries may cause server crash.

  mysql-test/t/subselect.test@1.129.14.1, 2007-11-19 19:55:43+00:00, evgen@moonbone.local +95 -0
    Added a test case for the bug#31048: Many nested subqueries may cause server crash.

  sql/item_subselect.cc@1.113.19.1, 2007-11-19 19:59:30+00:00, evgen@moonbone.local +3 -1
    Bug31048: Many nested subqueries may cause server crash.
    Now the subselect_single_select_engine::exec function allows subquery result
    caching when the UNCACHEABLE_EXPLAIN flag is set.

  sql/opt_range.cc@1.159.41.4, 2007-11-19 19:59:00+00:00, evgen@moonbone.local +6 -0
    Bug#31048: Many nested subqueries may cause server crash.
    Now the SQL_SELECT::test_quick_select function calls the check_stack_overrun
    function for stack checking purposes to preven server crash.

ChangeSet@1.1810.3395.29, 2007-11-19 21:34:21+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32282: TEXT silently truncates when value is exactly 65536
  bytes length.
  
  The server has been modified to report warnings on truncation to
  65536 bytes as usual.
  

  mysql-test/r/type_blob.result@1.49.2.7, 2007-11-19 21:34:12+04:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #32282.

  mysql-test/t/type_blob.test@1.33.1.2, 2007-11-19 21:34:12+04:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #32282.

  sql/sql_string.cc@1.91.1.9, 2007-11-19 21:34:10+04:00, gshchepa@gleb.loc +4 -1
    Fixed bug #32282.
    The well_formed_copy_nchars function returned an incorrect value
    of copied bytes of the truncated input string: extra length of
    the first truncated character added to the *from_end_pos pointer.
    That has been fixed.

ChangeSet@1.1810.3476.1, 2007-11-19 17:59:44+01:00, thek@adventure.(none) +7 -0
  Bug #31153 calling stored procedure crashes server if available memory is low
  
  When the server was out of memory it crashed because of invalid memory access.
  
  This patch adds detection for failed memory allocations and make the server
  output a proper error message.

  sql/mysqld.cc@1.439.133.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +12 -2
    Don't try to push_warning from within push_warning. It will cause a recursion
    until the stack is consumed.
    
    If my_net_init fails (for example: because of OOM) the temporary vio object 
    might have been attached to the thd object already. This will cause a double
    free on the vio object when the thd object is deleted later on and the server
    will crash.

  sql/sp_head.cc@1.200.23.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +30 -8
    Added check for out-of-memory on a 'new' operation.
    Refactored reset_lex method to return a error state code instead of void.
    Initialize the mem-root with init_sql_alloc to get a basic error handler for
    memory allocation problems. This alone won't prevent the server from crashing,
    NULL pointers have to be accounted for as well.

  sql/sp_head.h@1.79.6.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -3
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_base.cc@1.235.115.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -2
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_lex.h@1.175.1.79, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +3 -2
    Use the throw() clause in operator new, to indicate to the compiler that
    memory allocation can fail and return NULL, so that the compiler should
    generate code to check for NULL before invoking C++ constructors, to be
    crash safe.

  sql/sql_prepare.cc@1.142.1.66, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +1 -1
    Use init_sql_alloc to get basic out-of-memory error handling.

  sql/sql_yacc.yy@1.371.129.1, 2007-11-19 17:59:43+01:00, thek@adventure.(none) +118 -31
    Check for memory allocation failures where it matters.

ChangeSet@1.1810.3450.2, 2007-11-19 18:59:25+03:00, kaa@polly.(none) +13 -0
  Fix for bug #32221: bug25714, mytest, mysql_client_test complaints and
  crashes.
  
  MySQL distributions contain a number of programs that are used only by
  the MySQL test suite internally, i.e. they are not indended to be
  invoked directly by a user. As a result, such programs are not
  documented, do not have any built-in help or proper error reporting,
  which may confuse users.
  
  This patch fixes the problem with the following changes:
  - mytest, libmysqltest and all references to them were removed from the
  distribution since they are not used anymore
  - bug25714 now displays an error message when run with incorrect
  arguments or with the --help option
  - mysql_client_test now does not call abort() in case of errors,
  instead it does a clean exit() with a proper error status.

  VC++Files/copy_mysql_files.bat@1.3.2.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +0 -5
    Removed references to libmysqltest.

  BitKeeper/deleted/.del-myTest-package.dsp@1.1.1.1, 2007-11-19 17:40:05+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest-package.dsp

  BitKeeper/deleted/.del-myTest-package_ia64.dsp@1.1.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp

  BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952@1.8.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest.dsp

  BitKeeper/deleted/.del-myTest.vcproj@1.1.2.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest.vcproj

  BitKeeper/deleted/.del-myTest_ia64.dsp@1.2.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/myTest_ia64.dsp

  BitKeeper/deleted/.del-mytest.c~9a99338689e5de8@1.4.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/mytest.c

  BitKeeper/deleted/.del-mytest.dsw~2324698861155335@1.4.1.1, 2007-11-19 17:40:06+03:00, kaa@polly.(none) +0 -0
    Delete: VC++Files/libmysqltest/mytest.dsw

  BitKeeper/deleted/.del-mytest.c@1.4, 2007-11-19 17:37:30+03:00, kaa@polly.(none) +0 -0
    Delete: libmysql/mytest.c

  libmysql/CMakeLists.txt@1.1.7.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +0 -3
    Removed rules for myTest.

  libmysql/Makefile.am@1.47.1.6, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +1 -1
    Removed mytest.c from EXTRA_DIST.

  tests/bug25714.c@1.2.1.1, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +5 -1
    Display a meaningful error message when run incorrectly or with the --help option.

  tests/mysql_client_test.c@1.167.37.2, 2007-11-19 18:59:20+03:00, kaa@polly.(none) +1 -1
    In case of error, don't cause abnormal program termination, do a clean exit() with an error status.

ChangeSet@1.1810.3474.1, 2007-11-19 14:38:08+01:00, df@pippilotta.erinye.com +43 -0
  Update readline to version 5.2. This fixes bug#18431.

  cmd-line-utils/readline/INSTALL@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +15 -1
    update readline to version 5.2

  cmd-line-utils/readline/README@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +16 -2
    update readline to version 5.2

  cmd-line-utils/readline/bind.c@1.15.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +201 -109
    update readline to version 5.2

  cmd-line-utils/readline/callback.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +118 -14
    update readline to version 5.2

  cmd-line-utils/readline/chardefs.h@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +2 -4
    update readline to version 5.2

  cmd-line-utils/readline/compat.c@1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/complete.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +82 -58
    update readline to version 5.2

  cmd-line-utils/readline/configure.in@1.6, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +90 -9
    update readline to version 5.2

  cmd-line-utils/readline/display.c@1.16.1.2, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +340 -188
    update readline to version 5.2

  cmd-line-utils/readline/funmap.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/histexpand.c@1.14, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +29 -25
    update readline to version 5.2

  cmd-line-utils/readline/histfile.c@1.9.1.3, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +10 -6
    update readline to version 5.2

  cmd-line-utils/readline/history.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +95 -18
    update readline to version 5.2

  cmd-line-utils/readline/histsearch.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/input.c@1.15, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +35 -10
    update readline to version 5.2

  cmd-line-utils/readline/isearch.c@1.12, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +447 -337
    update readline to version 5.2

  cmd-line-utils/readline/keymaps.c@1.8, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/kill.c@1.11, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +22 -14
    update readline to version 5.2

  cmd-line-utils/readline/macro.c@1.10, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +18 -5
    update readline to version 5.2

  cmd-line-utils/readline/mbutil.c@1.9, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +34 -14
    update readline to version 5.2

  cmd-line-utils/readline/misc.c@1.7, 2007-11-19 14:38:05+01:00, df@pippilotta.erinye.com +203 -99
    update readline to version 5.2

  cmd-line-utils/readline/nls.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -2
    update readline to version 5.2

  cmd-line-utils/readline/parens.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -1
    update readline to version 5.2

  cmd-line-utils/readline/readline.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +299 -85
    update readline to version 5.2

  cmd-line-utils/readline/readline.h@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +41 -24
    update readline to version 5.2

  cmd-line-utils/readline/rlconf.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +4 -1
    update readline to version 5.2

  cmd-line-utils/readline/rldefs.h@1.7, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +6 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlmbutil.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +36 -2
    update readline to version 5.2

  cmd-line-utils/readline/rlprivate.h@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +139 -2
    update readline to version 5.2

  cmd-line-utils/readline/rltty.c@1.11.1.1, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +79 -10
    update readline to version 5.2

  cmd-line-utils/readline/savestring.c@1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -2
    update readline to version 5.2

  cmd-line-utils/readline/search.c@1.11, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +208 -108
    update readline to version 5.2

  cmd-line-utils/readline/shell.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +25 -15
    update readline to version 5.2

  cmd-line-utils/readline/signals.c@1.8, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +71 -7
    update readline to version 5.2

  cmd-line-utils/readline/terminal.c@1.17, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +108 -33
    update readline to version 5.2

  cmd-line-utils/readline/text.c@1.9, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +240 -133
    update readline to version 5.2

  cmd-line-utils/readline/tilde.c@1.12, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +53 -9
    update readline to version 5.2

  cmd-line-utils/readline/tilde.h@1.6, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +3 -0
    update readline to version 5.2

  cmd-line-utils/readline/undo.c@1.10.1.3, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +80 -11
    update readline to version 5.2

  cmd-line-utils/readline/util.c@1.10, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +28 -6
    update readline to version 5.2

  cmd-line-utils/readline/vi_keymap.c@1.5, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +1 -1
    update readline to version 5.2

  cmd-line-utils/readline/vi_mode.c@1.15, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +403 -131
    update readline to version 5.2

  cmd-line-utils/readline/xmalloc.c@1.8.1.2, 2007-11-19 14:38:06+01:00, df@pippilotta.erinye.com +7 -4
    update readline to version 5.2

ChangeSet@1.1810.3438.5, 2007-11-19 15:27:44+03:00, kaa@polly.(none) +1 -0
  Changed the help text for --comments to make it clear which option
  disables the option explicitely.
  Changed the option location in code so that --help will show it in
  lexical option order.
  
  This is for bug #26215: mysql command line client should not strip
  comments from SQL statements

  client/mysql.cc@1.199.30.3, 2007-11-19 15:27:40+03:00, kaa@polly.(none) +4 -4
    Changed the help text for --comments to make it clear which option
    disables the option explicitely.
    Changed the option location in code so that --help will show it in
    lexical option order.

ChangeSet@1.2541.9.29, 2007-11-19 13:11:03+01:00, jonas@perch.ndb.mysql.com +1 -0
  remove debug printout

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.171, 2007-11-19 13:11:01+01:00, jonas@perch.ndb.mysql.com +0 -2
    remove debug printout

ChangeSet@1.2541.9.28, 2007-11-19 11:10:36+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#22696
    additional (not stricly necessary for this bug...)
    only send EXEC_SRCONF to node *in* SR

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.170, 2007-11-19 11:10:33+01:00, jonas@perch.ndb.mysql.com +4 -11
    ndb - bug#22696
      additional (not stricly necessary for this bug...)
      only send EXEC_SRCONF to node *in* SR

ChangeSet@1.2541.41.1, 2007-11-19 10:47:26+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#22696
    Fix handling of multiple redo phases
    - set correct state
    - handle 4 phases, by moving START_FRAGCONF to end of phase instead of beginning...

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.74, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +7 -12
    remove unused state ACTIVE_REMOVE_AFTER
    remove unused variable nextLcp
    remove unused methods (BUILD_INDX)
    add counter of outstanding GSN_EXEC_FRAGREQ
    remove c_redo_complete_fragments cause it fits badly with functional multi-redo-phases

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.31, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +0 -4
    remove unused stuff

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.169, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +47 -154
    1) set correct state before starting next non-empty REDO phase
    2) move GSN_START_FRAGCONF to execFRAGCONF instead of when sending GSN_EXEC_FRAGREQ
       or fragments with 4 redo-phases would never be complete...

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.20, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +39 -2
    testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.111, 2007-11-19 10:47:23+01:00, jonas@perch.ndb.mysql.com +3 -0
    testcase

ChangeSet@1.2604.14.16, 2007-11-19 12:42:25+04:00, gluh@mysql.com +1 -0
  Bug#32158 Crash in open_table_from_share, on mysql_unpack_partition errors
  added check for the result of mysql_unpack_partition()

  sql/table.cc@1.307.7.1, 2007-11-19 12:42:23+04:00, gluh@mysql.com +9 -3
    added check for the result of mysql_unpack_partition()

ChangeSet@1.1616.3123.1, 2007-11-19 11:03:03+04:00, holyfoot@mysql.com +3 -0
  Bug #30284 spatial key corruption.
  
  SPATIAL key is fine actually, but the chk_key() function
  mistakenly returns error. It tries to compare checksums
  of btree and SPATIAL keys while the checksum for the SPATIAL isn't
  calculated (always 0). Same thing with FULLTEXT keys is handled
  using full_text_keys counter, so fixed by counting both
  SPATIAL and FULLTEXT keys in that counter.

  mysql-test/r/gis.result@1.15.3.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +8 -0
    Bug #30284 spatial key corruption
    
    test result

  mysql-test/t/gis.test@1.17.2.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +11 -0
    Bug #30284 spatial key corruption.
    
    test case

  myisam/mi_check.c@1.105.10.1, 2007-11-19 11:03:01+04:00, holyfoot@mysql.com +1 -1
    Bug #30284 spatial key corruption
    
    full_text_keys counts both FULL_TEXT and SPATIAL keys

ChangeSet@1.2604.18.1, 2007-11-18 20:28:37+01:00, istruewing@stella.local +3 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  
  Post-pushbuild fix for a Valgrind warning.

  mysql-test/r/merge.result@1.70, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/merge.test@1.58, 2007-11-18 20:28:35+01:00, istruewing@stella.local +0 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed unnecessary statements from test.

  sql/sql_trigger.cc@1.107, 2007-11-18 20:28:35+01:00, istruewing@stella.local +5 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed usage of db and table_name for
    close_data_files_and_morph_locks().

ChangeSet@1.2604.15.3, 2007-11-18 17:33:12+04:00, holyfoot@mysql.com +1 -0
  test fixed

  mysql-test/r/windows.result@1.15, 2007-11-18 17:33:10+04:00, holyfoot@mysql.com +1 -0
    test fixed

ChangeSet@1.2604.15.2, 2007-11-18 00:32:06+04:00, holyfoot@mysql.com +3 -0
  Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
  
  failing 'INSTALL PLUGIN' statement doesn't work in embedded server
  as we disable library loading there.
  Fixed by enabling loading libraries (#define HAVE_DLOPEN), what also
  makes UDF working in the embedded server.

  include/mysql_embed.h@1.15, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +0 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    Let loading libraries in the embedded server

  libmysqld/CMakeLists.txt@1.18, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +1 -1
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    let loading libraries in the embedded server

  mysql-test/t/windows.test@1.12, 2007-11-18 00:32:04+04:00, holyfoot@mysql.com +3 -0
    Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server
    
    make sure proc_1() doesn't exists before we start

ChangeSet@1.1810.3473.1, 2007-11-18 00:02:55+04:00, gshchepa@gleb.loc +3 -0
  Fixed bug #32335.
  Comparison of a BIGINT NOT NULL column with a constant arithmetic
  expression that evaluates to NULL caused error 1048: "Column '...'
  cannot be null".
  
  Made convert_constant_item() check if the constant expression is NULL
  before attempting to store it in a field. Attempts to store NULL in a
  NOT NULL field caused query errors.

  mysql-test/r/select.result@1.121.1.40, 2007-11-18 00:01:31+04:00, gshchepa@gleb.loc +6 -0
    Added test case for bug #32335.

  mysql-test/t/select.test@1.102.1.35, 2007-11-18 00:01:30+04:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #32335.

  sql/item_cmpfunc.cc@1.187.46.3, 2007-11-18 00:01:29+04:00, gshchepa@gleb.loc +2 -1
    Fixed bug #32335.
    1. Made convert_constant_item() check if the constant expression is NULL
       before attempting to store it in a field. Attempts to store NULL in
       a NOT NULL field caused query errors.
    
    2. Also minor bug has been fixed: the thd->count_cuted_fields value
       was not restored in case of successful conversion.

ChangeSet@1.2564.31.2, 2007-11-17 19:42:16+01:00, tnurnberg@mysql.com +2 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  post-merge fixes: some things work differently in 5.1

  mysql-test/r/type_newdecimal.result@1.63, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: 5.1 throws different warning here

  sql/sql_select.cc@1.564.1.2, 2007-11-17 19:42:14+01:00, tnurnberg@mysql.com +1 -1
    post-merge fix: signature has changed in 5.1

ChangeSet@1.1810.3472.1, 2007-11-17 19:05:31+01:00, tnurnberg@mysql.com +3 -0
  Bug#24907: unpredictable (display) precission, if input precission increases
  
  Server failed in assert() when we tried to create a DECIMAL() temp field
  with a scale of more than the allowed 30. Now we limit the scale to the
  allowed maximum. A truncation warning is thrown as necessary.

  mysql-test/r/type_newdecimal.result@1.36.1.15, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -0
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  mysql-test/t/type_newdecimal.test@1.33.1.16, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +20 -1
    Show that out of range DECIMAL temp fields will no longer
    stop the server with an assert. 

  sql/sql_select.cc@1.312.179.1, 2007-11-17 19:05:29+01:00, tnurnberg@mysql.com +36 -2
    When creating DECIMAL() temp field, ascertain we stay within allowed
    limits. If not, truncate and warn.

ChangeSet@1.1810.3471.2, 2007-11-17 17:11:05+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/gis.result@1.35.1.15, 2007-11-17 17:11:04+04:00, holyfoot@mysql.com +2 -64
    merging

ChangeSet@1.2604.8.11, 2007-11-17 11:20:50+04:00, ramil@mysql.com +3 -0
  Fix for bug #32260: User variables in query cause server crash
    
  Problem: there's no guarantee that the user variable item's result_field
  is assigned when we're adjusting its table read map.
    
  Fix: check the result_field before using it.

  mysql-test/r/user_var.result@1.49, 2007-11-17 11:20:48+04:00, ramil@mysql.com +11 -0
    Fix for bug #32260: User variables in query cause server crash
      - test result.

  mysql-test/t/user_var.test@1.45, 2007-11-17 11:20:48+04:00, ramil@mysql.com +21 -0
    Fix for bug #32260: User variables in query cause server crash
      - test case.

  sql/item_func.cc@1.427.2.1, 2007-11-17 11:20:48+04:00, ramil@mysql.com +2 -1
    Fix for bug #32260: User variables in query cause server crash
      - using the result_field ensure it is set.

ChangeSet@1.1810.3425.14, 2007-11-16 14:56:37-07:00, tsmith@ramayana.hindu.god +1 -0
  Eliminate 'unused variable' warnings when compiling non-debug build

  mysys/default.c@1.72.1.20, 2007-11-16 14:56:35-07:00, tsmith@ramayana.hindu.god +12 -3
    Eliminate 'unused variable' warnings when compiling non-debug build

ChangeSet@1.2604.5.15, 2007-11-16 18:05:30+01:00, istruewing@stella.local +2 -0
  Bug#32443 - trigger.test produces warnings files
  
  Wrong syntax for mysqltest commands was used in test file.
  
  Fixed test.

  mysql-test/r/trigger.result@1.74, 2007-11-16 18:05:28+01:00, istruewing@stella.local +0 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test result

  mysql-test/t/trigger.test@1.84, 2007-11-16 18:05:28+01:00, istruewing@stella.local +2 -2
    Bug#32443 - trigger.test produces warnings files
    Fixed test

ChangeSet@1.1810.3469.1, 2007-11-16 17:43:15+01:00, tnurnberg@mysql.com +3 -0
  Bug #32180: DATE_ADD treats datetime numeric argument as DATE instead of DATETIME
  
  This is a regression from 2007-05-18 when code to zero out the returned struct was
  added to number_to_datetime(); zero for time_type corresponds to MYSQL_TIMESTAMP_DATE.
  We now explicitly set the type we return (MYSQL_TIMESTAMP_DATETIME).

  mysql-test/r/func_time.result@1.47.1.38, 2007-11-16 17:43:13+01:00, tnurnberg@mysql.com +12 -0
    show that DATE_ADD() behaves the same for YYYYMMDDhhmmss given
    as string and as integer.

  mysql-test/t/func_time.test@1.41.1.31, 2007-11-16 17:43:14+01:00, tnurnberg@mysql.com +10 -0
    show that DATE_ADD() behaves the same for YYYYMMDDhhmmss given
    as string and as integer.

  sql-common/my_time.c@1.19.18.1, 2007-11-16 17:43:14+01:00, tnurnberg@mysql.com +8 -1
    explictly set return type in number_to_datetime()

ChangeSet@1.1810.3449.17, 2007-11-16 17:36:13+01:00, joerg@trift2. +1 -0
  In the "spec" file for RPM builds, handle the debug server tests different from the standard server.

  support-files/mysql.spec.sh@1.99.1.75, 2007-11-16 17:36:11+01:00, joerg@trift2. +5 -1
    Don't use the "test-bt" target to run the tests on the debug server,
    rather use "test-bt-debug".
    
    There are two reasons for this:
    1) Consistency with the "tar.gz" builds.
    2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
       or else it will fail when it generates the test status summary.

ChangeSet@1.2604.17.1, 2007-11-16 15:55:22+01:00, mkindahl@dl145h.mysql.com +4 -0
  Bug#32435:
  DROP DATABASE statement writes changes to mysql.proc table under RBR
  
  When replicating a DROP DATABASE statement with a database holding
  stored procedures, the changes to the mysql.proc table was recorded
  in the binary log under row-based replication.
  
  With this patch, the thread uses statement-logging format for the
  duration of the DROP DATABASE statement. The logging format is
  (already) reset at the end of the statement, so no additional code
  for resetting the logging format is necessary.

  mysql-test/extra/binlog_tests/database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +15 -0
    New BitKeeper file ``mysql-test/extra/binlog_tests/database.test''

  mysql-test/extra/binlog_tests/database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_database.result@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +56 -0
    New BitKeeper file ``mysql-test/suite/binlog/r/binlog_database.result''

  mysql-test/suite/binlog/r/binlog_database.result@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/suite/binlog/t/binlog_database.test@1.1, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +12 -0
    New BitKeeper file ``mysql-test/suite/binlog/t/binlog_database.test''

  mysql-test/suite/binlog/t/binlog_database.test@1.0, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +0 -0

  sql/sql_db.cc@1.164, 2007-11-16 15:55:19+01:00, mkindahl@dl145h.mysql.com +7 -0
    Clearing the row-based statement flag for the DROP DATABASE statement
    since it should always be replicated as a statement.

ChangeSet@1.1810.3418.3, 2007-11-16 13:58:09+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32241: memory corruption due to large index map in 'Range
  checked for each record'
  
  The problem was in incorrectly calculated length of the buffer used to
  store a hexadecimal representation of an index map in
  select_describe(). This could result in buffer overrun and stack
  corruption under some circumstances.
  
  Fixed by correcting the calculation.

  mysql-test/r/explain.result@1.17.1.4, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +20 -0
    Added a test case for bug #32241.

  mysql-test/t/explain.test@1.10.1.3, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +28 -0
    Added a test case for bug #32241.

  sql/sql_select.cc@1.312.174.2, 2007-11-16 13:58:06+03:00, kaa@polly.(none) +2 -1
    Corrected the buffer length calculation. Count one hex digit as 4 bits,
    not 8.

ChangeSet@1.1810.3467.1, 2007-11-16 14:46:36+04:00, gluh@mysql.com +3 -0
  Bug#30294 blackhole engine causes 100% with 2 alter table statements running
  Implement neccessary shared lock structure for table locks.
  This is the backport of bug26241 fix.

  sql/handler.cc@1.167.1.73, 2007-11-16 14:46:35+04:00, gluh@mysql.com +4 -0
    added BLACKHOLE_DB case

  sql/ha_blackhole.cc@1.21.6.1, 2007-11-16 14:46:35+04:00, gluh@mysql.com +112 -10
    Implement neccessary shared lock structure for table locks.

  sql/ha_blackhole.h@1.5.4.1, 2007-11-16 14:46:35+04:00, gluh@mysql.com +16 -2
    Declare shared structure for table locks

ChangeSet@1.1810.3465.1, 2007-11-16 10:43:59+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32429 ssl_cipher setting in my.cnf not read by libmysqlclient

  sql-common/client.c@1.83.19.1, 2007-11-16 10:43:58+01:00, msvensson@pilot.mysql.com +5 -0
    Store ssl_cipher setting read from my.cnf into "option->ssl_cipher"

ChangeSet@1.2604.8.10, 2007-11-15 20:25:43+01:00, istruewing@stella.local +35 -0
  Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
              corrupts a MERGE table
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  Bug 25038 - Waiting TRUNCATE
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  Bug 19627 - temporary merge table locking
  Bug 27660 - Falcon: merge table possible
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
  The problems were:
  
  Bug 26379 - Combination of FLUSH TABLE and REPAIR TABLE
                  corrupts a MERGE table
  
    1. A thread trying to lock a MERGE table performs busy waiting while
       REPAIR TABLE or a similar table administration task is ongoing on
       one or more of its MyISAM tables.
    
    2. A thread trying to lock a MERGE table performs busy waiting until all
       threads that did REPAIR TABLE or similar table administration tasks
       on one or more of its MyISAM tables in LOCK TABLES segments do UNLOCK
       TABLES. The difference against problem #1 is that the busy waiting
       takes place *after* the administration task. It is terminated by
       UNLOCK TABLES only.
    
    3. Two FLUSH TABLES within a LOCK TABLES segment can invalidate the
       lock. This does *not* require a MERGE table. The first FLUSH TABLES
       can be replaced by any statement that requires other threads to
       reopen the table. In 5.0 and 5.1 a single FLUSH TABLES can provoke
       the problem.
  
  Bug 26867 - LOCK TABLES + REPAIR + merge table result in
              memory/cpu hogging
  
    Trying DML on a MERGE table, which has a child locked and
    repaired by another thread, made an infinite loop in the server.
  
  Bug 26377 - Deadlock with MERGE and FLUSH TABLE
  
    Locking a MERGE table and its children in parent-child order
    and flushing the child deadlocked the server.
  
  Bug 25038 - Waiting TRUNCATE
  
    Truncating a MERGE child, while the MERGE table was in use,
    let the truncate fail instead of waiting for the table to
    become free.
  
  Bug 25700 - merge base tables get corrupted by
              optimize/analyze/repair table
  
    Repairing a child of an open MERGE table corrupted the child.
    It was necessary to FLUSH the child first.
  
  Bug 30275 - Merge tables: flush tables or unlock tables
              causes server to crash
  
    Flushing and optimizing locked MERGE children crashed the server.
  
  Bug 19627 - temporary merge table locking
  
    Use of a temporary MERGE table with non-temporary children
    could corrupt the children.
  
    Temporary tables are never locked. So we do now prohibit
    non-temporary chidlren of a temporary MERGE table.
  
  Bug 27660 - Falcon: merge table possible
  
    It was possible to create a MERGE table with non-MyISAM children.
  
  Bug 30273 - merge tables: Can't lock file (errno: 155)
  
    This was a Windows-only bug. Table administration statements
    sometimes failed with "Can't lock file (errno: 155)".
  
  These bugs are fixed by a new implementation of MERGE table open.
  
  When opening a MERGE table in open_tables() we do now add the
  child tables to the list of tables to be opened by open_tables()
  (the "query_list"). The children are not opened in the handler at
  this stage.
  
  After opening the parent, open_tables() opens each child from the
  now extended query_list. When the last child is opened, we remove
  the children from the query_list again and attach the children to
  the parent. This behaves similar to the old open. However it does
  not open the MyISAM tables directly, but grabs them from the already
  open children.
  
  When closing a MERGE table in close_thread_table() we detach the
  children only. Closing of the children is done implicitly because
  they are in thd->open_tables.
  
  For more detail see the comment at the top of ha_myisammrg.cc.
  
  Changed from open_ltable() to open_and_lock_tables() in all places
  that can be relevant for MERGE tables. The latter can handle tables
  added to the list on the fly. When open_ltable() was used in a loop
  over a list of tables, the list must be temporarily terminated
  after every table for open_and_lock_tables().
  table_list->required_type is set to FRMTYPE_TABLE to avoid open of
  special tables. Handling of derived tables is suppressed.
  These details are handled by the new function
  open_n_lock_single_table(), which has nearly the same signature as
  open_ltable() and can replace it in most cases.
  
  In reopen_tables() some of the tables open by a thread can be
  closed and reopened. When a MERGE child is affected, the parent
  must be closed and reopened too. Closing of the parent is forced
  before the first child is closed. Reopen happens in the order of
  thd->open_tables. MERGE parents do not attach their children
  automatically at open. This is done after all tables are reopened.
  So all children are open when attaching them.
  
  Special lock handling like mysql_lock_abort() or mysql_lock_remove()
  needs to be suppressed for MERGE children or forwarded to the parent.
  This depends on the situation. In loops over all open tables one
  suppresses child lock handling. When a single table is touched,
  forwarding is done.
  
  Behavioral changes:
  ===================
  
  This patch changes the behavior of temporary MERGE tables.
  Temporary MERGE must have temporary children.
  The old behavior was wrong. A temporary table is not locked. Hence
  even non-temporary children were not locked. See
  Bug 19627 - temporary merge table locking.
  
  You cannot change the union list of a non-temporary MERGE table
  when LOCK TABLES is in effect. The following does *not* work:
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ...;
  LOCK TABLES t1 WRITE, t2 WRITE, m1 WRITE;
  ALTER TABLE m1 ... UNION=(t1,t2) ...;
  However, you can do this with a temporary MERGE table.
  
  You cannot create a MERGE table with CREATE ... SELECT, neither
  as a temporary MERGE table, nor as a non-temporary MERGE table.
  CREATE TABLE m1 ... ENGINE=MRG_MYISAM ... SELECT ...;
  Gives error message: table is not BASE TABLE.

  include/my_base.h@1.107.2.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +7 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN.

  include/myisammrg.h@1.21, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added element 'children_attached' to MYRG_INFO.
    Added declarations for myrg_parent_open(),
    myrg_attach_children() and myrg_detach_children()
    for the new MERGE table open approach.

  mysql-test/extra/binlog_tests/blackhole.test@1.23, 2007-11-15 20:25:40+01:00, istruewing@stella.local +9 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Preliminarily added new error message with a comment.

  mysql-test/r/create.result@1.155.1.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/r/delayed.result@1.17, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result from here to merge.result.

  mysql-test/r/merge-big.result@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +77 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test result

  mysql-test/r/merge-big.result@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/r/merge.result@1.69, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1080 -14
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed/added test result.

  mysql-test/r/myisam.result@1.117, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -18
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test result for bug 8306 from here to merge.result.

  mysql-test/suite/binlog/r/binlog_stm_blackhole.result@1.22, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test result.

  mysql-test/t/create.test@1.105.1.1, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed error number.

  mysql-test/t/delayed.test@1.22, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test from here to merge.test.

  mysql-test/t/merge-big.test@1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +150 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table
    New test case

  mysql-test/t/merge-big.test@1.0, 2007-11-15 20:25:41+01:00, istruewing@stella.local +0 -0

  mysql-test/t/merge.test@1.57, 2007-11-15 20:25:40+01:00, istruewing@stella.local +841 -6
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed test for new temporary MERGE table behavior.
    Exchanged error numbers by symbolic codes.
    Added tests. Included are tests for bugs
    8306 (moved from myisam.test), 26379, 19627, 25038, 25700, 26377,
    26867, 27660, 30275, and 30273.
    Fixed changes resulting from disabled CREATE...SELECT.
    Integrated tests moved from delayed.test and myisam.test to here.

  mysql-test/t/myisam.test@1.92, 2007-11-15 20:25:40+01:00, istruewing@stella.local +0 -26
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Moved test for bug 8306 from here to merge.test.

  mysys/thr_lock.c@1.62, 2007-11-15 20:25:40+01:00, istruewing@stella.local +23 -10
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code to let the owner of a high priority lock (TL_WRITE_ONLY)
    to bypass its own lock.

  sql/ha_ndbcluster_binlog.cc@1.133.2.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/handler.cc@1.322.12.2, 2007-11-15 20:25:40+01:00, istruewing@stella.local +6 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/mysql_priv.h@1.551, 2007-11-15 20:25:41+01:00, istruewing@stella.local +20 -4
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Removed declaration of check_merge_table_access(). It is now static
    in sql_parse.cc.
    Added declaration for fix_merge_after_open().
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'.
    Added inline functions simple_open_n_lock_tables() and
    open_and_lock_tables(), which call open_and_lock_tables_derived()
    and add the argument for 'derived'.
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Added 'thd' argument to init_tmp_table_share().

  sql/slave.cc@1.315.3.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +6 -0
    ug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added comment.

  sql/sql_base.cc@1.421.17.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +984 -88
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Defined new functions add_merge_table_list(),
    attach_merge_children(), detach_merge_children(), and
    fix_merge_after_open() for the new MERGE table open approach.
    
    Added calls of the new functions to
    close_handle_and_leave_table_as_lock(), close_thread_tables(),
    close_thread_table(), unlink_open_table(), reopen_name_locked_table(),
    reopen_table(), drop_locked_tables(), close_temporary_table(),
    and open_tables() respectively.
    
    Prevented special lock handling of merge children (like
    mysql_lock_remove, mysql_lock_merge or mysql_lock_abort)
    at many places. Some of these calls are forwarded to the
    parent table instead.
    
    Added code to set thd->some_tables_deleted for every thread that has
    a table open that we are flushing.
    Added code for MERGE tables to unlink_open_table().
    Added MERGE children to the list of unusable tables in open_table().
    Added MERGE table handling to reopen_table().
    Added lock handling and closing of a parent before the children
    in close_data_files_and_morph_locks().
    Added code for re-attaching children in reopen_tables().
    Added MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN to the locking flags and
    error reporting after mysql_lock_tables() in reopen_tables().
    Added lock handling and closing of a parent before the children
    in close_old_data_files().
    Added lock handling and detaching in drop_locked_tables().
    Added code for removing the children list from the statement list
    to prepare for a repetition in open_tables().
    Added new function open_n_lock_single_table(), which can be used
    as an replacement for open_ltable() in most situations. Internally
    it calls simple_open_n_lock_tables() so hat it is appropriate for
    MERGE tables.
    Disabled use of open_ltable() for MERGE tables.
    Removed function simple_open_n_lock_tables(). It is now inline
    declared in mysql_priv.h.
    Renamed open_and_lock_tables() to open_and_lock_tables_derived()
    with additional parameter 'derived'. open_and_lock_tables() is now
    inline declared in mysql_priv.h.
    Added a check for end-of-list in two loops in lock_tables().
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_insert.cc@1.299.3.2, 2007-11-15 20:25:41+01:00, istruewing@stella.local +12 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Changed from open_ltable() to open_n_lock_single_table() in
    handle_delayed_insert().
    Reestablished LEX settings after lex initialization.
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_parse.cc@1.700.4.10, 2007-11-15 20:25:41+01:00, istruewing@stella.local +53 -20
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Made check_merge_table_access() a static function.
    Disabled use of CREATE...SELECT for MERGE tables.

  sql/sql_partition.cc@1.118.1.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Fixed comment typo.

  sql/sql_select.cc@1.566.7.1, 2007-11-15 20:25:41+01:00, istruewing@stella.local +1 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().

  sql/sql_table.cc@1.446.7.6, 2007-11-15 20:25:41+01:00, istruewing@stella.local +75 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Optimized use of mysql_ha_flush() in mysql_rm_table_part2().
    Disabled the use of MERGE tables with prepare_for_restore() and
    prepare_for_repair().
    Changed from open_ltable() to open_n_lock_single_table() in
    mysql_alter_table() and mysql_checksum_table().
    Disabled change of child list under LOCK TABLES.
    Initialized table_list->table in mysql_recreate_table().

  sql/sql_trigger.cc@1.106, 2007-11-15 20:25:41+01:00, istruewing@stella.local +39 -5
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added code for allowing CREATE TRIGGER under LOCK TABLE, to be able
    to test it with MERGE tables.

  sql/table.cc@1.307.1.8, 2007-11-15 20:25:41+01:00, istruewing@stella.local +27 -2
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added 'thd' argument to init_tmp_table_share().
    Setting table_map_id from query_id in init_tmp_table_share().
    Added member function TABLE::is_children_attached().

  sql/table.h@1.179.1.8, 2007-11-15 20:25:41+01:00, istruewing@stella.local +33 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added access method get_table_def_version() to TABLE_SHARE.
    Added elements for MERGE tables to TABLE and TABLE_LIST.

  storage/myisam/ha_myisam.cc@1.233, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added an unrelated comment to the function comment of table2myisam().

  storage/myisam/ha_myisam.h@1.89, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added new member function MI_INFO::file_ptr().

  storage/myisammrg/ha_myisammrg.cc@1.125, 2007-11-15 20:25:41+01:00, istruewing@stella.local +580 -90
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added callback functions to support parent open and children attach
    of MERGE tables.
    Changed ha_myisammrg::open() to initialize storage engine structures
    and create a list of child tables only. Child tables are not opened.
    Added ha_myisammrg::attach_children(), which does now the main part
    of MERGE open.
    Added ha_myisammrg::detach_children().
    Added calls to ::attach_children() and ::detach_children() to
    ::extra() on HA_EXTRA_ATTACH_CHILDREN and HA_EXTRA_DETACH_CHILDREN
    respectively.
    Added a check for matching TEMPORARY type for children against
    parent.
    Added a check for table def version.
    Added support for thd->open_options to attach_children().
    Changed child path name generation for temporary tables so that
    it does nothing special for temporary tables.

  storage/myisammrg/ha_myisammrg.h@1.57, 2007-11-15 20:25:41+01:00, istruewing@stella.local +8 -1
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added elements to class ha_myisammrg to support the new
    open approach.
    Changed empty destructor definition to a declaration.
    Implemented in ha_myisammrg.cc.
    Added declaration for methods attach_children() and
    detach_children().
    Added definition for method table_ptr() for use with
    callback functions.

  storage/myisammrg/myrg_close.c@1.11, 2007-11-15 20:25:41+01:00, istruewing@stella.local +31 -3
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Added a check to avoid closing of MyISAM tables when the
    child tables are not attached.
    Added freeing of rec_per_key_part when the child tables
    are not attached.

  storage/myisammrg/myrg_extra.c@1.19, 2007-11-15 20:25:41+01:00, istruewing@stella.local +4 -0
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    Some ::extra() functions and ::reset() can be called when
    children are detached.

  storage/myisammrg/myrg_open.c@1.39, 2007-11-15 20:25:41+01:00, istruewing@stella.local +326 -8
    Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
                corrupts a MERGE table
    
    Kept old myrg_open() for MERGE use independent from MySQL.
    Removed an always true condition in myrg_open().
    Set children_attached for independent MERGE use in myrg_open().
    
    Added myrg_parent_open(), myrg_attach_children(), and
    myrg_detach_children() for the new MERGE table open approach.

ChangeSet@1.2604.3.7, 2007-11-15 15:35:35+03:00, anozdrin@station. +3 -0
  A patch for BUG#19723: kill of active connection yields
  different error code depending on platform.
  
  On Mac OS X, KILL statement issued to kill the current
  connection would return a different error code and message than on
  other platforms ('MySQL server has gone away' instead of 'Shutdown
  in progress').
  
  The reason for this difference was that on Mac OS X we have macro
  SIGNAL_WITH_VIO_CLOSE defined. This macro forces KILL
  implementation to close the communication socket of the thread
  that is being killed. SIGNAL_WITH_VIO_CLOSE macro is defined on
  platforms where just sending a signal is not a reliable mechanism
  to interrupt the thread from sleeping on a blocking system call.
  In a nutshell, closing the socket is a hack to work around an
  operating system bug and awake the blocked thread no matter what.
  
  However, if the thread that is being killed is the same
  thread that issued KILL statement, closing the socket leads to a
  prematurely lost connection. At the same time it is not necessary
  to close the socket in this case, since the thread in question
  is not inside a blocking system call.
  
  The fix, therefore, is to not close the socket if the thread that
  is being killed is the same that issued KILL statement, even with
  defined SIGNAL_WITH_VIO_CLOSE.

  mysql-test/r/kill.result@1.21, 2007-11-15 15:35:32+03:00, anozdrin@station. +9 -0
    Update result file.

  mysql-test/t/kill.test@1.29, 2007-11-15 15:35:32+03:00, anozdrin@station. +16 -0
    Added a test case for BUG#19723: kill of active connection yields
    different error code depending on platform.

  sql/sql_class.cc@1.347.5.1, 2007-11-15 15:35:32+03:00, anozdrin@station. +14 -1
    Call close_active_vio() only if we're killing another thread.

ChangeSet@1.2604.14.7, 2007-11-15 14:12:59+02:00, gkodinov@magare.gmz +1 -0
  merge of bug 31928 to 5.1-opt

  mysql-test/r/type_date.result@1.28, 2007-11-15 14:12:58+02:00, gkodinov@magare.gmz +0 -1
    merge of bug 31928 to 5.1-opt

ChangeSet@1.2573.96.1, 2007-11-15 12:30:35+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  tests adjusted for Windows

  mysql-test/r/log_tables.result@1.27.1.1, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +12 -12
    Be more conservative in tests (for Windows)

  mysql-test/t/log_tables.test@1.25, 2007-11-15 12:30:32+01:00, tnurnberg@mysql.com +3 -3
    Be more conservative in tests (for Windows)

ChangeSet@1.2604.8.9, 2007-11-15 11:36:50+01:00, istruewing@stella.local +2 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  Post-pushbuild fix
  Added test case for better coverage.

  mysql-test/r/partition.result@1.74.1.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +7 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test result

  mysql-test/t/partition.test@1.67.1.1, 2007-11-15 11:36:49+01:00, istruewing@stella.local +10 -0
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added test case

ChangeSet@1.2604.14.5, 2007-11-15 11:58:42+04:00, gluh@mysql.com +3 -0
  updated result file

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.14, 2007-11-15 11:58:40+04:00, gluh@mysql.com +71 -59
    updated result file

ChangeSet@1.2604.3.5, 2007-11-14 16:12:46-05:00, dkatz@damien-katzs-computer.local +4 -0
  Bug#28785 thread-handling not displayed properly in SHOW VARIABLES

  mysql-test/r/no-threads.result@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -0
    Test that we are in the 'no-threads' thread_handling mode.

  mysql-test/t/no-threads.test@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -0
    Test that we are in the 'no-threads' thread_handling mode.

  sql/mysqld.cc@1.682.2.1, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +3 -2
    Changes to make global_system_variables.thread_handling be zero based, instead of 1
    based.

  sql/scheduler.h@1.2, 2007-11-14 16:12:42-05:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the enum to start at 0, to match the array elements in thread_handling_names
    in mysqld.cc

ChangeSet@1.2604.12.3, 2007-11-14 21:08:59+01:00, mkindahl@dl145h.mysql.com +1 -0
  Post-merge fixes.

  sql/sql_delete.cc@1.234, 2007-11-14 21:08:55+01:00, mkindahl@dl145h.mysql.com +1 -1
    Correcting merge error.

ChangeSet@1.2573.95.1, 2007-11-14 22:20:31+04:00, holyfoot@mysql.com +4 -0
  Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.
  
  It's not InnoDB specific bug.
  Error is in QUEUE code, about the way we handle queue->max_at_top.
  It's either '0' or '-2' and we do '^' operation to get the proper
  direction. Though queue->compare() function can return '-2' as
  a result of comparison sometimes. So we'll get
  queue->compare() ^ queue->max_at_top == 0 (when max_at_top is -2)
  and _downheap() function code will go wrong way here:
  ...
      if (next_index < elements &&
          (queue->compare(queue->first_cmp_arg,
                          queue->root[next_index]+offset_to_key,
                          queue->root[next_index+1]+offset_to_key) ^
           queue->max_at_top) > 0)
        next_index++;
  ...
  
  Fixed by changing max_at_top to be either 1 or -1, doing
  '* max_at_top' to get proper direction.

  include/queues.h@1.16, 2007-11-14 22:20:28+04:00, holyfoot@mysql.com +3 -3
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    max_at_top policy changed

  mysql-test/r/partition.result@1.69.2.4, 2007-11-14 22:20:28+04:00, holyfoot@mysql.com +35 -0
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    test result

  mysql-test/t/partition.test@1.63.3.4, 2007-11-14 22:20:29+04:00, holyfoot@mysql.com +27 -0
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working
    
    test case

  mysys/queues.c@1.20.1.1, 2007-11-14 22:20:29+04:00, holyfoot@mysql.com +15 -21
    Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.
    
    queue->max_at_top policy changed - now it can either be '1' or '-1'.
    We multiply comparison result on max_at_top to get the proper
    direction.

ChangeSet@1.2604.14.4, 2007-11-14 20:40:07+04:00, gluh@mysql.com +1 -0
  updated result file

  mysql-test/suite/ndb/r/ps_7ndb.result@1.65, 2007-11-14 20:40:05+04:00, gluh@mysql.com +1 -1
    updated result file

ChangeSet@1.1810.3449.14, 2007-11-14 18:56:14+04:00, gluh@mysql.com +1 -0
  after merge fix
  TAG: clone-5.0.52-build

  mysql-test/t/select.test@1.102.1.34, 2007-11-14 18:56:12+04:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.2604.12.2, 2007-11-14 14:04:33+01:00, mkindahl@dl145h.mysql.com +1 -0
  Reverting changes to debug printouts to ha_ndbcluster.cc.

  sql/ha_ndbcluster.cc@1.472, 2007-11-14 14:04:28+01:00, mkindahl@dl145h.mysql.com +55 -55
    Reverting previous changes done to DBUG_ENTER strings.

ChangeSet@1.2541.9.25, 2007-11-14 13:28:45+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb -
    add new testtool that does connect/disconnect in loop

  storage/ndb/test/tools/Makefile.am@1.20, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +2 -1
    add new test tool

  storage/ndb/test/tools/connect.cpp@1.1, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +152 -0
    New BitKeeper file ``storage/ndb/test/tools/connect.cpp''

  storage/ndb/test/tools/connect.cpp@1.0, 2007-11-14 13:28:42+01:00, jonas@perch.ndb.mysql.com +0 -0

ChangeSet@1.1810.3463.1, 2007-11-14 12:02:20+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Post-pushbuild fix
  
  Added a purecov comment and a test for coverage of parallel
  enable keys.

  mysql-test/r/myisam.result@1.71.13.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +8 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.2, 2007-11-14 12:02:18+01:00, istruewing@stella.local +6 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test for coverage of parallel enable keys.

  myisam/mi_check.c@1.129.30.1, 2007-11-14 12:02:18+01:00, istruewing@stella.local +1 -1
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added purecov comment.

ChangeSet@1.2541.9.24, 2007-11-14 11:52:40+01:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Add new dump 8011
    which dumps all subscribers

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.64, 2007-11-14 11:52:38+01:00, jonas@perch.ndb.mysql.com +48 -0
    Add new dump 8011
      which dumps all subscribers

ChangeSet@1.2573.94.3, 2007-11-14 13:48:21+04:00, gshchepa@gleb.loc +4 -0
  Fixed bug #32034: On 64bit platforms assigning values of
  storage engine system variables was not validated and
  unexpected value was assigned.
  
  The check_func_enum function used subtraction from the uint
  value with the probably negative result. That result of
  type uint was compared with 0 after casting to signed long
  type. On architectures where long type is longer than int
  type the result of comparison was unexpected.

  mysql-test/r/plugin.result@1.4, 2007-11-14 13:48:18+04:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #32034.

  mysql-test/t/plugin.test@1.3, 2007-11-14 13:48:17+04:00, gshchepa@gleb.loc +15 -0
    Added test case for bug #32034.

  sql/sql_plugin.cc@1.75.2.1, 2007-11-14 13:48:16+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #32034.
    The check_func_enum function used subtraction from the uint
    value with the probably negative result. That result of
    type uint was compared with 0 after casting to signed long
    type. On architectures where long type is longer than int
    type the result of comparison was unexpected.
    
    uint value has been casted to long type before subtraction.

  storage/example/ha_example.cc@1.62, 2007-11-14 13:48:15+04:00, gshchepa@gleb.loc +29 -1
    Fixed bug #32034.
    Sample system variable example_enum_var has been added to the
    EXAMPLE storage to test ENUM variables.

ChangeSet@1.2541.9.23, 2007-11-14 10:46:34+01:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#32359
    Increase connection negotiation timeout
    Improve some weirdness

  storage/ndb/src/common/transporter/Transporter.cpp@1.30, 2007-11-14 10:46:32+01:00, jonas@perch.ndb.mysql.com +2 -2
    - Increase connection negotiation timeout
    - return false if trying to connect when already connected (should still be assert)

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@1.78, 2007-11-14 10:46:32+01:00, jonas@perch.ndb.mysql.com +2 -1
    Use correct "is_connected" checks
      (although this is kind of bogus and should be cleaned-up)

ChangeSet@1.2573.43.53, 2007-11-13 19:32:12+02:00, gkodinov@magare.gmz +1 -0
  merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

  mysql-test/r/lowercase_view.result@1.14, 2007-11-13 19:32:11+02:00, gkodinov@magare.gmz +2 -2
    merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format

ChangeSet@1.2573.93.1, 2007-11-13 13:24:48+00:00, evgen@moonbone.local +17 -0
  Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
  command and reported to a client.
  
  The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
  by the SHOW COMMAND and reported to a client through connectors. This led to
  problems in the ODBC connector and might lead to a user confusion.
  
  A new filed flag called ON_UPDATE_NOW_FLAG is added. 
  Constructors of the Field_timestamp set it when a field should be set to NOW
  on UPDATE.
  
  The get_schema_column_record function now reports whether a timestamp field
  will be set to NOW on UPDATE.

  client/mysql.cc@1.272.2.1, 2007-11-13 13:24:10+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The fieldflag2str function is adjusted to print the ON_UPDATE_NOW_FLAG.

  include/mysql_com.h@1.125, 2007-11-13 13:24:09+00:00, evgen@moonbone.local +1 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    A new filed flag called ON_UPDATE_NOW_FLAG  is added.

  mysql-test/r/grant.result@1.83.1.1, 2007-11-13 13:23:34+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/information_schema.result@1.170.1.1, 2007-11-13 13:22:58+00:00, evgen@moonbone.local +4 -2
    A test case adjusted after fixing the bug#30081.

  mysql-test/r/log_tables.result@1.26.1.1, 2007-11-13 13:22:57+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/metadata.result@1.19, 2007-11-13 13:22:56+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_2myisam.result@1.63.1.1, 2007-11-13 13:22:41+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_3innodb.result@1.66.1.1, 2007-11-13 13:22:40+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_4heap.result@1.62.1.1, 2007-11-13 13:22:39+00:00, evgen@moonbone.local +1 -1
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/ps_5merge.result@1.63.1.1, 2007-11-13 13:22:38+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/show_check.result@1.133, 2007-11-13 13:22:37+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_ranges.result@1.48, 2007-11-13 13:22:36+00:00, evgen@moonbone.local +2 -2
    Adjusted a test case after fixing bug#30081.

  mysql-test/r/type_timestamp.result@1.39, 2007-11-13 13:22:29+00:00, evgen@moonbone.local +4 -4
    Adjusted a test case after fixing bug#30081.

  mysql-test/t/information_schema.test@1.113.1.1, 2007-11-13 13:21:58+00:00, evgen@moonbone.local +2 -1
    A test case adjusted after fixing the bug#30081.

  sql/field.cc@1.416.3.1, 2007-11-13 13:24:07+00:00, evgen@moonbone.local +4 -0
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    Constructors of the Field_timestamp set the ON_UPDATE_NOW_FLAG on a field when
    it should be set to NOW on UPDATE.

  sql/sql_show.cc@1.441.2.1, 2007-11-13 13:24:02+00:00, evgen@moonbone.local +6 -3
    Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
    command and reported to a client.
    The get_schema_column_record function now reports whether a timestamp field
    will be set to NOW on UPDATE.

  tests/mysql_client_test.c@1.255.2.1, 2007-11-13 13:23:36+00:00, evgen@moonbone.local +1 -1
    A test case adjusted after fixing the bug#30081.

ChangeSet@1.2604.8.5, 2007-11-13 11:12:53+01:00, istruewing@stella.local +3 -0
  Bug#32091: Security breach via directory changes
  
  Post pushbuild fix
  
  Disabled test on windows due to bug#30459
  (DATA/INDEX DIR for partitions not working on windows)
  
  Patch from Mattias Jonsson.

  mysql-test/r/partition_mgm.result@1.14, 2007-11-13 11:12:51+01:00, istruewing@stella.local +0 -10
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_mgm.test@1.13, 2007-11-13 11:12:51+01:00, istruewing@stella.local +10 -9
    Bug#32091: Security breach via directory changes
    
    fixed non-windows lines.

  mysql-test/t/partition_symlink.test@1.2, 2007-11-13 11:12:51+01:00, istruewing@stella.local +2 -0
    Bug#32091: Security breach via directory changes
    
    Added no_windows, since it is affected of bug#30459

ChangeSet@1.1810.3461.1, 2007-11-13 11:39:52+02:00, gkodinov@magare.gmz +5 -0
  Bug #31562: HAVING and lower case
  
  The columns in HAVING can reference the GROUP BY and 
  SELECT columns. There can be "table" prefixes when
  referencing these columns. And these "table" prefixes
  in HAVING use the table alias if available.
  This means that table aliases are subject to the same
  storage rules as table names and are dependent on 
  lower_case_table_names in the same way as the table 
  names are.
  Fixed by :
  1. Treating table aliases as table names
  and make them lowercase when printing out the SQL
  statement for view persistence.
  2. Using case insensitive comparison for table 
  aliases when requested by lower_case_table_names

  mysql-test/r/lowercase_view.result@1.11.1.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +19 -2
    Bug #31562: test case

  mysql-test/t/lowercase_view.test@1.8, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +23 -0
    Bug #31562: test case

  sql/item.cc@1.113.102.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +1 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in GROUP BY

  sql/sql_base.cc@1.235.1.161, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +2 -1
    Bug #31562: lower_case_table_name contious comparison
    when searching in SELECT

  sql/sql_select.cc@1.312.178.1, 2007-11-13 11:39:51+02:00, gkodinov@magare.gmz +14 -1
    Bug #31562: treat table aliases as table names
    and make them lowercase when printing

ChangeSet@1.2604.10.2, 2007-11-13 10:25:22+01:00, istruewing@stella.local +1 -0
  Bug#32078 - Excessive warnings: One can only use the --user switch
              if running as root
  
  Every start of a server in the test suite raised that warning.
  
  The cause was an unconditionla add of the --user option to the
  server command line. Only the "root" user (effective user id == 0)
  must use that option.
  
  Added check for effective user id == 0 before adding --user.
  
  Thanks to Magnus Svensson for the patch.

  mysql-test/mysql-test-run.pl@1.335.1.3, 2007-11-13 10:25:20+01:00, istruewing@stella.local +3 -1
    Bug#32078 - Excessive warnings: One can only use the --user switch
                if running as root
    Added check for effective user id == 0 before adding --user
    in mysqld_arguments().

ChangeSet@1.2573.92.1, 2007-11-13 13:09:59+04:00, holyfoot@mysql.com +4 -0
  Bug #31868 mysql_server_init crash when language path is not correctly set.
  
  When mysql_server_init() interrupts on some error (wrong errmsg file
  for example) in the middle of it's execution, it doesn't call
  execute_ddl_log_recovery() so LOCK_gdl mutex isn't init-ed.
  In this case we shouldn't execute release_ddl_log during cleanup
  as it uses that mutex inside.

  BitKeeper/etc/ignore@1.300.3.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +4 -0
    Added libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc libmysql_r/client_settings.h to the ignore list

  libmysqld/lib_sql.cc@1.140.2.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +0 -1
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    line moved to clean_up()

  sql/mysqld.cc@1.679.1.4, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +2 -1
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    release_ddl_log() now can be called from common 'clean_up()'

  sql/sql_table.cc@1.446.10.1, 2007-11-13 13:09:56+04:00, holyfoot@mysql.com +10 -3
    Bug #31868 mysql_server_init crash when language path is not correctly set.
    
    do_release flag added to the global_ddl_log and the construcntor to
    set it's initial value.
    Also now release_ddl_log() checks for that flag.

ChangeSet@1.1810.3428.7, 2007-11-13 09:43:29+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Elimination of warning for unused function code_name() in non-debug mode.

  sql/log_event.cc@1.174.1.69, 2007-11-13 09:43:25+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Elimination of warning for unused function code_name() in non-debug mode.

ChangeSet@1.2573.91.1, 2007-11-13 12:10:22+04:00, holyfoot@mysql.com +2 -0
  Bug #31960 All embedded test crash
  
  Crash happens as a result of NO_EMBEDDED_ACCESS_CHECKS option
  (which is default for embedded server).
  check_table_access failed on using unintialized structure.
  Better solutions here is to disable that code completely in this case.
  Though the crash happens only in 6.0 i belive it's good to do it in 5.1

  sql/mysql_priv.h@1.544.1.6, 2007-11-13 12:10:19+04:00, holyfoot@mysql.com +36 -0
    Bug #31960 All embedded test crash.
    
    Access check functions from sql_parse.cc defined as FALSE if
    NO_EMBEDDED_ACCESS_CHECKS

  sql/sql_parse.cc@1.700.11.1, 2007-11-13 12:10:20+04:00, holyfoot@mysql.com +2 -18
    Bug #31960 All embedded test crash.
    
    Implementation of access checkings functions #ifdefed out for
    NO_EMBEDDED_ACCESS_CHECKS

ChangeSet@1.1810.3428.6, 2007-11-13 09:01:42+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixes to eliminate warnings.

  sql/log_event.cc@1.174.1.68, 2007-11-13 09:01:39+01:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Fixes to eliminate warnings.

ChangeSet@1.1616.3120.1, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +5 -0
  Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
  
  max_length parameter for BLOB-returning functions must be big enough
  for any possible content. Otherwise the field created for a table
  will be too small.

  mysql-test/r/gis.result@1.15.1.12, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +25 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    test result

  mysql-test/t/gis.test@1.17.1.8, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +31 -0
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    test case

  sql/field.cc@1.197.1.41, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_field_size used instead of numeric value

  sql/field.h@1.120.1.19, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -0
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_field_size constant defined

  sql/item_geofunc.cc@1.18.1.8, 2007-11-13 10:51:47+04:00, holyfoot@mysql.com +1 -1
    Bug #31158  Spatial, Union, LONGBLOB vs BLOB bug (crops data)
    
    max_length parameter fixed

ChangeSet@1.2573.43.50, 2007-11-13 09:41:59+04:00, holyfoot@mysql.com +2 -0
  test fixed

  mysql-test/r/partition_innodb.result@1.9, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +4 -3
    result fixed

  mysql-test/t/partition_innodb.test@1.8, 2007-11-13 09:41:57+04:00, holyfoot@mysql.com +3 -2
    number of subpartitions fixed

ChangeSet@1.1810.3428.5, 2007-11-12 22:02:12+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31793 (log event corruption causes crash):
  
  Corrections to get_str_len_and_pointer().

  sql/log_event.cc@1.174.1.67, 2007-11-12 22:02:05+01:00, mats@kindahl-laptop.dnsalias.net +37 -10
    Adding missing return at end of get_str_len_and_pointer()
    and correcting computation of missing bytes.

ChangeSet@1.1616.3119.3, 2007-11-12 21:52:30+04:00, svoj@mysql.com +2 -0
  symlink.test, symlink.result:
    Use proper variable for test.

  mysql-test/r/symlink.result@1.11.1.17, 2007-11-12 21:51:47+04:00, svoj@mysql.com +3 -3
    Use proper variable for test.

  mysql-test/t/symlink.test@1.11.1.10, 2007-11-12 21:51:28+04:00, svoj@mysql.com +4 -4
    Use proper variable for test.

ChangeSet@1.2573.90.1, 2007-11-12 21:11:31+04:00, holyfoot@mysql.com +3 -0
  Bug #32067 Partitions: crash with timestamp column.
  
  Partition handler fails updating tables with partitioning
  based on timestamp field, as it calculates the timestamp field
  AFTER it calculates the number of partition of a record.
  
  Fixed by adding timestamp_field->set_time() call and disabling
  such consequent calls

  mysql-test/r/partition.result@1.69.4.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +5 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test result

  mysql-test/t/partition.test@1.63.4.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +21 -0
    Bug #32067 Partitions: crash with timestamp column.
    
    test case

  sql/ha_partition.cc@1.106.1.1, 2007-11-12 21:11:27+04:00, holyfoot@mysql.com +22 -6
    Bug #32067 Partitions: crash with timestamp column.
    
    do timestamp_field->set_time() in the ha_partition::update_row()

ChangeSet@1.2604.3.3, 2007-11-12 17:26:32+03:00, anozdrin@station. +1 -0
  A patch for BUG#32172: information_schema test fails with
  wait_condition timeout.
  
  The problem was that the event thread didn't manage to execute
  the event in 30 seconds on highly-loaded box. The fix is to
  increase timeout.
  
  This is a fix for the test suite.

  mysql-test/t/information_schema.test@1.112.1.1, 2007-11-12 17:26:29+03:00, anozdrin@station. +1 -0
    Provide more time to execute an event.

ChangeSet@1.2573.75.3, 2007-11-12 14:51:14+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#31705 Partitions: crash if varchar length > 65530
  
  Buffer overflow due to wrong key length in partitioning
  
  Changed to the correct key_length function.

  mysql-test/r/partition_datatype.result@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +282 -0
    Bug#31705 Partitions: crash if varchar length > 65530
    New test-result case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length use)

  mysql-test/r/partition_datatype.result@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_datatype.test@1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +213 -0
    Bug#31705 Partitions: crash if varchar length > 65530 
    New test case for testing all column types
    used in key-partitioning.
    
    (For verifying correct key-length used)
    

  mysql-test/t/partition_datatype.test@1.0, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  sql/opt_range.cc@1.287.1.1, 2007-11-12 14:51:12+01:00, mattiasj@mattiasj-laptop.(none) +4 -6
    Bug#31705 Partitions: crash if varchar length > 65530
    Problem: buffer overflow due to wrong key-length
    
    Fix: Using correct key_length function

ChangeSet@1.2598.9.4, 2007-11-12 13:23:45+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#32091: Security breach via directory changes
  
  Merge fix
  
  partition_mgm did not require have_symlink.
  
  Moved the test case to partition_symlink, which
  require have_symlink, and should work on both *nix and
  Windows

  mysql-test/r/partition_mgm.result@1.13, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -82
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/r/partition_symlink.result@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +83 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/r/partition_symlink.result@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

  mysql-test/t/partition_mgm.test@1.12, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +2 -112
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink.

  mysql-test/t/partition_symlink.test@1.1, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +119 -0
    Bug#32091: Security breach via directory changes
    
    Moved the test case to partition_symlink. It requires
    have_symlink.

  mysql-test/t/partition_symlink.test@1.0, 2007-11-12 13:23:43+01:00, mattiasj@mattiasj-laptop.(none) +0 -0

ChangeSet@1.2604.9.1, 2007-11-12 13:07:54+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                  partitioned table
      
  Post-pushbuild fix
      
  Pushbuild detected yet another need for lex initialization in
  embedded server.

  libmysqld/lib_sql.cc@1.140.1.2, 2007-11-12 13:07:52+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                        partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1616.3097.2, 2007-11-12 12:52:03+01:00, kent@mysql.com +2 -0
  bigint.test, bigint.result:
    Test case for Bug#30069

  mysql-test/r/bigint.result@1.23.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +6 -0
    Test case for Bug#30069

  mysql-test/t/bigint.test@1.22.1.3, 2007-11-12 12:51:40+01:00, kent@mysql.com +9 -0
    Test case for Bug#30069

ChangeSet@1.2604.3.2, 2007-11-12 14:44:17+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31898: 16M memory allocations for user variables
  in stored procedure.
  
  The problem was that MySQL used unnecessarily large amounts of
  memory if user variables were used as an argument to CONCAT or
  CONCAT_WS -- 16M per each user variable used.
  
  Technically, it happened because MySQL used the following
  allocation strategy for string functions to avoid multiple
  realloc() calls: in the virtual operation fix_length_and_dec()
  the attribute max_length was calculated as a sum of max_length
  values for each argument.
  
  Although this approach worked well for small (or fixed) data types,
  there could be a problem if there as a user variable among
  the arguments of a string function -- max_length of the function
  would be 16M (as the max_length of a user variable is 16M).
  
  Both CONCAT() and CONCAT_WS() functions suffer from this problem.
  
  The fix is to do not use meta-data for allocating memory.
  The following strategy is proposed instead: allocate the exact
  length of the result string at the first record, double the amount
  of memory allocated when it is required.
  
  No test case for this bug because there is no way to test memory
  consumption in a robust way with our test suite.

  sql/item_strfunc.cc@1.331, 2007-11-12 14:44:15+03:00, anozdrin@station. +55 -5
    Implement memory-wise allocation strategy.

ChangeSet@1.1616.3119.2, 2007-11-12 15:15:16+04:00, svoj@mysql.com +1 -0
  After merge fix.

  mysql-test/r/symlink.result@1.11.1.16, 2007-11-12 15:15:15+04:00, svoj@mysql.com +1 -1
    After merge fix.

ChangeSet@1.2604.8.1, 2007-11-12 11:29:55+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding missing drop of user created for test case.

  mysql-test/r/mysqlbinlog.result@1.39, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.53, 2007-11-12 11:29:48+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Dropping user that was added earlier in the test.

ChangeSet@1.2573.89.1, 2007-11-12 14:26:09+04:00, holyfoot@mysql.com +4 -0
  'no innodb engine' test failure fixed

  mysql-test/r/partition.result@1.69.2.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -14
    test result fixed

  mysql-test/r/partition_innodb.result@1.8, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +12 -0
    test result fixed

  mysql-test/t/partition.test@1.63.3.2, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +0 -11
    test moved to partition_innodb

  mysql-test/t/partition_innodb.test@1.7, 2007-11-12 14:26:07+04:00, holyfoot@mysql.com +11 -0
    test moved from partition.test

ChangeSet@1.1616.3118.1, 2007-11-12 13:00:22+04:00, holyfoot@mysql.com +4 -0
  Bug #31305 myisam tables crash when they are near capacity.
  
  When we insert a record into MYISAM table which is almost 'full',
  we first write record data in the free space inside a file, and then
  check if we have enough space after the end of the file.
  So if we don't have the space, table will left corrupted.
  Similar error also happens when we updata MYISAM tables.
  
  Fixed by modifying write_dynamic_record and update_dynamic_record functions
  to check for free space before writing parts of a record

  BitKeeper/etc/ignore@1.153.1.89, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +2 -0
    Added libmysql_r/client_settings.h libmysqld/ha_blackhole.cc to the ignore list

  mysql-test/r/almost_full.result@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/almost_full.result''

  mysql-test/r/almost_full.result@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  mysql-test/t/almost_full.test@1.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +41 -0
    New BitKeeper file ``mysql-test/t/almost_full.test''

  mysql-test/t/almost_full.test@1.0, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +0 -0

  myisam/mi_dynrec.c@1.36.3.1, 2007-11-12 13:00:21+04:00, holyfoot@mysql.com +68 -0
    Bug #31305 myisam tables crash when they are near capacity.
    
    now we check space left in table in write_dynamic_record
    and update_dynamic_record functions.
    If we don't have enough room for the new (updated) record, return with the
    error.

ChangeSet@1.2604.6.1, 2007-11-11 22:30:01+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
  Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash.
  
  Post-pushbuild fix
  
  Pushbuild genereted valgrind warnings.
  
  Changed function to safer variant.

  sql/sql_partition.cc@1.118, 2007-11-11 22:29:56+01:00, mattiasj@mattiasj-laptop.(none) +1 -1
    Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
        causes the Server to crash.
    
    Fix for valgrind warning in pushbuild.
    String.c_prt fcn is not as safe as comment says.
    (gives valgrind errors in this case)

ChangeSet@1.2604.2.8, 2007-11-11 20:38:28+01:00, istruewing@stella.local +3 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    
  Post-pushbuild fix
    
  Pushbuild detected a new need for lex initialization in
  embedded server.
  
  Fixed test for INSERT DELAYED in partitions_hash.test so that
  it works with embedded server.

  libmysqld/lib_sql.cc@1.140.1.1, 2007-11-11 20:38:26+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Initialized lex for later use in open_table().

  mysql-test/r/partition_hash.result@1.9, 2007-11-11 20:38:26+01:00, istruewing@stella.local +0 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test result for embedded server.

  mysql-test/t/partition_hash.test@1.11, 2007-11-11 20:38:26+01:00, istruewing@stella.local +3 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                    partitioned table
    Fixed test for embedded server.

ChangeSet@1.2606, 2007-11-10 22:41:43+01:00, serg@janus.mylan +1 -0
  bad merge fixed

  sql/sql_class.h@1.399.4.1, 2007-11-10 22:41:40+01:00, serg@janus.mylan +0 -2
    bad merge fixed

ChangeSet@1.2573.86.2, 2007-11-10 21:51:47+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  add 5.1-specific test showing that 'const' access increments 'examined'
  counter in slow query log.

  mysql-test/r/log_tables.result@1.27, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +28 -0
    5.1-only test showing that 'const' access increments counters

  mysql-test/t/log_tables.test@1.24, 2007-11-10 21:51:46+01:00, tnurnberg@mysql.com +31 -0
    5.1-only test showing that 'const' access increments counters

ChangeSet@1.2598.9.3, 2007-11-10 21:29:39+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  Changed test case from GRANT to CREATE USER

  mysql-test/r/partition_mgm.result@1.12, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.11, 2007-11-10 21:29:38+01:00, mattiasj@mattiasj-laptop.(none) +3 -2
    Bug#32091: Security breach via directory changes
    Changed test case from GRANT to CREATE USER

ChangeSet@1.1810.3455.1, 2007-11-10 23:44:48+04:00, gshchepa@gleb.loc +9 -0
  Fixed bug #28076: inconsistent binary/varbinary comparison.
  
  After adding an index the <VARBINARY> IN (SELECT <BINARY> ...)
  clause returned a wrong result: the VARBINARY value was illegally padded
  with zero bytes to the length of the BINARY column for the index search.
  (<VARBINARY>, ...) IN (SELECT <BINARY>, ... ) clauses are affected too.

  mysql-test/r/subselect.result@1.134.1.63, 2007-11-10 23:44:29+04:00, gshchepa@gleb.loc +49 -0
    Added test case for bug #28076.

  mysql-test/t/subselect.test@1.129.12.2, 2007-11-10 23:44:16+04:00, gshchepa@gleb.loc +42 -0
    Added test case for bug #28076.

  sql/item.cc@1.113.1.177, 2007-11-10 23:44:09+04:00, gshchepa@gleb.loc +12 -4
    Fixed bug #28076.
    The Item_cache_str::save_in_field method has been overloaded
    to check cached values for an illegal padding before the saving
    into a field.

  sql/item.h@1.183.1.63, 2007-11-10 23:44:11+04:00, gshchepa@gleb.loc +11 -3
    Fixed bug #28076.
    The Item_cache_str::is_varbinary flag has been added and the
    Item_cache_str::save_in_field method has been overloaded to prevent
    cached values from an illegal padding when saving in fields.
    The signature of the Item_cache::get_cache method has been
    changed to accept pointers to Item instead of Item_result
    values.

  sql/item_cmpfunc.cc@1.187.47.1, 2007-11-10 23:44:12+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The Item_in_optimizer::fix_left method has been modified to
    to call Item_cache::get_cache in a new manner.

  sql/item_subselect.cc@1.113.1.48, 2007-11-10 23:44:13+04:00, gshchepa@gleb.loc +12 -1
    Fixed bug #28076.
    The subselect_indexsubquery_engine::exec method has been
    modified to take into account field conversion errors
    (copy&paste from subselect_uniquesubquery_engine::exec).

  sql/sp_rcontext.cc@1.44.1.2, 2007-11-10 23:44:14+04:00, gshchepa@gleb.loc +3 -3
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method has been
    modified to call Item_cache::get_cache in a new manner.

  sql/sp_rcontext.h@1.36, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The sp_rcontext::create_case_expr_holder method signature
    has been modified to pass Item pointers to the
    Item_cache::get_cache method.

  sql/sql_class.cc@1.223.1.57, 2007-11-10 23:44:15+04:00, gshchepa@gleb.loc +1 -1
    Fixed bug #28076.
    The select_max_min_finder_subselect::send_data method has been
    modified to call Item_cache::get_cache in a new manner.

ChangeSet@1.1810.3453.2, 2007-11-10 21:39:30+04:00, ramil@mysql.com +2 -0
  compiler warnings fixed.

  sql/unireg.cc@1.53.11.3, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

  sql/ha_myisam.cc@1.147.25.1, 2007-11-10 21:39:29+04:00, ramil@mysql.com +1 -1
    compiler warning fixed.

ChangeSet@1.1810.3454.1, 2007-11-10 18:29:13+01:00, tnurnberg@mysql.com +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  UNIQUE (eq-ref) lookups result in table being considered as a "constant" table.
  Queries that consist of only constant tables are processed in do_select() in a
  special way that doesn't invoke evaluate_join_record(), and therefore doesn't
  increase the counters join->examined_rows and join->thd->row_count.
  
  The patch increases these counters in this special case.
  
  NOTICE:
  This behavior seems to contradict what the documentation says in Sect. 5.11.4:
  "Queries handled by the query cache are not added to the slow query log, nor
  are queries that would not benefit from the presence of an index because the
  table has zero rows or one row."
  
  No test case in 5.0 as issue shows only in slow query log, and other counters
  can give subtly different values (with regard to counting in create_sort_index(),
  synthetic rows in ROLLUP, etc.).

  sql/sql_class.h@1.230.1.118, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +19 -4
    add documentation for some variables

  sql/sql_select.cc@1.312.176.1, 2007-11-10 18:29:11+01:00, tnurnberg@mysql.com +9 -0
    Don't forget const tables when counting read records!

ChangeSet@1.2573.29.24, 2007-11-10 18:57:09+04:00, ramil@mysql.com +1 -0
  manual merge.

  mysql-test/r/ps.result@1.119.1.2, 2007-11-10 18:57:06+04:00, ramil@mysql.com +5 -0
    manual merge.

ChangeSet@1.1810.3431.3, 2007-11-10 18:27:57+04:00, ramil@mysql.com +3 -0
  manual merge.

  mysql-test/r/ps.result@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +5 -0
    manual merge.

  mysql-test/t/ps.test@1.56.1.40, 2007-11-10 18:27:56+04:00, ramil@mysql.com +10 -0
    manual merge.

  sql/item_timefunc.cc@1.100.36.2, 2007-11-10 18:27:56+04:00, ramil@mysql.com +26 -22
    manual merge.

ChangeSet@1.2598.9.2, 2007-11-10 14:56:21+01:00, mattiasj@mattiasj-laptop.(none) +2 -0
  Bug#32091: Security breach via directory changes
  
  small fix of test case (when running make test after
  merge, it did not substitute MYSQLTEST_VARDIR in
  the error)

  mysql-test/r/partition_mgm.result@1.11, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test result

  mysql-test/t/partition_mgm.test@1.10, 2007-11-10 14:56:19+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#32091: Security breach via directory changes
    small fix in test case

ChangeSet@1.2604.2.7, 2007-11-10 14:36:25+01:00, istruewing@stella.local +1 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Post-merge fix
  
  A new need for lex initialization arose.

  sql/ha_ndbcluster.cc@1.469.1.3, 2007-11-10 14:36:23+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1616.3117.1, 2007-11-10 16:54:25+04:00, holyfoot@mysql.com +1 -0
  Bug #32063 "create table like" works case-significant only in "embedded" server (libmysqld)
  
  in mysql_creata_like_table() we 'downcase' the complete path to the
  .frm file. It works fine in standalone case as there usually
  we only have './' as a path to the datahome, but doesn't work in
  the embedded server where we add the real path there, so if a
  directory has uppercase letters in it's name, it won't be found.
  
  Fixed by 'downcasing' only database/table pair.

  sql/sql_table.cc@1.157.63.1, 2007-11-10 16:54:24+04:00, holyfoot@mysql.com +4 -4
    Bug #32063 "create table like" works case-significant only in "embedded" server (libmysqld)
    
    do not lowercase the database directory

ChangeSet@1.1810.3452.1, 2007-11-10 13:33:42+01:00, tnurnberg@mysql.com +4 -0
  Bug#31800: Date comparison fails with timezone and slashes for greater than comparison
  
  BETWEEN was more lenient with regard to what it accepted as a DATE/DATETIME
  in comparisons than greater-than and less-than were. ChangeSet makes < >
  comparisons similarly robust with regard to trailing garbage (" GMT-1")
  and "missing" leading zeros. Now all three comparators behave similarly
  in that they throw a warning for "junk" at the end of the data, but then
  proceed anyway if possible. Before < > fell back on a string- (rather than
  date-) comparison when a warning-condition was raised in the string-to-date
  conversion. Now the fallback only happens on actual errors, while warning-
  conditions still result in a warning being to delivered to the client.

  mysql-test/r/select.result@1.121.16.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +153 -7
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.
    Adjust older result as "2005-09-3a" is now correctly seen as
    "2005-09-3" + trailing garbage, rather than as "2005-09-30".

  mysql-test/t/select.test@1.102.14.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +72 -6
    Show that we compare DATE/DATETIME-like strings as date(time)s
    now, rather than as bin-strings.

  sql-common/my_time.c@1.19.17.4, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +16 -16
    correct/clarify date-related comments, particulary for check_date().
    doxygenize comment while at it.

  sql/item_cmpfunc.cc@1.187.46.1, 2007-11-10 13:33:41+01:00, tnurnberg@mysql.com +38 -25
    get_date_from_str() no longer signals an error when all we had
    was a warning-condition -- and one we already gave the user a
    warning for at that. Preamble doxygenized.

ChangeSet@1.2573.84.1, 2007-11-10 13:09:18+01:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug#29368: Modified error messages
  
  Problem: there was no standard syntax error when
           creating partitions with syntax error in
           the partitioning clause.
  
  Solution: added "Syntax error: " to the error message

  mysql-test/r/partition.result@1.69.3.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +2 -2
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result update

  mysql-test/r/partition_error.result@1.16, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +12 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test result

  mysql-test/t/partition_error.test@1.18, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +13 -0
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    test case

  sql/share/errmsg.txt@1.168.1.1, 2007-11-10 13:09:16+01:00, mattiasj@mattiasj-laptop.(none) +3 -3
    Bug#29368: Incorrect error for syntax error when createing
               partition
    
    Modified error messages

ChangeSet@1.1810.3436.5, 2007-11-09 18:27:20-07:00, tsmith@ramayana.hindu.god +2 -0
  Fix Windows build problems.

  libmysql/CMakeLists.txt@1.1.6.1, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mysys/mf_arr_appstr.c source file

  mysys/default.c@1.72.1.19, 2007-11-09 18:27:19-07:00, tsmith@ramayana.hindu.god +7 -7
    Fix some bad code that caused warnings on Windows

ChangeSet@1.2598.9.1, 2007-11-09 23:22:00+01:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug#32091: Security breach via directory changes
  
  Problem: the table's INDEX and DATA DIR was taken
    directly from the table's first partition.
    This allowed rename attack similar to
    bug#32111 when ALTER TABLE REMOVE PARTITIONING
  
  Solution: Silently ignore the INDEX/DATA DIR
    for the table. (Like some other storage engines
    do). 
    Partitioned tables do not support DATA/INDEX
    DIR on the table level, only on its partitions.

  mysql-test/r/partition_mgm.result@1.10, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +81 -0
    Bug#32091: Security breach via directory changes
    test result

  mysql-test/t/partition_mgm.test@1.9, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +111 -2
    Bug#32091: Security breach via directory changes
    test case

  sql/ha_partition.cc@1.108, 2007-11-09 23:21:58+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
    Bug#32091: Security breach via directory changes
    
    Do not use the first partition's DATA/INDEX DIR
    as the table's DATA/INDEX DIR.
    (A partitioned table do not have support for DATA/
    INDEX DIR, only its partitions do)

ChangeSet@1.1810.3438.4, 2007-11-09 19:12:12+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32202: ORDER BY not working with GROUP BY
  
  The bug is a regression introduced by the fix for bug30596. The problem
  was that in cases when groups in GROUP BY correspond to only one row,
  and there is ORDER BY, the GROUP BY was removed and the ORDER BY
  rewritten to ORDER BY <group_by_columns> without checking if the
  columns in GROUP BY and ORDER BY are compatible. This led to
  incorrect ordering of the result set as it was sorted using the
  GROUP BY columns. Additionaly, the code discarded ASC/DESC modifiers
  from ORDER BY even if its columns were compatible with the GROUP BY
  ones.
  
  This patch fixes the regression by checking if ORDER BY columns form a
  prefix of the GROUP BY ones, and rewriting ORDER BY only in that case,
  preserving the ASC/DESC modifiers. That check is sufficient, since the
  GROUP BY columns contain a unique index.

  mysql-test/r/group_by.result@1.69.1.12, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +65 -0
    Added a test case for bug #32202.

  mysql-test/t/group_by.test@1.59.1.7, 2007-11-09 19:12:09+03:00, kaa@polly.(none) +35 -0
    Added a test case for bug #32202.

  sql/sql_select.cc@1.312.175.1, 2007-11-09 19:12:10+03:00, kaa@polly.(none) +12 -3
    In cases when groups in GROUP BY correspond to only one row and there
    is ORDER BY, rewrite the query to ORDER BY <group_by_columns> only if
    the columns in ORDER BY and GROUP BY are compatible, i.e. either one
    forms a prefix for another.

ChangeSet@1.2598.3.11, 2007-11-09 14:08:12+01:00, mleich@five.local.lan +3 -0
  Fix for
     Bug#32153 Status output differs - scheduling ?
  Modifications:
  1. Introduce additional poll routines + adjust queries 
     as fixes for Bug#32153 and another non reported bug
     found during stability testing
  2. Replace builtin poll routines by wait_condition.inc.
  3. Update the comments

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +54 -69
    Fixes, details are in changeset comment

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.2, 2007-11-09 14:08:10+01:00, mleich@five.local.lan +4 -4
    Updated results

ChangeSet@1.1810.3428.3, 2007-11-09 13:43:09+01:00, mats@capulet.net +4 -0
  BUG#31793 (log event corruption causes crash):
  
  When running mysqlbinlog on a 64-bit machine with a corrupt relay log,
  it causes mysqlbinlog to crash. In this case, the crash is caused
  because a request for 18446744073709534806U bytes is issued, which
  apparantly can be served on a 64-bit machine (speculatively, I assume)
  but this causes the memcpy() issued later to copy the data to segfault.
  
  The request for the number of bytes is caused by a computation
  of data_len - server_vars_len where server_vars_len is corrupt in such
  a sense that it is > data_len. This causes a wrap-around, with the
  the data_len given above.
  
  This patch adds a check that if server_vars_len is greater than
  data_len before the substraction, and aborts reading the event in
  that case marking the event as invalid. It also adds checks to see
  that reading the server variables does not go outside the bounds
  of the available space, giving a limited amount of integrity check.

  mysql-test/r/mysqlbinlog.result@1.25.1.12, 2007-11-09 13:43:07+01:00, mats@capulet.net +1 -0
    Result change.

  mysql-test/std_data/corrupt-relay-bin.000624@1.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +2033 -0
    BitKeeper file /home/mats/devel/b31793-mysql-5.0-rpl/mysql-test/std_data/corrupt-relay-bin.000624

  mysql-test/std_data/corrupt-relay-bin.000624@1.0, 2007-11-09 13:43:07+01:00, mats@capulet.net +0 -0

  mysql-test/t/mysqlbinlog.test@1.21.1.30, 2007-11-09 13:43:07+01:00, mats@capulet.net +4 -0
    Adding test that it fails gracefully for a corrupt relay log.

  sql/log_event.cc@1.174.21.1, 2007-11-09 13:43:07+01:00, mats@capulet.net +84 -11
    Adding check that status var length does not cause wrap-around
    when performing subtraction. Extending get_str_len_and_pointer() to
    check that the string can actually be read without reading outside
    bounds. Adding checks when reading server variables from the Query-
    log_event so that the variable can really be read. Abort reading
    and mark the event as invalid otherwise.

ChangeSet@1.1616.3094.10, 2007-11-09 16:05:01+04:00, svoj@mysql.com +3 -0
  BUG#29083 - test suite times out on OS X 64bit - also in older releases
  
  The "mysql client in mysqld"(which is used by
  replication and federated) should use alarms instead of setting
  socket timeout value if the rest of the server uses alarm. By
  always calling 'my_net_set_write_timeout'
  or 'net_set_read_timeout' when changing the timeout value(s), the
  selection whether to use alarms or timeouts will be handled by
  ifdef's in those two functions.
  
  This is minimal backport of patch for BUG#26664, which was pushed
  to 5.0 and up.
  
  Affects 4.1 only.

  include/mysql_com.h@1.67.1.43, 2007-11-09 16:05:01+04:00, svoj@mysql.com +5 -0
    Move the net_set_*_timeout function declarations to mysql_com.h

  sql-common/client.c@1.46.9.2, 2007-11-09 16:05:01+04:00, svoj@mysql.com +2 -4
     Use my_net_read_timeout or my_net_write_timeout when setting the timeouts

  sql/mysql_priv.h@1.186.91.64, 2007-11-09 16:05:01+04:00, svoj@mysql.com +0 -3
    Move the net_set_*_timeout function declarations to mysql_com.h

ChangeSet@1.1810.3450.1, 2007-11-09 13:29:43+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32020: loading udfs while --skip-grant-tables is enabled
  causes out of memory errors
  
  The code in mysql_create_function() and mysql_drop_function() assumed
  that the only reason for UDFs being uninitialized at that point is an
  out-of-memory error during initialization. However, another possible 
  reason for that is the --skip-grant-tables option in which case UDF 
  initialization is skipped and UDFs are unavailable.
  
  The solution is to check whether mysqld is running with
  --skip-grant-tables and issue a proper error in such a case.

  mysql-test/r/skip_grants.result@1.10.1.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +5 -0
    Added a test case for bug #32020.

  mysql-test/t/skip_grants.test@1.6.1.7, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +12 -0
    Added a test case for bug #32020.

  sql/sql_udf.cc@1.45.7.1, 2007-11-09 13:29:36+03:00, kaa@polly.(none) +10 -2
    Issue a proper error when a user tries to CREATE/DROP a UDF 
    on a server running with the --skip-grant-tables option.

ChangeSet@1.2573.29.22, 2007-11-09 11:16:47+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#32217 rpl_ssl fails with different number of records on master and slave
   - Add debug queries

  mysql-test/suite/rpl/t/rpl_ssl.test@1.12, 2007-11-09 11:16:44+01:00, msvensson@pilot.mysql.com +10 -0
    Add additional queries to run when we detect that the number of queries between slave and master differs

ChangeSet@1.2573.54.17, 2007-11-09 11:02:51+01:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#31552 (Replication breaks when deleting rows from out-of-sync table without PK):
  
  Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.

  mysql-test/extra/rpl_tests/rpl_row_basic.test@1.8, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +31 -5
    Adding test to see that no error is given on slave when deleting
    rows that don't exist on table without primary key.

  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result@1.5, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result@1.6, 2007-11-09 11:02:45+01:00, mats@kindahl-laptop.dnsalias.net +19 -0
    Result change.

ChangeSet@1.2573.54.16, 2007-11-09 09:13:47+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing some tests to make the replication team tree green.

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +17 -12
    Result change.

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.2, 2007-11-09 09:13:39+01:00, mats@kindahl-laptop.dnsalias.net +15 -10
    Adding ORDER BY to avoid order dependencies.
    Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
    Dropping procedures that polluted later test results.

ChangeSet@1.2573.82.1, 2007-11-09 10:10:15+02:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #31170 rpl_innodb_bug28430 fails: varying timing, ports, and log use
  
  Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
  by means of using the standard include-macro.
  
  The masked-out parameters are not needed by the logics of the original
  tests. What is need to demonstre that replication is not stopped remains.
  

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6.1.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +8 -8
    results changed

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.2.1, 2007-11-09 10:10:12+02:00, aelkin@koti.dsl.inet.fi +1 -2
    using the standard macro that takes care of masking out env specific values
     

ChangeSet@1.2541.40.5, 2007-11-08 15:05:38+01:00, jmiller@mysql.com +1 -0
  testDict.cpp:
    Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database

  storage/ndb/test/ndbapi/testDict.cpp@1.40, 2007-11-08 15:05:29+01:00, jmiller@mysql.com +7 -3
    Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database

ChangeSet@1.2598.8.1, 2007-11-08 13:43:40+01:00, jperkin@production.mysql.com +1 -0
  Remove the --source-install option and instead make use of --srcdir
  to install system tables directly from the source tree (useful for
  testing purposes).  This helps clean the script up a lot and clarify
  the three possible ways the script can be called (using compiled-in
  paths, passing --basedir pointing to alternative install location,
  or --srcdir).  Include further tidying as well.
    
  This fixes bug#30759.

  scripts/mysql_install_db.sh@1.88, 2007-11-08 13:42:01+01:00, jperkin@production.mysql.com +69 -69
    Re-order the logic in printing messages at the end of the
    script, to make it clearer which paths are taken depending
    on tests or outcome of command status.  Tidy some output.

  scripts/mysql_install_db.sh@1.87, 2007-11-07 18:38:36+01:00, jperkin@production.mysql.com +59 -108
    Remove the --source-install argument and re-implement similar
    functionality by expanding the --srcdir option
      - rename missing_in_basedir to cannot_find_file and use it
        to report on missing files in --srcdir too
      - merge --windows configuration into --srcdir where it is
        better placed.  All --windows usage uses --srcdir
        anyway, so effectively a nop.
      - use cannot_find_file for more file tests

  scripts/mysql_install_db.sh@1.86, 2007-11-07 15:50:02+01:00, jperkin@production.mysql.com +4 -4
    Update and clarify some comments.

  scripts/mysql_install_db.sh@1.85, 2007-11-07 14:58:11+01:00, jperkin@production.mysql.com +2 -2
    Use consistent test style throughout the script.

  scripts/mysql_install_db.sh@1.84, 2007-11-07 14:55:10+01:00, jperkin@production.mysql.com +1 -7
    Initialise $ldata early, reduce code.

ChangeSet@1.2573.54.14, 2007-11-08 09:25:03+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Fixing test case to not print warnings causing a result mismatch for rpl_trigger.

  mysql-test/suite/rpl/t/rpl_trigger.test@1.14, 2007-11-08 09:24:52+01:00, mats@kindahl-laptop.dnsalias.net +5 -0
    Disabling warnings to prevent different result files for
    MIXED and STATEMENT mode.

ChangeSet@1.1810.3448.1, 2007-11-08 06:08:44+01:00, tnurnberg@mysql.com +4 -0
  Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE
  
  HOUR(), MINUTE(), ... returned spurious results when used on a DATE-cast.
  This happened because DATE-cast object did not overload get_time() method
  in superclass Item. The default method was inappropriate here and
  misinterpreted the data.
  
  Patch adds missing method; get_time() on DATE-casts now returns SQL-NULL
  on NULL input, 0 otherwise. This coincides with the way DATE-columns
  behave.

  mysql-test/r/cast.result@1.39.1.14, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +24 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  mysql-test/t/cast.test@1.31.1.7, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +22 -0
    Show that HOUR(), MINUTE(), ... return sensible values when used
    on DATE-cast objects, namely NULL for NULL-dates and 0 otherwise.
    Show that this coincides with how DATE-columns behave.

  sql/item_timefunc.cc@1.100.35.1, 2007-11-08 06:08:42+01:00, tnurnberg@mysql.com +7 -0
    Add get_time() method to DATE-cast object to overload
    the method in Item superclass that would return spurious
    results. Return zero-result; flag NULL if input was NULL.

  sql/item_timefunc.h@1.63.5.5, 2007-11-08 06:08:43+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.1810.3447.1, 2007-11-07 15:23:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Bug #20748: Configuration files should not be read more than once
  
  A user could not override system-wide settings in their ~/.my.cnf,
  because the DEFAULT_SYSCONFDIR was being searched last.  Also, in
  some configurations (especially when the --sysconfdir compile-time
  option is set to /etc or /etc/mysql), the system-wide my.cnf file
  was read multiple times, causing confusion and potential problems.
  
  Rearrange default directories to conform to the manual and logic.
  Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
  directory to the middle of the list.  $HOME/.my.cnf should be last,
  so the user is able to override the system-wide settings.
  
  Change init_default_directories() to remove duplicates from the
  list.

  include/my_sys.h@1.178.15.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +2 -0
    Add array_append_string_unique(), from mf_arr_appstr.c

  libmysql/Makefile.shared@1.68.2.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.lo object

  mysys/CMakeLists.txt@1.1.6.3, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/Makefile.am@1.62.1.15, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Add new mf_arr_appstr.c source.

  mysys/default.c@1.72.1.18, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +129 -63
    Change order in which defaults files are added to default_directories,
    in order to conform to the manual (and to common sense).  This fixes
    a particularly bad problem on Unix, where ~/.my.cnf was read before
    /usr/local/etc/my.cnf.
    
    Also, don't add duplicate entries; move the existing entry to the
    end of the list instead.
    
    
    Here is a comparison of the order of defaults files, BEFORE and AFTER
    this patch.
    
    On Windows:
    
    BEFORE:  C:\, GetWindowsDirectory(), GetSystemWindowsDirectory(),
             $MYSQL_HOME, defaults-extra-file, INSTALLDIR
    
    AFTER:  GetSystemWindowsDirectory(), GetWindowsDirectory(), C:\,
            INSTALLDIR, $MYSQL_HOME, defaults-extra-file
    
    GetSystemWindowsDirectory() is moved before GetWindowsDirectory() because
    the former is shared by all Terminal Services users, while the latter is
    private for each user.
    
    
    On Netware (no change):
    
    BEFORE:  sys:/etc/, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  sys:/etc, $MYSQL_HOME, defaults-extra-file
    
    
    On OS/2:
    
    BEFORE:  $ETC, /etc, $MYSQL_HOME, defaults-extra-file
    
    AFTER:  /etc, $ETC, $MYSQL_HOME, defaults-extra-file
    
    
    On everything else (general Unix):
    
    BEFORE:  /etc, $MYSQL_HOME, defaults-extra-file, ~/, --sysconfdir
    
    AFTER:  /etc/, --sysconfdir, $MYSQL_HOME, defaults-extra-file, ~/
    
    The BEFORE code added --sysconfdir on all systems, but only the
    Unix build system actually defined a value for it.

  mysys/mf_arr_appstr.c@1.1, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +61 -0
    BitKeeper file /home/tsmith/m/bk/build/50-b20748/mysys/mf_arr_appstr.c

  mysys/mf_arr_appstr.c@1.0, 2007-11-07 15:23:49-07:00, tsmith@ramayana.hindu.god +0 -0

ChangeSet@1.2598.7.1, 2007-11-07 12:59:22-07:00, tsmith@ramayana.hindu.god +1 -0
  Cast away compiler warning on Windows.

  storage/innobase/handler/ha_innodb.cc@1.367, 2007-11-07 12:59:20-07:00, tsmith@ramayana.hindu.god +1 -1
    Cast away a compiler warning; some functions return ulong or ulint for
    errors, and some use int.  Let's hope these all fit in an int.

ChangeSet@1.1810.3419.2, 2007-11-07 20:57:21+01:00, jonas@perch.ndb.mysql.com +5 -0
  ndb - bug#32160 (recommit to 5.0)
    fix lcp master take over bug

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.23.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +6 -1
    new error codes

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.8.21.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +10 -0
    add debug code

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.24.82.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +54 -6
    fix master lcp bug
    add 2 new error codes

  ndb/test/ndbapi/testNodeRestart.cpp@1.13.32.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +48 -0
    testcase

  ndb/test/run-test/daily-basic-tests.txt@1.27.51.1, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.2573.54.13, 2007-11-07 18:12:21+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Second attempt at getting rid of warnings in replication tree.

  sql/log_event.cc@1.307.1.5, 2007-11-07 18:12:13+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Second attempt at getting rid of warnings in replication tree.

ChangeSet@1.1810.3395.21, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +3 -0
  Bug #31928: Search fails on '1000-00-00' date after sql_mode change
  
  When constructing a key image stricter date checking (from sql_mode)
  should not be enabled, because it will reject invalid dates that the
  server would otherwise accept for searching when there's no index.
   
  Fixed by disabling strict date checking when constructing a key image.

  mysql-test/r/type_date.result@1.13.6.1, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +38 -1
    Bug #31928: test case

  mysql-test/t/type_date.test@1.14.5.1, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +20 -0
    Bug #31928: test case

  sql/sql_select.h@1.92.1.32, 2007-11-07 18:02:12+02:00, gkodinov@magare.gmz +7 -4
    Bug #31928: Disable strict date checking when consructing
    a key image

ChangeSet@1.2573.81.1, 2007-11-07 19:59:58+04:00, ramil@mysql.com +6 -0
  Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
  and auto_increment keys
  
  Problems: 
    1. ALTER TABLE ... ORDER BY... doesn't make sence if there's a 
       user-defined clustered index in the table.
    2. using a secondary index is slower than using a clustered one 
       for a table scan.
  
  Fixes:
    1. raise a warning.
    2. use the clustered index.

  mysql-test/include/mix1.inc@1.57.2.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +8 -0
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - test case.

  mysql-test/r/innodb.result@1.202.2.1, 2007-11-07 19:59:56+04:00, ramil@mysql.com +15 -15
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/innodb_mysql.result@1.60.3.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +13 -8
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  mysql-test/r/join_outer_innodb.result@1.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +2 -2
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - results adjusted.

  sql/sql_select.cc@1.569, 2007-11-07 19:59:56+04:00, ramil@mysql.com +9 -1
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - use the clustered index for a table scan (if any) as it's faster than
        using a secondary index.

  sql/sql_table.cc@1.446.6.3, 2007-11-07 19:59:56+04:00, ramil@mysql.com +28 -16
    Fix for bug #26447: "ALTER TABLE .. ORDER" does not work with InnoDB 
    and auto_increment keys
      - ALTER TABLE ... ORDER BY doesn't make sence if there's a 
        user-defined clustered index in the table. Ignore it in such cases
        and raise a warning.

ChangeSet@1.1616.3116.1, 2007-11-07 18:45:04+03:00, kaa@polly.(none) +3 -0
  Fix for bug #32103: optimizer crash when join on int and mediumint with
  variable in where clause.
  
  Problem: the new_item() method of Item_uint used an incorrect
  constructor. "new Item_uint(name, max_length)" calls
  Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
  first argument to be the string representation of the value, not the
  item's name. This could result in either a server crash or incorrect
  results depending on usage scenarios.
  
  Fixed by using the correct constructor in new_item():
  Item_uint::Item_uint(const char *str_arg, longlong i, uint length).

  mysql-test/r/select.result@1.34.3.42, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +8 -0
    Added a test case for bug #32103.

  mysql-test/t/select.test@1.28.4.17, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +21 -0
    Added a test case for bug #32103.

  sql/item.h@1.56.1.142, 2007-11-07 18:45:01+03:00, kaa@polly.(none) +1 -1
    Use the correct constructor for Item_uint in Item_uint::new_item().

ChangeSet@1.2573.54.11, 2007-11-07 15:23:57+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Adding return value, which is not used, and wrapped debug function in
  DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

  sql/log_event.cc@1.307.1.4, 2007-11-07 15:23:49+01:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding return value, which is not used, and wrapped debug function in
    DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

ChangeSet@1.2573.80.1, 2007-11-07 15:08:50+03:00, kaa@polly.(none) +1 -0
  Fix for bug #25421: MySQL threads don't respond to the kill command
  
  Calculating the estimated number of records for a range scan may take a
  significant time, and it was impossible for a user to interrupt that
  process by killing the connection or the query.
  
  Fixed by checking the thread's 'killed' status in check_quick_keys() and
  interrupting the calculation process if it is set to a non-zero value.

  sql/opt_range.cc@1.284.1.1, 2007-11-07 15:08:44+03:00, kaa@polly.(none) +3 -0
    Check the thread's 'killed' status in check_quick_keys() and
    interrupt the calculation process if it is set to a non-zero value.

ChangeSet@1.1810.3418.2, 2007-11-07 14:00:45+03:00, kaa@polly.(none) +3 -0
  Fix for bug #30666: Incorrect order when using range conditions on 2
  tables or more
  
  The problem was that the optimizer used the join buffer in cases when
  the result set is ordered by filesort. This resulted in the ORDER BY
  clause being ignored, and the records being returned in the order
  determined by the order of matching records in the last table in join.
  
  Fixed by relaxing the condition in make_join_readinfo() to take
  filesort-ordered result sets into account, not only index-ordered ones.

  mysql-test/r/select.result@1.121.14.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +39 -0
    Added a test case for bug #30666.

  mysql-test/t/select.test@1.102.12.1, 2007-11-07 14:00:41+03:00, kaa@polly.(none) +36 -0
    Added a test case for bug #30666.

  sql/sql_select.cc@1.312.174.1, 2007-11-07 14:00:42+03:00, kaa@polly.(none) +3 -4
    Relaxed the condition to determine when the join buffer usage must be
    disabled. The condition is now true for cases when the result set is
    ordered by filesort, that is when 'join->order &&
    !join->skip_sort_order' is true.

ChangeSet@1.1616.3115.1, 2007-11-07 12:55:28+04:00, svoj@mysql.com +7 -0
  BUG#31277 - myisamchk --unpack corrupts a table
  
  With certain data sets (when compressed record length gets bigger than
  uncompressed) myisamchk --unpack may corrupt data file.
  
  Fixed that record length was wrongly restored from compressed table.

  mysql-test/mysql-test-run.pl@1.8.20.16, 2007-11-07 12:55:27+04:00, svoj@mysql.com +15 -0
    Environment variables to execute myisamchk and myisampack.

  mysql-test/r/myisampack.result@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +29 -0
    New BitKeeper file ``mysql-test/r/myisampack.result''

  mysql-test/r/myisampack.result@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  mysql-test/t/myisampack.test@1.1, 2007-11-07 12:55:27+04:00, svoj@mysql.com +33 -0
    New BitKeeper file ``mysql-test/t/myisampack.test''

  mysql-test/t/myisampack.test@1.0, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -0

  myisam/mi_check.c@1.105.1.59, 2007-11-07 12:55:27+04:00, svoj@mysql.com +21 -18
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.
    
    Still, it is not doable with parallel repair, as it allocates needed
    record buffers at once. For parellel repair added better record length
    calculation.

  myisam/mi_open.c@1.80.2.13, 2007-11-07 12:55:27+04:00, svoj@mysql.com +5 -2
    When calculating record buffer size, take into account that compressed
    record length may be bigger than uncompressed.

  myisam/mi_packrec.c@1.25.1.9, 2007-11-07 12:55:27+04:00, svoj@mysql.com +0 -1
    With certain data set share->max_pack_length (compressed record length)
    may be bigger than share->base.pack_reclength (packed record length).
    
    set_if_bigger(pack_reclength, max_pack_length) in this case causes
    myisamchk --unpack to write extra garbage, whereas pack_reclength
    remains the same in new index file. As a result we get unreadable
    table.

  myisam/myisamchk.c@1.92.6.2, 2007-11-07 12:55:27+04:00, svoj@mysql.com +4 -3
    With compressed tables compressed record length may be bigger than
    pack_reclength, thus we may allocate insufficient memory for record
    buffer.
    
    Let single function allocate record buffer, performing needed record
    length calculations.

ChangeSet@1.1616.3110.2, 2007-11-07 12:47:19+04:00, ramil@mysql.com +3 -0
  Fix for bug #32137: prepared statement crash with str_to_date in update clause
  
  Problem: calling non-constant argument's val_xxx() methods 
  in the ::fix_length_and_dec() is inadmissible.
  
  Fix: call the method only for constant arguments.

  mysql-test/r/ps.result@1.31.1.26, 2007-11-07 12:47:18+04:00, ramil@mysql.com +5 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test result.

  mysql-test/t/ps.test@1.27.1.33, 2007-11-07 12:47:18+04:00, ramil@mysql.com +9 -0
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - test case.

  sql/item_timefunc.cc@1.51.6.10, 2007-11-07 12:47:18+04:00, ramil@mysql.com +26 -23
    Fix for bug #32137: prepared statement crash with str_to_date in update clause
      - call argument's val_str() only for constant items in the 
        Item_func_str_to_date::fix_length_and_dec().

ChangeSet@1.2573.79.1, 2007-11-07 09:30:41+01:00, istruewing@stella.local +1 -0
  Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
              the wrong buffer
  
  handler::index_next_same() did not take into account that the
  internally called function key_cmp_if_same() uses the fixed
  buffer table->record[0] for key comparison instead of the
  buffer provided by the caller of handler::index_next_same().
  
  Added code to temporarily redirect table->record[0] and the fields
  used for the key to the record buffer provided by the caller of
  handler::index_next_same().
  
  The test case is in partition.test already.

  sql/handler.cc@1.322.11.1, 2007-11-07 09:30:38+01:00, istruewing@stella.local +42 -1
    Bug#22351 - handler::index_next_same() call to key_cmp_if_same() uses
                the wrong buffer
    Added code to temporarily redirect table->record[0] and the fields
    used for the key to the record buffer provided by the caller of
    handler::index_next_same().

ChangeSet@1.2598.3.7, 2007-11-06 16:40:50-07:00, tsmith@ramayana.hindu.god +6 -0
  Apply snapshot innodb-5.1-ss2034
  
  The following bugs are fixed:
  
  Bug #31860: Server crashes after inserting into InnoDB table with auto_increment column
    In the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.

  mysql-test/r/innodb.result@1.202.1.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  mysql-test/t/innodb.test@1.171.1.2, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +19 -0
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/handler/ha_innodb.cc@1.366, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +15 -18
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.
    
    
    Revision r2018:
    Remove ut_print_timestamp(), this should have been removed when the following
    changes were made by MySQL.
    
    	ChangeSet@1.1810.467.1  2005-08-11 19:19:20+03:00  jani@omakaista.fi
    
    Fix error message so that it conforms to "  InnoDB: Error: ...".

  storage/innobase/include/univ.i@1.65, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2015:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Remove warnings on 64-bit systems.

  storage/innobase/row/row0sel.c@1.123, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +5 -2
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2034:
    Fix for Bug# 31860, in the Bug 16979 fix there was an erroneous assertion that
    autoincrement columns can't contain negative values. With the fix, the
    autoincrement table counter is set to 0 if the maximum value read from
    the autoinc column index is negative.
    
    Add test for the bug fix but the test is not really useful as the server
    needs to be restarted half way through the test. It has been added for 
    reference only.

  storage/innobase/sync/sync0sync.c@1.50, 2007-11-06 16:33:49-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss2034
    
    Revision r2017:
    Use "InnoDB:" prefix in error messages.

ChangeSet@1.2598.3.6, 2007-11-06 15:42:58-07:00, tsmith@ramayana.hindu.god +31 -0
  Apply snapshot innodb-5.1-ss1989
  
  Fixes the following bugs:
  
  Bug #30706: SQL thread on slave is allowed to block client queries when slave load is high
    Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
  
  Bug #30888: Innodb table + stored procedure + row deletion = server crash
    While adding code for the low level read of the AUTOINC value from the index,
    the case for MEDIUM ints which are 3 bytes was missed triggering an
    assertion.
  
  Bug #30907: Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
    We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
  
  Bug #31444: "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
    DB_SUCCESS.  A timeout on LOCK TABLES would lead to an inconsistent state,
    which would cause trx_free() to print a warning.
  
  Bug #31494: innodb + 5.1 + read committed crash, assertion
    Set an error code when a deadlock occurs in semi-consistent read.

  mysql-test/r/innodb-semi-consistent.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +36 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/r/innodb-semi-consistent.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/r/innodb.result@1.202.1.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +36 -40
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1821:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2536.50.1  2007-08-02 12:45:56-07:00  igor@mysql.com
    
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT.
    If there was a ref/range access to the table whose rows were required
    to be ordered in the result set the optimizer always employed this access
    though a scan by a different index that was compatible with the required
    order could be cheaper to produce the first L rows of the result set.
    Now for such queries the optimizer makes a choice between the cheapest
    ref/range accesses not compatible with the given order and index scans
    compatible with it.
    
    innodb.result: Adjusted results for test cases affected fy the fix for
    bug #28404.
    
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1792:
    innodb.result: Revert r1655, which should have been reverted as part of r1781.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +39 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/r/innodb_autoinc_lock_mode_zero.result@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb-semi-consistent.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +46 -0
    Apply snapshot innodb-5.1-ss1989
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.

  mysql-test/t/innodb-semi-consistent.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb.test@1.171.1.1, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +42 -33
    Apply snapshot innodb-5.1-ss1989
    
    Also, a test is moved into the new innodb_autoinc_lock_mode_zero
    test, because it depends on a non-default setting for a read-only
    variable.
    
    Revision r1781:
    Fix a test case that was broken after Bug#16979 fix. See r1645 and r1735.
    The variable used in the tests below was introduced in r1735.
    
    
    Revision r1843:
    Add test for Bug# 21409, the actual bug was fixed in r1334.

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +1 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.1, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +44 -0
    New test, using read-only setting --innodb-autoinc-lock-mode=0

  mysql-test/t/innodb_autoinc_lock_mode_zero.test@1.0, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +0 -0

  storage/innobase/buf/buf0lru.c@1.38, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -1
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/dict/dict0dict.c@1.108, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/dict/dict0load.c@1.57, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +46 -32
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/handler/ha_innodb.cc@1.365, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +67 -31
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1887:
    Merge changes from MySQL AB:
    
    ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god
    
    Fix some Windows compiler warnings.
    
    dict0mem.c: Fix compiler warning with a cast.
    
    ha_innodb.cc: Change type to fix a compiler warning.
    
    
    Revision r1809:
    ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
    trx->n_mysql_tables_in_use only after row_lock_table_for_mysql()
    returns DB_SUCCESS.  A timeout on LOCK TABLES would lead to an
    inconsistent state, which would cause trx_free() to print a warning.
    
    This was later reported as Bug #31444.
    
    
    Revision r1833:
    Add /*== ... === */ decoration that was missing around some auto-inc functions.
    Add a missing comment, fix the length of a decoration.  Initialize the *value
    out parameter in ha_innobase::innobase_get_auto_increment().
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1846:
    Add config option innodb_use_adaptive_hash_indexes to enable/disable
    adaptive hash indexes. It is enabled by default (no change in default
    behavior).
    
    Approved by:	Marko
    
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.
    
    
    Revision r1829:
    Add assertion to enforce check of an implicit invariant and add comment about
    retry of autoinc read semantics. We always reread the table's autoinc counter
    after attempting to initialize it i.e., we want to guarantee that a read of
    autoinc valus that is returned to the caller is always covered by the
    AUTOINC locking mechanism.
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1888:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2528.115.30  2007-08-28 10:17:15-06:00  tsmith@hindu.god
    
    Fix another compiler warning on Windows in InnoDB.
    
    ha_innodb.cc:
    
    Fix compiler warning: ::get_auto_increment takes a ulonglong
    for nb_desired_values, but InnoDB's trx struct stores it as
    a ulint (unsigned long).  Probably harmless, as a single
    statement won't be asking for more than 2^32 rows.
    
    
    Revision r1987:
    Bug fix: The problem was that when write_row() attempted to update the max
    autoinc value, and if it was rolled back because of a deadlock, the 
    deadlock error (transaction rollback) was not being propagated back to MySQL.
    
    
    Revision r1889:
    Merge a change from MySQL AB:
    
    ChangeSet@1.2560  2007-09-21 10:15:16+02:00  gkodinov@local
    
    ha_innodb.cc: fixed type conversion warnings revealed by bug 30639 
    
    
    Revision r1989:
    Suppress printing of deadlock errors while reading the autoinc value.
    DB_DEADLOCK errors are part of normal processing and excessive printing
    of these error messages could be disconcerting for users. 
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.

  storage/innobase/handler/ha_innodb.h@1.147, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +0 -14
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1844:
    Remove the prototypes of some functions inside #if 0.
    The function definitions were removed in r1746.

  storage/innobase/ibuf/ibuf0ibuf.c@1.55, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +2 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1965:
    ibuf_insert_to_index_page(): Fix typos in diagnostic output.

  storage/innobase/include/db0err.h@1.15, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +4 -2
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1974:
    Prevent loading of tables that have unsupported features most notably
    FTS indexes.

  storage/innobase/include/ha_prototypes.h@1.3, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +16 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.

  storage/innobase/include/mach0data.h@1.7, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +11 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mach0data.ic@1.11, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +37 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/include/mem0dbg.h@1.10, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -8
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.

  storage/innobase/include/mem0mem.ic@1.21, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +9 -7
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1937:
    mem_heap_free_top(): Remove a bogus Valgrind warning.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/include/rem0rec.ic@1.31, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +1 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().

  storage/innobase/include/row0mysql.h@1.54, 2007-11-06 15:23:45-07:00, tsmith@ramayana.hindu.god +8 -5
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().

  storage/innobase/include/sync0rw.h@1.22, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +2 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/include/univ.i@1.64, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +28 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1827:
    Merge r1826 from branches/zip: UNIV_MEM_ASSERT_AND_FREE():
    Use UNIV_MEM_ASSERT_W() instead of UNIV_MEM_ASSERT_RW().
    The memory area need not be initialized.
    This mistake was made in r1815.
    
    
    Revision r1918:
    Improve Valgrind instrumentation.
    
    rec_offs_set_n_alloc(): Use UNIV_MEM_ASSERT_AND_ALLOC().
    
    UNIV_MEM_ASSERT_AND_ALLOC(): New directive, similar to
    UNIV_MEM_ASSERT_AND_FREE().
    
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.
    
    
    Revision r1948:
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display also __FILE__ and __LINE__
    when these Valgrind checks fail.

  storage/innobase/include/ut0ut.h@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +18 -0
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().

  storage/innobase/mem/mem0dbg.c@1.25, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +24 -16
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1830:
    Improve memory debugging.  This is follow-up to r1819.
    
    mem_heap_validate(): Compile this function also if UNIV_MEM_DEBUG is
    defined.  Previously, this function was only compiled with UNIV_DEBUG.
    
    mem_heap_free_heap_top(): Flag the memory allocated, not freed, for
    Valgrind.  Otherwise, Valgrind would complain on the second call of
    mem_heap_empty().
    
    UNIV_MEM_ASSERT_RW(), UNIV_MEM_ASSERT_W(): Display additional diagnostics
    for failed Valgrind checks.
    
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/mem/mem0mem.c@1.20, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1819:
    Merge r1815:1817 from branches/zip: Improve Valgrind instrumentation.
    
    UNIV_MEM_ASSERT_RW(): New macro, to check that the contents of a memory
    area is defined.
    
    UNIV_MEM_ASSERT_W(): New macro, to check that a memory area is writable.
    
    UNIV_MEM_ASSERT_AND_FREE(): New macro, to check that the memory is
    writable before declaring it free (unwritable).  This replaces UNIV_MEM_FREE()
    in many places.
    
    mem_init_buf(): Check that the memory is writable, and declare it undefined.
    
    mem_erase_buf(): Check that the memory is writable, and declare it freed.

  storage/innobase/row/row0mysql.c@1.144, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +38 -44
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1786:
    row_create_table_for_mysql(), row_truncate_table_for_mysql(),
    row_drop_table_for_mysql(): Do not mention innodb_force_recovery
    when newraw is set.
    
    
    Revision r1790:
    row_drop_table_for_mysql(): Before calling
    dict_table_remove_from_cache(table) and thus freeing the memory
    allocated for the table, copy the table name.  This avoids reading
    freed memory when name == table->name.
    
    Approved by Sunny.
    
    
    Revision r1783:
    Correct the function comments of row_create_table_for_mysql() and
    row_drop_table_for_mysql().
    
    
    Revision r1894:
    Add debug lock checks to autoinc functions. Add lock guards around an
    invocation of dict_table_autoinc_initialize().

  storage/innobase/row/row0sel.c@1.122, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +48 -27
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1782:
    Add comment that the variable dest should be word aligned. After discussion
    on IM with Heikki.
    
    
    Revision r1988:
    Set an error code when a deadlock occurs in semi-consistent read.  (Bug #31494)
    
    innodb-semi-consistent: New tests for InnoDB semi-consistent reads.
    Unfortunately, these will not trigger Bug #31494, because there merely
    occur lock wait timeouts, not deadlocks.
    
    
    Revision r1820:
    Use the clustered index and not the one selected by the optimizer in the plan,
    when building a previous version of the row. This bug is triggered when
    running queries via InnoDB's internal SQL parser; when InnoDB's optimizer
    selects a secondary index for the plan.
    
    
    Revision r1828:
    Fix two bugs:
    
    Bug# 30907: We don't rely on *first_value to be 0 when checking whether
    get_auto_increment() has been invoked for the first time in a multi-row
    INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
    inside ha_innobase::start_stmt() too.
    
    Bug# 30888: While adding code for the low level read of the AUTOINC value
    from the index, the case for MEDIUM ints which are 3 bytes was missed
    triggering an assertion.
    
    
    Revision r1779:
    Fix a bug that handles the case where the host specific byte order matches
    the InnoDB storage byte order, which is big-endian.

  storage/innobase/sync/sync0rw.c@1.34, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +3 -3
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1757:
    Enclose rw_lock_validate() in #ifdef UNIV_DEBUG.  It is only called by
    debug assertions.

  storage/innobase/ut/ut0ut.c@1.42, 2007-11-06 15:23:46-07:00, tsmith@ramayana.hindu.god +51 -20
    Apply snapshot innodb-5.1-ss1989
    
    Revision r1850:
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    Approved by:	Heikki
    
    
    
    Revision r1873:
    snprintf() should always return non-negative result. According to
    Microsoft documentation about _vscprintf():
    
      If format is a null pointer, the invalid parameter handler is invoked,
      as described in Parameter Validation. If execution is allowed to
      continue, the functions return -1 and set errno to EINVAL.
    
    The UNIX variant of snprintf() segfaults if format is a NULL pointer
    (similar to strlen(NULL) for example), so it is better to conform to
    this behavior and crash our custom Windows version instead of
    returning -1. Noone would expect -1 to be returned from snprintf().
    
    Cosmetic: Add a space after typecast.
    
    Approved by:	Marko
    
    
    Revision r1862:
    Add ut_snprintf() function. On Windows this needs to be implemented
    using auxiliary functions because there is no snprintf-variant on
    Windows that behaves exactly as specified in the standard:
    
    * Always return the number of characters that would have been printed
      if the size were unlimited (not including the final `\0').
    * Always '\0'-terminate the result
    * Do not touch the buffer if size=0, only return the number of characters
      that would have been printed. Can be used to estimate the size needed
      and to allocate it dynamically.
    
    See http://www.freebsd.org/cgi/query-pr.cgi?pr=87260 for the reason why
    2 ap variables are used.
    
    Approved by:	Heikki
    
    
    Revision r1866:
    Revert r1850 as MySQL did not approve the addition.
    
    log for r1850:
    
    Implement this feature request:
    http://bugs.mysql.com/30706
    
    * Add a function that returns the number of microseconds since
      epoch - ut_time_us().
    
    * Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
    
    * Add UT_WAIT_FOR() macro that waits for a specified condition to occur
      until a timeout elapses.
    
    * Using all of the above, handle the replication thread specially in
      srv_conc_enter_innodb().
    
    
    Revision r1787:
    Move the prototype of innobase_print_identifier() from ut0ut.c to
    ha_prototypes.h.  Enclose the definitions in ha_prototypes.h in
    #ifndef UNIV_HOTBACKUP.
    
    
    Revision r1789:
    ut_print_namel(): Do not assume that all '/' are separators between
    database and table names.
    
    Approved by Heikki.
    
    
    Revision r1936:
    ut_print_buf(): Add a Valgrind check that the buffer is wholly defined.

ChangeSet@1.2541.40.4, 2007-11-06 22:28:44+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  only potentially skip GAP event on startup, not on cluster restart

  sql/ha_ndbcluster_binlog.cc@1.131.1.8, 2007-11-06 22:28:41+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    only potentially skip GAP event on startup, not on cluster restart

ChangeSet@1.2573.43.34, 2007-11-06 21:57:51+03:00, sergefp@mysql.com +1 -0
  Better comments

  sql/opt_range.h@1.81, 2007-11-06 21:57:39+03:00, sergefp@mysql.com +7 -2
    Better comments

ChangeSet@1.1810.3446.5, 2007-11-06 20:31:40+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  refining non-deterministic tests.
  The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
   

  mysql-test/r/binlog_killed.result@1.6.3.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +4 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.4.1, 2007-11-06 20:31:37+02:00, aelkin@koti.dsl.inet.fi +15 -0
    refining the tests as killing is inherently non-deterministic;
    leaving todos.

ChangeSet@1.2573.61.13, 2007-11-06 20:09:45+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  tests fixing: refreshing the results file.

  mysql-test/suite/binlog/r/binlog_killed.result@1.13, 2007-11-06 20:09:40+02:00, aelkin@koti.dsl.inet.fi +8 -0
    results changed

ChangeSet@1.2564.30.1, 2007-11-06 17:51:32+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#12092 (FOUND_ROWS() not replicated):
  
  In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
  works only in mixed mode under 5.1. There is a workaround that
  can be used in statement-based mode either under 5.0 or 5.1
  where the result of FOUND_ROWS() is stored into a user vari-
  able and used that way instead. This will replicate correctly
  even under statement-based replication, since it will write
  a User_var entry to the binary log. For some other cases, the
  value has to be passed explicitly.
  
  This patch adds tests to demonstrate that the workarounds docu-
  mented for statement-based replication works as advertised, and
  does more extensive tests for cases that does not work under sta-
  tement-based replication actually work under mixed mode by switch-
  ing to row-based replication.

  mysql-test/include/reset_master_and_slave.inc@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +10 -0
    New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''

  mysql-test/include/reset_master_and_slave.inc@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +228 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''

  mysql-test/suite/rpl/r/rpl_found_rows.result@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.1, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +251 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''

  mysql-test/suite/rpl/t/rpl_found_rows.test@1.0, 2007-11-06 17:51:23+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

ChangeSet@1.2573.61.12, 2007-11-06 16:32:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
  results from 5.0 is not needed

  BitKeeper/deleted/.del-binlog_killed_simulate.result@1.2, 2007-11-06 16:29:04+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/r/binlog_killed_simulate.result

ChangeSet@1.1810.3446.4, 2007-11-06 16:25:32+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  fixing tests

  mysql-test/r/binlog_killed_simulate.result@1.1, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +33 -0
    the new tests' result

  mysql-test/r/binlog_killed_simulate.result@1.0, 2007-11-06 16:25:29+02:00, aelkin@koti.dsl.inet.fi +0 -0

ChangeSet@1.2541.40.3, 2007-11-06 15:12:27+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
  - correction, do not insert GAP on first startup

  sql/ha_ndbcluster_binlog.cc@1.131.1.7, 2007-11-06 15:12:25+01:00, tomas@whalegate.ndb.mysql.com +20 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction, do not insert GAP on first startup

ChangeSet@1.1346.896.1, 2007-11-06 18:09:33+04:00, svoj@mysql.com +3 -0
  BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLE
  
  RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites
  the file to which the symlink points.
  
  This is security issue, because it is possible to create a table with
  some name in some non-system database and set DATA/INDEX DIRECTORY
  to mysql system database. Renaming this table to one of mysql system
  tables (e.g. user, host) would overwrite the system table.
  
  Return an error when the file to which the symlink points exist.

  mysql-test/r/symlink.result@1.4.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +6 -0
    A test case for BUG#32111.

  mysql-test/t/symlink.test@1.3.1.4, 2007-11-06 18:09:32+04:00, svoj@mysql.com +12 -0
    A test case for BUG#32111.

  mysys/my_symlink2.c@1.6.1.1, 2007-11-06 18:09:32+04:00, svoj@mysql.com +10 -1
    Return an error when the file to which the symlink points exist.

ChangeSet@1.2604.2.3, 2007-11-06 14:47:15+01:00, istruewing@stella.local +2 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Post-merge fix. Moved test into 5.0 section.

  mysql-test/r/myisam.result@1.115, 2007-11-06 14:47:14+01:00, istruewing@stella.local +25 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

  mysql-test/t/myisam.test@1.90, 2007-11-06 14:47:14+01:00, istruewing@stella.local +26 -25
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Post-merge fix. Moved test into 5.0 section.

ChangeSet@1.2598.2.10, 2007-11-06 15:29:55+02:00, gkodinov@magare.gmz +2 -0
  Bug #31974: additional commit (test case updates)
   loose index scan enabled for subqueries

  mysql-test/r/group_min_max.result@1.37, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +2 -2
    Bug #31974: test case updates
     loose index scan enabled for subqueries

  mysql-test/r/index_merge_myisam.result@1.10, 2007-11-06 15:29:54+02:00, gkodinov@magare.gmz +1 -1
    Bug #31974: test case updates
     loose index scan enabled for subqueries

ChangeSet@1.1810.3446.3, 2007-11-06 15:11:59+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571
  
  removing extra tests (on 5.1 that's been already done)

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.1.1.1, 2007-11-06 15:09:37+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.1.1.1, 2007-11-06 15:09:42+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

ChangeSet@1.2573.43.33, 2007-11-06 16:53:02+04:00, gluh@mysql.com +2 -0
  fix for pushbuild 'powermacg5' failure

  mysql-test/r/information_schema.result@1.172, 2007-11-06 16:53:01+04:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/t/information_schema.test@1.115, 2007-11-06 16:53:01+04:00, gluh@mysql.com +1 -1
    test fix

ChangeSet@1.1810.3437.7, 2007-11-06 13:41:32+01:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.13.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.12.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.28.1, 2007-11-06 13:41:31+01:00, istruewing@stella.local +167 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.1810.3446.2, 2007-11-06 13:53:26+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571
  
  commit is specific for 5.0 to eliminated non-deterministic tests.
  Those tests run only in 5.1 env where there is a necessary devices such
  as processlist table of info_schema.

  mysql-test/r/binlog_killed.result@1.6.2.1, 2007-11-06 13:53:23+02:00, aelkin@koti.dsl.inet.fi +5 -71
    results changed

  mysql-test/t/binlog_killed.test@1.6.3.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +13 -105
    removing non-deterministic part of the test

  mysql-test/t/binlog_killed_simulate.test@1.1.1.1, 2007-11-06 13:53:24+02:00, aelkin@koti.dsl.inet.fi +1 -0
    adding the guard same as for 5.1 version

ChangeSet@1.2573.61.9, 2007-11-06 13:08:37+02:00, aelkin@koti.dsl.inet.fi +1 -0
  bug#27571
  
  non-deterministic tests refining.
  This particular patch tested on two archs.

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.5, 2007-11-06 13:08:34+02:00, aelkin@koti.dsl.inet.fi +9 -2
    deploying synchronization of killing with reaching the explected state
    of the prey's connection.

ChangeSet@1.2541.36.12, 2007-11-06 10:57:49+01:00, mskold@mysql.com +3 -0
  ndb_auto_increment.result:
    Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result
  ndb_auto_increment.test, ndb_auto_increment.result:
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases
  ha_ndbcluster.cc:
    Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0
  ndb_auto_increment.test:
    Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test

  mysql-test/suite/ndb/r/ndb_auto_increment.result@1.3, 2007-11-06 10:57:21+01:00, mskold@mysql.com +1 -1
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases

  mysql-test/suite/ndb/r/ndb_auto_increment.result@1.2, 2007-11-06 07:15:46+01:00, mskold@mysql.com +0 -0
    Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result

  mysql-test/suite/ndb/t/ndb_auto_increment.test@1.3, 2007-11-06 10:56:51+01:00, mskold@mysql.com +0 -1
    Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases

  mysql-test/suite/ndb/t/ndb_auto_increment.test@1.2, 2007-11-06 07:15:09+01:00, mskold@mysql.com +0 -0
    Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test

  sql/ha_ndbcluster.cc@1.467.3.9, 2007-11-06 10:54:42+01:00, mskold@mysql.com +66 -23
    Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0

ChangeSet@1.2573.61.8, 2007-11-06 11:53:47+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#27571 
  
  non-deterministic tests execution on some platforms.

  mysql-test/suite/binlog/r/binlog_killed.result@1.11, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +4 -1
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.4, 2007-11-06 11:53:44+02:00, aelkin@koti.dsl.inet.fi +5 -3
    correcting the prev test's cleanup;
    increasing time to wait by to be killed query;
    adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query

ChangeSet@1.1810.3202.23, 2007-11-06 10:28:11+01:00, mskold@mysql.com +1 -0
  Removed compiler warnings

  sql/ha_ndbcluster.cc@1.175.86.5, 2007-11-06 10:28:04+01:00, mskold@mysql.com +6 -7
    Removed compiler warnings

ChangeSet@1.2541.40.2, 2007-11-06 10:27:56+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  break out tuple data read

  sql/ha_ndbcluster_binlog.cc@1.131.1.6, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +15 -10
    more state saving

  storage/ndb/tools/restore/Restore.cpp@1.55, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +84 -72
    ndb:
    break out tuple data read for ndb_restore
    more save state in run query

  storage/ndb/tools/restore/Restore.hpp@1.32, 2007-11-06 10:27:53+01:00, tomas@whalegate.ndb.mysql.com +4 -0
    break out tuple data read

ChangeSet@1.2604.1.3, 2007-11-05 16:52:04-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  fixed coding style

  sql/sql_yacc.yy@1.601.5.3, 2007-11-05 16:51:58-07:00, malff@lambda.hsd1.co.comcast.net. +4 -3
    Fixed coding style (tabs)

ChangeSet@1.2541.40.1, 2007-11-05 23:23:26+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  preserve more of the state

  sql/ha_ndbcluster_binlog.cc@1.131.1.5, 2007-11-05 23:23:24+01:00, tomas@whalegate.ndb.mysql.com +4 -2
    preserve more of the state

ChangeSet@1.2573.61.7, 2007-11-05 22:10:25+02:00, aelkin@koti.dsl.inet.fi +3 -0
  bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
  
  refining tests as they appear to be non-deterministic.

  mysql-test/suite/binlog/r/binlog_killed.result@1.10, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +32 -23
    results changed

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.3, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +31 -19
    restructuring the test to deliver more deterministic outcome.
    order-by for update and delete did not guaratee the order of scanning.
    --error are masked with zero in order to catch more info if killing
    really will happen to be non-deterministic on some platform (witnessed
    something like that on dl145j)

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.4, 2007-11-05 22:10:18+02:00, aelkin@koti.dsl.inet.fi +1 -0
    important guard added

ChangeSet@1.1810.3202.22, 2007-11-05 20:18:22+01:00, mskold@mysql.com +7 -0
  ha_ndbcluster.h:
    Bug #31956       auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default
  ndb_auto_increment.result:
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result
  mysqld.cc:
    Bug #25176  	Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
    Bug #31956  	auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)
  ndb_insert.test, ndb_insert.result:
    Moved auto_increment tests to ndb_auto_increment.test
  ndb_auto_increment.test:
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test
  ha_ndbcluster.cc:
    Bug #31956       auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
    Bug #32055  	Cluster does not handle auto inc correctly with insert ignore statement

  mysql-test/r/ndb_auto_increment.result@1.1, 2007-11-05 18:15:18+01:00, mskold@mysql.com +445 -0
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/r/ndb_auto_increment.result

  mysql-test/r/ndb_auto_increment.result@1.0, 2007-11-05 18:15:18+01:00, mskold@mysql.com +0 -0

  mysql-test/r/ndb_insert.result@1.8.1.5, 2007-11-05 18:16:18+01:00, mskold@mysql.com +0 -169
    Moved auto_increment tests to ndb_auto_increment.test

  mysql-test/t/ndb_auto_increment.test@1.1, 2007-11-05 18:15:18+01:00, mskold@mysql.com +294 -0
    BitKeeper file /home/marty/MySQL/mysql-5.0-ndb/mysql-test/t/ndb_auto_increment.test

  mysql-test/t/ndb_auto_increment.test@1.0, 2007-11-05 18:15:18+01:00, mskold@mysql.com +0 -0

  mysql-test/t/ndb_insert.test@1.12.1.3, 2007-11-05 18:15:54+01:00, mskold@mysql.com +0 -138
    Moved auto_increment tests to ndb_auto_increment.test

  sql/ha_ndbcluster.cc@1.175.86.4, 2007-11-05 18:11:55+01:00, mskold@mysql.com +62 -22
    Bug #31956       auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement), added handling of updates of pk/unique key with auto_increment
    Bug #32055  	Cluster does not handle auto inc correctly with insert ignore statement

  sql/ha_ndbcluster.h@1.82.4.20, 2007-11-05 18:09:13+01:00, mskold@mysql.com +3 -0
    Bug #31956       auto increment bugs in MySQL Cluster: Added utility method and constant for internal prefetch default

  sql/mysqld.cc@1.439.132.1, 2007-11-05 18:04:13+01:00, mskold@mysql.com +2 -2
    Bug #25176  	Trying to set ndb_autoincrement_prefetch_sz always fails: Changed pointer to max value
    Bug #31956  	auto increment bugs in MySQL Cluster: Changed meaning of ndb_autoincrement_prefetch_sz to specify prefetch between statements, changed default to 1 (with internal prefetch to at least 32 inside a statement)

ChangeSet@1.1810.3436.3, 2007-11-05 17:48:11+01:00, jperkin@production.mysql.com +1 -0
  Provide better feedback to the user when unable to find MySQL files
  usually caused by a bad basedir setting.

  support-files/mysql.server.sh@1.49.1.9, 2007-11-05 17:46:23+01:00, jperkin@production.mysql.com +1 -1
    Be more verbose in error message.

ChangeSet@1.2564.3.7, 2007-11-05 16:25:40+01:00, istruewing@stella.local +17 -0
  Bug#31210 - INSERT DELAYED crashes server when used on
              partitioned table
  
  Trying INSERT DELAYED on a partitioned table, that has not been
  used right before, crashes the server. When a table is used for
  select or update, it is kept open for some time. This period I
  mean with "right before".
  
  Information about partitioning of a table is stored in form of
  a string in the .frm file. Parsing of this string requires a
  correctly set up lexical analyzer (lex). The partitioning code
  uses a new temporary instance of a lex. But it does still refer
  to the previously active lex. The delayd insert thread does not
  initialize its lex though...
  
  Added initialization for thd->lex before open table in the delayed
  thread and at all other places where it is necessary to call
  lex_start() if all tables would be partitioned and need to parse
  the .frm file.

  mysql-test/r/partition_hash.result@1.8, 2007-11-05 16:25:38+01:00, istruewing@stella.local +4 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test result

  mysql-test/t/partition_hash.test@1.10, 2007-11-05 16:25:38+01:00, istruewing@stella.local +8 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added test

  sql/event_scheduler.cc@1.47.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/events.cc@1.84.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/ha_ndbcluster_binlog.cc@1.131.2.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/slave.cc@1.315.2.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_acl.cc@1.243.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_base.cc@1.421.15.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table().

  sql/sql_connect.cc@1.9.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_insert.cc@1.295.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +6 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added initialization for thd->lex before open table.

  sql/sql_lex.cc@1.255.10.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +2 -1
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_lex.h@1.296.3.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Added 'is_lex_started' to test if lex is initialized.

  sql/sql_plugin.cc@1.75.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_servers.cc@1.14.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/sql_udf.cc@1.80.1.1, 2007-11-05 16:25:38+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

  sql/table.cc@1.307.6.1, 2007-11-05 16:25:39+01:00, istruewing@stella.local +3 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Asserted that lex is initialized in open_table_from_share().

  sql/tztime.cc@1.59, 2007-11-05 16:25:39+01:00, istruewing@stella.local +1 -0
    Bug#31210 - INSERT DELAYED crashes server when used on
                partitioned table
    Initialized lex for later use in open_table().

ChangeSet@1.1810.3443.1, 2007-11-05 17:20:10+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #28597 Replication doesn't start after upgrading to 5.1.18
  
  Since bug@20166, which replaced the binlog file name generating to base
  on pidfile_name instead of the previous glob_hostname, the binlog file
  name suddenly started to be stored solely in the absolute path format,
  including a case when --log-bin option meant a relative path.
  What's more serious, the path for binlog file can lead unrequestedly 
  to pid-file directory so that after any proper fix for this bug
  there might be similar to the bug report consequences for one who
  upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.
  
  Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
  off its directory part. This restores the original logics of storing
  the names in compatible with --log-bin option format and with the
  requirement for --log-bin ralative path to corresond to the data directory.
  Side effects for this fix:
  
  effective fixing bug@27070, refining its test;
  ensuring no overrun for buff can happen anymore (Bug#31836 
  insufficient space reserved for the suffix of relay log file name);
  bug#31837  --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
  in rpl_temporary.test;
  fixes Bug@28603  Invalid log-bin default location;

  mysql-test/t/rpl_dual_pos_advance.test@1.2.1.1, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +0 -6
    After correcting the logics of log file name composing workaround for
    
      Bug #27070 server logs are created unrequested and in wrong directory
    
    is removed.

  mysql-test/t/rpl_temporary.test@1.15.1.10, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +2 -0
    remaining temp file of the test removed

  sql/log.cc@1.158.1.63, 2007-11-05 17:20:08+02:00, aelkin@koti.dsl.inet.fi +4 -7
    stripping off the directory part of `pidfile_name' for binlog name
    generating (which fixes two more bugs on wrong binlog file location);
    ensuring no overrun for buff can happen anymore (Bug #31836 
    insufficient space reserved for the suffix of relay log file name);

ChangeSet@1.2573.78.2, 2007-11-05 18:43:13+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.149, 2007-11-05 18:43:11+04:00, holyfoot@mysql.com +1 -1
    merging

ChangeSet@1.1810.3442.2, 2007-11-05 18:23:55+04:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/func_str.result@1.110.1.29, 2007-11-05 18:23:54+04:00, holyfoot@mysql.com +3 -3
    merging

ChangeSet@1.1810.3437.6, 2007-11-05 14:44:38+01:00, istruewing@stella.local +1 -0
  Bug#32108 - subselect.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/subselect.test@1.129.13.1, 2007-11-05 14:44:37+01:00, istruewing@stella.local +1 -1
    Bug#32108 - subselect.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.1810.3437.5, 2007-11-05 14:37:00+01:00, istruewing@stella.local +1 -0
  Bug#32107 - ctype_uca.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
    
  Changed -- to #.

  mysql-test/t/ctype_uca.test@1.17.3.1, 2007-11-05 14:36:59+01:00, istruewing@stella.local +1 -1
    Bug#32107 - ctype_uca.test produces warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2528.235.3, 2007-11-05 14:24:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Incremental patch to remove redundant, but benign, my_error() call.

  sql/sql_binlog.cc@1.13.1.2, 2007-11-05 14:24:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing redundant error reporting.

ChangeSet@1.2604, 2007-11-05 13:33:20+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  workaround for case insensitive filesystems

  mysql-test/suite/ndb/r/ndb_multi.result@1.17.1.1, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    workaround for case insensitive filesystems

  mysql-test/suite/ndb/t/ndb_multi.test@1.25.1.1, 2007-11-05 13:33:17+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    workaround for case insensitive filesystems

ChangeSet@1.2598.2.9, 2007-11-05 13:19:56+02:00, gkodinov@magare.gmz +3 -0
  Bug #31974: Wrong EXPLAIN output
  
  The fix for bug 31148 is not correct. It does not
  have a relation to the problem described in this bug.
  And removing the fix will not make the bug to re-appear.
  Fixed the bug #31974 by removing the fix for bug 31148
  and adding a test case.

  mysql-test/r/key.result@1.48, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +14 -0
    Bug #31974: test case

  mysql-test/t/key.test@1.39, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +17 -0
    Bug #31974: test case

  sql/sql_select.cc@1.566.1.6, 2007-11-05 13:19:54+02:00, gkodinov@magare.gmz +0 -7
    Bug #31974: revert the fix for bug 31148

ChangeSet@1.1810.3438.2, 2007-11-05 13:30:31+03:00, kaa@polly.(none) +1 -0
  Fixed code that parses the DELIMITER command to correctly calculate 
  the length of the remaining input string.
  
  This is to fix mysqldump test failure in PB introduced by the patch
  for bug #26215.

  client/mysql.cc@1.199.30.2, 2007-11-05 13:30:28+03:00, kaa@polly.(none) +3 -4
    Fixed code that parses the DELIMITER command to correctly calculate 
    the length of the remaining input string.

ChangeSet@1.2598.4.6, 2007-11-05 10:57:52+01:00, istruewing@stella.local +1 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  Fixed absurd compiler warnings of a Suse 10.1 system.

  storage/myisam/mi_check.c@1.165, 2007-11-05 10:57:50+01:00, istruewing@stella.local +2 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Fixed absurd compiler warnings of a Suse 10.1 system.

ChangeSet@1.2541.36.10, 2007-11-03 13:46:49+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  compile error

  sql/ha_ndbcluster_binlog.cc@1.131.1.4, 2007-11-03 13:46:46+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    compile error

ChangeSet@1.2528.235.1, 2007-11-03 01:33:48+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#31611 (Security risk with BINLOG statement):
  
  Adding check that the user executing a BINLOG statement has SUPER
  privileges and aborting execution of the statement with an error
  otherwise.

  mysql-test/r/mysqlbinlog.result@1.38, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +22 -0
    Result change.

  mysql-test/t/mysqlbinlog.test@1.52, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +27 -0
    Adding test that generates a BINLOG command for inserting data into a
    table and feed the BINLOG statement into the database as an untrusted
    user. Also checking that insertion into the table fails for that user
    and that the table only contain a single line: the original one inserted.

  sql/sql_binlog.cc@1.13.1.1, 2007-11-03 01:33:44+01:00, mats@kindahl-laptop.dnsalias.net +6 -0
    Adding a check that the executor of the BINLOG command has
    SUPER privileges and give an error and abort execution if not.

ChangeSet@1.2541.36.9, 2007-11-02 23:44:17+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  this error should not be printed

  sql/ha_ndbcluster_binlog.cc@1.131.1.3, 2007-11-02 23:44:15+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    this error should not be printed

ChangeSet@1.2541.36.8, 2007-11-02 23:28:29+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  reverting to old setting

  mysql-test/include/have_multi_ndb.inc@1.11, 2007-11-02 23:28:27+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    reverting to old setting

ChangeSet@1.2573.77.1, 2007-11-03 00:32:17+03:00, skozlov@mysql.com +2 -0
  WL#3949. Added an option for support "combinations" of mysqld arguments for a suite

  mysql-test/lib/mtr_cases.pl@1.69, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +99 -0
    updated mtr_cases.pl

  mysql-test/mysql-test-run.pl@1.335.3.1, 2007-11-03 00:31:56+03:00, skozlov@mysql.com +5 -0
    updated mtr

ChangeSet@1.2573.75.2, 2007-11-02 14:25:48-07:00, antony@pcg5ppc.xiphis.org +1 -0
  fix for 2.4.6 bug should be properly enclosed to not break other versions.

  sql/CMakeLists.txt@1.19.1.1, 2007-11-02 14:25:45-07:00, antony@pcg5ppc.xiphis.org +2 -0
    fix for 2.4.6 bug should be properly enclosed to not break other versions.

ChangeSet@1.2598.3.4, 2007-11-02 15:30:39-04:00, iggy@alf.(none) +1 -0
  Bug#31217 C1033 compilation error on Windows
  - This workaround is no longer necessary with cmake 2.4.7.

  sql/CMakeLists.txt@1.20, 2007-11-02 15:30:37-04:00, iggy@alf.(none) +0 -7
    Bug#31217 C1033 compilation error on Windows
    - Remove workaround no longer needed.

ChangeSet@1.1810.3436.2, 2007-11-02 15:16:45-04:00, iggy@alf.(none) +1 -0
  Bug#31319 CMake build does not check for minimum required version
  - Add check

  CMakeLists.txt@1.1.27.5, 2007-11-02 15:16:44-04:00, iggy@alf.(none) +2 -0
    Bug#31319 CMake build does not check for minimum required version
    - Add check

ChangeSet@1.2541.36.7, 2007-11-02 17:34:06+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  workaround for some bug to investigate

  mysql-test/include/have_multi_ndb.inc@1.10, 2007-11-02 17:34:03+01:00, tomas@whalegate.ndb.mysql.com +2 -0
    workaround for some bug to investigate

ChangeSet@1.2573.76.2, 2007-11-02 16:40:08+03:00, kaa@polly.(none) +3 -0
  5.1-specific changes for bug #26215 after merging the patch from 5.0:
  
  - Added trigger tests back.
  - Fixed test cases to match the extended output format of SHOW CREATE ...
  - Replaced 'gptr' with 'uchar *'.

  client/mysql.cc@1.270.2.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +1 -1
    Replaced 'gptr' with 'uchar *'.

  mysql-test/r/mysql_comments.result@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +32 -20
    Fixed test cases to match the extended output format of SHOW CREATE ...
    Added trigger tests back.

  mysql-test/t/mysql_comments.sql@1.2, 2007-11-02 16:40:01+03:00, kaa@polly.(none) +43 -2
    Added trigger tests back.

ChangeSet@1.1810.3439.4, 2007-11-02 13:16:23+01:00, kent@mysql.com +2 -0
  Makefile.am:
    Removed place holder for 'manual.chm'
  .del-manual.chm:
    Delete: Docs/manual.chm

  BitKeeper/deleted/.del-manual.chm@1.2, 2007-11-02 13:07:52+01:00, kent@mysql.com +0 -0
    Delete: Docs/manual.chm

  Docs/Makefile.am@1.57.1.12, 2007-11-02 13:15:42+01:00, kent@mysql.com +1 -1
    Removed place holder for 'manual.chm'

ChangeSet@1.1346.895.3, 2007-11-02 13:12:19+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Don't install INSTALL-BINARY, handled by build scripts

  Docs/Makefile.am@1.38.1.20, 2007-11-02 13:11:55+01:00, kent@mysql.com +1 -2
    Don't install INSTALL-BINARY, handled by build scripts

ChangeSet@1.2564.29.1, 2007-11-02 14:00:38+02:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #31554  	rpl.rpl_truncate_2myisam test failure: wrong master binlog file name
  
  Actually, the failure happened with 3innodb as well. Most probably
  the reason is in failing to delete a binlog file on __NT__ so that
  that master increments the index of the binlog file.
  The test results hide valueable warning that windows could generate
  about that.
  
  The scope of this fix is to make sure we have such warning and
  to lessen chances for binlog file being held at time of closing.
  The dump thread is getting a good chance to leave and 
  release the file for its successful deletion.
  
  We shall watch over the two tests as regression is not excluded.
  In that case we would have an extra info possibly explaining why
  __NT__ env can not close/delete the file.
  However, regardless of that reason, there is alwasy workaround to mask out
  non-deterministic binlog index number.
  

  mysql-test/extra/rpl_tests/rpl_truncate_helper.test@1.7, 2007-11-02 14:00:34+02:00, aelkin@koti.dsl.inet.fi +8 -6
    enable warnings for other than DROP queries;
    wait for slave's full stop which ensures io thread left and that
    will be regarded by dump thread to leave and close the binlog file;
    relocating reset master to the end of the test so that the caller of
    this helper should start with the binlog name which has not yet been
    affected/reset since its creation.

  mysql-test/suite/rpl/r/rpl_truncate_2myisam.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

  mysql-test/suite/rpl/r/rpl_truncate_3innodb.result@1.8, 2007-11-02 14:00:35+02:00, aelkin@koti.dsl.inet.fi +42 -0
    results changed

ChangeSet@1.1810.3439.2, 2007-11-02 12:59:45+01:00, kent@mysql.com +5 -0
  Makefile.am:
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.
  ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
    Updated links to version 5.0 of the manual

  Docs/INSTALL-BINARY@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  Docs/Makefile.am@1.57.1.10, 2007-11-02 12:58:49+01:00, kent@mysql.com +2 -4
    Added manual.chm to EXTRA_DIST
    Removed install of INSTALL-BINARY, handled
    by install scripts.

  INSTALL-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  INSTALL-WIN-SOURCE@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

  support-files/MacOSX/ReadMe.txt@1.2, 2007-11-02 12:58:10+01:00, kent@mysql.com +1 -1
    Updated links to version 5.0 of the manual

ChangeSet@1.2598.2.8, 2007-11-02 14:47:18+03:00, kostja@bodhi.(none) +2 -0
  Cleanup the test case for Bug#32030 "DELETE does not return an error and
   deletes rows if error evaluating WHERE"

  mysql-test/r/ps.result@1.121, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +0 -3
    Disable warnings.

  mysql-test/t/ps.test@1.123, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +2 -1
    Disable warnings.

ChangeSet@1.1616.3114.2, 2007-11-02 12:36:44+01:00, kent@mysql.com +1 -0
  INSTALL-WIN-SOURCE:
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.1, 2007-11-02 12:36:29+01:00, kent@mysql.com +9 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE

  INSTALL-WIN-SOURCE@1.0, 2007-11-02 12:36:29+01:00, kent@mysql.com +0 -0

ChangeSet@1.1346.895.2, 2007-11-02 12:29:13+01:00, kent@mysql.com +6 -0
  mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:
    Let place holders for real documentation have text that
    makes sense to the user (Bug#25205)

  BitKeeper/deleted/.del-generate-text-files.pl@1.4.2.1, 2007-11-02 01:13:38+01:00, kent@mysql.com +0 -0
    Delete: Docs/Support/generate-text-files.pl

  Docs/INSTALL-BINARY@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY

  Docs/INSTALL-BINARY@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  Docs/Makefile.am@1.38.1.19, 2007-11-02 01:32:35+01:00, kent@mysql.com +3 -26
    Don't generate text files from the documentation

  Docs/mysql.info@1.2, 2007-11-02 01:31:55+01:00, kent@mysql.com +3 -26
    More of a end-user text

  INSTALL-SOURCE@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE

  INSTALL-SOURCE@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

  support-files/MacOSX/ReadMe.txt@1.1, 2007-11-02 01:29:32+01:00, kent@mysql.com +8 -0
    BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt

  support-files/MacOSX/ReadMe.txt@1.0, 2007-11-02 01:29:32+01:00, kent@mysql.com +0 -0

ChangeSet@1.1810.3438.1, 2007-11-02 13:40:34+03:00, kaa@polly.(none) +4 -0
  Fix for:
    bug #26215: mysql command line client should not strip comments
                from SQL statements
  and
    bug #11230: Keeping comments when storing stored procedures
  
  With the introduction of multiline comments support in the command line
  client (mysql) in MySQL 4.1, it became impossible to preserve
  client-side comments within single SQL statements or stored routines.
  This feature was useful for monitoring tools and maintenance.
  
  The patch adds a new option to the command line client
  ('--enable-comments', '-c') which allows to preserve SQL comments and
  send them to the server for single SQL statements, and to keep comments
  in the code for stored procedures / functions / triggers.
  
  The patch is a modification of the contributed patch from bug #11230
  with the following changes:
  - code style changes to conform to the coding guidelines
  - changed is_prefix() to my_strnncoll() to detect the DELIMITER
  command, since the first one is case-sensitive and not charset-aware
  - renamed t/comments-51.* to t/mysql_comments.*
  - removed tests for comments in triggers since 5.0 does not have SHOW
  CREATE TRIGGER (those tests will be added back in 5.1).
  
  The test cases are only for bug #11230. No automated test case for bug
  #26215 is possible due to the test suite deficiencies (though the cases
  from the bug report were tested manually).

  client/mysql.cc@1.199.30.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +125 -43
    Applied the contributed patch from bug11230 with the following changes:
    - code style changes to conform to the coding guidelines
    - changed is_prefix() to my_strnncoll() to detect the DELIMITER
    command, since the first one is case-sensitive and not charset-aware
    
    The patch adds a new option to the command line client which allows to
    preserve SQL comments and send them to the server to ensure better
    error reporting and to, keep comments in the code for stored procedures
    / functions / triggers.

  mysql-test/r/mysql_comments.result@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +50 -0
    Added test cases for bug11230.

  mysql-test/r/mysql_comments.result@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.sql@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +177 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.sql@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

  mysql-test/t/mysql_comments.test@1.1, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +37 -0
    Added test cases for bug11230.

  mysql-test/t/mysql_comments.test@1.0, 2007-11-02 13:40:31+03:00, kaa@polly.(none) +0 -0

ChangeSet@1.1616.3094.8, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
  Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Preliminarily disabled test case

  mysql-test/t/disabled.def@1.1.5.1, 2007-11-02 10:11:26+01:00, istruewing@stella.local +1 -0
    Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
    Preliminarily disabled test case

ChangeSet@1.2573.64.4, 2007-11-02 09:58:29+01:00, istruewing@stella.local +2 -0
  Bug#32048 - innodb_mysql.test produces warnings files
  
  Typo --#echo at line begin in test files lead to warnings
  from mysqltest.
    
  Changed to --echo #.

  mysql-test/include/mix1.inc@1.58.1.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -1
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed comment sign

  mysql-test/r/innodb_mysql.result@1.60.4.1, 2007-11-02 09:58:27+01:00, istruewing@stella.local +1 -0
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed test result

ChangeSet@1.2573.74.2, 2007-11-02 12:39:14+04:00, gluh@mysql.com +3 -0
  Bug#31630 debug assert with explain extended select ... from i_s
  added 'in_rows' column value for 'describe extended' for the case 
  when 'describe' handles I_S table

  mysql-test/r/information_schema.result@1.171, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test result

  mysql-test/t/information_schema.test@1.114, 2007-11-02 12:39:12+04:00, gluh@mysql.com +5 -0
    test case

  sql/sql_select.cc@1.566.4.1, 2007-11-02 12:39:12+04:00, gluh@mysql.com +4 -0
    added 'in_rows' column value for 'describe extended' for the case 
    when 'describe' handles I_S table

ChangeSet@1.2573.74.1, 2007-11-02 12:24:45+04:00, gluh@mysql.com +3 -0
  Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names
  db name should be quoted. this code does communication with the server.
  it's always ok to quote names in this case.

  client/mysqldump.c@1.291.1.14, 2007-11-02 12:24:43+04:00, gluh@mysql.com +3 -1
    db name should be quoted. this code does communication with the server.
    it's always ok to quote names in this case.

  mysql-test/r/mysqldump.result@1.159.1.4, 2007-11-02 12:24:43+04:00, gluh@mysql.com +19 -0
    test result

  mysql-test/t/mysqldump.test@1.148.1.4, 2007-11-02 12:24:44+04:00, gluh@mysql.com +12 -0
    test case

ChangeSet@1.2541.36.6, 2007-11-02 07:14:56+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  make sure everything is clean before starting the test

  mysql-test/include/have_multi_ndb.inc@1.9, 2007-11-02 07:14:53+01:00, tomas@whalegate.ndb.mysql.com +20 -0
    make sure everything is clean before starting the test

ChangeSet@1.2573.73.1, 2007-11-02 02:36:12+03:00, kostja@bodhi.(none) +5 -0
  A fix for Bug#32030 "DELETE does not return an error and deletes rows if 
  error evaluating WHERE"
  
  DELETE with a subquery in WHERE clause would sometimes ignore subquery
  evaluation error and proceed with deletion.
  
  The fix is to check for an error after evaluation of the WHERE clause
  in DELETE.
  
  Addressed review comments.

  mysql-test/r/group_min_max.result@1.36, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -2
    Update the test results to reflect the fix for Bug#32030.

  mysql-test/r/ps.result@1.120, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +20 -0
    Update test results (Bug#32030)

  mysql-test/t/group_min_max.test@1.33, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +1 -0
    Update the test case to reflect the fix for Bug#32030

  mysql-test/t/ps.test@1.122, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +33 -0
    Add a test case for Bug#32030

  sql/sql_delete.cc@1.226.1.3, 2007-11-02 02:36:10+03:00, kostja@bodhi.(none) +9 -2
    Check for an error before calling send_ok(). Two different places are
    covered because the subquery code has slightly different execution
    paths depending on ps-protocol/old-protocol

ChangeSet@1.2573.72.1, 2007-11-01 18:52:56-02:00, davi@endora.local +15 -0
  Bug#30882 Dropping a temporary table inside a stored function may cause a server crash
  
  If a stored function that contains a drop temporary table statement
  is invoked by a create temporary table of the same name may cause
  a server crash. The problem is that when dropping a table no check
  is done to ensure that table is not being used by some outer query
  (or outer statement), potentially leaving the outer query with a
  reference to a stale (freed) table.
  
  The solution is when dropping a temporary table, always check if
  the table is being used by some outer statement as a temporary
  table can be dropped inside stored procedures.
  
  The check is performed by looking at the TABLE::query_id value for
  temporary tables. To simplify this check and to solve a bug related
  to handling of temporary tables in prelocked mode, this patch changes
  the way in which this member is used to track the fact that table is
  used/unused. Now we ensure that TABLE::query_id is zero for unused
  temporary tables (which means that all temporary tables which were
  used by a statement should be marked as free for reuse after it's
  execution has been completed).

  mysql-test/include/handler.inc@1.40, 2007-11-01 18:52:50-02:00, davi@endora.local +32 -0
    Add test case for side effect of Bug#30882

  mysql-test/r/handler_innodb.result@1.22, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/handler_myisam.result@1.35, 2007-11-01 18:52:50-02:00, davi@endora.local +62 -0
    Add test case result for side effect of Bug#30882

  mysql-test/r/sp-error.result@1.134, 2007-11-01 18:52:50-02:00, davi@endora.local +49 -3
    Add test case result for Bug#30882

  mysql-test/t/sp-error.test@1.129, 2007-11-01 18:52:50-02:00, davi@endora.local +69 -5
    Add test case for Bug#30882

  sql/event_db_repository.cc@1.38, 2007-11-01 18:52:50-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values.

  sql/mysql_priv.h@1.549, 2007-11-01 18:52:51-02:00, davi@endora.local +2 -2
    Remove implicit default parameters values of the close_thread_tables
    function as no callers are using it.

  sql/slave.cc@1.315.1.3, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sp_head.cc@1.292.1.7, 2007-11-01 18:52:51-02:00, davi@endora.local +1 -1
    Update close_thread_tables call, no more default values

  sql/sql_base.cc@1.421.14.4, 2007-11-01 18:52:51-02:00, davi@endora.local +89 -52
    Changed the approach to distinguishing currently unused temporary tables.
    Now we ensure that such tables always have TABLE::query_id set to 0 and
    use this fact to perform checks during opening and dropping of temporary
    tables. This means that we have to call close_thread_tables() even for
    statements which use only temporary tables. To make this call cheaper,
    we re-factored close_thread_tables() to not take LOCK_open unless there
    are open base tables.

  sql/sql_handler.cc@1.104, 2007-11-01 18:52:52-02:00, davi@endora.local +14 -0
    Properly close temporary tables associated with a handler.

  sql/sql_insert.cc@1.299.1.2, 2007-11-01 18:52:52-02:00, davi@endora.local +1 -1
    close_temporary_table is now merged into drop_temporary_table.

  sql/sql_parse.cc@1.700.4.8, 2007-11-01 18:52:52-02:00, davi@endora.local +6 -9
    Now the condition doesn't cover all cases because close_thread_tables()
    must be called even for statements that use only temporary tables.

  sql/sql_table.cc@1.446.9.1, 2007-11-01 18:52:52-02:00, davi@endora.local +22 -6
    Use drop_temporary_table which perform checks to verify if
    the table is not being used. Error path problem is due to
    a handler tables issue and is going to be addressed in bug
    31397.

  sql/table.h@1.179.1.7, 2007-11-01 18:52:52-02:00, davi@endora.local +20 -2
    Rename previously unused clear_query_id and document the usage of
    query_id and open_by_handler.

ChangeSet@1.2573.44.7, 2007-11-01 12:30:03-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30671
    "ALTER SERVER can cause server to crash"
    While retrieving values, it would erronously set the socket value
    to NULL and attempt to use it in strcmp().
    Ensure it is correctly set to "" so that strcmp may not crash.

  mysql-test/r/federated_server.result@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +9 -1
    results for bug30671
    fix inconsistent result

  mysql-test/t/federated_server.test@1.10, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +13 -1
    surplus semicolon
    test for bug30671

  sql/sql_servers.cc@1.15, 2007-11-01 12:29:59-07:00, antony@pcg5ppc.xiphis.org +2 -2
    bug30671
    inside function get_server_from_table_to_cache()
      server->socket was being set to NULL instead of empty string

ChangeSet@1.2573.71.1, 2007-11-01 17:29:20-02:00, davi@endora.local +2 -0
  Bug#31850 Test crashes in "embedded" server
  
  The mysql_change_user command fails to properly update the database pointer
  when no database is selected, leading to "use after free" errors. The same
  happens on the user privilege pointer in the thread security context.
  
  The solution is to properly reset and update the database name. Also update
  the user_priv pointer so that it doesn't point to freed memory.

  sql/sql_connect.cc@1.14.1.1, 2007-11-01 17:29:17-02:00, davi@endora.local +9 -14
    After a successful call to check_user() without specifying a new
    database name, the previous database thd->db) is freed but the
    pointer is not updated to NULL.

  sql/sql_parse.cc@1.700.9.1, 2007-11-01 17:29:17-02:00, davi@endora.local +3 -2
    Update the security_ctx->priv_user pointer as it is a alias for
    the user security_ctx->user pointer. Also remove unneeded cast,
    the x_free macro casts the argument.

ChangeSet@1.2541.36.5, 2007-11-01 20:00:44+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
  - correction

  mysql-test/suite/ndb/r/ndb_multi.result@1.18, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  mysql-test/suite/ndb/t/ndb_multi.test@1.26, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +4 -2
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

  sql/ha_ndbcluster_binlog.cc@1.131.1.2, 2007-11-01 20:00:41+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #31484    Cluster LOST_EVENTS entry not added to binlog on mysqld restart
    - correction

ChangeSet@1.1810.3287.46, 2007-11-01 19:40:27+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41 & 5.0.45 on Mac OS X Server 10.5

  mysql-test/mysql-test-run.pl@1.30.49.109, 2007-11-01 19:40:25+01:00, msvensson@pilot.mysql.com +10 -0
    Also check for euid == 0

ChangeSet@1.1810.3395.17, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +3 -0
  Bug #31794: no syntax error on SELECT id FROM t HAVING count(*)>2
  
  The HAVING clause is subject to the same rules as the SELECT list
  about using aggregated and non-aggregated columns.
  But this was not enforced when processing implicit grouping from
  using aggregate functions.
  Fixed by performing the same checks for HAVING as for SELECT.

  mysql-test/r/func_group.result@1.49.1.15, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +15 -0
    Bug #31794: test case

  mysql-test/t/func_group.test@1.48.1.11, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +19 -0
    Bug #31794: test case

  sql/sql_select.cc@1.312.173.2, 2007-11-01 18:36:24+02:00, gkodinov@magare.gmz +10 -2
    Bug #31794: Check HAVING in addition to SELECT list

ChangeSet@1.2602, 2007-11-01 17:24:21+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  disable test

  mysql-test/suite/rpl_ndb/t/disabled.def@1.10.1.2, 2007-11-01 17:24:18+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    disable test

ChangeSet@1.2598.2.4, 2007-11-01 18:33:51+03:00, kostja@bodhi.(none) +1 -0
  Cleanup execute_ddl_log_recovery() to not generate an error if 
  there is nothing to recover.
  
  Discovered while working on Bug#12713

  sql/sql_table.cc@1.446.7.4, 2007-11-01 18:33:49+03:00, kostja@bodhi.(none) +1 -1
    Use MYF(0) in my_open() in read_ddl_log_header() called from
    execute_ddl_log_recovery() called during the server start up to not
    generate an error if no ddl log exists. This is not an erroneous situation,
    in fact it's the case in any server statrtup. The error was lost
    anyway, since it was pushed into the stack of the artificial thd.

ChangeSet@1.2573.2.40, 2007-11-01 18:06:46+03:00, kostja@bodhi.(none) +1 -0
  Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
  error in mysql_create_frm instead of
  direct access to my_error() members.
  
  This is a pre-requisite for the patch for Bug#12713.

  sql/unireg.cc@1.105, 2007-11-01 18:06:44+03:00, kostja@bodhi.(none) +42 -6
    Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
    error in mysql_create_frm instead of
    direct access to my_error() members.

ChangeSet@1.2573.2.39, 2007-11-01 17:08:02+03:00, kostja@bodhi.(none) +1 -0
  Use thd->is_error() instead of direct access to thd->net.report_error
  in evaluate_join_record().
  
  A minor cleanup required for the fix for Bug#12713.

  sql/sql_select.cc@1.566.1.5, 2007-11-01 17:07:59+03:00, kostja@bodhi.(none) +5 -6
    Use thd->is_error() instead of direct access to thd->net.report_error
    in evaluate_join_record()

ChangeSet@1.2541.36.4, 2007-11-01 15:08:00+01:00, tomas@whalegate.ndb.mysql.com +5 -0
  Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/include/have_multi_ndb.inc@1.8, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +2 -10
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/suite/ndb/r/ndb_multi_row.result@1.6, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  mysql-test/suite/ndb/t/ndb_multi_row.test@1.8, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +2 -1
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  sql/ha_ndbcluster.cc@1.467.3.7, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

  sql/ha_ndbcluster_binlog.cc@1.131.1.1, 2007-11-01 15:07:57+01:00, tomas@whalegate.ndb.mysql.com +31 -4
    Bug #31484  	Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

ChangeSet@1.1810.3435.2, 2007-11-01 15:04:23+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.51.9.1, 2007-11-01 15:04:22+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1810.3435.1, 2007-11-01 15:03:09+01:00, istruewing@stella.local +1 -0
  Bug#31909 - New gis.test creates warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
  
  Changed -- to #.

  mysql-test/include/gis_keys.inc@1.2, 2007-11-01 15:03:08+01:00, istruewing@stella.local +8 -8
    Bug#31909 - New gis.test creates warnings files
    Changed -- to # at comment begin to avoid warnings files.

ChangeSet@1.2573.2.38, 2007-11-01 17:00:24+03:00, kostja@bodhi.(none) +1 -0
  Fix a compilation warning.

  sql/sql_connect.cc@1.16, 2007-11-01 17:00:22+03:00, kostja@bodhi.(none) +0 -1
    Fix a compilation warning (unused variable).

ChangeSet@1.2573.70.1, 2007-11-01 14:42:14+02:00, gkodinov@magare.gmz +3 -0
  Bug #31866: MySQL Server crashes on SHOW CREATE TRIGGER statement
  
  SHOW CREATE TRIGGER was not checking for detected errors 
  opening/reading the trigger file. 
  Fixed to return the already generated error.

  mysql-test/r/trigger.result@1.73, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +6 -0
    Bug #31866: test case

  mysql-test/t/trigger.test@1.83, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +12 -0
    Bug #31866: test case

  sql/sql_show.cc@1.441.1.1, 2007-11-01 14:42:13+02:00, gkodinov@magare.gmz +3 -0
    Bug #31866: test for error and return it.

ChangeSet@1.1810.3413.3, 2007-11-01 16:27:01+04:00, svoj@mysql.com +1 -0
  BUG#31950 - repair table hangs while processing multicolumn utf8
              fulltext index
  
  Having a table with broken multibyte characters may cause fulltext
  parser dead-loop.
  
  Since normally it is not possible to insert broken multibyte sequence
  into a table, this problem may arise only if table is damaged.
  
  Affected statements are:
  - CHECK/REPAIR against damaged table with fulltext index;
  - boolean mode phrase search against damaged table with or
    without fulltext inex;
  - boolean mode searches without index;
  - nlq searches.
  
  No test case for this fix. Affects 5.0 only.

  myisam/ft_parser.c@1.46.6.1, 2007-11-01 16:27:00+04:00, svoj@mysql.com +1 -1
    When skipping leading spaces, skip broken characters as well (broken
    characters a identified by mbl == 0).

ChangeSet@1.2601, 2007-11-01 12:02:41+01:00, tomas@whalegate.ndb.mysql.com +3 -0
  disable tests

  BitKeeper/etc/ignore@1.300.1.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +1 -0
    Added libmysql_r/client_settings.h to the ignore list

  mysql-test/suite/rpl/t/disabled.def@1.11.1.2, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

  mysql-test/suite/rpl_ndb/t/disabled.def@1.10.1.1, 2007-11-01 12:02:39+01:00, tomas@whalegate.ndb.mysql.com +2 -2
    disable tests

ChangeSet@1.1810.3404.2, 2007-11-01 11:33:35+01:00, msvensson@pilot.mysql.com +2 -0
  Bug#32023 ndb_mgmd is slow to repsond when no nodes are up

  ndb/src/mgmsrv/Services.cpp@1.45.43.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +1 -1
    Only call 'updateStatus'(and forcing HB) once before printing
    node status 

  ndb/src/ndbapi/ClusterMgr.cpp@1.17.15.1, 2007-11-01 11:33:32+01:00, msvensson@pilot.mysql.com +4 -1
    Only wait for reply to forced API_REGREQ if any signals
    has been sent

ChangeSet@1.1810.3434.2, 2007-11-01 11:02:28+01:00, msvensson@pilot.mysql.com +1 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard
   - Fix problem in first implementation

  mysql-test/lib/mtr_cases.pl@1.12.1.31, 2007-11-01 11:02:27+01:00, msvensson@pilot.mysql.com +4 -6
    Prepend a ^ to the regex only if _all_ charactersin the pattern are normal

ChangeSet@1.1810.3434.1, 2007-11-01 11:01:05+01:00, msvensson@pilot.mysql.com +1 -0
  Fix comment

  client/mysqltest.c@1.155.9.119, 2007-11-01 11:01:01+01:00, msvensson@pilot.mysql.com +1 -1
    Fix comment

ChangeSet@1.1810.3202.21, 2007-11-01 07:59:55+01:00, knielsen@ymer.(none) +1 -0
  Bug #31848: Test failure: Cluster has problems on insert with auto-increment
  
  Fix uninitialized variable causing failures for some interpreted update
  operations on gcc 4.2.1.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.13.1, 2007-11-01 07:59:52+01:00, knielsen@ymer.(none) +2 -1
    Fix uninitialized variable causing failures for some interpreted update
    operations on gcc 4.2.1.

ChangeSet@1.2573.2.36, 2007-11-01 00:55:25+03:00, kostja@bodhi.(none) +1 -0
  Another attempt to fix the Windows compilation failre.

  sql-common/client.c@1.146, 2007-11-01 00:55:23+03:00, kostja@bodhi.(none) +3 -3
    Another attempt to fix the Windows compilation failre.

ChangeSet@1.2541.38.1, 2007-10-31 22:37:10+01:00, jmiller@mysql.com +3 -0
  Adding dbutil to ndb test lib

  storage/ndb/test/include/dbutil.hpp@1.1, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +97 -0
    Hearder file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/include/dbutil.hpp@1.0, 2007-10-31 22:35:06+01:00, jmiller@mysql.com +0 -0

  storage/ndb/test/src/Makefile.am@1.14, 2007-10-31 22:36:40+01:00, jmiller@mysql.com +1 -1
    Updated to include dbutil

  storage/ndb/test/src/dbutil.cpp@1.1, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +176 -0
    Implementation file for SQL Database Utilities class for adding MySQL SQL abilities to NDB API tests cases.

  storage/ndb/test/src/dbutil.cpp@1.0, 2007-10-31 22:36:05+01:00, jmiller@mysql.com +0 -0

ChangeSet@1.2573.2.35, 2007-11-01 00:31:57+03:00, kostja@bodhi.(none) +3 -0
  A fix for Bug#32007 select udf_function() doesn't return an error if error
  during udf initialization. The bug is spotted while working on Bug 12713.
  
  If a user-defined function was used in a SELECT statement, and an
  error would occur during UDF initialization, this error would not terminate
  execution of the SELECT, but rather would be converted to a warning.
  
  The fix is to use a stack buffer to store the message from udf_init instead
  of private my_error() buffer.

  mysql-test/r/udf.result@1.27, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the result to reflect the fix for Bug#32007 select udf_function() 
    doesn't return an error if error during udf initialization

  mysql-test/t/udf.test@1.25, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +6 -6
    Update the test to reflect the fix for Bug #32007 select udf_function() 
    doesn't return an error if error during udf initialization

  sql/item_func.cc@1.426, 2007-11-01 00:31:54+03:00, kostja@bodhi.(none) +3 -2
    A fix for Bug#32007.
    
    net.last_error buffer was used to store the temporary message from udf_init.
    Then, when my_error() was called, net.last_error was not empty so 
    my_error() would conclude that there is already an error in the error stack, 
    and not "overwrite" it.
    However, thd->net.report_error was not set, so the the 
    SELECT was not aborted.
    
    The fix is to use a stack buffer instead of thd->net.last_error
    to store the message from udf_init. The message will end up in
    thd->net.last_error anyway after a call to my_error.

ChangeSet@1.2573.69.1, 2007-11-01 00:10:58+03:00, kostja@bodhi.(none) +6 -0
  Remove net_printf_error(). Do not talk to network directly in
  check_user()/check_connection()/check_for_max_user_connections().
  
  This is a pre-requisite patch for the fix for Bug#12713 "Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem"
  
  Implement review comments.

  sql/mysql_priv.h@1.548, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    check_for_max_user_connections() is used in one place only, make it static.

  sql/mysqld.cc@1.682, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +5 -1
    Remove net_printf_error(): a consolidation of error reporting facilities
    is necessary to simplify maintenance of the query cache, the 
    client-server protocol, stored procedure continue handlers. 
    Rewrite the only place where its use is somewhat justified 
    (my_error() can not be used since we need to report an error for the thread 
    that does not exist) with my_snprintf()/net_send_error().

  sql/protocol.cc@1.133, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +1 -119
    Remove net_printf_error().

  sql/protocol.h@1.43, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -1
    Remove net_printf_error().

  sql/sql_connect.cc@1.15, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +104 -83
    Remove net_printf_error(). In check_connection()/check_user()/
    check_for_max_user_connections() do not write directly to the network,
    but use the standard my_error() mechanism to record an error in THD.
    It will be sent to the client by the caller. This was the last place
    in the server that would attempt to send an error directly, mainly left 
    untouched by 5.0 refactoring because it is executed only during 
    thread startup.

  sql/sql_parse.cc@1.700.8.1, 2007-11-01 00:10:56+03:00, kostja@bodhi.(none) +0 -5
    In the old code, when res was greater than 0, it contained an exact 
    error code, e.g. ER_OUT_OF_RESOURCES or NO SUCH DATABASE, 
    or ER_HANDSHAKE_ERROR. I don't know the reason why this error code was 
    ignored, and instead a generic  ER_UNKNOWN_COM_ERROR was pushed into the
    error stack, but knowing the relaxed attitude towards preserving the error
    codes in the old code, I'm inclinded to think that it was a bug.
    
    After this patch, the most specific error message is already pushed,
    so calling my_message() again is useless.
    
    If res is < 0, the error used to be already sent. This is not done
    by the new code, but will be done later, in the end
    of dispatch_command(). When this is done, clear_error() will be called 
    for us - it is in the first lines of do_command.
    
    To sum up, this change is to remove COM_CHANGE_USER specific error handling
    in favor of the standard one employed for all other COM_* commands.

ChangeSet@1.2573.68.1, 2007-10-31 23:48:41+03:00, kostja@bodhi.(none) +1 -0
  Try to fix a Windows compilation warning.

  sql-common/client.c@1.145, 2007-10-31 23:48:37+03:00, kostja@bodhi.(none) +70 -55
    Move a block of auxiliary functions to the beginning of the file,
    to avoid compilation warnings on Windows.
    Add comments, albeit trivial, while we're at it.

ChangeSet@1.2573.67.1, 2007-10-31 21:09:52+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#28086 (SBR of USER() becomes corrupted on slave):
  
  Marking statements containing USER() or CURRENT_USER() as unsafe, causing
  them to switch to using row-based logging in MIXED mode and generate a
  warning in STATEMENT mode.

  mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result@1.25, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +68 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test@1.19, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +36 -0
    Adding test to check that USER() and CURRENT_USER() cause a switch
    to row-based logging.

  sql/sql_yacc.yy@1.605, 2007-10-31 21:09:44+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Setting statements containing USER() or CURRENT_USER() to be unsafe.

ChangeSet@1.2573.61.3, 2007-10-31 14:01:01-05:00, jmiller@mysql.com +1 -0
  rpl_extraSlave_Col.test:
    Corrected issues found in preparing to push code

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.6, 2007-10-31 14:00:09-05:00, jmiller@mysql.com +3 -0
    Corrected issues found in preparing to push code

ChangeSet@1.1810.3433.1, 2007-10-31 17:40:29+01:00, mleich@four.local.lan +1 -0
  Fix for
     Bug#29290 type_datetime.test failure in 5.1

  mysql-test/t/type_datetime.test@1.18.8.4, 2007-10-31 17:39:53+01:00, mleich@four.local.lan +16 -3
    - If we are too close to midnight sleep till we reach 
      at least midnight + 1 second.
    - Replace error numbers with error names.

ChangeSet@1.2573.58.2, 2007-10-31 13:54:53-02:00, davi@endora.local +1 -0
  Post merge fix for bug 31669.

  tests/mysql_client_test.c@1.255.1.4, 2007-10-31 13:54:51-02:00, davi@endora.local +8 -8
    Macro name changed in 5.1

ChangeSet@1.2573.2.32, 2007-10-31 18:33:13+03:00, kostja@bodhi.(none) +3 -0
  Cleanup: rename select_send::status to select_send::is_result_set_started.
  Add select_send::cleanup.
  Fix a compilation warning.
  Issues spotted while working on the fix for Bug#12713.

  sql-common/client.c@1.144, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +0 -1
    Fix a warning.

  sql/sql_class.cc@1.347.1.9, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +22 -8
    Give a variable a more specific name. Rewrite an incorrect comment.
    Add a cleanup for select_send. The only case now this cleanup can be
    necessary is when we have a prepared statement inside a stored procedure, 
    and a continue handler. At first execution, the statement is killed
    after having executed select_send::send_fields. At the second execution
    it is killed after having executed select_send::send_fields.

  sql/sql_class.h@1.399.3.4, 2007-10-31 18:33:06+03:00, kostja@bodhi.(none) +8 -2
    Rename a member. Add comments.

ChangeSet@1.2573.66.1, 2007-10-31 17:16:53+03:00, kostja@bodhi.(none) +4 -0
  Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.
  No functionality added or changed.
  This is a pre-requisite for the fix for Bug#12713 Error in a stored 
  function called from a SELECT doesn't cause ROLLBACK of statem
  
  Address post-review comments.

  include/sql_common.h@1.21, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +4 -2
    Declare auxiliary functions to manipulate mysql.net.last_er* and 
    mysql_stmt.last_er*

  libmysql/libmysql.c@1.301.1.1, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -86
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  libmysqld/lib_sql.cc@1.141, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +8 -14
    Use helper functions to set an error in MYSQL or MYSQL_STMT

  sql-common/client.c@1.143, 2007-10-31 17:16:51+03:00, kostja@bodhi.(none) +66 -82
    Use helper functions to set an error in MYSQL or MYSQL_STMT

ChangeSet@1.2573.62.1, 2007-10-31 16:01:29+04:00, holyfoot@mysql.com +3 -0
  Bug #31893 Partitions: crash if subpartitions and engine change.
  
  The new default database engine for altered table was reassigned to
  the old one. That's wrong thing by itself, and (as the engine
  for a subpartition gets that new value) leads to DBUG_ASSERTION
  in mysql_unpack_partition()

  mysql-test/r/partition.result@1.69.2.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +14 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test result

  mysql-test/t/partition.test@1.63.3.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +11 -0
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    test case

  sql/sql_partition.cc@1.116.1.1, 2007-10-31 16:01:26+04:00, holyfoot@mysql.com +4 -1
    Bug #31893 Partitions: crash if subpartitions and engine change.
    
    Don't change part_info->default_engine_type if it's already set

ChangeSet@1.1810.3409.2, 2007-10-31 12:25:18+01:00, thek@adventure.(none) +1 -0
  Bug#31347 Increase in memory usage after many DROP USER statements
  
  Dropping users causes huge increase in memory usage because field values were
  allocated on the server memory root for temporary usage but never deallocated.
  
  This patch changes the target memory root to be that of the thread handler
  instead since this root is cleared between each statement.

  sql/sql_acl.cc@1.128.48.1, 2007-10-31 12:25:17+01:00, thek@adventure.(none) +13 -11
    Changed memory root from server life time memory to thread life time memory.

ChangeSet@1.2573.61.1, 2007-10-31 11:48:49+02:00, aelkin@koti.dsl.inet.fi +7 -0
  bug#27571 merging. Fixing offsets and moving tests to the corrent
  destination. Removing wrong (local temp) tests.

  BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt@1.2, 2007-10-31 11:44:30+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571-master.opt

  BitKeeper/deleted/.del-binlog_killed_bug27571.test@1.2, 2007-10-31 11:44:23+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Delete: mysql-test/t/binlog_killed_bug27571.test

  mysql-test/suite/binlog/r/binlog_killed.result@1.9, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +7 -6
    results changed

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.1, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +33 -0
    new results file

  mysql-test/suite/binlog/r/binlog_killed_simulate.result@1.0, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/binlog/t/binlog_killed.test@1.11.1.2, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +6 -4
    binlog offset made 5.1 specific

  mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt@1.2, 2007-10-31 11:32:05+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.3, 2007-10-31 11:48:43+02:00, aelkin@koti.dsl.inet.fi +5 -2
    binlog offset + guard to run the test with stmt/mixed format

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@1.2, 2007-10-31 11:31:45+02:00, aelkin@koti.dsl.inet.fi +0 -0
    Rename: mysql-test/t/binlog_killed_simulate.test -> mysql-test/suite/binlog/t/binlog_killed_simulate.test

ChangeSet@1.2573.54.7, 2007-10-31 10:45:31+01:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes to handle some test failures.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.7, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +8 -8
    Result file change.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5.1.1, 2007-10-31 10:45:20+01:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Include file show_slave_status.inc should be used for portable SHOW SLAVE STATUS.

ChangeSet@1.1810.3431.1, 2007-10-31 10:34:26+01:00, knielsen@loke.(none) +4 -0
  BUG#31799: Scrambled number output due to integer overflow
  
  An integer overflow in number->string conversion caused completely
  wrong output of the number LONGLONG_MIN with gcc 4.2.1.
  
  Fixed by eliminating the overflow, using only operations that are
  well-defined in ANSI C.

  strings/ctype-simple.c@1.75.4.2, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/ctype-ucs2.c@1.50.1.18, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +14 -10
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/int2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +10 -6
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

  strings/longlong2str.c@1.10, 2007-10-31 10:34:25+01:00, knielsen@loke.(none) +18 -14
    An integer overflow in number->string conversion caused completely
    wrong output of the number LONGLONG_MIN with gcc 4.2.1.
    
    Fixed by eliminating the overflow, using only operations that are
    well-defined in ANSI C.

ChangeSet@1.2573.2.29, 2007-10-31 12:04:19+03:00, anozdrin@station. +1 -0
  Fix for a BUG#31649: events.test fails: NULL "state" field of
  SHOW PROCESSLIST.
  
  The problem was a race condition: if the Event Scheduler was not
  quick enough, the following scenario happens:
    - The Event Scheduler picks up the created event;
    - The event is executed;
    - event_scheduler_thread->proc_info is set to NULL;
    - The client issues SELECT FROM I_S.
  
  The fix is to wait for the Event Scheduler to reach 'Waiting
  for next activation' state. 

  mysql-test/t/events.test@1.54, 2007-10-31 12:04:17+03:00, anozdrin@station. +2 -1
    Wait for the Event Scheduler to start waiting for the activation.

ChangeSet@1.2573.2.28, 2007-10-31 09:53:58+03:00, anozdrin@station. +2 -0
  Fix result files after patch for BUG#31035.

  mysql-test/r/group_min_max.result@1.35, 2007-10-31 09:53:56+03:00, anozdrin@station. +2 -2
    Update result file.

  mysql-test/r/index_merge_myisam.result@1.9, 2007-10-31 09:53:56+03:00, anozdrin@station. +1 -1
    Update result file.

ChangeSet@1.2573.57.1, 2007-10-30 20:51:04-02:00, davi@endora.local +5 -0
  Bug#30904 SET PASSWORD statement is non-transactional
  
  The SET PASSWORD statement is non-transactional (no explicit transaction
  boundaries) in nature and hence is forbidden inside stored functions and
  triggers, but it weren't being effectively forbidden.
  
  The implemented fix is to issue a implicit commit with every SET PASSWORD
  statement, effectively prohibiting these statements in stored functions
  and triggers. 

  mysql-test/r/sp-error.result@1.133, 2007-10-30 20:51:01-02:00, davi@endora.local +10 -0
    Add test case result for Bug#30904

  mysql-test/t/sp-error.test@1.128, 2007-10-30 20:51:01-02:00, davi@endora.local +19 -0
    Add test case for Bug#30904

  sql/sql_lex.h@1.301, 2007-10-30 20:51:01-02:00, davi@endora.local +1 -1
    Add variable to set that a statement with SET PASSWORD causes a implicit
    commit.

  sql/sql_parse.cc@1.700.4.6, 2007-10-30 20:51:02-02:00, davi@endora.local +4 -0
    End active transaction in SET PASSWORD.

  sql/sql_yacc.yy@1.601.5.2, 2007-10-30 20:51:02-02:00, davi@endora.local +8 -0
    Set the correct flag on SET PASSWORD if inside a SP, thus effectively
    prohibiting SET PASSWORD statements in stored functions and triggers.

ChangeSet@1.2564.28.1, 2007-10-30 21:17:19+01:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#19958 (RBR idempotency issue for UPDATE and DELETE):
  
  The rpl_trigger test case indicated a problem with idempotency support when run
  under row-based replication, which this patch fixes.
  
  However, despite this, the test is not designed for execution under row-based
  replication and hence rpl_trigger.test is not executed under row-based
  replication.
  
  The problem is that the test expects triggers to be executed when the slave
  updates rows on the slave, and this is (deliberately) not done with row-based
  replication.

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +71 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_idempotency.result''

  mysql-test/suite/rpl/r/rpl_idempotency.result@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.1, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +79 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_idempotency.test''

  mysql-test/suite/rpl/t/rpl_idempotency.test@1.0, 2007-10-30 21:17:14+01:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/log_event.cc@1.305.3.1, 2007-10-30 21:17:13+01:00, mats@kindahl-laptop.dnsalias.net +67 -4
    Adding function to print symbolic name of handler errors for debug purposes.
    Ignoring some more error messages to provide full idempotency support for
    update and delete operations.

ChangeSet@1.1810.3425.5, 2007-10-30 20:54:31+01:00, kent@mysql.com +1 -0
  Makefile.am:
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

  cmd-line-utils/libedit/Makefile.am@1.16.1.1, 2007-10-30 20:37:12+01:00, kent@mysql.com +9 -3
    Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
    work around for problem with automake 1.10 (bug#24809)

ChangeSet@1.2573.2.25, 2007-10-30 22:35:14+03:00, kostja@bodhi.(none) +7 -0
  In ha_delete_table, use a standard mechanism to intercept the error message
  and convert it to a warning instead of direct manipulation with the
  thread error stack.
  Fix a bug in handler::print_erorr when a garbled message was
  printed for HA_ERR_NO_SUCH_TABLE.
  This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
  function called from a SELECT doesn't cause ROLLBACK of statem

  sql/handler.cc@1.322.8.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +45 -25
    Use a standard mechanism to intercept the error message, instead
    of direct manipulation with thread error stack. 
    Fix a bug when for HA_ERR_NO_SUCH_TABLE handler::print_error() would
    print a garbled message.

  sql/log.cc@1.297.1.4, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/mysqld.cc@1.681, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_base.cc@1.421.14.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_class.cc@1.347.1.8, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -2
    Extend internal error handler interface to carry the message text.

  sql/sql_class.h@1.399.3.3, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +2 -1
    Extend internal error handler interface to carry the message text.

  sql/sql_error.cc@1.47, 2007-10-30 22:35:11+03:00, kostja@bodhi.(none) +1 -1
    Extend internal error handler interface to carry the message text.

ChangeSet@1.2597, 2007-10-30 20:06:49+01:00, joerg@trift2. +2 -0
  Minor Makefile fixes:
  
  1) Add a new top level "Makefile.am" target "make embedded-test".
  
  2) Fix a syntax error (bad merge) in "netware/Makefile.am".

  Makefile.am@1.144, 2007-10-30 20:06:46+01:00, joerg@trift2. +11 -6
    Add a new "make" target "embedded-test" so that it is easier 
    to test the "embedded server" ("libmyslqd").
    Make it "phony".
    
    Use it via a sub-make within "test-bt" to avoid code duplication.

  netware/Makefile.am@1.35, 2007-10-30 20:06:46+01:00, joerg@trift2. +0 -3
    Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

ChangeSet@1.2573.56.1, 2007-10-30 20:08:16+03:00, kostja@bodhi.(none) +20 -0
  Use an inline getter method (thd->is_error()) to query if there is an error 
  in THD.
  In future the error may be stored elsewhere (not in net.report_error) and 
  it's important to start using an opaque getter to simplify merges.

  sql/filesort.cc@1.136, 2007-10-30 20:08:10+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/ha_ndbcluster_binlog.cc@1.133, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/item_func.cc@1.425, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/item_subselect.cc@1.163, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/set_var.cc@1.252.2.5, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp.cc@1.173, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sp_head.cc@1.292.1.6, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_base.cc@1.421.14.2, 2007-10-30 20:08:11+03:00, kostja@bodhi.(none) +5 -5
    net.report_error -> is_error()

  sql/sql_class.cc@1.347.1.7, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

  sql/sql_class.h@1.399.3.2, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +15 -1
    net.report_error -> is_error()

  sql/sql_connect.cc@1.12.1.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_delete.cc@1.226.1.2, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +4 -4
    net.report_error -> is_error()

  sql/sql_insert.cc@1.299.1.1, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +6 -6
    net.report_error -> is_error()

  sql/sql_parse.cc@1.700.4.5, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +11 -11
    net.report_error -> is_error()

  sql/sql_prepare.cc@1.235, 2007-10-30 20:08:12+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_select.cc@1.566.1.4, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +15 -15
    net.report_error -> is_error()

  sql/sql_union.cc@1.154, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +1 -1
    net.report_error -> is_error()

  sql/sql_update.cc@1.254.2.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_view.cc@1.156, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +3 -3
    net.report_error -> is_error()

  sql/sql_yacc.yy@1.601.5.1, 2007-10-30 20:08:13+03:00, kostja@bodhi.(none) +2 -2
    net.report_error -> is_error()

ChangeSet@1.1810.3400.3, 2007-10-30 15:22:52+01:00, df@pippilotta.erinye.com +1 -0
  bug#30630

  mysql-test/mysql-test-run.pl@1.30.95.1, 2007-10-30 15:22:49+01:00, df@pippilotta.erinye.com +7 -0
    bug#30630

ChangeSet@1.2573.55.3, 2007-10-30 14:52:12+01:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct result file

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.2, 2007-10-30 14:52:09+01:00, tomas@whalegate.ndb.mysql.com +8 -8
    correct result file

ChangeSet@1.2573.54.5, 2007-10-30 14:08:37+01:00, aelkin@dl145j.mysql.com +4 -0
  manual merge

  BitKeeper/deleted/.del-rpl_slave_skip-slave.opt@1.2, 2007-10-30 13:56:11+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip-slave.opt

  BitKeeper/deleted/.del-rpl_slave_skip.result@1.2, 2007-10-30 13:58:30+01:00, aelkin@dl145j.mysql.com +0 -0
    Delete: mysql-test/r/rpl_slave_skip.result

  BitKeeper/deleted/.del-rpl_slave_skip.test@1.2, 2007-10-30 13:56:12+01:00, mkindahl@dl145j.mysql.com +0 -0
    Delete: mysql-test/t/rpl_slave_skip.test

  sql/slave.cc@1.324, 2007-10-30 14:07:16+01:00, aelkin@dl145j.mysql.com +8 -105
    manual merge

ChangeSet@1.2573.55.2, 2007-10-30 14:04:41+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.4, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.4, 2007-10-30 14:04:38+01:00, tomas@whalegate.ndb.mysql.com +12 -12
    correct manual merge

ChangeSet@1.2573.2.23, 2007-10-30 15:39:50+03:00, kostja@bodhi.(none) +1 -0
  Fix failing init_connect.test (5.1-runtime).

  sql/sql_connect.cc@1.13, 2007-10-30 15:39:47+03:00, kostja@bodhi.(none) +11 -1
    Fix failing init_connect.test (5.1-runtime). Add comments for the unjustified use
    of thd->is_slave_error.

ChangeSet@1.1810.3430.1, 2007-10-30 14:27:21+02:00, gkodinov@magare.gmz +3 -0
  Bug #31884: Assertion + crash in subquery in the SELECT clause.
  
  Item_in_subselect's only externally callable method is val_bool().
  However the nullability in the wrapper class (Item_in_optimizer) is 
  established by calling the "forbidden" method val_int().
  
  Fixed to use the correct method (val_bool() ) to establish nullability 
  of Item_in_subselect in Item_in_optimizer.

  mysql-test/r/subselect.result@1.134.1.62, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +11 -0
    Bug #31884: test case

  mysql-test/t/subselect.test@1.129.12.1, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +15 -0
    Bug #31884: test case

  sql/item_subselect.h@1.77.1.14, 2007-10-30 14:27:19+02:00, gkodinov@magare.gmz +1 -0
    Bug #31884: Use the correct method to establish nullability

ChangeSet@1.2573.2.22, 2007-10-30 15:25:39+03:00, kostja@bodhi.(none) +1 -0
  Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
  This is important for a development environment where not all source files
  are checked out.

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.2.1, 2007-10-30 15:25:36+03:00, kostja@bodhi.(none) +1 -1
    Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only.
    This is important for a development environment where not all source files
    are checked out.

ChangeSet@1.2573.54.4, 2007-10-30 13:49:42+02:00, aelkin@koti.dsl.inet.fi +6 -0
  Manual merge 5.0-rpl -> 5.1-rpl.
  
  involved bug#12691, bug#27571

  mysql-test/suite/rpl/r/rpl_sp_effects.result@1.9, 2007-10-30 13:49:34+02:00, aelkin@koti.dsl.inet.fi +41 -0
    results changed

  sql/slave.cc@1.323, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +9 -70
    pended manual merge done (mats)

  sql/sql_delete.cc@1.232, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +2 -23
    manual merge

  sql/sql_insert.cc@1.302, 2007-10-30 13:49:35+02:00, aelkin@koti.dsl.inet.fi +1 -25
    manual merge

  sql/sql_load.cc@1.133, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +5 -44
    manual merge

  sql/sql_update.cc@1.260, 2007-10-30 13:49:36+02:00, aelkin@koti.dsl.inet.fi +13 -132
    manual merge.

ChangeSet@1.2573.44.5, 2007-10-30 12:03:44+01:00, istruewing@stella.local +1 -0
  Post-merge fix

  mysql-test/t/variables.test@1.74.1.1, 2007-10-30 12:03:43+01:00, istruewing@stella.local +1 -1
    Post-merge fix

ChangeSet@1.1616.3109.2, 2007-10-30 14:46:43+04:00, svoj@mysql.com +3 -0
  BUG#11392 - fulltext search bug
  
  Fulltext boolean mode phrase search may crash server on platforms
  where size of pointer is not equal to size of unsigned integer
  (in other words some 64-bit platforms).
  
  The problem was integer overflow.
  
  Affects 4.1 only.

  mysql-test/r/fulltext.result@1.65.1.15, 2007-10-30 14:46:42+04:00, svoj@mysql.com +6 -0
    A test case for BUG#11392.

  mysql-test/t/fulltext.test@1.71.1.8, 2007-10-30 14:46:42+04:00, svoj@mysql.com +8 -0
    A test case for BUG#11392.

  myisam/ft_boolean_search.c@1.84.1.6, 2007-10-30 14:46:42+04:00, svoj@mysql.com +2 -1
    my_match_t::beg is unsigned int, that means type of expression
    (m[0].beg - 1) has unsigned type too. It may happen that instr()
    finds substring in the beggining of passed string, returning
    m[0].beg equal to 0. In this case value of expression (m[0].beg - 1)
    is equal to MAX_UINT.
    
    This is not a problem on platforms where sizeof(pointer) equals to
    sizeof(uint). That means ptr[(uint)-1] = ptr[(uint)MAX_UINT] = ptr - 1.
    
    On some 64-bit platforms where sizeof(pointer) is 8 and sizeof(uint)
    is 4, wrong address gets accessed. In other words ptr[(uint)-1] is
    equal to ptr + MAX_UINT.

ChangeSet@1.1810.3429.1, 2007-10-30 12:51:57+04:00, ramil@mysql.com +3 -0
  Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
  names include backticks or blank
  
  Problem: mysqlcheck doesn't escape backtick characters in the table names.
  
  Fix: escape them.

  client/mysqlcheck.c@1.55.1.5, 2007-10-30 12:51:55+04:00, ramil@mysql.com +38 -14
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - escape backtick characters in the table names.

  mysql-test/r/mysqlcheck.result@1.1.1.3, 2007-10-30 12:51:55+04:00, ramil@mysql.com +6 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test result.

  mysql-test/t/mysqlcheck.test@1.1.1.3, 2007-10-30 12:51:56+04:00, ramil@mysql.com +10 -1
    Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
    names include backticks or blank
      - test case.

ChangeSet@1.1616.3112.1, 2007-10-30 12:35:03+04:00, holyfoot@mysql.com +3 -0
  Bug #31758 inet_ntoa, oct crashes server with null+filesort
  
  Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
  argument, which is wrong.
  Both can be NULL with notnull arguments, so that's fixed.

  mysql-test/r/func_str.result@1.70.1.35, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +15 -3
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test case

  mysql-test/t/func_str.test@1.64.1.23, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +13 -0
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    test result

  sql/item_strfunc.h@1.73.2.21, 2007-10-30 12:35:02+04:00, holyfoot@mysql.com +2 -1
    Bug #31758 inet_ntoa, oct crashes server with null+filesort
    
    missing maybe_null flags set for Item_func_inet_ntoa and Item_func_conv

ChangeSet@1.2593, 2007-10-29 22:48:58+01:00, kent@mysql.com +1 -0
  autorun.sh:
    After review changes

  BUILD/autorun.sh@1.13, 2007-10-29 22:48:18+01:00, kent@mysql.com +4 -4
    After review changes

ChangeSet@1.2592, 2007-10-29 20:12:44+01:00, kent@mysql.com +2 -0
  autorun.sh:
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/autorun.sh@1.12, 2007-10-29 20:10:53+01:00, kent@mysql.com +16 -7
    Removed innobase from compile-dist, and let it use autorun.sh to avoid
    code duplication. Also corrected a problem when searching for one of
    "libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

  BUILD/compile-dist@1.19, 2007-10-29 20:12:28+01:00, kent@mysql.com +3 -8

ChangeSet@1.2590.1.3, 2007-10-29 20:00:36+01:00, joerg@trift2. +1 -0
  5.1 has been promoted to "rc" status.

  configure.in@1.494.1.2, 2007-10-29 20:00:27+01:00, joerg@trift2. +1 -1
    5.1 has been promoted to "rc" status.

ChangeSet@1.2573.29.16, 2007-10-29 20:31:03+04:00, ramil@mysql.com +4 -0
  after-merge fix-up.

  mysql-test/include/mix1.inc@1.57.2.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +9 -0
    after-merge fix-up.

  mysql-test/r/innodb_mysql.result@1.60.3.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +15 -0
    after-merge fix-up.

  mysql-test/r/key.result@1.46.1.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +45 -0
    after-merge fix-up.

  mysql-test/t/key.test@1.37.1.2, 2007-10-29 20:31:01+04:00, ramil@mysql.com +20 -0
    after-merge fix-up.

ChangeSet@1.1810.3426.1, 2007-10-29 15:20:59+02:00, aelkin@koti.dsl.inet.fi +12 -0
  Bug #27571 asynchronousity in setting mysql_`query`::error and
             Query_log_event::error_code
  
  A query can perform completely having the local var error of mysql_$query
  zero, where $query in insert, update, delete, load,
  and be  binlogged with error_code e.g KILLED_QUERY while there is no
  reason do to so.
  That can happen because Query_log_event consults thd->killed flag to
  evaluate error_code.
  
  Fixed with implementing a scheme suggested and partly implemented at
  time of bug@22725 work-on. error_status is cached immediatly after the
  control leaves the main rows-loop and that instance always corresponds
  to `error' the local of mysql_$query functions. The cached value
  is passed to Query_log_event constructor, not the default thd->killed
  which can be changed in between of the caching and the constructing.

  mysql-test/t/binlog_killed_bug27571-master.opt@1.1, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +1 -0
    post rows-loop killing simulation's options

  mysql-test/t/binlog_killed_bug27571-master.opt@1.0, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_bug27571.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +68 -0
    Checking that if killing happens inbetween of the end of rows loop and
    recording into binlog that will not lead to recording any error incl
    the killed error.

  mysql-test/t/binlog_killed_bug27571.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/r/binlog_killed.result@1.6.1.1, 2007-10-29 15:20:53+02:00, aelkin@koti.dsl.inet.fi +106 -0
    results changed

  mysql-test/t/binlog_killed.test@1.6.2.1, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +170 -125
    Demonstrating that effective killing during rows-loop execution leads to the speficied actions:
    binlogging with the error for a query modified a not-transactional table or
    rolling back effects for transactional table;
    
    fixing possible non-determinism with ID when query_log_enabled;
    
    leave commented out tests for multi-update,delete due to another bug;
    
    removing an obsolete tests template;
    
    changing system rm to --remove_file.

  mysql-test/t/binlog_killed_simulate-master.opt@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +1 -0
    simulation options

  mysql-test/t/binlog_killed_simulate-master.opt@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/binlog_killed_simulate.test@1.1, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +65 -0
    tests for 
    a query (update is choosen) being killed after the row-loop;
    load data killed within the loop - effective killed error in the event is gained.
    

  mysql-test/t/binlog_killed_simulate.test@1.0, 2007-10-29 15:20:56+02:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.1.65, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -5
    adding killed status arg

  sql/log_event.h@1.122.1.14, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +6 -4
    added killed status arg

  sql/sql_delete.cc@1.144.1.58, 2007-10-29 15:20:54+02:00, aelkin@koti.dsl.inet.fi +11 -7
    deploying the update part patch for delete, multi-delete

  sql/sql_insert.cc@1.146.1.106, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +2 -1
    deploying the update-part patch for insert..select

  sql/sql_load.cc@1.78.1.40, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +20 -6
    deploying the update-part patch for load data.
    simulation added.

  sql/sql_update.cc@1.154.2.71, 2007-10-29 15:20:55+02:00, aelkin@koti.dsl.inet.fi +34 -36
    Impementing the fix as described in the comments left by bug@22725.
    Also simulation of killing after the loop that would affect binlogging in the old code.

ChangeSet@1.2573.32.4, 2007-10-29 15:42:49+03:00, anozdrin@station. +3 -0
  Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
  rebuild the table.
  
  The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
  table reconstruction.
  
  The fix is to rebuild a table if ROW_FORMAT is specified.

  mysql-test/include/mix1.inc@1.57.1.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +49 -0
    Add a test case for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
    rebuild the table.

  mysql-test/r/innodb_mysql.result@1.60.2.1, 2007-10-29 15:42:47+03:00, anozdrin@station. +34 -0
    Update result file.

  sql/sql_table.cc@1.446.8.3, 2007-10-29 15:42:47+03:00, anozdrin@station. +1 -0
    Rebuild a table if ROW_FORMAT was specified in ALTER TABLE.

ChangeSet@1.2573.43.20, 2007-10-29 15:49:56+04:00, gluh@mysql.com +1 -0
  after merge fix

  mysql-test/r/type_decimal.result@1.53, 2007-10-29 15:49:54+04:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3395.15, 2007-10-29 15:39:56+04:00, gluh@mysql.com +4 -0
  Bug#30889: filesort and order by with float/numeric crashes server
  
  There are two problems with ROUND(X, D) on an exact numeric 
  (DECIMAL, NUMERIC type) field of a table:
  1) The implementation of the ROUND function would change the number of decimal
  places regardless of the value decided upon in fix_length_and_dec. When the
  number of decimal places is not constant, this would cause an inconsistent
  state where the number of digits was less than the number of decimal places,
  which crashes filesort.
  
  Fixed by not allowing the ROUND operation to add any more decimal places than
  was decided in fix_length_and_dec.
  
  2) fix_length_and_dec would allow the number of decimals to be greater than
  the maximium configured value for constant values of D. This led to the same 
  crash as in (1).
  
  Fixed by not allowing the above in fix_length_and_dec.

  mysql-test/r/type_decimal.result@1.38.1.10, 2007-10-29 15:39:54+04:00, gluh@mysql.com +67 -0
    Bug#30889: Test result

  mysql-test/t/type_decimal.test@1.35.1.3, 2007-10-29 15:39:54+04:00, gluh@mysql.com +38 -1
    Bug#30889: Test case

  sql/item_func.cc@1.270.80.1, 2007-10-29 15:39:54+04:00, gluh@mysql.com +2 -1
    Bug#30889: 
    - Avoid setting number of digits after decimal point (scale) higher than its 
      maximum value.
    - Avoid increasing the number of decimal places in ::decimal_op

  sql/item_func.h@1.136.2.40, 2007-10-29 15:39:54+04:00, gluh@mysql.com +31 -0
    Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op
    family of methods.

ChangeSet@1.1810.3395.14, 2007-10-29 14:53:10+04:00, gluh@mysql.com +3 -0
  Bug#30897 GROUP_CONCAT returns extra comma on empty fields
  The fix is a copy of Martin Friebe's suggestion.
  added testing for no_appended which will be false if anything,
  including the empty string is in result

  mysql-test/r/func_gconcat.result@1.52.1.21, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test result

  mysql-test/t/func_gconcat.test@1.44.1.16, 2007-10-29 14:53:09+04:00, gluh@mysql.com +9 -0
    test case

  sql/item_sum.cc@1.170.1.46, 2007-10-29 14:53:09+04:00, gluh@mysql.com +1 -1
    added testing for no_appended which will be False if anything,
    including the empty string is in result

ChangeSet@1.1810.3395.13, 2007-10-29 14:45:35+04:00, gluh@mysql.com +2 -0
  backported test case from 5.1

  mysql-test/r/information_schema.result@1.87.1.41, 2007-10-29 14:45:33+04:00, gluh@mysql.com +32 -0
    backported test case from 5.1

  mysql-test/t/information_schema.test@1.65.1.32, 2007-10-29 14:45:33+04:00, gluh@mysql.com +20 -0
    backported test case from 5.1

ChangeSet@1.1810.3395.12, 2007-10-29 11:52:44+03:00, kaa@polly.(none) +1 -0
  Fixed compile warnings introduced by the patch for bug #29131.

  sql/mysqld.cc@1.439.131.2, 2007-10-29 11:52:39+03:00, kaa@polly.(none) +2 -1
    Fixed compile warnings introduced by the patch for bug #29131.

ChangeSet@1.2591, 2007-10-29 09:31:13+01:00, mleich@four.local.lan +3 -0
  Fix for
    Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
    
  Reason for the changes is:
    WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.2, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -1
    1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
    2. Add missing subtest with ALTER DATABASE ... UPGRADE ...

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.3, 2007-10-29 09:31:11+01:00, mleich@four.local.lan +4 -0
    Updated results

ChangeSet@1.1810.3423.1, 2007-10-29 12:20:21+04:00, ramil@mysql.com +4 -0
  Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
  JOIN, and ORDER BY
  
  Problem: improper maximum length calculation of the CASE function leads to 
  decimal value truncation (storing/retrieving decimal field values).
  
  Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
  of the CASE function.

  mysql-test/r/case.result@1.24.2.5, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -1
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test result.

  mysql-test/t/case.test@1.18.1.4, 2007-10-29 12:20:19+04:00, ramil@mysql.com +19 -2
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - test case.

  sql/item_cmpfunc.cc@1.187.45.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +30 -6
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

  sql/item_cmpfunc.h@1.122.24.1, 2007-10-29 12:20:19+04:00, ramil@mysql.com +2 -0
    Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
    JOIN, and ORDER BY
      - accurately calculate Item_func_case::max_length/unsigned_flag/decimals.

ChangeSet@1.2573.43.12, 2007-10-28 11:30:36+04:00, gshchepa@gleb.loc +3 -0
  Many files:
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.12.1.1, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.24, 2007-10-28 11:30:08+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2573.43.11, 2007-10-28 02:09:24+04:00, gshchepa@gleb.loc +3 -0
  rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:
    Error message numbers.

  mysql-test/r/sp.result@1.304, 2007-10-28 02:09:11+04:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.4, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +26 -26
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.27, 2007-10-28 02:08:51+04:00, gshchepa@gleb.loc +6 -6
    Error message numbers.

ChangeSet@1.2573.43.10, 2007-10-28 02:33:18+05:00, gshchepa@gleb.loc +1 -0
  ha_archive.cc:
    Post-merge fix.

  storage/archive/ha_archive.cc@1.144, 2007-10-28 02:29:15+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.2573.53.2, 2007-10-27 01:40:48+05:00, gshchepa@gleb.loc +14 -0
  Many files:
    Error message numbers.

  mysql-test/r/binlog_unsafe.result@1.6, 2007-10-27 04:37:17+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/r/events_bugs.result@1.42.1.1, 2007-10-27 05:03:12+05:00, gshchepa@gleb.loc +8 -8
    Error message numbers.

  mysql-test/r/events_trans.result@1.6, 2007-10-27 05:04:18+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/r/sp_gis.result@1.11, 2007-10-27 05:07:10+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/r/xml.result@1.29, 2007-10-27 05:08:29+05:00, gshchepa@gleb.loc +9 -9
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.22.1.2, 2007-10-27 05:52:59+05:00, gshchepa@gleb.loc +3 -3
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.21, 2007-10-27 06:02:36+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_gis.result@1.27, 2007-10-27 06:02:47+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.9, 2007-10-27 06:02:54+05:00, gshchepa@gleb.loc +1 -1
    Error message numbers.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.15, 2007-10-27 06:02:55+05:00, gshchepa@gleb.loc +5 -5
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_incident.result@1.13, 2007-10-27 05:09:44+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.8, 2007-10-27 05:10:36+05:00, gshchepa@gleb.loc +2 -2
    Error message numbers.

  mysql-test/suite/rpl/r/rpl_udf.result@1.12, 2007-10-27 05:11:26+05:00, gshchepa@gleb.loc +4 -4
    Error message numbers.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.13.1.1, 2007-10-27 05:40:31+05:00, gshchepa@gleb.loc +16 -16
    Error message numbers.

ChangeSet@1.1810.3422.1, 2007-10-26 18:52:58+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
    
  Adding code to keep skipping events while inside a transaction. Execution
  will start just after the transaction has been skipped.

  mysql-test/t/rpl_slave_skip-slave.opt@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip-slave.opt''

  mysql-test/t/rpl_slave_skip-slave.opt@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/r/rpl_slave_skip.result@1.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +144 -0
    New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''

  mysql-test/r/rpl_slave_skip.result@1.0, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/t/rpl_slave_skip.test@1.1, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +203 -0
    New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''

  mysql-test/t/rpl_slave_skip.test@1.0, 2007-10-26 18:52:54+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.241.23.1, 2007-10-26 18:52:53+02:00, mats@kindahl-laptop.dnsalias.net +53 -3
    Adding code to set the thd->options flag for the slave SQL thread
    even when BEGIN, ROLLBACK, COMMIT, and XID events are being skipped.
        
    Adding code to not decrease the slave skip counter from 1 to 0 if we
    are inside a transaction. This will keep the counter at 1, and keep
    skipping events, until a transaction terminator is read. At that point,
    the slave skip counter will be decreased to 0, and events will be read
    and executed instead of read and skipped.

ChangeSet@1.2541.37.1, 2007-10-26 21:26:06+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31036: Using order by with archive table crashes server.
  
  1. Memory overrun have been fixed.
  2. Server failure on assertion has been fixed.

  mysql-test/r/archive.result@1.33.1.1, 2007-10-26 20:55:06+05:00, gshchepa@gleb.loc +4 -0
    Added test case for bug #31036.

  mysql-test/t/archive.test@1.32.1.1, 2007-10-26 20:54:55+05:00, gshchepa@gleb.loc +22 -0
    Added test case for bug #31036.

  storage/archive/azio.c@1.20.1.1, 2007-10-26 20:54:40+05:00, gshchepa@gleb.loc +5 -5
    Fixed bug #31036.
    The ha_archive::rnd_pos function has been modified to take
    into account the result of the azseek function and
    to return HA_ERR_CRASHED_ON_USAGE in case of seek error.

  storage/archive/ha_archive.cc@1.143, 2007-10-26 20:54:49+05:00, gshchepa@gleb.loc +2 -2
    Fixed bug #31036.
    1. Memory overrun has been fixed: maximal sizes of azio_stream::inbuf
       and azio_stream::outbuf was mixed.
    2. Zero value of the output parameter of the azread function was
       incorrectly interpreted by the azseek function: after the first
       successful read attempt the execution of the azseek loop was
       interrupted and negative value was returned.
       (See ha_archive::rnd_pos: that negative value was silently ignored,
       and an incomplete data was used, for example, as a size of a packed
       record, and server failed with the assertion:
       "row_len <= record_buffer->length".)

ChangeSet@1.2590, 2007-10-26 17:36:22+02:00, mleich@four.local.lan +4 -0
  Fix for
     Bug#31408 funcs_1: <engine>_trig_03e test fail
  Modification:
     The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
     Therefore after REVOKE TRIGGER privilege the 
     - SHOW TRIGGERS
     - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
     result sets are now empty.

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@1.3, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.4, 2007-10-26 17:36:20+02:00, mleich@four.local.lan +0 -2
    Updated results

ChangeSet@1.2564.25.3, 2007-10-26 16:11:20+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#28772 rpl_row_until fails in pushbuild

  mysql-test/suite/rpl/t/rpl_row_until.test@1.9, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

  mysql-test/suite/rpl/t/rpl_stm_until.test@1.31, 2007-10-26 16:11:18+02:00, msvensson@pilot.mysql.com +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

ChangeSet@1.1810.3303.16, 2007-10-26 15:29:06+02:00, istruewing@stella.local +3 -0
  Bug#4692 - DISABLE/ENABLE KEYS waste a space
  
  Disabling and enabling indexes on a non-empty table grows the
  index file.
  
  Disabling indexes just sets a flag per non-unique index and does not
  free the index blocks of the affected indexes. Re-enabling indexes
  creates new indexes with new blocks. The old blocks remain unused
  in the index file.
  
  Fixed by dropping and re-creating all indexes if non-empty disabled
  indexes exist when enabling indexes. Dropping all indexes resets
  the internal end-of-file marker to the end of the index file header.
  It also clears the root block pointers of every index and clears the
  deleted blocks chains. This way all blocks are declared as free.

  mysql-test/r/myisam.result@1.71.1.30, 2007-10-26 15:29:05+02:00, istruewing@stella.local +25 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test result.

  mysql-test/t/myisam.test@1.55.1.27, 2007-10-26 15:29:05+02:00, istruewing@stella.local +26 -0
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added test.

  myisam/mi_check.c@1.129.27.1, 2007-10-26 15:29:05+02:00, istruewing@stella.local +165 -57
    Bug#4692 - DISABLE/ENABLE KEYS waste a space
    Added function mi_drop_all_indexes() to support drop of all indexes
    in case we want to re-enable non-empty disabled indexes.
    Changed mi_repair(), mi_repair_by_sort(), and mi_repair_parallel()
    to use the new function instead of duplicate drop index code.

ChangeSet@1.1810.3287.41, 2007-10-26 15:37:38+05:00, ramil@mysql.com +7 -0
  Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
  file .\ha_innodb.
  
  Problem: if a partial unique key followed by a non-partial one we declare
  the second one as a primary key.
  
  Fix: sort non-partial unique keys before partial ones.

  include/my_base.h@1.70.1.17, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  mysql-test/t/innodb_mysql.test@1.3.50.1, 2007-10-26 15:37:37+05:00, ramil@mysql.com +9 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  mysql-test/r/innodb_mysql.result@1.3.22.6, 2007-10-26 15:37:37+05:00, ramil@mysql.com +15 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/r/key.result@1.28.1.12, 2007-10-26 15:37:37+05:00, ramil@mysql.com +44 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test result.

  mysql-test/t/key.test@1.24.1.7, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -0
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - test case.

  sql/sql_table.cc@1.239.66.2, 2007-10-26 15:37:37+05:00, ramil@mysql.com +18 -8
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

  sql/structs.h@1.53.3.3, 2007-10-26 15:37:37+05:00, ramil@mysql.com +1 -1
    Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
    file .\ha_innodb.
      - sort unique keys that don't contain partial segments before other keys:
          set HA_KEY_HAS_PART_KEY_SEG flag for such keys in the mysql_prepare_table(),
          use it in the sort_keys();

ChangeSet@1.2541.36.2, 2007-10-26 11:43:05+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct unused code

  sql/sql_update.cc@1.253.2.1, 2007-10-26 11:43:02+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct unused code

ChangeSet@1.2541.36.1, 2007-10-26 11:42:33+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  commit of WL#3686 test case already in 5.1 to get regression testing, no code committed

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +75 -0
    New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''

  mysql-test/suite/ndb/r/ndb_update_no_read.result@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.1, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +79 -0
    New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''

  mysql-test/suite/ndb/t/ndb_update_no_read.test@1.0, 2007-10-26 11:42:30+02:00, tomas@whalegate.ndb.mysql.com +0 -0

ChangeSet@1.2541.9.19, 2007-10-26 09:06:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  post merge weirdness

  mysql-test/suite/ndb/r/ndb_basic.result@1.60, 2007-10-26 09:06:16+02:00, jonas@perch.ndb.mysql.com +10 -10
    post merge weirdness

ChangeSet@1.1810.3420.1, 2007-10-26 09:01:29+02:00, tnurnberg@mysql.com +2 -0
  Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump
  
  SHOW FIELDS FROM a view with no valid definer was possible (since fix
  for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
  of such views being successful, but loading such a dump with the client
  failing. Patch allows SHOW FIELDS to give data-type of field in underlying
  table.

  mysql-test/r/information_schema_db.result@1.1.1.12, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -3
    Fix test results: SHOW FIELDS FROM a view with no valid DEFINER
    gives us the field-type of the underlying table now rather than NULL.

  sql/sql_base.cc@1.235.114.1, 2007-10-26 09:01:28+02:00, tnurnberg@mysql.com +3 -1
    In the case of SHOW FIELDS FROM <view>, do not require a valid
    DEFINER for determining underlying data-type like we usually do.
    This is needed for mysqldump.

ChangeSet@1.1810.3419.1, 2007-10-26 08:42:33+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31635 (5.0)
    0 pad varsize keys in ndbapi

  mysql-test/r/ndb_basic.result@1.28.1.11, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +24 -0
    new testcase

  mysql-test/t/ndb_basic.test@1.32.1.9, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +20 -2
    new testcase

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.8.1, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +25 -8
    pad varsize keys

  ndb/src/ndbapi/NdbOperationSearch.cpp@1.24.6.1, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +23 -7
    pad varsize keys

ChangeSet@1.2573.50.1, 2007-10-25 21:19:28-07:00, antony@pcg5ppc.xiphis.org +3 -0
  Bug#30296
    "Dynamic plugins fail to load on FreeBSD"
    ELF executables need to be linked using the -export-dynamic option to
    ld(1) for symbols defined in the executable to become visible to dlsym().
    Also, do not build plugins on an all-static build.

  config/ac-macros/plugins.m4@1.22, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +11 -0
    Do not build plugins when building all-static

  configure.in@1.495, 2007-10-25 21:19:19-07:00, antony@pcg5ppc.xiphis.org +12 -1
    Bug#30296
      Use "-export-dynamic" when building executable for use with plugins.
      Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
      affect any other binary.

  sql/sql_yacc.yy@1.601.4.1, 2007-10-25 21:19:20-07:00, antony@pcg5ppc.xiphis.org +1 -1
    build fix - surplus semicolon

ChangeSet@1.1810.3413.2, 2007-10-25 17:23:12-07:00, antony@pcg5ppc.xiphis.org +2 -0
  protect bug31473 from regressing into 5.0

  mysql-test/r/csv.result@1.4.1.5, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +42 -0
    protect bug31473 from regressing into 5.0

  mysql-test/t/csv.test@1.5.1.7, 2007-10-25 17:23:06-07:00, antony@pcg5ppc.xiphis.org +33 -0
    protect bug31473 from regressing into 5.0

ChangeSet@1.1616.3111.1, 2007-10-25 13:28:12+02:00, df@pippilotta.erinye.com +1 -0
  add new trigger to prevent certain naming clashes

  BitKeeper/triggers/pre-commit.check-case.pl@1.1, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +26 -0
    catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

  BitKeeper/triggers/pre-commit.check-case.pl@1.0, 2007-10-25 13:28:09+02:00, df@pippilotta.erinye.com +0 -0

ChangeSet@1.2573.48.1, 2007-10-25 13:17:44+02:00, joerg@trift2. +1 -0
  Mimic a rename which Daniel already did in 6.0,
  to get rid of a name clash among *deleted* files on case-insignificant file systems.

  BitKeeper/deleted/.del-changelog-bleh@1.7, 2007-10-25 13:13:48+02:00, joerg@trift2. +0 -0
    Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

ChangeSet@1.2573.47.1, 2007-10-25 14:03:24+04:00, kaa@polly.(none) +3 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
    
  This is a 5.1 version of the patch.
    
  Problem:
    
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
    
  Solution:
  
  Since as of MySQL 5.1.12 one can enable or disable the general query log
  or the slow query log at runtime by changing values of
  general_log/slow_query_log, make 'log' and 'log_slow_queries" to be 
  synonyms for 'general_log' and 'slow_query_log' respectively.  This 
  makes expressions using the '@@var' syntax backward compatible with 
  5.0 and SHOW VARIABLES output to be consistent with the SET statement.

  mysql-test/r/log_state.result@1.7.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +63 -0
    Added a test case for bug #29131.

  mysql-test/t/log_state.test@1.9.1.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +36 -0
    Added a test case for bug #29131.

  sql/set_var.cc@1.249.3.1, 2007-10-25 14:03:17+04:00, kaa@polly.(none) +6 -2
    Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.

ChangeSet@1.1810.3418.1, 2007-10-25 14:02:27+04:00, kaa@polly.(none) +6 -0
  Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET
  doesn't recognize it
  
  This is a 5.0 version of the patch, it will be null-merged to 5.1
  
  Problem:
  
  'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
  in SHOW VARIABLES, but could not be used in expressions like 
  "select @@log". Also, using them in the SET statement produced an 
  incorrect "unknown system variable" error.
  
  Solution:
  
  Make 'log' and 'log_slow_queries' read-only dynamic variables to make 
  them available for use in expressions, and produce a correct error 
  about the variable being read-only when used in the SET statement.

  mysql-test/r/variables.result@1.76.9.1, 2007-10-25 14:02:22+04:00, kaa@polly.(none) +16 -0
    Added a test case for bug #29131.

  mysql-test/t/variables.test@1.51.8.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #29131.

  sql/mysql_priv.h@1.290.124.2, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/mysqld.cc@1.439.130.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +2 -2
    Changed the type of opt_log and opt_slow_log to my_bool to 
    align with the interfaces in set_var.cc

  sql/set_var.cc@1.125.35.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +6 -2
    Made 'log' and 'log_slow_queries' to be read-only dynamic system 
    variable, i.e. available for use in expressions with the @@var syntax.

  sql/set_var.h@1.68.6.1, 2007-10-25 14:02:23+04:00, kaa@polly.(none) +22 -0
    Added a new system variable class representing a read-only boolean
    variable.

ChangeSet@1.2564.5.18, 2007-10-25 11:58:18+02:00, sven@murkla.(none) +3 -0
  WL#4078:  Document binary format of binlog entries
  Documented some binlog events using doxygen. More will be done later.
  Also fixed typos in other comments and added remarks about dubious code.
  Only comments are affected, there is no change to the actual code.

  sql/log_event.cc@1.305.1.8, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +27 -2
    Fixed typos in some comments.
    Added remarks (as comments) about questionable code.

  sql/log_event.h@1.165, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +866 -127
    Documented the binary format of following binlog events:
    Log_event
    Query_log_event
    Muted_query_log_event
    Slave_log_event (partial)
    Load_log_event
    Intvar_log_event
    Rand_log_event
    Rotate_log_event (partial)

  sql/sql_class.h@1.403, 2007-10-25 11:58:14+02:00, sven@murkla.(none) +7 -5
    Fixed typo in comment.

ChangeSet@1.1810.3417.1, 2007-10-25 08:40:42+02:00, knielsen@loke.(none) +1 -0
  BUG#31810: Potential infinite loop with autoincrement failures in ndb
  
  Fix extra semicolon causing if-statement to be disabled.

  sql/ha_ndbcluster.cc@1.175.87.1, 2007-10-25 08:35:35+02:00, knielsen@loke.(none) +2 -2
    Fix extra semicolon causing if-statement to be disabled.

ChangeSet@1.1810.2128.71, 2007-10-25 07:57:18+02:00, knielsen@loke.(none) +5 -0
  BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc
  
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.

  ndb/include/kernel/AttributeHeader.hpp@1.7.2.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -5
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@1.19.11.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +3 -2
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@1.16.4.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +5 -6
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/kernel/blocks/dbutil/DbUtil.cpp@1.11.3.1, 2007-10-25 07:54:38+02:00, knielsen@loke.(none) +2 -3
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.19.6.1, 2007-10-25 07:56:56+02:00, knielsen@loke.(none) +6 -9
    Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
    
    Using the same object as both Uint32 and class AttributeHeader violates
    strict aliasing rule.

ChangeSet@1.1810.3416.1, 2007-10-25 10:32:52+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #27695: View should not be allowed to have empty or
  all space column names.
  
  The parser has been modified to check VIEW column names
  with the check_column_name function and to report an error
  on empty and all space column names (same as for TABLE
  column names).

  mysql-test/r/select.result@1.121.13.1, 2007-10-25 10:32:36+05:00, gshchepa@gleb.loc +12 -14
    Updated test case for bug #27695.

  mysql-test/t/select.test@1.102.11.1, 2007-10-25 10:32:35+05:00, gshchepa@gleb.loc +15 -8
    Updated test case for bug #27695.

  sql/sql_yacc.yy@1.371.1.168, 2007-10-25 10:32:33+05:00, gshchepa@gleb.loc +6 -0
    Fixed bug #27695.
    The parser has been modified to check VIEW column aliases
    with the check_column_name function and to report an error
    on empty columns and all space columns (same as for TABLE
    column names).

ChangeSet@1.1810.3287.40, 2007-10-25 08:19:57+04:00, kaa@polly.(none) +1 -0
  Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

  mysys/my_write.c@1.15.1.2, 2007-10-25 08:19:52+04:00, kaa@polly.(none) +1 -1
    Replaced 'return' with DBUG_RETURN() in the fix for bug #31566.

ChangeSet@1.2573.32.3, 2007-10-24 19:01:08-06:00, malff@lambda.hsd1.co.comcast.net. +2 -0
  Bug#30854 (Tables name show as binary in slave err msg on vm-win2003-64-b)
  
  The root cause of this defect is that a call to my_error() is using a
  'LEX_STRING' parameter instead of a 'char*'
  
  This patch fixes the failing calls to my_error(), as well as similar calls
  found during investigation.
  
  This is a compiling bug (see the instrumentation in the bug report), no test cases provided.

  sql/sql_base.cc@1.421.12.1, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fix broken calls to "..." (va_args) functions.

  sql/sql_table.cc@1.446.8.2, 2007-10-24 19:01:04-06:00, malff@lambda.hsd1.co.comcast.net. +5 -4
    Fix broken calls to "..." (va_args) functions.

ChangeSet@1.2573.45.1, 2007-10-24 22:36:57+05:00, ramil@mysql.com +3 -0
  Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
  
  Problem: we skip views perfoming --fix-table-names.
  
  Fix: rename views as well.

  client/mysqlcheck.c@1.70, 2007-10-24 22:36:55+05:00, ramil@mysql.com +5 -2
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - rename views performing --fix-table-names as well.

  mysql-test/r/mysqlcheck.result@1.15, 2007-10-24 22:36:55+05:00, ramil@mysql.com +18 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test result.

  mysql-test/t/mysqlcheck.test@1.9, 2007-10-24 22:36:55+05:00, ramil@mysql.com +13 -0
    Fix for bug #30679: 5.1 name encoding not performed for views during upgrade
      - test case.

ChangeSet@1.1810.3383.2, 2007-10-24 21:16:20+04:00, kaa@polly.(none) +1 -0
  Fix for bug #31566: my_write(fd, 0x0, 0, flags) fails with EFAULT on
  some platforms
  
  Since the behavior of write(fd, buf, 0) is undefined, it may fail with
  EFAULT on some architectures when buf == NULL. The error was propagated
  up to a caller, since my_write() code did not handle it properly.
  
  Fixed by checking the 'number of bytes' argument in my_write() and
  returning before calling the write() system call when there is nothing
  to write.

  mysys/my_write.c@1.15.1.1, 2007-10-24 21:16:12+04:00, kaa@polly.(none) +4 -0
    Return from my_write() before calling the write() system call when the
    number of bytes to be written is 0, since the behavior of write() in
    this case is not portable.

ChangeSet@1.2564.5.16, 2007-10-24 16:02:37+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  BUG#31702 (Missing row on slave causes assertion failure under row-based
  replication):
  
  Incremental patch to enable idempotency support for update events again.
  The final handling of errors will be done in BUG#31609, and until then
  the handling of errors should be consistent between the different types
  of changes.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.23, 2007-10-24 16:02:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.21, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.2, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +1 -3
    Changing test to assume idempotency handling of update event.

  sql/log_event.cc@1.305.1.6, 2007-10-24 16:02:32+02:00, mats@kindahl-laptop.dnsalias.net +3 -6
    Incremental patch to enable idempotency support for the update events again.
    The real error handling will be implemented in BUG#31609.

ChangeSet@1.1616.3108.1, 2007-10-24 16:09:30+05:00, svoj@mysql.com +5 -0
  BUG#31159 - fulltext search on ucs2 column crashes server
  
  ucs2 doesn't provide required by fulltext ctype array. Crash
  happens because fulltext attempts to use unitialized ctype
  array.
  
  Fixed by converting ucs2 fields to compatible utf8 analogue.

  include/my_sys.h@1.116.5.2, 2007-10-24 16:09:29+05:00, svoj@mysql.com +2 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  mysql-test/r/ctype_ucs.result@1.11.4.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +6 -0
    A test case for BUG#31159.

  mysql-test/t/ctype_ucs.test@1.15.3.1, 2007-10-24 16:09:29+05:00, svoj@mysql.com +8 -0
    A test case for BUG#31159.

  mysys/charset.c@1.135.1.10, 2007-10-24 16:09:29+05:00, svoj@mysql.com +40 -0
    Added a function to find compatible character set with ctype array
    available. Currently used by fulltext search to find compatible
    substitute for ucs2 collations.

  sql/item_func.cc@1.124.42.26, 2007-10-24 16:09:29+05:00, svoj@mysql.com +32 -1
    Convert ucs2 fields to utf8. Fulltext requires ctype array, but
    ucs2 doesn't provide it.

ChangeSet@1.2573.33.6, 2007-10-24 13:28:46+05:00, ramil@mysql.com +2 -0
  after-merge fix: new sys_var_character_set_client classs introduced to perform 
  separate checking.

  sql/set_var.cc@1.256, 2007-10-24 13:28:45+05:00, ramil@mysql.com +24 -1
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

  sql/set_var.h@1.112, 2007-10-24 13:28:45+05:00, ramil@mysql.com +14 -0
    after-merge fix: new sys_var_character_set_client classs introduced to perform 
    separate checking.

ChangeSet@1.1810.3412.1, 2007-10-24 11:15:08+03:00, gkodinov@magare.gmz +3 -0
  Bug #30715: Assertion failed: item_field->field->real_maybe_null(), 
    file .\opt_sum.cc, line
  The optimizer pre-calculates the MIN/MAX values for queries like
   SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const
  when there is a key over kp_1...kp_k
  In doing so it was not checking correctly nullability and 
  there was a superfluous assert(). 
  Fixed by making sure that the field can be null before checking and
  taking out the wrong assert().
  .
  Introduced a correct check for nullability 
  The MIN(field) can return NULL when all the row values in the group
  are NULL-able or if there were no rows.
  Fixed the assertion to reflect the case when there are no rows.

  mysql-test/r/func_group.result@1.49.1.14, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -0
    Bug #30715: test case

  mysql-test/t/func_group.test@1.48.1.10, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +9 -0
    Bug #30715: test case

  sql/opt_sum.cc@1.44.1.19, 2007-10-24 11:15:07+03:00, gkodinov@magare.gmz +5 -5
    Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.

ChangeSet@1.2573.43.5, 2007-10-24 12:49:58+05:00, gluh@mysql.com +2 -0
  result fix

  mysql-test/r/named_pipe.result@1.3, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/shm.result@1.6, 2007-10-24 12:49:56+05:00, gluh@mysql.com +2 -2
    result fix

ChangeSet@1.1810.3411.1, 2007-10-24 12:08:33+05:00, bar@mysql.com +1 -0
  Bug#31081 server crash in regexp function
  Additional fix for valgrind warning

  sql/item_cmpfunc.cc@1.187.42.2, 2007-10-24 12:08:32+05:00, bar@mysql.com +1 -1
    Bug#31081 server crash in regexp function
    Additional fix for valgrind warning

ChangeSet@1.2564.27.1, 2007-10-23 22:04:09+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
  Bug #30695: An apostrophe ' in the comment of the ADD PARTITION
    causes the Server to crash.
  
  Accessing partitioned table with an apostrophe in partition options
  like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash.
  
  Partition options were saved in .frm file without escaping.
  When accessing such table it is not possible to properly restore
  partition information.
  Crashed because there was no check for partition info parser failure.
  
  Fixed by escaping quoted text in the partition info when writing it to
  the frm-file and added a check that it was able to parse the partition
  info before using it 
  
  NOTE: If the comment is written by an earlier version of the server,
  the corrupted frm-file is not fixed, but left corrupted, you have to
  manually drop the table and recreate it.

  mysql-test/r/partition.result@1.68.2.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +16 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
     testresult

  mysql-test/t/partition.test@1.62.3.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +26 -0
    bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
    the Server to crash.
      testcase

  sql/sql_partition.cc@1.115.1.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +17 -4
    Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes
      the Server to crash.
    
      Crashes when there is an non escaped apostrophe in the partition options
    
      fixed by escaping quoted text before writing to the frm-file

  sql/table.cc@1.307.5.1, 2007-10-23 22:04:08+02:00, mattiasj@mattiasj-laptop.(none) +2 -1
    Bug #30695 An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash
    
    problem was using a null poiter without check -> crash.
    
    added a check that the previus call succeded

ChangeSet@1.1810.3395.7, 2007-10-23 21:32:30+04:00, sergefp@mysql.com +2 -0
  Post-merge fixes

  mysql-test/r/type_decimal.result@1.38.1.9, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +1 -0
    Post-merge fixes

  mysql-test/t/type_decimal.test@1.35.1.2, 2007-10-23 21:32:27+04:00, sergefp@mysql.com +15 -0
    Post-merge fixes

ChangeSet@1.1810.3373.9, 2007-10-23 19:24:59+04:00, sergefp@mysql.com +3 -0
  BUG#31450: Query causes error 1048
  - Let Item::save_in_field() call set_field_to_null_with_conversions() 
    for decimal type, like this is done for the other item result types.

  mysql-test/r/type_decimal.result@1.38.2.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +11 -0
    BUG#31450: Query causes error 1048: testcase

  mysql-test/t/type_decimal.test@1.33.1.2, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +19 -0
    BUG#31450: Query causes error 1048: testcase

  sql/item.cc@1.113.101.1, 2007-10-23 19:24:56+04:00, sergefp@mysql.com +1 -1
    BUG#31450: Query causes error 1048
    - Let Item::save_in_field() call set_field_to_null_with_conversions() 
      for decimal type, like this is done for the other item result types.

ChangeSet@1.2573.43.4, 2007-10-23 20:12:50+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/type_datetime.result@1.57, 2007-10-23 20:12:48+05:00, gluh@mysql.com +1 -1
    result fix

ChangeSet@1.2573.43.2, 2007-10-23 19:28:47+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/query_cache.result@1.107, 2007-10-23 19:28:44+05:00, gluh@mysql.com +1 -78
    after merge fix

  mysql-test/t/query_cache.test@1.88, 2007-10-23 19:28:45+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3409.1, 2007-10-23 18:03:51+04:00, anozdrin@station. +3 -0
  Patch for BUG#30736: Row Size Too Large Error Creating a Table and
  Inserting Data.
  
  The problem was that under some circumstances Field class was not
  properly initialized before calling create_length_to_internal_length()
  function, which led to assert failure.
  
  The fix is to do the proper initialization.
  
  The user-visible problem was that under some circumstances
  CREATE TABLE ... SELECT statement crashed the server or led
  to wrong error message (wrong results).

  mysql-test/r/select.result@1.121.1.38, 2007-10-23 18:03:49+04:00, anozdrin@station. +35 -0
    Update result file.

  mysql-test/t/select.test@1.102.1.32, 2007-10-23 18:03:49+04:00, anozdrin@station. +48 -0
    Add a test case for BUG#30736: Row Size Too Large Error
    Creating a Table and Inserting Data.

  sql/sql_table.cc@1.239.67.1, 2007-10-23 18:03:49+04:00, anozdrin@station. +1 -1
    Move sql_field->decimals initialization before
    sql_field->create_length_to_internal_length() call.

ChangeSet@1.1810.3408.1, 2007-10-23 09:05:39-03:00, davi@moksha.local +2 -0
  Bug#31669 Buffer overflow in mysql_change_user()
  
  The problem is that when copying the supplied username and
  database, no bounds checking is performed on the fixed-length
  buffer. A sufficiently large (> 512) user string can easily
  cause stack corruption. Since this API can be used from PHP
  and other programs, this is a serious problem.
  
  The solution is to increase the buffer size to the accepted
  size in similar functions and perform bounds checking when
  copying the username and database.

  libmysql/libmysql.c@1.233.1.14, 2007-10-23 09:05:37-03:00, davi@moksha.local +4 -3
    Increase the buffer size and perform bounds checking when copying
    the supplied arguments.

  tests/mysql_client_test.c@1.167.1.72, 2007-10-23 09:05:37-03:00, davi@moksha.local +94 -0
    Add test case for Bug#31669

ChangeSet@1.1810.3374.17, 2007-10-23 16:32:05+05:00, holyfoot@mysql.com +2 -0
  type conversions fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.3, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +3 -3
    type conversion fix

  sql/ha_heap.cc@1.71.12.1, 2007-10-23 16:32:03+05:00, holyfoot@mysql.com +1 -1
    type conversion fix

ChangeSet@1.2573.5.21, 2007-10-23 14:26:57+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt for bug 30825

  mysql-test/r/innodb_gis.result@1.17, 2007-10-23 14:26:54+03:00, gkodinov@magare.gmz +1 -0
    merge 5.0-opt -> 5.1-opt for bug 30825

ChangeSet@1.1810.3406.1, 2007-10-23 16:16:59+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #31663: if the FIELDS TERMINATED BY string
  in the SELECT INTO OUTFILE clause starts with a special
  character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY
  is empty, every occurrence of this character within a
  field value is duplicated.
  
  Duplication has been avoided.
  New warning message has been added: "First character of
  the FIELDS TERMINATED string is ambiguous; please use
  non-optional and non-empty FIELDS ENCLOSED BY".

  mysql-test/r/outfile_loaddata.result@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +85 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/r/outfile_loaddata.result
    Added test case for bug #31663.

  mysql-test/r/outfile_loaddata.result@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/outfile_loaddata.test@1.1, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +89 -0
    BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/t/outfile_loaddata.test
    Added test case for bug #31663.

  mysql-test/t/outfile_loaddata.test@1.0, 2007-10-23 16:15:18+05:00, gshchepa@gleb.loc +0 -0

  sql/share/errmsg.txt@1.42.1.40, 2007-10-23 16:15:27+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #31663.
    The ER_AMBIGUOUS_FIELD_TERM warning has been added.

  sql/sql_class.cc@1.223.34.1, 2007-10-23 16:15:26+05:00, gshchepa@gleb.loc +35 -9
    Fixed bug #31663.
    The select_export::prepare method has been modified to calculate
    a value of the select_export::is_ambiguous_field_term field and
    to warn if this value is true.
    The select_export::send_data method has been modified to
    avoid escaping or duplication of the field_set_char if
    is_ambiguous_field_term is true.

  sql/sql_class.h@1.230.1.117, 2007-10-23 16:15:24+05:00, gshchepa@gleb.loc +7 -0
    Fixed bug #31663.
    The select_export::is_ambiguous_field_term field has been added.
    This field is true if select_export::field_sep_char contains
    the first char of the FIELDS TERMINATED BY (ENCLOSED BY is empty),
    and items can contain this character.
    The select_export::field_term_char field has been added (first
    char of the FIELDS TERMINATED BY string or INT_MAX).

ChangeSet@1.1810.3402.2, 2007-10-23 15:34:10+05:00, holyfoot@mysql.com +1 -0
  type conversion fixed to get rid of warnings

  sql/opt_range.cc@1.159.41.2, 2007-10-23 15:34:08+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

ChangeSet@1.1810.3404.1, 2007-10-23 11:52:55+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#30560  Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.108, 2007-10-23 11:52:54+02:00, msvensson@pilot.mysql.com +31 -17
    Use an array to store the valgrind options
    Deprecate --valgrind-options=s and instead use --valgrind-option(but allow
    PushBuild's) --valgrind-options=s usage.
    Make the variables local

ChangeSet@1.2573.38.2, 2007-10-23 14:31:59+05:00, holyfoot@mysql.com +1 -0
  merging

  include/config-win.h@1.104.1.2, 2007-10-23 14:31:57+05:00, holyfoot@mysql.com +0 -1
    merging

ChangeSet@1.1810.3402.1, 2007-10-23 14:27:11+05:00, holyfoot@mysql.com +10 -0
  type conversions fixed to avoid warnings on Windows

  sql/opt_range.cc@1.159.41.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +6 -6
    type conversion fixed

  sql/sql_map.cc@1.16.1.3, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +3 -3
    type conversion fixed

  sql/sql_select.cc@1.312.166.12, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/sql_update.cc@1.154.37.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_federated.cc@1.24.31.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

  sql/ha_heap.cc@1.71.11.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_innodb.cc@1.202.53.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  sql/ha_myisam.cc@1.147.24.1, 2007-10-23 14:27:09+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/mi_write.c@1.50.16.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +1 -1
    type conversion fixed

  myisam/sort.c@1.45.25.1, 2007-10-23 14:27:08+05:00, holyfoot@mysql.com +2 -2
    type conversion fixed

ChangeSet@1.2541.21.21, 2007-10-23 11:24:34+02:00, jonas@perch.ndb.mysql.com +18 -0
  ndb - bug#26450
    partial backport from 6.2 + add fix of bug

  storage/ndb/include/kernel/GlobalSignalNumbers.h@1.34, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -3
    add prep_copy_frag

  storage/ndb/include/kernel/signaldata/AccScan.hpp@1.10, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new argument specifying which page to scan to

  storage/ndb/include/kernel/signaldata/CopyFrag.hpp@1.6, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +40 -1
    add new argument specifying which page to scan to

  storage/ndb/include/ndb_version.h.in@1.16, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +47 -0
    add versioning checks for prep_copy_frag

  storage/ndb/src/common/debugger/signaldata/SignalNames.cpp@1.20, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add prep_copy_frag

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.49, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error codes

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.39, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +6 -1
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp@1.23, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +5 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.128, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +105 -6
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.73, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp@1.30, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new to-step

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.168, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +91 -2
    add new to-step

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.74, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +3 -0
    add new argument specifying which page to scan to

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.43, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +19 -0
    add utility to get max page used by fragment

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.29, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +60 -8
    add NR scan to > frag.noOfPages

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.19, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +54 -0
    add testcase

  storage/ndb/test/run-test/daily-basic-tests.txt@1.109, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase

  storage/ndb/test/src/NdbRestarts.cpp@1.11, 2007-10-23 11:24:31+02:00, jonas@perch.ndb.mysql.com +1 -0
    add testcase

ChangeSet@1.2573.5.19, 2007-10-23 13:20:51+05:00, gluh@mysql.com +3 -0
  Bug#31633 Information schema = NULL queries crash the server
  added correct handling of NULL values for lookup fields

  mysql-test/r/information_schema.result@1.168, 2007-10-23 13:20:49+05:00, gluh@mysql.com +40 -0
    test result

  mysql-test/t/information_schema.test@1.111, 2007-10-23 13:20:49+05:00, gluh@mysql.com +24 -0
    test case

  sql/sql_show.cc@1.441, 2007-10-23 13:20:49+05:00, gluh@mysql.com +43 -22
    added correct handling of NULL values for lookup fields

ChangeSet@1.1810.3401.2, 2007-10-23 07:09:16+02:00, tnurnberg@mysql.com +2 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.107.10.2, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

  mysql-test/t/create.test@1.71.1.24, 2007-10-23 07:09:15+02:00, tnurnberg@mysql.com +1 -1
    after-merge fixes, errno changed 4.1->5.0

ChangeSet@1.1616.3099.6, 2007-10-23 06:54:31+02:00, tnurnberg@mysql.com +5 -0
  Bug #20901: CREATE privilege is enough to insert into a table
  
  CREATE TABLE IF NOT EXISTS ... SELECT let you insert into an existing
  table as long as you had the CREATE privilege.  CREATE ... SELECT
  variants now always require INSERT privilege on target table.

  mysql-test/r/create.result@1.75.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +38 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/r/grant.result@1.21.1.23, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +3 -3
    Sort output for a defined state.

  mysql-test/t/create.test@1.48.1.16, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +76 -0
    Show that CREATE...SELECT requires INSERT privilege on target table.

  mysql-test/t/grant.test@1.17.1.20, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +1 -1
    Sort output for a defined state.

  sql/sql_parse.cc@1.271.134.4, 2007-10-23 06:54:30+02:00, tnurnberg@mysql.com +8 -1
    Require INSERT privilege on target table for CREATE ... SELECT.

ChangeSet@1.2573.27.6, 2007-10-22 15:16:43-04:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #31332 --event-scheduler option misbehaving
    
  Changed the behaviour of the --event-scheduler option when used without an arguments. It
  now turns the option on.

  mysql-test/r/events_bugs.result@1.44, 2007-10-22 15:16:18-04:00, dkatz@damien-katzs-computer.local +4 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.1, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +1 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  mysql-test/t/events_bugs-master.opt@1.0, 2007-10-22 15:16:20-04:00, dkatz@damien-katzs-computer.local +0 -0

  mysql-test/t/events_bugs.test@1.37, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +15 -0
    Test that --event-scheduler with no options in events_bugs-master.opt turns the option
    on.

  sql/events.cc@1.86, 2007-10-22 15:16:19-04:00, dkatz@damien-katzs-computer.local +1 -1
    Changed the behaviour of the --event-scheduler option when used without an arguments.
    It now turns the option on.

ChangeSet@1.2573.32.1, 2007-10-22 23:02:05+04:00, anozdrin@station. +1 -0
  WL#4104: Deprecate the Instance Manager.
  
  A deprecation warning added.

  server-tools/instance-manager/mysqlmanager.cc@1.34, 2007-10-22 23:02:03+04:00, anozdrin@station. +3 -0
    Add a deprecation warning.

ChangeSet@1.2564.26.1, 2007-10-22 21:45:21+03:00, aelkin@koti.dsl.inet.fi +3 -0
  Bug #30594  	rpl.rpl_skip_error is nondeterministic 
  
  Non-determinism in the tests was due to results of SBR are different from those gained
  with row binlog format.
  
  Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
  to run the test on in mixed and stmt binlog format.
  ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
  favoring reentrant reading from binlog rule
  which means that a Write_rows_log_event overwrites a slave's row
  if the one has the same primary key.
  
  If future we might have skipping error due to applying of row-based events.
  The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.

  mysql-test/suite/rpl/r/rpl_skip_error.result@1.18, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -2
    new results

  mysql-test/suite/rpl/t/rpl_skip_error-slave.opt@1.9, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +1 -1
    wrong error code that can not happen in the test removed.

  mysql-test/suite/rpl/t/rpl_skip_error.test@1.16, 2007-10-22 21:45:17+03:00, aelkin@koti.dsl.inet.fi +8 -0
    enforcing the test is to skip only errors due to SBR.
    The current test does not check anything for RBR as ignorable ER_DUP_ENTRY
    does make sense only for SBR.

ChangeSet@1.1810.3287.32, 2007-10-22 22:35:08+04:00, kaa@polly.(none) +1 -0
  Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  libmysql/CMakeLists.txt@1.1.5.2, 2007-10-22 22:35:05+04:00, kaa@polly.(none) +1 -1
    Fixed the Windows build failures introduced by the patch for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.2588, 2007-10-22 20:10:51+02:00, mleich@four.local.lan +8 -0
  This changeset contains the following stuff:
  - Fix for
      Bug#28827 Partition test needs archive engine
      Bug#26669 Two tests on partition fail while blackhole engine is missing
    Solution: Move ARCHIVE and BLACKHOLE sub test cases to their own main test.
  - The two bugs above + the fact that CSV could be also sometimes not
    available --> Move also CSV sub tests out.
  - Minor cleanups
    - Replace error numbers with error names
    - fix typos, wrong comments
    - remove redundant sub test cases
    - add missing drop database
    - SET GLOBAL general_log = default is wrong, = 1 is correct

  mysql-test/r/partition.result@1.68.1.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -43
    Updated results

  mysql-test/r/partition_archive.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +13 -0
    Expected results

  mysql-test/r/partition_archive.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_blackhole.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +7 -0
    Expected results

  mysql-test/r/partition_blackhole.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/r/partition_csv.result@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +15 -0
    Expected results

  mysql-test/r/partition_csv.result@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition.test@1.62.1.2, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +22 -99
    Remove ARCHIVE, BLACKHOLE and CSV related sub test cases.

  mysql-test/t/partition_archive.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +32 -0
    Tests for the partition storage engine in connection with the
    storage engine ARCHIVE.

  mysql-test/t/partition_archive.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_blackhole.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +24 -0
    Tests for the partition storage engine in connection with the
    storage engine BLACKHOLE.

  mysql-test/t/partition_blackhole.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

  mysql-test/t/partition_csv.test@1.1, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +38 -0
    Tests for the partition storage engine in connection with the
    storage engine CSV.

  mysql-test/t/partition_csv.test@1.0, 2007-10-22 20:10:49+02:00, mleich@four.local.lan +0 -0

ChangeSet@1.2573.27.5, 2007-10-22 13:25:00-04:00, dkatz@damien-katzs-computer.local +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
  into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime

  BitKeeper/deleted/.del-.del-changelog@1.3, 2007-10-22 13:24:52-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: BitKeeper/deleted/.del-changelog

ChangeSet@1.1810.3374.14, 2007-10-22 19:32:18+03:00, gkodinov@magare.gmz +3 -0
  Bug #28687: Search fails on '0000-00-00' date after sql_mode change
  
  When doing indexed search the server constructs a key image for 
  faster comparison to the stored keys. While doing that it must not
  perform (and stop if they fail) the additional date checks that can 
  be turned on by the SQL mode because there already may be values in 
  the table that don't comply with the error checks.
  Fixed by ignoring these SQL mode bits while making the key image.

  mysql-test/r/type_date.result@1.13.4.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +39 -0
    Bug #28687: test case

  mysql-test/t/type_date.test@1.14.3.4, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +20 -0
    Bug #28687: test case

  sql/item.cc@1.113.1.174, 2007-10-22 19:32:16+03:00, gkodinov@magare.gmz +3 -0
    Bug #28687: no invalid date warnings

ChangeSet@1.1810.3399.2, 2007-10-22 16:10:08+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31742: delete from ... order by function call that causes
  an error, asserts server
  
  In case of a fatal error during filesort in find_all_keys() the error
  was returned without the necessary handler uninitialization.
  Fixed by changing the code so that handler uninitialization is performed
  before returning the error.

  mysql-test/r/delete.result@1.32, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +8 -0
    Added a test case for bug #31742.

  mysql-test/t/delete.test@1.30, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #31742.

  sql/filesort.cc@1.105.1.19, 2007-10-22 16:10:03+04:00, kaa@polly.(none) +4 -1
    In case of a fatal error in find_all_keys() do not return before doing
    the necessary handler uninitialization steps.

ChangeSet@1.2564.25.2, 2007-10-22 10:32:35+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Post-merge fixes.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.13, 2007-10-22 10:32:27+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.13, 2007-10-22 10:32:28+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Result change

ChangeSet@1.1810.3399.1, 2007-10-21 21:45:31+04:00, kaa@polly.(none) +5 -0
  Bug #28550 "Potential bugs related to the return type of the CHAR function".
    
  Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
    
  This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().

  mysql-test/r/func_str.result@1.110.1.27, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +11 -1
    Import patch bug288550.patch

  mysql-test/t/func_str.test@1.92.1.16, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +12 -0
    Import patch bug288550.patch

  sql/item.cc@1.113.1.173, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +13 -0
    Import patch bug288550.patch

  sql/item.h@1.183.1.61, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -0
    Import patch bug288550.patch

  sql/item_strfunc.h@1.101.1.24, 2007-10-21 21:00:18+04:00, kaa@polly.(none) +1 -1
    Import patch bug288550.patch

ChangeSet@1.1810.3398.1, 2007-10-21 18:37:37+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -0
  Bug #26199  	Replication Failure on Slave when using stored procs with bit-type parameters.
  
  The value of the actual argument of BIT-type-arg stored procedure was binlogged as non-escaped
  sequence of bytes corresponding to internal representation of the bit value.
  
  The patch enforces binlogging of the bit-argument as a valid literal: prefixing the quoted bytes
  sequence with _binary.
  Note, that behaviour of Item_field::var_str for field_type() of MYSQL_TYPE_BIT is exceptional
  in that the returned string contains the binary representation even though result_type() of
  the item is INT_RESULT.

  mysql-test/r/rpl_sp_effects.result@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +41 -0
    testing stored function and procedure called with BIT-arg.

  mysql-test/t/rpl_sp_effects.test@1.3.1.1, 2007-10-21 18:37:34+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +51 -0
    results changed

  sql/sp_head.cc@1.200.22.1, 2007-10-21 18:37:35+03:00, aelkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi +3 -2
    Treating BIT field type specially to for its value to be prefixed and quoted.

ChangeSet@1.2564.5.15, 2007-10-20 20:16:12+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
  BUG#24860 (Incorrect SLAVE_TRANSACTION_RETRIES code can result in slave stuck):
  
  If a temporary error occured inside a group on an event that was not the first
  event of the group, the slave could get stuck because the retry counter is reset
  whenever an event was executed successfully.
  
  This patch only reset the retry counter when an entire group has been successfully
  executed, or failed with a non-transient error.

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +81 -0
    New BitKeeper file ``mysql-test/suite/rpl/r/rpl_temporary_errors.result''

  mysql-test/suite/rpl/r/rpl_temporary_errors.result@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt''

  mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.1, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +29 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors.test''

  mysql-test/suite/rpl/t/rpl_temporary_errors.test@1.0, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  sql/slave.cc@1.320, 2007-10-20 20:16:08+02:00, mats@kindahl-laptop.dnsalias.net +21 -5
    Adding debug printouts to every place where Relay_log_info::trans_retries
    is changed and to has_temporary_error() to print the error when returning.
    
    Adding debug variable all_errors_are_temporary_errors to make all errors
    for slave thread temporary errors.
    
    Adding code so that the Relay_log_info::trans_retries is only reset when
    an entire group was sucessfully executed, or a non-temporary error occured.

ChangeSet@1.2573.27.4, 2007-10-20 21:48:15+04:00, anozdrin@station. +3 -0
  Fix for BUG#31148: bool close_thread_table(THD*, TABLE**):
  Assertion `table->key_read == 0' failed.
  
  The problem was that key_read on a table in a sub-select was not
  properly reset. That happens because the code responsible for that
  is copy&pasted all around the server. In some place, it was obviously
  forgotten to be pasted.
  
  The fix is to reset key_read properly.

  mysql-test/r/key.result@1.47, 2007-10-20 21:48:13+04:00, anozdrin@station. +15 -0
    Update result file.

  mysql-test/t/key.test@1.38, 2007-10-20 21:48:13+04:00, anozdrin@station. +23 -0
    A test case for BUG#31148: bool close_thread_table(THD*, TABLE**):
    Assertion `table->key_read == 0' failed.

  sql/sql_select.cc@1.566.1.2, 2007-10-20 21:48:13+04:00, anozdrin@station. +8 -1
    Reset key_read before closing index.

ChangeSet@1.2564.5.14, 2007-10-20 18:19:55+02:00, mats@kindahl-laptop.dnsalias.net +5 -0
  Bug#31702 (Missing row on slave causes assertion failure under row-based replication):
  
  When replicating an update pair (before image, after image) under row-based
  replication, and the before image is not found on the slave, the after image
  was not discared, and was hence read as a before image for the next row.
  Eventually, this lead to an after image being read outside the block of rows
  in the event, causing an assertion to fire.
  
  This patch fixes this by reading the after image in the event that the row
  was not found on the slave, adds some extra debug assertion to catch future
  errors earlier, and also adds a few non-debug checks to prevent reading
  outside the block of the event.

  include/my_base.h@1.108, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +5 -3
    Adding error code HA_ERR_CORRUPT_EVENT.

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@1.22, 2007-10-20 18:19:50+02:00, mats@kindahl-laptop.dnsalias.net +31 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test@1.20, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +37 -0
    Adding test to try to use row-based replication to replicate an
    update of a row that doesn't exist on the slave. We should get
    an apropriate error and the slave should stop.

  sql/log_event.cc@1.305.1.5, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -5
    Adding debug printouts. Adding code to Update_rows_log_event::do_exec_row()
    so that the after image is read (and ignored) in the event of an error in
    finding the row. This is necessary so that the second pair of images is
    read correctly for the next update pair.
    
    Changing logic for ignoring errors to not include update events, since
    a "key not found" error or a "record changed" error is not idempotent
    for updates, just for deletes and inserts.

  sql/log_event.h@1.163, 2007-10-20 18:19:51+02:00, mats@kindahl-laptop.dnsalias.net +22 -2
    Adding debug assertions to check that row reading is within the events block of rows.

ChangeSet@1.2573.30.1, 2007-10-20 01:20:38+04:00, kostja@bodhi.(none) +12 -0
  Rename: query_error -> is_slave_error.
  Add comments.

  sql/ha_ndbcluster_binlog.cc@1.132, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/handler.cc@1.322.9.1, 2007-10-20 01:20:33+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/log.cc@1.297.1.3, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/log_event.cc@1.308, 2007-10-20 01:20:34+04:00, kostja@bodhi.(none) +30 -24
    query_error -> slave_error

  sql/log_event_old.cc@1.9.1.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +6 -6
    query_error -> slave_error

  sql/mysqld.cc@1.680, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/protocol.cc@1.129.1.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +2 -2
    query_error -> slave_error

  sql/slave.cc@1.315.1.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sp_head.cc@1.292.1.5, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +3 -3
    query_error -> slave_error

  sql/sql_class.cc@1.347.3.1, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    query_error -> slave_error

  sql/sql_class.h@1.399.2.2, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +9 -2
    Rename: query_error -> is_slave_error, to avoid confusion.
    Add commenta.

  sql/sql_connect.cc@1.12, 2007-10-20 01:20:35+04:00, kostja@bodhi.(none) +1 -1
    Rename: query_error -> is_slave_error, to avoid confusion.
    Originally it was the same code to handle init-connect and init-slave 
    mysqld options. Then init-connect implementation forked off,
    but the one who copy-pasted the code didn't change it to not
    use a replication-specific variable.

ChangeSet@1.2573.27.2, 2007-10-19 19:57:08+04:00, anozdrin@station. +7 -0
  Patch for BUG#31111: --read-only crashes MySQL (events fail to load).
  
  There actually were several problems here:
    - WRITE-lock is required to load events from the mysql.event table,
      but in the read-only mode an ordinary user can not acquire it;
    - Security_context::master_access attribute was not properly
      initialized in Security_context::init(), which led to differences
      in behavior with and without debug configure options.
    - if the server failed to load events from mysql.event, it forgot to
      close the mysql.event table, that led to the coredump, described
      in the bug report.
  
  The patch is to fix all these problems:
    - Use the super-user to acquire WRITE-lock on the mysql.even table;
    - The WRITE-lock is acquired by the event scheduler in two cases:
      - on initial loading of events from the database;
      - when an event has been executed, so its attributes should
        be updated.
      Other cases when WRITE-lock is needed for the mysql.event table
      happen under the user account. So, nothing should be changed there
      for the read-only mode. The user is able to create/update/drop
      an event only if he is a super-user.
    - Initialize Security_context::master_access;
    - Close the mysql.event table in case something went wrong.

  mysql-test/r/events_bugs.result@1.43, 2007-10-19 19:57:06+04:00, anozdrin@station. +102 -1
    Update result file.

  mysql-test/t/events_bugs.test@1.36, 2007-10-19 19:57:06+04:00, anozdrin@station. +212 -12
    A test case for BUG#31111: --read-only crashes MySQL (events fail
    to load).

  sql/event_data_objects.cc@1.111, 2007-10-19 19:57:06+04:00, anozdrin@station. +14 -2
    When the worker thread is going to drop event after the execution
    we should do it under the super-user privileges in order to be able
    to lock the mysql.event table for writing in the read-only mode.
    
    This is a system operation, where user SQL can not be executed.
    So, there is no risk in compromising security by dropping an event
    under the super-user privileges.

  sql/event_db_repository.cc@1.37, 2007-10-19 19:57:06+04:00, anozdrin@station. +9 -0
    1. Close tables if something went wrong in simple_open_n_lock_tables();
    2. As soon as the system event scheduler thread is running under
       the super-user privileges, we should always be able to acquire
       WRITE-lock on the mysql.event table. However, let's have an assert
       to check this.

  sql/event_scheduler.cc@1.48, 2007-10-19 19:57:06+04:00, anozdrin@station. +7 -0
    Run the system event scheduler thread under the super-user privileges.
    In particular, this is needed to be able to lock the mysql.event table
    for writing when the server is running in the read-only mode.
    
    The event scheduler executes only system operations and does not
    execute user SQL (this is what the worker threads for). So, there
    is no risk in compromising security by running the event scheduler
    under the super-user privileges.

  sql/events.cc@1.85, 2007-10-19 19:57:06+04:00, anozdrin@station. +15 -1
    Open the mysql.event table as the super user to be able to acquire
    WRITE-lock in the read-only mode.

  sql/sql_class.cc@1.347.1.5, 2007-10-19 19:57:06+04:00, anozdrin@station. +1 -0
    Initialize Security_context::master_acces.

ChangeSet@1.1810.3339.3, 2007-10-19 17:07:08+02:00, df@pippilotta.erinye.com +13 -0
  export patch for bug#31221
  TAG: mysql-5.0.50

  mysql-test/r/ps_6bdb.result@1.27.20.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/derived.result@1.58.2.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_2myisam.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_3innodb.result@1.42.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_4heap.result@1.38.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/r/ps_5merge.result@1.39.8.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +4 -2
    export patch for bug#31221

  mysql-test/r/type_date.result@1.13.5.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +30 -0
    export patch for bug#31221

  mysql-test/r/type_datetime.result@1.30.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -0
    export patch for bug#31221

  mysql-test/r/ps_7ndb.result@1.26.10.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/derived.test@1.53.1.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +2 -1
    export patch for bug#31221

  mysql-test/t/type_date.test@1.14.4.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -0
    export patch for bug#31221

  sql/field.cc@1.256.62.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +21 -4
    export patch for bug#31221

  sql/item_timefunc.cc@1.100.34.1, 2007-10-19 17:07:06+02:00, df@pippilotta.erinye.com +1 -2
    export patch for bug#31221

ChangeSet@1.2573.28.1, 2007-10-19 15:43:19+03:00, gkodinov@magare.gmz +4 -0
  Bug #31157: crash when select+order by the avg of some field within the group by
  
  The uncacheable flag should be set at fix_fields() stage.
  Fixed by moving the flag setting to match the one in 5.1

  mysql-test/r/query_cache.result@1.102.1.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +14 -0
    Bug #31157: test case

  mysql-test/t/query_cache.test@1.83.1.1, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +17 -0
    Bug #31157: test case

  sql/item_func.cc@1.418.1.5, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +8 -1
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

  sql/item_func.h@1.171, 2007-10-19 15:43:17+03:00, gkodinov@magare.gmz +1 -0
    Bug #31157: The uncacheable flag should be set at
    fix_fields() stage.

ChangeSet@1.2528.234.1, 2007-10-19 14:18:41+02:00, mats@kindahl-laptop.dnsalias.net +10 -0
  BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER
  is possible):
  
  When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
  flag was not set correctly, which caused the slave to not recognize that it was
  inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
  and XID events. It also adds checks if inside a group before decreasing the
  slave skip counter to zero.
  
  Begin_query_log_event was not marked that it could not end a group, which is now
  corrected.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3.1.2, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +3 -1
    Correcting slave skip counter to get the correct behaviour.

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    New BitKeeper file ``mysql-test/suite/rpl/data/rpl_bug28618.dat''

  mysql-test/suite/rpl/data/rpl_bug28618.dat@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_slave_skip.result@1.6, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +208 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt''

  mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt@1.0, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/t/rpl_slave_skip.test@1.4, 2007-10-19 14:18:30+02:00, mats@kindahl-laptop.dnsalias.net +239 -0
    Adding tests to check that skipping works for transactions:
    - Skipping one group with BEGIN first
    - Skipping two groups with BEGIN first
    - Skipping one group without BEGIN first but with AUTOCOMMIT=0
    - LOAD DATA INFILE under statement-based replication

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.12.1.1, 2007-10-19 14:18:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Result change.

  sql/log_event.cc@1.302.5.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +64 -17
    Adding checks if we're in a group when the slave skip counter is 1.
    In that case, we should keep going.
    
    Adding helping member function Log_event::continue_group() denoting
    that this event cannot end a group, and if the skip counter indicates
    that the group ends after this event, it should not decrease the skip
    counter.
    
    Query_log_event will change the OPTION_BEGIN flag for BEGIN, COMMIT, and
    ROLLBACK, even when skipping because of a positive skip count, and
    Xid_log_event will also affect the OPTION_BEGIN flag, even when being
    skipped.
    
    Begin_load_query_log_event cannot end a group, so it is marked to
    continue the group.

  sql/log_event.h@1.158.1.3, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Adding helper function Log_event::continue_group().

  sql/rpl_rli.h@1.21.2.1, 2007-10-19 14:18:33+02:00, mats@kindahl-laptop.dnsalias.net +12 -0
    Adding Relay_log_info::get_flag() to get the value of a
    replication flag.

  sql/slave.cc@1.318.1.1, 2007-10-19 14:18:34+02:00, mats@kindahl-laptop.dnsalias.net +4 -1
    Adding debug output and changing debug message.

ChangeSet@1.1810.3397.1, 2007-10-19 14:54:05+05:00, ramil@mysql.com +3 -0
  Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
  
  Problem: lying to the optimizer that a function (Item_func_inet_ntoa)
  cannot return NULL values leads to unexpected results (in the case group
  keys creation/comparison is broken). 
  
  Fix: Item_func_inet_ntoa::maybe_null should be set properly.

  mysql-test/r/func_misc.result@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test result.

  mysql-test/t/func_misc.test@1.21.3.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +8 -0
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - test case.

  sql/item_strfunc.h@1.101.12.1, 2007-10-19 14:54:03+05:00, ramil@mysql.com +6 -1
    Fix for bug #31349: ERROR 1062 (23000): Duplicate entry '' for key 'group_key'
      - set Item_func_inet_ntoa::maybe_null flag.

ChangeSet@1.2573.25.1, 2007-10-18 15:08:27-07:00, brian@zim.(none) +2 -0
  Fix for bug#31704
  
  Just had to put in the removal of the autocommit, and make sure the commit occurred at the propper time. 

  client/mysqlslap.c@1.62.1.1, 2007-10-18 15:08:21-07:00, brian@zim.(none) +15 -7
    Fix for auto-connect on counter. Relabeled variable which was misnamed. 

  mysql-test/r/mysqlslap.result@1.13.1.1, 2007-10-18 15:08:21-07:00, brian@zim.(none) +8 -0
    Updated result file

ChangeSet@1.2573.24.1, 2007-10-18 14:48:04-07:00, antony@pcg5ppc.xiphis.org +7 -0
  Bug#31473
    "CSV does not work with NULL value in datetime fields"
    Attempting to insert a row with a NULL value for a DATETIME field
    results in a CSV file which the storage engine cannot read.
    Don't blindly assume that "0" is acceptable for all field types,
    Since CSV does not support NULL, we find out from the field the
    default non-null value.
    Do not permit the creation of a table with a nullable columns.

  mysql-test/r/csv.result@1.23, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +82 -24
    test for bug 31473

  mysql-test/r/log_tables.result@1.22.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +48 -48
    change in results due to bugfix 31473

  mysql-test/r/system_mysql_db.result@1.49.1.1, 2007-10-18 14:47:59-07:00, antony@pcg5ppc.xiphis.org +9 -9
    change in results due to bugfix 31473

  mysql-test/t/csv.test@1.28, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +63 -24
    test for bug 31473

  mysql-test/t/log_tables.test@1.19.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +9 -9
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  scripts/mysql_system_tables.sql@1.15.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +2 -2
    due to bug31473, all columns in CSV tables must be declared as NOT NULL

  storage/csv/ha_tina.cc@1.84.1.1, 2007-10-18 14:48:00-07:00, antony@pcg5ppc.xiphis.org +27 -9
    bug31473
      Don't blindly assume that "0" is acceptable for all field types,
      Since CSV does not support NULL, we find out from the field the
      default non-null value.
      Do not permit the creation of a table with a nullable columns;

ChangeSet@1.2403.18.94, 2007-10-18 23:21:18+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets
    Correct check for buffer/no buffer

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.9, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +1 -1
    new error code

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@1.53.2.6, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -2
    correct check for buffer/no buffer

  storage/ndb/test/ndbapi/test_event.cpp@1.28, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +88 -0
    test prg

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.12, 2007-10-18 23:21:16+02:00, jonas@perch.ndb.mysql.com +4 -0
    test prg

ChangeSet@1.2573.23.2, 2007-10-18 17:24:57-03:00, davi@moksha.com.br +2 -0
  Post merge fix for Bug 21557

  mysql-test/r/log_tables.result@1.25, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +2 -1
    Update test result, general_log disabled.

  mysql-test/t/log_tables.test@1.22, 2007-10-18 17:24:54-03:00, davi@moksha.com.br +1 -0
    Disable the general_log before consulting it.

ChangeSet@1.1810.3393.1, 2007-10-18 21:48:16+02:00, msvensson@pilot.mysql.com +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/binlog_killed.test@1.6.1.3, 2007-10-18 21:48:14+02:00, msvensson@pilot.mysql.com +1 -1
    Remove unportable use of "system rm"

ChangeSet@1.2573.23.1, 2007-10-18 15:45:07-03:00, davi@moksha.com.br +9 -0
  Bug#21557 entries in the general query log truncated at 1000 characters.
  
  The general log write function (general_log_print) uses printf style
  arguments which need to be pre-processed, meaning that the all arguments
  are copied to a single buffer and the problem is that the buffer size is
  constant (1022 characters) but queries can be much larger then this.
  
  The solution is to introduce a new log write function that accepts a
  buffer and it's length as arguments. The function is to be used when
  a formatted output is not required, which is the case for almost all
  query write-to-log calls.
  
  This is a incompatible change with respect to the log format of prepared
  statements.

  mysql-test/r/log_tables.result@1.24, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +214 -0
    Add test case result for Bug#21557

  mysql-test/t/log_tables.test@1.21, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +116 -0
    Add test case for Bug#21557

  sql/log.cc@1.297.1.2, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +94 -60
    Introduce the logger function general_log_write which is similar to
    general_log_print but accepts a single buffer and the buffer length.
    The function doesn't perform any formatting and sends the buffer
    directly to the underlying log handlers.

  sql/log.h@1.30.1.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +4 -0
    Introduce the logger function general_log_write.

  sql/log_event.cc@1.307, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/mysql_priv.h@1.543, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -0
    Prototype for the logger function general_log_write.

  sql/sp_head.cc@1.292.2.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +1 -1
    Pass the query buffer directly to the logger function, formatting
    is not required on this case.

  sql/sql_parse.cc@1.700.6.1, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +3 -4
    Pass the buffer directly to the logger function when formatting
    is not required.

  sql/sql_prepare.cc@1.234, 2007-10-18 15:45:04-03:00, davi@moksha.com.br +2 -11
    Don't log the statement id, it avoids making a extra copy of the query
    and the query is not truncated anymore if it exceeds the limit.

ChangeSet@1.2573.22.1, 2007-10-18 16:14:27+02:00, istruewing@stella.local +1 -0
  Bug#31692 - binlog_killed.test crashes sometimes
  
  The server crashed when a thread was killed while locking the
  general_log table at statement begin.
  
  The general_log table is handled like a performance schema table.
  The state of open tables is saved and cleared so that this table
  seems to be the only open one. Then this table is opened and locked.
  After writing, the table is closed and the open table state is
  restored. Before restoring, however, it is asserted that there is
  no current table open.
  
  After locking the table, mysql_lock_tables() checks if the thread
  was killed in between. If so, it unlocks the table and returns an
  error. open_ltable() just returns with the error and leaves closing
  of the table to close_thread_tables(), which is called at
  statement end.
  
  open_performance_schema_table() did not take this into account.
  It assumed that a failed open_ltable() would not leave an open
  table behind.
  
  Fixed by closing thread tables after open_ltable() and before
  restore_backup_open_tables_state() if the thread was killed.
  
  No test case. It requires correctly timed parallel execution.
  Since this bug was detected by the test suite, it seems
  dispensable to add another test.

  sql/sql_base.cc@1.421.11.1, 2007-10-18 16:14:25+02:00, istruewing@stella.local +10 -0
    Bug#31692 - binlog_killed.test crashes sometimes
    Closing thread tables after open_ltable() and before
    restore_backup_open_tables_state() if the thread was killed.

ChangeSet@1.1810.3390.1, 2007-10-18 15:19:04+03:00, gkodinov@magare.gmz +13 -0
  Bug #31221: Optimizer incorrectly identifies impossible WHERE clause
   No warning was generated when a TIMESTAMP with a non-zero time part
   was converted to a DATE value. This caused index lookup to assume
   that this is a valid conversion and was returning rows that match 
   a comparison between a TIMESTAMP value and a DATE keypart.
   Fixed by generating a warning on such a truncation.

  mysql-test/r/ps_6bdb.result@1.27.19.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/derived.result@1.58.1.1, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/r/ps_2myisam.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_3innodb.result@1.42.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_4heap.result@1.38.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/ps_5merge.result@1.39.6.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +4 -2
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_date.result@1.13.4.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +30 -0
    Bug #31221: Warnings cased by existing tests

  mysql-test/r/type_datetime.result@1.30.1.18, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -0
    Bug #31221: test case

  mysql-test/r/ps_7ndb.result@1.26.8.5, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: Warnings cased by existing tests

  mysql-test/t/derived.test@1.54, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +2 -1
    Bug #31221: fixed an existing not-precise test case

  mysql-test/t/type_date.test@1.14.3.3, 2007-10-18 15:19:02+03:00, gkodinov@magare.gmz +22 -0
    Bug #31221: test case

  sql/field.cc@1.256.61.1, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +21 -4
    Bug #31221: 
     - Upgraded fix for bug 29729
     - issue a warning only if the hh:mm:ss.msec is not zero consistently 
       for all the Field_newdate::store function

  sql/item_timefunc.cc@1.100.31.7, 2007-10-18 15:19:03+03:00, gkodinov@magare.gmz +1 -2
    Bug #31221: don't ignore the errors when storing data

ChangeSet@1.2573.20.2, 2007-10-18 15:17:21+04:00, kaa@polly.(none) +3 -0
  Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  include/my_sys.h@1.230, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +1 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/partition_info.cc@1.42, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -2
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

  sql/set_var.cc@1.252.1.1, 2007-10-18 15:17:15+04:00, kaa@polly.(none) +2 -1
    Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

ChangeSet@1.1810.3389.1, 2007-10-18 13:09:30+02:00, mleich@four.local.lan +4 -0
  Fix for
  Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order

  mysql-test/suite/funcs_2/r/innodb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/memory_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/myisam_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.1.1.1, 2007-10-18 13:09:29+02:00, mleich@four.local.lan +3 -3
    Updated result

ChangeSet@1.1810.3366.3, 2007-10-18 12:03:30+02:00, joerg@trift2. +3 -0
  Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
  and the modified values of the compile-related variables used in "configure".
  
  Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".
  
  This fixes bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug

  configure.in@1.245.103.3, 2007-10-18 12:03:27+02:00, joerg@trift2. +5 -0
    Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS.
    
    This is necessary so that the "mysqlbug" script can output the variables affecting
    compilation with both their original (on call) and final (modified) values.
    
    This work is related to fixing bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/Makefile.am@1.43.4.1, 2007-10-18 12:03:27+02:00, joerg@trift2. +10 -4
    Clearly differ between the original and the modified values of the compile-related
    variables used in "configure".
    
    This is to fix bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

  scripts/mysqlbug.sh@1.8.1.2, 2007-10-18 12:03:27+02:00, joerg@trift2. +4 -2
    Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO"
    which contain the original (call parameters, environment) and the modified values
    of the "configure" variables controlling the compile process.
    
    This fixes bug#31644
       Values of *FLAGS that were used for building packages is missed in mysqlbug

ChangeSet@1.1810.3388.1, 2007-10-18 14:52:19+05:00, holyfoot@mysql.com +1 -0
  Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
  
  The BIG_TABLES define wasn't enabled on Windows.
  #define added

  include/config-win.h@1.71.4.1, 2007-10-18 14:52:17+05:00, holyfoot@mysql.com +1 -0
    Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
    
    BIG_TABLES enabled on Windows

ChangeSet@1.2573.5.14, 2007-10-18 11:13:52+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#31588: buffer overrun when setting variables
  
  post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

  mysql-test/r/variables.result@1.101.1.2, 2007-10-18 11:13:47+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output

ChangeSet@1.1616.3098.3, 2007-10-18 10:47:54+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31588: buffer overrun when setting variables
  
  Buffer used when setting variables was not dimensioned to accomodate
  trailing '\0'. An overflow by one character was therefore possible.
  CS corrects limits to prevent such overflows.

  mysql-test/r/variables.result@1.21.1.45, 2007-10-18 10:47:51+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Try to overflow buffer used for setting system variables.
    Unpatched server should throw a valgrind warning here.
    Actual value and error message irrelevant, only length counts.

  mysql-test/t/variables.test@1.18.1.36, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +8 -1
    Try to overflow buffer used for setting system variables.

  sql/set_var.cc@1.34.71.1, 2007-10-18 10:47:52+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    Adjust maximum number of characters we can store in 'buff' by one
    as strmake() will write a terminating '\0'.

ChangeSet@1.1810.3337.12, 2007-10-17 17:54:11-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
      
  Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself.
      
  Now the *_init functions get the constant as a null terminated string with the correct length supplied too.

  mysql-test/r/udf.result@1.3.4.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.3.3, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.77.2, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max length of the var containing the constant.

  sql/udf_example.c@1.29.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that lengths of constants are correctly passed.

  sql/udf_example.def@1.3.2.1, 2007-10-17 17:54:08-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2573.18.2, 2007-10-17 16:43:30-03:00, davi@moksha.com.br +3 -0
  Bug#31608 missing mysqltest change_user command
  
  Post merge fixes: close any open statement before
  the change user command and fix test case output.

  client/mysqltest.c@1.313.1.4, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +6 -0
    Close an open statement since it won't work after a change_user command.

  mysql-test/r/change_user.result@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +2 -2
    Fixed test case output.

  mysql-test/t/change_user.test@1.2, 2007-10-17 16:43:26-03:00, davi@moksha.com.br +1 -1
    Fix test case output to return 1 or 0.

ChangeSet@1.2573.6.3, 2007-10-17 20:40:23+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30878: Crashing when alter an auto_increment non partitioned
    table to partitioned
  
  Problem:
  Crashed because usage of an uninitialised mutex when auto_incrementing
    a partitioned temporary table
  
  Fix:
  Only locking (using the mutex) if not temporary table.

  mysql-test/r/partition.result@1.70, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +12 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    test result

  mysql-test/t/partition.test@1.64, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    testcase

  sql/ha_partition.cc@1.104.1.2, 2007-10-17 20:40:22+02:00, mattiasj@mattiasj-laptop.(none) +15 -5
    Bug #30878: Crashing when alter an auto_increment non partitioned
      table to partitioned
    
    If the table is a temporary table, the table_share->mutex is not
      initialised.
    
    Checking if not temporary table, then OK to lock (else no need
      to lock)

ChangeSet@1.1810.3287.30, 2007-10-17 11:22:41-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix syntax error build problem on Windows (variable was defined
  in middle of block)

  libmysql/libmysql.c@1.233.1.13, 2007-10-17 11:22:40-06:00, tsmith@ramayana.hindu.god +11 -7
    Fix syntax error - don't define new variables in the middle of a block.
    
    Also, use size_t instead of uint to avoid unnecessary casting.

ChangeSet@1.1810.3387.1, 2007-10-17 20:08:58+04:00, kaa@polly.(none) +21 -0
  Fix for bug #31207: Test "join_nested" shows different strategy on IA64
  CPUs / Intel's ICC compile
  
  The bug is a combination of two problems:
  
  1. IA64/ICC MySQL binaries use glibc's qsort(), not the one in mysys.
  
  2. The order relation implemented by join_tab_cmp() is not transitive,
  i.e. it is possible to choose such a, b and c that (a < b) && (b < c)
  but (c < a). This implies that result of a sort using the relation
  implemented by join_tab_cmp() depends on the order in which
  elements are compared, i.e. the result is implementation-specific. Since
  choose_plan() uses qsort() to pre-sort the
  join tables using join_tab_cmp() as a compare function, the results of
  the sorting may vary depending on qsort() implementation.
  
  It is neither possible nor important to implement a better ordering
  algorithm in join_tab_cmp(). Therefore the only way to fix it is to
  force our own qsort() to be used by renaming it to my_qsort(), so we don't depend
  on linker to decide that.
  
  This patch also "fixes" bug #20530: qsort redefinition violates the
  standard.

  include/my_sys.h@1.178.2.21, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -2
    Renamed qsort() and qsort2() to my_qsort() and my_qsort2(). Since
    previously we relied on stdlib.h to provide a declaration for qsort(), a
    separate declaration for my_qsort() is now required.

  libmysql/Makefile.shared@1.68.1.2, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Added mf_qsort.c to libmysql, since my_lib.c now uses my_qsort() instead of qsort().

  mysys/mf_keycache.c@1.55.1.10, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  mysys/mf_qsort.c@1.17, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Renamed qsort() to my_qsort() and qsort2() to my_qsort2().

  mysys/mf_sort.c@1.7.1.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  mysys/my_lib.c@1.23.3.5, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +3 -3
    Replaced qsort() with my_qsort().

  mysys/queues.c@1.15.1.3, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.cc@1.187.44.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/item_cmpfunc.h@1.122.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort2() with my_qsort2().

  sql/opt_range.cc@1.159.1.95, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +4 -4
    Replaced qsort() with my_qsort().

  sql/records.cc@1.40.1.7, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort() with my_qsort().

  sql/sql_acl.cc@1.128.46.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +10 -10
    Replaced qsort() with my_qsort().

  sql/sql_array.h@1.3.1.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_help.cc@1.47.1.8, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/sql_select.cc@1.312.172.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +15 -3
    Replaced qsort() with my_qsort().

  sql/sql_table.cc@1.239.66.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  sql/examples/ha_tina.cc@1.10.10.1, 2007-10-17 20:08:54+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/ft_boolean_search.c@1.90.8.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -2
    Replaced qsort2() with my_qsort2().

  myisam/ft_nlq_search.c@1.38.4.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +2 -1
    Replaced qsort2() with my_qsort2().

  myisam/myisampack.c@1.39.24.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +1 -1
    Replaced qsort() with my_qsort().

  myisam/sort.c@1.45.23.1, 2007-10-17 20:08:53+04:00, kaa@polly.(none) +6 -6
    Replaced qsort2() with my_qsort2().

ChangeSet@1.2573.2.12, 2007-10-17 15:44:22+04:00, anozdrin@station. +2 -0
  Fix result files (BUG#24923).

  mysql-test/r/information_schema.result@1.162.1.1, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

  mysql-test/r/system_mysql_db.result@1.50, 2007-10-17 15:44:20+04:00, anozdrin@station. +1 -1
    Fix result files (BUG#24923).

ChangeSet@1.1616.3107.1, 2007-10-17 14:28:00+05:00, ramil@mysql.com +4 -0
  Fix for bug#31615: crash after set names ucs2 collate xxx
  
  Problem: currently, UCS-2 cannot be used as a client character set.
  
  Fix: raise an error if one attempts to set it to USC-2.

  mysql-test/r/ctype_ucs.result@1.11.1.25, 2007-10-17 14:27:58+05:00, ramil@mysql.com +8 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test result.

  mysql-test/t/ctype_ucs.test@1.15.1.21, 2007-10-17 14:27:58+05:00, ramil@mysql.com +12 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - test case.

  sql/set_var.cc@1.34.52.48, 2007-10-17 14:27:58+05:00, ramil@mysql.com +22 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

  sql/set_var.h@1.54.1.9, 2007-10-17 14:27:58+05:00, ramil@mysql.com +1 -0
    Fix for bug#31615: crash after set names ucs2 collate xxx
      - raise an error if one is going to set character_set_client to UCS-2.

ChangeSet@1.2573.15.3, 2007-10-17 14:08:03+05:00, gluh@mysql.com +3 -0
  Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
  move 'table_collation' field filling outside of if(file) condition
  because this field has 'OPEN_FRM_ONLY' attribute

  mysql-test/r/information_schema.result@1.167, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.110, 2007-10-17 14:08:01+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.440, 2007-10-17 14:08:01+05:00, gluh@mysql.com +4 -3
    move 'table_collation' field filling outside of if(file) condition
    because this field has 'OPEN_FRM_ONLY' attribute

ChangeSet@1.1810.3374.9, 2007-10-17 13:22:34+05:00, gluh@mysql.com +3 -0
  Bug#31568 Some "information_schema" entries suddenly report a NULL default
  updated result files

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.3, 2007-10-17 13:22:33+05:00, gluh@mysql.com +39 -43
    updated result file

ChangeSet@1.2573.2.11, 2007-10-17 12:13:56+04:00, anozdrin@station. +8 -0
  Fix for BUG#24923: Functions with ENUM issues.
  
  The problem was that the RETURNS column in the mysql.proc was of
  CHAR(64). That was not enough for storing long-named datatypes.
  
  The fix is to change CHAR(64) to LONGBLOB, and to throw warnings
  at the time a stored routine is created if some data is truncated
  during writing into mysql.proc.

  mysql-test/r/sp.result@1.303, 2007-10-17 12:13:53+04:00, anozdrin@station. +51 -0
    Update test result.

  mysql-test/t/sp.test@1.264, 2007-10-17 12:13:53+04:00, anozdrin@station. +70 -0
    Add a test case for BUG#24923.

  scripts/mysql_system_tables.sql@1.16, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -1
    Change the data type of column 'returns' from char(64) to longblob.

  scripts/mysql_system_tables_fix.sql@1.65, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Change the data type of column 'returns' from char(64) to longblob.

  sql/share/errmsg.txt@1.168, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Add new error message.

  sql/sp.cc@1.172, 2007-10-17 12:13:53+04:00, anozdrin@station. +92 -39
    Produce warnings if any data was truncated during writing
    into mysql.proc.

  sql/sp.h@1.42, 2007-10-17 12:13:53+04:00, anozdrin@station. +1 -0
    Add new error code.

  sql/sql_parse.cc@1.700.5.9, 2007-10-17 12:13:54+04:00, anozdrin@station. +3 -0
    Hande

ChangeSet@1.2564.5.13, 2007-10-17 09:29:11+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Removing debug variables from non-debug builds.

  sql/rpl_record.cc@1.16, 2007-10-17 09:29:06+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Turning of declaration of debug variables in non-debug builds.

ChangeSet@1.1616.3099.5, 2007-10-17 10:29:51+04:00, kaa@polly.(none) +2 -0
  Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/r/repair.result@1.14.1.9, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

  mysql-test/t/repair.test@1.12.1.7, 2007-10-17 10:29:45+04:00, kaa@polly.(none) +1 -1
    Fixed the test case for bug #31174 to not fail on 64-bit platforms.

ChangeSet@1.2564.24.1, 2007-10-17 06:50:03+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  Eliminating some valgrind warnings resulting from that some
  storage engines do not set the unused null bits (i.e., the
  filler bits and the X bit) correctly. Also adding some casts
  to debug printouts to eliminate compiler warnings.

  sql/ha_ndbcluster.cc@1.470, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +55 -55
    Changing debug enter names to use full names for member functions.

  sql/records.cc@1.51, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
    Emptying records before starting to read records since some engines do
    not set the unused null bits, leading to valgrind errors.

  sql/rpl_record.cc@1.15, 2007-10-17 06:49:55+02:00, mats@kindahl-laptop.dnsalias.net +3 -2
    Adding casts to debug printouts to eliminate compiler warnings.

ChangeSet@1.2573.2.10, 2007-10-16 20:47:08-06:00, malff@lambda.hsd1.co.comcast.net. +8 -0
  Manual merge of 5.0-runtime to 5.1-runtime

  mysql-test/r/sp-error.result@1.132, 2007-10-16 20:47:02-06:00, malff@lambda.hsd1.co.comcast.net. +14 -1
    Manual merge

  mysql-test/r/sp.result@1.302, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +16 -0
    Manual merge

  mysql-test/r/udf.result@1.21.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +10 -3
    Manual merge

  mysql-test/t/sp.test@1.263, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +31 -0
    Manual merge

  mysql-test/t/udf.test@1.19.1.2, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +2 -1
    Manual merge

  sql/item_create.cc@1.93, 2007-10-16 20:47:03-06:00, malff@lambda.hsd1.co.comcast.net. +19 -0
    Manual merge

  sql/sp_head.cc@1.292.1.3, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +30 -4
    Manual merge

  sql/sql_yacc.yy@1.601.1.7, 2007-10-16 20:47:04-06:00, malff@lambda.hsd1.co.comcast.net. +259 -224
    Manual merge

ChangeSet@1.1810.3337.11, 2007-10-16 14:27:20-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed broken call to my_error

  sql/sql_yacc.yy@1.371.1.166, 2007-10-16 14:27:18-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed error message to use char*, not LEX_STRING

ChangeSet@1.2564.5.11, 2007-10-16 23:19:39+04:00, skozlov@mysql.com +4 -0
  Fix for non-deterministic behavior of SELECTs and VIEWs

  mysql-test/suite/rpl/include/rpl_mixed_check_select.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/include/rpl_mixed_check_view.inc@1.2, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +2 -2
    Added ORDER BY for VIEW

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +4 -4
    Added ORDER BY for SELECT

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.8, 2007-10-16 23:19:27+04:00, skozlov@mysql.com +76 -76
    Updated result file

ChangeSet@1.2573.19.1, 2007-10-16 19:32:38+02:00, thek@adventure.(none) +2 -0
  Fixed query_cache_notembedded test program failure because of dependencies between
  test programs.

  mysql-test/r/query_cache.result@1.105, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +4 -0
    Reset query cache parameters to prevent dependency between test programs.

  mysql-test/t/query_cache.test@1.86, 2007-10-16 19:32:34+02:00, thek@adventure.(none) +6 -0
    Reset query cache parameters to prevent dependency between test programs.

ChangeSet@1.1810.3371.6, 2007-10-16 11:16:31-06:00, malff@lambda.hsd1.co.comcast.net. +3 -0
  Implementing code review comments

  mysql-test/r/sp.result@1.170.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +15 -0
    Added tests for coverage

  mysql-test/t/sp.test@1.174.50.3, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +29 -0
    Added tests for coverage

  sql/sql_udf.cc@1.45.1.18, 2007-10-16 11:16:23-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Code cleanup

ChangeSet@1.2573.2.7, 2007-10-16 20:21:40+04:00, kostja@bodhi.(none) +1 -0
  Update the client ABI to reflect member rename 
  (this is a backward-compatible change).

  include/mysql_h.ic@1.13, 2007-10-16 20:21:38+04:00, kostja@bodhi.(none) +1 -1
    Update the ABI to reflect member rename 
    (this is a backward-compatible change).

ChangeSet@1.2573.18.1, 2007-10-16 12:29:22-03:00, davi@moksha.com.br +5 -0
  Bug#31608 missing mysqltest change_user command
  
  The problem is that currently there is no way to test the behavior
  of the mysql_change_user() function using the mysqltest suite because
  there is no internal command for it.
  
  The solution is to introduce a change_user command that can be used
  to test aspects of the MySQL client function mysql_change_user().

  client/mysqltest.c@1.313.1.3, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +60 -1
    Add change_user command to mysqltest.

  mysql-test/r/change_user.result@1.1, 2007-10-16 12:29:20-03:00, davi@moksha.com.br +46 -0
    Add new file with test case results for bugs 20023 and 31418.

  mysql-test/r/change_user.result@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/r/mysqltest.result@1.71, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +3 -0
    Add test case result for change_user command

  mysql-test/t/change_user.test@1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +35 -0
    Add new file with test cases for bugs 20023 and 31418.

  mysql-test/t/change_user.test@1.0, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +0 -0

  mysql-test/t/mysqltest.test@1.91.1.1, 2007-10-16 12:29:19-03:00, davi@moksha.com.br +18 -0
    Add test case for change_user command

ChangeSet@1.2573.17.1, 2007-10-16 14:42:42+02:00, thek@adventure.(none) +5 -0
  Bug#30710 query_cache.test fails on embedded - per-column privs test
  
  The embedded version of the server doesn't use column level grants, and 
  the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
  the redundant HAVE_QUERY_CACHE (which is always the case) to determine if 
  column level grants should be compiled or not.

  mysql-test/r/query_cache.result@1.104, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +0 -33
    Updated result file

  mysql-test/r/query_cache_notembedded.result@1.10, 2007-10-16 14:42:40+02:00, thek@adventure.(none) +33 -0
    Updated result file

  mysql-test/t/query_cache.test@1.85, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +0 -39
    Moved test with GRANT to query_cache_notembedded test.

  mysql-test/t/query_cache_notembedded.test@1.9, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +36 -0
    Moved test with GRANT to query_cache_notembedded test.

  sql/sql_cache.cc@1.128, 2007-10-16 14:42:41+02:00, thek@adventure.(none) +1 -1
    Changed the conditional compilation directive to only compile column level grant
    checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.

ChangeSet@1.2573.16.1, 2007-10-16 17:19:07+05:00, ramil@mysql.com +3 -0
  Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
  
  Problem: we don't evaluate given expression checking values of the
  slow_query_log_file/general_log_file, don't check it for NULL.
  
  Fix: evaluate the expression, check result returned.

  mysql-test/r/log_state.result@1.8, 2007-10-16 17:19:05+05:00, ramil@mysql.com +13 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test result.

  mysql-test/t/log_state.test@1.10, 2007-10-16 17:19:05+05:00, ramil@mysql.com +20 -0
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - test case.

  sql/set_var.cc@1.253, 2007-10-16 17:19:05+05:00, ramil@mysql.com +17 -6
    Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
      - evaluate var->value calling val_str() method;
      - check for null values returned;
      - return proper errors if any.

ChangeSet@1.2573.1.4, 2007-10-16 13:20:08+02:00, serg@janus.mylan +2 -0
  tests/mysql_client_test.c: typo fixed

  BitKeeper/etc/ignore@1.301, 2007-10-16 13:20:05+02:00, serg@janus.mylan +6 -0
    Added libmysql_r/client_settings.h libmysql_r/link_sources libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc sql/link_sources to the ignore list

  tests/mysql_client_test.c@1.252.4.1, 2007-10-16 13:20:04+02:00, serg@janus.mylan +1 -1
    typo fixed

ChangeSet@1.2564.5.10, 2007-10-16 15:22:44+05:00, bar@mysql.com +4 -0
  After merge fix:
  Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format

  mysql-test/r/ctype_uca.result@1.19.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_ucs.result@1.59.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/ctype_utf8.result@1.120.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

  mysql-test/r/func_regexp.result@1.12.1.2, 2007-10-16 15:22:42+05:00, bar@mysql.com +2 -2
    Adjusting SHOW CREATE TABLE output

ChangeSet@1.2573.14.1, 2007-10-16 13:43:16+05:00, ramil@mysql.com +2 -0
  Fix for bug #31285: main.status test fails with different Table_locks_waited
  
  Problem: Table_locks_waited value may depend on general logging.
  
  Fix: switch general logging off.

  mysql-test/r/status.result@1.23, 2007-10-16 13:43:13+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

  mysql-test/t/status.test@1.31, 2007-10-16 13:43:14+05:00, ramil@mysql.com +3 -0
    Fix for bug #31285: main.status test fails with different Table_locks_waited
      - switch general logging off.

ChangeSet@1.1810.3371.5, 2007-10-15 19:15:38-06:00, malff@lambda.hsd1.co.comcast.net. +6 -0
  Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II
  
  The root cause of the issue was that the CREATE FUNCTION grammar,
  for User Defined Functions, was using the sp_name rule.
  The sp_name rule is intended for fully qualified stored procedure names,
  like either ident.ident, or just ident but with a default database
  implicitly selected.
  
  A UDF does not have a fully qualified name, only a name (ident), and should
  not use the sp_name grammar fragment during parsing.
  
  The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
  - creating UDF (no definer, can have AGGREGATE, simple ident)
  - creating Stored Functions (definer, no AGGREGATE, fully qualified name)
  
  With the test case provided, another issue was exposed which is also fixed:
  the DROP FUNCTION statement was using sp_name and also failing when no database
  is implicitly selected, when droping UDF functions.
  The fix is also to change the grammar so that DROP FUNCTION works with
  both the ident.ident syntax (to drop a stored function), or just the ident
  syntax (to drop either a UDF or a Stored Function, in the current database)

  mysql-test/r/sp-error.result@1.102.1.14, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/r/udf.result@1.3.4.2, 2007-10-15 19:13:24-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  mysql-test/t/sp-error.test@1.100.1.17, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +5 -2
    Adjust test results

  mysql-test/t/udf.test@1.8.3.2, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +2 -2
    Adjust test results

  sql/sql_parse.cc@1.426.165.4, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +0 -6
    CREATE UDF FUNCTION does not use a fully qualified name.

  sql/sql_yacc.yy@1.371.1.165, 2007-10-15 19:13:25-06:00, malff@lambda.hsd1.co.comcast.net. +222 -190
    Fix grammar for CREATE / DROP FUNCTION, FOR udf
    Improve error messages for select no_such_function()

ChangeSet@1.2573.2.5, 2007-10-15 15:53:39-04:00, dkatz@damien-katzs-computer.local +1 -0
  fix problem caused by previous submission for bugs BUG#29589 BUG#29772 

  sql/set_var.cc@1.249.1.2, 2007-10-15 15:53:37-04:00, dkatz@damien-katzs-computer.local +32 -209
    fix problem caused by previous submission

ChangeSet@1.1810.3366.2, 2007-10-15 19:59:14+02:00, joerg@trift2. +1 -0
  Allow for different directories containing the "libc",
  as it may well happen with 32- vs 64-bit Linux systems.
  
  This patch was proposed immediately with the report of
  Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

  configure.in@1.245.103.2, 2007-10-15 19:59:10+02:00, joerg@trift2. +1 -1
    Allow for different directories containing the "libc",
    as it may well happen with 32- vs 64-bit Linux systems.
    
    This patch was proposed immediately with the report of
    Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms

ChangeSet@1.2573.5.11, 2007-10-15 19:56:24+03:00, gkodinov@magare.gmz +2 -0
  Bug #27099: system_mysql fail in pushbuild windows
  
  On Windows the debug log was doing freopen () instead of
  fflush() and that was slowing the logging down that much 
  that some tests timed out.
  Fixed by replacing the freopen() with an syncing-to-disk
  flag to fopen() and fflush().
  Also increased the timeout of the tests running with --debug
  on windows : seems to slow down as much as valgrind on linux.

  dbug/dbug.c@1.39, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +10 -18
    Bug #27099: remove the freopen() for the 
    windows log : too slow. Replace it with the "c" option
    for fopen().

  mysql-test/mysql-test-run.pl@1.330.1.2, 2007-10-15 19:56:22+03:00, gkodinov@magare.gmz +2 -0
    Bug #27099: on windows debug log seems to slow the tests
    down about as much as valgrind does on linux.

ChangeSet@1.2579, 2007-10-15 17:04:43+02:00, mleich@four.local.lan +2 -0
  Fix for
  Bug#31169 Test case does not check whether configuration contains feature tested

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.6, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

  mysql-test/suite/rpl/t/rpl_innodb_bug30919.test@1.3, 2007-10-15 17:04:41+02:00, mleich@four.local.lan +1 -0
    Add check for partitioning feature.

ChangeSet@1.1810.3386.1, 2007-10-15 18:40:58+05:00, gluh@mysql.com +5 -0
  Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
  issue an error if string has illegal characters

  mysql-test/r/ctype_utf8.result@1.85.11.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -32
    issue an error if string has illegal characters

  mysql-test/t/ctype_utf8.test@1.84.10.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +8 -0
    issue an error if string has illegal characters

  sql/item.cc@1.113.100.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +9 -3
    issue an error if string has illegal characters

  sql/item.h@1.183.41.1, 2007-10-15 18:40:57+05:00, gluh@mysql.com +1 -1
    issue an error if string has illegal characters

  sql/sql_yacc.yy@1.371.128.2, 2007-10-15 18:40:57+05:00, gluh@mysql.com +5 -10
    issue an error if string has illegal characters

ChangeSet@1.2573.3.25, 2007-10-15 16:42:41+04:00, kostja@bodhi.(none) +2 -0
  Add comments, tidy up sql_delete.cc to refer to thd->row_count_func 
  explicitly.

  sql/sql_class.cc@1.347.1.3, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +12 -0
    Add comments.

  sql/sql_delete.cc@1.226.1.1, 2007-10-15 16:42:39+04:00, kostja@bodhi.(none) +4 -4
    Change syntax to make grepping easier. No semantical change.

ChangeSet@1.2573.3.24, 2007-10-15 15:49:16+04:00, kostja@bodhi.(none) +1 -0
  Fix broken compilation.

  sql/net_serv.cc@1.115, 2007-10-15 15:49:05+04:00, kostja@bodhi.(none) +1 -1
    Fix the build I broke by the previous change.

ChangeSet@1.2573.3.23, 2007-10-15 15:45:20+04:00, kostja@bodhi.(none) +2 -0
  Remove an unused variable that was there since the first implementation
  of the stored procedure cursors (materialized on disk).

  include/mysql_com.h@1.124, 2007-10-15 15:45:15+04:00, kostja@bodhi.(none) +1 -1
    Remove an unused variable.

  sql/protocol.cc@1.129.1.1, 2007-10-15 15:45:16+04:00, kostja@bodhi.(none) +1 -1
    net->no_send_eof was not used anywhere.

ChangeSet@1.2541.34.2, 2007-10-15 09:17:15+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - reenable disabled testcases
    ndb_load
    ndb_dd_sql_features

  mysql-test/suite/ndb/t/disabled.def@1.6, 2007-10-15 09:17:12+02:00, jonas@perch.ndb.mysql.com +0 -3
    reenable disabled testcases

ChangeSet@1.2541.34.1, 2007-10-15 09:10:14+02:00, jonas@perch.ndb.mysql.com +17 -0
  ndb - bug#31482
    (re)impl. simple-read (read that releases lock just before LQHKEYCONF)
    use simple-read for blobs

  storage/ndb/include/kernel/signaldata/TcKeyConf.hpp@1.8, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    rename bit

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.45.1.1, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -1
    add new lock-mode

  storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp@1.5, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +2 -2
    rename bit

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@1.72, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +0 -1
    remove aggregate

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.167, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +48 -28
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.59, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +4 -8
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.156, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +107 -92
    impl. simple-read = normal read + release lock just before LQHKEYCONF

  storage/ndb/src/ndbapi/NdbBlob.cpp@1.61, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    use simple read for blobs

  storage/ndb/src/ndbapi/NdbIndexOperation.cpp@1.32, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -0
    no simple-read for ui (yet)

  storage/ndb/src/ndbapi/NdbOperationDefine.cpp@1.33, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +33 -29
    impl. simple-read

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@1.29, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -9
    impl. simple-read

  storage/ndb/src/ndbapi/NdbReceiver.cpp@1.22, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -1
    impl. simple-read

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@1.120, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +1 -0
    no simple-read for scan (yet)

  storage/ndb/src/ndbapi/NdbTransaction.cpp@1.81, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +3 -3
    rename bit

  storage/ndb/test/ndbapi/testBasic.cpp@1.25, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +13 -22
    add testcase for simlpe-read

  storage/ndb/test/run-test/daily-basic-tests.txt@1.107, 2007-10-15 09:10:10+02:00, jonas@perch.ndb.mysql.com +8 -0
    add testcase

  storage/ndb/test/src/HugoOperations.cpp@1.35, 2007-10-15 09:10:11+02:00, jonas@perch.ndb.mysql.com +1 -0
    add simple-read

ChangeSet@1.1810.3375.2, 2007-10-15 10:34:34+04:00, kaa@polly.(none) +3 -0
  Fix for bug #30453: String not cast to int correctly.
  
  Problem:
  
  my_strntoull10rnd_8bit() handled incorrectly cases when the input
  string contains a decimal point and is long enough to overrun the
  'unsigned long long' type. The position of the decimal point was not
  taken into account which resulted in miscalculated numbers and
  truncation to appropriate SQL data type limits.
  
  Solution:
  
  Fix my_strntoull10rnd_8bit() to take the position of a decimal point
  into account in such cases.

  mysql-test/r/insert.result@1.22.1.8, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +14 -0
    Added a test case for bug #30453.

  mysql-test/t/insert.test@1.22.1.5, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +15 -0
    Added a test case for bug #30453.

  strings/ctype-simple.c@1.75.4.1, 2007-10-15 10:34:29+04:00, kaa@polly.(none) +9 -5
    In cases when the 'unsigned long long' type is overrun by the input
    string and a decimal point has occurred, adjust the 'shift' according to
    the position of the decimal point and skip all subsequent digits.

ChangeSet@1.1810.3340.4, 2007-10-15 10:11:52+05:00, holyfoot@mysql.com +1 -0
  bug #29801 Federated engine crashes local server
                 if remote server sends malicious response.
  
  We need to check if the SHOW TABLE STATUS query we issue inside the
  FEDERATED engine returned the result with the proper (or just sufficient)
  number of rows. Otherwise statements like row[12] can crash the server.

  sql/ha_federated.cc@1.24.30.1, 2007-10-15 10:11:50+05:00, holyfoot@mysql.com +6 -1
    bug #29801 Federated engine crashes local server
                   if remote server sends malicious response.
    
    Return with the error if the remote server return fewer rows than we need.

ChangeSet@1.2403.18.93, 2007-10-14 18:42:49+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testScan -n InsertDelete
  fix testcase

  storage/ndb/test/ndbapi/testScan.cpp@1.25, 2007-10-14 18:42:47+02:00, jonas@perch.ndb.mysql.com +1 -1
    fix testcase

ChangeSet@1.1810.3202.17, 2007-10-14 16:17:39+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - bug#29390: fix mem leak introduced in previous cset

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.9.1, 2007-10-14 16:15:43+02:00, pekka@sama.ndb.mysql.com +32 -0
    fix mem leak on discarded scanfilter

ChangeSet@1.1810.3374.6, 2007-10-14 11:28:43+03:00, gkodinov@magare.gmz +1 -0
  item_sum.cc:
    Fixed dbug macros usage errors

  sql/item_sum.cc@1.170.1.44, 2007-10-14 11:28:11+03:00, gkodinov@magare.gmz +3 -3
    Fixed dbug macros usage errors

ChangeSet@1.2564.17.5, 2007-10-13 23:12:50+03:00, aelkin@koti.dsl.inet.fi +11 -0
  manual merge for bug_29136, bug#29309.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.2, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +69 -5
    manual merge from 5.0

  mysql-test/r/innodb.result@1.204, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.52, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +21 -2
    results changed

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.25, 2007-10-13 23:12:45+03:00, aelkin@koti.dsl.inet.fi +53 -6
    manual merge: results re-recorded

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.51, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +53 -6
    results changed

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.2, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +23 -8
    results recorded for 5.1

  mysql-test/t/innodb.test@1.173, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +0 -39
    removing bug27716 regression test as one exists in binlog suite already.

  mysql-test/t/multi_update.test@1.58, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +6 -2
    manual merge plus refining for execution in both binlog_format.

  sql/log_event.cc@1.305.1.4, 2007-10-13 23:12:46+03:00, aelkin@koti.dsl.inet.fi +26 -2
    bloody manual merge;
    the fact that an event is artificial is encode with setting timestamp argument to zero.
    rli's last_master_timestamp won't be updated in stmt_done in such case.

  sql/rpl_rli.cc@1.14, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +9 -1
    simulation and the real fixing code.
    Don't update last_master_timestamp with zero.

  sql/sql_delete.cc@1.229, 2007-10-13 23:12:47+03:00, aelkin@koti.dsl.inet.fi +3 -3
    manual merge

ChangeSet@1.1810.3336.10, 2007-10-13 15:49:42+03:00, aelkin@koti.dsl.inet.fi +10 -0
  Bug #29136 erred multi-delete on trans table does not rollback the statement
  
  similar to bug_27716, but it was stressed on in the synopsis on that there is another
  side of the artifact affecting behaviour in transaction.
  
  Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
  to perform binlogging job if needed.
  
  The changeset includes the following side effects:
  - added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
  - fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.15.1, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +70 -6
    multi-update  and multi-delete of mixure of ta and not-ta tables tests added (relates to bug_23333).

  mysql-test/r/innodb.result@1.145.1.26, 2007-10-13 15:49:36+03:00, aelkin@koti.dsl.inet.fi +15 -2
    results changed

  mysql-test/r/multi_update.result@1.44.1.3, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +22 -2
    results changed

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.12.1, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +48 -4
    results changed

  mysql-test/t/innodb.test@1.118.2.18, 2007-10-13 15:49:37+03:00, aelkin@koti.dsl.inet.fi +32 -0
    trans table specific test added

  mysql-test/t/multi_update.test@1.48.1.3, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +34 -0
    testing another branch of mult-delete: send_eof() (binloggin there), send_error (early return)

  sql/sql_class.h@1.230.79.2, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +10 -0
    a new flag to designate the fact the statement's error has been handled.
    The flag is checked by ::send_error() methods (multi_update and _delete classes)

  sql/sql_delete.cc@1.144.1.57, 2007-10-13 15:49:38+03:00, aelkin@koti.dsl.inet.fi +25 -4
    expanding multi_delete::send_error to 
    1. early return if error_handled == t
    2. binlogging locally if there was a non-trans table modified side effect

  sql/sql_parse.cc@1.426.1.213, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +7 -0
    adding multi_update::send_error which can perform binlogging and rollback job in needed

  sql/sql_update.cc@1.154.2.70, 2007-10-13 15:49:39+03:00, aelkin@koti.dsl.inet.fi +11 -11
    issues relating to
     
    1. bug_27716 with zeroing of `updated' to serve as the flag of early return from send_error().
       The flag is changed to be a new member error_handled; also moved outside binlogging branch.
       The reason for this change is that bug_23333 fixes were pushed after the bug_27716's and they
       left this flaw (also no test coverage).
    2. bug_30763 with assertion on trans_safe. I decide to make 2 liner fix for that bug here instead of to remove
       those two assertions. This new bug test case is the same as for multi-update on the mixure of tables.
       The rational for this fix:
       presumption for mutli_update::trans_safe to be set to zero at
       multi_update::multi_update or multi_update::initialize_tables() is incorrect.
    
       trans_safe := false should happen only when a non-transactional table gets modified. 
       Therefore, at initialization the member must be be set to true.

ChangeSet@1.1810.3287.23, 2007-10-12 13:07:39-07:00, mtaylor@solace.(none) +45 -0
  Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion.

  BitKeeper/deleted/.del-README.debian@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/README.debian

  BitKeeper/deleted/.del-aa@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/aa

  BitKeeper/deleted/.del-ab@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ab

  BitKeeper/deleted/.del-ac@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ac

  BitKeeper/deleted/.del-ad@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ad

  BitKeeper/deleted/.del-ae@1.2.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ae

  BitKeeper/deleted/.del-az@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/az

  BitKeeper/deleted/.del-changelog~8457b43736642c@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/changelog

  BitKeeper/deleted/.del-control@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/control

  BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/copyright

  BitKeeper/deleted/.del-gomi@1.3.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/gomi

  BitKeeper/deleted/.del-libmysqlclient10.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.dirs

  BitKeeper/deleted/.del-libmysqlclient10.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient10.postinst

  BitKeeper/deleted/.del-libmysqlclient9.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.dirs

  BitKeeper/deleted/.del-libmysqlclient9.postinst@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/libmysqlclient9.postinst

  BitKeeper/deleted/.del-move@1.2.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/move

  BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/my.cnf

  BitKeeper/deleted/.del-mysql-bench.dirs@1.1.1.1, 2007-10-12 13:04:33-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-bench.dirs

  BitKeeper/deleted/.del-mysql-client.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-client.dirs

  BitKeeper/deleted/.del-mysql-dev.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-dev.dirs

  BitKeeper/deleted/.del-mysql-doc.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-doc.dirs

  BitKeeper/deleted/.del-mysql-max-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.dirs

  BitKeeper/deleted/.del-mysql-max-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postinst

  BitKeeper/deleted/.del-mysql-max-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-debug.postrm

  BitKeeper/deleted/.del-mysql-max-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.dirs

  BitKeeper/deleted/.del-mysql-max-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postinst

  BitKeeper/deleted/.del-mysql-max-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max-shared.postrm

  BitKeeper/deleted/.del-mysql-max.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.dirs

  BitKeeper/deleted/.del-mysql-max.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postinst

  BitKeeper/deleted/.del-mysql-max.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-max.postrm

  BitKeeper/deleted/.del-mysql-server-debug.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.dirs

  BitKeeper/deleted/.del-mysql-server-debug.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postinst

  BitKeeper/deleted/.del-mysql-server-debug.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-debug.postrm

  BitKeeper/deleted/.del-mysql-server-shared.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.dirs

  BitKeeper/deleted/.del-mysql-server-shared.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postinst

  BitKeeper/deleted/.del-mysql-server-shared.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server-shared.postrm

  BitKeeper/deleted/.del-mysql-server.conffiles@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.conffiles

  BitKeeper/deleted/.del-mysql-server.dirs@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.dirs

  BitKeeper/deleted/.del-mysql-server.postinst@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postinst

  BitKeeper/deleted/.del-mysql-server.postrm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.postrm

  BitKeeper/deleted/.del-mysql-server.prerm@1.1.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/mysql-server.prerm

  BitKeeper/deleted/.del-rules~2018e0de32c6d936@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/rules

  BitKeeper/deleted/.del-shlibs@1.2.1.1, 2007-10-12 13:04:34-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/shlibs

  BitKeeper/deleted/.del-ta@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/ta

  BitKeeper/deleted/.del-tb@1.1.1.1, 2007-10-12 13:04:35-07:00, mtaylor@solace.(none) +0 -0
    Delete: support-files/debian/patches/tb

ChangeSet@1.2564.17.3, 2007-10-12 18:22:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  BUG#29549 (Endians: rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb and rpl_ndb_mix_innodb failed on):
  Post-merge fixes. Setting write bit before calling Field::store() since the function asserts that
  the write bit has been set.

  sql/field.cc@1.419, 2007-10-12 18:22:26+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Setting bit in write set to prevent assertion from throwing when calling Field::store().

ChangeSet@1.1810.3384.1, 2007-10-12 10:55:46-03:00, davi@moksha.com.br +1 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  If mysql_lock_tables fails because the lock was aborted, we need to
  reset thd->some_tables_delete, otherwise we might loop indefinitely
  because handler's tables are not closed in a standard way, meaning
  that close_thread_tables() (which resets some_tables_deleted) is not
  used.
  
  This patch fixes sporadical failures of handler_myisam/innodb tests
  which were introduced by previous fix for this bug.

  sql/sql_handler.cc@1.72.1.22, 2007-10-12 10:55:44-03:00, davi@moksha.com.br +6 -0
    Properly reset thd->some_tables_deleted if mysql_lock_tables
    fails for some reason.

ChangeSet@1.1810.3382.1, 2007-10-12 14:03:51+04:00, kaa@polly.(none) +2 -0
  Fix for bug #31254: "Max_data_length" truncated / reported wrong
  (compiler issue ?)
  
  Problem:
  
  Improper compile-time flags on AIX prevented use of files > 2 GB. This
  resulted in Max_data_length being truncated to 2 GB by MyISAM code.
  
  Solution:
  
  Reverted large-file changes from the fix for bug10776. We need to define
  _LARGE_FILES on AIX to have support for files > 2 GB.
  
   Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
  automatically defined by including standards.h, we also need a
  workaround to avoid this conflict.

  config/ac-macros/large_file.m4@1.4, 2007-10-12 14:03:41+04:00, kaa@polly.(none) +9 -2
    Reverted large-file changes from the fix for bug10776. We need to define
    _LARGE_FILES on AIX to have support for files > 2 GB.

  include/my_global.h@1.96.14.5, 2007-10-12 14:03:42+04:00, kaa@polly.(none) +5 -0
    _LARGE_FILE_API is defined in standards.h that is automatically included
    by at least some C++ compilers on AIX. Since it is also incompatible
    with _LARGE_FILES which is required for POSIX IO calls to be
    largefile-safe, the only workaround is to explicitely #undef
    _LARGE_FILE_API.

ChangeSet@1.1810.3381.1, 2007-10-12 11:46:48+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#30951: makedate returns different results depending on version of mysql
  
  makedate() will fold years below 100 into the 1970-2069 range. CS removes code
  that also wrongly folded years between 100 and 200 into that range, which should
  be left unchanged. Backport from 5.1.

  mysql-test/r/func_sapdb.result@1.15.8.1, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Show that makedate() works correctly for 100 <= year < 200.

  mysql-test/t/func_sapdb.test@1.13.3.2, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    Show that makedate() works correctly for 100 <= year < 200.

  sql-common/my_time.c@1.19.17.3, 2007-10-12 11:46:46+02:00, tnurnberg@sin.intern.azundris.com +0 -5
    Remove unnecessary date magic. Syncs behaviour with 5.1+
    and manual.

ChangeSet@1.1810.3379.1, 2007-10-12 11:23:45+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug#30821: setting --tc_heuristic_recover tries to set myisam_stats_method
  
  Options to mysqld were not processed correctly because switch statement
  was missing some "break"s. CS adds them.
  
  No test case; would require .opt file and server restart. Manually tested.

  sql/mysqld.cc@1.439.129.2, 2007-10-12 11:23:43+02:00, tnurnberg@sin.intern.azundris.com +2 -0
    Add missing "break"s to switch() in mysqld to fix option processing.

ChangeSet@1.1810.3287.22, 2007-10-12 02:15:32-07:00, mtaylor@solace.(none) +96 -0
  Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474@1.5, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/Makefile.am

  BitKeeper/deleted/.del-POTFILES.in.in@1.4, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/POTFILES.in.in

  BitKeeper/deleted/.del-README.Maintainer@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/README.Maintainer

  BitKeeper/deleted/.del-ca.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ca.po

  BitKeeper/deleted/.del-changelog@1.3.1.1, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/changelog

  BitKeeper/deleted/.del-compat@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/compat

  BitKeeper/deleted/.del-control.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/control.in

  BitKeeper/deleted/.del-copyright@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright

  BitKeeper/deleted/.del-copyright.more@1.2, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/copyright.more

  BitKeeper/deleted/.del-cs.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/cs.po

  BitKeeper/deleted/.del-da.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/da.po

  BitKeeper/deleted/.del-de.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/de.po

  BitKeeper/deleted/.del-defs.mk.in@1.6, 2007-10-12 02:13:59-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/defs.mk.in

  BitKeeper/deleted/.del-es.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/es.po

  BitKeeper/deleted/.del-eu.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/eu.po

  BitKeeper/deleted/.del-fr.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/fr.po

  BitKeeper/deleted/.del-gl.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/gl.po

  BitKeeper/deleted/.del-it.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/it.po

  BitKeeper/deleted/.del-ja.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ja.po

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.examples.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in@1.2.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIB-dev.links.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.README.Debian.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.dirs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.docs.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.files.in

  BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in@1.4, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libmysqlclientSLIBoff.postinst.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.files.in

  BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB-dev.links.in

  BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.README.Debian.in

  BitKeeper/deleted/.del-libndbclientNLIB.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.dirs.in

  BitKeeper/deleted/.del-libndbclientNLIB.files.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.files.in

  BitKeeper/deleted/.del-libndbclientNLIB.postinst.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/libndbclientNLIB.postinst.in

  BitKeeper/deleted/.del-my.cnf@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/my.cnf

  BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-client-BASE.dirs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-client-BASE.docs.in@1.3, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.docs.in

  BitKeeper/deleted/.del-mysql-client-BASE.files.in@1.4.1.1, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.files.in

  BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:00-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-client-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-common.README.Debian.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.README.Debian.in

  BitKeeper/deleted/.del-mysql-common.dirs.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.dirs.in

  BitKeeper/deleted/.del-mysql-common.files.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.files.in

  BitKeeper/deleted/.del-mysql-common.postrm.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.postrm.in

  BitKeeper/deleted/.del-mysql-common.preinst.in@1.2, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-common.preinst.in

  BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-extra-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-extra-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-management-BASE.files.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.files.in

  BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-management-BASE.mysql-management.init.in

  BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.NEWS.in

  BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.README.Debian.in

  BitKeeper/deleted/.del-mysql-server-BASE.config.in@1.5, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.config.in

  BitKeeper/deleted/.del-mysql-server-BASE.dirs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-server-BASE.docs.in@1.3, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.docs.in

  BitKeeper/deleted/.del-mysql-server-BASE.files.in@1.4.1.1, 2007-10-12 02:14:01-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.files.in

  BitKeeper/deleted/.del-mysql-server-BASE.links.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.links.in

  BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in@1.5, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.lintian-overrides.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in@1.3, 2007-10-12 02:14:02-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.server.in

  BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in

  BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.mysql-server.logrotate.in

  BitKeeper/deleted/.del-mysql-server-BASE.postinst.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.postrm.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.postrm.in

  BitKeeper/deleted/.del-mysql-server-BASE.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.preinst.in

  BitKeeper/deleted/.del-mysql-server-BASE.prerm.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.prerm.in

  BitKeeper/deleted/.del-mysql-server-BASE.templates.in@1.5, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-BASE.templates.in

  BitKeeper/deleted/.del-mysql-server-PREV.preinst.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server-PREV.preinst.in

  BitKeeper/deleted/.del-mysql-server.lintian-overrides@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/mysql-server.lintian-overrides

  BitKeeper/deleted/.del-mysql-server.preinst.in@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-server.preinst.in

  BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-storage-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.files.in

  BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-storage-BASE.mysql-storage.init.in

  BitKeeper/deleted/.del-mysql-test-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-test-BASE.files.in@1.2.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-test-BASE.files.in

  BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.dirs.in

  BitKeeper/deleted/.del-mysql-tools-BASE.files.in@1.3, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/mysql-tools-BASE.files.in

  BitKeeper/deleted/.del-nb.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nb.po

  BitKeeper/deleted/.del-ndb_mgmd.cnf@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/additions/ndb_mgmd.cnf

  BitKeeper/deleted/.del-nl.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/nl.po

  BitKeeper/deleted/.del-pt.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt.po

  BitKeeper/deleted/.del-pt_BR.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/pt_BR.po

  BitKeeper/deleted/.del-ro.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ro.po

  BitKeeper/deleted/.del-ru.po@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/ru.po

  BitKeeper/deleted/.del-rules@1.5.1.1, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/rules

  BitKeeper/deleted/.del-source.lintian-overrides.in@1.4, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/source.lintian-overrides.in

  BitKeeper/deleted/.del-sv.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/sv.po

  BitKeeper/deleted/.del-templates.pot@1.2, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/templates.pot

  BitKeeper/deleted/.del-tr.po@1.3, 2007-10-12 02:14:04-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/po/tr.po

  BitKeeper/deleted/.del-watch@1.2, 2007-10-12 02:14:03-07:00, mtaylor@solace.(none) +0 -0
    Delete: debian/watch

  Makefile.am@1.68.1.40, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +1 -2
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

  configure.in@1.245.1.214, 2007-10-12 02:15:29-07:00, mtaylor@solace.(none) +0 -1
    Removed debian dir. It was a mistake to embed it in the tree in the first place. 

ChangeSet@1.2541.21.16, 2007-10-12 01:16:55-07:00, mtaylor@solace.(none) +1 -0
  Fixed a typo. We have NdbTransactions not NdbTransations. 

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.48, 2007-10-12 01:16:54-07:00, mtaylor@solace.(none) +1 -1
    Fixed a typo. We have NdbTransactions not NdbTransations. 

ChangeSet@1.2541.21.15, 2007-10-12 00:10:07-07:00, mtaylor@solace.(none) +3 -0
  Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.47, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +1 -2
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.12, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +2 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.59, 2007-10-12 00:10:05-07:00, mtaylor@solace.(none) +3 -1
    Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.

ChangeSet@1.2541.31.1, 2007-10-11 23:46:25-07:00, mtaylor@solace.(none) +6 -0
  Fixed header to reflect the implementation. 
  Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbOperation.hpp@1.46, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +3 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbPool.hpp@1.4, 2007-10-11 23:46:21-07:00, mtaylor@solace.(none) +2 -1
    Fixed header to reflect the implementation. 

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@1.11, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +1 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/include/ndbapi/NdbTransaction.hpp@1.58, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +7 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbOperation.cpp@1.24, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +6 -0
    Added accessor method to help out the NDB/Connectors.

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@1.17, 2007-10-11 23:46:22-07:00, mtaylor@solace.(none) +4 -0
    Added accessor method to help out the NDB/Connectors.

ChangeSet@1.2528.233.1, 2007-10-11 17:55:18-06:00, malff@weblab.(none) +3 -0
  Bug#27858 (Failing to log to a log table doesn't log anything to error log)
  
  Before this patch, failures to write to the log tables (mysql.slow_log
  and mysql.general_log) were improperly printed (the time was printed twice),
  or not printed at all.
  
  With this patch, failures to write to the log tables is reported in the
  error log, for all cases of failures.

  mysql-test/r/log_tables.result@1.21.1.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +4 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  mysql-test/t/log_tables.test@1.20, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +56 -0
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

  sql/log.cc@1.297.1.1, 2007-10-11 17:55:16-06:00, malff@weblab.(none) +21 -22
    Bug#27858 (Failing to log to a log table doesn't log anything to error log)

ChangeSet@1.2573.3.20, 2007-10-11 17:38:40-03:00, davi@moksha.com.br +4 -0
  Bug#29223 declare cursor c for SHOW .....
  
  "DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work,
  but is untested for some SHOW commands and does not work for other SHOW
  commands.
  
  Since this is an un-intended feature that leaked as a result of a coding bug
  (in the parser grammar), the correct fix is to fix the grammar to not accept
  this construct.
  
  In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>"
  is not considered a bug, and we will not implement other features to make all
  the SHOW commands usable inside a cursor just because someone exploited a bug.

  mysql-test/r/sp-error.result@1.130, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +20 -1
    Only allow declaring cursors for SELECT statements to avoid
    possible further confusion/problems.

  mysql-test/t/information_schema.test@1.105.1.1, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +1 -1
    Only SELECT statements are allowed in cursors.

  mysql-test/t/sp-error.test@1.126, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +22 -1
    Add test case for Bug#29223. Non-SELECT statements in cursors now
    yields a parser error.

  sql/sql_yacc.yy@1.601.1.5, 2007-10-11 17:38:36-03:00, davi@moksha.com.br +3 -15
    Rework DECLARE CURSOR statement to not allow non-SELECT statements.

ChangeSet@1.2578, 2007-10-11 19:39:18+02:00, mleich@four.local.lan +7 -0
  Fix for
  Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
  = Adjust the files with expected results 

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.4, 2007-10-11 19:39:15+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.5, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.5, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.4, 2007-10-11 19:39:16+02:00, mleich@four.local.lan +1 -1
    Updated result

ChangeSet@1.2528.232.1, 2007-10-11 18:18:05+02:00, mats@kindahl-laptop.dnsalias.net +20 -0
  BUG#29549 (Endians: test failures on Solaris):
  
  Refactoring code to add parameter to pack() and unpack() functions with
  purpose of indicating if data should be packed in little-endian or
  native order. Using new functions to always pack data for binary log
  in little-endian order. The purpose of this refactoring is to allow
  proper implementation of endian-agnostic pack() and unpack() functions.
  
  Eliminating several versions of virtual pack() and unpack() functions
  in favor for one single virtual function which is overridden in
  subclasses.
  
  Implementing pack() and unpack() functions for some field types that
  packed data in native format regardless of the value of the
  st_table_share::db_low_byte_first flag.
  
  The field types that were packed in native format regardless are:
  Field_real, Field_decimal, Field_tiny, Field_short, Field_medium,
  Field_long, Field_longlong, and Field_blob.
  
  Before the patch, row-based logging wrote the rows incorrectly on
  big-endian machines where the storage engine defined its own
  low_byte_first() to be FALSE on big-endian machines (the default
  is TRUE), while little-endian machines wrote the fields in correct
  order. The only known storage engine that does this is NDB. In effect,
  this means that row-based replication from or to a big-endian
  machine where the table was using NDB as storage engine failed if the
  other engine was either non-NDB or on a little-endian machine.
  
  With this patch, row-based logging is now always done in little-endian
  order, while ORDER BY uses the native order if the storage engine
  defines low_byte_first() to return FALSE for big-endian machines.
  
  In addition, the max_data_length() function available in Field_blob
  was generalized to the entire Field hierarchy to give the maximum
  number of bytes that Field::pack() will write.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +855 -0
    New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result''

  mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result@1.0, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +0 -0

  mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Result change.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2.1.1, 2007-10-11 18:17:55+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Sorting by columns that produces deterministic order.

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.2.1.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Result change.

  mysql-test/suite/rpl/t/disabled.def@1.8.2.1, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +0 -1
    Enabling tests.

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@1.8, 2007-10-11 18:17:56+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Adding missing sync_slave_with_master causing slave to keep tables
    after shutdown.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.6.2.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +0 -2
    Enabling tests.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test@1.4.1.1, 2007-10-11 18:17:57+02:00, mats@kindahl-laptop.dnsalias.net +6 -4
    Adding have_log_bin.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt@1.6.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding --new option

  mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test@1.4.1.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +5 -2
    Adding have_log_bin

  mysql-test/t/partition.test@1.62.2.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +2 -1
    Adding have_archive, since that is used in the test.

  sql/field.cc@1.408.6.1, 2007-10-11 18:17:58+02:00, mats@kindahl-laptop.dnsalias.net +263 -144
    Eliminating all two-argument pack() and unpack() functions and moving
    functionality into the four-argument version. The four argument version
    is introduced so that it is possible to avoid using the storage engine
    default when writing and reading the packed format (the unpacked format
    still uses the storage engine's default). This is used by row-based
    replication to write the fields in a storage engine- and endian-agnostic
    format.
    
    Packing integral and floating-point numbers in little-endian format
    (if requested).
    
    Using pad_char for the field instead of spaces (0x20) when unpacking.
    
    Adding some Doxygen documentation.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.
    
    Adding casts to remove warnings for debug printouts.

  sql/field.h@1.243.3.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +231 -40
    Eliminating all virtual pack() and unpack() functions except the four-
    argument version, which now is the function that shall be overridden.
    The two-argument versions are convenience functions, to prevent changes
    to code that uses these.
    
    Adding code to pack integer numbers and floating-point numbers in
    little-endian format, if requested.
    ---
    Adding max_data_length() to denote the maximum number of bytes that
    pack() will write.

  sql/log.cc@1.293.3.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +0 -3
    Removing debug printout causing crash when starting NDB on Solaris.

  sql/log_event.cc@1.297.7.1, 2007-10-11 18:17:59+02:00, mats@kindahl-laptop.dnsalias.net +4 -0
    Adding missing #ifndef causing compile failure. Adding debug printouts.

  sql/rpl_record.cc@1.7.3.2, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +22 -32
    Debriding code. Using new pack() and unpack() functions to always pack
    fields little-endian. Adding debug printouts.
    ---
    Using max_data_length() when packing field into row.
    
    Adding casts to debug printouts.

  sql/sql_show.cc@1.432.1.1, 2007-10-11 18:18:00+02:00, mats@kindahl-laptop.dnsalias.net +4 -2
    Adding code that causes crash on Solaris machines since printf() cannot
    handle NULL values for strings properly.

ChangeSet@1.2541.27.7, 2007-10-11 15:28:10+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb -
    decrease test time

  storage/ndb/test/run-test/daily-basic-tests.txt@1.105, 2007-10-11 15:28:07+02:00, jonas@perch.ndb.mysql.com +1 -1
    decrease test time

ChangeSet@1.2573.3.19, 2007-10-11 17:11:12+04:00, anozdrin@station. +2 -0
  A patch for BUG#31418: User locks misfunctioning after
  mysql_change_user().
  
  The problem was that THD::ull was not reset in THD::cleanup().
  
  The fix is to reset it.

  sql/sql_class.cc@1.347.1.2, 2007-10-11 17:11:10+04:00, anozdrin@station. +1 -0
    Reset THD::ull after cleanup to prevent memory corruption.

  tests/mysql_client_test.c@1.252.1.4, 2007-10-11 17:11:10+04:00, anozdrin@station. +134 -32
    Add test case for BUG#31418.

ChangeSet@1.2403.18.92, 2007-10-11 14:54:05+02:00, jonas@perch.ndb.mysql.com +4 -0
  ndb - bug#31525
    Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.8, 2007-10-11 14:54:02+02:00, jonas@perch.ndb.mysql.com +4 -1
    add new error codes for bug#31525

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.10, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add new error codes for bug#31525
    fix bug, i.e include missing_2 in LCP

  storage/ndb/test/ndbapi/testNodeRestart.cpp@1.38.1.13, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +77 -0
    add testcase for bug#31525

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.11, 2007-10-11 14:54:03+02:00, jonas@perch.ndb.mysql.com +4 -0
    add testcase for bug#31525

ChangeSet@1.1810.3360.5, 2007-10-11 17:20:34+05:00, ramil@mysql.com +3 -0
  Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
  
  Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
  which are constructed using a temporary table fields,
  see Item_func_group_concat::setup().
  As a) we don't store null bits in the tree where the bit fields store parts 
  of their data and b) there's no method to properly compare two table records
  we've got problem.
  
  Fix: convert BIT fields to INT in the temporary table used.

  mysql-test/r/func_gconcat.result@1.52.1.20, 2007-10-11 17:20:32+05:00, ramil@mysql.com +42 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test result.

  mysql-test/t/func_gconcat.test@1.44.1.15, 2007-10-11 17:20:32+05:00, ramil@mysql.com +28 -0
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - test case.

  sql/item_sum.cc@1.170.28.1, 2007-10-11 17:20:32+05:00, ramil@mysql.com +25 -6
    Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
      - force the create_tmp_table() to convert BIT columns to INT 
        in order to be able to compare records containing BIT fields.

ChangeSet@1.2573.5.4, 2007-10-11 16:41:05+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_yacc.yy@1.601.3.4, 2007-10-11 16:41:03+05:00, gluh@mysql.com +1 -1
    after merge fix

ChangeSet@1.1810.3378.1, 2007-10-11 16:07:10+05:00, gluh@mysql.com +9 -0
  Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero
  Bug#30982 CHAR(..USING..) can return a not-well-formed string
  Bug#30986 Character set introducer followed by a HEX string can return bad result
  check_well_formed_result moved to Item from Item_str_func
  fixed Item_func_char::val_str for proper ucs symbols converting
  added check for well formed strings for correct conversion of constants with underscore
  charset

  mysql-test/r/ctype_ucs.result@1.39.3.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +3 -0
    test result

  mysql-test/r/ctype_utf8.result@1.85.11.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +64 -2
    test result

  mysql-test/t/ctype_ucs.test@1.36.4.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +5 -0
    test case

  mysql-test/t/ctype_utf8.test@1.84.10.1, 2007-10-11 16:07:08+05:00, gluh@mysql.com +19 -0
    test case

  sql/item.cc@1.113.100.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +35 -0
    check_well_formed_result() moved from Item_str_func

  sql/item.h@1.183.1.58, 2007-10-11 16:07:09+05:00, gluh@mysql.com +1 -0
    check_well_formed_result() moved from Item_str_func

  sql/item_strfunc.cc@1.261.1.45, 2007-10-11 16:07:09+05:00, gluh@mysql.com +3 -32
    check_well_formed_result moved to Item
    fixed Item_func_char::val_str for proper ucs symbols converting

  sql/item_strfunc.h@1.101.1.23, 2007-10-11 16:07:09+05:00, gluh@mysql.com +0 -1
    check_well_formed_result moved to Item

  sql/sql_yacc.yy@1.371.128.1, 2007-10-11 16:07:09+05:00, gluh@mysql.com +18 -4
    added check for well formed string

ChangeSet@1.1616.3106.1, 2007-10-11 14:28:12+04:00, kaa@polly.(none) +3 -0
  Fix for bug #31174: "Repair" command on MyISAM crashes with small
  myisam_sort_buffer_size.
  
  An incorrect length of the sort buffer was used when calculating the
  maximum number of keys. When myisam_sort_buffer_size is small enough,
  this could result in the number of keys < number of
  BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.
  
  Fixed by correcting the buffer length calculation.

  mysql-test/r/repair.result@1.14.1.8, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +27 -0
    Added a test case for bug #31174.

  mysql-test/t/repair.test@1.12.1.6, 2007-10-11 14:28:09+04:00, kaa@polly.(none) +30 -1
    Added a test case for bug #31174.

  myisam/sort.c@1.35.1.17, 2007-10-11 14:28:08+04:00, kaa@polly.(none) +4 -2
    Use a correct buffer length when calculating the maximum number of keys.
    Assert that for each BUFFPEK structure there is at least one
    corresponding key. Otherwise we would fail earlier and not reach
    merge_buffers().

ChangeSet@1.1810.3377.1, 2007-10-11 11:29:26+03:00, gkodinov@magare.gmz +3 -0
  Bug #31440: 'select 1 regex null' asserts debug server
  
  The special case with NULL as a regular expression
  was handled at prepare time. But in this special case
  the item was not marked as fixed. This caused an assertion
  at execution time.
  Fixed my marking the item as fixed even when known to 
  return NULL at prepare time.

  mysql-test/r/func_regexp.result@1.10.2.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +5 -0
    Bug #31440: test case

  mysql-test/t/func_regexp.test@1.9.1.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +10 -1
    Bug #31440: test case

  sql/item_cmpfunc.cc@1.187.43.1, 2007-10-11 11:29:24+03:00, gkodinov@magare.gmz +1 -0
    Bug #31440: mark the item as fixed even when 
    known to return NULL.

ChangeSet@1.2573.3.18, 2007-10-10 21:39:22-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 31409

  mysql-test/include/handler.inc@1.39, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +33 -0
    Add test case for Bug 31409

  mysql-test/r/handler_innodb.result@1.21, 2007-10-10 21:39:19-03:00, davi@moksha.com.br +18 -0
    Add test case result for InnoDB run of the handler test for Bug 31409

  mysql-test/r/handler_myisam.result@1.34, 2007-10-10 21:39:20-03:00, davi@moksha.com.br +18 -0
    Add test case result for MyISAM run of the handler test for Bug 31409

ChangeSet@1.2573.3.16, 2007-10-10 21:07:23-03:00, davi@moksha.com.br +1 -0
  Mismerge broken 5.1-runtime compilation because do_command was defined
  static but it's still used by another compilation unit.
  
  Remove static qualifier from do_command definition.

  sql/sql_parse.cc@1.700.5.7, 2007-10-10 21:07:20-03:00, davi@moksha.com.br +1 -1
    do_command is also used by sql_connect.c in 5.1

ChangeSet@1.2573.3.10, 2007-10-10 19:06:53-03:00, davi@moksha.com.br +3 -0
  Post-merge test case for Bug 21587

  mysql-test/include/handler.inc@1.38, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +35 -0
    Add test case for Bug 21587

  mysql-test/r/handler_innodb.result@1.20, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for InnoDB run of the handler test for Bug 21587

  mysql-test/r/handler_myisam.result@1.33, 2007-10-10 19:06:47-03:00, davi@moksha.com.br +22 -0
    Add test case result for MyISAM run of the handler test for Bug 21587

ChangeSet@1.2575.1.1, 2007-10-10 22:03:10+02:00, mleich@four.local.lan +19 -0
  Combined fix for
     Bug#31481 test suite parts: Many tests fail because of changed server error codes
     Bug#31243 Test "partition_basic_myisam" truncates path names
  + minor cleanup

  mysql-test/suite/parts/inc/partition.pre@1.4, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +9 -9
    - Blow column file_list up to VARBINARY(10000)
       = Fix for Bug#31243 Test "partition_basic_myisam" truncates path names
    - Minor cleanup
      = remove reference to fixed bugs #17455, #19305

  mysql-test/suite/parts/inc/partition_alter_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +11 -9
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_check.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +12 -8
    Adjust expected server error codes

  mysql-test/suite/parts/inc/partition_syntax.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +19 -19
    Minor cleanup
    = replace error numbers with error names

  mysql-test/suite/parts/inc/partition_syntax_1.inc@1.6, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +15 -13
    Adjust expected server error codes

  mysql-test/suite/parts/r/partition_alter1_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter1_myisam.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_innodb.result@1.3, 2007-10-10 22:03:06+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter2_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter3_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_alter4_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_basic_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_innodb.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_engine_myisam.result@1.3, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_innodb.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_myisam.result@1.4, 2007-10-10 22:03:07+02:00, mleich@four.local.lan +1 -4
    Updated results

ChangeSet@1.1810.3376.1, 2007-10-10 14:00:57-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback()
  
  Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
  fix is to check thd for NULL before using it.

  sql/sql_class.cc@1.223.1.55, 2007-10-10 14:00:56-06:00, tsmith@ramayana.hindu.god +5 -2
    It is possible that mark_transaction_to_rollback() may be
    called in rare circumstances when thd is NULL (e.g., from
    some calls to convert_error_code_to_mysql()).  Don't use thd
    if it is NULL.

ChangeSet@1.2564.17.1, 2007-10-10 18:10:54+02:00, sven@murkla.(none) +2 -0
  BUG#29046: rpl_stm_mystery22 unstable
  
  Problem: rpl_stm_mystery22 is unstable.
  
  Reason: At one place, the test case *should* wait until the SQL thread on the
  slave receives an error, but instead it waits until the SQL thread stops. The
  SQL thread may stop before the error flag is set, so that when the test case
  continues to execute, the error flag is not set.
  
  Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
  which waits until there is an error in the sql thread of the slave.
  
  Re-commit: fixed one logical error and two smaller things noted by Mats.

  mysql-test/include/wait_for_slave_sql_error.inc@1.1, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +33 -0
    New BitKeeper file ``mysql-test/include/wait_for_slave_sql_error.inc''
    This is a subroutine that waits until the sql thread on the slave receives an
    error, as indicated by Last_SQL_Errno in "SHOW SLAVE STATUS".

  mysql-test/include/wait_for_slave_sql_error.inc@1.0, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +0 -0

  mysql-test/suite/rpl/t/rpl_stm_mystery22.test@1.12, 2007-10-10 18:10:51+02:00, sven@murkla.(none) +1 -1
    Use the new wait_for_slave_sql_error.inc instead of wait_for_slave_to_stop.
    There may be a delay from when the slave stops to when Last_SQL_Errno is set,
    so it is not safe to merely wait until the slave stops.

ChangeSet@1.2541.21.12, 2007-10-10 17:22:21+02:00, jmiller@mysql.com +2 -0
  rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result:
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.1, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +2286 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@1.0, 2007-10-10 17:22:06+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.1, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +14 -0
    Back porting NDB test case

  mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test@1.0, 2007-10-10 17:21:54+02:00, jmiller@mysql.com +0 -0

ChangeSet@1.1810.3374.1, 2007-10-10 20:14:29+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 &&
                    precision > 0 && scale <= precision'.
  
  A sign of a resulting item of the IFNULL function was not
  updated and the maximal length of this result was calculated
  improperly. Correct algorithm was copy&pasted from the IF
  function implementation.

  mysql-test/r/create.result@1.107.1.29, 2007-10-10 19:50:45+05:00, gshchepa@gleb.loc +1 -1
    Update test case after the bugfix of bug #31471.

  mysql-test/r/null.result@1.33.1.4, 2007-10-10 19:50:35+05:00, gshchepa@gleb.loc +24 -1
    Added test case for bug #31471.

  mysql-test/t/null.test@1.22, 2007-10-10 19:50:26+05:00, gshchepa@gleb.loc +25 -2
    Added test case for bug #31471.

  sql/item_cmpfunc.cc@1.187.1.78, 2007-10-10 19:49:55+05:00, gshchepa@gleb.loc +14 -4
    Fixed bug #31471.
    The Item_func_ifnull::fix_length_and_dec method has been
    modified to update the Item_func_ifnull::unsigned_flag field
    and to take this field into account when calculating the
    Item_func_ifnull::max_length value.
    (See Item_func_if::fix_length_and_dec for reference).

ChangeSet@1.2541.21.11, 2007-10-10 16:43:20+02:00, jmiller@mysql.com +8 -0
  .del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
  .del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
  .del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
  Many files:
    merged and cleanup of test cases

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2@1.3, 2007-10-10 14:44:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423@1.2, 2007-10-10 14:42:04+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba@1.2, 2007-10-10 14:42:14+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.3, 2007-10-10 16:43:08+02:00, jmiller@mysql.com +692 -150
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@1.3, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@1.3, 2007-10-10 16:42:40+02:00, jmiller@mysql.com +2092 -762
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -1
    merged and cleanup of test cases

  mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test@1.2, 2007-10-10 16:42:52+02:00, jmiller@mysql.com +2 -0
    merged and cleanup of test cases

ChangeSet@1.2573.3.8, 2007-10-10 17:57:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20023: mysql_change_user() resets the value
  of SQL_BIG_SELECTS.
  
  The bug was that SQL_BIG_SELECTS was not properly set
  in COM_CHANGE_USER.
  
  The fix is to update SQL_BIG_SELECTS properly.

  sql/mysql_priv.h@1.542, 2007-10-10 17:56:58+04:00, anozdrin@station. +0 -1
    Cleanup: make prepare_new_connection_state() private for module.

  sql/sql_class.cc@1.347.1.1, 2007-10-10 17:56:58+04:00, anozdrin@station. +6 -0
    Update THD::options with the respect to SQL_BIG_SELECTS
    in COM_CHANGE_USER.

  sql/sql_connect.cc@1.11, 2007-10-10 17:56:58+04:00, anozdrin@station. +2 -2
    Cleanup: make prepare_new_connection_state() private for module.

  tests/mysql_client_test.c@1.252.1.3, 2007-10-10 17:56:59+04:00, anozdrin@station. +171 -0
    Add a test case BUG#20023.

ChangeSet@1.2576, 2007-10-10 15:37:33+02:00, mleich@four.local.lan +5 -0
  Fix for
    Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.12, 2007-10-10 15:37:30+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.12, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.12, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +86 -254
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.6, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +151 -403
    Updated expected results
    Attention:
       The update does not prevent that the test has to be disabled.
       Reason: Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results

  mysql-test/suite/funcs_1/t/disabled.def@1.5, 2007-10-10 15:37:31+02:00, mleich@four.local.lan +1 -0
    Disable ndb__datadict because of
    Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
    which will be fixed later.

ChangeSet@1.1810.3373.2, 2007-10-10 16:26:02+03:00, gkodinov@magare.gmz +14 -0
  Bug #30825: Problems when putting a non-spatial index on a GIS column
   Fixed the usage of spatial data (and Point in specific) with 
   non-spatial indexes.
   Several problems :
     - The length of the Point class was not updated to include the 
       spatial reference system identifier. Fixed by increasing with 4 
       bytes.
     - The storage length of the spatial columns was not accounting for
       the length that is prepended to it. Fixed by treating the 
       spatial data columns as blobs (and thus increasing the storage
       length)
     - When creating the key image for comparison in index read wrong
       key image was created (the one needed for and r-tree search,
       not the one for b-tree/other search). Fixed by treating the
       spatial data columns as blobs (and creating the correct kind of
       image based on the index type). 

  mysql-test/r/bdb_gis.result@1.2.7.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: bdb tests

  mysql-test/t/bdb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: bdb tests

  mysql-test/include/gis_keys.inc@1.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +46 -0
    Bug #30825: Test file for spatial data and non-spatial indexes

  mysql-test/include/gis_keys.inc@1.0, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +0 -0

  mysql-test/r/gis-rtree.result@1.14.1.15, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -2
    Bug #30825: key length changed

  mysql-test/r/gis.result@1.35.1.13, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: MyISAM tests

  mysql-test/r/innodb_gis.result@1.2.2.7, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +39 -0
    Bug #30825: InnoDB tests

  mysql-test/t/gis.test@1.29.1.11, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +2 -0
    Bug #30825: MyISAM tests

  mysql-test/t/innodb_gis.test@1.2.1.1, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -0
    Bug #30825: InnoDB tests

  sql/field.cc@1.256.1.106, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -30
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/field.h@1.153.27.10, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +0 -1
    Bug #30825: Removed Field_geom::get_key_image as Field_blog::get_key_image 
      takes type parameter into consideration and is a superset of 
      Field_geom::get_key_image()

  sql/sql_select.h@1.92.1.31, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +6 -2
    Bug #30825: Geometry data are a blob derivate

  sql/sql_table.cc@1.239.1.117, 2007-10-10 16:26:00+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/sql_yacc.yy@1.371.127.1, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +1 -1
    Bug #30825: Increased key length to accomodate for
      spatial reference system identifier (srid)

  sql/table.cc@1.160.1.99, 2007-10-10 16:26:01+03:00, gkodinov@magare.gmz +4 -2
    Bug #30825: It stores a length for spatial data
     as well, so increase the storage length (as it's
     done for blobs).

ChangeSet@1.2541.21.10, 2007-10-10 14:18:34+02:00, jmiller@mysql.com +2 -0
  rpl_bug31076.test, rpl_bug31076.result:
    Correcting test bug

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.2.1, 2007-10-10 14:18:14+02:00, jmiller@mysql.com +1 -0
    Correcting test bug

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.2.1, 2007-10-10 14:18:24+02:00, jmiller@mysql.com +3 -0
    Correcting test bug

ChangeSet@1.1810.3371.3, 2007-10-10 14:42:29+04:00, anozdrin@station. +2 -0
  Cleanup sp.test.

  mysql-test/r/sp.result@1.170.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -3
    Update result file.

  mysql-test/t/sp.test@1.174.50.2, 2007-10-10 14:42:27+04:00, anozdrin@station. +3 -7
    Cleanup sp.test.

ChangeSet@1.2573.3.7, 2007-10-10 13:53:24+04:00, anozdrin@station. +1 -0
  Fix automerge.

  mysql-test/r/sp.result@1.299, 2007-10-10 13:53:21+04:00, anozdrin@station. +176 -0
    Fix automerge.

ChangeSet@1.2541.1.49, 2007-10-10 14:22:21+05:00, gluh@mysql.com +2 -0
  after merge fix

  mysql-test/r/view.result@1.244, 2007-10-10 14:22:19+05:00, gluh@mysql.com +6 -6
    after merge fix

  sql/sql_repl.cc@1.174.1.1, 2007-10-10 14:22:19+05:00, gluh@mysql.com +3 -0
    after merge fix

ChangeSet@1.1810.3308.34, 2007-10-10 12:21:11+05:00, gluh@mysql.com +3 -0
  Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES
  added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
  to make them visible within SHOW VARIABLES

  mysql-test/r/rpl_flush_log_loop.result@1.24.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +7 -0
    test result

  mysql-test/t/rpl_flush_log_loop.test@1.14.1.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    test case

  sql/set_var.cc@1.125.33.1, 2007-10-10 12:21:10+05:00, gluh@mysql.com +3 -0
    added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
    to make them visible within SHOW VARIABLES

ChangeSet@1.1810.3308.33, 2007-10-10 12:16:13+05:00, gluh@mysql.com +2 -0
  Bug#25359 Test 'view' is dependent on current year to be 2006
  removed now() call to make the test to be year independent

  mysql-test/r/view.result@1.138.1.71, 2007-10-10 12:16:12+05:00, gluh@mysql.com +8 -7
    result fix

  mysql-test/t/view.test@1.126.1.64, 2007-10-10 12:16:12+05:00, gluh@mysql.com +7 -6
    removed now() call to make the test to be year independent

ChangeSet@1.2564.4.13, 2007-10-09 18:45:29-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix compiler warning (use correct data type)

  client/mysqltest.c@1.318, 2007-10-09 18:45:27-06:00, tsmith@ramayana.hindu.god +2 -1
    Use correct data type for dummy variable passed to dirname_part()

ChangeSet@1.2573.3.5, 2007-10-09 18:12:13-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Fixed packet length for embedded tests

  libmysqld/lib_sql.cc@1.140, 2007-10-09 18:12:09-06:00, malff@lambda.hsd1.co.comcast.net. +1 -1
    Fixed packet length for embedded

ChangeSet@1.1810.3372.1, 2007-10-09 20:46:33-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +8 -0
  Bug#28318 CREATE FUNCTION (UDF) requires a schema
  Bug#29816 Syntactically wrong query fails with misleading error message
  
  The core problem is that an SQL-invoked function name can be a <schema
  qualified routine name> that contains no <schema name>, but the mysql
  parser insists that all stored procedures (function, procedures and
  triggers) must have a <schema name>, which is not true for functions.
  This problem is especially visible when trying to create a function
  or when a query contains a syntax error after a function call (in the
  same query), both will fail with a "No database selected" message if
  the session is not attached to a particular schema, but the first
  one should succeed and the second fail with a "syntax error" message.
  
  Part of the fix is to revamp the sp name handling so that a schema
  name may be omitted for functions -- this means that the internal
  function name representation may not have a dot, which represents
  that the function doesn't have a schema name. The other part is
  to place schema checks after the type (function, trigger or procedure)
  of the routine is known.

  mysql-test/r/sp-error.result@1.102.1.13, 2007-10-09 20:45:04-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +13 -0
    Add test case result for Bug#29816

  mysql-test/r/udf.result@1.3.4.1, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +7 -0
    Add test case result for Bug#28318

  mysql-test/t/sp-error.test@1.100.1.16, 2007-10-09 20:45:05-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +20 -0
    Add test case for Bug#29816

  mysql-test/t/udf.test@1.8.3.1, 2007-10-09 20:45:29-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +14 -0
    Add test case for Bug#28318

  sql/sp.cc@1.82.1.54, 2007-10-09 20:45:30-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +3 -10
    Copy the (last) nul byte of the stored routine key and move name parsing
    code to the sp_name class constructor.

  sql/sp_head.cc@1.200.7.30, 2007-10-09 20:45:39-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +28 -3
    Revamp routine name parsing for when no schema is specified and
    omit dot from the qualified name if the routine is not associated
    with a scheme name.

  sql/sp_head.h@1.79.1.21, 2007-10-09 20:45:48-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +1 -10
    Name parsing got bigger, uninline by moving to a single unit -- the sp_head.cc
    file.

  sql/sql_yacc.yy@1.371.126.1, 2007-10-09 20:45:56-03:00, davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br +26 -5
    Only copy the schema name if one is actually set and check for schema
    name presence only where it's necessary.

ChangeSet@1.2541.21.9, 2007-10-09 19:51:57+02:00, jmiller@mysql.com +8 -0
  Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests.

  mysql-test/extra/rpl_tests/rpl_row_charset.test@1.8, 2007-10-09 19:48:04+02:00, jmiller@mysql.com +4 -2
    Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB

  mysql-test/suite/rpl/r/rpl_row_charset.result@1.10, 2007-10-09 19:48:37+02:00, jmiller@mysql.com +5 -3
    Updated results file

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.1, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +215 -0
    New results file for innodb test case

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@1.0, 2007-10-09 19:50:55+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.1, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on master

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt@1.0, 2007-10-09 19:50:00+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.1, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +1 -0
    Option file to ensure innodb on slave

  mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt@1.0, 2007-10-09 19:50:16+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.1, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +9 -0
    Created a wrapper to test innodb storage engine as well

  mysql-test/suite/rpl/t/rpl_row_charset_innodb.test@1.0, 2007-10-09 19:49:17+02:00, jmiller@mysql.com +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@1.10, 2007-10-09 19:46:45+02:00, jmiller@mysql.com +17 -17
    Updated results file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test@1.5, 2007-10-09 19:46:09+02:00, jmiller@mysql.com +2 -2
    Updated test to run for both row and mixed replication testing

ChangeSet@1.1810.3360.4, 2007-10-09 22:40:22+05:00, ramil@mysql.com +2 -0
  metadata test of bug # 31249: problem with convert(..., datetime) removed 
  as PS protocol gives slightly different metadata.

  mysql-test/r/type_datetime.result@1.30.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -7
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

  mysql-test/t/type_datetime.test@1.18.8.3, 2007-10-09 22:40:20+05:00, ramil@mysql.com +0 -3
    metadata test of bug # 31249: problem with convert(..., datetime) removed 
    as PS protocol gives slightly different metadata.

ChangeSet@1.1810.3355.3, 2007-10-09 12:02:59-03:00, davi@moksha.local +2 -0
  Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
  
  This deadlock occurs when a client issues a HANDLER ... OPEN statement
  that tries to open a table that has a pending name-lock on it by another
  client that also needs a name-lock on some other table which is already
  open and associated to a HANDLER instance owned by the first client.
  The deadlock happens because the open_table() function will back-off
  and wait until the name-lock goes away, causing a circular wait if some
  other name-lock is also pending for one of the open HANDLER tables.
  
  Such situation, for example, can be easily repeated by issuing a RENAME
  TABLE command in such a way that the existing table is already open
  as a HANDLER table by another client and this client tries to open
  a HANDLER to the new table name.
  
  The solution is to allow handler tables with older versions (marked for
  flush) to be closed before waiting for the name-lock completion. This is
  safe because no other name-lock can be issued between the flush and the
  check for pending name-locks.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_base.cc@1.235.113.1, 2007-10-09 12:02:57-03:00, davi@moksha.local +11 -1
    Improve comments in the open_table() function, stating the importance
    of the handler tables flushing for the back-off process.

  sql/sql_handler.cc@1.72.1.21, 2007-10-09 12:02:57-03:00, davi@moksha.local +28 -19
    Allows handler tables flushes when opening new tables in order to avoid
    potential deadlocks. Add comments explaining the importance of the flush.

ChangeSet@1.2564.16.1, 2007-10-09 19:16:39+05:00, ramil@mysql.com +6 -0
  Fix for bug #29444: crash with partition refering to table in create-select
  
  Problem: creating a partitioned table during name resolution for the 
  partition function we search for column names in all parts of the
  CREATE TABLE query. It is superfluous (and wrong) sometimes.
  
  Fix: launch name resolution for the partition function against
  the table we're creating.

  mysql-test/r/partition.result@1.68.1.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  mysql-test/t/partition.test@1.62.1.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +20 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - test result.

  sql/item.cc@1.289, 2007-10-09 19:16:36+05:00, ramil@mysql.com +3 -1
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.cc@1.255.1.11, 2007-10-09 19:16:36+05:00, ramil@mysql.com +1 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_lex.h@1.296.2.1, 2007-10-09 19:16:36+05:00, ramil@mysql.com +8 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - LEX::use_only_table_context introduced, which is used in the 
        Item_field::fix_fields() to resolve names only against
        context->first_name_resolution_table/last_name_resolution_table.

  sql/sql_partition.cc@1.116, 2007-10-09 19:16:37+05:00, ramil@mysql.com +7 -0
    Fix for bug #29444: crash with partition refering to table in create-select
      - set the lex->use_only_table_context before the func_expr->fix_fields()
        call to ensure we're resolving names against the table we're creating;
        then restore it back after the call.

ChangeSet@1.1810.3370.1, 2007-10-09 14:58:09+02:00, mhansson@linux-st28.site +4 -0
  Bug#31160: MAKETIME() crashes server when returning NULL in ORDER BY using filesort
  
  Even though it returns NULL, the MAKETIME function did not have this property set,
  causing a failed assertion (designed to catch exactly this).
  Fixed by setting the nullability property of MAKETIME().

  mysql-test/r/func_sapdb.result@1.15.7.2, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +1 -1
    Bug#31160: Changed test result.

  mysql-test/r/func_time.result@1.47.1.37, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +9 -0
    Bug#31160: Test result.

  mysql-test/t/func_time.test@1.41.1.30, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +10 -0
    Bug#31160: Test case.

  sql/item_timefunc.h@1.63.7.1, 2007-10-09 14:58:07+02:00, mhansson@linux-st28.site +4 -1
    Bug#31160: The fix: Initializing maybe_null to true

ChangeSet@1.1810.3369.1, 2007-10-09 13:10:51+02:00, istruewing@stella.local +2 -0
  Bug#15522 - create ... select and with merge tables
  Added test case.
  The fix for Bug#20662 does also fix this one.

  mysql-test/r/merge.result@1.43.1.20, 2007-10-09 13:10:50+02:00, istruewing@stella.local +5 -0
    Bug#15522 - create ... select and with merge tables
    Added test result.

  mysql-test/t/merge.test@1.37.1.15, 2007-10-09 13:10:50+02:00, istruewing@stella.local +14 -0
    Bug#15522 - create ... select and with merge tables
    Added test case.

ChangeSet@1.2573.3.3, 2007-10-09 14:53:15+04:00, anozdrin@station. +3 -0
  Fix merge.

  sql/mysql_priv.h@1.541, 2007-10-09 14:53:12+04:00, anozdrin@station. +1 -0
    Fix merge.

  sql/sql_connect.cc@1.10, 2007-10-09 14:53:12+04:00, anozdrin@station. +12 -4
    Fix merge.

  sql/sql_parse.cc@1.700.5.3, 2007-10-09 14:53:13+04:00, anozdrin@station. +0 -2
    Fix merge.

ChangeSet@1.1810.3348.3, 2007-10-09 14:37:21+05:00, ramil@mysql.com +4 -0
  Fix for bug #31249: Assertion `!table || (!table->write_set || 
  bitmap_is_set(table->write_set, fiel
  
  Problem: creating a temporary table we allocate the group buffer if needed
  followed by table bitmaps (see create_tmp_table()). Reserving less memory for 
  the group buffer than actually needed (used) for values retrieval may lead 
  to overlapping with followed bitmaps in the memory pool that in turn leads 
  to unpredictable consequences.
  
  As we use Item->max_length sometimes to calculate group buffer size,
  it must be set to proper value. In this particular case 
  Item_datetime_typecast::max_length is too small.
  
  Another problem is that we use max_length to calculate the group buffer
  key length for items represented as DATE/TIME fields which is superfluous.
  
  Fix: set Item_datetime_typecast::max_length properly,
  accurately calculate the group buffer key length for items 
  represented as DATE/TIME fields in the buffer.

  mysql-test/r/type_datetime.result@1.30.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +14 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test result.

  mysql-test/t/type_datetime.test@1.18.9.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +13 -0
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - test case.

  sql/item_timefunc.h@1.63.6.1, 2007-10-09 14:37:19+05:00, ramil@mysql.com +3 -1
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - set Item_datetime_typecast::max_length properly.

  sql/sql_select.cc@1.312.1.237, 2007-10-09 14:37:19+05:00, ramil@mysql.com +22 -4
    Fix for bug #31249: Assertion `!table || (!table->write_set || 
    bitmap_is_set(table->write_set, fiel
      - the group buffer key length for items represented as 
    DATE/TIME fields in the buffer should be calculated using
    the maximum pack length of such fields (== 8), using 
    max_length here is redundant.

ChangeSet@1.1810.3368.1, 2007-10-09 11:36:05+02:00, mhansson@linux-st28.site +3 -0
  Bug#30832:Assertion + crash with select name_const('test',now());
  Completion of previous patch. Negative number were denied
  as the second argument to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.8, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +6 -0
    Bug#30832 completion: test result

  mysql-test/t/func_misc.test@1.21.2.2, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832 completion: test case
    added negative numbers

  sql/item_func.h@1.136.2.39, 2007-10-09 11:36:00+02:00, mhansson@linux-st28.site +1 -0
    Bug#30832 completion
    The function that represents unary minus is considered a constant if the argument is.

ChangeSet@1.2564.5.7, 2007-10-09 13:53:39+05:00, bar@mysql.com +1 -0
  Bug#27287 extractvalue() (and updatexml()) extremely slow for large XML
  Performance improvements made.
  ExtractValue for large XML values is now much faster
  (about 2000 times faster of 1Mb-long XML values).

  sql/item_xmlfunc.cc@1.33.1.1, 2007-10-09 13:53:38+05:00, bar@mysql.com +24 -36
    Performance improvement for huge XML values:
    1. Avoid reallocs - reserve extra memory:
    using String::reserve() + String::q_append()
    instead of String::append()
    2. Parent is now not searched through the all previous
    nodes in backward direction. Instead, we do the following:
    - we introduce data->parent - a new member in MY_XML_USER_DATA
    - when entering a new tag/attribute node, we remember offset
      of the current node in data->parent
    - when leaving a tag/attribute node, we change data->parent
      to offset of the parent of the current node.

ChangeSet@1.2403.18.91, 2007-10-09 10:41:26+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - more test prg fixes (due to small change in scanUpdates impl.)
    (autotest tests)

  storage/ndb/test/ndbapi/testDict.cpp@1.34.2.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/testIndex.cpp@1.21.1.1, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +2 -2
    more test prg fixes

  storage/ndb/test/ndbapi/test_event.cpp@1.27, 2007-10-09 10:41:24+02:00, jonas@perch.ndb.mysql.com +1 -1
    more test prg fixes

ChangeSet@1.2403.18.90, 2007-10-09 09:55:30+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - testSystemRestart -n SR_UNDO
    yet another test prg bug

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.4, 2007-10-09 09:55:28+02:00, jonas@perch.ndb.mysql.com +1 -1
    yet another test prg bug

ChangeSet@1.2541.27.4, 2007-10-09 09:39:39+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/r/ndb_multi.result@1.17, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +21 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  mysql-test/suite/ndb/t/ndb_multi.test@1.25, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +27 -0
    Bug #31470 ndb table with special characters in name are not discovered correctly

  sql/handler.cc@1.322.2.2, 2007-10-09 09:39:36+02:00, tomas@whalegate.ndb.mysql.com +1 -2
    Bug #31470 ndb table with special characters in name are not discovered correctly

ChangeSet@1.1810.3367.1, 2007-10-08 22:30:41-04:00, iggy@alf.(none) +1 -0
  Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
  doesn't clean them up
  - Make sure to cleanup temporary files after use.

  client/mysql_upgrade.c@1.6.1.22, 2007-10-08 22:30:39-04:00, iggy@alf.(none) +4 -0
    Bug#28774 mysql_upgrade creates tempfiles in root-dir (C:\) and 
    doesn't clean them up
    - Close file handle and delete temporary file when write fails.

ChangeSet@1.2564.15.1, 2007-10-08 17:43:32-04:00, iggy@alf.(none) +1 -0
  Bug#28535 mistake in mysqldump error message
  - Fixed error message.

  client/mysqldump.c@1.291.8.1, 2007-10-08 17:43:30-04:00, iggy@alf.(none) +1 -1
    Bug#28535 mistake in mysqldump error message
    - Corrected parameter order.

ChangeSet@1.2541.23.6, 2007-10-09 01:07:15+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31310.
  Locked rows of the InnoDB storage was silently skipped in the read-committed
  isolation level.
  
  QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
  of the record that was read semi-consistently and just skip it.
  
  The handler::read_multi_range_next method has been modified
  to retry previous unique range if the previous read was
  semi-consistent.

  mysql-test/include/mix1.inc@1.54.1.1, 2007-10-09 01:03:44+05:00, gshchepa@gleb.loc +125 -0
    Added test case for bug #31310.

  mysql-test/r/innodb_mysql.result@1.57.1.1, 2007-10-09 01:03:59+05:00, gshchepa@gleb.loc +80 -0
    Added test case for bug #31310.

  sql/handler.cc@1.322.8.1, 2007-10-09 01:03:36+05:00, gshchepa@gleb.loc +5 -3
    Fixed bug #31310.
    The handler::read_multi_range_next method has been modified
    to retry previous unique range if the previous read was
    semi-consistent.

ChangeSet@1.2573.4.3, 2007-10-08 20:57:37+02:00, serg@janus.mylan +3 -0
  sql_plugin.cc:
    fixed uninit memory access in SET pluginvar=DEFAULT
  innodb_mysql.test, innodb_mysql.result:
    test case for SET pluginvar=DEFAULT

  mysql-test/r/innodb_mysql.result@1.58.1.1, 2007-10-08 20:57:24+02:00, serg@janus.mylan +2 -0
    test case for SET pluginvar=DEFAULT

  mysql-test/t/innodb_mysql.test@1.4, 2007-10-08 20:57:28+02:00, serg@janus.mylan +2 -1
    test case for SET pluginvar=DEFAULT

  sql/sql_plugin.cc@1.73.1.1, 2007-10-08 20:57:28+02:00, serg@janus.mylan +8 -2
    fixed uninit memory access in SET pluginvar=DEFAULT

ChangeSet@1.2573.4.2, 2007-10-08 20:56:43+02:00, serg@janus.mylan +1 -0
  rpl_mixed_dml.inc:
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5.1.2, 2007-10-08 20:56:27+02:00, serg@janus.mylan +2 -2
    use mysqltest builtins instead of --exec. Fixes a failing test too :)

ChangeSet@1.2573.4.1, 2007-10-08 20:55:44+02:00, serg@janus.mylan +2 -0
  Makefile.am:
    do link_sources only once

  libmysql_r/Makefile.am@1.34, 2007-10-08 20:55:22+02:00, serg@janus.mylan +1 -0
    do link_sources only once

  sql/Makefile.am@1.193, 2007-10-08 20:55:16+02:00, serg@janus.mylan +1 -0
    do link_sources only once

ChangeSet@1.2573.1.2, 2007-10-08 20:52:06+02:00, serg@janus.mylan +1 -0
  mtr_report.pl:
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

  mysql-test/lib/mtr_report.pl@1.61.1.1, 2007-10-08 20:51:33+02:00, serg@janus.mylan +10 -4
    InnoDB errors are no less important for pushbuild to monitor
    than InnoDB warnings

ChangeSet@1.2573.3.1, 2007-10-08 12:37:57-06:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  Test cleanup, the upgrade test script assumes a unix like environment

  mysql-test/t/upgrade.test@1.7, 2007-10-08 12:37:55-06:00, malff@lambda.hsd1.co.comcast.net. +5 -1
    Test cleanup, --exec mkdir does not work on windows platforms

ChangeSet@1.1810.3366.1, 2007-10-08 13:00:01-04:00, iggy@alf.(none) +1 -0
  Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
  tool error
  - Move disable manifest generation commands to more global location.

  CMakeLists.txt@1.1.27.4, 2007-10-08 13:00:00-04:00, iggy@alf.(none) +9 -8
    Bug#31289 vm-win2003-64-b build failures on PushBuild due to manifest
    tool error
    - Disable Manifests by default for VS 7 and 8.

ChangeSet@1.2541.27.3, 2007-10-08 16:10:41+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - post merge fixes

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.26, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +0 -4
    merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.42, 2007-10-08 16:10:39+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge

ChangeSet@1.2403.18.89, 2007-10-08 16:02:21+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - fix dd drop table race condition
    add list of pages being unmaped, so we can wait for it to be empty before dropping extents

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.11, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +2 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.3, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +6 -0
    add list of pages being unmaped

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.6, 2007-10-08 16:02:19+02:00, jonas@perch.ndb.mysql.com +13 -0
    wait for unmap pages

ChangeSet@1.2403.18.88, 2007-10-08 16:00:18+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Fix disk scan (backup)
    (introduced by only updating extent pages after pageout)

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@1.18.1.6, 2007-10-08 16:00:17+02:00, jonas@perch.ndb.mysql.com +1 -1
    Fix disk scan (backup)

ChangeSet@1.1810.3337.6, 2007-10-08 17:59:23+04:00, anozdrin@station. +1 -0
  Get rid of compilation warning.

  sql/sql_parse.cc@1.426.165.3, 2007-10-08 17:59:21+04:00, anozdrin@station. +2 -0
    Get rid of compilation warning.

ChangeSet@1.2403.18.87, 2007-10-08 15:58:08+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - remove extra ;
    (in test framework)

  storage/ndb/test/src/NDBT_Thread.cpp@1.2.1.1, 2007-10-08 15:58:06+02:00, jonas@perch.ndb.mysql.com +1 -1
    remove extra ;

ChangeSet@1.2403.18.86, 2007-10-08 15:57:01+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#31257
      handle partially complete LCP better in SR

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.25.2.5, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +1 -0
    remove partially complete LCP from "node" when doign removeNodeFromTable

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.100.3.9, 2007-10-08 15:56:59+02:00, jonas@perch.ndb.mysql.com +34 -1
    remove partially complete LCP from "node" when doign removeNodeFromTable

ChangeSet@1.2403.18.85, 2007-10-08 15:53:29+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#30975 (recommit to 51-telco-gca)
      - only update extent pages *after* flush of real page has been done
      - sync both create/drop of table into undolog (for disk tables)

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@1.130.2.18, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +8 -3
    inform TUP which LCP to restore each fragment to

  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@1.55.2.10, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +5 -4
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@1.21.2.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +191 -63
    1) inform TUP which LCP to restore each fragment to
    2) inform TUP both before/after a page has been written

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@1.33.2.5, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +21 -11
    log both create/drop table

  storage/ndb/src/kernel/blocks/lgman.cpp@1.23.1.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +10 -2
    let TUP know about all LCPs

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.9, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +32 -4
    add "when" argument to disk_page_unmap_callback so that TUP gets informed both before and after page writeout
      so that extent pages can be updated only *after* page has been written

  storage/ndb/src/kernel/blocks/tsman.cpp@1.13.1.2, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +38 -24
    remove lsn from update page free bits
    use wal for page vs extent relation

  storage/ndb/src/kernel/blocks/tsman.hpp@1.9, 2007-10-08 15:53:26+02:00, jonas@perch.ndb.mysql.com +9 -15
    remove lsn from update page free bits
    use wal for page vs extent relation

ChangeSet@1.2403.18.84, 2007-10-08 15:11:47+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - Set usable timeout for atrt
    (problem introduced by stew's timeout handling)

  storage/ndb/src/cw/cpcd/APIService.cpp@1.10.1.1, 2007-10-08 15:11:45+02:00, jonas@perch.ndb.mysql.com +1 -1
    Set usable timeout for atrt

ChangeSet@1.1810.3337.5, 2007-10-08 17:09:28+04:00, anozdrin@station. +1 -0
  Fix compilation warning.

  sql/sql_parse.cc@1.426.165.2, 2007-10-08 17:09:26+04:00, anozdrin@station. +1 -1
    Fix compilation warning.

ChangeSet@1.2403.18.83, 2007-10-08 15:07:58+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - fix bug in old test prg(s)
    fix SR1 and SR2

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.3, 2007-10-08 15:07:56+02:00, jonas@perch.ndb.mysql.com +3 -3
    fix SR1 and SR2

ChangeSet@1.2564.10.11, 2007-10-08 16:52:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #31438: updatexml still crashes
  
  Problem: check missed if the second updatexml() argument is valid.
  
  Fix: check it.

  mysql-test/r/xml.result@1.28, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test result.

  mysql-test/t/xml.test@1.23, 2007-10-08 16:52:13+05:00, ramil@mysql.com +11 -0
    Fix for bug #31438: updatexml still crashes
      - test case.

  sql/item_xmlfunc.cc@1.34, 2007-10-08 16:52:13+05:00, ramil@mysql.com +2 -1
    Fix for bug #31438: updatexml still crashes
      - check if the second argument passed to the updatexml() is valid.

ChangeSet@1.1810.3365.1, 2007-10-08 12:57:43+03:00, gkodinov@magare.gmz +3 -0
  Bug #31156: mysqld: item_sum.cc:918: virtual bool 
    Item_sum_distinct::setup(THD*): Assertion
  
  There was an assertion to detect a bug in ROLLUP
  implementation. However the assertion is not true
  when used in a subquery context with non-cacheable
  statements.
  Fixed by turning the assertion to accepted case
  (just like it's done for the other aggregate functions). 

  mysql-test/r/func_group.result@1.49.1.13, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +10 -0
    Bug #31156: test case

  mysql-test/t/func_group.test@1.48.1.9, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +13 -0
    Bug #31156: test case

  sql/item_sum.cc@1.170.1.43, 2007-10-08 12:57:41+03:00, gkodinov@magare.gmz +4 -1
    Bug #31156: make it OK to call setup() several times:
     done for (e.g.) scalar subquery 

ChangeSet@1.1810.3364.1, 2007-10-08 03:48:59+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #31019: the MOD() function and the % operator crash the server
  when a divisor is less than 1 and its fractional part is very long.
  For example:
  1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789;
  
  Stack buffer overflow has been fixed in the do_div_mod function.

  mysql-test/r/type_decimal.result@1.38.2.1, 2007-10-08 03:43:23+05:00, gshchepa@gleb.loc +6 -0
    Added test case for bug #31019.

  mysql-test/t/type_decimal.test@1.33.1.1, 2007-10-08 03:43:15+05:00, gshchepa@gleb.loc +8 -0
    Added test case for bug #31019.

  strings/decimal.c@1.65.1.16, 2007-10-08 03:43:04+05:00, gshchepa@gleb.loc +2 -1
    Fixed bug #31019.
    Stack buffer overflow has been fixed in the do_div_mod function:
    a value of the upper bound of the buffer was increased where
    a decrement is required.

ChangeSet@1.2564.11.2, 2007-10-06 03:01:30+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #31253: crash comparing datetime to double
  
  after-merge fixies

  mysql-test/r/type_datetime.result@1.52.1.2, 2007-10-06 03:01:25+02:00, tnurnberg@sin.intern.azundris.com +1 -1
    adjust to 5.1 warning message

ChangeSet@1.2574, 2007-10-05 20:06:41+02:00, mleich@four.local.lan +5 -0
  1. Fix for Bug#31237 Test "ndb_views" fails because of differing order of select results
  2. Cleanup of test

  mysql-test/suite/funcs_1/r/innodb_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/memory_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +162 -112
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam_views.result@1.10, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +9315 -8531
    Updated expected results

  mysql-test/suite/funcs_1/r/ndb_views.result@1.5, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +184 -134
    Updated expected results

  mysql-test/suite/funcs_1/views/views_master.inc@1.9, 2007-10-05 20:06:35+02:00, mleich@four.local.lan +294 -290
    1. Fix for Bug#31237
       Typical changes:
          - Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
          - Partially refine the SELECT on the VIEW to get a reproducible result
    2. Cleanup of test
          - replace error numbers by names
          - remove comments and workarounds dedicated to now fixed bugs
          - minor fixes or improvements in comments
          - remove trailing spaces

ChangeSet@1.1810.3363.1, 2007-10-05 19:55:00+02:00, msvensson@pilot.mysql.com +1 -0
  Fixed Bug #27789 "Wrong permissions of sql/share/language directories"

  extra/comp_err.c@1.23.1.8, 2007-10-05 19:54:58+02:00, msvensson@pilot.mysql.com +1 -0
    Override my_mkdir() umask setting. The default is 0700 which perfectly 
    makes sense for the server but leads to Bug #27789 when applied to comp_err
    generated directories in the souce tree. Generated directories and the
    files within won't be accessible to other users, sometimes including root 
    if on a non-local filesystem, making "sudo make install" fail.

ChangeSet@1.1810.3305.14, 2007-10-05 19:28:09+02:00, msvensson@shellback.(none) +1 -0
  Update test case to allow the .reject file to be in either var/log or r/

  mysql-test/t/mysqltest.test@1.24.1.45, 2007-10-05 19:28:07+02:00, msvensson@shellback.(none) +3 -0
    Update test case to allow the .reject file to be in either var/log or r/

ChangeSet@1.1810.3305.13, 2007-10-05 19:23:44+02:00, msvensson@shellback.(none) +2 -0
  Bug#27753 enable mysql-test-run.pl to ignore tests based on wildcard

  mysql-test/lib/mtr_cases.pl@1.12.1.30, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +25 -3
    Allow --skip-test and --do-test to take a perl regex

  mysql-test/mysql-test-run.pl@1.30.49.106, 2007-10-05 19:23:42+02:00, msvensson@shellback.(none) +6 -2
    Update usage for --skip-test and --do-test

ChangeSet@1.1810.3360.2, 2007-10-05 13:16:54-04:00, cmiller@zippy.cornsilk.net +14 -0
  Change URLs.
  
  Our web server has been restructured several times, and references
  to it in our source code has stayed the same.  This patch from Paul
  DuBois updates all URLs to modern semantics.

  debian/po/ca.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/cs.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/da.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/gl.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/ja.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/pt_BR.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/sv.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  debian/po/tr.po@1.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  mysql-test/lib/mtr_report.pl@1.21.3.6, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  mysql-test/mysql-test-run-shell.sh@1.262.22.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  netware/mysql_test_run.c@1.18.2.2, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  scripts/mysqld_safe.sh@1.80.1.4, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

  sql/mysqld.cc@1.439.129.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +2 -2
    Change URLs.

  ndb/include/ndbapi/Ndb.hpp@1.39.15.1, 2007-10-05 13:16:51-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change URLs.

ChangeSet@1.1810.3305.12, 2007-10-05 18:36:23+02:00, msvensson@shellback.(none) +1 -0
  Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error

  mysql-test/mysql-test-run.pl@1.30.49.105, 2007-10-05 18:36:18+02:00, msvensson@shellback.(none) +1 -1
    Just pass the $opt_valgrind_options to mtr_add_arg - it does a
    "push(@$args, sprintf($format, @fargs));" behind the scenes 

ChangeSet@1.2564.10.6, 2007-10-05 18:24:48+02:00, msvensson@shellback.(none) +1 -0
  Remove printout

  mysql-test/lib/mtr_cases.pl@1.67, 2007-10-05 18:24:42+02:00, msvensson@shellback.(none) +0 -2
    Remove printout

ChangeSet@1.2564.10.5, 2007-10-05 18:22:28+02:00, msvensson@shellback.(none) +1 -0
  Update for 5.1 format of dirname_part

  client/mysqltest.c@1.317, 2007-10-05 18:22:24+02:00, msvensson@shellback.(none) +2 -2
    Update for 5.1 format of dirname_part

ChangeSet@1.1810.3305.11, 2007-10-05 18:18:50+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run, part2
  Write .reject file to r/ if it's writable else use opt_logdir 

  client/mysqltest.c@1.155.9.118, 2007-10-05 18:18:47+02:00, msvensson@shellback.(none) +15 -4
    Write .reject file to r/ if it's writable else use opt_logdir 

ChangeSet@1.1810.3305.10, 2007-10-05 17:54:19+02:00, msvensson@shellback.(none) +1 -0
  Bug#31398 problems with mysql-test-run
   - "mysqld --verbose --help" need to be started in a writable directory 

  mysql-test/mysql-test-run.pl@1.30.49.104, 2007-10-05 17:54:16+02:00, msvensson@shellback.(none) +3 -2
    Create a tmpdir where mysqld can peform it's lowercase or uppercase test

ChangeSet@1.2541.26.1, 2007-10-05 17:28:34+03:00, gkodinov@magare.gmz +7 -0
  Bug #31094: Forcing index-based sort doesn't work anymore if joins are done
  
  A rule was introduced by the 5.1 part of the fix for bug 27531 to 
  prefer filesort over indexed ORDER BY when accessing all of the rows of a 
  table (because it's faster). This new rule was not accounting for the 
  presence of a LIMIT clause.
  Fixed the condition for this rule so it will prefer filesort over 
  indexed ORDER BY only if no LIMIT.

  mysql-test/r/compress.result@1.12, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/join.result@1.50, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +164 -0
    Bug #31094: test case

  mysql-test/r/select.result@1.167, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl.result@1.10, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/r/ssl_compress.result@1.10, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +2 -2
    Bug #31094: LIMIT is not considered a full index scan

  mysql-test/t/join.test@1.43, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +29 -0
    Bug #31094: test case

  sql/sql_select.cc@1.562.1.6, 2007-10-05 17:28:31+03:00, gkodinov@magare.gmz +6 -6
    Bug #31094: prefer filesort over indexed ORDER BY only if no LIMIT

ChangeSet@1.2564.12.1, 2007-10-05 14:42:38+02:00, msvensson@shellback.(none) +1 -0
  Bug#31400 mysql-test-run inconvenience problems running a certain test
   - Allow test case names to be specied in various different ways

  mysql-test/lib/mtr_cases.pl@1.66, 2007-10-05 14:42:34+02:00, msvensson@shellback.(none) +83 -63
    Allow test name to be specified in all sorts of ways:
    mysql-test-run alias
    mysql-test-run alias.test
    mysql-test-run main.alias
    mysql-test-run main.alias.test
    mysql-test-run t/alias
    mysql-test-run t/alias.test

ChangeSet@1.2528.231.1, 2007-10-05 16:35:01+04:00, anozdrin@station. +4 -0
  Fix for BUG#20550: Stored function: wrong RETURN type metadata
  when used in a VIEW.
  
  The problem was that wrong function (create_tmp_from_item())
  was used to create a temporary field for Item_func_sp.
  
  The fix is to use create_tmp_from_field().

  mysql-test/r/sp.result@1.292.1.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +49 -1
    Update result file.

  mysql-test/t/sp.test@1.256.1.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +84 -0
    Add a test case for BUG#20550.

  sql/item_func.h@1.167.1.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +5 -0
    Add a getter for Item_func_sp::sp_result_field.

  sql/sql_select.cc@1.555.3.1, 2007-10-05 16:34:58+04:00, anozdrin@station. +30 -0
    Use create_tmp_from_field() to create a temporary field
    for Item_func_sp.

ChangeSet@1.1810.3291.7, 2007-10-05 16:33:15+05:00, ramil@mysql.com +3 -0
  Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
  
  Problem: creating an rb-tree key we store length (2 bytes) before the actual data for 
  varchar key parts. The fact was missed for NULL key parts, when we set NULL byte and 
  skip the rest.
  
  Fix: take into account the length of the varchar key parts for NULLs.

  mysql-test/r/heap_btree.result@1.18.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +8 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      -test result.

  mysql-test/t/heap_btree.test@1.20.3.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +9 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - test case.

  heap/hp_hash.c@1.38.11.1, 2007-10-05 16:33:14+05:00, ramil@mysql.com +6 -0
    Fix for bug #30885: MEMORY returns incorrect data if BTREE index is used for NULL lookup
      - skip varchar key parts length (2 byte) for null key parts.

ChangeSet@1.1616.3103.1, 2007-10-05 15:40:32+05:00, holyfoot@mysql.com +4 -0
  Bug #30286 spatial index cause corruption and server crash!
  
  As the result of DOUBLE claculations can be bigger
  than DBL_MAX constant we use in code, we shouldn't use this constatn
  as a biggest possible value.
  Particularly the rtree_pick_key function set 'min_area= DBL_MAX' relying
  that any rtree_area_increase result will be less so we return valid
  key. Though in rtree_area_increase function we calculate the area
  of the rectangle, so the result can be 'inf' if the rectangle is
  huge enough, which is bigger than DBL_MAX.
  
  Code of the rtree_pick_key modified so we always return a valid key.

  mysql-test/r/gis-rtree.result@1.8.1.8, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +31 -0
    Bug #30286 spatial index cause corruption and server crash!
    test result

  mysql-test/t/gis-rtree.test@1.9.1.7, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +36 -0
    Bug #30286 spatial index cause corruption and server crash!
    test case

  myisam/rt_index.c@1.16.6.4, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +5 -13
    Bug #30286 spatial index cause corruption and server crash!
    
    always set the best_key with the first key we get, so we always return
    somthing valid.

  myisam/rt_mbr.c@1.9.4.1, 2007-10-05 15:40:31+05:00, holyfoot@mysql.com +4 -1
    Bug #30286 spatial index cause corruption and server crash!
    
    function comment extended

ChangeSet@1.1810.3361.1, 2007-10-05 12:08:38+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug #31253: crash comparing datetime to double
  
  convert(<invalid time>, datetime) in WHERE caused crash as function
  returned (void*)NULL, but did not flag SQL NULL. It does now.

  mysql-test/r/type_datetime.result@1.30.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +9 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  mysql-test/t/type_datetime.test@1.18.8.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +10 -0
    show that convert() to datetime in a WHERE-clause will no longer crash
    the server on invalid input.

  sql/item.cc@1.113.98.1, 2007-10-05 12:08:36+02:00, tnurnberg@sin.intern.azundris.com +1 -0
    When failing to process time values, do not just return (void*)NULL,
    but flag SQL NULL as well so no caller will try to process the 0x0L.
    This makes behaviour for Item::Item::val_decimal_from_date() and
    Item::Item::val_decimal_from_time() identical.

ChangeSet@1.1810.3359.1, 2007-10-05 09:38:57+02:00, tnurnberg@sin.intern.azundris.com +3 -0
  Bug#31227: memory overrun with decimal (6,6) and zerofill and group_concat
  
  Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.

  mysql-test/r/type_decimal.result@1.38.1.6, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +8 -0
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].

  mysql-test/t/type_decimal.test@1.34, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +12 -1
    show that we allocate a large enough buffer for output of DECIMAL(a,a) [ZEROFILL].
    without patch for bug#31227, valgrind will complain here; so will a
    debug build.

  sql/my_decimal.cc@1.11.3.2, 2007-10-05 09:38:55+02:00, tnurnberg@sin.intern.azundris.com +29 -10
    Reserve the space for the leading 0 (before the decimal point) in DECIMAL(a,a) ZEROFILL.
    Doxygenise preamble of my_decimal2string().

ChangeSet@1.1810.3354.2, 2007-10-05 12:29:02+05:00, gluh@mysql.com +2 -0
  test fix(to satisfy WIN)

  mysql-test/r/information_schema.result@1.87.1.40, 2007-10-05 12:29:01+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/t/information_schema.test@1.65.1.31, 2007-10-05 12:29:01+05:00, gluh@mysql.com +2 -2
    test fix(to satisfy WIN)

ChangeSet@1.1810.3358.1, 2007-10-05 12:15:11+05:00, bar@mysql.com +11 -0
  Bug#31081 server crash in regexp function
  Problem: The "regex" library written by Henry Spencer
  does not support tricky character sets like UCS2.
  Fix: convert tricky character sets to UTF8 before calling
  regex functions.

  mysql-test/include/ctype_regex.inc@1.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +42 -0
    New BitKeeper file ``mysql-test/include/ctype_regex.inc''
    
    Moving common regular expression tests into a separate
    file and uncluding it into func_regexp and into many ctype_xxx tests.
    

  mysql-test/include/ctype_regex.inc@1.0, 2007-10-05 12:15:09+05:00, bar@mysql.com +0 -0

  mysql-test/r/ctype_uca.result@1.19.1.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_ucs.result@1.39.1.17, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/ctype_utf8.result@1.85.1.23, 2007-10-05 12:15:09+05:00, bar@mysql.com +45 -0
    Adding tests

  mysql-test/r/func_regexp.result@1.10.1.2, 2007-10-05 12:15:09+05:00, bar@mysql.com +13 -1
    Adding tests

  mysql-test/t/ctype_uca.test@1.17.2.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_ucs.test@1.36.1.18, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding tests

  mysql-test/t/ctype_utf8.test@1.84.1.15, 2007-10-05 12:15:09+05:00, bar@mysql.com +7 -0
    Adding tests

  mysql-test/t/func_regexp.test@1.10, 2007-10-05 12:15:09+05:00, bar@mysql.com +2 -21
    Adding tests

  sql/item_cmpfunc.cc@1.187.42.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +72 -50
    - Adding new method Item_func_regex::regcomp()
    to share more code between fix_fields() and val_int()
    - Adding conversion from ASCII-incompatible charsets like UCS2
    to UTF8, because the "regexp" does not support these charsets
    - Additional optimization: calculate flags for regcomp only
      once in fix_fields, instead of every regcomp()

  sql/item_cmpfunc.h@1.122.22.1, 2007-10-05 12:15:09+05:00, bar@mysql.com +4 -0
    Adding prototypes for new members and methods

ChangeSet@1.2541.24.2, 2007-10-04 17:34:28-07:00, acurtis@xiphis.org +1 -0
  fix undefined variable which can lead to crash

  sql/sql_plugin.cc@1.75, 2007-10-04 17:34:23-07:00, acurtis@xiphis.org +3 -2
    fix undefined variable which can lead to crash

ChangeSet@1.1810.3357.1, 2007-10-04 17:34:41-03:00, davi@moksha.local +1 -0
  Bug#21587 FLUSH TABLES causes server crash when used with HANDLER statements
  
  This bug is a symptom of the way handler's tables are managed. The
  most different aspect, compared to the conventional behavior, is that
  the handler's tables are long lived, meaning that their lifetimes are
  not bounded by the duration of the command that opened them. For this
  effect the handler code uses its own list (handler_tables instead of
  open_tables) to hold open handler tables so that the tables won't be
  closed at the end of the command/statement. Besides the handler_tables
  list, there is a hash (handler_tables_hash) which is used to associate
  handler aliases to tables and to refresh the tables upon demand (flush
  tables).
  
  The current implementation doesn't work properly with refreshed tables
  -- more precisely when flush commands are issued by other initiators.
  This happens because when a handler open or read statement is being
  processed, the associated table has to be opened or locked and, for this
  matter, the open_tables and handler_tables lists are swapped so that the
  new table being opened is inserted into the handler_tables list. But when
  opening or locking the table, if the refresh version is different from the
  thread refresh version then all used tables in the open_tables list (now
  handler_tables) are refreshed. In the "refreshing" process the handler
  tables are flushed (closed) without being properly unlinked from the
  handler hash.
  
  The current implementation also fails to properly discard handlers of
  dropped tables, but this and other problems are going to be addressed
  in the fixes for bugs 31397 and 31409.
  
  The chosen approach tries to properly save and restore the table state
  so that no table is flushed during the table open and lock operations.
  The logic is almost the same as before with the list swapping, but with
  a working glue code.
  
  The test case for this bug is going to be committed into 5.1 because it
  requires a test feature only avaiable in 5.1 (wait_condition).

  sql/sql_handler.cc@1.72.1.20, 2007-10-04 17:34:38-03:00, davi@moksha.local +41 -12
    Backup and reset the open_tables and handler_table lists when opening
    a new handler table and merge the opened table into the handler_tables
    list afterwards. When locking, do the same but possibly close the table
    if a refresh is pending.

ChangeSet@1.2541.24.1, 2007-10-04 10:55:08-07:00, acurtis@xiphis.org +3 -0
  Bug#31382
    "Disabled plugin is provoking Valgrind error"
    If there are any auto-alloced string plug-in options, memory is
    allocated during the call for handle_options(). We must free this
    memory if we are not installing the plug-in.

  include/my_getopt.h@1.24, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +1 -0
    bug31382
      new function: my_cleanup_options()

  mysys/my_getopt.c@1.73.1.1, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +43 -3
    bug31382
      new function: my_cleanup_options(), fini_one_value()
      alter init_variables() to take an extra option.
      forward declare init_one_value() and fini_one_value()

  sql/sql_plugin.cc@1.74, 2007-10-04 10:55:05-07:00, acurtis@xiphis.org +7 -3
    bug31382
      after calling handle_options(), make sure to call my_cleanup_options()
      if we are not installing the plug-in.

ChangeSet@1.2541.21.7, 2007-10-04 19:46:01+02:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - wl#29390 post-merge 5.0 to 5.1

  storage/ndb/src/ndbapi/ndberror.c@1.96, 2007-10-04 19:44:53+02:00, pekka@sama.ndb.mysql.com +1 -0
    wl#29390 post-merge 5.0 to 5.1

ChangeSet@1.1810.3356.1, 2007-10-04 18:46:31+03:00, aelkin@koti.dsl.inet.fi +5 -0
  Bug #29309 Incorrect "Seconds_Behind_Master" value in SHOW SLAVE STATUS after FLUSH LOGS
  
  Report claims that Seconds_behind_master behaves unexpectedly. 
  
  Code analysis shows that there is an evident flaw in that treating of FormatDescription event is wrong
  so  that after FLUSH LOGS on slave the Seconds_behind_master's calculation slips and incorrect
  value can be reported to SHOW SLAVE STATUS. 
  Even worse is that the gap between the correct and incorrect deltas grows with time.
  
  Fixed with prohibiting changes to rpl->last_master_timestamp by artifical events (any kind of).
  suggestion as comments is added how to fight with lack of info on the slave side by means of
  new heartbeat feature coming.
  
  The test can not be done ealily fully determistic.

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +121 -0
    result are not deterministic though there are comments saying the most probable expected
    value for Seconds_behind_master

  mysql-test/suite/manual/r/rpl_replication_delay.result@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +1 -0
    bug emulation

  mysql-test/suite/manual/t/rpl_replication_delay-slave.opt@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.1, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +71 -0
    specic test for bug#29309. It's hard to make it reliable as it deals with timestamps.
    (a way to automate the test like this is to have I_S table for show slave status' fields)
    
    A possible way to check results is to run
    grep -i 'show\|seconds' < suite/manual/r/rpl_replication_delay.reject and to get the lines like these:
    
    show slave status /* Second_behind reports 0 */;;
    Seconds_Behind_Master   0
    show slave status /* bug emulated: reports slave threads starting time about 3*3 not 3 secs */;;
    Seconds_Behind_Master   9
    show slave status /* reports the correct diff with master query time about 3+3 secs */;;
    Seconds_Behind_Master   6
    
    Due to time discreteness of time the reported numbers may slightly vary. That's why the test is not reliable.
     

  mysql-test/suite/manual/t/rpl_replication_delay.test@1.0, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/log_event.cc@1.174.1.64, 2007-10-04 18:46:28+03:00, aelkin@koti.dsl.inet.fi +31 -1
    changing timestamp is affirmed only by non-artificial events. Artifical FD won't change it anymore.
    The simulation code is off unless server is started with the args from the opt-file.
    The simulation code assumes that it will execute specific schedule generated by rpl_replication_delay.test.

  sql/slave.cc@1.241.1.61, 2007-10-04 18:46:29+03:00, aelkin@koti.dsl.inet.fi +10 -1
    Comments are changed to announce a new possibility to cope with
    Seconds_behind_master jumping due to EOF special treatment (reset of the timestamp)

ChangeSet@1.1810.3339.2, 2007-10-04 16:08:13+02:00, df@pippilotta.erinye.com +3 -0
  apply patch for bug#31035 to 5.0.50 release clone

  mysql-test/r/sp.result@1.170.28.29, 2007-10-04 16:08:11+02:00, df@pippilotta.erinye.com +176 -0
    apply patch for bug#31035

  mysql-test/t/sp.test@1.174.28.26, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +290 -0
    apply patch for bug#31035

  sql/item_func.cc@1.270.78.1, 2007-10-04 16:08:12+02:00, df@pippilotta.erinye.com +11 -2
    apply patch for bug#31035

ChangeSet@1.1810.3355.1, 2007-10-04 17:19:14+04:00, anozdrin@station. +3 -0
  Fix for BUG#31035: select from function, group by result crasher.
  
  This actually, fix for the patch for bug-27354. The problem with
  the patch was that Item_func_sp::used_tables() was updated, but
  Item_func_sp::const_item() was not. So, for Item_func_sp, we had
  the following inconsistency:
    - used_tables() returned RAND_TABLE, which means that the item
      can produce "random" results;
    - but const_item() returned TRUE, which means that the item is
      a constant one.
  
  The fix is to change Item_func_sp::const_item() behaviour: it must
  return TRUE (an item is a constant one) only if a stored function
  is deterministic and each of its arguments (if any) is a constant
  item.

  mysql-test/r/sp.result@1.170.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +176 -0
    Update result file.

  mysql-test/t/sp.test@1.174.49.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +290 -0
    Add test cases for BUG-31035, BUG-31191, BUG-31226

  sql/item_func.cc@1.270.77.1, 2007-10-04 17:19:13+04:00, anozdrin@station. +11 -2
    Make Item::const_item() be consistent with Item::used_tables().

ChangeSet@1.2564.3.4, 2007-10-04 14:56:33+02:00, mattiasj@mattiasj-laptop.(none) +3 -0
  Bug #30484: Partitions: crash with self-referencing trigger
  
  Two cases in ha_partition::extra() was missing
  (HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH)
  which only is currently used by NDB (which not uses ha_partition)

  mysql-test/r/partition.result@1.69, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +4 -0
    Added result for test of Bug #30484

  mysql-test/t/partition.test@1.63, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +9 -0
    Added test for Bug #30484

  sql/ha_partition.cc@1.103.1.2, 2007-10-04 14:56:29+02:00, mattiasj@mattiasj-laptop.(none) +18 -0
    Added HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH
    in ha_partition::extra to do nothing
    (Only currently used in NDB, which is not dependent of ha_partition)

ChangeSet@1.2541.22.4, 2007-10-04 17:08:59+05:00, gluh@mysql.com +1 -0
  after merge fix

  sql/sql_parse.cc@1.700.4.2, 2007-10-04 17:08:57+05:00, gluh@mysql.com +2 -2
    after merge fix

ChangeSet@1.1810.3354.1, 2007-10-04 16:20:56+05:00, gluh@mysql.com +3 -0
  Bug#30079 A check for "hidden" I_S tables is flawed
  added check for hidden I_S tables for 'show columns|keys' commands

  mysql-test/r/information_schema.result@1.87.1.39, 2007-10-04 16:20:54+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.65.1.30, 2007-10-04 16:20:54+05:00, gluh@mysql.com +9 -0
    test case

  sql/sql_parse.cc@1.426.164.1, 2007-10-04 16:20:54+05:00, gluh@mysql.com +6 -1
    added check for hidden I_S tables for 'show columns|keys' commands

ChangeSet@1.2541.22.2, 2007-10-04 15:35:45+05:00, gluh@mysql.com +4 -0
  after merge fix

  client/client_priv.h@1.74.2.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +2 -3
    after merge fix

  client/mysqldump.c@1.291.6.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +1 -1
    after merge fix

  mysql-test/r/mysqldump.result@1.159.2.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +29 -146
    after merge fix

  mysql-test/r/view_grant.result@1.36.1.2, 2007-10-04 15:35:43+05:00, gluh@mysql.com +13 -11
    after merge fix

ChangeSet@1.1616.3102.1, 2007-10-04 14:22:35+04:00, kaa@polly.(none) +3 -0
  Backport of the 5.0 patch to 4.1
  
  Bug#28878: InnoDB tables with UTF8 character set and indexes cause  wrong result for DML
  When making key reference buffers over CHAR fields whitespace (0x20) must be used to fill in the remaining space in the field's buffer. This is what Field_string::store() does. Fixed Field_string::get_key_image() to do the same.

  mysql-test/t/innodb_mysql.test@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +32 -0
    Bug#28878: test case

  mysql-test/r/innodb_mysql.result@1.3.3.7, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +36 -0
    Bug#28878: test case

  sql/field.cc@1.197.1.40, 2007-10-04 14:22:30+04:00, kaa@polly.(none) +2 -1
    Bug#28878: Fill with space instead of binary zeros.

ChangeSet@1.2564.5.6, 2007-10-04 13:13:04+03:00, aelkin@koti.dsl.inet.fi +1 -0
  manual merge

  sql/log.h@1.31, 2007-10-04 13:12:58+03:00, aelkin@koti.dsl.inet.fi +7 -1
    manual merge: moving 5.0 hunk into the correct file.

ChangeSet@1.1810.3202.16, 2007-10-04 11:32:49+02:00, pekka@sama.ndb.mysql.com +10 -0
  ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it

  mysql-test/r/ndb_condition_pushdown.result@1.15.1.8, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +22 -0
    if ScanFilter is too large, abort or optionaly discard it

  mysql-test/t/ndb_condition_pushdown.test@1.16.1.5, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1025 -0
    if ScanFilter is too large, abort or optionaly discard it

  sql/ha_ndbcluster_cond.cc@1.4.1.2, 2007-10-04 10:52:14+02:00, pekka@sama.ndb.mysql.com +17 -3
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/kernel/signaldata/ScanTab.hpp@1.13.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/Ndb.hpp@1.39.14.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +1 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/NdbScanFilter.hpp@1.7.2.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +27 -2
    if ScanFilter is too large, abort or optionaly discard it

  ndb/include/ndbapi/ndbapi_limits.h@1.7.3.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanFilter.cpp@1.8.8.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +187 -21
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/NdbScanOperation.cpp@1.66.33.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +4 -0
    if ScanFilter is too large, abort or optionaly discard it

  ndb/src/ndbapi/ndberror.c@1.30.41.1, 2007-10-04 10:52:13+02:00, pekka@sama.ndb.mysql.com +2 -1
    if ScanFilter is too large, abort or optionaly discard it

ChangeSet@1.1810.3353.1, 2007-10-04 11:30:30+02:00, jperkin@production.mysql.com +3 -0
  Restore creation of test databases and the anonymous user which
  were accidentally removed during a previous rototill of this
  code.  Fixes bug#27692.
    
  While it can be argued we should strive to provide a 'secure by
  default' installation, this happens to be the setup currently
  documented in the manual as the default, so defer changes that
  improve security out of the box to a co-ordinated effort later
  on.
    
  For now, make a note about the test databases and anonymous user
  in mysql_install_db and recommend that mysql_secure_installation
  be ran for users wishing to remove these defaults.
  
  [..re-commit of previously lost change..]

  mysql-test/mysql-test-run.pl@1.30.94.1, 2007-10-04 11:28:01+02:00, jperkin@production.mysql.com +1 -0
    Add a comment where removing anonymous users.

  scripts/mysql_install_db.sh@1.64.1.36, 2007-09-24 15:40:38+02:00, jperkin@production.mysql.com +9 -0
    Point users at the mysql_secure_installation script.

  scripts/mysql_system_tables_data.sql@1.1.1.3, 2007-09-24 15:36:05+02:00, jperkin@production.mysql.com +2 -0
    Add anonymous accounts.

ChangeSet@1.1810.3291.6, 2007-10-04 12:34:00+04:00, kaa@polly.(none) +4 -0
  Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
  
  This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.

  mysql-test/r/variables.result@1.76.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +2 -0
    Fixed the test.

  mysql-test/t/variables.test@1.51.1.17, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +1 -0
    Fixed the test.

  mysys/my_getopt.c@1.55.1.8, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +16 -0
    Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.

  sql/set_var.cc@1.125.32.1, 2007-10-04 12:33:56+04:00, kaa@polly.(none) +15 -0
    Issue an SQL warning if a user assignes a value greater than the variable's maximum value.

ChangeSet@1.1810.3336.8, 2007-10-04 13:06:01+05:00, bar@mysql.com +3 -0
  Bug#29323 mysql client only accetps ANSI encoded files
  Fix: ignore BOM marker in the first line.

  client/mysql.cc@1.199.29.1, 2007-10-04 13:05:59+05:00, bar@mysql.com +11 -0
    Skip BOM marker in the very first line.

  mysql-test/r/mysql.result@1.17.2.15, 2007-10-04 13:05:59+05:00, bar@mysql.com +2 -0
    Adding test

  mysql-test/t/mysql.test@1.4.1.29, 2007-10-04 13:05:59+05:00, bar@mysql.com +9 -0
    Adding test

ChangeSet@1.1810.3281.2, 2007-10-04 09:15:26+02:00, mhansson@linux-st28.site +3 -0
  Bug #30942: select str_to_date from derived table returns varying results
  
  The function str_to_date has a field to say whether it's invoked constant 
  arguments. But this member was not initialized, causing the function to
  think that it could use a cache of the format type when said cache was in 
  fact not initialized.
  Fixed by initializing the field to false.

  mysql-test/r/type_date.result@1.13.4.2, 2007-10-04 09:15:24+02:00, mhansson@linux-st28.site +10 -0
    Bug#30942: Test result

  mysql-test/t/type_date.test@1.14.3.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +13 -0
    Bug#30942: Test case

  sql/item_timefunc.h@1.63.5.2, 2007-10-04 09:15:25+02:00, mhansson@linux-st28.site +1 -1
    Bug#30942: Initialized const_item to false

ChangeSet@1.1810.3348.2, 2007-10-04 12:09:22+05:00, ramil@mysql.com +5 -0
  merging: results adjusted

  mysql-test/r/ctype_big5.result@1.15, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_euckr.result@1.2.1.2, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gb2312.result@1.4, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_gbk.result@1.6, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

  mysql-test/r/ctype_uca.result@1.21, 2007-10-04 12:09:20+05:00, ramil@mysql.com +2 -0
    merging: results adjusted

ChangeSet@1.1810.3350.1, 2007-10-04 12:01:28+05:00, holyfoot@mysql.com +4 -0
  Bug #31155 gis types in union'd select cause crash.
  
  We use get_geometry_type() call to decide the exact type
  of a geometry field to be created (POINT, POLYGON etc)
  Though this function was only implemented for few items.
  In the bug's case we need to call this function for the
  Item_sum instance, where it was not implemented, what is
  the reason of the crash.
  Fixed by implementing virtual Item::get_geometry_type(),
  so it can be called for any Item.

  sql/item.cc@1.113.1.170, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -8
    Bug #31155 gis types in union'd select cause crash.
    
    Unified virtual ::get_geometry_type() function used

  sql/item.h@1.183.40.1, 2007-10-04 11:51:56+05:00, holyfoot@mysql.com +4 -2
    Bug #31155 gis types in union'd select cause crash.
    virtual Item::geometry_type() added instead of
    various geometry_type() fucntions.

  sql/item_geofunc.cc@1.27.1.5, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +7 -11
    Bug #31155 gis types in union'd select cause crash.
    
    virtual Item::geometry_type() implemented for geo-Items.
    Mostly previous ::get_geometry_type() implementation changed

  sql/item_geofunc.h@1.13.1.3, 2007-10-04 12:01:26+05:00, holyfoot@mysql.com +3 -4
    Bug #31155 gis types in union'd select cause crash.
    
    get_geometry_type() declarations unified

ChangeSet@1.1616.3100.1, 2007-10-04 08:27:03+02:00, tnurnberg@sin.intern.azundris.com +1 -0
  Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
  
  The combination of --single-transaction and --master-data requires
  START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
  mysqld 4.1 on. When trying this against an older server, print
  diagnostic, then, if --force is not given, abort.
  
  No test-case given since it would require a mysqld < 4.1.

  client/mysqldump.c@1.143.15.1, 2007-10-04 08:27:01+02:00, tnurnberg@sin.intern.azundris.com +12 -0
    Bug #30444: 5.0 mysqldump silently allows wrong backup to be taken against a 4.0 database
    
    The combination of --single-transaction and --master-data requires
    START TRANSACTION WITH CONSISTENT SNAPSHOT which is available from
    mysqld 4.1 on. When trying this against an older server, print
    diagnostic, then, if --force is not given, abort.

ChangeSet@1.1616.3099.1, 2007-10-04 10:20:00+05:00, ramil@mysql.com +11 -0
  Fix for bug #31069: crash in 'sounds like'
  and for bug #31070: crash during conversion of charsets
  
  Problem: passing a 0 byte length string to some my_mb_wc_XXX() 
  functions leads to server crash due to improper argument check.
  
  Fix: properly check arguments passed to my_mb_wc_XXX() functions.

  strings/ctype-cp932.c@1.1.9.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  mysql-test/include/ctype_common.inc@1.3, 2007-10-04 10:19:59+05:00, ramil@mysql.com +9 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test case.

  mysql-test/r/ctype_big5.result@1.11.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_euckr.result@1.2.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gb2312.result@1.3, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_gbk.result@1.3.1.1, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  mysql-test/r/ctype_uca.result@1.13.1.2, 2007-10-04 10:19:59+05:00, ramil@mysql.com +11 -0
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - test result.

  strings/ctype-big5.c@1.67.1.14, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-euc_kr.c@1.59.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-gb2312.c@1.56.1.4, 2007-10-04 10:19:59+05:00, ramil@mysql.com +1 -3
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

  strings/ctype-sjis.c@1.72.1.11, 2007-10-04 10:19:59+05:00, ramil@mysql.com +2 -2
    Fix for bug #31069: crash in 'sounds like'
    and bug #31070: crash during conversion of charsets
      - check the string length before testing its first byte.

ChangeSet@1.1810.3347.1, 2007-10-03 21:38:32+02:00, msvensson@pilot.mysql.com +2 -0
  Bug#30992 Wrong implementation of pthread_mutex_trylock()
  It's not possible to use WaitForSingleObject to wait
  on a CRITICAL_SECTION, instead use the TryEnterCriticalSection function.
   - if "mutex" was already taken => return EBUSY
   - if "mutex" was aquired => return 0

  include/config-win.h@1.71.1.15, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +3 -0
    Make windows.h define TryEnterCriticalSection

  mysys/my_winthread.c@1.15, 2007-10-03 21:38:30+02:00, msvensson@pilot.mysql.com +10 -12
    Use the TryEnterCriticalSection function to implement pthread_mutex_trylock
    Prevent recursive behaviour by looking at the RecursionCount variable
    in the CRITICAL_SECTION struct and return EBUSY from function if
    the mutex was already locked once.

ChangeSet@1.2541.1.40, 2007-10-03 15:49:51+05:00, gshchepa@gleb.loc +1 -0
  mysqldump.c:
    Post-merge fix.

  client/mysqldump.c@1.291.5.2, 2007-10-03 15:49:31+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

ChangeSet@1.1810.3336.6, 2007-10-03 11:57:14+02:00, sven@murkla.(none) +2 -0
  BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)
  Problem: one thread could read uninitialized memory from (the stack of) another
  thread.
  Fix: swapped order of initializing the memory and making it available to the
  other thread.
  Fix: put lock around the statement that makes the memory available to the other
  thread.
  Fix: all fields of the struct are now initialized in the constructor, to avoid
  future problems.

  sql/sql_class.h@1.230.79.1, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +7 -1
    Initialize all members in constructor for more safe future code.

  sql/sql_repl.cc@1.133.1.30, 2007-10-03 11:57:12+02:00, sven@murkla.(none) +8 -2
    Swap order so that linfo is first initialized, then assigned, instead of the
    other way around.
    Put a lock around the assignment. We use LOCK_thread_count since log_in_use
    uses it: log_in_use may be running concurrently, called from
    MYSQL_LOG::purge_logs.

ChangeSet@1.1616.3098.1, 2007-10-03 13:35:35+05:00, holyfoot@mysql.com +3 -0
  Bug #30955 geomfromtext() crasher.
  
  end-of-line check missed in Gis_read_stream::get_next_word,
  what can lead to crashes (expecially with NULL strings).
  
  End-of-line check added

  mysql-test/r/gis.result@1.15.1.11, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +6 -0
    Bug #30955 geomfromtext() crasher.
    
    test result

  mysql-test/t/gis.test@1.17.1.7, 2007-10-03 13:35:33+05:00, holyfoot@mysql.com +8 -0
    Bug #30955 geomfromtext() crasher.
    
    test case

  sql/gstream.cc@1.7.1.1, 2007-10-03 13:30:31+05:00, holyfoot@mysql.com +1 -1
    Bug #30955 geomfromtext() crasher

ChangeSet@1.2541.9.11, 2007-10-03 09:54:33+02:00, mskold@mysql.com +1 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

  sql/ha_ndbcluster.cc@1.467.3.4, 2007-10-03 09:53:49+02:00, mskold@mysql.com +8 -7
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1

ChangeSet@1.1810.3342.2, 2007-10-03 09:29:10+02:00, mskold@mysql.com +1 -0
  Removed tabs

  sql/ha_ndbcluster.cc@1.175.86.2, 2007-10-03 09:28:09+02:00, mskold@mysql.com +2 -2
    Removed tabs

ChangeSet@1.2541.21.5, 2007-10-03 17:26:17+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29509 ndb_mgm help needs to list the -a option for DN restart
  
  Index: ndb/storage/ndb/src/mgmclient/CommandInterpreter.cpp
  ===================================================================

  storage/ndb/src/mgmclient/CommandInterpreter.cpp@1.98, 2007-08-14 14:58:43+10:00, stewart@flamingspork.com +7 -5
    BUG#29509 ndb_mgm help needs to list the -a option for DN restart

ChangeSet@1.2541.21.4, 2007-10-03 17:26:03+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 make formatting of key=value consistent in getTextTransReportCounters
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.45, 2007-08-14 14:49:39+10:00, stewart@flamingspork.com +1 -1
    BUG#25064 make formatting of key=value consistent in getTextTransReportCounters

ChangeSet@1.2541.21.3, 2007-10-03 17:25:46+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#25064 Remove newlines from cluster log
  
  Index: ndb/storage/ndb/src/common/debugger/EventLogger.cpp
  ===================================================================

  storage/ndb/src/common/debugger/EventLogger.cpp@1.44, 2007-08-14 14:47:54+10:00, stewart@flamingspork.com +5 -5
    BUG#25064 Remove newlines from cluster log

ChangeSet@1.1810.3340.3, 2007-10-03 11:36:42+05:00, gshchepa@gleb.loc +2 -0
  mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.49, 2007-10-03 11:36:20+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.48, 2007-10-03 11:36:18+05:00, gshchepa@gleb.loc +2 -2
    Bug #31077: post-commit fix.

ChangeSet@1.1810.3202.15, 2007-10-03 16:16:48+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#29565 managment server can log entries multiple times after mgmd restart
  
  Close the event log on shutdown of mgmd (in stopEventLog())
  
  Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp
  ===================================================================

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.73.54.1, 2007-10-03 16:09:34+10:00, stewart@flamingspork.com +3 -3
    BUG#29565 managment server can log entries multiple times after mgmd restart

ChangeSet@1.1810.3345.1, 2007-10-02 23:47:30-06:00, tsmith@sita.local +4 -0
  Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.c
  
  Add --skip-innodb-adaptive-hash-index option, which is a way to
  work around the bug (by disabling the adaptive hash feature entirely).
  
  This may be useful even once the bug is fixed, for benchmarking purposes.
  There are some workloads for which the adaptive hash index is not effective.

  sql/mysqld.cc@1.439.128.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +8 -1
    Add --skip-innodb-adaptive-hash-index option.

  sql/set_var.cc@1.125.31.1, 2007-10-02 23:47:26-06:00, tsmith@sita.local +1 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.cc@1.202.52.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +3 -0
    Add --skip-innodb-adaptive-hash-index option.

  sql/ha_innodb.h@1.93.7.1, 2007-10-02 23:47:25-06:00, tsmith@sita.local +2 -1
    Add --skip-innodb-adaptive-hash-index option.

ChangeSet@1.1810.3340.2, 2007-10-03 02:50:38+05:00, gshchepa@gleb.loc +3 -0
  mysqldump.c, mysqldump.test, mysqldump.result:
    Bug #31077: post-commit fix.

  client/mysqldump.c@1.214.29.2, 2007-10-03 02:48:31+05:00, gshchepa@gleb.loc +1 -1
    Bug #31077: post-commit fix.

  mysql-test/r/mysqldump.result@1.83.1.48, 2007-10-03 02:49:24+05:00, gshchepa@gleb.loc +14 -2
    Bug #31077: post-commit fix.

  mysql-test/t/mysqldump.test@1.76.1.47, 2007-10-03 02:48:44+05:00, gshchepa@gleb.loc +6 -3
    Bug #31077: post-commit fix.

ChangeSet@1.1810.3344.1, 2007-10-02 21:21:45+02:00, jmiller@mysql.com +1 -0
  testScanFilter.cpp:
     Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

  ndb/test/ndbapi/testScanFilter.cpp@1.1.4.1, 2007-10-02 21:21:37+02:00, jmiller@mysql.com +7 -5
     Updated variable size arrays to use vector like Jonas did for 5.1 so that my build would not break

ChangeSet@1.1810.3328.5, 2007-10-02 20:44:37+02:00, msvensson@pilot.mysql.com +1 -0
  Bug#27597 mysqld-debug broken
   - "on" -> "restore" to avoid warning in MSVC when compiling with debug

  mysys/my_init.c@1.44.1.6, 2007-10-02 20:44:35+02:00, msvensson@pilot.mysql.com +1 -1
    Fix spelling error that cause MSVC to throw a warning
    when compiling with debug.
    Use "restore" instaed of "on" to turn runtime checks back on

ChangeSet@1.1810.3308.24, 2007-10-02 17:45:49+03:00, gkodinov@magare.gmz +1 -0
  fixed a warning in the fix for bug 28702

  sql/sql_select.cc@1.312.166.11, 2007-10-02 17:45:48+03:00, gkodinov@magare.gmz +1 -1
    fixed a warning in the fix for bug 28702

ChangeSet@1.1810.3308.22, 2007-10-02 14:57:10+03:00, gkodinov@magare.gmz +1 -0
  Fixed a valgrind warning with the fix for bug 28702.

  sql/sql_select.cc@1.312.166.10, 2007-10-02 14:57:09+03:00, gkodinov@magare.gmz +10 -2
    Fixed a valgrind warning with the fix for bug 28702.

ChangeSet@1.1810.3342.1, 2007-10-02 13:36:13+02:00, mskold@mysql.com +4 -0
  Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/r/ndb_update.result@1.5.1.8, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  mysql-test/t/ndb_update.test@1.9.1.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +5 -0
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.cc@1.175.86.1, 2007-10-02 13:35:47+02:00, mskold@mysql.com +36 -4
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

  sql/ha_ndbcluster.h@1.82.4.19, 2007-10-02 13:35:47+02:00, mskold@mysql.com +8 -1
    Bug#25817  UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks

ChangeSet@1.1810.3336.4, 2007-10-02 15:20:45+05:00, bar@mysql.com +1 -0
  Bug#29675 collation_connection is defined twice for the same value
  Removing redundant initialization.

  sql/mysqld.cc@1.439.127.1, 2007-10-02 15:20:43+05:00, bar@mysql.com +0 -1
    Removing redundant variable initialization.

ChangeSet@1.1810.3336.3, 2007-10-02 13:28:58+05:00, bar@mysql.com +2 -0
  Fixing comments to use "#" instead of "--"

  mysql-test/t/ctype_uca.test@1.17.1.1, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

  mysql-test/t/subselect.test@1.129.1.29, 2007-10-02 13:28:57+05:00, bar@mysql.com +1 -1
    Fixing comments to use "#" instead of "--"

ChangeSet@1.1810.3341.1, 2007-10-01 20:03:50+00:00, evgen@moonbone.local +3 -0
  Bug#31095: Unexpected NULL constant caused server crash.
  
  The Item_func_rollup_const class is used for wrapping constants to avoid
  wrong result for ROLLUP queries with DISTINCT and a constant in the select
  list. This class is also used to wrap up a NULL constant but its null_value
  wasn't set accordingly. This led to a server crash.
  
  Now the null_value of an object of the Item_func_rollup_const class is set
  by its fix_length_and_dec member function.

  mysql-test/r/olap.result@1.33.1.7, 2007-10-01 20:02:07+00:00, evgen@moonbone.local +11 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  mysql-test/t/olap.test@1.29, 2007-10-01 20:02:05+00:00, evgen@moonbone.local +9 -0
    Added a test case for the bug#31095: Unexpected NULL constant caused server crash.

  sql/item_func.h@1.136.2.38, 2007-10-01 20:02:14+00:00, evgen@moonbone.local +2 -0
    Bug#31095: Unexpected NULL constant caused server crash. 
    Now the null_value of an object of the Item_func_rollup_const class is set
    by its fix_length_and_dec member function.

ChangeSet@1.2570, 2007-10-01 18:41:38+02:00, kent@mysql.com +1 -0
  make_binary_distribution.sh:
    Added special handling of "mysql_install_db" and "mysql.server" scripts,
    find executables relative to the current directory.

  scripts/make_binary_distribution.sh@1.162, 2007-10-01 18:40:40+02:00, kent@mysql.com +29 -0
    Added special handling of "mysql_install_db" and "mysql.server" scripts,
    find executables relative to the current directory.

ChangeSet@1.1810.3340.1, 2007-10-01 20:35:51+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #31077.
  mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
  to the end of output if the --comments switch is on.
  The only way to suppress this line is to use --skip-comments/--compact
  switch.
  
  New switch has been added to the mysqldump client command line:
  --dump-date.
  
  For the compatibility with previous releases, by default the --dump-date
  is on.
  The --dump-date switch forces mysqldump to add date to the
  "-- Dump completed on ..." string at the end of output.
  The --skip-dump-date switch supresses the output of date string
  and uses short form of that commentary: "-- Dump completed".
  --skip-comments or --compact switches disable the whole commentary
  as usual.

  client/client_priv.h@1.43.2.6, 2007-10-01 20:32:32+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #31077.
    New OPT_DUMP_DATE option has been added to implement
    the mysqldump client --dump-date switch.

  client/mysqldump.c@1.214.29.1, 2007-10-01 20:32:34+05:00, gshchepa@gleb.loc +13 -5
    Fixed bug #31077.
    The opt_dump_date variable has been added to imlements
    the mysqldump cliemt --dump-date switch.
    By default this switch is on (for compatibility with previous
    releases).
    The --dump-date switch forces mysqldump to add date to the
    "-- Dump completed on ..." string at the end of output.
    The --skip-dump-date switch supresses the output of date string
    and uses short form of that commentary: "-- Dump completed".
    --skip-comments or --compact switches disable the whole commentary
    as usual.

  mysql-test/r/mysqldump.result@1.83.1.47, 2007-10-01 20:33:05+05:00, gshchepa@gleb.loc +10 -0
    Added test case for bug #31077.

  mysql-test/t/mysqldump.test@1.76.1.46, 2007-10-01 20:33:01+05:00, gshchepa@gleb.loc +14 -0
    Added test case for bug #31077.

ChangeSet@1.2541.1.37, 2007-10-01 17:37:48+03:00, gkodinov@magare.gmz +1 -0
  merge 5.0-opt -> 5.1-opt

  mysql-test/r/view_grant.result@1.38, 2007-10-01 17:37:46+03:00, gkodinov@magare.gmz +13 -11
    merge 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3245.3, 2007-10-01 15:11:15+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
  BUG#30992 (Wrong implementation of pthread_mutex_trylock()):
  
  Adding support for correct handling of pthread_mutex_trylock() on Win32
  systems as well as when using the safe mutexes. 

  include/my_pthread.h@1.90.7.1, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +5 -4
    Adding win_pthread_mutex_trylock() function as wrapper function for
    Windows implementation of pthread_mutex_trylock().
    
    Adding flag to safe_mutex_lock() that is shall not abort if the mutex
    is already locked and instead return EBUSY since this is the POSIX
    behaviour.

  mysys/my_winthread.c@1.14, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +25 -0
    Added Win32 wrappper function to handle pthread_mutex_trylock().

  mysys/thr_mutex.c@1.27.1.3, 2007-10-01 15:11:12+02:00, mats@kindahl-laptop.dnsalias.net +42 -7
    Added parameter 'try_lock' to safe_mutex_lock() to allow it to do double-
    duty as a pthread_mutex_trylock() in addition to working as
    pthread_mutex_lock().
    
    The code needs to return EBUSY instead of throwing an error in the event
    that the mutex is re-locked (we do not have recursive mutexes), but it
    also requires some special handling to avoid race conditions when
    calling the real pthread_mutex_{lock,trylock}().

ChangeSet@1.2528.141.57, 2007-10-01 15:41:18+04:00, anozdrin@station. +2 -0
  BUG#30472: libmysql doesn't reset charset, insert_id after
  succ. mysql_change_user() call.
  
  Use 2 bytes for character set number.

  libmysql/libmysql.c@1.290.4.3, 2007-10-01 15:41:16+04:00, anozdrin@station. +2 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

  sql/sql_parse.cc@1.700.3.5, 2007-10-01 15:41:16+04:00, anozdrin@station. +11 -2
    BUG#30472: libmysql doesn't reset charset, insert_id after
    succ. mysql_change_user() call.
    
    Use 2 bytes for character set number.

ChangeSet@1.1810.3339.1, 2007-10-01 12:44:29+02:00, thek@adventure.(none) +1 -0
  Bug #30768 query cache patch for bug #21074 crashes on windows
  
  "pthread_mutex_trylock" isn't implemented correctly for the Windows platform.
  
  This temporary patch reverts the patch for bug#21074 for Windows until
  pthread_mutex_trylock is properly implemented. 

  sql/sql_cache.cc@1.76.1.33, 2007-10-01 12:44:28+02:00, thek@adventure.(none) +6 -0
    Added code branch for the Windows platform to avoid a faulty pthread_mutex_trylock
    implementation.

ChangeSet@1.1810.3338.1, 2007-10-01 15:35:42+05:00, bar@mysql.com +3 -0
  Bug#30315 Character sets: insertion of euckr code value 0xa141 fails
  
  Problem: some valid euc-kr characters were rejected because
  condition checking multi-byte tail didn't allow 
  multi-byte characters having the second byte in the ranges
  [0x41..0x5A]  and [0x61..0x7A].
  
  Fix: allow these byte ranges for mb tails

  mysql-test/r/ctype_euckr.result@1.3, 2007-10-01 15:35:41+05:00, bar@mysql.com +41 -0
    Adding tests

  mysql-test/t/ctype_euckr.test@1.2, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -0
    Adding tests

  strings/ctype-euc_kr.c@1.65.1.5, 2007-10-01 15:35:41+05:00, bar@mysql.com +23 -4
    Fixing wrong tail character pattern

ChangeSet@1.2566.1.6, 2007-10-01 12:10:46+02:00, joerg@trift2. +2 -0
  Fix bug#31150 "Test case does not cleanup":
  Add the cleanup by dropping the database 'track' in test "rpl_bug31076".

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.1.1.1, 2007-10-01 12:10:41+02:00, joerg@trift2. +2 -0
    Fix bug#31150 "Test case does not cleanup":
    Drop the database 'track' which was newly created for this test.

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.1.1.1, 2007-10-01 12:10:41+02:00, joerg@trift2. +4 -0
    Fix bug#31150 "Test case does not cleanup":
    Drop the database 'track' which was newly created for this test.

ChangeSet@1.1810.3308.20, 2007-10-01 12:51:59+03:00, gkodinov@magare.gmz +2 -0
  removed undeterministic test result from the fux for bug 30587

  mysql-test/r/func_math.result@1.33.1.6, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -8
    removed undeterministic test result from the fux for bug 30587

  mysql-test/t/func_math.test@1.27.1.3, 2007-10-01 12:51:58+03:00, gkodinov@magare.gmz +0 -2
    removed undeterministic test result from the fux for bug 30587

ChangeSet@1.1810.3308.19, 2007-10-01 11:32:29+03:00, gkodinov@magare.gmz +1 -0
  fixed pb problem with the fix for bug 30587

  mysql-test/r/func_math.result@1.33.1.5, 2007-10-01 11:32:27+03:00, gkodinov@magare.gmz +4 -4
    fixed pb problem with the fix for bug 30587

ChangeSet@1.1810.3202.14, 2007-10-01 14:32:22+10:00, stewart@willster.(none) +1 -0
  remove debug printout

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.52.1, 2007-10-01 14:32:19+10:00, stewart@willster.(none) +0 -1
    remove accidently left in printout

ChangeSet@1.2528.141.56, 2007-10-01 00:16:50+04:00, anozdrin@station. +1 -0
  Fix compilation warnings.

  client/mysqltest.c@1.313.1.2, 2007-10-01 00:16:47+04:00, anozdrin@station. +3 -5
    Fix compilation warnings.

ChangeSet@1.2528.141.55, 2007-09-29 23:31:08+04:00, anozdrin@station. +4 -0
  Fix compile warnings.

  client/client_priv.h@1.76, 2007-09-29 23:31:05+04:00, anozdrin@station. +0 -4
    Fix compile warnings.

  client/mysqltest.c@1.313.1.1, 2007-09-29 23:31:05+04:00, anozdrin@station. +6 -4
    Fix compile warnings.

  libmysql/client_settings.h@1.39, 2007-09-29 23:31:05+04:00, anozdrin@station. +4 -0
    Fix compile warnings.

  libmysql/libmysql.c@1.290.4.2, 2007-09-29 23:31:05+04:00, anozdrin@station. +3 -3
    Fix compile warnings.

ChangeSet@1.2528.225.3, 2007-09-29 16:04:31-03:00, davi@moksha.local +1 -0
  The fix for BUG 21136 (ChangeSet@1.2611.1.1) introduced a regression that
  caused a few tests to fail because the thd->extra_lock wasn't being set to
  NULL after the table was unlocked. This poses a serious problem because later
  attempts to access thd->extra_lock (now a dangling pointer) will probably
  result in a crash (undefined behavior) -- and that's what actually happens
  in some test cases.
  
  The solution is to set the select_create::m_plock pointee to NULL, which
  means that thd->extra_lock is set to NULL when the lock data is not for a
  temporary table.

  sql/sql_insert.cc@1.298, 2007-09-29 16:04:24-03:00, davi@moksha.local +4 -2
    Set the m_plock pointee to NULL, thus avoiding a dangling thd->extra_lock pointer
    in some cases.

ChangeSet@1.2403.18.82, 2007-09-29 11:10:12+02:00, jonas@perch.ndb.mysql.com +2 -0
  ndb - bug#30975
    add even more tests

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.2, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +109 -21
    add more tests...

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.10, 2007-09-29 11:10:09+02:00, jonas@perch.ndb.mysql.com +32 -0
    add more tests

ChangeSet@1.2562.1.1, 2007-09-29 09:26:33+02:00, df@pippilotta.erinye.com +1 -0
  align types

  storage/ndb/include/portlib/NdbThread.h@1.8, 2007-09-29 09:26:26+02:00, df@pippilotta.erinye.com +1 -1
    align types

ChangeSet@1.1810.3308.18, 2007-09-29 01:07:29+00:00, evgen@moonbone.local +2 -0
  view_grant.result, view_grant.test:
    Corrected test case for the bug#29908.

  mysql-test/r/view_grant.result@1.8.1.19, 2007-09-29 01:06:40+00:00, evgen@moonbone.local +6 -5
    Corrected test case for the bug#29908.

  mysql-test/t/view_grant.test@1.8.1.17, 2007-09-29 01:06:22+00:00, evgen@moonbone.local +3 -2
    Corrected test case for the bug#29908.

ChangeSet@1.1810.3335.1, 2007-09-28 23:24:40+00:00, evgen@moonbone.local +3 -0
  Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
  
  The change_to_use_tmp_fields function leaves the orig_table member of an
  expression's tmp table field filled for the new Item_field being created.
  Later orig_table is used by the Field::make_field function to provide some
  info about original table and field name to a user. This is ok for a field
  but for an expression it should be empty.
  
  The change_to_use_tmp_fields function now resets orig_table member of
  an expression's tmp table field to prevent providing a wrong info to a user.
  The Field::make_field function now resets the table_name and the org_col_name
  variables when the orig_table is set to 0.

  sql/field.cc@1.256.59.1, 2007-09-28 23:22:29+00:00, evgen@moonbone.local +13 -3
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The Field::make_field function now resets the table_name and the org_col_name
    variables when the orig_table is set to 0.

  sql/sql_select.cc@1.312.171.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +3 -0
    Bug#27990: Wrong info in MYSQL_FIELD struct members when a tmp table was used.
    The change_to_use_tmp_fields function now resets orig_table member of
    an expression's tmp table field to prevent providing a wrong info to a user.

  tests/mysql_client_test.c@1.167.36.1, 2007-09-28 23:22:32+00:00, evgen@moonbone.local +26 -19
    The test case for the bug#21635 is altered to test behavior on both const and
    non-const tables.

ChangeSet@1.2528.225.2, 2007-09-28 19:11:26-03:00, davi@moksha.local +1 -0
  Post-merge fix for Bug 21136, initial merge missed the modifications for
  the sql_class.h file.

  sql/sql_class.h@1.399.2.1, 2007-09-28 19:11:24-03:00, davi@moksha.local +6 -1
    Add pointers for holding lock data for temporary tables.

ChangeSet@1.2528.225.1, 2007-09-28 18:25:47-03:00, davi@moksha.local +3 -0
  Bug#21136 CREATE TABLE SELECT within CREATE TABLE SELECT causes server crash
  
  When CREATE TEMPORARY TABLE .. SELECT is invoked from a stored function
  which in turn is called from CREATE TABLE SELECT causes a memory leak
  because the inner create temporary table overrides the outter extra_lock
  reference when locking the table.
  
  The solution is to simply not overrride the extra_lock by only using the
  extra_lock for a non-temporary table lock.

  mysql-test/r/create.result@1.154, 2007-09-28 18:25:42-03:00, davi@moksha.local +14 -0
    Add test case result for Bug#21136

  mysql-test/t/create.test@1.105, 2007-09-28 18:25:42-03:00, davi@moksha.local +25 -0
    Add test case for Bug#21136

  sql/sql_insert.cc@1.297, 2007-09-28 18:25:42-03:00, davi@moksha.local +20 -7
    For temporary tables, store the lock data within the select_create class
    since tmp tables contents are not replicated. For "real" tables, store
    the lock data in the thread extra_lock pointer.

ChangeSet@1.1810.3334.1, 2007-09-28 17:13:35-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29589	sys_innodb_max_purge_lag is defined twice in sys_variables
  
  Removed duplicate innodb variable from sys_variables array.

  sql/set_var.cc@1.125.5.48, 2007-09-28 17:13:30-04:00, dkatz@damien-katzs-computer.local +0 -1
    Removed duplicate innodb variable from sys_variables array.

ChangeSet@1.1810.3333.1, 2007-09-28 17:10:14-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29772  Error compiling with option --without-geometry
  
  Added #ifdef HAVE_SPATIAL around geometry related code.

  sql/item.cc@1.113.97.1, 2007-09-28 17:10:06-04:00, dkatz@damien-katzs-computer.local +4 -0
    Added #ifdef HAVE_SPATIAL around geometry related code.

ChangeSet@1.1616.3097.1, 2007-09-28 22:35:48+02:00, kent@mysql.com +1 -0
  ctype-simple.c:
    Avoid undefined value when negating (bug#30069)

  strings/ctype-simple.c@1.57.1.12, 2007-09-28 22:33:23+02:00, kent@mysql.com +2 -2
    Avoid undefined value when negating (bug#30069)

ChangeSet@1.2528.141.52, 2007-09-28 23:30:54+04:00, anozdrin@station. +5 -0
  Patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  See also WL 4066.
    
  This bug reveals two problems:
    - the problem on the client side which was described originally;
    - the problem in protocol / the server side: connection context
      on client and server should be like after mysql_real_connect()
      and be consistent. The server however just resets character
      set variables to the global defaults.
  
  The fix seems to be as follows:
    - extend the protocol so that the client be able to send
      character set information in COM_CHANGE_USER command;
    - change the server so that it understands client character set
      in the command;
    - change the client:
      - reset character set to the default value (which has been
        read from the configuration);
      - send character set in COM_CHANGE_USER command.

  client/client_priv.h@1.75, 2007-09-28 23:30:52+04:00, anozdrin@station. +4 -0
    Declare a function, used in libmysql.c and client.c.

  libmysql/libmysql.c@1.290.4.1, 2007-09-28 23:30:52+04:00, anozdrin@station. +25 -1
    1. Reset character set on the client in mysql_change_user().
    2. Send character set to the server in COM_CHANGE_USER command.

  mysql-test/t/mysql_client_test.test@1.24, 2007-09-28 23:30:52+04:00, anozdrin@station. +2 -2
    mysql_client_test.log is used by the test suite.
    
    Use mysql_client_test.out.log to collect mysql_client_test
    real output.

  sql/sql_parse.cc@1.700.3.4, 2007-09-28 23:30:52+04:00, anozdrin@station. +13 -1
    Switch character set in COM_CHANGE_USER.

  tests/mysql_client_test.c@1.252.1.2, 2007-09-28 23:30:52+04:00, anozdrin@station. +174 -2
    Test case for BUG#30472.

ChangeSet@1.1810.3309.7, 2007-09-28 18:05:23+02:00, mhansson@linux-st28.site +3 -0
  Bug #30832: Assertion + crash with select name_const('test', now());
  
  The NAME_CONST function is required to work correctly with constants only.
  When executed with functions that return types other than those returned by
  Item::field_type (string, int, decimal, or real), the result gets cast to
  one of those types. This cannot happen for constants.
  Fixed by only allowing constants as arguments to NAME_CONST.

  mysql-test/r/func_misc.result@1.21.1.7, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +16 -0
    Bug#30832: Test result

  mysql-test/t/func_misc.test@1.21.2.1, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +14 -0
    Bug#30832: Test case

  sql/item.h@1.183.1.57, 2007-09-28 18:05:20+02:00, mhansson@linux-st28.site +2 -0
    Bug#30832: The fix

ChangeSet@1.1810.3332.1, 2007-09-28 16:46:05+03:00, gkodinov@macbook.gmz +3 -0
  Bug #30587: mysql crashes when trying to group by TIME div NUMBER
  
  When calculating the result length of an integer DIV function 
  the number of decimals was used without checking the result type
  first. Thus an uninitialized number of decimals was used for some 
  types. This caused an excessive amount of memory to be allocated 
  for the field's buffer and crashed the server.
  
   
  Fixed by using the number of decimals only for data types that 
  can have decimals and thus have valid decimals number.

  mysql-test/r/func_math.result@1.33.1.4, 2007-09-28 16:45:57+03:00, gkodinov@macbook.gmz +46 -0
    Bug #30587: test case

  mysql-test/t/func_math.test@1.27.1.2, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +27 -0
    Bug #30587: test case

  sql/item_func.cc@1.270.76.1, 2007-09-28 16:45:58+03:00, gkodinov@macbook.gmz +5 -1
    Bug #30587: Don't use decimals on a type that doesn't have them.

ChangeSet@1.2541.19.2, 2007-09-28 17:33:30+05:00, gluh@mysql.com +3 -0
  Bug#30795 Query on INFORMATION_SCHEMA.SCHEMATA, wrong result
  skip the check of directory presence for 'information_schema' name

  mysql-test/r/information_schema.result@1.164, 2007-09-28 17:33:28+05:00, gluh@mysql.com +4 -0
    test result

  mysql-test/t/information_schema.test@1.107, 2007-09-28 17:33:28+05:00, gluh@mysql.com +6 -0
    test case

  sql/sql_show.cc@1.439, 2007-09-28 17:33:29+05:00, gluh@mysql.com +2 -1
    skip the check of directory presence for 'information_schema' name

ChangeSet@1.2528.141.51, 2007-09-28 15:42:37+04:00, anozdrin@station. +4 -0
  Prerequisite patch for BUG#30472: libmysql doesn't reset charset,
  insert_id after succ. mysql_change_user() call.
  
  Supply a correct packet length to dispatch command.

  sql/sp_head.cc@1.292.1.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +1 -1
    Fix packet length.

  sql/sql_parse.cc@1.700.3.3, 2007-09-28 15:42:35+04:00, anozdrin@station. +65 -47
    Fix packet length.

  sql/sql_prepare.cc@1.233, 2007-09-28 15:42:35+04:00, anozdrin@station. +6 -5
    Fix packet length.

  tests/mysql_client_test.c@1.252.1.1, 2007-09-28 15:42:35+04:00, anozdrin@station. +200 -1
    Test case for COM_CHANGE_USER.

ChangeSet@1.2541.19.1, 2007-09-28 16:02:43+05:00, gluh@mysql.com +5 -0
  Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
  view_body_utf8 attribute type is changed to 'escaped string'

  mysql-test/r/ddl_i18n_koi8r.result@1.3, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/ddl_i18n_utf8.result@1.3, 2007-09-28 16:02:41+05:00, gluh@mysql.com +4 -2
    result fix

  mysql-test/r/information_schema.result@1.163, 2007-09-28 16:02:41+05:00, gluh@mysql.com +16 -4
    result fix

  mysql-test/t/information_schema.test@1.106, 2007-09-28 16:02:41+05:00, gluh@mysql.com +10 -0
    test case

  sql/sql_view.cc@1.153, 2007-09-28 16:02:41+05:00, gluh@mysql.com +1 -1
    Bug#30689 Wrong content in I_S.VIEWS.VIEW_DEFINITION if VIEW is based on I_S
    view_body_utf8 attribute type is changed to 'escaped string'

ChangeSet@1.2541.1.33, 2007-09-28 12:30:55+02:00, mhansson@dl145s.mysql.com +1 -0
  Bug#30665: Post-merge fix

  mysql-test/r/group_by.result@1.91, 2007-09-28 12:30:52+02:00, mhansson@dl145s.mysql.com +1 -1
    Bug#30665: Post-merge fix

ChangeSet@1.2541.18.2, 2007-09-28 10:22:54+02:00, jonas@perch.ndb.mysql.com +1 -0
  post merge

  storage/ndb/test/src/HugoTransactions.cpp@1.38, 2007-09-28 10:22:52+02:00, jonas@perch.ndb.mysql.com +0 -180
    post merge

ChangeSet@1.2403.18.81, 2007-09-28 09:58:56+02:00, jonas@perch.ndb.mysql.com +10 -0
  ndb - add new testcases/error insert bug#30975
    (recommit for correct merge order)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.32.1.7, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +3 -1
    new error code

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@1.40.1.5, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add error inserts

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.131.2.6, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +1 -0
    add error insert

  storage/ndb/src/kernel/blocks/pgman.cpp@1.20.1.8, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +24 -2
    add error inserts

  storage/ndb/test/include/HugoTransactions.hpp@1.16, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +18 -0
    add 
    - loadTableStartFrom
    - scanUpdate with scanflags
    - fillTableStartFrom

  storage/ndb/test/include/UtilTransactions.hpp@1.10, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +5 -0
    add
    - clearTable with scan flags

  storage/ndb/test/ndbapi/testSystemRestart.cpp@1.13.1.1, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +180 -0
    add new testcases

  storage/ndb/test/run-test/daily-basic-tests.txt@1.63.2.9, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +32 -0
    add new testcases

  storage/ndb/test/src/HugoTransactions.cpp@1.31.2.2, 2007-09-28 09:58:53+02:00, jonas@perch.ndb.mysql.com +83 -48
    add new functions

  storage/ndb/test/src/UtilTransactions.cpp@1.24.1.2, 2007-09-28 09:58:54+02:00, jonas@perch.ndb.mysql.com +41 -33
    add new functions

ChangeSet@1.2541.17.1, 2007-09-28 09:36:05+02:00, mhansson@linux-st28.site +5 -0
  Bug#30665: Inconsistent optimization of IGNORE INDEX FOR {ORDER BY|GROUP BY}
  
  The optimizer takes different execution paths during EXPLAIN than SELECT,
  this fix relates only to EXPLAIN, hence no behavior changes.
  The test of sort keys for ORDER BY was prohibited from considering keys
  that were mentioned in IGNORE KEYS FOR ORDER BY. This led to two 
  inconsistencies: One was that IGNORE INDEX FOR GROUP BY and 
  IGNORE INDEX FOR ORDER BY gave apparently different EXPLAINs; the latter 
  erroneously claimed to do filesort. The second inconsistency 
  is that the test of sort keys is called twice, finding a sort key the first
  time but not the second time, leading to the mentioned filesort.
  
  Fixed by making the test of sort keys consider all enabled 
  keys on the table. This test rejects keys that are not covering, and for 
  covering keys the hint should be ignored anyway. 

  mysql-test/r/group_by.result@1.90, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +147 -1
    Bug#30665: Changed test result. The plan gets more efficient here. 
    The output is included in order to show that it is still correct.

  mysql-test/r/order_by.result@1.71, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +285 -0
    Bug#30665: Test result

  mysql-test/t/group_by.test@1.71, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +1 -0
    Bug#30665: Changed test case to show correctness of changed plan

  mysql-test/t/order_by.test@1.55, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +57 -0
    Bug#30665: Test case

  sql/sql_select.cc@1.562.2.1, 2007-09-28 09:36:01+02:00, mhansson@linux-st28.site +3 -1
    Bug#30665: 
    - the fix: Give test_if_skip_sort_order all keys not the subset of non-disabled keys.
    - Added comment to test_if_skip_sort_order

ChangeSet@1.2566.2.1, 2007-09-27 21:39:23+02:00, kent@mysql.com +3 -0
  Makefile.am, configure.in:
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  Makefile.am@1.140.1.1, 2007-09-27 21:22:07+02:00, kent@mysql.com +1 -1
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  configure.in@1.489.1.1, 2007-09-27 21:22:40+02:00, kent@mysql.com +6 -7
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

  pstack/Makefile.am@1.9, 2007-09-27 21:22:49+02:00, kent@mysql.com +5 -8
    Handle pstack like other optional directories
    Check if a directory exists relative to $srcdir

ChangeSet@1.1810.3308.14, 2007-09-27 17:56:50+03:00, gkodinov@magare.gmz +1 -0
  Fixed a warning cased by the fix for bug 30468

  sql/sql_acl.cc@1.128.45.3, 2007-09-27 17:56:49+03:00, gkodinov@magare.gmz +2 -1
    Fixed a warning cased by the fix for bug 30468

ChangeSet@1.1810.3308.13, 2007-09-27 14:29:46+03:00, gkodinov@magare.gmz +1 -0
  separated an assertion from the assignment (bug 30468)

  sql/sql_acl.cc@1.128.45.2, 2007-09-27 14:29:45+03:00, gkodinov@magare.gmz +2 -1
    separated an assertion from the assignment (bug 30468)

ChangeSet@1.2569, 2007-09-27 12:21:56+02:00, kent@mysql.com +3 -0
  Makefile.am, make_binary_distribution.sh:
    Use custom 'pkgduppdir'
  mysql.server.sh:
    The server is installed in 'libexecdir'

  scripts/Makefile.am@1.72.1.2, 2007-09-27 10:33:27+02:00, kent@mysql.com +4 -0
    Use custom 'pkgduppdir'

  scripts/make_binary_distribution.sh@1.161, 2007-09-27 10:33:27+02:00, kent@mysql.com +3 -1
    Use custom 'pkgduppdir'

  support-files/mysql.server.sh@1.57, 2007-09-27 11:06:35+02:00, kent@mysql.com +1 -1
    The server is installed in 'libexecdir'

ChangeSet@1.1810.3331.1, 2007-09-27 12:15:19+03:00, gkodinov@magare.gmz +6 -0
  Bug #30468: column level privileges not respected when joining tables
  
  When expanding a * in a USING/NATURAL join the check for table access
  for both tables in the join was done using the grant information of the
  first one.
  Fixed by getting the grant information for the current table while 
  iterating through the columns of the join.

  mysql-test/r/grant2.result@1.25.2.11, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +18 -0
    Bug #30468: test case

  mysql-test/t/grant2.test@1.31.2.10, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +32 -0
    Bug #30468: test case

  sql/sql_acl.cc@1.128.45.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +68 -37
    Bug #30468: correctly check column grants

  sql/sql_acl.h@1.28.1.27, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +2 -3
    Bug #30468: correctly check column grants

  sql/sql_base.cc@1.235.112.2, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +1 -4
    Bug #30468: correctly check column grants

  sql/sql_insert.cc@1.146.68.1, 2007-09-27 12:15:18+03:00, gkodinov@magare.gmz +3 -5
    Bug #30468: correctly check column grants

ChangeSet@1.2541.1.28, 2007-09-27 13:15:15+05:00, gshchepa@gleb.loc +2 -0
  mysqlslap.result, mysqlslap.test:
    Post-commit fix.

  mysql-test/r/mysqlslap.result@1.15, 2007-09-27 13:14:45+05:00, gshchepa@gleb.loc +1 -0
    Post-commit fix.

  mysql-test/t/mysqlslap.test@1.19, 2007-09-27 13:14:37+05:00, gshchepa@gleb.loc +2 -0
    Post-commit fix.

ChangeSet@1.1810.3329.1, 2007-09-27 08:56:06+02:00, df@pippilotta.erinye.com +1 -0
  avoid using GetTempFileName in a way it's documented to not work on windows

  mysys/mf_tempfile.c@1.24.1.3, 2007-09-27 08:56:04+02:00, df@pippilotta.erinye.com +14 -0
    Try to avoid passing null as first parameter to GetTempFileName, since it's documented that it won't work.

ChangeSet@1.1810.3328.1, 2007-09-27 08:48:39+02:00, msvensson@pilot.(none) +1 -0
  Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

  libmysql/libmysql.c@1.233.25.1, 2007-09-27 08:48:37+02:00, msvensson@pilot.(none) +2 -2
    Move DBUG_ENTER to begining of function to avoid build failure with debug on windows

ChangeSet@1.1810.3304.5, 2007-09-26 21:59:17+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #26000 SHOW SLAVE STATUS can crash mysqld during shutdown process
  
  active_mi has been reset (shutdown) at the time of quering with 
  SHOW SLAVE STATUS so that 
  at handling of SHOW an attempt to read its members segfaults.
  
  Fixed with checking the value of active_mi before to call show_master_info()
  Merely send_ok() is invoked when active_mi does not exist.
  A test can not be easiely written.
  
  Notice, there are more analogical cases in the code which require a similar
  treatment (to be reported as a bug separately). 

  sql/sql_parse.cc@1.426.163.1, 2007-09-26 21:59:11+02:00, aelkin@koti.dsl.inet.fi +10 -1
    Ignore reporting and send only OK if master info struct has been destoyed.
    As this must be at shutdown merely a warning is sent to the client.

ChangeSet@1.2528.224.1, 2007-09-26 20:19:33+02:00, kent@mysql.com +5 -0
  make_binary_distribution.sh:
    Use 'make install' to create the package
  Makefile.am:
    Added 'pkgsuppdir' to control location separately
    Pass on mandir and infodir
    Don't install headers

  cmd-line-utils/libedit/Makefile.am@1.17, 2007-09-26 20:19:19+02:00, kent@mysql.com +3 -3
    Don't install headers

  cmd-line-utils/readline/Makefile.am@1.16, 2007-09-26 20:19:00+02:00, kent@mysql.com +4 -4
    Don't install headers

  scripts/Makefile.am@1.71.2.1, 2007-09-26 20:15:47+02:00, kent@mysql.com +2 -0
    Pass on mandir and infodir

  scripts/make_binary_distribution.sh@1.158.1.1, 2007-09-26 20:16:29+02:00, kent@mysql.com +201 -240
    Use 'make install' to create the package

  support-files/Makefile.am@1.39, 2007-09-26 20:18:00+02:00, kent@mysql.com +5 -2
    Added 'pkgsuppdir' to control location separately

ChangeSet@1.2566, 2007-09-26 19:41:46+02:00, kent@mysql.com +1 -0
  Makefile.am:
    Corrected typo

  libmysql_r/Makefile.am@1.33, 2007-09-26 19:41:40+02:00, kent@mysql.com +1 -1
    Corrected typo

ChangeSet@1.1810.3303.11, 2007-09-26 19:15:42+02:00, dfischer@mysql.com +1 -0
  Raise version number after cloning 5.0.50

  configure.in@1.245.103.1, 2007-09-26 19:15:33+02:00, dfischer@mysql.com +2 -2
    Raise version number after cloning 5.0.50

ChangeSet@1.2548.1.1, 2007-09-26 18:47:55+02:00, kent@mysql.com +13 -0
  Makefile.am:
    Always include all sub directories in "make dist"
    Removed incorrect comment
  configure.in:
    Unconditionally list make files in AC_CONFIG_FILES
    Removed 'thread_dirs', it is not used
    Minor cleanup
  compile-dist:
    Simplified the configure line needed for "make dist" to get it all
  zlib.m4, ssl.m4:
    Unconditionally list make files in AC_CONFIG_FILES
  Makefile.am:
    Removed DIST_SUBDIRS not needed
    Don't copy soft links as files into source package

  BUILD/compile-dist@1.18, 2007-08-31 01:17:26+02:00, kent@mysql.com +1 -12
    Simplified the configure line needed for "make dist" to get it all

  Makefile.am@1.140, 2007-08-31 01:21:32+02:00, kent@mysql.com +10 -3
    Always include all sub directories in "make dist"

  config/ac-macros/ssl.m4@1.6, 2007-08-31 01:18:56+02:00, kent@mysql.com +9 -8
    Unconditionally list make files in AC_CONFIG_FILES

  config/ac-macros/zlib.m4@1.14, 2007-08-31 01:18:56+02:00, kent@mysql.com +3 -4
    Unconditionally list make files in AC_CONFIG_FILES

  configure.in@1.488, 2007-08-31 01:24:12+02:00, kent@mysql.com +61 -68
    Unconditionally list make files in AC_CONFIG_FILES
    Removed 'thread_dirs', it is not used
    Minor cleanup

  extra/Makefile.am@1.46, 2007-08-31 01:23:48+02:00, kent@mysql.com +1 -0
    Always include all sub directories in "make dist"

  libmysql/Makefile.am@1.57, 2007-08-31 01:20:05+02:00, kent@mysql.com +0 -1
    Removed incorrect comment

  libmysql_r/Makefile.am@1.32, 2007-08-31 01:23:07+02:00, kent@mysql.com +1 -2
    Don't copy soft links as files into source package

  libmysqld/Makefile.am@1.117, 2007-08-31 01:23:07+02:00, kent@mysql.com +2 -1
    Don't copy soft links as files into source package

  libmysqld/examples/Makefile.am@1.41, 2007-08-31 01:23:07+02:00, kent@mysql.com +5 -5
    Don't copy soft links as files into source package

  mysql-test/Makefile.am@1.113.1.1, 2007-08-31 01:22:02+02:00, kent@mysql.com +0 -1
    Removed DIST_SUBDIRS not needed

  plugin/Makefile.am@1.8, 2007-08-31 01:23:48+02:00, kent@mysql.com +1 -0
    Always include all sub directories in "make dist"

  sql/Makefile.am@1.192, 2007-08-31 01:23:07+02:00, kent@mysql.com +5 -2
    Don't copy soft links as files into source package

ChangeSet@1.2541.1.25, 2007-09-26 19:06:54+03:00, gkodinov@magare.gmz +6 -0
  merge of the fix for bug 27802 & 27216 to 5.1-opt

  mysql-test/r/view.result@1.242, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +6 -6
    merge of the fix for bug 27802 to 5.1

  sql/item_cmpfunc.h@1.169, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27216 to 5.1

  sql/sql_insert.cc@1.295.2.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +1 -1
    merge of the fix for bug 27216 to 5.1

  sql/sql_lex.h@1.296.1.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +2 -0
    merge of the fix for bug 27802 to 5.1

  sql/sql_select.cc@1.562.1.2, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +24 -27
    merge of the fix for bug 27802 to 5.1

  sql/table.h@1.179.1.6, 2007-09-26 19:06:51+03:00, gkodinov@magare.gmz +0 -2
    merge of the fix for bug 27802 to 5.1

ChangeSet@1.2541.13.4, 2007-09-26 17:28:20+02:00, msvensson@pilot.(none) +2 -0
  Update result file(s) for 5.1

  mysql-test/r/named_pipe.result@1.2, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

  mysql-test/r/shm.result@1.5, 2007-09-26 17:28:18+02:00, msvensson@pilot.(none) +7 -7
    Update result file for 5.1

ChangeSet@1.1810.3287.12, 2007-09-26 17:04:41+02:00, msvensson@pilot.(none) +1 -0
  Bug#31167 Introduction of @@hostname breaks replication in a ring
   - Use a local uservariable to avoid @@hostname in binlog

  scripts/mysql_system_tables_data.sql@1.1.3.1, 2007-09-26 17:04:39+02:00, msvensson@pilot.(none) +2 -1
    Load @@hostname into a local user variable to avoid
    writing @@hostname to the binary log that potentially
    would be replicated to a slave server that not yet was upgraded
    to have @@hostname.

ChangeSet@1.2541.15.1, 2007-09-26 12:45:08+02:00, gshchepa@devsrv-b.mysql.com +3 -0
  Fixed bug #31075.
  The `SELECT col FROM t WHERE col NOT IN (col, ...) GROUP BY col'
  crashed in the range optimizer.
  
  The get_func_mm_tree function has been modified to check the
  Item_func_in::array field for the NULL value before using of that
  value.

  mysql-test/r/func_in.result@1.45, 2007-09-26 12:43:38+02:00, gshchepa@devsrv-b.mysql.com +5 -0
    Added test case for bug #31075.

  mysql-test/t/func_in.test@1.33, 2007-09-26 12:43:37+02:00, gshchepa@devsrv-b.mysql.com +8 -0
    Added test case for bug #31075.

  sql/opt_range.cc@1.284, 2007-09-26 12:43:35+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Fixed bug #31075.
    The get_func_mm_tree function has been modified to check the
    Item_func_in::array field for the NULL value before using of that
    value.

ChangeSet@1.2541.11.3, 2007-09-25 12:16:39+02:00, stewart@willster.(none) +2 -0
  ndb_rand.c:
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c
  ndb_rand.h:
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/include/util/ndb_rand.h@1.2, 2007-09-25 12:16:03+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h

  storage/ndb/src/common/util/ndb_rand.c@1.2, 2007-09-25 12:16:22+02:00, stewart@willster.(none) +0 -0
    Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c

ChangeSet@1.1810.3202.13, 2007-09-25 12:01:23+02:00, stewart@flamingspork.com +4 -0
  [PATCH] BUG#30379 Better randomise time before retry in timeout check (DBTC)
  
  timoOutLoopStartLab() checks if any transactions have been delayed
  for so long that we are forced to perform some action (e.g. abort,
  resend etc).
  
  It is *MEANT* to (according to the comment):
  > To avoid aborting both transactions in a deadlock detected by time-out
  > we insert a random extra time-out of upto 630 ms by using the lowest
  > six bits of the api connect reference.
  > We spread it out from 0 to 630 ms if base time-out is larger than 3 sec,
  > we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec,
  > and otherwise we spread it out 310 ms.
  
  The comment (as all do) lies.
  
  the API connect reference is not very random, producing incredibly
  predictable "random" numbers. This could lead to both txns being
  aborted instead of just one.
  
  Before:
  timeout value: 123 3
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 122 2
  timeout value: 123 3
  
  After:
  timeout value: 127 7
  timeout value: 126 6
  timeout value: 129 9
  timeout value: 139 19
  timeout value: 137 17
  timeout value: 151 31
  timeout value: 130 10
  timeout value: 132 12
  
  Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  ===================================================================

  ndb/include/util/ndb_rand.h@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +33 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/include/util/ndb_rand.h@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/common/util/Makefile.am@1.10.3.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +2 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +40 -0
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

  ndb/src/common/util/ndb_rand.c@1.0, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +0 -0

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.51.1, 2007-09-25 11:02:59+02:00, stewart@flamingspork.com +3 -1
    BUG#30379 Better randomise time before retry in timeout check (DBTC)

ChangeSet@1.1810.3308.11, 2007-09-24 15:34:10+03:00, gkodinov@magare.gmz +4 -0
  Bug #28702: VIEWs defined with USE/FORCE KEY ignore that request
  When storing the VIEW the CREATE VIEW command is reconstructed 
  from the parse tree. While constructing the command string
  the index hints specified should also be printed.
  Fixed by adding code to print the index hints when printing a 
  table in the FROM clause.

  mysql-test/r/view.result@1.138.1.70, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +28 -0
    Bug #28702: test case

  mysql-test/t/view.test@1.126.1.63, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +21 -0
    Bug #28702: test case

  sql/sql_select.cc@1.312.166.8, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +52 -0
    Bug #28702: preserve index hints in a VIEW definition.

  sql/table.h@1.102.1.46, 2007-09-24 15:34:09+03:00, gkodinov@magare.gmz +2 -0
    Bug #28702: preserve index hints in a VIEW definition.

ChangeSet@1.2541.1.22, 2007-09-24 13:02:59+02:00, gkodinov@macbook.local +2 -0
  merging bug 28701 to 5.1-opt

  mysql-test/r/view.result@1.240, 2007-09-24 13:02:48+02:00, gkodinov@macbook.local +4 -4
    merging bug 28701 to 5.1-opt

  sql/sql_view.cc@1.151, 2007-09-24 13:02:49+02:00, gkodinov@macbook.local +2 -5
    merging bug 28701 to 5.1-opt

ChangeSet@1.1810.3305.9, 2007-09-24 12:42:44+02:00, msvensson@shellback.(none) +7 -0
  Add test for named pipes on windows
  Improve test for  shm on windows

  mysql-test/include/windows.inc@1.1.1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +5 -4
    improve "skip message" and don't require a result file

  mysql-test/r/named_pipe.result@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    New BitKeeper file ``mysql-test/r/named_pipe.result''

  mysql-test/r/named_pipe.result@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/r/shm.result@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +2153 -0
    Update result after adding more tests

  mysql-test/r/shm.result@1.3, 2007-09-24 12:27:21+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/shm.result -> mysql-test/r/shm.result

  mysql-test/t/shm.result@1.2, 2007-09-24 12:25:34+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/r/windows_shm.result -> mysql-test/t/shm.result

  mysql-test/t/named_pipe-master.opt@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -0
    New BitKeeper file ``mysql-test/t/named_pipe-master.opt''

  mysql-test/t/named_pipe-master.opt@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/named_pipe.test@1.1, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +14 -0
    New BitKeeper file ``mysql-test/t/named_pipe.test''

  mysql-test/t/named_pipe.test@1.0, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +0 -0

  mysql-test/t/shm-master.opt@1.3, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +1 -1
    Add $MTR_BUILD_THREAD to get a unique shared memory base name

  mysql-test/t/shm-master.opt@1.2, 2007-09-24 12:25:04+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm-master.opt -> mysql-test/t/shm-master.opt

  mysql-test/t/shm.test@1.4, 2007-09-24 12:42:41+02:00, msvensson@shellback.(none) +11 -1
    Run a bunch of more test to check shm

  mysql-test/t/shm.test@1.3, 2007-09-24 12:24:43+02:00, msvensson@shellback.(none) +0 -0
    Rename: mysql-test/t/windows_shm.test -> mysql-test/t/shm.test

ChangeSet@1.1810.3303.9, 2007-09-22 16:29:15+02:00, jonathan@bagpuss.adsl.perkin.org.uk +1 -0
  Revert previous attempt to fix bug#27693, the files removed from the
  cmake list are auto-generated and thus still required.  Correct fix
  not yet known.

  bdb/CMakeLists.txt@1.1.3.1, 2007-09-22 16:25:56+02:00, jonathan@bagpuss.adsl.perkin.org.uk +7 -7
    Revert previous change, it is incorrect as those files are automatically
    generated.

ChangeSet@1.1810.3305.8, 2007-09-22 12:17:14+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843  Bad Test addition to t/archive.test

  mysql-test/r/archive.result@1.13.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +4 -5
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

  mysql-test/t/archive.test@1.14.1.7, 2007-09-22 12:17:09+02:00, msvensson@shellback.(none) +3 -3
    Don't care about the "after insert delayed" record when since
    we can't guarantee the order it's been inserted   

ChangeSet@1.1810.3325.1, 2007-09-22 11:49:27+04:00, evgen@sunlight.local +12 -0
  Bug#27216: functions with parameters of different date types may return wrong
  type of the result.
  
  There are several functions that accept parameters of different types.
  The result field type of such functions was determined based on
  the aggregated result type of its arguments. As the DATE and the DATETIME
  types are represented by the STRING type, the result field type
  of the affected functions was always STRING for DATE/DATETIME arguments.
  The affected functions are COALESCE, IF, IFNULL, CASE, LEAST/GREATEST, CASE.
  
  Now the affected functions aggregate the field types of their arguments rather
  than their result types and return the result of aggregation as their result
  field type.
  The cached_field_type member variable is added to the number of classes to
  hold the aggregated result field type.
  The str_to_date() function's result field type now defaults to the
  MYSQL_TYPE_DATETIME.
  The agg_field_type() function is added. It aggregates field types with help
  of the Field::field_type_merge() function.
  The create_table_from_items() function now uses the 
  item->tmp_table_field_from_field_type() function to get the proper field
  when the item is a function with a STRING result type.

  libmysql/libmysql.c@1.233.24.1, 2007-09-22 11:44:40+04:00, evgen@sunlight.local +2 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The client library now accepts the NEWDATE type as a string.

  mysql-test/r/date_formats.result@1.18.12.2, 2007-09-22 11:48:37+04:00, evgen@sunlight.local +1 -1
    A test case result corrected after fixing bug#27216.

  mysql-test/r/type_datetime.result@1.30.1.17, 2007-09-22 11:48:39+04:00, evgen@sunlight.local +61 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  mysql-test/t/type_datetime.test@1.18.1.15, 2007-09-22 11:48:40+04:00, evgen@sunlight.local +38 -0
    Added a test case for the bug#27216: functions with parameters of different
    date types may return wrong type of the result.

  sql/item_cmpfunc.cc@1.187.1.77, 2007-09-22 11:45:40+04:00, evgen@sunlight.local +36 -4
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    Now the fix_length_and_dec functions of the
    Item_func_ifnull,Item_func_if, Item_func_case, Item_func_coalesce
    classes are use agg_field_type function to find out the type of their 
    result field.

  sql/item_cmpfunc.h@1.122.2.32, 2007-09-22 11:48:32+04:00, evgen@sunlight.local +7 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field type is added to the Item_func_case, Item_func_if and
    Item_func_coalesce classes.
    The field_type function is added to the Item_func_ifnull, Item_func_if,
    Item_func_coalesce, Item_func_case classes.

  sql/item_func.cc@1.270.75.1, 2007-09-22 11:48:33+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Item_func_min_max::fix_length_and_dec function now uses the agg_field_type
    function to find out the correct type of the result field.

  sql/item_func.h@1.136.2.37, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +3 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The cached_field_type variable is added to the Item_func_min_max class.

  sql/item_timefunc.cc@1.100.31.6, 2007-09-22 11:48:34+04:00, evgen@sunlight.local +1 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The result of the str_to_date function now defaults to the
    DATETIME type.

  sql/mysql_priv.h@1.290.124.1, 2007-09-22 11:48:35+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The prototype of the agg_field_type function is added.

  sql/protocol.cc@1.111.6.2, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +1 -0
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The Protocol_simple::store function is now used to store fields of NEWDATE type.

  sql/sql_insert.cc@1.146.67.1, 2007-09-22 11:48:36+04:00, evgen@sunlight.local +4 -1
    Bug#27216: functions with parameters of different date types may return wrong
    type of the result.
    The create_table_from_items function now uses the
    tmp_table_field_from_field_type function to get field for items with the
    STRING result type.

ChangeSet@1.2528.223.2, 2007-09-21 12:05:54-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
      
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.11, 2007-09-21 12:05:50-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
            
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.1810.3305.6, 2007-09-21 17:52:02+02:00, msvensson@shellback.(none) +1 -0
  - Increase default connect_timeout to avoid intermittent
  disconnects when test servers are put under load

  mysql-test/mysql-test-run.pl@1.30.49.103, 2007-09-21 17:51:59+02:00, msvensson@shellback.(none) +5 -0
    - Increase default connect_timeout to avoid intermittent
    disconnects when test servers are put under load

ChangeSet@1.1810.3314.2, 2007-09-21 11:38:23-04:00, iggy@alf.(none) +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
    
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout.

  win/configure.js@1.1.8.1, 2007-09-21 11:38:19-04:00, iggy@alf.(none) +35 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
        
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

ChangeSet@1.1810.3305.5, 2007-09-21 17:10:45+02:00, msvensson@shellback.(none) +1 -0
  Bug#28359 Intermitted lost connection at 'reading authorization packet' errors
   - Increase default 'connect_timeout' value to 10 seconds

  sql/mysql_priv.h@1.290.123.1, 2007-09-21 17:10:40+02:00, msvensson@shellback.(none) +6 -1
    Increase the default connect_timeout value to 10 seconds

ChangeSet@1.2541.1.20, 2007-09-21 12:17:09+02:00, gkodinov@macbook.local +1 -0
  fixed warnings by bug 30639

  sql/opt_range.cc@1.283, 2007-09-21 12:17:00+02:00, gkodinov@macbook.local +3 -3
    fixed warnings by bug 30639

ChangeSet@1.2541.1.19, 2007-09-21 10:15:16+02:00, gkodinov@macbook.local +10 -0
  fixed type conversion warnings revealed by bug 30639

  sql/opt_range.cc@1.282, 2007-09-21 10:14:57+02:00, gkodinov@macbook.local +9 -9
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_map.cc@1.24, 2007-09-21 10:14:58+02:00, gkodinov@macbook.local +3 -3
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_select.cc@1.562, 2007-09-21 10:14:59+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  sql/sql_update.cc@1.254.1.1, 2007-09-21 10:15:00+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/federated/ha_federated.cc@1.111, 2007-09-21 10:15:01+02:00, gkodinov@macbook.local +3 -3
    fixed type conversion warnings revealed by bug 30639 

  storage/heap/ha_heap.cc@1.118, 2007-09-21 10:15:02+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/innobase/handler/ha_innodb.cc@1.360, 2007-09-21 10:15:02+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/ha_myisam.cc@1.231, 2007-09-21 10:15:03+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/mi_write.c@1.70, 2007-09-21 10:15:04+02:00, gkodinov@macbook.local +1 -1
    fixed type conversion warnings revealed by bug 30639 

  storage/myisam/sort.c@1.72, 2007-09-21 10:15:05+02:00, gkodinov@macbook.local +2 -2
    fixed type conversion warnings revealed by bug 30639 

ChangeSet@1.1810.3308.8, 2007-09-21 12:09:00+04:00, evgen@sunlight.local +4 -0
  Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
  led to creating corrupted index.
  
  While execution of the  CREATE .. SELECT SQL_BUFFER_RESULT statement the 
  engine->start_bulk_insert function was called twice. On the first call
  On the first call MyISAM disabled all non-unique indexes and on the second
  call it decides to not re-enable them because all indexes was disabled.
  Due to this no indexes was actually created during CREATE TABLE thus
  producing crashed table.
  
  Now the select_inset class has is_bulk_insert_mode flag which prevents
  calling the start_bulk_insert function twice.
  The flag is set in the select_create::prepare, select_insert::prepare2
  functions and the select_insert class constructor.
  The flag is reset in the select_insert::send_eof function.

  mysql-test/r/insert_select.result@1.35.1.16, 2007-09-21 12:05:56+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the 
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  mysql-test/t/insert_select.test@1.34.1.7, 2007-09-21 12:05:22+04:00, evgen@sunlight.local +12 -0
    A test case is added for the bug#30384: Having SQL_BUFFER_RESULT option in the
    CREATE .. KEY(..) .. SELECT led to creating corrupted index.

  sql/sql_class.h@1.230.1.116, 2007-09-21 12:06:30+04:00, evgen@sunlight.local +1 -1
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode flag is added to the select_insert class.

  sql/sql_insert.cc@1.146.66.2, 2007-09-21 12:07:40+04:00, evgen@sunlight.local +10 -2
    Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECT
    led to creating corrupted index.
    The is_bulk_insert_mode is set in the select_create::prepare, select_insert::prepare2
    functions and the select_insert class constructor.
    The flag is reset in the select_insert::send_eof function.

ChangeSet@1.1810.3324.1, 2007-09-21 09:48:30+02:00, msvensson@shellback.(none) +2 -0
  Bug#30843 Bad Test addition to t/archive.test
   - Add extra insert

  mysql-test/r/archive.result@1.13.1.6, 2007-09-21 09:48:27+02:00, msvensson@shellback.(none) +3 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

  mysql-test/t/archive.test@1.14.1.6, 2007-09-21 09:48:28+02:00, msvensson@shellback.(none) +9 -1
    Add an extra insert to guarantee that the delayed
    insert shows up in the table 

ChangeSet@1.2528.1.48, 2007-09-21 08:13:52+02:00, mats@kindahl-laptop.dnsalias.net +2 -0
  Fixing bug in test in that a database was not dropped and was visible
  in following tests.

  mysql-test/suite/rpl/r/rpl_bug31076.result@1.2, 2007-09-21 08:13:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
    Result file change.

  mysql-test/suite/rpl/t/rpl_bug31076.test@1.2, 2007-09-21 08:13:28+02:00, mats@kindahl-laptop.dnsalias.net +3 -0
    Dropping database so that following tests don't see it.

ChangeSet@1.1810.3323.1, 2007-09-20 18:10:35+02:00, tnurnberg@sin.intern.azundris.com +5 -0
  Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
  
  clean up SHOW GRANTS so it will show host-names with case as entered.
  make REVOKE and friends case-sensitive to make things more intuitive.
  Patch by Martin Friebe.

  mysql-test/r/grant.result@1.37.14.1, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/r/grant3.result@1.4, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +122 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  mysql-test/t/grant.test@1.41.1.17, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +3 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up after test so random order of tests is possible

  mysql-test/t/grant3.test@1.5, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +100 -0
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.

  sql/sql_acl.cc@1.128.1.95, 2007-09-20 18:10:34+02:00, tnurnberg@sin.intern.azundris.com +31 -10
    Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
    
    clean up SHOW GRANTS so it will show host-names with case as entered.
    make REVOKE and friends case-sensitive to make things more intuitive.
    Patch by Martin Friebe.

ChangeSet@1.1810.3322.1, 2007-09-20 18:05:09+04:00, evgen@sunlight.local +3 -0
  Bug#29908: A user can gain additional access through the ALTER VIEW.
  
  Non-definer of a view was allowed to alter that view. Due to this the alterer
  can elevate his access rights to access rights of the view definer and thus
  modify data which he wasn't allowed to modify. A view defined with
  SQL SECURITY INVOKER can't be used directly for access rights elevation.
  But a user can first alter the view SQL code and then alter the view to 
  SQL SECURITY DEFINER and thus elevate his access rights. Due to this
  altering a view with SQL SECURITY INVOKER is also prohibited.
  
  Now the mysql_create_view function allows ALTER VIEW only to the view
  definer or a super user. 

  mysql-test/r/view_grant.result@1.8.1.18, 2007-09-20 17:48:10+04:00, evgen@sunlight.local +47 -3
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.

  mysql-test/t/view_grant.test@1.8.1.16, 2007-09-20 17:46:26+04:00, evgen@sunlight.local +47 -2
    Added a test case for the bug#29908: A user can gain additional access through the
    ALTER VIEW.
    A test case was adjusted after fixfing bug#29908.

  sql/sql_view.cc@1.78.1.40, 2007-09-20 18:03:16+04:00, evgen@sunlight.local +1 -4
    Bug#29908: A user can gain additional access through the ALTER VIEW.
    Now the mysql_create_view function allows ALTER VIEW only to the view
    definer or a super user. 

ChangeSet@1.2541.12.3, 2007-09-20 16:27:58+05:00, gluh@mysql.com +3 -0
  result fix

  mysql-test/r/alter_table.result@1.87, 2007-09-20 16:27:56+05:00, gluh@mysql.com +4 -4
    result fix

  mysql-test/r/log_tables.result@1.22, 2007-09-20 16:27:56+05:00, gluh@mysql.com +6 -6
    result fix

  mysql-test/r/show_check.result@1.132, 2007-09-20 16:27:56+05:00, gluh@mysql.com +8 -248
    result fix

ChangeSet@1.1810.3308.7, 2007-09-20 14:38:41+05:00, gluh@mysql.com +1 -0
  result fix

  mysql-test/r/grant.result@1.37.1.31, 2007-09-20 14:38:39+05:00, gluh@mysql.com +1 -1
    result fix

ChangeSet@1.1810.3308.6, 2007-09-20 13:54:46+05:00, gluh@mysql.com +17 -0
  Bug#27747 database metadata doesn't return sufficient column default info
  added get_field_default_value() function which obtains default value from the field
  (used in store_create_info() & get_schema_column_record() functions)

  mysql-test/r/alter_table.result@1.49.1.19, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/create.result@1.107.1.28, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ctype_collate.result@1.31.1.3, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/ctype_recoding.result@1.30.1.5, 2007-09-20 13:54:44+05:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/r/default.result@1.3.1.3, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/gis.result@1.35.1.11, 2007-09-20 13:54:44+05:00, gluh@mysql.com +9 -9
    result fix

  mysql-test/r/grant.result@1.37.1.30, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/information_schema.result@1.87.1.38, 2007-09-20 13:54:44+05:00, gluh@mysql.com +32 -1
    result fix

  mysql-test/r/key.result@1.28.1.11, 2007-09-20 13:54:44+05:00, gluh@mysql.com +11 -11
    result fix

  mysql-test/r/mysql.result@1.17.2.14, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/ps_1general.result@1.50.1.8, 2007-09-20 13:54:44+05:00, gluh@mysql.com +3 -3
    result fix

  mysql-test/r/show_check.result@1.75.1.13, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/sp.result@1.170.28.28, 2007-09-20 13:54:44+05:00, gluh@mysql.com +2 -2
    result fix

  mysql-test/r/type_enum.result@1.27.1.7, 2007-09-20 13:54:44+05:00, gluh@mysql.com +1 -1
    result fix

  mysql-test/r/type_ranges.result@1.38.1.8, 2007-09-20 13:54:44+05:00, gluh@mysql.com +11 -11
    result fix

  mysql-test/t/information_schema.test@1.65.1.29, 2007-09-20 13:54:44+05:00, gluh@mysql.com +17 -0
    test case

  sql/sql_show.cc@1.253.52.10, 2007-09-20 13:54:44+05:00, gluh@mysql.com +64 -64
    Bug#27747 database metadata doesn't return sufficient column default info
    added get_field_default_value() function which obtains default value from the field
    (used in store_create_info() & get_schema_column_record() functions)

ChangeSet@1.2528.220.1, 2007-09-19 17:47:52+03:00, gkodinov@magare.gmz +4 -0
  Bug #30639: limit offset,rowcount wraps when rowcount >= 2^32 in windows
  
   The parser uses ulonglong to store the LIMIT number. This number
   then is stored into a variable of type ha_rows. ha_rows is either
   4 or 8 byte depending on the BIG_TABLES define from config.h
   So an overflow may occur (and LIMIT becomes zero) while storing an
   ulonglong value in ha_rows.
   Fixed by :
    1. Using the maximum possible value for ha_rows on overflow
    2. Defining BIG_TABLES for the windows builds (to match the others) 

  include/config-win.h@1.104, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +2 -0
    Bug #30639: turn on BIG_TABLES for windows

  mysql-test/r/select.result@1.163.1.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +17 -0
    Bug #30639: test case

  mysql-test/t/select.test@1.129.1.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +10 -0
    Bug #30639: test case

  sql/sql_lex.cc@1.255.9.1, 2007-09-19 17:47:50+03:00, gkodinov@magare.gmz +11 -2
    Bug #30639: Use the maximum possible number on overflow 
     of LIMIT. This is valid because there won't be more rows
     anyway.

ChangeSet@1.2541.11.1, 2007-09-19 11:20:30+02:00, jmiller@mysql.com +1 -0
  NDBT_Thread.cpp:
    Removed semicolon causing build syntax issues per pekka

  storage/ndb/test/src/NDBT_Thread.cpp@1.3, 2007-09-19 11:20:22+02:00, jmiller@mysql.com +1 -1
    Removed semicolon causing build syntax issues per pekka

ChangeSet@1.2528.219.1, 2007-09-17 21:39:07+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29985.
  Multiple-result processing is required during the execution
  of CALL statements for stored procedures, however the mysqlslap
  client lacked that processing.
  

  client/mysqlslap.c@1.63, 2007-09-17 21:23:40+05:00, gshchepa@gleb.loc +11 -7
    Fixed bug #29985.
    1. Connection flags have been changed: the CLIENT_MULTI_STATEMENTS
    flag has been added.
    2. The run_task function has been modified to process multiple
    result sets.

  mysql-test/r/mysqlslap.result@1.14, 2007-09-17 21:24:50+05:00, gshchepa@gleb.loc +5 -0
    Added test case for bug #29985.

  mysql-test/t/mysqlslap.test@1.18, 2007-09-17 21:24:02+05:00, gshchepa@gleb.loc +11 -0
    Added test case for bug #29985.

ChangeSet@1.2528.216.5, 2007-09-17 12:31:10+02:00, aelkin@dl145j.mysql.com +5 -0
  Merge: bug@27417,23333 and bug#28960 tests with 5.1

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +234 -0
    sourced part for bugs with SF() etc having side effects of midifying
    non-transactional tables.
    

  mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test@1.0, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +0 -0

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@1.24, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +186 -0
    results changed

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.49, 2007-09-17 12:29:36+02:00, aelkin@dl145j.mysql.com +18 -27
    results changed

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@1.13.1.1, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +2 -0
    calling included file with testing bug#27417,23333. bug#28960 is not an rbr bug.

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.16, 2007-09-17 12:29:37+02:00, aelkin@dl145j.mysql.com +3 -231
    moved SF() with side effects bugs to a separate includable file.
    This test verifies STMT format whereas binlog_row test is reposible for
    ROW format.

ChangeSet@1.2528.216.4, 2007-09-16 18:16:40+02:00, aelkin@dl145j.mysql.com +3 -0
  Merge: bug#27417,23333 manual work for fixing tests and a source code.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.48, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +53 -24
    results changed due to 
    1. tt table made temporary is it's supposed to; 
    2. show master status is turned into binlog pos masking-out macro
    3. merge defect for select_insert::abort()

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.15, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +8 -8
    masking-out binlog postions in the results via 
    source include/show_binlog_events.inc;

  sql/sql_insert.cc@1.292.2.3, 2007-09-16 18:15:35+02:00, aelkin@dl145j.mysql.com +10 -9
    merging defect in not applied hunk for select_insert::abort() is fixed

ChangeSet@1.2528.216.3, 2007-09-16 12:07:00+02:00, aelkin@dl145j.mysql.com +5 -0
  Manual merge fixes/tests for bugs_28960,27417,23333.

  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +0 -250
    follow-up of the previous manual resolve. The snippet is moved into the heading
    file.

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@1.47, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +89 -19
    results changed

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@1.14, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +126 -12
    removing explicit offsets from report;
    appending bug#27417,23333,28960 related snippet, addressing left TODO:s.

  mysql-test/suite/rpl/r/rpl_packet.result@1.10, 2007-09-16 12:06:56+02:00, aelkin@dl145j.mysql.com +7 -2
    results changed

  mysql-test/suite/rpl/t/rpl_packet.test@1.13, 2007-09-16 12:06:57+02:00, aelkin@dl145j.mysql.com +1 -1
    fixing row/stmt compatibility with #-ing out unneeded values

ChangeSet@1.2541.9.3, 2007-09-15 23:33:04+02:00, mikael@dator6.(none) +1 -0
  Fixed ndbcluster_rollback

  sql/ha_ndbcluster.cc@1.467.3.2, 2007-09-15 23:33:02+02:00, mikael@dator6.(none) +6 -1
    Fixed ndbcluster_rollback

ChangeSet@1.2528.208.12, 2007-09-15 07:39:58+02:00, gshchepa@devsrv-b.mysql.com +5 -0
  Many files:
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.12, 2007-09-15 07:34:41+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.12, 2007-09-15 07:35:48+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.3, 2007-09-15 07:27:14+02:00, gshchepa@devsrv-b.mysql.com +26 -26
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.23.2.1, 2007-09-15 07:33:35+02:00, gshchepa@devsrv-b.mysql.com +6 -6
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.20.2.1, 2007-09-15 07:37:28+02:00, gshchepa@devsrv-b.mysql.com +6 -6
    Post-merge fix.

ChangeSet@1.1810.3309.6, 2007-09-15 07:04:32+02:00, gshchepa@devsrv-b.mysql.com +1 -0
  select.test:
    Post-fix for bug#27695.

  mysql-test/t/select.test@1.102.1.31, 2007-09-15 07:02:02+02:00, gshchepa@devsrv-b.mysql.com +4 -0
    Post-fix for bug#27695.

ChangeSet@1.2528.218.2, 2007-09-15 04:59:46+02:00, tnurnberg@mysql.com +1 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  after merge fix :-/

  client/mysqlbinlog.cc@1.157.2.2, 2007-09-15 04:59:32+02:00, tnurnberg@mysql.com +0 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    after merge fix :-/

ChangeSet@1.2528.217.1, 2007-09-14 21:15:57+04:00, sergefp@mysql.com +1 -0
  Fix compile failure on windows

  sql/item.h@1.260, 2007-09-14 21:15:53+04:00, sergefp@mysql.com +1 -1
    Fix compile failure on windows

ChangeSet@1.2528.215.1, 2007-09-14 11:22:41-04:00, cbell@mysql_cab_desk. +4 -0
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch clarifies some of the coding choices with documentationa and
  removes a limitation in the code for future expansion of the CHAR and
  BINARY fields to length > 255.

  sql/field.cc@1.410.3.2, 2007-09-14 11:22:36-04:00, cbell@mysql_cab_desk. +1 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds an assertion to ensure we are not attempting to encode
    negative values.

  sql/log_event.cc@1.297.4.5, 2007-09-14 11:22:37-04:00, cbell@mysql_cab_desk. +10 -0
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch adds comments to help explain the choice of variable types.

  sql/rpl_utility.cc@1.15.3.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +23 -13
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch removes code from the calc_field_size that is not needed and
    was ambiguous. Originally intended to future expansion, the code was
    not needed.
    
    Also added are comments to help explain some portions of the code.
    
    A change was made to the korr method to use the unsigned version to 
    avoid extended sign problems.

  sql/rpl_utility.h@1.12.4.1, 2007-09-14 11:22:38-04:00, cbell@mysql_cab_desk. +7 -7
    BUG#30790 : Suspicious code in rpl_utility.cc
    
    This patch corrects some type discrepencies and removes an extra cast.

ChangeSet@1.2528.208.8, 2007-09-14 17:21:50+02:00, gshchepa@devsrv-b.mysql.com +15 -0
  Many files:
    Merge with 5.0-opt.

  mysql-test/r/binlog_unsafe.result@1.5, 2007-09-14 11:00:34+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/r/events_bugs.result@1.42, 2007-09-14 11:03:19+02:00, gshchepa@devsrv-b.mysql.com +8 -8
    Merge with 5.0-opt.

  mysql-test/r/events_trans.result@1.5, 2007-09-14 11:04:19+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/r/sp.result@1.295, 2007-09-14 15:36:07+02:00, gshchepa@devsrv-b.mysql.com +4 -4
    Merge with 5.0-opt.

  mysql-test/r/sp_gis.result@1.10, 2007-09-14 15:37:12+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/r/xml.result@1.27, 2007-09-14 15:38:25+02:00, gshchepa@devsrv-b.mysql.com +9 -9
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.22.1.1, 2007-09-14 17:01:45+02:00, gshchepa@devsrv-b.mysql.com +3 -3
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.20, 2007-09-14 17:02:37+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_gis.result@1.26, 2007-09-14 17:03:18+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.8, 2007-09-14 17:04:20+02:00, gshchepa@devsrv-b.mysql.com +1 -1
    Merge with 5.0-opt.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.14, 2007-09-14 17:05:10+02:00, gshchepa@devsrv-b.mysql.com +5 -5
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_incident.result@1.12, 2007-09-14 15:39:51+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.7, 2007-09-14 16:57:31+02:00, gshchepa@devsrv-b.mysql.com +2 -2
    Merge with 5.0-opt.

  mysql-test/suite/rpl/r/rpl_udf.result@1.11, 2007-09-14 16:58:24+02:00, gshchepa@devsrv-b.mysql.com +4 -4
    Merge with 5.0-opt.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.13, 2007-09-14 17:00:03+02:00, gshchepa@devsrv-b.mysql.com +16 -16
    Merge with 5.0-opt.

ChangeSet@1.1810.3321.1, 2007-09-14 17:43:14+03:00, gkodinov@magare.gmz +3 -0
  Bug #31001: ORDER BY DESC in InnoDB not working
  
  The optimizer sets index traversal in reverse order only if there are 
   used key parts that are not compared to a constant.
  However using the primary key as an ORDER BY suffix rendered the check
  incomplete : going in reverse order must still be used even if 
  all the parts of the secondary key are compared to a constant.
  
  Fixed by relaxing the check and set reverse traversal even when all
  the secondary index keyparts are compared to a const.
  Also account for the case when all the primary keys are compared to a
  constant.

  mysql-test/t/innodb_mysql.test@1.3.48.1, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +23 -0
    Bug #31001: test case

  mysql-test/r/innodb_mysql.result@1.3.22.4, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +97 -0
    Bug #31001: test case

  sql/sql_select.cc@1.312.166.7, 2007-09-14 17:43:12+03:00, gkodinov@magare.gmz +7 -1
    Bug #31001: 
     - account for the case when all the primary key parts are compared
       to a constant
     - force test_if_skip_sort_order to go backwards over the key even 
       when the number of keyparts used is the same as the number of 
       keyparts equal to a constant. (because of the primary key 
       suffix).

ChangeSet@1.1810.3319.1, 2007-09-14 14:53:13+04:00, sergefp@mysql.com +3 -0
  BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
  - The bug was caused by COUNT(DISTINCT ...) code using Unique object in 
    a way that assumed that BIT(N) column occupies a contiguous space in
    temp_table->record[0] buffer. 
  - The fix is to make COUNT(DISTINCT ...) code instruct create_tmp_table to
    create temporary table with column of type BIGINT, not BIT(N).

  mysql-test/r/type_bit.result@1.14.1.10, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +15 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Testcase

  mysql-test/t/type_bit.test@1.18.1.4, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +14 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Testcase

  sql/item_sum.cc@1.170.1.42, 2007-09-14 14:53:11+04:00, sergefp@mysql.com +17 -0
    BUG#30324: Grouping queries with COUNT(DISTINCT bit column) return wrong results
    - Make COUNT(DISTINCT ...) code instruct create_tmp_table to create 
      temporary table with BIGINT, not BIT(N) column.

ChangeSet@1.2528.213.1, 2007-09-14 14:18:42+04:00, sergefp@mysql.com +8 -0
  BUG#27927:Partition pruning not optimal with TO_DAYS and YEAR functions
  - Introduced val_int_endpoint() function which converts between func 
    argument intervals and func value intervals for monotonic functions.
  - Made partition interval analyzer use part_expr->val_int_endpoint()
    to check if the edge values should be included.

  mysql-test/r/partition_pruning.result@1.27.1.1, 2007-09-14 14:17:38+04:00, sergefp@mysql.com +28 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Testcase

  mysql-test/t/partition_pruning.test@1.22, 2007-09-14 14:17:39+04:00, sergefp@mysql.com +31 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Testcase

  sql/item.cc@1.285.1.1, 2007-09-14 14:17:39+04:00, sergefp@mysql.com +5 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added Item_field::val_int_endpoint() implementation

  sql/item.h@1.259, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +38 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added Item::val_int_endpoint() which converts intervals from argument
      space to function value space for unary monotonic functions.

  sql/item_timefunc.cc@1.173, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +70 -1
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added val_int_endpoint() for TO_DAYS and YEAR functions.

  sql/item_timefunc.h@1.89, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +2 -0
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Added val_int_endpoint() for TO_DAYS and YEAR functions.

  sql/partition_info.h@1.25, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +0 -14
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Removed partition_info::range_analysis_include_bounds as it is no longer 
      needed.

  sql/sql_partition.cc@1.115, 2007-09-14 14:17:40+04:00, sergefp@mysql.com +8 -12
    BUG#27927: Partition pruning not optimal with TO_DAYS and YEAR functions
    - Make partition interval analyzer use part_expr->val_int_endpoint() to 
      check if the edge values should be included.

ChangeSet@1.2528.141.50, 2007-09-13 19:22:08-03:00, davi@moksha.local +3 -0
  Bug#30747 Create table with identical constraint names behaves incorrectly
  
  MySQL provides what appears to be a non standard extension to the
  FOREIGN KEY syntax which let users name (label/tag) a foreign key
  to more easily identify a specific foreign key if any problems show
  up later during the query parsing or execution. But the foreign key
  name was not being properly set to the right key, possible leaving
  the foreign key with no name.

  mysql-test/include/mix1.inc@1.51.1.1, 2007-09-13 19:22:04-03:00, davi@moksha.local +34 -0
    Add test case for Bug#30747

  mysql-test/r/innodb_mysql.result@1.54.1.1, 2007-09-13 19:22:05-03:00, davi@moksha.local +36 -0
    Add test case result for Bug#30747

  sql/sql_yacc.yy@1.601.1.3, 2007-09-13 19:22:05-03:00, davi@moksha.local +3 -2
    Set the foreign key name to the constraint name if a specific name was
    not provided. As for the constraint name, only use the foreign name if
    a specific name was not provided.

ChangeSet@1.2541.9.2, 2007-09-14 00:10:47+02:00, mikael@dator6.(none) +4 -0
  BUG#30996: Committed too early when autocommit and lock table
  Moved out a lot of code into functions from external_lock and
  start_stmt
  Fixed a crashing bug at memory alloc failure
  Merged the stmt and all variables into one trans variable
  Always register start of statement as according to the
  interface of the handlers.
  Also register for start of transaction when not statement commit
  == not autocommit AND no begin - commit ongoing
  Now that we registered in a proper manner we also needed to handle
  the commit call when end of statement and transaction is ongoing
  Added start_stmt_count to know when we have start of statement
  for first table

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +11 -0
    Added a new test case for bug30996

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.1, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/r/ndb_lock_table.result

  mysql-test/suite/ndb/r/ndb_lock_table.result@1.0, 2007-09-13 13:07:17+02:00, mikael@dator6.(none) +0 -0

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.2, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +5 -1
    Added a new test case for bug30996

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.1, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +11 -0
    BitKeeper file /home/mikael/mysql_clones/bug30996/mysql-test/suite/ndb/t/ndb_lock_table.test

  mysql-test/suite/ndb/t/ndb_lock_table.test@1.0, 2007-09-13 13:07:27+02:00, mikael@dator6.(none) +0 -0

  sql/ha_ndbcluster.cc@1.467.3.1, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +166 -163
    Moved out a lot of code into functions from external_lock and
    start_stmt
    Fixed a crashing bug at memory alloc failure
    Merged the stmt and all variables into one trans variable
    Always register start of statement as according to the
    interface of the handlers.
    Also register for start of transaction when not statement commit
    == not autocommit AND no begin - commit ongoing
    Now that we registered in a proper manner we also needed to handle
    the commit call when end of statement and transaction is ongoing
    Added start_stmt_count to know when we have start of statement
    for first table

  sql/ha_ndbcluster.h@1.187, 2007-09-14 00:10:44+02:00, mikael@dator6.(none) +6 -2
    New functions and merged variables

ChangeSet@1.2528.120.45, 2007-09-13 09:34:21-07:00, antony@pcg5ppc.xiphis.org +2 -0
  fix intermittant timing-related test failure

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.6, 2007-09-13 09:34:17-07:00, antony@pcg5ppc.xiphis.org +1 -1
    fix intermittant timing-related test failure

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.5, 2007-09-13 09:34:17-07:00, antony@pcg5ppc.xiphis.org +1 -1
    fix intermittant timing-related test failure

ChangeSet@1.1810.3314.1, 2007-09-13 16:19:46+02:00, tnurnberg@mysql.com +26 -0
  Bug #15327: configure: --with-tcp-port option being partially ignored
  
  make sure that if builder configured with a non-standard (!= 3306)
  default TCP port that value actually gets used throughout. if they
  didn't configure a value, assume "use a sensible default", which
  will be read from /etc/services or, failing that, from the factory
  default. That makes the order of preference
  - command-line option
  - my.cnf, where applicable
  - $MYSQL_TCP_PORT environment variable
  - /etc/services (unless configured --with-tcp-port)
  - default port (--with-tcp-port=... or factory default)

  scripts/mysqld_safe-watch.sh@1.5.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  client/mysqlmanagerc.c@1.13.2.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql.cc@1.199.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysql_upgrade.c@1.6.11.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -2
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqladmin.cc@1.115.1.3, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlbinlog.cc@1.123.1.17, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +8 -3
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlcheck.c@1.55.1.4, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqldump.c@1.214.27.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlimport.c@1.58.1.5, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqlshow.c@1.49.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  client/mysqltest.c@1.155.36.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  configure.in@1.245.102.1, 2007-09-13 16:19:43+02:00, tnurnberg@mysql.com +28 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    If MYSQL_TCP_PORT defaulted in configure (factory default 3306
    at the time of this writing), set MYSQL_TCP_PORT to factory
    default, then clear factory default after. That way, we lose no
    information, and we can distinguish between "defaulted" and the
    pathological case "builder specifically configured a port that
    coincides with factory default." This can in theory happen if
    builder configures and builds several servers from a script
    (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326).
    Not all that probable, but much preferable to having more "magic"
    happen in the server when we can solve this without any guesswork.

  include/mysql_version.h.in@1.20, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  libmysql/libmysql.c@1.233.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +17 -4
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    initialize default tcp port for client, like so:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)
    - environment variable MYSQL_TCP_PORT overrides this default
    - command-line option overrides all of the above

  mysql-test/Makefile.am@1.66.7.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  mysql-test/mysql-test-run-shell.sh@1.262.22.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +10 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  netware/mysql_test_run.c@1.18.2.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +2 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  netware/mysqld_safe.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  scripts/Makefile.am@1.43.3.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT
    if build-time configured with a different default.  (0 if unchanged)

  scripts/mysql_config.sh@1.27.1.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +6 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    set up MYSQL_TCP_PORT if not already set in environment:
    - if user configured --with-tcp-port, use that value as default
    - otherwise assume "use a good default": search mysqld/tcp in
      /etc/services; if that doesn't exist, use factory default (3306)

  scripts/mysql_fix_privilege_tables.sh@1.35.1.4, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -0
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    clarifying notice only

  server-tools/instance-manager/priv.h@1.10.1.3, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  sql/mysqld.cc@1.439.124.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +20 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    if builder specifically requested a default port, use that
    (even if it coincides with our factory default).
    only if they didn't do we check /etc/services (and, failing
    on that, fall back to the factory default of 3306).
    either default can be overridden by the environment variable
    MYSQL_TCP_PORT, which in turn can be overridden with command
    line options.

  tests/mysql_client_test.c@1.167.35.1, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

  tests/ssl_test.c@1.11, 2007-09-13 16:19:44+02:00, tnurnberg@mysql.com +1 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    account for non-standard default port-no. configured at build-time

  tests/thread_test.c@1.17.1.1, 2007-09-13 16:19:45+02:00, tnurnberg@mysql.com +7 -1
    Bug #15327: configure: --with-tcp-port option being partially ignored
    
    make help on --port a little more clear

ChangeSet@1.1810.3313.1, 2007-09-13 18:41:50+05:00, gshchepa@gleb.loc +4 -0
  Fixed bug #27695.
  Declaring an all space column name in the SELECT FROM DUAL or in a view
  leads to misleading warning message:
  "Leading spaces are removed from name ' '".
  
  The Item::set_name method has been modified to raise warnings like
  "Name ' ' has become ''" in case of the truncation of an all
  space identifier to an empty string identifier instead of the
  "Leading spaces are removed from name ' '" warning message.

  mysql-test/r/select.result@1.121.1.37, 2007-09-13 18:31:07+05:00, gshchepa@gleb.loc +34 -0
    Added test case for bug #27695.

  mysql-test/t/select.test@1.102.1.30, 2007-09-13 18:31:03+05:00, gshchepa@gleb.loc +20 -0
    Added test case for bug #27695.

  sql/item.cc@1.113.1.169, 2007-09-13 18:30:28+05:00, gshchepa@gleb.loc +10 -4
    Fixed bug #27695.
    The Item::set_name method has been modified to raise warnings like
    "Name ' ' has become ''" in case of the truncation of an all
    space identifier to an empty string identifier instead of the
    "Leading spaces are removed from name ' '" warning message.

  sql/share/errmsg.txt@1.42.1.39, 2007-09-13 18:30:34+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27695.

ChangeSet@1.2528.209.1, 2007-09-13 18:33:40+05:00, svoj@mysql.com +3 -0
  BUG#30583 - Partition on DOUBLE key + INNODB + count(*) == crash
  
  Issuing SELECT COUNT(*) against partitioned InnoDB table may cause
  server crash.
  
  Fixed that not all required fields were included into read_set.

  mysql-test/r/partition_innodb.result@1.7, 2007-09-13 18:33:37+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30583.

  mysql-test/t/partition_innodb.test@1.6, 2007-09-13 18:33:37+05:00, svoj@mysql.com +8 -0
    A test case for BUG#30583.

  sql/ha_partition.cc@1.97.2.1, 2007-09-13 18:33:37+05:00, svoj@mysql.com +16 -0
    Ensure that all fields of current key are included into read_set,
    as partitioning requires them for sorting
    (see ha_partition::handle_ordered_index_scan).

ChangeSet@1.1810.3312.1, 2007-09-13 17:30:44+04:00, anozdrin@station. +2 -0
  Bug#16918: Aborted_clients > Connections.
  
  The problem was that aborted_threads variable was updated
  twice when a client connection had been aborted.
  
  The fix is to refactor a code to have aborted_threads updated
  only in one place.

  sql/mysql_priv.h@1.290.1.171, 2007-09-13 17:30:42+04:00, anozdrin@station. +0 -1
    Make do_command() a private function.

  sql/sql_parse.cc@1.426.162.1, 2007-09-13 17:30:43+04:00, anozdrin@station. +17 -10
    1. Make do_command() a private function;
    2. Update aborted_threads in the only one place.

ChangeSet@1.1616.3096.1, 2007-09-13 15:39:16+05:00, svoj@mysql.com +5 -0
  BUG#30590 - delete from memory table with composite btree primary key
  
  DELETE query against memory table with btree index may remove
  not all matching rows. This happens only when DELETE uses
  index read method to find matching rows. E.g. for queries
  like DELETE FROM t1 WHERE a=1.
  
  Fixed by reverting fix for BUG9719 and applying proper solution.

  mysql-test/r/heap_btree.result@1.13.2.5, 2007-09-13 15:39:15+05:00, svoj@mysql.com +7 -0
    A test case for BUG#30590.

  mysql-test/t/heap_btree.test@1.12.1.6, 2007-09-13 15:39:15+05:00, svoj@mysql.com +9 -0
    A test case for BUG#30590.

  heap/hp_delete.c@1.12.2.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +0 -3
    Reverted fix for BUG9719 as it makes queries like
    DELETE FROM t1 WHERE a=1 to remove not all matching
    rows (assuming this is memory table and there is btree
    key over `a`).
    
    This happens because we calculate info->lastkey_len in
    heap_rkey(). When we enter heap_rnext(), info->lastkey_len
    is 0 (set by hp_rb_delete_key()). We need to preserve
    info->lastkey_len in this situation, otherwise
    tree_search_key() will always return smallest value in
    a tree.

  heap/hp_rfirst.c@1.13.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +11 -0
    If we're performing index_first on a table that was taken from
    table cache, info->lastkey_len is initialized to previous query.
    Thus we set info->lastkey_len to proper value for subsequent
    heap_rnext() calls.
    This is needed for DELETE queries only, otherwise this variable is
    not used.
    Note that the same workaround may be needed for heap_rlast(), but
    for now heap_rlast() is never used for DELETE queries.

  heap/hp_rnext.c@1.11.3.1, 2007-09-13 15:39:15+05:00, svoj@mysql.com +29 -0
    An optimization for DELETE queries that use index_first()/index_next().
    Use faster tree_search_edge() instead of tree_search_key().

ChangeSet@1.1810.3310.1, 2007-09-13 09:47:21+02:00, mskold@mysql.com +1 -0
  bug#27494  An invalid subselect crashes mysql server: Added check for missing arguments

  sql/ha_ndbcluster_cond.cc@1.4.1.1, 2007-09-13 09:46:53+02:00, mskold@mysql.com +8 -0
    bug#27494  An invalid subselect crashes mysql server: Added check for missing arguments

ChangeSet@1.2528.120.44, 2007-09-12 18:16:50-07:00, antony@pcg5ppc.xiphis.org +4 -0
  Changes for pushbuild test runs and VSC compile warnings

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.5, 2007-09-12 18:16:45-07:00, antony@pcg5ppc.xiphis.org +1 -1
    Fix test results for pushbuild

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.4, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +2 -0
    Fix test results for pushbuild

  mysql-test/suite/rpl/t/rpl_innodb_bug30888.test@1.4, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +1 -0
    Fix test results for pushbuild

  storage/innobase/handler/ha_innodb.cc@1.355.1.8, 2007-09-12 18:16:46-07:00, antony@pcg5ppc.xiphis.org +1 -1
    resolve a VSC++ typecast compile warning.

ChangeSet@1.2528.208.2, 2007-09-13 02:09:29+05:00, gshchepa@gleb.loc +1 -0
  sql_view.cc:
    Post-merge fix.

  sql/sql_view.cc@1.149, 2007-09-13 02:08:41+05:00, gshchepa@gleb.loc +2 -1
    Post-merge fix.

ChangeSet@1.2528.120.43, 2007-09-12 13:35:39-07:00, antony@pcg5ppc.xiphis.org +7 -0
  undo unneccessary change to ha_innodb.cc
  remove 'drop database' from new tests.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@1.4, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +4 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/r/rpl_innodb_bug30888.result@1.3, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +0 -2
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/r/rpl_innodb_bug30919.result@1.2, 2007-09-12 13:35:33-07:00, antony@pcg5ppc.xiphis.org +0 -2
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@1.3, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug30888.test@1.3, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -6
    remove "DROP DATABASE test"

  mysql-test/suite/rpl/t/rpl_innodb_bug30919.test@1.2, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -4
    remove "DROP DATABASE test"

  storage/innobase/handler/ha_innodb.cc@1.355.1.7, 2007-09-12 13:35:34-07:00, antony@pcg5ppc.xiphis.org +2 -7
    undo unneccessary edits.

ChangeSet@1.2528.207.1, 2007-09-12 12:42:02-06:00, malff@lambda.weblab +1 -0
  Cleanup of sql_yacc.yy

  sql/sql_yacc.yy@1.601.2.1, 2007-09-12 12:41:57-06:00, malff@lambda.weblab +15 -15
    Remove useless actions from the grammar.
    Empty {} actions in the middle of a rule caused an extra reduce,
    which is affecting the parser complexity and performances.

ChangeSet@1.1810.3307.5, 2007-09-12 18:13:19+04:00, sergefp@mysql.com +1 -0
  Better wording in comments

  sql/opt_range.cc@1.159.1.94, 2007-09-12 18:13:15+04:00, sergefp@mysql.com +2 -2
    Better wording in comments

ChangeSet@1.1810.3202.10, 2007-09-12 13:53:32+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  BUG#23354 revert

  ndb/src/common/debugger/EventLogger.cpp@1.21.17.1, 2007-09-12 13:53:30+02:00, tomas@whalegate.ndb.mysql.com +2 -0
    BUG#23354 revert

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.45.2, 2007-09-12 13:53:30+02:00, tomas@whalegate.ndb.mysql.com +1 -9
    BUG#23354 revert

ChangeSet@1.1810.3307.4, 2007-09-12 01:52:27+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes

  mysql-test/r/delete.result@1.31, 2007-09-12 01:52:24+04:00, sergefp@mysql.com +0 -1
    Post-merge fixes

ChangeSet@1.2528.199.5, 2007-09-11 20:47:17+05:00, holyfoot@mysql.com +1 -0
  merging

  mysql-test/r/partition_pruning.result@1.28, 2007-09-11 20:47:15+05:00, holyfoot@mysql.com +2 -2
    merging

ChangeSet@1.2403.18.80, 2007-09-11 16:45:22+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#30914
    Dont add insert+delete tuple(s) to lcp-keep-list

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@1.21.2.5, 2007-09-11 16:45:20+02:00, jonas@perch.ndb.mysql.com +2 -1
    ndb - bug#30914
      Dont add insert+delete tuple(s) to lcp-keep-list

ChangeSet@1.2528.206.1, 2007-09-11 15:00:52+02:00, msvensson@pilot.(none) +1 -0
  Add support for specifying suites not located in mysql-test/suite/
  Example otions that will all run binlog_stm_binlog.test in suite/binlog:
   --suite=binlog binlog.binlog_stm_binlog
   --suite=binlog binlog_stm_binlog
   binlog_stm_binlog
   --suite=suite/binlog binlog.binlog_stm_binlog
   --suite=suite/binlog binlog_stm_binlog
   

  mysql-test/lib/mtr_cases.pl@1.65, 2007-09-11 15:00:50+02:00, msvensson@pilot.(none) +10 -13
    Add support for specifying suites not located in mysql-test/suite/
    Example otions that will all run binlog_stm_binlog.test in suite/binlog:
     --suite=binlog binlog.binlog_stm_binlog
     --suite=binlog binlog_stm_binlog
     binlog_stm_binlog
     --suite=suite/binlog binlog.binlog_stm_binlog
     --suite=suite/binlog binlog_stm_binlog
     

ChangeSet@1.1810.3307.3, 2007-09-11 02:41:42+04:00, sergefp@mysql.com +1 -0
  Post-merge fixes

  mysql-test/t/delete.test@1.29, 2007-09-11 02:41:38+04:00, sergefp@mysql.com +0 -1
    Post-merge fixes

ChangeSet@1.2528.141.48, 2007-09-10 16:10:37-06:00, malff@lambda.weblab +18 -0
  WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name>
    UPGRADE)
  
  Bug 17565 (RENAME DATABASE destroys events)
  Bug#28360 (RENAME DATABASE destroys routines)
  
  Removed the
    RENAME DATABASE db1 TO db2
  statement.
  
  Implemented the
    ALTER DATABASE db UPGRADE DATA DIRECTORY NAME
  statement, which has the same function.

  client/mysqlcheck.c@1.68, 2007-09-10 12:53:15-06:00, malff@omega.weblab +21 -4
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/create.result@1.153, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/query_cache.result@1.103, 2007-09-10 12:53:15-06:00, malff@omega.weblab +0 -49
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/renamedb.result@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -32
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-code.result@1.17, 2007-09-10 12:53:15-06:00, malff@omega.weblab +2 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/sp-error.result@1.129, 2007-09-10 12:53:15-06:00, malff@omega.weblab +13 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/r/upgrade.result@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +25 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/create.test@1.104, 2007-09-10 12:53:15-06:00, malff@omega.weblab +11 -8
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/query_cache.test@1.84, 2007-09-10 12:53:15-06:00, malff@omega.weblab +39 -41
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/renamedb.test@1.3, 2007-09-10 12:53:15-06:00, malff@omega.weblab +49 -22
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/sp-error.test@1.125, 2007-09-10 12:53:15-06:00, malff@omega.weblab +28 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  mysql-test/t/upgrade.test@1.6, 2007-09-10 12:53:15-06:00, malff@omega.weblab +31 -0
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/mysql_priv.h@1.539, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_db.cc@1.163, 2007-09-10 16:10:32-06:00, malff@lambda.weblab +42 -80
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_lex.h@1.297, 2007-09-10 12:53:16-06:00, malff@omega.weblab +1 -2
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_parse.cc@1.700.3.2, 2007-09-10 12:53:16-06:00, malff@omega.weblab +11 -15
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_prepare.cc@1.232, 2007-09-10 12:53:17-06:00, malff@omega.weblab +1 -1
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

  sql/sql_yacc.yy@1.601.1.1, 2007-09-10 12:53:17-06:00, malff@omega.weblab +12 -20
      ALTER DATABASE db UPGRADE DATA DIRECTORY NAME

ChangeSet@1.1616.3095.1, 2007-09-10 16:26:51+04:00, sergefp@mysql.com +3 -0
  BUG#30385: Server crash when deleting with ORDER BY and LIMIT
  in get_index_for_order(), don't walk over the end of the index key parts
  when matching index description and needed ordering.

  mysql-test/r/delete.result@1.21.1.4, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +11 -0
    BUG#30385: Testcase

  mysql-test/t/delete.test@1.19.1.5, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +13 -0
    BUG#30385: Testcase

  sql/opt_range.cc@1.98.12.4, 2007-09-10 16:26:49+04:00, sergefp@mysql.com +2 -1
    BUG#30385: Server crash when deleting with ORDER BY and LIMIT
    in get_index_for_order(), don't walk over the end of the index key parts
    when matching index description and needed ordering.

ChangeSet@1.2528.204.1, 2007-09-07 18:41:49+05:00, holyfoot@mysql.com +4 -0
  Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
  
  In the ha_partition::position() we don't calculate the number
  of the partition of the record, but use m_last_part value instead,
  relying on that it's previously set by some other call like ::write_row().
  Delete_rows_log_event::do_exec_row() calls find_and_fetch_row(),
  where we used position() + rnd_pos() call for the InnoDB-based PARTITION-ed
  table as there HA_PRIMARY_KEY_REQUIRED_FOR_POSITION enabled.
  
  fixed by introducing new handler::rnd_pos_by_record() method to be
  used for random record-based positioning

  sql/ha_partition.cc@1.100.1.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +32 -6
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    ha_partition::rnd_pos_by_record() implemented

  sql/ha_partition.h@1.41.1.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +1 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    ha_partition::rnd_pos_by_record() declared

  sql/handler.h@1.277, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +6 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    handler::rnd_pos_by_record() introduced

  sql/handler.h@1.276, 2007-09-07 18:25:06+05:00, holyfoot@mysql.com +5 -0
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    handler::rnd_pos_by_record() declared

  sql/log_event.cc@1.302.2.1, 2007-09-07 18:41:46+05:00, holyfoot@mysql.com +1 -2
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    
    handler::rnd_pos_by_record used instead of position() + rnd_pos() call

ChangeSet@1.2541.3.11, 2007-09-07 11:15:07+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug #11313 confusing/erroneous 4006 message

  sql/ha_ndbcluster_binlog.cc@1.131, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/Ndb.cpp@1.98, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +3 -2
    Bug #11313 confusing/erroneous 4006 message

  storage/ndb/src/ndbapi/ndberror.c@1.94, 2007-09-07 11:15:04+02:00, tomas@whalegate.ndb.mysql.com +1 -0
    Bug #11313 confusing/erroneous 4006 message

ChangeSet@1.2528.1.42, 2007-09-07 12:04:57+04:00, skozlov@mysql.com +1 -0
  replaced '--exec rm' to '--remove_file'

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.7, 2007-09-07 12:04:48+04:00, skozlov@mysql.com +2 -2
    replaced '--exec rm' to '--remove_file'

ChangeSet@1.1810.2582.3, 2007-09-07 11:58:04+04:00, kaa@polly.(none) +2 -0
  This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB".
    
  The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
    
  - I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
  - even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.

  include/my_global.h@1.96.10.3, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +0 -3
    Removed SSIZE_MAX definition because it's not neeeded anymore.

  sql/mysqld.cc@1.439.123.1, 2007-09-07 11:57:48+04:00, kaa@polly.(none) +3 -3
    Limit read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms.

ChangeSet@1.2528.141.46, 2007-09-06 12:06:22-06:00, malff@omega.weblab +2 -0
  Test cleanup in rpl_binlog_grant: XID values are unpredictable

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.2, 2007-09-06 12:06:20-06:00, malff@omega.weblab +3 -3
    Test cleanup in rpl_binlog_grant: XID values are unpredictable

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.2, 2007-09-06 12:06:20-06:00, malff@omega.weblab +2 -0
    Test cleanup in rpl_binlog_grant: XID values are unpredictable

ChangeSet@1.2528.144.24, 2007-09-06 21:56:46+05:00, gshchepa@gleb.loc +1 -0
  sql_parse.cc:
    Post-merge fix.

  sql/sql_parse.cc@1.700.1.6, 2007-09-06 21:56:03+05:00, gshchepa@gleb.loc +0 -1
    Post-merge fix.

ChangeSet@1.2528.203.1, 2007-09-06 13:22:34-03:00, davi@moksha.local +4 -0
  The test case for bug 28587 doesn't work with the embedded version,
  the first query is not running while we are doing wait queries on
  a second connection.

  mysql-test/r/insert_notembedded.result@1.2, 2007-09-06 13:22:31-03:00, davi@moksha.local +19 -0
    Test case result for bug 28587 moved from insert_update.result

  mysql-test/r/insert_update.result@1.35, 2007-09-06 13:22:31-03:00, davi@moksha.local +0 -19
    Remove test case result for bug 28587, moving to insert_notembedded.result

  mysql-test/t/insert_notembedded.test@1.2, 2007-09-06 13:22:31-03:00, davi@moksha.local +35 -0
    Test case result for bug 28587, moved from insert_update.test

  mysql-test/t/insert_update.test@1.31, 2007-09-06 13:22:31-03:00, davi@moksha.local +0 -35
    Remove test case for bug 28587, moving to insert_notembedded.test

ChangeSet@1.2528.144.23, 2007-09-06 20:42:36+05:00, gshchepa@gleb.loc +1 -0
  sp.result:
    Post-merge fix.

  mysql-test/r/sp.result@1.288.2.2, 2007-09-06 19:21:16+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

ChangeSet@1.2528.141.44, 2007-09-06 15:57:36+04:00, dlenev@mockturtle.local +1 -0
  Make events.test more robust against timing issues.

  mysql-test/t/events.test@1.53, 2007-09-06 15:57:32+04:00, dlenev@mockturtle.local +2 -1
    Wait until event scheduler thread reaches exactly the same state
    which later appears in the results of select from processlist.

ChangeSet@1.1810.3306.1, 2007-09-05 16:30:38-05:00, rburnett@xp64. +3 -0
  Adding batch files for building with nmake make files

  libmysql/libmysql.c@1.233.21.1, 2007-09-05 16:25:25-05:00, 'rburnett'@xp64. +0 -1
    remove the duplicate call to DBUG_ENTER

  win/build-nmake-x64.bat@1.1, 2007-09-05 16:30:31-05:00, rburnett@xp64. +21 -0
    New BitKeeper file ``win/build-nmake-x64.bat''

  win/build-nmake-x64.bat@1.0, 2007-09-05 16:30:31-05:00, rburnett@xp64. +0 -0

  win/build-nmake.bat@1.1, 2007-09-05 16:30:32-05:00, rburnett@xp64. +21 -0
    New BitKeeper file ``win/build-nmake.bat''

  win/build-nmake.bat@1.0, 2007-09-05 16:30:32-05:00, rburnett@xp64. +0 -0

ChangeSet@1.1810.3246.2, 2007-09-05 15:06:10-04:00, dkatz@damien-katzs-computer.local +5 -0
  Bug #29804  UDF parameters don't contain correct string length
    
  Previously, UDF *_init functions were passed constant strings with erroneous lengths.
  The length came from the containing variable's size, not the length of the value itself.
    
  Now the *_init functions get the constant as a null terminated string with the correct
  length supplied too.

  mysql-test/r/udf.result@1.3.1.11, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.8.1.6, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.270.74.1, 2007-09-05 15:06:06-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max
    length of the var containing the constant.

  sql/udf_example.c@1.29.1.7, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that the
    lengths of constants are correctly passed.

  sql/udf_example.def@1.3.1.1, 2007-09-05 15:06:07-04:00, dkatz@damien-katzs-computer.local +2 -0
    Add new example functions to windows dll export list.

ChangeSet@1.2528.202.1, 2007-09-05 12:14:43-06:00, malff@omega.weblab +2 -0
  Test events_logs_tests cleanup
  Fixed test failure under heavy load, in case truncate table is slow.

  mysql-test/r/events_logs_tests.result@1.20, 2007-09-05 12:13:17-06:00, malff@omega.weblab +4 -2
    Fixed test failure under heavy load, in case truncate table is slow.

  mysql-test/t/events_logs_tests.test@1.21, 2007-09-05 12:13:17-06:00, malff@omega.weblab +4 -2
    Fixed test failure under heavy load, in case truncate table is slow.

ChangeSet@1.2528.141.41, 2007-09-05 15:03:02-03:00, davi@moksha.local +4 -0
  The test case for Bug#29936 doesn't work with the embedded version,
  the first query is not running while we are doing wait queries on
  a second connection.

  mysql-test/r/sp.result@1.292, 2007-09-05 15:02:59-03:00, davi@moksha.local +0 -23
    Remove test case result for Bug#29936, moving to sp_notembedded.result

  mysql-test/r/sp_notembedded.result@1.9, 2007-09-05 15:02:59-03:00, davi@moksha.local +23 -0
    Test case result for Bug#29936, moved from sp.result

  mysql-test/t/sp.test@1.256, 2007-09-05 15:02:59-03:00, davi@moksha.local +0 -65
    Remove test case for Bug#29936, moving to sp_notembedded.test

  mysql-test/t/sp_notembedded.test@1.9, 2007-09-05 15:02:59-03:00, davi@moksha.local +65 -0
    Test case result for Bug#29936, moved from sp.test

ChangeSet@1.2541.4.8, 2007-09-05 19:39:13+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  change printout to be a warning

  sql/ha_ndbcluster.cc@1.467.2.4, 2007-09-05 19:39:11+02:00, tomas@whalegate.ndb.mysql.com +3 -3
    change printout to be a warning

ChangeSet@1.2541.4.7, 2007-09-05 19:13:36+02:00, tomas@whalegate.ndb.mysql.com +9 -0
  moving these tests to suite ndb_team

  mysql-test/suite/ndb/t/disabled.def@1.5, 2007-09-05 19:13:33+02:00, tomas@whalegate.ndb.mysql.com +0 -4
    moving these tests to suite ndb_team

  mysql-test/suite/ndb_team/r/ndb_autodiscover.result@1.34, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result

  mysql-test/suite/ndb_team/r/ndb_autodiscover2.result@1.7, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result

  mysql-test/suite/ndb_team/r/ndb_autodiscover3.result@1.7, 2007-09-05 19:04:13+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result

  mysql-test/suite/ndb_team/t/disabled.def@1.1, 2007-09-05 19:13:00+02:00, tomas@whalegate.ndb.mysql.com +17 -0
    BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def

  mysql-test/suite/ndb_team/t/disabled.def@1.0, 2007-09-05 19:13:00+02:00, tomas@whalegate.ndb.mysql.com +0 -0

  mysql-test/suite/ndb_team/t/ndb_autodiscover.test@1.30, 2007-09-05 19:03:58+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test

  mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt@1.3, 2007-09-05 19:03:57+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt

  mysql-test/suite/ndb_team/t/ndb_autodiscover2.test@1.14, 2007-09-05 19:03:57+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test

  mysql-test/suite/ndb_team/t/ndb_autodiscover3.test@1.18, 2007-09-05 19:03:58+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test

ChangeSet@1.2541.4.6, 2007-09-05 18:44:47+02:00, tomas@whalegate.ndb.mysql.com +18 -0
  tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test@1.18, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test@1.9, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@1.10, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test@1.10, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test@1.9, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test@1.8, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test@1.7, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

  mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test@1.6, 2007-09-05 18:44:44+02:00, tomas@whalegate.ndb.mysql.com +0 -1
    tests actually work in statement based

ChangeSet@1.2541.4.5, 2007-09-05 18:02:46+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct include file

  mysql-test/include/ndb_master-slave.inc@1.4, 2007-09-05 18:02:44+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    correct include file

ChangeSet@1.2541.4.4, 2007-09-05 17:31:26+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  correct include file

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test@1.2, 2007-09-05 17:31:23+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    correct include file

ChangeSet@1.2541.1.7, 2007-09-05 13:01:30+00:00, lzhou@dev3-63.(none) +16 -0
  BUG#27543 Backup and restore can compatible with different endians for blob attribute

  mysql-test/Makefile.am@1.115, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +8 -0
    Add install data for new test case

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +959 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +674 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log@1.1, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log@1.0, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +530 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +1103 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +756 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +2 -0
    test data for endian test

  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +200 -0
    test result for endian test

  mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test@1.1, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +185 -0
    test case for endian test

  mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test@1.0, 2007-09-05 13:01:20+00:00, lzhou@dev3-63.(none) +0 -0

  storage/ndb/tools/restore/Restore.cpp@1.51.1.4, 2007-09-05 13:01:19+00:00, lzhou@dev3-63.(none) +14 -0
    Convert blob(text) length stored in main table

ChangeSet@1.2541.4.3, 2007-09-05 11:43:42+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
  - problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
  - point to table map instead?
  - or copy it?
  - or make sure that anything interacting with the share happens _after_ the epoch
  
  Problem with flush is that STMT_END_F may not be included as it shoudld...

  sql/ha_ndbcluster_binlog.cc@1.130, 2007-09-05 11:43:39+02:00, tomas@whalegate.ndb.mysql.com +0 -5
    getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event
    - problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
    - point to table map instead?
    - or copy it?
    - or make sure that anything interacting with the share happens _after_ the epoch
    
    Problem with flush is that STMT_END_F may not be included as it shoudld...

ChangeSet@1.1810.3303.3, 2007-09-05 09:30:50+02:00, joerg@trift2. +1 -0
  libmysql/libmysql.c  :    Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".

  libmysql/libmysql.c@1.233.5.22, 2007-09-05 09:30:47+02:00, joerg@trift2. +0 -1
    Correct a wrong automerge: Don't duplicate "DBUG_ENTER()".

ChangeSet@1.2541.4.2, 2007-09-05 09:22:58+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)

  sql/ha_ndbcluster_binlog.cc@1.129, 2007-09-05 09:22:56+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)

ChangeSet@1.2528.200.1, 2007-09-05 11:35:29+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #29938.
  mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
  and during the restoration from this dump events were created in spite
  of the --skip-events option.
  
  The mysqldump client has been modified to ignore mysql.event table data
  in case of --skip-events options.

  client/mysqldump.c@1.291.2.2, 2007-09-05 11:35:01+05:00, gshchepa@gleb.loc +12 -0
    Fixed bug #29938.
    The dump_table function has been modified to skip dumping of
    the mysql.event table data in case of the --skip-event mysqldump
    client option.

  mysql-test/r/mysqldump.result@1.159.1.1, 2007-09-05 11:35:15+05:00, gshchepa@gleb.loc +13 -0
    Updated test case for bug #29938.

  mysql-test/t/mysqldump.test@1.148.1.1, 2007-09-05 11:35:13+05:00, gshchepa@gleb.loc +16 -0
    Updated test case for bug #29938.

ChangeSet@1.2528.199.1, 2007-09-04 20:03:12-07:00, brian@zim.(none) +1 -0
  Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 

  client/mysqlslap.c@1.62, 2007-09-04 20:03:09-07:00, brian@zim.(none) +6 -0
    Cleanup resuls if rows are returned.

ChangeSet@1.1810.3304.2, 2007-09-04 16:40:27-06:00, malff@weblab.(none) +1 -0
  Fixed whitespace

  sql/sql_trigger.cc@1.35.1.35, 2007-09-04 16:40:25-06:00, malff@weblab.(none) +1 -1
    Fixed whitespace

ChangeSet@1.2528.1.41, 2007-09-04 15:24:04+02:00, rafal@quant.(none) +1 -0
  Disabling rpl_ndb_2other test.

  mysql-test/suite/rpl_ndb/t/disabled.def@1.6.1.1, 2007-09-04 15:24:01+02:00, rafal@quant.(none) +1 -0
    The rpl_ndb_2other test must be disabled until replication correctly
    handles endianess issues.

ChangeSet@1.1810.3300.2, 2007-09-03 13:42:32+02:00, thek@adventure.(none) +1 -0
  - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0)

  sql/sql_cache.cc@1.76.11.2, 2007-09-03 13:42:30+02:00, thek@adventure.(none) +1 -1
    - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0) 

ChangeSet@1.2528.197.2, 2007-09-03 15:13:34+04:00, anozdrin@station. +2 -0
  Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
  statement.

  mysql-test/suite/rpl/r/rpl_ps.result@1.6, 2007-09-03 15:13:32+04:00, anozdrin@station. +25 -14
    Update result file.

  mysql-test/suite/rpl/t/rpl_ps.test@1.7, 2007-09-03 15:13:32+04:00, anozdrin@station. +37 -10
    Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
    statement.

ChangeSet@1.2528.197.1, 2007-09-03 15:12:28+04:00, anozdrin@station. +1 -0
  Make mysql compilable on gcc-4.2.1.
  
  c++config.h now has the following code:
  // For example, <windows.h> is known to #define min and max as macros...
  #undef min
  #undef max
  
  So, our defines in my_global.h are undefined when <new> header
  is included.
  
  Move definitions of min()/max() to the end of my_global.h.

  include/my_global.h@1.175.1.1, 2007-09-03 15:12:25+04:00, anozdrin@station. +6 -6
    Make mysql compilable on gcc-4.2.1.
    
    c++config.h now has the following code:
    // For example, <windows.h> is known to #define min and max as macros...
    #undef min
    #undef max
    
    So, our defines in my_global.h are undefined when <new> header
    is included.
    
    Move definitions of min()/max() to the end of my_global.h.

ChangeSet@1.1810.3302.1, 2007-09-03 11:55:35+02:00, mhansson@linux-st28.site +3 -0
  Bug #30234: Unexpected behavior using DELETE with AS and USING
    
  DELETE FROM ... USING ... statements with the following type of 
  ambiguous aliasing gave unexpected results:
  DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
  This query would leave table t1 intact but delete rows from t2.
  Fixed by changing DELETE FROM ... USING syntax so that only alias 
  references (as opposed to alias declarations) may be used in FROM.

  mysql-test/r/delete.result@1.29, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +37 -0
    Bug#30234: Test Result

  mysql-test/t/delete.test@1.27, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +44 -0
    Bug#30234: Test Case

  sql/sql_yacc.yy@1.371.124.1, 2007-09-03 11:55:33+02:00, mhansson@linux-st28.site +17 -2
    Bug#30234:
    - Added parser rule table_alias_ref_list that contains a list of table 
      aliases only.
    - Added parser rule table_alias_ref that sets the TL_OPTION_ALIAS in 
      order to turn off semantic checking that applies only for table names.

ChangeSet@1.2541.3.8, 2007-09-03 11:32:48+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - merge error code
    forgot to update next TC no

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.45, 2007-09-03 11:32:46+02:00, jonas@perch.ndb.mysql.com +1 -1
    ndb - merge error code
      forgot to update next TC no

ChangeSet@1.2541.3.7, 2007-09-03 11:29:58+02:00, jonas@perch.ndb.mysql.com +3 -0
  ndb - merge error code(s)

  storage/ndb/src/kernel/blocks/ERROR_codes.txt@1.44, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.152, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

  storage/ndb/test/ndbapi/testIndex.cpp@1.24, 2007-09-03 11:29:55+02:00, jonas@perch.ndb.mysql.com +1 -1
    merge error code(s)

ChangeSet@1.2528.180.2, 2007-09-03 12:57:47+04:00, kaa@polly.(none) +2 -0
  Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1. This is for bug #5731.

  include/my_global.h@1.176, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +3 -0
    Added SIZE_T_MAX.

  sql/mysqld.cc@1.670, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +1 -1
    Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1.

ChangeSet@1.1810.3300.1, 2007-09-03 10:47:24+02:00, thek@adventure.(none) +1 -0
  Bug #21074 Large query_cache freezes mysql server sporadically under heavy load
  
  Invaldating a subset of a sufficiently large query cache can take a long time.
  During this time the server is efficiently frozen and no other operation can
  be executed. This patch addresses this problem by setting a time limit on
  how long time a dictionary access request can take before giving up on the 
  attempt. This patch does not work for query cache invalidations issued by
  DROP, ALTER or RENAME TABLE operations.

  sql/sql_cache.cc@1.76.11.1, 2007-09-03 10:47:23+02:00, thek@adventure.(none) +30 -1
    Changed mutex locking to a timed spinn lock. If access to query cache dictionary
    takes "a long time" (currently more than 0.1 seconds) the system fall backs on
    ordinary statement execution.

ChangeSet@1.1810.3279.10, 2007-09-03 12:22:56+05:00, gluh@mysql.com +4 -0
  Bug#29408 Cannot find view in columns table if the selection contains a function
  Use view db name as thread default database, in order to ensure
  that the view is parsed and prepared correctly.

  mysql-test/r/sp.result@1.170.47.1, 2007-09-03 12:22:54+05:00, gluh@mysql.com +22 -0
    test result

  mysql-test/t/sp.test@1.174.47.1, 2007-09-03 12:22:54+05:00, gluh@mysql.com +33 -0
    test case

  sql/sql_parse.cc@1.426.1.211, 2007-09-03 12:22:54+05:00, gluh@mysql.com +1 -1
    copy thd->db_length to table_list->db_length

  sql/sql_view.cc@1.78.1.39, 2007-09-03 12:22:54+05:00, gluh@mysql.com +14 -0
    Use view db name as thread default database, in order to ensure
    that the view is parsed and prepared correctly.

ChangeSet@1.2541.3.6, 2007-09-03 08:15:59+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - bug#30764
    When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
    (found by pekkas blob changes)

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@1.87, 2007-09-03 08:15:56+02:00, jonas@perch.ndb.mysql.com +1 -0
    When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
    (found by pekkas blob changes)

ChangeSet@1.1616.3092.4, 2007-09-01 11:41:38+02:00, msvensson@pilot.(none) +1 -0
  Use eval around "rmtree" and use our own version of rmtree if it fails

  mysql-test/lib/mtr_misc.pl@1.5.1.10, 2007-09-01 11:41:37+02:00, msvensson@pilot.(none) +6 -13
    Use eval around "rmtree" and use our own version of rmtree if it fails

ChangeSet@1.2528.168.10, 2007-08-31 15:51:57-06:00, malff@weblab.(none) +1 -0
  Fixed timing issues in events.test

  mysql-test/t/events.test@1.52, 2007-08-31 15:51:55-06:00, malff@weblab.(none) +11 -2
    
    Wait for the select get_lock() to actually get the lock
    wait for release_lock() to actually release the lock

ChangeSet@1.2528.168.9, 2007-09-01 00:12:00+04:00, anozdrin@ibm.opbmk +1 -0
  Eliminate compile warnings.

  sql/sp.cc@1.170, 2007-09-01 00:11:58+04:00, anozdrin@ibm.opbmk +2 -1
    Eliminate compile warnings.

ChangeSet@1.2528.141.37, 2007-08-31 10:53:51-06:00, tsmith@ramayana.hindu.god +1 -0
  Correct fix for test result.

  mysql-test/r/strict.result@1.55, 2007-08-31 10:53:49-06:00, tsmith@ramayana.hindu.god +37 -0
    Correct fix for test result.

ChangeSet@1.2528.193.1, 2007-08-31 20:42:14+04:00, anozdrin@ibm.opbmk +13 -0
  Fix for BUG#25843: changing default database between PREPARE and EXECUTE
  of statement breaks binlog.
  
  There were two problems discovered by this bug:
  
    1. Default (current) database is not fixed at the creation time.
       That leads to wrong output of DATABASE() function.
  
    2. Database attributes (@@collation_database) are not fixed at
       the creation time. That leads to wrong resultset.
  
  Binlog breakage and Query Cache wrong output happened because of
  the first problem.
  
  The fix is to remember the current database at the PREPARE-time and
  set it each time at EXECUTE.

  mysql-test/include/query_cache_sql_prepare.inc@1.7, 2007-08-31 20:42:11+04:00, anozdrin@ibm.opbmk +218 -0
    The first part of the test case for BUG#25843.

  mysql-test/r/query_cache_ps_no_prot.result@1.5, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +158 -0
    Update result file.

  mysql-test/r/query_cache_ps_ps_prot.result@1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +158 -0
    Update result file.

  mysql-test/suite/rpl/r/rpl_ps.result@1.5, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +39 -0
    Update result file.

  mysql-test/suite/rpl/t/rpl_ps.test@1.6, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +68 -0
    The second part of the test case for BUG#25843.

  sql/mysql_priv.h@1.534.1.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +7 -0
    Added mysql_opt_change_db() prototype.

  sql/sp.cc@1.164.1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +42 -106
    1. Polishing;
    2. sp_use_new_db() has been removed;
    3. Use mysql_opt_change_db() instead of sp_use_new_db().

  sql/sp.h@1.41, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +0 -11
    sp_use_new_db() has been removed.
    This function has nothing to do with a) sp and b) *new* database.
    It was merely "switch the current database if needed".

  sql/sp_head.cc@1.288.3.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +13 -9
    1. Polishing.
    2. Use mysql_opt_change_db() instead of sp_use_new_db().

  sql/sql_class.cc@1.344.2.1, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +4 -3
    Move THD::{db, db_length} into Statement.

  sql/sql_class.h@1.395.3.2, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +38 -22
    Move THD::{db, db_length} into Statement.

  sql/sql_db.cc@1.157.1.3, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +97 -1
    Introduce mysql_opt_change_db() as a replacement (and inspired by)
    sp_use_new_db().

  sql/sql_prepare.cc@1.231, 2007-08-31 20:42:12+04:00, anozdrin@ibm.opbmk +48 -0
    1. Remember the current database in Prepared_statement::prepare().
    2. Switch/restore the current database in Prepared_statement::execute().

ChangeSet@1.2541.3.5, 2007-08-31 16:55:59+02:00, jonas@perch.ndb.mysql.com +1 -0
  ndb - autotest 
    remove more "extra mysql-"

  storage/ndb/test/run-test/autotest-run.sh@1.4, 2007-08-31 16:55:57+02:00, jonas@perch.ndb.mysql.com +2 -2
    remove more "extra mysql-"

ChangeSet@1.2528.192.1, 2007-08-31 08:49:49-06:00, malff@weblab.(none) +2 -0
  Test cleanup for events.test

  mysql-test/r/events.result@1.55, 2007-08-31 08:49:39-06:00, malff@weblab.(none) +18 -8
    Fixed all the select on information_schema.processlist to be more reliable.

  mysql-test/t/events.test@1.51, 2007-08-31 08:49:40-06:00, malff@weblab.(none) +31 -10
    Fixed all the select on information_schema.processlist to be more reliable.

ChangeSet@1.2541.3.4, 2007-08-31 16:12:51+02:00, jonas@perch.ndb.mysql.com +5 -0
  ndb autotest
   add --tag
   remove prepended mysql-
    add conf-test.cnf
    add embryo upgrade-boot.sh

  storage/ndb/test/run-test/Makefile.am@1.30, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +1 -1
    add test test conf

  storage/ndb/test/run-test/autotest-boot.sh@1.2, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +29 -6
    add --tag to autotest
    remove "extra" appended mysql- to all scripts

  storage/ndb/test/run-test/autotest-run.sh@1.3, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +1 -1
    remove extra "mysql-"

  storage/ndb/test/run-test/conf-test.cnf@1.1, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +26 -0
    New BitKeeper file ``storage/ndb/test/run-test/conf-test.cnf''

  storage/ndb/test/run-test/conf-test.cnf@1.0, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +0 -0

  storage/ndb/test/run-test/upgrade-boot.sh@1.1, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +218 -0
    New BitKeeper file ``storage/ndb/test/run-test/upgrade-boot.sh''

  storage/ndb/test/run-test/upgrade-boot.sh@1.0, 2007-08-31 16:12:49+02:00, jonas@perch.ndb.mysql.com +0 -0

ChangeSet@1.2541.3.3, 2007-08-31 16:09:48+02:00, jonas@perch.ndb.mysql.com +1 -0
  merge

  storage/ndb/test/ndbapi/testIndex.cpp@1.23, 2007-08-31 16:09:45+02:00, jonas@perch.ndb.mysql.com +2 -1
    merge

ChangeSet@1.1810.3299.1, 2007-08-31 16:59:07+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #30126.
  When dumping database from a 4.x server, the mysqldump client
  inserted a delimiter sign inside special commentaries of the form:
    /*!... CREATE DATABASE IF NOT EXISTS ... ;*/
  During restoration that dump file was splitten by delimiter signs on
  the client side, and the rest of some commentary strings was prepended
  to following statements.
  
  The 4x_server_emul test case option has been added for use with the
  DBUG_EXECUTE_IF debugging macro. This option affects debug server
  builds only to emulate particular behavior of a 4.x server for
  the mysqldump client testing. Non-debugging builds are not affected.

  client/mysqldump.c@1.214.1.57, 2007-08-31 16:53:54+05:00, gshchepa@gleb.loc +1 -1
    Fixed bug #30126.
    The init_dumping_tables function has been modified to output semicolon
    outside of commentaries.

  mysql-test/r/mysqldump-compat.result@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +4 -0
    Added test case for bug #30126.

  mysql-test/r/mysqldump-compat.result@1.0, 2007-08-31 16:49:45+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/mysqldump-compat.opt@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +1 -0
    Added test case for bug #30126.

  mysql-test/t/mysqldump-compat.opt@1.0, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +0 -0

  mysql-test/t/mysqldump-compat.test@1.1, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +13 -0
    Added test case for bug #30126.

  mysql-test/t/mysqldump-compat.test@1.0, 2007-08-31 16:49:46+05:00, gshchepa@gleb.loc +0 -0

  sql/sql_parse.cc@1.426.1.210, 2007-08-31 16:53:51+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #30126.
    The mysqldump client uses the "SHOW CREATE DATABASE" query to
    obtain the "CREATE DATABASE" statement from that database.
    The 4.x server doesn't recognise that query, and mysqldump
    forms the "CREATE DATABASE" statement from scratch.
    That statement was formed incorrectly.
    
    To enforce the mysqldump client to create that statement from
    scratch, debugging code has been added to the mysql_execute_command
    function: in tcase of the --loose-debug=d,4x_server_emul option,
    the server returns parse error to client to emulate old behaviour.
    
    The 4x_server_emul test case option has been added for use with the
    DBUG_EXECUTE_IF debugging macro. This option affects debug server
    builds only to emulate particular behavior of a 4.x server for
    the mysqldump client testing. Non-debugging builds are not affected.

ChangeSet@1.2528.141.36, 2007-08-31 05:21:12-06:00, tsmith@ramayana.hindu.god +1 -0
  Correct test result file for bug #27014

  mysql-test/r/strict.result@1.54, 2007-08-31 05:21:11-06:00, tsmith@ramayana.hindu.god +15 -52
    Correct test result file for bug #27014

ChangeSet@1.2528.141.35, 2007-08-31 01:28:42-06:00, tsmith@ramayana.hindu.god +1 -0
  Fix test results for bug #27014

  mysql-test/r/date_formats.result@1.45, 2007-08-31 01:28:40-06:00, tsmith@ramayana.hindu.god +32 -32
    Fix test results for bug #27014

ChangeSet@1.2528.189.2, 2007-08-31 10:19:52+04:00, kostja@bodhi.(none) +6 -0
  Never access thd->ha_data directly, use getters/setters from the plugin
  API instead.
  This is a pre-requisite of the fix for Bug 12713, which changes the
  data type of thd->ha_data from void * to struct Ha_data.

  include/mysql/plugin.h@1.41, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +23 -0
    Provide accessors to thd->ha_data for simple and robust code.

  sql/ha_ndbcluster_binlog.h@1.25.1.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +4 -2
    Use getters/setters of thd->ha_data, instead of direct access.

  sql/handler.cc@1.322.7.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +2 -2
    Use a getter of thd->ha_data instead of direct access.

  sql/log.cc@1.291.2.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +23 -23
    Use getters/setters of thd->ha_data, instead of direct access.

  sql/rpl_utility.h@1.12.3.1, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a compilation warning (declaration order must match initialization
    order in constructor).

  storage/federated/ha_federated.cc@1.110, 2007-08-31 10:19:49+04:00, kostja@bodhi.(none) +6 -6
    Use interface accessors to thd->ha_data, instead of direct access.

ChangeSet@1.2528.141.34, 2007-08-30 23:57:39-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #27014: Imperfect error/warning message for STR_TO_DATE for invalid datetime value
  
  Fix name of function in warning message.

  sql/item_timefunc.cc@1.172, 2007-08-30 23:57:35-06:00, tsmith@ramayana.hindu.god +1 -1
    Fix error message in extract_date_time(); ("str_to_time" -> "str_to_date")

ChangeSet@1.2528.188.8, 2007-08-30 16:19:23-03:00, davi@moksha.local +2 -0
  Post-merge test case with wait_condition for Bug#28587

  mysql-test/r/insert_update.result@1.34, 2007-08-30 16:19:21-03:00, davi@moksha.local +19 -0
    Post-merge: add test case result for Bug#28587.

  mysql-test/t/insert_update.test@1.30, 2007-08-30 16:19:21-03:00, davi@moksha.local +35 -0
    Post-merge: add test case for Bug#28587.

ChangeSet@1.1810.3275.10, 2007-08-30 16:11:53-03:00, davi@moksha.local +1 -0
  Bug#28587 SELECT is blocked by INSERT waiting on read lock, even with low_priority_updates
  
  The problem is that a SELECT on one thread is blocked by INSERT ... ON
  DUPLICATE KEY UPDATE on another thread even when low_priority_updates is
  activated.
  
  The solution is to possibly downgrade the lock type to the setting of
  low_priority_updates if the INSERT cannot be concurrent.

  sql/sql_insert.cc@1.146.66.1, 2007-08-30 16:11:50-03:00, davi@moksha.local +1 -1
    Possibly downgrade lock type to the the setting of low_priority_updates if
    if the INSERT cannot be concurrent.

ChangeSet@1.2528.188.5, 2007-08-30 12:57:05-06:00, malff@weblab.(none) +3 -0
  Bug#28779 (mysql_query() allows execution of statements with unbalanced
  comments)
  
  This change set is for 5.1 (manually merged)
  
  Before this fix, the server would accept queries that contained comments,
  even when the comments were not properly closed with a '*' '/' marker.
  
  For example,
    select 1 /* + 2 <EOF>
  would be accepted as
    select 1 /* + 2 */ <EOF>
  and executed as
    select 1
  
  With this fix, the server now rejects queries with unclosed comments
  as syntax errors.
  Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
  closed with '*' '/' to be parsed correctly.

  mysql-test/r/comments.result@1.9, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +15 -0
    Unbalanced comments are a syntax error.

  mysql-test/t/comments.test@1.9, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +31 -0
    Unbalanced comments are a syntax error.

  sql/sql_lex.cc@1.255.3.5, 2007-08-30 12:57:00-06:00, malff@weblab.(none) +35 -8
    Unbalanced comments are a syntax error.

ChangeSet@1.2528.189.1, 2007-08-30 21:19:05+04:00, kostja@bodhi.(none) +1 -0
  Add -Wno-unused to --warning-mode=pedantic, otherwise sql/ compilation
  generated so many warnings that the mode was unusable.

  BUILD/SETUP.sh@1.77, 2007-08-30 21:19:00+04:00, kostja@bodhi.(none) +1 -1
    Add -Wno-unused to --warning-mode=pedantic, otherwise sql/ compilation
    generated so many warnings that the mode was unusable.

ChangeSet@1.2528.188.3, 2007-08-30 20:06:19+04:00, anozdrin@ibm.opbmk +3 -0
  Cleanup-patch for BUG#25843: changing default database between
  PREPARE and EXECUTE of statement breaks binlog.

  sql/sp.cc@1.164.1.2, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +32 -25
    - Polishing sp_use_new_db():
      - renamed no_access_check to force_switch to be more adequate;
      - fixed comment;

  sql/sql_class.h@1.395.3.1, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +34 -5
    Polishing: fixed comment.

  sql/sql_db.cc@1.157.1.2, 2007-08-30 20:06:17+04:00, anozdrin@ibm.opbmk +65 -22
    1. Use mysql_change_db_impl() to reset current database instead of
    THD::set_db() in mysql_rm_db(). THD::set_db() does not take care of
    THD::db_access and database attributes (@@collation_database).
    2. Polishing: add, fix comments.

ChangeSet@1.1810.3297.2, 2007-08-30 17:21:43+04:00, kaa@polly.(none) +1 -0
  Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164.

  mysql-test/t/mysql.test@1.4.13.2, 2007-08-30 17:21:40+04:00, kaa@polly.(none) +1 -1
    Use double quotes instead of single ones which make the test fail on Windows.

ChangeSet@1.2541.3.2, 2007-08-30 11:46:30+02:00, tomas@whalegate.ndb.mysql.com +3 -0
  Bug#20872 master*.err: miscellaneous error messages

  sql/ha_ndbcluster.cc@1.467.2.3, 2007-08-30 11:46:27+02:00, tomas@whalegate.ndb.mysql.com +9 -1
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull

  sql/ha_ndbcluster_binlog.cc@1.128, 2007-08-30 11:46:27+02:00, tomas@whalegate.ndb.mysql.com +7 -10
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull
    - no need to print error, my_errno is set

  sql/ha_ndbcluster_binlog.h@1.26, 2007-08-30 11:46:28+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    Bug#20872 master*.err: miscellaneous error messages
    - only allocate share if fully successfull

ChangeSet@1.1810.3297.1, 2007-08-30 12:53:24+04:00, kaa@polly.(none) +3 -0
  Bug #30164: Using client side macro inside server side comments generates broken queries
    
  Problem:
    
  In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
    
  Fix:
    
  If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
  This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
    
  - Nested server-side and/or client-side comments are not supported by mysql.cc
  - Using client-side macros in multi-line server-side comments is not supported
  - All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).

  client/mysql.cc@1.199.1.41, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +37 -17
    If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro.

  mysql-test/r/mysql.result@1.17.2.13, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +2 -0
    Added a test case for bug #30164.

  mysql-test/t/mysql.test@1.4.13.1, 2007-08-30 12:53:20+04:00, kaa@polly.(none) +5 -0
    Added a test case for bug #30164.

ChangeSet@1.2541.2.1, 2007-08-30 10:41:19+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug#20872 master*.err: miscellaneous error messages

  sql/ha_ndbcluster.cc@1.467.2.1, 2007-08-30 10:41:16+02:00, tomas@whalegate.ndb.mysql.com +3 -0
    remove warning for table exists in mysqld error log

  sql/ha_ndbcluster_binlog.cc@1.127, 2007-08-30 10:41:16+02:00, tomas@whalegate.ndb.mysql.com +11 -4
    remove warning for table exists in mysqld error log

ChangeSet@1.2528.153.17, 2007-08-29 18:56:00-06:00, malff@weblab.(none) +2 -0
  Bug#30712 (open_performance_schema_table() cause an open table leak on
  failures)
  
  Fixed open_performance_schema_table() and close_performance_schema_table()
  implementation and callers, to always execute balanced calls to:
    thd->reset_n_backup_open_tables_state(backup);
    thd->restore_backup_open_tables_state(backup);
  

  sql/log.cc@1.291.1.2, 2007-08-29 18:55:55-06:00, malff@weblab.(none) +8 -2
    Balanced calls to reset_n_backup_open_tables_state() / restore_backup_open_tables_state()

  sql/sql_base.cc@1.421.5.1, 2007-08-29 18:55:55-06:00, malff@weblab.(none) +21 -17
    Balanced calls to reset_n_backup_open_tables_state() / restore_backup_open_tables_state()

ChangeSet@1.2528.153.16, 2007-08-29 17:27:38-06:00, malff@weblab.(none) +2 -0
  Manual merge

  mysql-test/r/sp.result@1.288.1.3, 2007-08-29 17:27:34-06:00, malff@weblab.(none) +52 -0
    Manual merge

  mysql-test/t/sp.test@1.251.1.3, 2007-08-29 17:27:34-06:00, malff@weblab.(none) +54 -0
    Manual merge

ChangeSet@1.2528.187.2, 2007-08-29 16:58:00-06:00, tsmith@sita.local +2 -0
  Post-merge fixes, and disable buggy test case on embedded

  mysql-test/t/query_cache.test@1.82, 2007-08-29 16:57:55-06:00, tsmith@sita.local +5 -0
    Disable query_cache test on embedded, due to bug 30710.

  sql/log_event_old.cc@1.9, 2007-08-29 16:57:55-06:00, tsmith@sita.local +12 -12
    Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.

ChangeSet@1.2544.1.3, 2007-08-30 00:02:53+02:00, kent@mysql.com +3 -0
  libmysqld/sql_tablespace.cc
  libmysqld/scheduler.cc
  libmysqld/sql_connect.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-scheduler.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/scheduler.cc

  BitKeeper/deleted/.del-sql_connect.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/sql_connect.cc

  BitKeeper/deleted/.del-sql_tablespace.cc@1.2, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/sql_tablespace.cc

ChangeSet@1.1810.3296.4, 2007-08-30 00:01:02+02:00, kent@mysql.com +4 -0
  server-tools/instance-manager/sql_state.c
  server-tools/instance-manager/pack.c
  server-tools/instance-manager/password.c
  server-tools/instance-manager/net_serv.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-net_serv.cc@1.1.1.1, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/net_serv.cc

  BitKeeper/deleted/.del-pack.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/pack.c

  BitKeeper/deleted/.del-password.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/password.c

  BitKeeper/deleted/.del-sql_state.c@1.1.1.1, 2007-08-29 22:52:42+02:00, kent@mysql.com +0 -0
    Delete: server-tools/instance-manager/sql_state.c

ChangeSet@1.2528.153.14, 2007-08-29 19:00:49-03:00, davi@moksha.local +2 -0
  Post-merge fixes for Bug#30632

  mysql-test/r/handler_innodb.result@1.19, 2007-08-29 19:00:46-03:00, davi@moksha.local +13 -0
    Post-merge: add Bug#30632 test case result

  mysql-test/r/handler_myisam.result@1.32, 2007-08-29 19:00:46-03:00, davi@moksha.local +2 -2
    Post-merge fix of error number

ChangeSet@1.1616.3093.2, 2007-08-29 23:58:15+02:00, kent@mysql.com +2 -0
  libmysql_r/client_settings.h libmysqld/ha_blackhole.cc
    Deleted BitKeeper soft links not needed

  BitKeeper/deleted/.del-client_settings.h@1.2, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: libmysql_r/client_settings.h

  BitKeeper/deleted/.del-ha_blackhole.cc@1.1.4.1, 2007-08-29 22:52:41+02:00, kent@mysql.com +0 -0
    Delete: libmysqld/ha_blackhole.cc

ChangeSet@1.2528.168.3, 2007-08-29 14:36:08-07:00, brian@piggy.tangent.org +2 -0
  Added ORDER BY to udf select so that results are ordered. 

  mysql-test/include/rpl_udf.inc@1.4, 2007-08-29 14:36:06-07:00, brian@piggy.tangent.org +10 -10
    ORDER BY to force order

  mysql-test/suite/rpl/r/rpl_udf.result@1.10, 2007-08-29 14:36:06-07:00, brian@piggy.tangent.org +22 -22
    Fix for ORDER BY

ChangeSet@1.1810.3275.8, 2007-08-29 14:50:32-06:00, malff@weblab.(none) +3 -0
  Bug#28779 (mysql_query() allows execution of statements with unbalanced
  comments)
  
  Before this fix, the server would accept queries that contained comments,
  even when the comments were not properly closed with a '*' '/' marker.
  
  For example,
    select 1 /* + 2 <EOF>
  would be accepted as
    select 1 /* + 2 */ <EOF>
  and executed as
    select 1
  
  With this fix, the server now rejects queries with unclosed comments
  as syntax errors.
  Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
  closed with '*' '/' to be parsed correctly.

  mysql-test/r/comments.result@1.6.1.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +15 -0
    Unbalanced comments are a syntax error.

  mysql-test/t/comments.test@1.6.1.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +33 -0
    Unbalanced comments are a syntax error.

  sql/sql_lex.cc@1.142.45.1, 2007-08-29 14:50:29-06:00, malff@weblab.(none) +30 -7
    Unbalanced comments are a syntax error.

ChangeSet@1.1810.3296.2, 2007-08-29 22:29:07+02:00, kent@mysql.com +2 -0
  CMakeLists.txt:
    Link with library "udf_example" depends on, needed for nmake
  libmysql.c:
    DBUG_ENTER need to be in declaration section

  libmysql/libmysql.c@1.233.20.1, 2007-08-29 22:28:09+02:00, kent@mysql.com +1 -2
    DBUG_ENTER need to be in declaration section

  sql/CMakeLists.txt@1.1.10.3, 2007-08-29 22:28:33+02:00, kent@mysql.com +1 -1
    Link with library "udf_example" depends on, needed for nmake

ChangeSet@1.1616.3093.1, 2007-08-29 22:24:11+02:00, kent@mysql.com +1 -0
  mysql_config.sh:
    Flag changed name in icc 10

  scripts/mysql_config.sh@1.23.1.3, 2007-08-29 22:24:05+02:00, kent@mysql.com +1 -1
    Flag changed name in icc 10

ChangeSet@1.2528.153.12, 2007-08-29 16:59:38-03:00, davi@moksha.local +6 -0
  Bug#21975 Grant and revoke statements are non-transactional
  Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
  Bug#17244 GRANT gives strange error message when used in a stored function
  
  GRANT/REVOKE statements are non-transactional (no explicit transaction
  boundaries) in nature and hence are forbidden inside stored functions and
  triggers, but they weren't being effectively forbidden. Furthermore, the
  absence of implict commits makes changes made by GRANT/REVOKE statements to
  not be rolled back.
  
  The implemented fix is to issue a implicit commit with every GRANT/REVOKE
  statement, effectively prohibiting these statements in stored functions
  and triggers. The implicit commit also fixes the replication bug, and looks
  like being in concert with the behavior of DDL and administrative statements.
  
  Since this is a incompatible change, the following sentence should be
  added to the Manual in the very end of the 3rd paragraph, subclause
  13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
  MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."
  
  Patch contributed by Vladimir Shebordaev

  mysql-test/r/sp-error.result@1.128, 2007-08-29 16:59:32-03:00, davi@moksha.local +12 -0
    Test case result for Bug#17244

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +50 -0
    Add test case result for Bug#21975

  mysql-test/suite/rpl/r/rpl_binlog_grant.result@1.0, 2007-08-29 16:59:33-03:00, davi@moksha.local +0 -0

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.1, 2007-08-29 16:59:34-03:00, davi@moksha.local +41 -0
    Add test case for Bug#21975

  mysql-test/suite/rpl/t/rpl_binlog_grant.test@1.0, 2007-08-29 16:59:34-03:00, davi@moksha.local +0 -0

  mysql-test/t/sp-error.test@1.124, 2007-08-29 16:59:32-03:00, davi@moksha.local +15 -0
    Test case for Bug#17244

  sql/sp_head.cc@1.288.3.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +3 -0
    Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
    commit.

  sql/sql_parse.cc@1.700.3.1, 2007-08-29 16:59:33-03:00, davi@moksha.local +5 -0
    End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
    prohibit these statements in stored functions and triggers. An implicit commit
    also fixes a bug in replication, when GRANT or REVOKE would disappear from the
    binary log in case of a subsequent ROLLBACK, since they were considered
    transactional statements.

ChangeSet@1.2547, 2007-08-29 21:36:45+02:00, mleich@four.local.lan +10 -0
  Post merge fix 2 for
       ChangeSet@1.2509, 2007-08-28
       http://lists.mysql.com/commits/33239
    Fixes for the funcs_1 datadict test bugs
    #30418 "datadict" tests (all engines) fail:
           Dependency on the host name for ordering
    #30420 "datadict" tests (all engines) fail:
           Release build has help tables loaded
    #30438 "{memory,myisam,ndb}__datadict" tests fail:
           Use "InnoDB" without checking
    #30440 "datadict" tests (all engines) fail:
           Character sets depend on
                     configuration

  mysql-test/suite/funcs_1/README.txt@1.8, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +9 -2
    Improved README

  mysql-test/suite/funcs_1/datadict/datadict_load.inc@1.5, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +16 -1
    Additions for the NDB variant (currently not in use)

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.8, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +11 -0
    Write a comment about Bug#30689 into the test protocols.

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Fix for a not reported bug.
    The missing revoke usage and drop user harmed the next test.

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.2, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +2 -0
    Updated results

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.10, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +18 -8
    Updated results

  mysql-test/suite/funcs_1/r/ndb__datadict.result@1.4, 2007-08-29 21:36:43+02:00, mleich@four.local.lan +484 -618
    Updated results as far as they could be corrected.
    Attention:
       This test failed even before the current bug fixes.
       The updated expected results are now better than before,
       but they do not prevent that the test fails.
       It looks like one script is "damaged" and treats
       this NDB test different than expected within the
       file with expected results.
               

ChangeSet@1.1810.3295.1, 2007-08-29 21:45:53+03:00, pekka@sama.ndb.mysql.com +1 -0
  ndb - bug#29102 : use locked read even for blob parts

  ndb/src/ndbapi/NdbBlob.cpp@1.22.16.1, 2007-08-29 21:43:41+03:00, pekka@sama.ndb.mysql.com +6 -1
    race condition : s/committedRead/readTuple/ when reading parts since TUP commits tuples separately

ChangeSet@1.2528.186.1, 2007-08-29 19:02:33+02:00, msvensson@pilot.(none) +25 -0
  Move instance manager tests to it's own suite

  mysql-test/suite/im/r/im_cmd_line.result@1.4, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result

  mysql-test/suite/im/r/im_daemon_life_cycle.result@1.16, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result

  mysql-test/suite/im/r/im_instance_conf.result@1.7, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result

  mysql-test/suite/im/r/im_life_cycle.result@1.19, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result

  mysql-test/suite/im/r/im_options.result@1.7, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result

  mysql-test/suite/im/r/im_utils.result@1.16, 2007-08-29 16:34:51+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result

  mysql-test/suite/im/t/disabled.def@1.1, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +20 -0
    New BitKeeper file ``mysql-test/suite/im/t/disabled.def''

  mysql-test/suite/im/t/disabled.def@1.0, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +0 -0

  mysql-test/suite/im/t/im_check_env.inc@1.4, 2007-08-29 18:18:05+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc

  mysql-test/suite/im/t/im_cmd_line.imtest@1.6, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_cmd_line.imtest@1.5, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_cmd_line.imtest -> mysql-test/suite/im/t/im_cmd_line.imtest

  mysql-test/suite/im/t/im_daemon_life_cycle-im.opt@1.5, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt

  mysql-test/suite/im/t/im_daemon_life_cycle.imtest@1.18, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +25 -23
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_daemon_life_cycle.imtest@1.17, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_daemon_life_cycle.imtest -> mysql-test/suite/im/t/im_daemon_life_cycle.imtest

  mysql-test/suite/im/t/im_instance_conf-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt

  mysql-test/suite/im/t/im_instance_conf.imtest@1.8, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_instance_conf.imtest@1.7, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_instance_conf.imtest -> mysql-test/suite/im/t/im_instance_conf.imtest

  mysql-test/suite/im/t/im_life_cycle-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt

  mysql-test/suite/im/t/im_life_cycle.imtest@1.14, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +8 -6
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_life_cycle.imtest@1.13, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_life_cycle.imtest -> mysql-test/suite/im/t/im_life_cycle.imtest

  mysql-test/suite/im/t/im_options-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt

  mysql-test/suite/im/t/im_options.imtest@1.7, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +1 -1
    Update location of im_check_env.inc

  mysql-test/suite/im/t/im_options.imtest@1.6, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_options.imtest -> mysql-test/suite/im/t/im_options.imtest

  mysql-test/suite/im/t/im_utils-im.opt@1.2, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt

  mysql-test/suite/im/t/im_utils.imtest@1.8, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +5 -3
    Update location of im_check_env.inc
    Add variable UTIL that points to the "ugly" .sh scripts

  mysql-test/suite/im/t/im_utils.imtest@1.7, 2007-08-29 16:34:27+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/im_utils.imtest -> mysql-test/suite/im/t/im_utils.imtest

  mysql-test/suite/im/t/kill_n_check.sh@1.7, 2007-08-29 16:43:08+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh

  mysql-test/suite/im/t/log.sh@1.4, 2007-08-29 16:42:41+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh

  mysql-test/suite/im/t/utils.sh@1.2, 2007-08-29 16:42:16+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh

  mysql-test/suite/im/t/wait_for_process.sh@1.4, 2007-08-29 16:42:26+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh

  mysql-test/suite/im/t/wait_for_socket.sh@1.6, 2007-08-29 16:42:32+02:00, msvensson@pilot.(none) +0 -0
    Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh

  mysql-test/t/disabled.def@1.281.2.2, 2007-08-29 19:02:31+02:00, msvensson@pilot.(none) +0 -9
    Move disabled im test to suite/im/t/disabled.def

ChangeSet@1.1810.3294.1, 2007-08-29 19:57:10+03:00, aelkin@koti.dsl.inet.fi +2 -0
  Bug #30209  	rpl_packet.test: Slave_running mismatch (timing bug?)
  
  explicit --sleep is removed in favor of wait_for_slave_io_to_stop.inc.
  The status reporting uses `SHOW SLAVE STATUS' *not* possibly buggy "SHOW STATUS LIKE 'Slave_running'".

  mysql-test/r/rpl_packet.result@1.4.2.1, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +34 -3
    Recording the necessary Slave_IO_Running status at the end of the bug test.
    It must be No.

  mysql-test/t/rpl_packet.test@1.4.2.2, 2007-08-29 19:57:07+03:00, aelkin@koti.dsl.inet.fi +6 -4
    Removing sleep; wait_for_slave_io_to_stop.inc instead;
    Original "SHOW STATUS LIKE 'Slave_running'" seems to be buggy (to be reported) as with the macro above
    there were evidence slave IO was stopped indeed but "SHOW STATUS" did not find that (see failures in pb)

ChangeSet@1.1810.3293.1, 2007-08-29 20:45:04+04:00, kaa@polly.local +2 -0
  Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0. This is for bug #5731.

  include/keycache.h@1.7.2.2, 2007-08-29 20:45:00+04:00, kaa@polly.local +5 -5
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

  mysys/mf_keycache.c@1.55.1.9, 2007-08-29 20:45:00+04:00, kaa@polly.local +13 -12
    Backport of the keycache changes from http://lists.mysql.com/commits/31517 to make keycache 64-bit safe in 5.0.

ChangeSet@1.1810.3292.1, 2007-08-29 20:33:44+04:00, kaa@polly.local +1 -0
  Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms, since the related code in 5.0 is not 64-bit safe. This is patch is a part of work on bug #5731 and will be null-merged to 5.1.

  sql/mysqld.cc@1.439.1.184, 2007-08-29 20:33:37+04:00, kaa@polly.local +3 -3
    Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms.

ChangeSet@1.1616.3092.3, 2007-08-29 17:54:02+02:00, msvensson@pilot.(none) +1 -0
  Remove any old pidfile before starting mysqld to make sure that
  'mysqld_wait_started' don't return prematurely because of an old
  pidfile

  mysql-test/mysql-test-run.pl@1.8.20.15, 2007-08-29 17:54:01+02:00, msvensson@pilot.(none) +3 -0
    Remove any old pidfile before starting mysqld to make sure that
    'mysqld_wait_started' don't return prematurely because of an old
    pidfile

ChangeSet@1.1810.3291.2, 2007-08-29 19:20:18+04:00, kaa@polly.local +4 -0
  Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.
  
  This is required to allow key_buffer_size > 4 GB (bug #5731).

  include/my_sys.h@1.178.2.20, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -13
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_largepage.c@1.2.1.1, 2007-08-29 19:20:12+04:00, kaa@polly.local +6 -6
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/my_malloc.c@1.9.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +8 -8
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

  mysys/safemalloc.c@1.24.1.6, 2007-08-29 19:20:12+04:00, kaa@polly.local +13 -14
    Backport of my_malloc() changes from 5.1 to make it 64-bit safe on Unix platforms.

ChangeSet@1.1810.3287.9, 2007-08-29 14:44:23+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/myisam.test@1.55.1.26, 2007-08-29 14:44:21+02:00, msvensson@pilot.(none) +3 -3
    Remove unportable use of "system rm"

ChangeSet@1.1616.3092.2, 2007-08-29 14:39:40+02:00, msvensson@pilot.(none) +1 -0
  Fix typo: '$$' => '$'

  mysql-test/lib/mtr_misc.pl@1.5.1.9, 2007-08-29 14:39:39+02:00, msvensson@pilot.(none) +1 -1
    Fix typo: '$$' => '$'

ChangeSet@1.2528.183.1, 2007-08-29 14:54:32+03:00, gkodinov@magare.gmz +3 -0
  Bug #30244: row_count/found_rows does not replicate well
  
   The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in 
   statement based replication.
   Added code to declare them as such and switch the statement they're in
   to row based logging for mixed mode.

  mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result@1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +22 -0
    BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result

  mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result@1.0, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +0 -0

  mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test@1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +35 -0
    BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test

  mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test@1.0, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +0 -0

  sql/item_create.cc@1.90.1.1, 2007-08-29 14:54:30+03:00, gkodinov@magare.gmz +2 -0
    Bug #30244: row_count/found_rows does not replicate well
     - add the functions to the set of "unsafe functions" 
       for statement based replication

ChangeSet@1.2528.182.1, 2007-08-29 14:46:49+03:00, gkodinov@magare.gmz +2 -0
  Bug #30393: Test "group_by" fails with a difference in "row count" 
      and strategy (explain)
    
  The fix for WL3527 adds tests that test if the index usage hints
  combinations don't cause syntax errors.
  The EXPLAIN for one of these tests can be affected by the size of the
  rowid on the disk (affected by the presence of large file support). 
  Fixed to avoid the platform dependent test result by removing the 
  irrelevant columns from the EXPLAIN result.

  mysql-test/r/group_by.result@1.88, 2007-08-29 14:46:46+03:00, gkodinov@magare.gmz +1 -1
    Bug #30393: ignore columns irrelevant to the test

  mysql-test/t/group_by.test@1.69, 2007-08-29 14:46:46+03:00, gkodinov@magare.gmz +5 -0
    Bug #30393: ignore columns irrelevant to the test

ChangeSet@1.1810.3275.7, 2007-08-29 14:57:59+04:00, anozdrin@ibm. +2 -0
  Test case for Bug#13675: DATETIME/DATE type in store proc param
  seems to be converted as varbinary.
  
  The bug has been already fixed. This CS just adds a test case for it.

  mysql-test/r/sp.result@1.170.46.1, 2007-08-29 14:57:57+04:00, anozdrin@ibm. +52 -0
    Update result file.

  mysql-test/t/sp.test@1.174.46.1, 2007-08-29 14:57:57+04:00, anozdrin@ibm. +54 -0
    Test case for BUG#13675.

ChangeSet@1.1810.3287.7, 2007-08-29 12:47:00+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "system rm"

  mysql-test/t/ps.test@1.56.1.38, 2007-08-29 12:46:59+02:00, msvensson@pilot.(none) +0 -3
    Remove unportable use of "system rm"

ChangeSet@1.1810.3287.6, 2007-08-29 12:44:43+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable "system rm"

  mysql-test/t/backup.test@1.16.2.6, 2007-08-29 12:44:42+02:00, msvensson@pilot.(none) +10 -1
    Remove unportable "system rm"

ChangeSet@1.1810.3287.3, 2007-08-29 11:53:15+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable use of "exec chmod"

  mysql-test/t/information_schema_chmod.test@1.4, 2007-08-29 11:53:14+02:00, msvensson@pilot.(none) +1 -1
    Remove unportable use of "exec chmod"

ChangeSet@1.1616.3092.1, 2007-08-29 11:51:34+02:00, msvensson@pilot.(none) +2 -0
  Add 'mtr_rmtree'

  mysql-test/lib/mtr_misc.pl@1.5.1.8, 2007-08-29 11:51:33+02:00, msvensson@pilot.(none) +60 -0
    Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
    due to permission problems we will fun File::find to chmod all files and dirs
    to 0777 and then delete.

  mysql-test/mysql-test-run.pl@1.8.20.14, 2007-08-29 11:51:33+02:00, msvensson@pilot.(none) +10 -10
    Use 'mtr_rmtree' in favour of 'rmtree'

ChangeSet@1.2528.144.16, 2007-08-29 12:39:42+03:00, gkodinov@magare.gmz +1 -0
  Addendum to the 5.1 merge of the fix
  for bug 30377: use the function instead of
  the complex condition.

  sql/sql_parse.cc@1.700.1.3, 2007-08-29 12:39:40+03:00, gkodinov@magare.gmz +1 -2
    Addendum to the 5.1 merge of the fix
    for bug 30377: use the function instead of
    the complex condition.

ChangeSet@1.2482.124.4, 2007-08-29 14:30:21+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET
  
  Index: ndb/storage/ndb/src/mgmapi/mgmapi.cpp
  ===================================================================

  storage/ndb/src/mgmapi/mgmapi.cpp@1.96, 2007-08-29 10:51:05+10:00, stewart@flamingspork.com +1 -1
    Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET

ChangeSet@1.2528.153.11, 2007-08-28 15:56:12-06:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/sql_yacc.yy@1.597.1.8, 2007-08-28 15:56:10-06:00, malff@weblab.(none) +44 -56
    Manual merge

ChangeSet@1.2546, 2007-08-28 20:59:40+02:00, mleich@four.local.lan +4 -0
  Post merge fix 1 for
     ChangeSet@1.2509, 2007-08-28
     http://lists.mysql.com/commits/33239
  Fixes for the funcs_1 datadict test bugs
  #30418 "datadict" tests (all engines) fail:
         Dependency on the host name for ordering
  #30420 "datadict" tests (all engines) fail:
         Release build has help tables loaded
  #30438 "{memory,myisam,ndb}__datadict" tests fail:
         Use "InnoDB" without checking
  #30440 "datadict" tests (all engines) fail:
         Character sets depend on
                   configuration
  There are more post merge fixes needed.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +14 -176
    Post merge fix for
       ChangeSet@1.2509, 2007-08-28

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +14 -176
    Updated results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.9, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +7 -175
    Updated results

  mysql-test/suite/funcs_1/t/ndb__datadict.test@1.2, 2007-08-28 20:59:38+02:00, mleich@four.local.lan +4 -0
    Adjusted script

ChangeSet@1.1810.3290.1, 2007-08-28 11:16:03-06:00, malff@weblab.(none) +3 -0
  Bug#30625 (Performance, reduce depth for expressions)
  
  This is a performance bug, affecting in particular the bison generated code
  for the parser.
  
  Prior to this fix, the grammar used a long chain of reduces to parse an
  expression, like:
    bit_expr -> bit_term
    bit_term -> bit_factor
    bit_factor -> value_expr
    value_expr -> term
    term -> factor
  etc
  
  This chain of reduces cause the internal state automaton in the generated
  parser to execute more state transitions and more reduces, so that the
  generated MySQLParse() function would spend a lot of time looping to execute
  all the grammar reductions.
  
  With this patch, the grammar has been reorganized so that rules are more
  "flat", limiting the depth of reduces needed to parse <expr>.
  
  Tests have been written to enforce that relative priorities and properties
  of operators have not changed while changing the grammar.
  
  See the bug report for performance data.

  mysql-test/r/parser_precedence.result@1.2, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +391 -0
    Improved test coverage for operator precedence

  mysql-test/t/parser_precedence.test@1.2, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +240 -0
    Improved test coverage for operator precedence

  sql/sql_yacc.yy@1.371.1.162, 2007-08-28 11:16:02-06:00, malff@weblab.(none) +55 -60
    Simplified the grammar to improve performances

ChangeSet@1.1810.3289.1, 2007-08-28 18:37:17+02:00, mleich@four.local.lan +12 -0
  Fixes for
       Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                  for ordering
       Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
       Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
       Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
  Attention: Only the build team can check if Bug#30440 is really fixed.

  mysql-test/suite/funcs_1/README.txt@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +22 -0
    Update README

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +242 -206
    1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
       and the INFORMATION_SCHEMA.STATISTICS selects.
    2. Replace error numbers with error names
    3. Sort some results with mysqltest builtin function
    4. Some other minor changes

  mysql-test/suite/funcs_1/r/datadict_help_tables_build.result@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +22 -0
    File with expected results

  mysql-test/suite/funcs_1/r/datadict_help_tables_build.result@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +18 -0
    File with expected results

  mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/innodb__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/r/memory__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/r/myisam__datadict.result@1.1.2.2, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +31 -209
    Updated expected results

  mysql-test/suite/funcs_1/t/datadict_help_tables_build.test@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +73 -0
    Additional test checking the information about the help tables within
           INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
    as compensation for the removed checks within datadict_master.inc.
    Variant for use during build tests (non empty help tables)

  mysql-test/suite/funcs_1/t/datadict_help_tables_build.test@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test@1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +27 -0
    Additional test checking the information about the help tables within
           INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
    as compensation for the removed checks within datadict_master.inc.
    Variant for use during development tests (empty help tables)

  mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test@1.0, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/innodb__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +4 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

  mysql-test/suite/funcs_1/t/memory__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +4 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

  mysql-test/suite/funcs_1/t/myisam__datadict.test@1.1.1.1, 2007-08-28 18:35:22+02:00, mleich@four.local.lan +5 -0
    Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.

ChangeSet@1.2528.178.1, 2007-08-28 18:01:29+02:00, mhansson@linux-st28.site +6 -0
  Bug #30596  	GROUP BY optimization gives wrong result order
    
  The optimization that uses a unique index to remove GROUP BY did not 
  ensure that the index was actually used, thus violating the ORDER BY
  that is implied by GROUP BY.
  Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
  a unique index over non-nullable field(s). In case GROUP BY ... ORDER BY 
  null is used, GROUP BY is simply removed.

  mysql-test/include/mix1.inc@1.52, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case for InnoDB
    Here, as opposed to for MyISAM, row lookup is done using index 
    whenever the index covers the group list.

  mysql-test/r/distinct.result@1.57, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +3 -3
    Bug#30596: Changed test case. 
    Prior to Bug#16458, These queries use temp table and filesort. The
    bug was that they used a temp table. However, that patch removed
    filesort also, in which case we can no longer gurantee correct ordering.

  mysql-test/r/group_by.result@1.87, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +92 -1
    Bug#30596: Correct result
    The test case for IGNORE INDEX FOR GROUP BY gets degraded performance 
    (unneccesary filesort). This is due to Bug#30665, which will be fixed separately.

  mysql-test/r/innodb_mysql.result@1.55, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Test result

  mysql-test/t/group_by.test@1.68, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +44 -0
    Bug#30596: Test case

  sql/sql_select.cc@1.551.1.1, 2007-08-28 18:01:26+02:00, mhansson@linux-st28.site +14 -0
    Bug#30596: The fix: 
    - replace GROUP BY with ORDER BY unless ORDER BY [NULL|<constant>]
    - make sure to use the keys for GROUP BY in this ORDER BY.

ChangeSet@1.1810.3288.1, 2007-08-28 18:51:03+03:00, gkodinov@magare.gmz +4 -0
  Bug #30377: EXPLAIN loses last_query_cost when used with UNION
  
  Currently the Last_query_cost session status variable shows
  only the cost of a single flat subselect. For complex queries
  (with subselects or unions etc) Last_query_cost is not valid
  as it was showing the cost for the last optimized subselect.
  Fixed by reseting to zero Last_query_cost when the complete
  cost of the query cannot be determined.
  Last_query_cost will be non-zero only for single flat queries.

  mysql-test/r/status.result@1.10.1.1, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +48 -0
    Bug #30377: test case

  mysql-test/t/status.test@1.15.1.5, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +32 -0
    Bug #30377: test case

  sql/sql_lex.h@1.175.1.78, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +22 -0
    Bug #30377: helper function

  sql/sql_select.cc@1.312.170.1, 2007-08-28 18:51:02+03:00, gkodinov@magare.gmz +6 -2
    Bug #30377: don't assign cost if not on single level statement

ChangeSet@1.1810.3287.2, 2007-08-28 16:47:05+02:00, msvensson@pilot.(none) +1 -0
  Streamline "do_close_connection" and "do_send_quit"
  Fix typo, "next_con" -> "con"

  client/mysqltest.c@1.155.9.116, 2007-08-28 16:47:04+02:00, msvensson@pilot.(none) +58 -66
    Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit"
    Adjust alignment of comment
    Fix typo in "do_close_connection", it used the global variable "next_con" instead
    of local variable "con"

ChangeSet@1.1810.3287.1, 2007-08-28 16:44:31+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable constructs in loaddata.test

  mysql-test/t/loaddata.test@1.15.2.1, 2007-08-28 16:44:30+02:00, msvensson@pilot.(none) +10 -12
    Remove unportable constructs in loaddata.test

ChangeSet@1.1810.3286.2, 2007-08-28 16:06:08+02:00, df@pippilotta.erinye.com +1 -0
  fix bug in test case for bug#25714
  TAG: mysql-5.0.48

  mysql-test/include/have_bug25714.inc@1.1.2.1, 2007-08-28 16:06:06+02:00, df@pippilotta.erinye.com +1 -1
    this is not how you access variables

ChangeSet@1.2482.124.3, 2007-08-28 15:44:20+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  Bug #30667 result file

  mysql-test/r/ndb_restore.result@1.26.1.1, 2007-08-28 15:44:17+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #30667 result file

ChangeSet@1.2482.124.2, 2007-08-28 15:43:06+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  Bug #30667 ndb table discovery does not work correcly with information schema
  - the listed file_names are not necessarily on disk, so we need to discover them if they aren't

  mysql-test/t/ndb_restore.test@1.26.2.1, 2007-08-28 15:43:02+02:00, tomas@whalegate.ndb.mysql.com +5 -0
    Bug #30667 ndb table discovery does not work correcly with information schema

  sql/ha_ndbcluster.cc@1.457.3.1, 2007-08-28 15:43:03+02:00, tomas@whalegate.ndb.mysql.com +18 -1
    Bug #30667 ndb table discovery does not work correcly with information schema
    - the listed file_names are not necessarily on disk, so we need to discover them if they aren't

ChangeSet@1.2528.141.21, 2007-08-28 15:35:42+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable construct in loaddata.test

  mysql-test/t/loaddata.test@1.31, 2007-08-28 15:35:41+02:00, msvensson@pilot.(none) +1 -1
    Remove unportable construct in loaddata.test

ChangeSet@1.1810.2875.71, 2007-08-28 15:32:44+02:00, msvensson@pilot.(none) +1 -0
  Remove unportable constructs in loaddata.test

  mysql-test/t/loaddata.test@1.15.1.12, 2007-08-28 15:32:43+02:00, msvensson@pilot.(none) +10 -12
    Remove unportable constructs in loaddata.test

ChangeSet@1.1810.2875.70, 2007-08-28 15:32:13+02:00, msvensson@pilot.(none) +2 -0
  Move "analyze_testcase_failure" to mysqltest(since it knows best when
  to perform this analyzis)

  client/mysqltest.c@1.155.9.115, 2007-08-28 15:32:12+02:00, msvensson@pilot.(none) +69 -0
    Add function 'show_query' and use it to output some debug queries when
    "sync_with_master" has failed.

  mysql-test/mysql-test-run.pl@1.30.49.100, 2007-08-28 15:32:12+02:00, msvensson@pilot.(none) +0 -54
    Move "analyze_testcase_failure" to mysqltest

ChangeSet@1.1810.3286.1, 2007-08-28 15:22:14+02:00, df@pippilotta.erinye.com +1 -0
  build fix for aix and others

  libmysql/libmysql.c@1.233.5.20, 2007-08-28 15:22:12+02:00, df@pippilotta.erinye.com +3 -3
    build fix: DBUG_ENTER can't be this late

ChangeSet@1.2528.141.19, 2007-08-28 12:41:25+02:00, msvensson@pilot.(none) +1 -0
  Temp disable of icheck

  include/Makefile.am@1.86, 2007-08-28 12:41:24+02:00, msvensson@pilot.(none) +1 -1
    Temp disable of icheck

ChangeSet@1.2528.141.18, 2007-08-28 11:39:29+02:00, msvensson@pilot.(none) +1 -0
  Fix warning

  client/mysqltest.c@1.311, 2007-08-28 11:39:27+02:00, msvensson@pilot.(none) +1 -1
    Fix warning

ChangeSet@1.1810.3285.1, 2007-08-28 11:34:43+02:00, msvensson@pilot.(none) +2 -0
  Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117
   - Merge sslaccept and sslconnect.
   - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
     succeeded, this avoids having to revert anything and thus protects
     against "close_active_vio" in the middle.
   - Add some variance to the testcase

  mysql-test/t/rpl_ssl.test@1.1.1.4, 2007-08-28 11:34:42+02:00, msvensson@pilot.(none) +15 -0
    Add some variance by running two selects before stopping the slave
    Check that number of records in t1 are equal on master and slave

  vio/viossl.c@1.34.2.10, 2007-08-28 11:34:42+02:00, msvensson@pilot.(none) +46 -96
    Rewrite sslconnect and sslaccept to automically "reset" the vio
    to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid
    setting vio->sd to -1, that previously occured when "close_active_vio"
    was called during connect/accept.
    
    Merge the two function since they were exactly the same except for one line.
    
    Update the DBUG printouts to be generic(i.e use peer instead of client/server).

ChangeSet@1.1810.3261.10, 2007-08-28 10:35:55+02:00, msvensson@pilot.(none) +15 -0
  Import yaSSL version 1.7.2
  - Fix bug#27265
  - Support for fixing bug#18441

  extra/yassl/include/openssl/crypto.h@1.3.1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/des_old.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/des_old.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/evp.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +10 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/evp.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/hmac.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/hmac.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/objects.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/objects.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/prefix_ssl.h@1.5, 2007-08-28 10:35:54+02:00, msvensson@pilot.(none) +3 -0
    Update prefixes

  extra/yassl/include/openssl/sha.h@1.1, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/sha.h@1.0, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +0 -0

  extra/yassl/include/openssl/ssl.h@1.14.1.11, 2007-08-28 09:45:25+02:00, msvensson@pilot.(none) +2 -1
    Import patch yassl.diff

  extra/yassl/include/yassl_int.hpp@1.11.1.10, 2007-08-06 10:02:27+02:00, msvensson@pilot.(none) +1 -1
    Import patch yassl.diff

  extra/yassl/src/handshake.cpp@1.16, 2007-08-28 09:57:52+02:00, msvensson@pilot.(none) +4 -0
    Import patch yassl.diff

  extra/yassl/src/socket_wrapper.cpp@1.16, 2007-08-28 10:03:04+02:00, msvensson@pilot.(none) +0 -4
    Import patch yassl.diff

  extra/yassl/src/ssl.cpp@1.16.1.16, 2007-08-28 09:45:26+02:00, msvensson@pilot.(none) +6 -0
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp@1.19.1.8, 2007-08-20 21:54:45+02:00, msvensson@pilot.(none) +1 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/coding.cpp@1.9, 2007-05-03 19:31:49+02:00, msvensson@pilot.(none) +3 -2
    Import patch yassl.diff

  extra/yassl/taocrypt/src/crypto.cpp@1.3, 2007-08-21 00:31:31+02:00, msvensson@pilot.(none) +5 -0
    Import patch yassl.diff

ChangeSet@1.2528.176.4, 2007-08-28 01:02:57-06:00, tsmith@sita.local +2 -0
  Post-merge fixes

  sql/ha_partition.cc@1.102, 2007-08-28 01:02:52-06:00, tsmith@sita.local +0 -7
    Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)

  sql/mysqld.cc@1.669, 2007-08-28 01:02:53-06:00, tsmith@sita.local +5 -4
    Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
    duplicate definition of OPT_KEEP_FILES_ON_CREATE).

ChangeSet@1.2482.124.1, 2007-08-27 21:58:49+03:00, pekka@sama.ndb.mysql.com +2 -0
  ndb - bug#30646 fsync on close only if file is open for write

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.40, 2007-08-27 21:57:18+03:00, pekka@sama.ndb.mysql.com +8 -1
    AsyncFile: fsync on close only if file is open for write (for AIX)

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@1.12, 2007-08-27 21:57:18+03:00, pekka@sama.ndb.mysql.com +2 -0
    AsyncFile: fsync on close only if file is open for write (for AIX)

ChangeSet@1.1810.3284.1, 2007-08-27 17:33:41+02:00, mhansson@linux-st28.site +7 -0
  Bug #30596  	GROUP BY optimization gives wrong result order
  
  The optimization that uses a unique index to remove GROUP BY, did not 
  ensure that the index was actually used, thus violating the ORDER BY
  that is impled by GROUP BY.
  Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
  a unique index. In case GROUP BY ... ORDER BY null is used, GROUP BY is
  simply removed.

  BitKeeper/etc/ignore@1.210.1.43, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +5 -0
    Added support-files/mysqld_multi.server tests/bug25714 cscope.in.out cscope.out cscope.po.out to the ignore list

  mysql-test/t/innodb_mysql.test@1.3.46.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case

  mysql-test/r/distinct.result@1.46.1.8, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +3 -3
    Bug#30596: Changed test case. 
    Prior to Bug#16458, These queries use temp table and filesort. The
    bug was that they used a temp table. However, that patch removed
    filesort also, in which case we can no longer gurantee correct ordering.

  mysql-test/r/group_by.result@1.69.1.11, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Correct result

  mysql-test/r/innodb_mysql.result@1.3.24.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +49 -0
    Bug#30596: Test case for innodb. Here, as opposed to for MyISAM, row 
    lookup is done using index whenever the index covers the group list.

  mysql-test/t/group_by.test@1.59.1.6, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +27 -0
    Bug#30596: Test case

  sql/sql_select.cc@1.312.169.1, 2007-08-27 17:33:38+02:00, mhansson@linux-st28.site +8 -0
    Bug#30596: The fix, replacing GROUP BY with ORDER BY unless 
    ORDER BY [NULL|<constant>]

ChangeSet@1.2528.174.1, 2007-08-27 18:44:13+04:00, skozlov@mysql.com +3 -0
  WL#3694 Replication of Invocation and Invoked Features Testing.
  Bug#29020 Event results not correctly replicated to slave in RBR: partially.

  mysql-test/suite/rpl/r/rpl_invoked_features.result@1.5, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +14 -16
    Updated result file.

  mysql-test/suite/rpl/t/disabled.def@1.13, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +0 -3
    removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)

  mysql-test/suite/rpl/t/rpl_invoked_features.test@1.6, 2007-08-27 18:44:03+04:00, skozlov@mysql.com +49 -31
    Added comments, implemented the waiting via include/wait_condition, minor fixes.

ChangeSet@1.2528.1.37, 2007-08-27 16:17:17+02:00, rafal@quant.(none) +5 -0
  Post merge fixes.

  sql/log_event.cc@1.297.4.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +23 -18
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event.h@1.155.3.2, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.
    - Rows_log_event fields which are used for event application not 
      included when compiling in MYSQL_CLIENT mode.

  sql/log_event_old.cc@1.5.2.3, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +12 -12
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/log_event_old.h@1.7, 2007-08-27 16:17:12+02:00, rafal@quant.(none) +8 -8
    - Rename RELAY_LOG_INFO -> Relay_log_info.

  sql/sql_yacc.yy@1.598.2.1, 2007-08-27 16:17:13+02:00, rafal@quant.(none) +1 -12
    Reverting to version used in the rpl tree.

ChangeSet@1.1810.3275.5, 2007-08-27 10:37:12-03:00, davi@moksha.local +3 -0
  Bug#30632 HANDLER read failure causes hang
  
  If, after the tables are locked, one of the conditions to read from a
  HANDLER table is not met, the handler code wrongly jumps to a error path
  that won't unlock the tables.
  
  The user-visible effect is that after a error in a handler read command,
  all subsequent handler operations on the same table will hang.
  
  The fix is simply to correct the code to jump to the (same) error path that
  unlocks the tables.

  mysql-test/t/handler.test@1.25.2.1, 2007-08-27 10:37:10-03:00, davi@moksha.local +19 -0
    Bug#30632 test case

  mysql-test/r/handler.result@1.25.3.1, 2007-08-27 10:37:10-03:00, davi@moksha.local +13 -0
    Bug#30632 test case result

  sql/sql_handler.cc@1.72.1.19, 2007-08-27 10:37:10-03:00, davi@moksha.local +3 -3
    Always unlock the internal and external table level locks if any of the conditions
    (including errors) to read from a HANDLER table are not met.

ChangeSet@1.1810.3275.4, 2007-08-27 10:13:54-03:00, davi@moksha.local +3 -0
  Bug#25164 create table `a` as select * from `A` hangs
  
  The problem from a user's perspective: user creates table A, and then tries
  to CREATE TABLE a SELECT from A - and this causes a deadlock error, a hang,
  or fails with a debug assert, but only if the storage engine is InnoDB.
  
  The origin of the problem: InnoDB uses case-insensitive collation
  (system_charset_info) when looking up the internal table share, thus returning
  the same share for 'a' and 'A'.
  
  Cause of the user-visible behavior: since the same share is returned to SQL
  locking subsystem, it assumes that the same table is first locked (within the
  same session) for WRITE, and then for READ, and returns a deadlock error.
  However, the code is wrong in not properly cleaning up upon an error, leaving
  external locks in place, which leads to assertion failures and hangs.
  
  Fix that has been implemented: the SQL layer should properly propagate the
  deadlock error, cleaning up and freeing all resources.
  
  Further work towards a more complete solution: InnoDB should not use case
  insensitive collation for table share hash if table names on disk honor the case.

  mysql-test/t/innodb-deadlock.test@1.11.4.1, 2007-08-27 10:13:52-03:00, davi@moksha.local +26 -1
    Bug#25164 test case. The CREATE TABLE may fail depending on the character set
    of the system and filesystem, but it should never hang.

  mysql-test/r/innodb-deadlock.result@1.5.1.1, 2007-08-27 10:13:52-03:00, davi@moksha.local +11 -0
    Bug#25164 test case result

  sql/lock.cc@1.64.1.36, 2007-08-27 10:13:52-03:00, davi@moksha.local +2 -0
    Unlock the storage engine "external" table level locks, if the MySQL thr_lock
    locking subsystem detects a deadlock error.

ChangeSet@1.2528.141.15, 2007-08-27 13:55:45+02:00, msvensson@pilot.(none) +2 -0
  Enable abi_check for 5.1
   - Run icheck on all files in HEADERS_ABI list 
   - Update reference 

  include/Makefile.am@1.85, 2007-08-27 13:55:43+02:00, msvensson@pilot.(none) +5 -7
    Enable abi_check for external API header files

  include/mysql_h.ic@1.12, 2007-08-27 13:55:43+02:00, msvensson@pilot.(none) +471 -268
    Update abi_check reference

ChangeSet@1.2528.141.14, 2007-08-27 13:39:34+02:00, msvensson@pilot.(none) +1 -0
  Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
   - Set sql_mode to default when creating system tables

  scripts/mysql_system_tables.sql@1.15, 2007-08-27 13:39:32+02:00, msvensson@pilot.(none) +1 -0
    set sql_mode = "" when creating the system tables

ChangeSet@1.2528.141.13, 2007-08-27 13:16:39+02:00, msvensson@pilot.(none) +1 -0
  Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459

  scripts/mysql_system_tables.sql@1.14, 2007-08-27 13:16:38+02:00, msvensson@pilot.(none) +0 -0
    Exclude

ChangeSet@1.1810.2875.67, 2007-08-27 11:38:32+02:00, df@pippilotta.erinye.com +1 -0
  adjust version number

  configure.in@1.245.1.211, 2007-08-27 11:38:31+02:00, df@pippilotta.erinye.com +2 -2
    adjust version number after 5.0.48 clone-off

ChangeSet@1.1810.3261.9, 2007-08-27 11:31:49+02:00, msvensson@pilot.(none) +1 -0
  Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password
   - "mysql" and "mysqlcheck" should not read defaults file

  client/mysql_upgrade.c@1.6.1.20, 2007-08-27 11:31:48+02:00, msvensson@pilot.(none) +2 -0
    Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not
    to read defaults file, they should get all the parameters they need from
    mysql_upgrade(that read the default file)

ChangeSet@1.2528.141.11, 2007-08-27 11:27:03+02:00, msvensson@pilot.(none) +1 -0
  Bug#30487 mysql_upgrade reports misleading errors
   - Update result file to include these "misleading errors", better to 
  run mysql_upgrade with them than not at all.

  mysql-test/r/mysql_upgrade.result@1.14, 2007-08-27 11:27:02+02:00, msvensson@pilot.(none) +24 -8
    Update result file for mysql_upgrade after removing it's disabling

ChangeSet@1.2528.141.9, 2007-08-27 11:20:31+02:00, msvensson@pilot.(none) +1 -0
  Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries
   - Remove disabling of mysql_upgrade

  mysql-test/t/disabled.def@1.281.2.1, 2007-08-27 11:20:29+02:00, msvensson@pilot.(none) +0 -1
    Remove disabling of mysql_upgrade

ChangeSet@1.1810.3261.8, 2007-08-27 10:25:34+02:00, msvensson@pilot.(none) +1 -0
  Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries
   - Chop off .libs/ part of path if running in non installed builddir
     using libtool

  client/mysql_upgrade.c@1.6.1.19, 2007-08-27 10:25:33+02:00, msvensson@pilot.(none) +41 -32
    Chop off .libs part of path to avoid executing "non relinked" binaries
    that would use the system installed dynamic libraries instead of the
    newly built ones.

ChangeSet@1.1810.3282.2, 2007-08-25 17:32:17+00:00, evgen@moonbone.local +1 -0
  sql_select.cc:
    Additional fix for the bug#30245.

  sql/sql_select.cc@1.312.166.4, 2007-08-25 17:11:45+00:00, evgen@moonbone.local +1 -1
    Additional fix for the bug#30245.

ChangeSet@1.2528.153.8, 2007-08-24 19:17:29-03:00, davi@moksha.local +2 -0
  Add test case for bug 29936 Stored Procedure DML ignores low_priority_updates setting.
  
  This test case uses the wait_condition helper (only available in 5.1) in order to wait till the select/update opens and locks the table.

  mysql-test/r/sp.result@1.288.1.1, 2007-08-24 19:17:25-03:00, davi@moksha.local +23 -0
    Test case result for bug 29936

  mysql-test/t/sp.test@1.251.1.1, 2007-08-24 19:17:26-03:00, davi@moksha.local +65 -0
    Test case for bug 29936

ChangeSet@1.2528.162.1, 2007-08-24 09:08:11-06:00, malff@weblab.(none) +1 -0
  
  Whitespace cleanup

  sql/sql_yacc.yy@1.597.1.6, 2007-08-24 09:08:07-06:00, malff@weblab.(none) +12 -11
    
    Whitespace cleaup

ChangeSet@1.2528.158.4, 2007-08-24 18:06:44+03:00, gkodinov@magare.gmz +3 -0
  Bug #28284: Test "mysqlslap" reports "out of memory"
  
  When locking a "fast" mutex a static variable cpu_count 
  was used as a flag to initialize itself on the first usage 
  by calling sysconf() and setting non-zero value.
  This is not thread and optimization safe on some 
  platforms. That's why the global initialization needs 
  to be done once in a designated function.
  This will also speed up the usage (by a small bit) 
  because it won't have to check if it's initialized on
  every call.
  
  Fixed by moving the fast mutexes initialization out of 
  my_pthread_fastmutex_lock() to fastmutex_global_init()
  and call it from my_init()

  include/my_pthread.h@1.116.1.1, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +1 -0
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

  mysys/my_init.c@1.62, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +3 -0
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

  mysys/thr_mutex.c@1.32, 2007-08-24 18:06:42+03:00, gkodinov@magare.gmz +11 -6
    Bug #28284: move the fast mutexes initialization out of 
    my_pthread_fastmutex_lock() to fastmutex_global_init()
    and call it from my_init()

ChangeSet@1.2528.152.11, 2007-08-24 16:40:26+02:00, jperkin@production.mysql.com +1 -0
  Finish up last syslog -> want_syslog change missed in r1.91,
  fixing bug#30624

  scripts/mysqld_safe.sh@1.93, 2007-08-24 16:39:16+02:00, jperkin@production.mysql.com +1 -1
    Fix last syslog -> want_syslog.

ChangeSet@1.1810.3261.7, 2007-08-24 15:43:45+02:00, msvensson@pilot.(none) +2 -0
  Remove unsued variable $glob_hostname, unused functions
  'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/lib/mtr_misc.pl@1.12.1.11, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +0 -26
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

  mysql-test/mysql-test-run.pl@1.30.49.99, 2007-08-24 15:43:44+02:00, msvensson@pilot.(none) +4 -4
    Remove unsued variable $glob_hostname, unused functions
    'mtr_short_hostname' and 'mtr_full_hostname'

ChangeSet@1.1810.3261.5, 2007-08-24 13:10:34+02:00, msvensson@pilot.(none) +1 -0
  Remove unecessary use of "Socket"

  mysql-test/lib/mtr_timer.pl@1.7.1.8, 2007-08-24 13:10:32+02:00, msvensson@pilot.(none) +0 -1
    Remove unecessary use of "Socket"

ChangeSet@1.1810.3277.2, 2007-08-24 10:47:13+02:00, joerg@trift2. +1 -0
  NetWare packages were missing the scripts to initialize the database: add them.

  netware/Makefile.am@1.15.1.10, 2007-08-24 10:47:10+02:00, joerg@trift2. +1 -1
    NetWare packages were missing the scripts to initialize the database: add them.

ChangeSet@1.2528.157.1, 2007-08-23 23:34:48+05:00, holyfoot@mysql.com +3 -0
  Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
  
  In the ha_partition::position() we didn't calculate the number
  of the partition of the record. We used m_last_part value instead,
  relying on that it is set in other place like previous call of a method
  like ::write_row(). In replication we don't call any of these befor
  position(). Delete_rows_log_event::do_exec_row calls find_and_fetch_row.
  In case of InnoDB-based PARTITION table, we have HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
  enabled, so use position() / rnd_pos() calls to fetch the record.
  
  Fixed by adding partition_id calculation to the ha_partition::position()

  mysql-test/r/partition_pruning.result@1.26, 2007-08-23 23:32:38+05:00, holyfoot@mysql.com +2 -2
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    test result fixed

  sql/ha_partition.cc@1.97.1.2, 2007-08-23 23:31:10+05:00, holyfoot@mysql.com +13 -1
    Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    Calculate the number of the partition in ha_partition::position().
    ha_partition::column_bitmaps_signal() implemented

  sql/ha_partition.h@1.38.1.1, 2007-08-23 23:29:49+05:00, holyfoot@mysql.com +1 -0
     Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
    column_bitmaps_signal interface added

ChangeSet@1.1810.3216.32, 2007-08-23 20:24:48+02:00, msvensson@pilot.(none) +1 -0
  Bug#30593 No cipher list returned for "SHOW STATUS LIKE 'Ssl_cipher_list'"
   - Move increment of "i" to "increment section" of for loop
   - Protect against writing after end of "buff"(backport from 5.1)

  sql/sql_show.cc@1.253.54.1, 2007-08-23 20:24:47+02:00, msvensson@pilot.(none) +3 -2
    - Move the increment of i to "increment" section of for loop. Since "i"
    was initially 0 the for loop exited immediately
    - Add protection for writing after end of "buff"

ChangeSet@1.2528.154.1, 2007-08-23 15:37:55+02:00, thek@adventure.(none) +2 -0
  Bug#28285 Test "events_bugs" has instable results of "select /*1*/ ... from processlist"
  
  Test case contains possible race conditions. This patch fixes these race
  conditions and also adjust the test to execute according to its documentation.

  mysql-test/r/events.result@1.54, 2007-08-23 15:37:53+02:00, thek@adventure.(none) +3 -0
    Modified test case to fit test documentation

  mysql-test/t/events.test@1.50, 2007-08-23 15:37:53+02:00, thek@adventure.(none) +6 -2
    Modified test case to fit test documentation

ChangeSet@1.1810.3278.1, 2007-08-23 10:22:20+02:00, thek@adventure.(none) +3 -0
  Bug#27358 INSERT DELAYED does not honour SQL_MODE of the client
  
  SQL_MODE was ignored when a client issued INSERT DELAYED.
  
  Some system settings weren't copied as intended when a record was saved for
  a delayed insert. 

  mysql-test/r/delayed.result@1.12.1.3, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +29 -0
    Added test case

  mysql-test/t/delayed.test@1.11.1.8, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +31 -0
    Added test case

  sql/sql_insert.cc@1.146.65.1, 2007-08-23 10:22:18+02:00, thek@adventure.(none) +8 -0
    - Added two new variables (sql_mode, auto_increment_field_not_null) to support
      SQL_MODE in INSERT DELAYED statements.

ChangeSet@1.1810.3275.3, 2007-08-22 18:11:01-06:00, malff@weblab.(none) +1 -0
  Do not use $static_link for GCOV builds,
  since this flag was explicitly removed in pushbuild for GCOV builds.
  
   BUILD_CMD => ['sh', '-c', 'perl -i.bak -pe "s/ \\\\\$static_link//" ' .
                'BUILD/compile-pentium-gcov; BUILD/compile-pentium-gcov'],
  
  Moving $static_link to SETUP.sh broke this, and is now fixed.
  
  Should this flag be needed on some platforms,
  the proper location is compile-<platform>-gcov
  
  Tested the amd64 and pentium64 build fine without it, and can run NDB tests.

  BUILD/SETUP.sh@1.44.1.22, 2007-08-22 18:10:58-06:00, malff@weblab.(none) +1 -1
    Removed $static_link from GCOV builds.

ChangeSet@1.2528.153.4, 2007-08-22 15:38:32-06:00, malff@weblab.(none) +3 -0
  Bug#30333 (Performance, expressions lists in the parser)
  
  Before this patch, the parser would execute:
  - Select->expr_list.push_front()
  - Select->expr_list.pop()
  when parsing expressions lists, in the following rules:
  - udf_expr_list
  - expr_list
  - ident_list
  
  This is unnecessary, and introduces overhead due to the memory allocations
  performed with Select->expr_list
  
  With this patch, this code has been removed.
  The list being parsed is maintained in the parser stack instead.
  
  Also, 'udf_expr_list' has been renamed 'opt_udf_expr_list', since this
  production can be empty.

  sql/sql_lex.cc@1.255.3.3, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +0 -2
    Removed unused attribute expr_list

  sql/sql_lex.h@1.294, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +0 -1
    Removed unused attribute expr_list

  sql/sql_yacc.yy@1.597.1.5, 2007-08-22 15:38:28-06:00, malff@weblab.(none) +41 -37
    Improved performances when parsing expression lists

ChangeSet@1.2528.153.3, 2007-08-22 14:25:36-06:00, malff@weblab.(none) +1 -0
  Manual merge

  sql/sql_yacc.yy@1.597.1.4, 2007-08-22 14:25:33-06:00, malff@weblab.(none) +98 -45
    Manual merge

ChangeSet@1.1810.3277.1, 2007-08-22 22:04:31+02:00, joerg@trift2. +4 -0
  Cleanup in the "netware" subdirectory:
  
  1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
     so we do not need the ".def" files for the "isam"-specific tools.
  
  2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.

  BitKeeper/deleted/.del-isamchk.def@1.8.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/isamchk.def

  BitKeeper/deleted/.del-isamlog.def@1.7.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/isamlog.def

  BitKeeper/deleted/.del-pack_isam.def@1.9.1.2, 2007-08-22 21:29:58+02:00, joerg@trift2. +0 -0
    Delete: netware/pack_isam.def

  netware/Makefile.am@1.15.1.9, 2007-08-22 22:04:28+02:00, joerg@trift2. +1 -1
    Use a plain "basename" showing the purpose, not a sed command which is harder to read.

ChangeSet@1.2528.153.2, 2007-08-22 12:02:23-06:00, malff@weblab.(none) +1 -0
  Manual merge

  BUILD/compile-pentium-gcov@1.23, 2007-08-22 12:02:18-06:00, malff@weblab.(none) +3 -10
    Manual merge

ChangeSet@1.1810.3228.6, 2007-08-22 11:05:35-06:00, malff@weblab.(none) +4 -0
  Bug#30237 (Performance regression in boolean expressions)
  
  This is a performance bug, related to the parsing or 'OR' and 'AND' boolean
  expressions.
  
  Let N be the number of expressions involved in a OR (respectively AND).
  
  When N=1
  
  For example, "select 1" involve only 1 term: there is no OR operator.
  
  In 4.0 and 4.1, parsing expressions not involving OR had no overhead.
  In 5.0, parsing adds some overhead, with Select->expr_list.
  
  With this patch, the overhead introduced in 5.0 has been removed,
  so that performances for N=1 should be identical to the 4.0 performances,
  which are optimal (there is no code executed at all)
  
  The overhead in 5.0 was in fact affecting significantly some operations.
  For example, loading 1 Million rows into a table with INSERTs,
  for a table that has 100 columns, leads to parsing 100 Millions of
  expressions, which means that the overhead related to Select->expr_list
  is executed 100 Million times ...
  
  Considering that N=1 is by far the most probable expression,
  this case should be optimal.
  
  When N=2
  
  For example, "select a OR b" involves 2 terms in the OR operator.
  
  In 4.0 and 4.1, parsing expressions involving 2 terms created 1 Item_cond_or
  node, which is the expected result.
  In 5.0, parsing these expression also produced 1 node, but with some extra
  overhead related to Select->expr_list : creating 1 list in Select->expr_list
  and another in Item_cond::list is inefficient.
  
  With this patch, the overhead introduced in 5.0 has been removed
  so that performances for N=2 should be identical to the 4.0 performances.
  Note that the memory allocation uses the new (thd->mem_root) syntax
  directly.
  The cost of "is_cond_or" is estimated to be neglectable: the real problem
  of the performance degradation comes from unneeded memory allocations.
  
  When N>=3
  
  For example, "select a OR b OR c ...", which involves 3 or more terms.
  
  In 4.0 and 4.1, the parser had no significant cost overhead, but produced
  an Item tree which is difficult to evaluate / optimize during runtime.
  In 5.0, the parser produces a better Item tree, using the Item_cond
  constructor that accepts a list of children directly, but at an extra cost
  related to Select->expr_list.
  
  With this patch, the code is implemented to take the best of the two
  implementations:
  - there is no overhead with Select->expr_list
  - the Item tree generated is optimized and flattened.
  
  This is achieved by adding children nodes into the Item tree directly,
  with Item_cond::add(), which avoids the need for temporary lists and memory
  allocation
  
  Note that this patch also provide an extra optimization, that the previous
  code in 5.0 did not provide: expressions are flattened in the Item tree,
  based on what the expression already parsed is, and not based on the order
  in which rules are reduced.
  
  For example : "(a OR b) OR c", "a OR (b OR c)" would both be represented
  with 2 Item_cond_or nodes before this patch, and with 1 node only with this
  patch. The logic used is based on the mathematical properties of the OR
  operator (it's associative), and produces a simpler tree.

  mysql-test/r/parser_precedence.result@1.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +356 -0
    Added test cases to cover boolean operator precedence
    

  mysql-test/r/parser_precedence.result@1.0, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +0 -0

  mysql-test/t/parser_precedence.test@1.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +93 -0
    Added test cases to cover boolean operator precedence
    

  mysql-test/t/parser_precedence.test@1.0, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +0 -0

  sql/item_cmpfunc.h@1.122.21.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +18 -0
    Improved performances for parsing boolean expressions

  sql/sql_yacc.yy@1.371.123.1, 2007-08-22 11:05:33-06:00, malff@weblab.(none) +97 -43
    Improved performances for parsing boolean expressions

ChangeSet@1.2528.152.3, 2007-08-22 17:32:35+02:00, joerg@trift2. +1 -0
  Raise the version number to 5.1.23,
  because we already split off a tree for 5.1.22 to receive only selected fixes.

  configure.in@1.485, 2007-08-22 17:32:30+02:00, joerg@trift2. +1 -1
    Raise the version number to 5.1.23,
    because we already split off a tree for 5.1.22 to receive only selected fixes.

ChangeSet@1.2528.152.2, 2007-08-22 17:25:31+02:00, joerg@trift2. +1 -0
  Correct an erroneous manual merge.

  sql/sql_yacc.yy@1.598.1.2, 2007-08-22 17:25:25+02:00, joerg@trift2. +0 -1
    Correct an erroneous manual merge, which had brought a duplicate line - remove one.

ChangeSet@1.1810.3267.2, 2007-08-22 16:08:40+02:00, jperkin@production.mysql.com +1 -0
  Remove deleted files from bdb CMake configuration.  Fixes bug#27693.

  bdb/CMakeLists.txt@1.1.2.1, 2007-08-22 16:05:41+02:00, jperkin@production.mysql.com +7 -7
    Update file list to match reality.

ChangeSet@1.2528.150.3, 2007-08-22 16:18:27+03:00, jani@hynda.mysql.fi +2 -0
  Removed a test which output may differ depending on machine load.

  mysql-test/r/status.result@1.20, 2007-08-22 16:18:24+03:00, jani@hynda.mysql.fi +0 -2
    Removed a test which output may differ depending on machine load.

  mysql-test/t/status.test@1.28, 2007-08-22 16:18:24+03:00, jani@hynda.mysql.fi +0 -4
    Removed a test which output may differ depending on machine load.

ChangeSet@1.1810.3274.1, 2007-08-22 18:15:54+05:00, gshchepa@gleb.loc +1 -0
  Fixed bug #30201.
  Killing a SELECT query with KILL QUERY or KILL CONNECTION
  causes a server crash if the query cache is enabled.
  
  Normal evaluation of a query may be interrupted by the
  KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
  function returns TRUE, and the thd->killed flag has true value.
  In this case the result of the query may
  be cached incompletely (omitting call to query_cache_insert inside
  the net_real_write function), and next call to query_cache_end_of_result
  may lead to server crash.
  Thus, the query_cache_end_of_result function has been modified to abort
  query cache in the case of killed thread.
  

  sql/sql_cache.cc@1.76.9.1, 2007-08-22 18:15:47+05:00, gshchepa@gleb.loc +23 -14
    Fixed bug #30201.
    The  query_cache_end_of_result function has been modified to abort query
    cache in the case of query execution failure. Also this function has been
    modified to remove incomplete query block.

ChangeSet@1.1810.3272.3, 2007-08-22 15:43:16+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#23333
  
  fixing the test due a to different offsets in binlog with ps-protocol (a possible bug to be reported)

  mysql-test/r/sp_trans_log.result@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +4 -3
    results changed as prescribed

  mysql-test/t/sp_trans_log.test@1.1.1.2, 2007-08-22 15:43:13+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -1
    Replacing the reporting pattern
    
    ### a possible bug: 
    #show master status /* the offset must denote there is the query */|
    # displays different offests in ps-protocol
    
    with 
      show binlog events

ChangeSet@1.1810.3272.2, 2007-08-22 10:40:38+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +2 -0
  bug#27417
  
  refining of cleanup of the tests.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    proper cleanup.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.2, 2007-08-22 10:40:35+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    results changed.

ChangeSet@1.2538, 2007-08-21 16:26:00+02:00, tomas@whalegate.ndb.mysql.com +13 -0
  rpl_ndb_dd_partitions-slave.opt:
    Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
  .del-rpl_stm_extraColmaster_ndb.result:
    Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result
  .del-rpl_extraColmaster_myisam.test:
    Delete: mysql-test/t/rpl_extraColmaster_myisam.test
  ndb_bug26793.result:
    Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result
  .del-rpl_extraColmaster_innodb-slave.opt:
    Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt
  .del-rpl_extraColmaster_innodb-master.opt:
    Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt
  .del-rpl_row_extraColmaster_ndb.test:
    Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test
  .del-rpl_row_extraColmaster_ndb.result:
    Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result
  .del-rpl_stm_extraColmaster_ndb.test:
    Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test
  .del-rpl_extraColmaster_innodb.test:
    Delete: mysql-test/t/rpl_extraColmaster_innodb.test
  ndb_bug26793.test:
    Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test
  rpl_ndb_dd_partitions-master.opt:
    Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
  .del-rpl_colSize.test~d9690ba9ffd2b048:
    Delete: mysql-test/t/rpl_colSize.test

  BitKeeper/deleted/.del-rpl_colSize.test~d9690ba9ffd2b048@1.2, 2007-08-21 15:58:50+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_colSize.test

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb-master.opt@1.2, 2007-08-21 15:59:10+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb-slave.opt@1.2, 2007-08-21 15:59:10+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt

  BitKeeper/deleted/.del-rpl_extraColmaster_innodb.test@1.2, 2007-08-21 15:59:11+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_innodb.test

  BitKeeper/deleted/.del-rpl_extraColmaster_myisam.test@1.2, 2007-08-21 15:59:11+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_extraColmaster_myisam.test

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result@1.3, 2007-08-21 16:04:52+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test@1.2, 2007-08-21 16:02:59+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.result@1.2, 2007-08-21 16:04:52+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result

  BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test@1.2, 2007-08-21 16:02:59+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test

  mysql-test/suite/ndb/r/ndb_bug26793.result@1.5, 2007-08-21 16:04:23+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result

  mysql-test/suite/ndb/t/ndb_bug26793.test@1.5, 2007-08-21 16:04:01+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt@1.2, 2007-08-21 16:25:18+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt

  mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt@1.2, 2007-08-21 16:25:24+02:00, tomas@whalegate.ndb.mysql.com +0 -0
    Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt

ChangeSet@1.1810.2875.59, 2007-08-21 18:59:42+05:00, gluh@mysql.com +1 -0
  compiler warning fix

  sql/sql_show.cc@1.253.52.8, 2007-08-21 18:59:41+05:00, gluh@mysql.com +2 -0
    compiler warning fix

ChangeSet@1.2528.126.11, 2007-08-21 17:55:49+05:00, gluh@mysql.com +2 -0
  Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1)
  added TRIGGER_ACL check for I_S.TRIGGERS

  mysql-test/r/information_schema.result@1.159.1.2, 2007-08-21 17:55:47+05:00, gluh@mysql.com +3 -3
    result fix

  sql/sql_show.cc@1.429.3.2, 2007-08-21 17:55:47+05:00, gluh@mysql.com +1 -1
    Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1)
    added TRIGGER_ACL check for I_S.TRIGGERS

ChangeSet@1.1810.3272.1, 2007-08-21 15:16:55+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +8 -0
  Bug #23333 stored function + non-transac table + transac table = breaks stmt-based binlog
  
  Binlogging of the statement with a side effect like a modified non-trans table did not happen.
  The artifact involved all binloggable dml queries.
  
  Fixed with changing the binlogging conditions all over the code to exploit thd->transaction.stmt.modified_non_trans_table
  introduced by the patch for bug@27417.
  
  Multi-delete case has own specific addressed by another bug@29136. Multi-update case has been addressed by bug#27716 and
  patch and will need merging.

  mysql-test/r/sp_trans_log.result@1.1.1.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -2
    results changed

  mysql-test/t/sp_trans_log.test@1.1.1.1, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -2
    refining of the proof of that there is an event in binlog

  mysql-test/t/mix_innodb_myisam_binlog.test@1.20.14.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +119 -1
    specific to the bug tests added

  mysql-test/r/mix_innodb_myisam_binlog.result@1.24.11.1, 2007-08-21 15:16:51+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +71 -2
    results changed

  sql/sql_delete.cc@1.144.1.56, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +3 -3
    deploying the binlogging check with thd->transaction.stmt.modified_non_trans_table

  sql/sql_insert.cc@1.146.1.104, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +39 -39
    binlogging when thd->transaction.stmt.modified_non_trans_table is TRUE. Merge with Bug#29571.

  sql/sql_load.cc@1.78.1.39, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

  sql/sql_update.cc@1.154.2.69, 2007-08-21 15:16:52+03:00, aelkin@dsl-hkibras-fe38f900-157.dhcp.inet.fi +1 -1
    binlogging when thd->transaction.stmt.modified_non_trans_table is true

ChangeSet@1.1810.3208.3, 2007-08-21 13:43:09+02:00, thek@adventure.(none) +5 -0
  Bug#30269 Query cache eats memory
  
  Although the query cache doesn't support retrieval of statements containing
  column level access control, it was still possible to cache such statements
  thus wasting memory.
    
  This patch extends the access control check on the target tables to avoid
  caching a statement with column level restrictions. 
  
  Views are excepted and can be cached but only retrieved by super user account.

  mysql-test/r/query_cache.result@1.65.10.2, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +7 -2
    Modified test case to allow caching of views

  mysql-test/r/query_cache_with_views.result@1.6, 2007-08-21 12:29:11+02:00, thek@adventure.(none) +0 -0
    Rename: mysql-test/r/view_query_cache.result -> mysql-test/r/query_cache_with_views.result

  mysql-test/t/query_cache.test@1.49.7.2, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +4 -1
    Modified test case to allow caching of views

  mysql-test/t/query_cache_with_views.test@1.5, 2007-08-21 12:28:27+02:00, thek@adventure.(none) +0 -0
    Rename: mysql-test/t/view_query_cache.test -> mysql-test/t/query_cache_with_views.test

  sql/sql_cache.cc@1.76.1.28, 2007-08-21 13:43:07+02:00, thek@adventure.(none) +12 -1
    Allow caching of views

ChangeSet@1.2528.144.3, 2007-08-20 17:50:42-06:00, malff@weblab.(none) +2 -0
  Fixed 5.0 -> 5.1 merge

  mysql-test/include/handler.inc@1.36, 2007-08-20 17:50:39-06:00, malff@weblab.(none) +1 -1
    Fixed 5.0 -> 5.1 merge

  mysql-test/r/handler_innodb.result@1.18, 2007-08-20 17:50:39-06:00, malff@weblab.(none) +7 -0
    Fixed 5.0 -> 5.1 merge

ChangeSet@1.1810.3270.1, 2007-08-21 01:39:39+05:00, gshchepa@gleb.loc +3 -0
  Fixed bug #30287.
  The server created temporary tables for filesort in the working directory
  instead of the specified tmpdir directory.

  sql/item.cc@1.113.1.168, 2007-08-21 01:09:20+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #30287.
    The Item_field::set_field method has been modified to reset the any_privileges
    flag to false in case of system temporary table. This modification prevents the
    server from unnecessary checking of user privileges to access system temporary
    tables.

  sql/sql_select.cc@1.312.168.1, 2007-08-21 01:09:43+05:00, gshchepa@gleb.loc +8 -11
    Fixed bug #30287.
    Bugfix for #29015 has been removed: TABLE_SHARE::table_name of system
    temporary tables contains full path to table file basename again.

  sql/sql_view.cc@1.78.1.38, 2007-08-21 01:09:50+05:00, gshchepa@gleb.loc +6 -0
    Fixed bug #30287.
    Commentary has been added.

ChangeSet@1.2528.91.3, 2007-08-20 13:03:50-07:00, brian@piggy.tangent.org +2 -0
  Extending tests for detach (found a memory issue in it, this fixes that and now tests it).

  client/mysqlslap.c@1.57.1.2, 2007-08-20 13:03:48-07:00, brian@piggy.tangent.org +7 -0
    Fix memory allocation

  mysql-test/t/mysqlslap.test@1.17, 2007-08-20 13:03:48-07:00, brian@piggy.tangent.org +2 -0
    Extend test for --detach

ChangeSet@1.1810.3269.1, 2007-08-20 11:00:51-06:00, tsmith@ramayana.hindu.god +1 -0
  Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003
  
  Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the
  get_list_of_tables() routine.
  
  The symptom is that, when used with recent versions of DBD::mysql,
  mysqlhotcopy uses a double-qualified table name, for example:
  
  Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855.
  
  This is caused by a change in DBD::mysql.  See this diff:
  
  http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188
  
  Basically, older DBD::mysql implemented a limited ->table_info method;
  now the full method is implemented, and as a result DBI's ->tables()
  method has access to the schema value, so it uses it.

  scripts/mysqlhotcopy.sh@1.53, 2007-08-20 11:00:49-06:00, tsmith@ramayana.hindu.god +7 -23
    Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in
    get_list_of_tables().  DBI's ->tables() method calls
    "SHOW TABLES" under the hood, and then quotes the
    names and (depending on DBD::mysql version) adds the schema
    name, too.  mysqlhotcopy doesn't want the schema name
    or the quotes, so it's all around better to just call
    "SHOW TABLES" itself.

ChangeSet@1.1810.3256.3, 2007-08-20 14:57:04+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#29674 Remove warning in pushbuild in 5.0

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.36.1, 2007-08-20 14:56:57+00:00, lzhou@dev3-63.(none) +1 -1
    Remove warning in pushbuild

ChangeSet@1.1810.3267.1, 2007-08-20 16:14:35+02:00, jperkin@production.mysql.com +1 -0
  Fix bug#27520.  For some unknown reason, libtool.m4 attempts
  to find "ar" but if it cannot be found sets AR=false.  This
  leads to confusing failures during the build rather than at
  configure time.
  
  We have our own checks for ar, but as AR was already set
  earlier by the libtool tests they were never exectuted.
  
  Therefore, update the tests so that we catch any libtool
  failures, and run AC_CHECK_PROG explicitly to ensure that we
  see sensible output from configure prior to any potential
  failure.

  config/ac-macros/misc.m4@1.12.1.4, 2007-08-20 15:53:29+02:00, jperkin@production.mysql.com +1 -4
    AC_CHECK_PROG does nothing if the first argument (variable) is
    already set, so remove redundant check for the empty string.
    This also ensures that a 'checking for ar' message is printed
    prior to any failure, which is far less confusing.

  config/ac-macros/misc.m4@1.12.1.3, 2007-08-20 15:52:42+02:00, jperkin@production.mysql.com +1 -1
    libtool.m4 sets AR=false if "ar" is not found in $PATH, so
    match that as well for failure.

ChangeSet@1.2528.143.1, 2007-08-20 15:12:14+02:00, msvensson@shellback.(none) +1 -0
  Make it possible to pass mysql-test-run.pl test cases to run
  also on the <suite>.<testname> format

  mysql-test/lib/mtr_cases.pl@1.64, 2007-08-20 15:12:12+02:00, msvensson@shellback.(none) +7 -2
    Make it possible to pass mysql-test-run.pl test cases to run
    also on the <suite>.<testname> format

ChangeSet@1.1810.3254.2, 2007-08-20 13:46:42+02:00, msvensson@pilot.(none) +1 -0
  Only install second master db if using second master

  mysql-test/mysql-test-run.pl@1.30.92.2, 2007-08-20 13:46:41+02:00, msvensson@pilot.(none) +1 -1
    Only install second master db if using second master

ChangeSet@1.1810.3256.2, 2007-08-20 10:47:09+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#29674 add install data of the new test case in makefile.am

  mysql-test/Makefile.am@1.66.6.1, 2007-08-20 10:47:02+00:00, lzhou@dev3-63.(none) +9 -1
    Add install info of new test case data in makefile.am

ChangeSet@1.2528.142.2, 2007-08-20 13:24:37+04:00, skozlov@mysql.com +2 -0
  Bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.6, 2007-08-20 13:24:20+04:00, skozlov@mysql.com +2 -2
    removed file_id,block_len from SHOW BINLOG EVENTS

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.6, 2007-08-20 13:24:21+04:00, skozlov@mysql.com +2 -2
    updated result file

ChangeSet@1.2528.142.1, 2007-08-20 12:31:21+04:00, skozlov@mysql.com +1 -0
  rpl.rpl_innodb_mixed_dml enabled

  mysql-test/suite/rpl/t/disabled.def@1.12, 2007-08-20 12:31:11+04:00, skozlov@mysql.com +1 -1
    rpl.rpl_innodb_mixed_dml enabled

ChangeSet@1.1810.3266.1, 2007-08-20 11:23:08+05:00, gluh@mysql.com +4 -0
  Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements
  added SUPER_ACL check for I_S.TRIGGERS

  mysql-test/r/information_schema.result@1.87.1.37, 2007-08-20 11:23:06+05:00, gluh@mysql.com +25 -1
    result fix

  mysql-test/r/information_schema_db.result@1.1.1.11, 2007-08-20 11:23:06+05:00, gluh@mysql.com +0 -2
    result fix

  mysql-test/t/information_schema.test@1.65.1.28, 2007-08-20 11:23:06+05:00, gluh@mysql.com +26 -0
    test case

  sql/sql_show.cc@1.253.52.7, 2007-08-20 11:23:06+05:00, gluh@mysql.com +8 -2
    added SUPER_ACL check for I_S.TRIGGERS

ChangeSet@1.2528.141.3, 2007-08-18 02:28:08-06:00, tsmith@ramayana.hindu.god +2 -0
  Bug #29307: status.test fails with different Table_locks_immediate
  
  Finish premature patch which was accidentally pushed; remove debugging
  info and correct the test.

  mysql-test/r/status.result@1.17.1.1, 2007-08-18 02:28:06-06:00, tsmith@ramayana.hindu.god +3 -6
    Correct test results

  mysql-test/t/status.test@1.25.1.2, 2007-08-18 02:28:06-06:00, tsmith@ramayana.hindu.god +7 -5
    Disable query log for one statement, and correct some comments

ChangeSet@1.2528.128.9, 2007-08-17 19:29:08-06:00, tsmith@ramayana.hindu.god +2 -0
  Bug #29307: status.test fails with different Table_locks_immediate
  
  When using --log --log-output=table, we increment Table_locks_immediate
  with every query.  The wait_condition.inc runs a query a variable number
  of times, depending on server load, etc.  This is a problem, when the
  test is checking the Table_locks_immediate value.
  
  Fix is to adjust the Table_locks_immediate value based on how many times
  the wait_condition query was executed.

  mysql-test/include/wait_condition.inc@1.3, 2007-08-17 19:29:06-06:00, tsmith@ramayana.hindu.god +5 -0
    Add a $wait_condition_reps variable, which lets the caller check how
    many times the wait_condition query was executed.
    
    This is used in the main.status test to adjust the value of
    Table_locks_immediate (it gets incremented with each query
    when --log --log-output=table).

  mysql-test/t/status.test@1.25.1.1, 2007-08-17 19:29:06-06:00, tsmith@ramayana.hindu.god +28 -2
    Adjust Table_locks_immediate value based on how many times the
    wait_condition query had to run.

ChangeSet@1.2528.140.1, 2007-08-17 17:11:08-03:00, davi@moksha.local +2 -0
  Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
  
  This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.

  sql/lock.cc@1.115.1.3, 2007-08-17 17:11:05-03:00, davi@moksha.local +1 -0
    Add late lock_type assertion.

  sql/sql_base.cc@1.421.1.3, 2007-08-17 17:11:05-03:00, davi@moksha.local +2 -7
    Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.

ChangeSet@1.2528.139.1, 2007-08-17 19:51:25+02:00, jmiller@mysql.com +1 -0
  rpl_packet.test:
    Removed sleep from test per lars request

  mysql-test/suite/rpl/t/rpl_packet.test@1.11, 2007-08-17 19:51:05+02:00, jmiller@mysql.com +0 -1
    Removed sleep from test per lars request

ChangeSet@1.1810.3208.2, 2007-08-17 16:55:20+02:00, thek@adventure.(none) +4 -0
  Bug #30269 Query cache eats memory
  
  Although the query cache doesn't support retrieval of statements containing
  column level access control, it was still possible to cache such statements
  thus wasting memory.
  
  This patch extends the access control check on the target tables to avoid
  caching a statement with column level restrictions. 

  mysql-test/r/query_cache.result@1.65.10.1, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +24 -0
    Added test

  mysql-test/t/query_cache.test@1.49.7.1, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +29 -1
    Added test

  sql/sql_cache.cc@1.76.1.27, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +21 -3
    The function check_table_access leaves the artifact
    grant.want_privileges= 1, if a statement refers to tables with column level
    privileges. To avoid the statement from being stored into the query cache,
    it is enough to check this flag and set 'safe_to_cache_query' to zero.

  sql/sql_cache.h@1.30.1.7, 2007-08-17 16:55:19+02:00, thek@adventure.(none) +5 -3
    - Removed 'static' attribute or class methods
    - Added THD parameter to process_and_count_tables

ChangeSet@1.2528.122.13, 2007-08-17 11:34:12-03:00, davi@moksha.local +3 -0
  Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
  
  mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
  
  This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).

  mysql-test/r/lock_multi.result@1.30, 2007-08-17 11:34:08-03:00, davi@moksha.local +7 -0
    Bug#25856 test result

  mysql-test/t/lock_multi.test@1.32, 2007-08-17 11:34:08-03:00, davi@moksha.local +15 -0
    Bug#25856 test case

  sql/sql_handler.cc@1.95.2.1, 2007-08-17 11:34:08-03:00, davi@moksha.local +47 -33
    Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close.

ChangeSet@1.1810.3265.1, 2007-08-17 18:30:41+04:00, evgen@moonbone.local +3 -0
  Bug#30245: A wrong type of a BIT field is reported when grouped by it.
  
  HEAP tables can't index BIT fields. Due to this when grouping by such fields is
  needed they are converted to a fields of the LONG type when temporary table
  is being created. But a side effect of this is that a wrong type of BIT
  fields is returned to a client.
  
  Now the JOIN::prepare and the create_distinct_group functions are create
  additional hidden copy of BIT fields to preserve original fields untouched.
  New hidden fields are used for grouping instead.

  mysql-test/r/type_bit.result@1.14.1.9, 2007-08-17 18:29:10+04:00, evgen@moonbone.local +15 -0
    Added a test case for the bug#30245: A wrong type of a BIT field is reported when grouped by it.

  mysql-test/t/type_bit.test@1.18.1.3, 2007-08-17 18:28:48+04:00, evgen@moonbone.local +13 -0
    Added a test case for the bug#30245: A wrong type of a BIT field is reported when grouped by it.

  sql/sql_select.cc@1.312.167.1, 2007-08-17 18:29:30+04:00, evgen@moonbone.local +53 -9
    Bug#30245: A wrong type of a BIT field is reported when grouped by it.
    Now the JOIN::prepare and the create_distinct_group functions are create
    additional hidden copy of BIT fields to preserve original fields untouched.
    New hidden fields are used for grouping instead.

ChangeSet@1.2528.1.33, 2007-08-17 13:22:31+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Minor fix to let the build proceed.

  sql/rpl_rli.h@1.21, 2007-08-17 13:22:25+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Adding missing forward declaration.

ChangeSet@1.2482.123.1, 2007-08-17 11:41:32+08:00, gni@dev3-221.dev.cn.tlan +8 -0
  BUG#22240 Add a test case into ndb_restore_compat

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +325 -325
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +365 -416
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    new log file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    new log file

  mysql-test/r/ndb_restore_compat.result@1.5.1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -2
    add "order by" to select clause

  mysql-test/t/ndb_restore_compat.test@1.4.1.2, 2007-08-17 11:41:29+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    add "order by" to select clause

ChangeSet@1.2528.126.7, 2007-08-16 19:27:44-07:00, igor@olga.mysql.com +2 -0
  Post-merge fix.

  mysql-test/r/select.result@1.163, 2007-08-16 19:27:35-07:00, igor@olga.mysql.com +2 -2
    Post-merge fix.

  tests/mysql_client_test.c@1.249.1.2, 2007-08-16 19:27:35-07:00, igor@olga.mysql.com +73 -0
    Post-merge fix.

ChangeSet@1.2528.1.31, 2007-08-17 00:10:46+02:00, lars@mysql.com +1 -0
  Empty changeset to restart pushbuild

  sql/log_event.cc@1.296.3.2, 2007-08-17 00:10:43+02:00, lars@mysql.com +1 -1
    Empty changeset to restart pushbuild

ChangeSet@1.2528.136.1, 2007-08-16 14:00:35-07:00, antony@pcg5ppc.xiphis.org +1 -0
  Bug#30359
    "Test federated_bug_25714 issues non-existing shell command"
    Problem caused by missing '$' symbol in eval statement causing it
    to always attempt to run test even if the test was not compiled.

  mysql-test/include/have_bug25714.inc@1.2, 2007-08-16 14:00:32-07:00, antony@pcg5ppc.xiphis.org +1 -1
    bug30359
      missing '$' in eval statement

ChangeSet@1.2528.122.12, 2007-08-16 21:54:41+04:00, kostja@bodhi.(none) +1 -0
  Last tweak for doxygen cleanup. The number of doxygen warnings is 0 now.

  sql/log_event.h@1.153.2.3, 2007-08-16 21:54:38+04:00, kostja@bodhi.(none) +14 -1
    Add doxygen documentation.
    Restore a text which had no influence on doxygen.

ChangeSet@1.1810.3259.3, 2007-08-16 14:51:37-03:00, davi@moksha.local +2 -0
  Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
  
  This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.
  
  For every table open operation with default write (TL_WRITE_DEFAULT) lock_type, downgrade the lock type to the session setting of low_priority_updates.

  sql/lock.cc@1.64.1.35, 2007-08-16 14:51:30-03:00, davi@moksha.local +1 -0
    Add late lock_type assertion.

  sql/sql_base.cc@1.235.111.1, 2007-08-16 14:51:31-03:00, davi@moksha.local +2 -7
    Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.

ChangeSet@1.2528.122.11, 2007-08-16 21:14:47+04:00, kostja@bodhi.(none) +4 -0
  Fix doxygen warnings.

  include/mysql/plugin.h@1.40, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings.

  sql/field.h@1.243.1.1, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +6 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/field_conv.cc@1.75, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -1
    Fix doxygen warnings - too complex return value type, it choked on it.

  sql/log_event.h@1.153.2.2, 2007-08-16 21:14:41+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings.

ChangeSet@1.1810.3262.3, 2007-08-16 10:56:09-06:00, tsmith@ramayana.hindu.god +3 -0
  Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
  
  Revert the fix for bug 21587.  That bug will be re-opened, and a new
  fix must be created.

  sql/mysql_priv.h@1.290.1.170, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -1
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_base.cc@1.235.110.1, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -8
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

  sql/sql_handler.cc@1.72.4.1, 2007-08-16 10:56:08-06:00, tsmith@ramayana.hindu.god +0 -45
    Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
    
    Revert the fix for bug 21587.  That bug will be re-opened, and a new
    fix must be created.

ChangeSet@1.2528.122.10, 2007-08-16 19:52:55+04:00, kostja@bodhi.(none) +6 -0
  Doxygen warnings.

  include/mysql/plugin.h@1.39, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/field.cc@1.408.2.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/log_event.h@1.153.2.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -1
    Doxygen warnings.

  sql/rpl_record.cc@1.7.1.1, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +1 -0
    Doxygen warnings.

  sql/sql_lex.cc@1.255.3.2, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +3 -3
    Doxygen warnings.

  sql/sql_lex.h@1.293, 2007-08-16 19:52:52+04:00, kostja@bodhi.(none) +2 -2
    Doxygen warnings.

ChangeSet@1.2528.1.30, 2007-08-16 17:26:32+02:00, lars@mysql.com +4 -0
  Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.11, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.11, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.2, 2007-08-16 17:26:29+02:00, lars@mysql.com +26 -26
    Post-merge fix of error number

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.12, 2007-08-16 17:26:29+02:00, lars@mysql.com +2 -2
    Post-merge fix of error number

ChangeSet@1.1810.3264.1, 2007-08-16 17:25:48+03:00, jani@hynda.mysql.fi +3 -0
  Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"

  include/my_pthread.h@1.90.1.10, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +9 -23
    Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail".
    
    Removed macro NPTL_PTHREAD_EXIT_BUG, because it doesn't work in dynamic
    environment. One can switch between NPTL and LT on the fly on Linux.
    
    Added pthread_dummy(ESRCH) for those platforms that don't have pthread_kill.
    This ensures that there won't be an error in mysqld.cc where the return value 
    is being checked from the function call.

  mysys/my_thr_init.c@1.31.1.15, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +12 -5
    Check for a Linux is enough. There is an additional test if
    NPTL is in use before spwaning the extra thread.

  sql/mysqld.cc@1.439.1.183, 2007-08-16 17:25:45+03:00, jani@hynda.mysql.fi +1 -1
    Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"

ChangeSet@1.2528.122.9, 2007-08-16 18:07:48+04:00, kostja@bodhi.(none) +1 -0
  Fix doxygen warning.

  sql/sql_class.cc@1.342.2.1, 2007-08-16 18:07:46+04:00, kostja@bodhi.(none) +4 -0
    Fix doxygen warning.

ChangeSet@1.2528.122.8, 2007-08-16 17:59:12+04:00, kostja@bodhi.(none) +1 -0
  Fix doxygen warning (declaration and definition mismatch).

  sql/item.cc@1.280.1.1, 2007-08-16 17:59:10+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warning (declaration and definition mismatch).

ChangeSet@1.2528.115.7, 2007-08-16 11:43:03+02:00, mats@kindahl-laptop.dnsalias.net +1 -0
  Minor code fixes to help Doxygen generate good documentation.

  sql/rpl_rli.h@1.20, 2007-08-16 11:42:58+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Removing redundant "class" keyword.

ChangeSet@1.2528.115.6, 2007-08-16 08:52:50+02:00, mats@kindahl-laptop.dnsalias.net +11 -0
  Renaming MASTER_INFO to Master_info in order to follow the coding
  standards (and help Doxygen generating good documentation).

  sql/ha_ndbcluster.cc@1.463.3.1, 2007-08-16 08:52:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming MASTER_INFO to Master_info.

  sql/log_event.cc@1.295.1.3, 2007-08-16 08:52:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming MASTER_INFO to Master_info.

  sql/repl_failsafe.cc@1.78, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming MASTER_INFO to Master_info.

  sql/repl_failsafe.h@1.15, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming MASTER_INFO to Master_info.

  sql/rpl_mi.cc@1.6, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +6 -6
    Renaming MASTER_INFO to Master_info.

  sql/rpl_mi.h@1.8, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +9 -9
    Renaming MASTER_INFO to Master_info.

  sql/rpl_rli.h@1.19, 2007-08-16 08:52:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming MASTER_INFO to Master_info.

  sql/slave.cc@1.308.1.10, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +42 -42
    Renaming MASTER_INFO to Master_info.

  sql/slave.h@1.108.1.2, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +16 -16
    Renaming MASTER_INFO to Master_info.

  sql/sql_repl.cc@1.174, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Renaming MASTER_INFO to Master_info.

  sql/sql_repl.h@1.46, 2007-08-16 08:52:44+02:00, mats@kindahl-laptop.dnsalias.net +5 -5
    Renaming MASTER_INFO to Master_info.

ChangeSet@1.2528.115.5, 2007-08-16 07:37:50+02:00, mats@kindahl-laptop.dnsalias.net +20 -0
  Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standards
  (and be more friendly to Doxygen by removing unnecessary typedefs).

  sql/log.cc@1.282.1.23, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming struct st_relay_log_info to class Relay_log_info.

  sql/log.h@1.28.1.1, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming struct st_relay_log_info to class Relay_log_info.

  sql/log_event.cc@1.295.1.2, 2007-08-16 07:37:39+02:00, mats@kindahl-laptop.dnsalias.net +70 -70
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/log_event.h@1.155, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +49 -51
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/log_event_old.cc@1.4.1.1, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +7 -7
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/log_event_old.h@1.5, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +3 -3
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_mi.h@1.7, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record.cc@1.8, 2007-08-16 07:37:40+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record.h@1.3, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record_old.cc@1.5, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_record_old.h@1.4, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_rli.cc@1.13, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +32 -32
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    

  sql/rpl_rli.h@1.18, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +10 -9
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/rpl_utility.cc@1.15, 2007-08-16 07:37:41+02:00, mats@kindahl-laptop.dnsalias.net +2 -2
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/rpl_utility.h@1.12, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/slave.cc@1.308.1.9, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +30 -30
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/slave.h@1.108.1.1, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +15 -16
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/sql_binlog.cc@1.14, 2007-08-16 07:37:42+02:00, mats@kindahl-laptop.dnsalias.net +1 -1
    Renaming RELAY_LOG_INFO to Relay_log_info.

  sql/sql_class.h@1.392.2.1, 2007-08-16 07:37:43+02:00, mats@kindahl-laptop.dnsalias.net +2 -3
    Renaming struct st_relay_log_info to class Relay_log_info.
    Renaming RELAY_LOG_INFO to Relay_log_info.
    Removing typedef RELAY_LOG_INFO.

  sql/sql_repl.cc@1.173, 2007-08-16 07:37:43+02:00, mats@kindahl-laptop.dnsalias.net +4 -4
    Renaming RELAY_LOG_INFO to Relay_log_info.

ChangeSet@1.1810.3263.1, 2007-08-15 18:10:16-06:00, malff@weblab.(none) +7 -0
  Bug#23062 (GCOV build: helper scripts missing in the BUILD directory)
  
  This patch provides compile helper scripts only,
  no server logic is affected.
  
  Before this patch, GCOV and GPROF build scripts were only provided for
  pentium platforms.
  
  With this patch, pentium, pentium64 and amd64 platforms have associated
  helper build scripts.
  
  The GCOV and GPROF specific compilation flags are set once in SETUP.sh,
  to avoid code duplication.

  BUILD/SETUP.sh@1.44.1.21, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +25 -0
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-amd64-gcov@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +17 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-amd64-gcov@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-amd64-gprof@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +9 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-amd64-gprof@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-pentium-gcov@1.14.2.3, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +3 -10
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-pentium-gprof@1.4, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +2 -2
    Moved GCOV and GPROF flags to compile-pentium-{gcov,gprof) to SETUP.sh

  BUILD/compile-pentium64-gcov@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +17 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-pentium64-gcov@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

  BUILD/compile-pentium64-gprof@1.1, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +9 -0
    Added helper scripts for GCOV and GPROF builds.
    

  BUILD/compile-pentium64-gprof@1.0, 2007-08-15 18:10:13-06:00, malff@weblab.(none) +0 -0

ChangeSet@1.1810.3262.2, 2007-08-15 17:20:54-06:00, tsmith@ramayana.hindu.god +8 -0
  NULL MERGE this ChangeSet to 5.1
  
  Apply innodb-5.0-ss1696 snapshot
  
  Fixes:
  - Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
  - Bug#23710: crash_commit_before fails if innodb_file_per_table=1
    At InnoDB startup consider the case where log scan went beyond
    checkpoint_lsn as a crash and initiate crash recovery code path.
  - Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
    We need to do some special AUTOINC handling for the following case:
    INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
    We need to use the AUTOINC counter that was actually used by
    MySQL in the UPDATE statement, which can be different from the
    value used in the INSERT statement.
  - Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
    Fix by typecasting the variables before multiplying them, so that the
    result of the multiplication is of type "unsigned long long".
  - Bug#29155: Innodb "Parallel recovery" is not prevented
    Fix by enabling file locking on FreeBSD.  It has been disabled because
    InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
    starts just fine.

  innobase/fsp/fsp0fsp.c@1.25.6.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +4 -3
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  sql/ha_innodb.cc@1.202.51.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +24 -5
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki
    
    
    Revision r1695:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.166.1  2007-06-20 19:22:27+03:00  monty@mysql.fi
    
    Allow multiple calls to mysql_server_end()
    (Part of fix for Bug 25621 Error in my_thread_global_end(): 1 threads
    didn't exit)
    Give correct error message if InnoDB table is not found
    (This allows us to drop a an innodb table that is not in the InnoDB registery)
    
    ha_innodb.cc:
      Give correct error message if InnoDB table is not found.
      (This allows us to drop a an innodb table that is not in the InnoDB
      registery)
    
    
    Revision r1606:
    branches/5.0: Formatting corrections.
    
    spotted by: Vasil
    
    
    Revision r1691:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.261.1  2007-07-20 14:17:15+03:00  gkodinov@magare.gmz
      Bug 29644: alter table hangs if records locked in share mode 
      by long running transaction
      
      On Windows opened files can't be deleted. There was a special
      upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ) 
      in ALTER TABLE to make sure nobody has the table opened
      when deleting the old table in ALTER TABLE. This special mode
      was causing ALTER TABLE to hang waiting on a lock inside InnoDB.
      This special lock is no longer necessary as the server is 
      closing the tables it needs to delete in ALTER TABLE.
      Fixed by removing the special lock.
      Note that this also reverses the fix for bug 17264 that deals with
      another consequence of this special lock mode being used.
    
    sql/ha_innodb.cc: Bug 29644: reverse the (now excessive) fix
    for bug 17264 (but leave the test case).
    
    
    Revision r1601:
    branches/5.0: Fix for bug#28781
    We need to do some special AUTOINC handling for the following case:
    
    INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
    
    We need to use the AUTOINC counter that was actually used by
    MySQL in the UPDATE statement, which can be different from the
    value used in the INSERT statement.
    
    approved by: Sunny
    
    
    Revision r1692:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2463.267.1  2007-07-30 17:14:34+04:00  evgen@local
      Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
      
      When innodb detects a deadlock it calls ha_rollback_trans() to rollback the 
      main transaction. But such action isn't allowed from inside of triggers and
      functions. When it happen the 'Explicit or implicit commit' error is thrown
      even if there is no commit/rollback statements in the trigger/function. This
      leads to the user confusion.
      
      Now the convert_error_code_to_mysql() function doesn't call the 
      ha_rollback_trans() function directly but rather calls the
      mark_transaction_to_rollback function and returns an error.
      The sp_rcontext::find_handler() now doesn't allow errors to be caught by the
      trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag
      is set. Procedures are still allowed to catch such errors.
      The sp_rcontext::find_handler function now accepts a THD handle as a parameter.
      The transaction_rollback_request and the is_fatal_sub_stmt_error flags are 
      added to the THD class. The are initialized by the THD class constructor.
      Now the ha_autocommit_or_rollback function rolls back main transaction
      when not in a sub statement and the thd->transaction_rollback_request
      is set.
      The THD::restore_sub_statement_state function now resets the 
      thd->is_fatal_sub_stmt_error flag on exit from a sub-statement.
    
    innodb-big.test, innodb-big.result:
      Added a test case for the bug 24989: The DEADLOCK error is improperly
      handled by InnoDB.
    
    sql/ha_innodb.cc:
      Bug 24989: The DEADLOCK error is improperly handled by InnoDB.
      Now the convert_error_code_to_mysql() function doesn't call the
      ha_rollback_trans() function directly but rather calls the
      mark_transaction_to_rollback function and returns an error.
    
    
    Revision r1693:
    branches/5.0: Merge a change from MySQL AB:
    
    ChangeSet@1.2489.5.1  2007-07-31 17:42:48+04:00  evgen@local
      ha_innodb.cc:
        Warning fixed.

  innobase/include/fsp0fsp.h@1.10.1.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  innobase/include/univ.i@1.40.8.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +2 -0
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1614:
    branches/5.0:
    
    Merge r1605 from trunk:
    
    Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB"
    by typecasting the variables before multiplying them, so that the result of
    the multiplication is of type "unsigned long long".
    
    I verified this fix by creating a sparse file of 6TB and forcing InnoDB to
    use it without overwriting it with zeroes (by commenting the code that
    overwrites :newraw files).
    
    New type ullint is introduced with the sole purpose of shortening
    "unsigned long long", please do not define it to something else than
    "unsigned long long".
    
    Approved by:	Heikki

  innobase/log/log0recv.c@1.46.14.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +148 -77
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1608:
    branches/5.0: Bug#23710
    Back port of r1607 from trunk
    
    At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path.
    
    reviewed by: Heikki

  innobase/os/os0file.c@1.103.18.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -2
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1615:
    branches/5.0:
    
    Merge r1613 from trunk:
    
    Fix Bug#29155 by enabling file locking on FreeBSD.
    It has been disabled because InnoDB has refused to start on
    FreeBSD & LinuxThreads, but now it starts just fine.
    
    Approved by:	Heikki

  innobase/srv/srv0srv.c@1.87.12.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +1 -1
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1552:
    branches/5.0:
    Fix Bug#20090 as suggested in the bug followup by Heikki.
    
    Approved by:	Heikki

  innobase/trx/trx0trx.c@1.54.10.1, 2007-08-15 16:54:19-06:00, tsmith@ramayana.hindu.god +7 -5
    Apply innodb-5.0-ss1696 snapshot
    
    Revision r1596:
    branches/5.0: Merge r1595 from trunk:
    
    trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when
    trx->sess or trx_dummy_sess is non-NULL.

ChangeSet@1.1810.3259.2, 2007-08-15 17:12:09-03:00, davi@moksha.local +1 -0
  Rework doxygen documentation for the function mysql_ha_close_table.

  sql/sql_handler.cc@1.72.1.17, 2007-08-15 17:12:07-03:00, davi@moksha.local +9 -9
    Add missing parameter to the @param tag and fix style.

ChangeSet@1.2528.134.1, 2007-08-15 21:46:44+02:00, mleich@four.local.lan +11 -0
  This changeset is result of
       WL#3982 Test information_schema.processlist
  and replaces the corresponding tests pushed to
       mysql-test-extra-5.1/mysql-test/qa-suite/info_schema 

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +107 -0
    Auxiliary script

  mysql-test/suite/funcs_1/datadict/datadict_priv.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +432 -0
    Test of privileges

  mysql-test/suite/funcs_1/datadict/processlist_priv.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +333 -0
    Test of values

  mysql-test/suite/funcs_1/datadict/processlist_val.inc@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +469 -0
    Expected results

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +174 -0
    Expected results

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +469 -0
    Expected results

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +174 -0
    Expected results

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +36 -0
    Test of privileges - variant without ps/sp/cursor/view-protocol

  mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +31 -0
    Test of values - variant without ps/sp/cursor/view-protocol

  mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +35 -0
    Test of privileges - variant with ps-protocol

  mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

  mysql-test/suite/funcs_1/t/b_processlist_val_ps.test@1.1, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +30 -0
    Test of values - variant with ps-protocol

  mysql-test/suite/funcs_1/t/b_processlist_val_ps.test@1.0, 2007-08-15 21:46:41+02:00, mleich@four.local.lan +0 -0

ChangeSet@1.1810.3260.1, 2007-08-15 10:24:18-07:00, igor@olga.mysql.com +7 -0
  Fixed bug #30396.
  The bug caused memory corruption for some queries with top OR level
  in the WHERE condition if they contained equality predicates and 
  other sargable predicates in disjunctive parts of the condition.
  
  The corruption happened because the upper bound of the memory
  allocated for KEY_FIELD and SARGABLE_PARAM internal structures
  containing info about potential lookup keys was calculated incorrectly
  in some cases. In particular it was calculated incorrectly when the
  WHERE condition was an OR formula with disjuncts being AND formulas
  including equalities and other sargable predicates.

  mysql-test/r/select.result@1.121.1.36, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +57 -0
    Added a test case for bug #30396.

  mysql-test/t/select.test@1.102.1.29, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +60 -0
    Added a test case for bug #30396.

  sql/item_cmpfunc.h@1.122.2.30, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +0 -1
    Removed max_members from the COND_EQUAL class as not useful anymore. 

  sql/sql_base.cc@1.235.1.154, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +1 -0
    Added the max_equal_elems field to the st_select_lex structure.

  sql/sql_lex.cc@1.142.1.88, 2007-08-15 10:24:05-07:00, igor@olga.mysql.com +1 -0
    Added the max_equal_elems field to the st_select_lex structure.

  sql/sql_lex.h@1.175.1.77, 2007-08-15 10:24:06-07:00, igor@olga.mysql.com +2 -1
    Added the max_equal_elems field to the st_select_lex structure.
    The field contains the maximal number of elements in multiple equalities
    built for the query conditions.

  sql/sql_select.cc@1.312.166.1, 2007-08-15 10:24:06-07:00, igor@olga.mysql.com +12 -26
    Fixed bug #30396.
    The bug caused memory corruption for some queries with top OR level
    in the WHERE condition if they contained equality predicates and 
    other sargable predicates in disjunctive parts of the condition.
    
    The corruption happened because the upper bound of the memory
    allocated for KEY_FIELD and SARGABLE_PARAM internal structures
    containing info about potential lookup keys was calculated incorrectly
    in some cases. In particular it was calculated incorrectly when the
    WHERE condition was an OR formula with disjuncts being AND formulas
    including equalities and other sargable predicates.
     
    The max_equal_elems field to the st_select_lex structure is used now
    to calculate the above mentioned upper bound. The field contains the
    maximal number of elements in multiple equalities built for the query
    conditions.
     

ChangeSet@1.2528.122.7, 2007-08-15 20:11:16+04:00, kostja@bodhi.(none) +1 -0
  Add replication group (comments).

  sql/slave.h@1.109, 2007-08-15 20:11:14+04:00, kostja@bodhi.(none) +10 -2
    Add replication group (comments).

ChangeSet@1.2482.120.6, 2007-08-15 15:40:56+00:00, lzhou@dev3-63.(none) +14 -0
  Remove the extra files for the bug29674 exist only in 5.0

  BitKeeper/deleted/.del-BACKUP-1-0.1.Data@1.2, 2007-08-15 15:37:31+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data

  BitKeeper/deleted/.del-BACKUP-1-0.1.Data~a57077b1652462e@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data

  BitKeeper/deleted/.del-BACKUP-1-0.2.Data@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data

  BitKeeper/deleted/.del-BACKUP-1-0.2.Data~7ded385bca6b1f64@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data

  BitKeeper/deleted/.del-BACKUP-1.1.ctl@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl

  BitKeeper/deleted/.del-BACKUP-1.1.ctl~f95f9b1922013c1f@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl

  BitKeeper/deleted/.del-BACKUP-1.1.log@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log

  BitKeeper/deleted/.del-BACKUP-1.1.log~a9759ef97cd15f92@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log

  BitKeeper/deleted/.del-BACKUP-1.2.ctl@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl

  BitKeeper/deleted/.del-BACKUP-1.2.ctl~3ebf846a47d4cc6c@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl

  BitKeeper/deleted/.del-BACKUP-1.2.log@1.2, 2007-08-15 15:37:32+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log

  BitKeeper/deleted/.del-BACKUP-1.2.log~6c37168b3738d195@1.2, 2007-08-15 15:37:52+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log

  BitKeeper/deleted/.del-ndb_restore_different_endian_data.result@1.2, 2007-08-15 15:35:11+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/r/ndb_restore_different_endian_data.result

  BitKeeper/deleted/.del-ndb_restore_different_endian_data.test@1.2, 2007-08-15 15:38:17+00:00, lzhou@dev3-63.(none) +0 -0
    Delete: mysql-test/t/ndb_restore_different_endian_data.test

ChangeSet@1.1810.3259.1, 2007-08-15 12:13:34-03:00, davi@moksha.local +3 -0
  Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
  
  mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
  
  This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).

  mysql-test/t/handler.test@1.25.1.6, 2007-08-15 12:13:31-03:00, davi@moksha.local +14 -0
    Bug#25856 test case

  mysql-test/r/handler.result@1.25.2.1, 2007-08-15 12:13:30-03:00, davi@moksha.local +7 -0
    Bug#25856 test result

  sql/sql_handler.cc@1.72.1.16, 2007-08-15 12:13:31-03:00, davi@moksha.local +47 -33
    Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close

ChangeSet@1.2528.122.6, 2007-08-15 19:08:44+04:00, kostja@bodhi.(none) +17 -0
  Provide initial module structure to Doxygen.

  sql/event_data_objects.cc@1.110, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/event_data_objects.h@1.27, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_db_repository.cc@1.33.1.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_db_repository.h@1.18, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +11 -2
    Add module comments.

  sql/event_queue.cc@1.38.1.1, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/event_queue.h@1.19, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +17 -0
    Add module comments.

  sql/event_scheduler.cc@1.47, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/event_scheduler.h@1.24, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +15 -3
    Add module comments.

  sql/events.cc@1.84, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/events.h@1.57, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +6 -3
    Add module comments.

  sql/lock.cc@1.115.1.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +8 -1
    Add module comments.

  sql/sp_head.h@1.114, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/sql_base.cc@1.421.1.2, 2007-08-15 19:08:40+04:00, kostja@bodhi.(none) +7 -0
    Add module comments.

  sql/sql_lex.h@1.292, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +7 -0
    Add module comments.

  sql/sql_parse.cc@1.700.2.2, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +9 -0
    Add module comments.

  sql/sql_select.cc@1.548.2.1, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

  sql/sql_yacc.yy@1.597.1.2, 2007-08-15 19:08:41+04:00, kostja@bodhi.(none) +8 -0
    Add module comments.

ChangeSet@1.2528.1.27, 2007-08-15 18:41:18+04:00, skozlov@mysql.com +1 -0
  fixed diff

  mysql-test/suite/rpl/include/rpl_mixed_ddl.inc@1.3, 2007-08-15 18:41:11+04:00, skozlov@mysql.com +1 -1
    fixed diff

ChangeSet@1.1810.2875.54, 2007-08-15 18:21:58+04:00, evgen@moonbone.local +1 -0
  mysql_client_test.c:
    Post fix for the bug#29948.

  tests/mysql_client_test.c@1.167.1.70, 2007-08-15 18:21:36+04:00, evgen@moonbone.local +3 -3
    Post fix for the bug#29948.

ChangeSet@1.2528.133.1, 2007-08-15 17:43:08+04:00, kostja@bodhi.(none) +24 -0
  Fix doxygen warnings.

  client/mysqldump.c@1.291.2.1, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings

  mysys/test_charset.c@1.19, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/event_db_repository.cc@1.33.1.1, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +3 -3
    Fix doxygen warnings

  sql/events.cc@1.83, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +1 -2
    Fix doxygen warnings

  sql/events.h@1.56, 2007-08-15 17:42:54+04:00, kostja@bodhi.(none) +7 -2
    Fix doxygen warnings

  sql/item_create.cc@1.91, 2007-08-15 17:42:55+04:00, kostja@bodhi.(none) +165 -165
    Fix doxygen warnings, style.

  sql/item_create.h@1.51, 2007-08-15 17:42:55+04:00, kostja@bodhi.(none) +4 -4
    Fix coding style.

  sql/item_subselect.cc@1.159.1.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/lock.cc@1.115.1.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +9 -4
    Fix doxygen warnings

  sql/sp.cc@1.164.1.1, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sp_head.h@1.113, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_analyse.cc@1.77, 2007-08-15 17:42:56+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_analyse.h@1.25, 2007-08-15 17:42:57+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_base.cc@1.421.1.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +3 -3
    Fix doxygen warnings

  sql/sql_db.cc@1.157.1.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_lex.cc@1.255.3.1, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +14 -1
    Fix doxygen warnings

  sql/sql_lex.h@1.291, 2007-08-15 17:42:58+04:00, kostja@bodhi.(none) +6 -13
    Fix doxygen warnings

  sql/sql_parse.cc@1.700.2.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +6 -5
    Fix doxygen warnings

  sql/sql_plugin.cc@1.70.1.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +1 -1
    Fix doxygen warnings

  sql/sql_prepare.cc@1.230, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +0 -1
    Fix doxygen warnings

  sql/sql_show.cc@1.429.2.1, 2007-08-15 17:42:59+04:00, kostja@bodhi.(none) +2 -2
    Fix doxygen warnings

  sql/sql_trigger.cc@1.104, 2007-08-15 17:43:00+04:00, kostja@bodhi.(none) +8 -8
    Fix doxygen warnings

  sql/sql_update.cc@1.254, 2007-08-15 17:43:00+04:00, kostja@bodhi.(none) +4 -4
    Fix doxygen warnings

  sql/table.h@1.179.3.1, 2007-08-15 17:43:01+04:00, kostja@bodhi.(none) +5 -5
    Fix doxygen warnings

ChangeSet@1.2528.1.26, 2007-08-15 15:51:27+04:00, skozlov@mysql.com +2 -0
  disabled rpl_innodb_mixed_dml

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.5, 2007-08-15 15:51:18+04:00, skozlov@mysql.com +1 -1
    fix for tmp directory

  mysql-test/suite/rpl/t/disabled.def@1.11, 2007-08-15 15:51:18+04:00, skozlov@mysql.com +1 -1
    disabled rpl_innodb_mixed_dml

ChangeSet@1.2528.1.25, 2007-08-15 14:53:14+04:00, skozlov@mysql.com +1 -0
  Fixed path to tmp directory for rpl_mixed_dml.inc

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.4, 2007-08-15 14:53:05+04:00, skozlov@mysql.com +1 -1
    Fixed path to tmp directory

ChangeSet@1.2528.128.4, 2007-08-15 02:18:41-06:00, tsmith@ramayana.hindu.god +2 -0
  Update result formatting for embedded runs of ps_1general and
  trigger tests, to match build_table_filename behavior.

  mysql-test/t/ps_1general.test@1.43, 2007-08-15 02:18:40-06:00, tsmith@ramayana.hindu.god +1 -1
    Adjust how the datadir file name is normalized, to match new
    build_table_filename behavior.  This fixes the test result
    when run with the embedded server.

  mysql-test/t/trigger.test@1.82, 2007-08-15 02:18:40-06:00, tsmith@ramayana.hindu.god +2 -1
    Adjust how the datadir file name is normalized, to match new
    build_table_filename behavior.  This fixes the test result
    when run with the embedded server.

ChangeSet@1.1810.3249.2, 2007-08-15 09:23:44+02:00, mhansson@linux-st28.site +4 -0
  bug#28570: handler::index_read() is called with different find_flag when 
  ORDER BY is used
  
  The range analysis module did not correctly signal to the 
  handler that a range represents a ref (EQ_RANGE flag). This causes 
  non-range queries like 
  SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
  ORDER BY ... FOR UPDATE
  to wait for a lock unneccesarily if another running transaction uses
  SELECT ... FOR UPDATE on the same table.
  
  Fixed by setting EQ_RANGE for all range accesses that represent 
  an equality predicate. 

  mysql-test/t/innodb_mysql.test@1.3.44.1, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +29 -0
    bug#28570: Test Case

  mysql-test/r/innodb_mysql.result@1.3.23.1, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +18 -0
    bug#28570: Test Result

  sql/handler.cc@1.167.1.72, 2007-08-15 09:23:42+02:00, mhansson@linux-st28.site +2 -1
    bug#28570: Updated comment

  sql/opt_range.cc@1.159.40.1, 2007-08-15 09:23:43+02:00, mhansson@linux-st28.site +1 -2
    bug#28570: Removed the criterion that key has to be unique (HA_NOSAME) in 
    order for the EQ_RANGE flag to be set. It is sufficient that the range 
    represent a ref access.

ChangeSet@1.2528.131.1, 2007-08-14 20:31:06-06:00, malff@weblab.(none) +1 -0
  Changed whitespace and indentation only, no logic change.

  sql/sql_yacc.yy@1.597.1.1, 2007-08-14 20:31:01-06:00, malff@weblab.(none) +6991 -6536
    Changed whitespace and indentation only, no logic change.

ChangeSet@1.2482.8.81, 2007-08-15 12:12:59+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#28253 ndb_size.pl: cannot set socket
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.11, 2007-08-15 11:49:49+10:00, stewart@flamingspork.com +20 -8
    BUG#28253 ndb_size.pl: cannot set socket

ChangeSet@1.2482.8.80, 2007-08-15 12:12:46+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#29228 ndb_size.pl borks on float columns with comma in ()
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.10, 2007-08-15 11:49:46+10:00, stewart@flamingspork.com +2 -0
    Bug#29228 ndb_size.pl borks on float columns with comma in ()

ChangeSet@1.2482.8.79, 2007-08-15 12:12:31+10:00, stewart@flamingspork.com +1 -0
  [PATCH] BUG#28683 - ndb_size.pl should support more than one database
  
  Patch by: Monty Taylor <mtaylor@mysql.com>
  Fixes by: Stewart Smith
  
    Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
    ---
    Added schema name information to index table calculations as well.
    ---
    Made database an optional parameter, the exclusion of which causes all databases to be examined.
    If selecting from information_schema fails, attempt to fall back to show tables from
    ---
    Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
    ---
    Fixed report title for the case where we are using operating on more than one database.
    ---
    Fixed some perl style concerns timothy had.
    Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
    Get this full list of databases from show databases if needed.
  
    storage/ndb/tools/ndb_size.pl@stripped, 2007-05-25 13:45:44-07:00, mtaylor@qualinost.(none) +102 -28
      Added the ability to run ndb_size.pl on mulitple databases and also to exclude lists of databases and tables from analysis.
      ---
      Added schema name information to index table calculations as well.
      ---
      Made database an optional parameter, the exclusion of which causes all databases to be examined.
      If selecting from information_schema fails, attempt to fall back to show tables from
      ---
      Added support for setting an optional "real_table_name" for a table to deal with unique indexe size calcs.
      ---
      Fixed report title for the case where we are using operating on more than one database.
      ---
      Fixed some perl style concerns timothy had. 
      Cull the list of databases in perl rather than passing both an in and a not in list to MySQL
      Get this full list of databases from show databases if needed.
  
  Index: ndb-work/storage/ndb/tools/ndb_size.pl
  ===================================================================

  storage/ndb/tools/ndb_size.pl@1.9, 2007-08-15 11:46:19+10:00, stewart@flamingspork.com +110 -29
    BUG#28683 - ndb_size.pl should support more than one database

ChangeSet@1.2528.128.3, 2007-08-14 15:35:19-06:00, tsmith@ramayana.hindu.god +6 -0
  Updates to allow innodb.test to be run with --embedded-server,
  including a small change to build_table_filename().

  mysql-test/mysql-test-run.pl@1.320.1.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +0 -20
    Remove unused bad merge bitrot code.  This chunk of code is a repeat
    copy of an earlier chunk, and should never have been here.

  mysql-test/r/innodb.result@1.199.1.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +3 -36
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/suite/binlog/r/binlog_innodb.result@1.6, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +33 -0
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/suite/binlog/t/binlog_innodb.test@1.5, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +39 -0
    Updates to allow innodb.test to be run with --embedded-server

  mysql-test/t/innodb.test@1.171, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +11 -52
    Updates to allow innodb.test to be run with --embedded-server

  sql/sql_table.cc@1.446.3.1, 2007-08-14 15:35:16-06:00, tsmith@ramayana.hindu.god +14 -4
    build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
    it's already there.  This is done to make it easier to write tests
    which check the output of various error messages, and work with
    both the embedded server (mysql_data_home is full path, including
    trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").

ChangeSet@1.1810.3257.1, 2007-08-14 17:28:51+04:00, evgen@moonbone.local +2 -0
  Bug#29948: Unchecked NULL pointer caused server crash.
  
  The cli_read_binary_rows function is used to fetch data from the server
  after a prepared statement execution. It accepts a statement handler and gets
  the connection handler from it. But when the auto-reconnect option is set
  the connection handler is reset to NULL after reconnection because the
  prepared statement is lost and the handler became useless. This case
  wasn't checked in the cli_read_binary_rows function and caused server crash.
  
  Now the cli_read_binary_rows function checks the connection handler to be
  not NULL and returns an error if it is.

  libmysql/libmysql.c@1.233.5.19, 2007-08-14 17:27:56+04:00, evgen@moonbone.local +9 -1
    Bug#29948: Unchecked NULL pointer caused server crash.
    Now the cli_read_binary_rows function checks the connection handler to be
    not NULL and returns an error if it is.

  tests/mysql_client_test.c@1.167.34.1, 2007-08-14 17:27:37+04:00, evgen@moonbone.local +75 -0
    Added a test case for the bug#29948: Unchecked NULL pointer caused server crash.

ChangeSet@1.1810.3216.30, 2007-08-14 11:10:23+02:00, msvensson@pilot.(none) +1 -0
  Remove unused variable

  mysql-test/mysql-test-run.pl@1.30.49.97, 2007-08-14 11:10:21+02:00, msvensson@pilot.(none) +0 -1
    Remove unused variable

ChangeSet@1.1810.3216.29, 2007-08-14 11:05:42+02:00, msvensson@pilot.(none) +1 -0
  Remove unused variables

  mysql-test/mysql-test-run.pl@1.30.49.96, 2007-08-14 11:05:40+02:00, msvensson@pilot.(none) +0 -3
    Remove unused variables

ChangeSet@1.2482.8.77, 2007-08-14 10:29:00+02:00, mskold@mysql.com +1 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

  mysql-test/r/ndb_read_multi_range.result@1.13.2.2, 2007-08-14 10:28:31+02:00, mskold@mysql.com +19 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Regenerated result

ChangeSet@1.1810.3256.1, 2007-08-14 15:07:17+10:00, stewart@willster.(none) +2 -0
   Backport Magnus' fix from 5.1
  
  ChangeSet@1.2575, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
    Bug#26793 mysqld crashes when doing specific query on information_schema
     - Drop the newly created user user1@localhost
     - Cleanup testcase

  mysql-test/r/ndb_bug26793.result@1.2.1.1, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +1 -6
      mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none)
    +1 -6
        Update test result

  mysql-test/t/ndb_bug26793.test@1.2.1.1, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +8 -11
      mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8
    -11
        - Remove the drop/restore of anonymous users - there are no such users
        by default anymore(if there were, they would probably be in mysql.user)
        - Switch back to default connection before cleanup 
        - Drop user1@localhost as part of cleanup

ChangeSet@1.1810.3255.1, 2007-08-14 00:03:05+02:00, kent@mysql.com +2 -0
  make_win_src_distribution_old.sh:
    Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh
  Makefile.am, make_win_src_distribution_old.sh:
    Rename and put in note not to be used

  scripts/make_win_src_distribution_old.sh@1.37.4.2, 2007-08-14 00:02:41+02:00, kent@mysql.com +8 -0
    Rename and put in note not to be used

  scripts/make_win_src_distribution_old.sh@1.37.4.1, 2007-08-13 23:48:53+02:00, kent@mysql.com +0 -0
    Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh

  scripts/Makefile.am@1.43.1.23, 2007-08-14 00:02:56+02:00, kent@mysql.com +3 -3
    Rename and put in note not to be used

ChangeSet@1.1810.3253.2, 2007-08-13 15:59:08+02:00, mskold@mysql.com +2 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

  mysql-test/r/ndb_read_multi_range.result@1.3.2.4, 2007-08-13 15:58:22+02:00, mskold@mysql.com +19 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

  mysql-test/t/ndb_read_multi_range.test@1.4.2.4, 2007-08-13 15:58:22+02:00, mskold@mysql.com +22 -0
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase

ChangeSet@1.1810.3216.28, 2007-08-13 15:46:11+02:00, msvensson@pilot.(none) +4 -0
  Improve error messages
  Write test results to var/log
  Add test for "source" and variable expansion

  client/mysqltest.c@1.155.9.114, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +21 -15
    Improve error messages
    Write .reject file to the location specified by --logdir

  mysql-test/mysql-test-run.pl@1.30.49.95, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +1 -0
    Pass logdir to mysqltest, to get test results written to var/log

  mysql-test/r/mysqltest.result@1.24.1.32, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +5 -3
    Update test results

  mysql-test/t/mysqltest.test@1.24.1.44, 2007-08-13 15:46:10+02:00, msvensson@pilot.(none) +15 -2
    Add test for "source" and variable expansion
    Update test after writing result in var/log

ChangeSet@1.1810.3253.1, 2007-08-13 11:36:30+02:00, mskold@mysql.com +1 -0
  bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

  sql/ha_ndbcluster.cc@1.175.84.1, 2007-08-13 11:35:52+02:00, mskold@mysql.com +2 -1
    bug#30337  DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Disable multi_read_range if there are after delete/update triggers

ChangeSet@1.2528.100.17, 2007-08-13 09:46:09+02:00, msvensson@pilot.(none) +1 -0
  Bug#29804 UDF parameters don't contain correct string length
   - Export 'check_const_len_init' from udf_example.dll

  sql/udf_example.def@1.6, 2007-08-13 09:46:07+02:00, msvensson@pilot.(none) +1 -0
    - Export 'check_const_len_init' from udf_example.dll

ChangeSet@1.1810.3202.4, 2007-08-13 09:22:42+02:00, jonas@perch.ndb.mysql.com +8 -0
  ndb - bug#28804
    Handle out of transaction buffer in TC for INDX lookups

  sql/ha_ndbcluster.cc@1.175.1.140, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +8 -2
    Set correct status

  ndb/src/kernel/blocks/ERROR_codes.txt@1.9.22.1, 2007-08-13 09:22:39+02:00, jonas@perch.ndb.mysql.com +5 -1
    Add new error codes for simulating out of transaction buffer memory

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.26.26.1, 2007-08-13 09:22:39+02:00, jonas@perch.ndb.mysql.com +5 -5
    Change signature to handle out of buffer

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.73.50.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +122 -41
    Handle otu of transaction buffers in index operations
      (TCINDXREQ++)

  ndb/src/ndbapi/NdbTransaction.cpp@1.43.29.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +32 -6
    Give more info on 4012

  ndb/src/ndbapi/ndberror.c@1.30.40.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +2 -0
    Add new error code

  ndb/test/ndbapi/testIndex.cpp@1.14.6.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +117 -0
    add tests

  ndb/test/run-test/daily-basic-tests.txt@1.27.50.1, 2007-08-13 09:22:40+02:00, jonas@perch.ndb.mysql.com +8 -0
    add tests

ChangeSet@1.2528.115.3, 2007-08-11 00:07:11+02:00, jmiller@mysql.com +2 -0
  rpl_packet.test:
    Changed patch to Mats suggestion from review. Patch is for Bug#30209
  .del-wait_for_slave_running_off.inc:
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  BitKeeper/deleted/.del-wait_for_slave_running_off.inc@1.2, 2007-08-11 00:05:12+02:00, jmiller@mysql.com +0 -0
    Delete: mysql-test/include/wait_for_slave_running_off.inc

  mysql-test/suite/rpl/t/rpl_packet.test@1.10, 2007-08-11 00:06:07+02:00, jmiller@mysql.com +1 -1
    Changed patch to Mats suggestion

ChangeSet@1.2528.123.1, 2007-08-10 12:48:01-04:00, cbell@mysql_cab_desk. +13 -0
  BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
  
  This patch adds functionality to row-based replication to ensure the
  slave's column sizes are >= to that of the master.
  
  It also includes some refactoring for the code from WL#3228.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.3.1.1, 2007-08-10 12:46:35-04:00, cbell@mysql_cab_desk. +49 -40
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Removed commented out portion of test referenced in bug report. This
    test supports the original request of the bug report.

  mysql-test/include/test_fieldsize.inc@1.1, 2007-08-10 12:46:42-04:00, cbell@mysql_cab_desk. +40 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Sub unit file to test each variable type that relies on field
    metadata from the master.

  mysql-test/include/test_fieldsize.inc@1.0, 2007-08-10 12:46:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.8.1.1, 2007-08-10 12:46:35-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.8.1.1, 2007-08-10 12:46:36-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.1, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +754 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  mysql-test/suite/rpl/r/rpl_row_colSize.result@1.0, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl/t/rpl_row_colSize.test@1.1, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +168 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    Added a test file to test each variable type that relies on field
    metadata from the master.

  mysql-test/suite/rpl/t/rpl_row_colSize.test@1.0, 2007-08-10 12:46:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.9.1.1, 2007-08-10 12:46:37-04:00, cbell@mysql_cab_desk. +99 -32
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    New result file for additional test.

  sql/field.cc@1.402.2.2, 2007-08-10 12:46:37-04:00, cbell@mysql_cab_desk. +271 -1
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the additions made by this bug patch and those
    made by WL#3228. The effort consolidates the large switches on type()
    into functions within the field classes. 

  sql/field.h@1.238.1.2, 2007-08-10 12:46:38-04:00, cbell@mysql_cab_desk. +66 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the additions made by this bug patch and those
    made by WL#3228. The effort consolidates the large switches on type()
    into functions within the field classes. 

  sql/log_event.cc@1.294.1.1, 2007-08-10 12:46:39-04:00, cbell@mysql_cab_desk. +29 -126
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors the calc_field_size() method to use the new
    methods implemented in the field classes. It also corrects comments 
    concerning how replication of field metadata works. 

  sql/log_event.h@1.154, 2007-08-10 12:46:39-04:00, cbell@mysql_cab_desk. +1 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch refactors out the calc_field_size() method into the method
    save_field_metadata(). 

  sql/rpl_utility.cc@1.11.1.1, 2007-08-10 12:46:40-04:00, cbell@mysql_cab_desk. +19 -0
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch adds a method to check the size of the field on the master 
    using the field metadata from WL#3228. Each column is checked to ensure 
    the slave's column is >= to the master's column in size.

  sql/rpl_utility.h@1.9.1.1, 2007-08-10 12:46:40-04:00, cbell@mysql_cab_desk. +3 -2
    BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
    
    This patch changes the table_def class so that it records the size of
    the metadata. This is a result of refactoring out the calc_field_size()
    method into the method save_field_metadata(). Prevents access via 
    field_metadata(col) to unitialized memory when there is no metadata
    transmitted from the master.

ChangeSet@1.2528.122.1, 2007-08-09 17:31:00-06:00, malff@weblab.(none) +2 -0
  Bug#25930 (CREATE TABLE x SELECT ... parses columns wrong when ran with
             ANSI_QUOTES mode)
  
  This patch contains a test case only, showing that the bug has been fixed.
  
  The issue was related to parsing <"blah">, where the lexical analyser
  would not properly delimit the start and end of the token.
  
  Properly making the token boundaries has been fixed in sql_lex.cc
  with the patch for bug 25411 : see the Lex_input_stream class.

  mysql-test/r/parser.result@1.6, 2007-08-09 17:30:56-06:00, malff@weblab.(none) +10 -0
    Test case for Bug#25930, which was fixed by Bug#25411

  mysql-test/t/parser.test@1.6, 2007-08-09 17:30:56-06:00, malff@weblab.(none) +22 -0
    Test case for Bug#25930, which was fixed by Bug#25411

ChangeSet@1.2528.115.2, 2007-08-09 23:18:44+02:00, jmiller@mysql.com +3 -0
  rpl_packet.test:
    Updated test to use new include function
  wait_for_slave_running_off.inc:
    Created new include to resolve the timing issue recorded by Bug#30209
  rpl_events.inc:
    The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.

  mysql-test/include/wait_for_slave_running_off.inc@1.1, 2007-08-09 23:18:18+02:00, jmiller@mysql.com +35 -0
    Created new include to resolve the timing issue recorded by Bug#30209

  mysql-test/include/wait_for_slave_running_off.inc@1.0, 2007-08-09 23:18:18+02:00, jmiller@mysql.com +0 -0

  mysql-test/include/rpl_events.inc@1.7, 2007-08-09 23:18:31+02:00, jmiller@mysql.com +2 -0
    The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.

  mysql-test/suite/rpl/t/rpl_packet.test@1.9, 2007-08-09 23:17:59+02:00, jmiller@mysql.com +1 -0
    Updated test to use new include function

ChangeSet@1.2528.91.2, 2007-08-09 13:01:29-07:00, brian@piggy.tangent.org +2 -0
  Two bugs in one! The count call was duplicating internally the counts for loaded tests (not autosql tests, just loaded). This could manifest itself by executing by file, or by executing a pre statement.
  BUG#29803

  client/mysqlslap.c@1.57.1.1, 2007-08-09 13:01:27-07:00, brian@piggy.tangent.org +9 -10
    1) Declared VOID on pre/post statement return values (we were not using the return value and I prefer to see this declared explicitly)
    2) Removed extra count call which was causing duplication of rows with parsed files examples.

  mysql-test/r/mysqlslap.result@1.13, 2007-08-09 13:01:27-07:00, brian@piggy.tangent.org +2 -2
    The additional selects come from fixing the pre return count call. Dropping the final select is a result of fixing the true count.

ChangeSet@1.2528.109.6, 2007-08-09 10:21:28+02:00, msvensson@pilot.(none) +2 -0
  Bug#29804 UDF parameters don't contain correct string length
   - Fix warnings
   - Export 'check_const_len' from udf_example.dll

  sql/udf_example.c@1.40, 2007-08-09 10:21:26+02:00, msvensson@pilot.(none) +3 -3
    Fix warnings

  sql/udf_example.def@1.5, 2007-08-09 10:21:26+02:00, msvensson@pilot.(none) +1 -0
    Add 'check_const_len' function to be exported from udf_example.dll 

ChangeSet@1.2528.117.5, 2007-08-08 17:16:26-07:00, omer@linux.site +18 -0
  Updated to result files for cluster tests for version 5.1.21 
  Updared to 'views' test - forcing sort order
  Updateds included masked results as a result of bug 30322

  mysql-test/suite/funcs_1/include/ndb_tb2.inc@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +1 -1
    Correction to test file creating an ndb table

  mysql-test/suite/funcs_1/r/innodb_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +265 -273
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/memory_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +265 -273
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/myisam_views.result@1.8, 2007-08-08 17:16:21-07:00, omer@linux.site +8009 -8012
    Updated resut file - forcing order by

  mysql-test/suite/funcs_1/r/ndb_cursors.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_func_view.result@1.3, 2007-08-08 17:16:21-07:00, omer@linux.site +4672 -4507
    updated result file

  mysql-test/suite/funcs_1/r/ndb_storedproc_07.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +4 -4
    updated result file

  mysql-test/suite/funcs_1/r/ndb_storedproc_08.result@1.2, 2007-08-08 17:16:21-07:00, omer@linux.site +108 -0
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@1.3, 2007-08-08 17:16:21-07:00, omer@linux.site +2 -2
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +13 -13
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@1.3, 2007-08-08 17:16:22-07:00, omer@linux.site +3 -4
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@1.2, 2007-08-08 17:16:22-07:00, omer@linux.site +1 -1
    updated result file

  mysql-test/suite/funcs_1/r/ndb_views.result@1.3, 2007-08-08 17:16:22-07:00, omer@linux.site +318 -325
    updated result file

  mysql-test/suite/funcs_1/views/views_master.inc@1.7, 2007-08-08 17:16:22-07:00, omer@linux.site +70 -66
    updated test file - forcing sort order 

  mysql-test/suite/funcs_2/r/ndb_charset.result@1.5, 2007-08-08 17:16:22-07:00, omer@linux.site +124 -124
    Updated result file

ChangeSet@1.2528.100.15, 2007-08-08 12:21:04-04:00, cmiller@zippy.cornsilk.net +3 -0
  Correct bad merge, and remove version numbers from test case.

  mysql-test/r/mysqlbinlog2.result@1.15, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change test case to remove server version number.

  mysql-test/t/mysqlbinlog2.test@1.18, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -1
    Change test case to remove server version number.

  mysys/mf_iocache2.c@1.37, 2007-08-08 12:20:59-04:00, cmiller@zippy.cornsilk.net +1 -0
    Correcting bad merge.

ChangeSet@1.1810.3247.8, 2007-08-08 18:03:44+02:00, msvensson@shellback.(none) +2 -0
  Don't require a space between "if" and "(". This should
  also fix "while" and "connect"
  It's now possible to write "if("

  client/mysqltest.c@1.155.35.7, 2007-08-08 18:03:36+02:00, msvensson@shellback.(none) +6 -2
    Don't require a space between for example "if" and "(". This should
    also fix "while" and "connect"

  mysql-test/t/mysqltest.test@1.24.15.2, 2007-08-08 18:03:36+02:00, msvensson@shellback.(none) +1 -1
    Remove space between if and ( to check it works

ChangeSet@1.1810.3247.7, 2007-08-08 16:45:18+02:00, msvensson@shellback.(none) +1 -0
  Use "create_temp_file" to create a temporary file name for the perl script

  client/mysqltest.c@1.155.35.6, 2007-08-08 16:45:07+02:00, msvensson@shellback.(none) +18 -9
    Use "create_temp_file" to create a temporary file name for the perl script

ChangeSet@1.1810.3247.6, 2007-08-08 16:44:01+02:00, msvensson@shellback.(none) +3 -0
  Remove extra newline added to files created by write_file and append_file

  client/mysqltest.c@1.155.35.5, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +23 -0
    - Remove the extra newline first in the file produced by
      write_file and append_file
    - Add check for too many arguments passed to 'check_command_args'

  mysql-test/r/mysqltest.result@1.24.11.1, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +1 -0
    Update test result

  mysql-test/t/mysqltest.test@1.24.15.1, 2007-08-08 16:43:57+02:00, msvensson@shellback.(none) +1 -0
    Add test to check that no extra newline is created

ChangeSet@1.2528.107.11, 2007-08-08 16:39:13+02:00, msvensson@pilot.(none) +1 -0
  Remove file before writing to it.

  mysql-test/t/csv.test@1.27, 2007-08-08 16:39:12+02:00, msvensson@pilot.(none) +5 -0
    Remove file before writing to it.

ChangeSet@1.2482.120.3, 2007-08-08 19:23:12+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  fix merge bug

  sql/ha_ndbcluster.cc@1.457.2.2, 2007-08-08 19:23:07+08:00, gni@dev3-221.dev.cn.tlan +1 -0
    fix merge bug 

ChangeSet@1.1810.3242.9, 2007-08-08 10:04:26+02:00, msvensson@pilot.(none) +1 -0
  Improve comments and log messages in lib/mtr_timer.pl

  mysql-test/lib/mtr_timer.pl@1.7.1.7, 2007-08-08 10:04:25+02:00, msvensson@pilot.(none) +12 -18
    Improve comments and log messages in lib/mtr_timer.pl

ChangeSet@1.1810.3242.8, 2007-08-08 09:31:45+02:00, msvensson@pilot.(none) +1 -0
  Fix warning

  client/mysqltest.c@1.155.9.111, 2007-08-08 09:31:43+02:00, msvensson@pilot.(none) +1 -1
    Fix warning

ChangeSet@1.1810.3066.2, 2007-08-07 18:07:57+00:00, lzhou@dev3-63.(none) +17 -0
  BUG#29674 Restore/backup are endian compatible in 5.0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +1066 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.1.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +394 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +393 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +1065 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +549 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -0
    Test case data

  mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/r/ndb_restore_different_endian_data.result@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +200 -0
    Test case result for restore data from different endian

  mysql-test/r/ndb_restore_different_endian_data.result@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  mysql-test/t/ndb_restore_different_endian_data.test@1.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +185 -0
    Test case for restore data from different endian

  mysql-test/t/ndb_restore_different_endian_data.test@1.0, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +0 -0

  ndb/src/ndbapi/NdbDictionaryImpl.cpp@1.74.35.1, 2007-08-07 18:07:39+00:00, lzhou@dev3-63.(none) +10 -3
    Twiddle the "replicaCount" and "fragCount" variable when restore data from different endian.

  ndb/src/ndbapi/NdbDictionaryImpl.hpp@1.30.14.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +2 -1
    Add byte order variable

  ndb/tools/restore/Restore.cpp@1.22.12.1, 2007-08-07 18:07:40+00:00, lzhou@dev3-63.(none) +32 -1
    Twiddle blob, datatime,timestamp when do restore in different endian.

ChangeSet@1.2482.8.75, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
  Bug#26793 mysqld crashes when doing specific query on information_schema
   - Drop the newly created user user1@localhost
   - Cleanup testcase

  mysql-test/r/ndb_bug26793.result@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +1 -6
    Update test result

  mysql-test/t/ndb_bug26793.test@1.3, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8 -11
    - Remove the drop/restore of anonymous users - there are no such users
    by default anymore(if there were, they would probably be in mysql.user)
    - Switch back to default connection before cleanup 
    - Drop user1@localhost as part of cleanup

ChangeSet@1.1810.3245.2, 2007-08-07 19:25:45+05:00, bar@mysql.com +3 -0
  Reversing additional change suggested by Serg
  under terms of bug#28875 for better performance.
  The change appeared to require more changes in item_cmpfunc.cc,
  which is dangerous in 5.0.
      
  Conversion between a latin1 column and an ascii string constant
  stopped to work.

  mysql-test/r/ctype_recoding.result@1.30.1.4, 2007-08-07 19:25:43+05:00, bar@mysql.com +8 -0
    Adding test case.

  mysql-test/t/ctype_recoding.test@1.23.1.1, 2007-08-07 19:25:43+05:00, bar@mysql.com +10 -0
    Adding test case.

  sql/sql_string.cc@1.91.1.8, 2007-08-07 19:25:43+05:00, bar@mysql.com +0 -2
    Reversing additional change suggested by Serg
    under terms of bug#28875 for better performance.
    The change appeared to require more changes in item_cmpfunc.cc,
    which is dangerous in 5.0.
        
    Conversion between a latin1 column and an ascii string constant
    stopped to work.

ChangeSet@1.1810.3247.5, 2007-08-07 11:56:30+02:00, msvensson@shellback.(none) +1 -0
  Bug#29547 mysql-test-run to retrieve warnings for failed command
   - Run "SHOW WARNINGS" when mysqltest fails and display all but the
     last warning(since it's the same as "last error") on stderr
   - Fix typo

  client/mysqltest.c@1.155.35.4, 2007-08-07 11:56:26+02:00, msvensson@shellback.(none) +81 -4
    - Display any warnings produced prior to the error that caused
    mysqltest to die.
    - Fix typo "cur_con" -> "con_slot"
    - Move initialization of the "cur_con" pointer to just before it's
      initialized  so it can be used to check if a connection to mysql
      exist.   

ChangeSet@1.1810.3242.6, 2007-08-07 11:40:03+02:00, msvensson@pilot.(none) +7 -0
  Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands)
   - Update comments
   - Make "write_file" fail if file already exist
   - Remove temporary files created by test cases

  client/mysqltest.c@1.155.9.109, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +11 -5
    Improve function comments
    Make write_file fail if file already exist

  mysql-test/r/mysqltest.result@1.24.10.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +2 -1
    Update test result after adding new test and updating description
    of argumements to chmod

  mysql-test/t/bootstrap.test@1.2, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +5 -2
    Remove temporary file created by testcase 

  mysql-test/t/mysql.test@1.4.1.27, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +3 -0
    Remove temporary file created by testcase 

  mysql-test/t/mysqladmin.test@1.5.1.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +2 -1
    Remove temporary file created by testcase 

  mysql-test/t/mysqltest.test@1.24.14.1, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +20 -0
    Remove temporary file created by testcase 
    Add test to show that "write_file" fails if file already exist

  mysql-test/t/sp-destruct.test@1.3.1.5, 2007-08-07 11:40:02+02:00, msvensson@pilot.(none) +1 -0
    Remove temporary file created by testcase 

ChangeSet@1.1810.3250.1, 2007-08-07 05:35:20-04:00, cmiller@zippy.cornsilk.net +4 -0
  Bug#27562: ascii.xml invalid?
  
  Two character mappings were way off (backtick and tilde were "E"
  and "Y"!), and three others were slightly rotated.  The first 
  would cause collisions, and the latter was probably benign.
  
  Now, assign the character mappings exactly to their normal values.

  mysql-test/r/ctype_ascii.result@1.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +177 -0
    Add new test file.
    
    Test all combinations of printable letter comparisons for 
    similarity.
    

  mysql-test/r/ctype_ascii.result@1.0, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +0 -0

  mysql-test/t/ctype_ascii.test@1.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +13 -0
    Add new test file.
    
    Test all combinations of printable letter comparisons for 
    similarity.
    

  mysql-test/t/ctype_ascii.test@1.0, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +0 -0

  sql/share/charsets/ascii.xml@1.7, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +3 -3
    Change the character mapping for 
     "`" to "`" (was "E") and 
     "[" to "[" (was "\") and 
     "\" to "\" (was "]") and
     "]" to "]" (was "[") and 
     "~" to "~" (was "Y").

  strings/ctype-extra.c@1.23.4.1, 2007-08-07 05:35:18-04:00, cmiller@zippy.cornsilk.net +3 -3
    Generated from charsets directory.

ChangeSet@1.2528.112.7, 2007-08-06 06:55:50-07:00, gkodinov@magare.gmz +1 -0
  Bug 29536 : error message changed 5.0-opt -> 5.1-opt

  mysql-test/suite/rpl/r/rpl_timezone.result@1.24, 2007-08-06 06:55:46-07:00, gkodinov@magare.gmz +1 -1
    Bug 29536 : error message changed 5.0-opt -> 5.1-opt

ChangeSet@1.1810.3249.1, 2007-08-06 04:57:28-07:00, gkodinov@magare.gmz +4 -0
  Bug #29536: timestamp inconsistent in replication around 1970
  
  MySQL replicates the time zone only when operations that involve
  it are performed. This is controlled by a flag. But this flag
  is set only on successful operation.
  The flag must be set also when there is an error that involves
  a timezone (so the master would replicate the error to the slaves). 
  
  Fixed by moving the setting of the flag before the operation
  (so it apples to errors as well).

  mysql-test/r/rpl_timezone.result@1.12.1.5, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +18 -0
    Bug #29536: test case

  mysql-test/t/rpl_timezone.test@1.8.1.3, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +27 -2
    Bug #29536: test case

  sql/field.cc@1.256.1.104, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +3 -3
    Bug #29536: move setting of the flag before the operation
    (so it apples to errors as well).

  sql/time.cc@1.57.8.2, 2007-08-06 04:57:26-07:00, gkodinov@magare.gmz +1 -1
    Bug #29536: move setting of the flag before the operation
    (so it apples to errors as well).

ChangeSet@1.1810.3247.4, 2007-08-06 13:42:00+02:00, msvensson@shellback.(none) +1 -0
  Add missing '
  Extend buffer size to allow for longer log messages

  client/mysqltest.c@1.155.35.3, 2007-08-06 13:41:55+02:00, msvensson@shellback.(none) +2 -2
    Add missing '
    Extend buffer size to allow for longer log messages

ChangeSet@1.1810.3247.3, 2007-08-06 11:20:36+02:00, msvensson@shellback.(none) +3 -0
  Remove NOT_YET code
  Update comments
  Add more tests for "let from query"

  client/mysqltest.c@1.155.35.2, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +6 -24
    Remove NOT_YET code
    Update comments

  mysql-test/r/mysqltest.result@1.24.1.29, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +12 -0
    Add more tests for "let from query" 

  mysql-test/t/mysqltest.test@1.24.1.40, 2007-08-06 11:20:33+02:00, msvensson@shellback.(none) +19 -17
    Add more tests for "let from query" 

ChangeSet@1.1810.3247.2, 2007-08-06 10:39:48+02:00, msvensson@shellback.(none) +1 -0
  Fix spelling errors

  client/mysqltest.c@1.155.35.1, 2007-08-06 10:39:43+02:00, msvensson@shellback.(none) +2 -2
    Fix spelling errors

ChangeSet@1.1810.3244.6, 2007-08-06 01:01:22-07:00, igor@olga.mysql.com +2 -0
  Removed a query from the test case for bug 39219 that displayed in valgrind
  a problem for BIT type values different from the one reported for the bug.

  mysql-test/r/type_bit.result@1.14.1.8, 2007-08-06 01:01:16-07:00, igor@olga.mysql.com +0 -8
    Removed a query from the test case for bug 39219 that displayed in valgrind
    a problem for BIT type values different from the one reported for the bug.

  mysql-test/t/type_bit.test@1.18.1.2, 2007-08-06 01:01:17-07:00, igor@olga.mysql.com +0 -5
    Removed a query from the test case for bug 39219 that displayed in valgrind
    a problem for BIT type values different from the one reported for the bug.

ChangeSet@1.2528.112.4, 2007-08-06 00:53:32-07:00, igor@olga.mysql.com +1 -0
  Post-merge fixes.

  sql/field.h@1.242.1.2, 2007-08-06 00:53:26-07:00, igor@olga.mysql.com +2 -2
    Post-merge fixes.

ChangeSet@1.2528.109.5, 2007-08-05 21:37:55-04:00, dkatz@damien-katzs-computer.local +4 -0
  Bug #29804  UDF parameters don't contain correct string length
  
  Previously, UDF *_init functions were passed constant strings with erroneous lengths.
  The length came from the containing variable's size, not the length of the value itself.
  
  Now the *_init functions get the constant as a null terminated string with the correct
  length supplied.

  mysql-test/r/udf.result@1.21, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +24 -0
    Test case to check constants passed UDFs.

  mysql-test/t/udf.test@1.19, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +36 -0
    Test case to check constants passed UDFs.

  sql/item_func.cc@1.413.1.1, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +2 -1
    UDF _init functions are now passed the length of the constants, rather than the max
    length of the var containing the constant.

  sql/udf_example.c@1.39, 2007-08-05 21:37:51-04:00, dkatz@damien-katzs-computer.local +35 -0
    Added check_const_len functions. The check_const_len_init functions checks that the
    lengths of constants are correctly passed.

ChangeSet@1.2528.109.4, 2007-08-05 21:08:08-04:00, dkatz@damien-katzs-computer.local +1 -0
  Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
  into  damien-katzs-computer.local:/Users/dkatz/mysql51

  BitKeeper/deleted/.del-.del-README.txt@1.2.1.1, 2007-08-05 21:08:03-04:00, dkatz@damien-katzs-computer.local +0 -0
    Delete: BitKeeper/deleted/.del-README.txt

ChangeSet@1.1810.3244.5, 2007-08-05 17:12:57-07:00, igor@olga.mysql.com +1 -0
  Fixed compiler error for Windows in the patch for bug 30219.

  sql/field.h@1.153.27.9, 2007-08-05 17:12:52-07:00, igor@olga.mysql.com +1 -1
    Fixed compiler error for Windows in the patch for bug 30219.

ChangeSet@1.1810.3235.5, 2007-08-05 14:16:49-07:00, igor@olga.mysql.com +3 -0
  Fix bug #30219.
  This bug manifested itself for queries with grouping by columns of
  the BIT type. It led to wrong comparisons of bit-field values and
  wrong result sets.
  Bit-field values never cannot be compared as binary values. Yet
  the class Field_bit had an implementation of the cmp method that
  compared bit-fields values as binary values. 
  Also the get_image and set_image methods of the base class Field 
  cannot be used for objects of the Field_bit class. 
  Now these methods are declared as virtual and specific implementations
  of the methods are provided for the class Field_bit.

  mysql-test/r/type_bit.result@1.14.1.7, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +32 -0
    Added a test case for bug #30219.

  mysql-test/t/type_bit.test@1.18.1.1, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +24 -0
    Added a test case for bug #30219.

  sql/field.h@1.153.27.8, 2007-08-05 14:16:44-07:00, igor@olga.mysql.com +10 -3
    Fix bug #30219.
    This bug manifested itself for queries with grouping by columns of
    the BIT type. It led to wrong comparisons of bit-field values and
    wrong result sets.
    Bit-field values never cannot be compared as binary values. Yet
    the class Field_bit had an implementation of the cmp method that
    compared bit-fields values as binary values.
    Also the get_image and set_image methods of the base class Field
    cannot be used for objects of the Field_bit class. 
    Now these methods are declared as virtual and specific implementations
    of these methods are provided for the class Field_bit.

ChangeSet@1.2528.112.2, 2007-08-05 14:02:33+03:00, gkodinov@magare.gmz +7 -0
  rpl_row_tabledefs_2myisam.result:
     merged 5.1-main to 5.1-opt : error numbers changed.
  Many files:
     merged 5.1-main to 5.1-opt : error numbers changed
  rpl_extraCol_innodb.result:
    merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@1.9, 2007-08-05 13:56:34+03:00, gkodinov@magare.gmz +14 -14
    merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@1.9, 2007-08-05 13:57:23+03:00, gkodinov@magare.gmz +14 -14
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_incident.result@1.11, 2007-08-05 13:57:37+03:00, gkodinov@magare.gmz +2 -2
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@1.6, 2007-08-05 13:58:23+03:00, gkodinov@magare.gmz +2 -2
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@1.23, 2007-08-05 13:58:58+03:00, gkodinov@magare.gmz +6 -6
     merged 5.1-main to 5.1-opt : error numbers changed.

  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@1.20, 2007-08-05 13:59:23+03:00, gkodinov@magare.gmz +6 -6
     merged 5.1-main to 5.1-opt : error numbers changed

  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@1.10, 2007-08-05 13:59:50+03:00, gkodinov@magare.gmz +14 -14
     merged 5.1-main to 5.1-opt : error numbers changed

ChangeSet@1.2528.111.5, 2007-08-04 20:31:48-07:00, igor@olga.mysql.com +1 -0
  Removed warnings after fix for bug 28404.

  sql/sql_select.cc@1.544.4.4, 2007-08-04 20:31:43-07:00, igor@olga.mysql.com +5 -2
    Removed warnings after fix for bug 28404.

ChangeSet@1.2528.111.4, 2007-08-04 17:15:33-07:00, igor@olga.mysql.com +2 -0
  Made the test case for bug 28404 platform independent.

  mysql-test/r/order_by.result@1.70, 2007-08-04 17:15:24-07:00, igor@olga.mysql.com +12 -13
    Made the test case for bug 28404 platform independent.

  mysql-test/t/order_by.test@1.54, 2007-08-04 17:15:24-07:00, igor@olga.mysql.com +8 -8
    Made the test case for bug 28404 platform independent.

ChangeSet@1.2528.111.3, 2007-08-04 13:41:01-07:00, igor@olga.mysql.com +2 -0
  Made sure that the test case for bug 28404 use the correct statistics.

  mysql-test/r/order_by.result@1.69, 2007-08-04 13:40:55-07:00, igor@olga.mysql.com +9 -5
    Made sure that the test case for bug 28404 use the correct statistics.

  mysql-test/t/order_by.test@1.53, 2007-08-04 13:40:55-07:00, igor@olga.mysql.com +6 -3
    Made sure that the test case for bug 28404 use the correct statistics.

ChangeSet@1.2528.111.2, 2007-08-04 03:12:43-07:00, igor@olga.mysql.com +1 -0
  Post-merge fix.

  mysql-test/r/innodb_mysql.result@1.45.3.2, 2007-08-04 03:12:37-07:00, igor@olga.mysql.com +1 -1
    Post-merge fix.

ChangeSet@1.2528.111.1, 2007-08-03 21:10:57-07:00, igor@olga.mysql.com +1 -0
  Fixed a memory leak in the patch for bug 28404.

  sql/sql_select.cc@1.544.4.3, 2007-08-03 21:10:44-07:00, igor@olga.mysql.com +5 -2
    Fixed a memory leak in the patch for bug 28404.

ChangeSet@1.2528.107.6, 2007-08-03 13:42:31+02:00, msvensson@pilot.(none) +2 -0
  Update to reflect new location of where log file end up

  mysql-test/r/mysqltest.result@1.66, 2007-08-03 13:42:29+02:00, msvensson@pilot.(none) +1 -1
    Update to reflect new location of where log file end up

  mysql-test/t/mysqltest.test@1.86, 2007-08-03 13:42:29+02:00, msvensson@pilot.(none) +1 -1
    Update to reflect new location of where log file end up

ChangeSet@1.1810.3242.5, 2007-08-03 13:39:55+02:00, msvensson@pilot.(none) +1 -0
  Add extra newline between diff and error message 

  client/mysqltest.c@1.155.9.108, 2007-08-03 13:39:54+02:00, msvensson@pilot.(none) +1 -1
    Add extra newline between diff and error message 

ChangeSet@1.2528.107.4, 2007-08-03 13:29:30+02:00, msvensson@pilot.(none) +1 -0
  Update after merge, change "byte" and "gptr" into "uchar" and "uchar*"

  client/mysqltest.c@1.301.2.8, 2007-08-03 13:29:29+02:00, msvensson@pilot.(none) +5 -5
    Update after merge, change "byte" and "gptr" into "uchar" and "uchar*"

ChangeSet@1.1810.3235.4, 2007-08-03 14:14:33+03:00, gkodinov@magare.gmz +1 -0
  Bug #25228: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a
  
  A test case was waiting for a fixed number of seconds for a specific 
  state of the slave IO thread to take place.
  Fixed by waiting in a loop for that specific thread state instead 
  (or timeout).

  mysql-test/t/rpl_relayspace.test@1.5.1.1, 2007-08-03 14:14:31+03:00, gkodinov@magare.gmz +16 -0
    Bug #25228: fixed test case

ChangeSet@1.1810.3243.3, 2007-08-03 13:12:53+02:00, msvensson@shellback.(none) +5 -0
  WL#3935 Improve mysqltest report and exitcode for diff
   - Move the code to generate test report to the test tool(in this
     case mysqltest) where the best control of what failed is
  - Simplify the code in mysql-test-run.pl
  - mysqltest will now find what diff to use in a best effort attempt
    using "diff -u", "diff -c" and finally dumping the two files verbatim
    in the report.

  client/mysqltest.c@1.155.9.107, 2007-08-03 13:12:48+02:00, msvensson@shellback.(none) +404 -139
    - Add new option --tail-lines indicating how many lines of the result to output
      when generating report for a failure
    - Remove eval_result, noone knows what it should do and it's not used.
    - Add support for best effort execution of systems builtin "diff",
      try with "diff -u" and "diff -c" and if that fails dump the whole content
       of teh two files to report
    - Use one common function when comapring two files, used when test 
      has completed and the result should be compared to the .result file
      as well as using it from myqltest's builtin diff_files command.
    - Output the last lines og the result so far  in the report that mysqltest
      generates in case of a test failure.
    
     

  mysql-test/lib/mtr_report.pl@1.21.5.1, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +9 -52
    - Remove code for generating diff between .reject and .result file,
      that is handled by mysqltest(or the test tool) from now on.
    - Add better comments 

  mysql-test/mysql-test-run.pl@1.30.91.1, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +3 -6
    - Remove the --udiff flag to mysql-test-run.pl, if the systems diff supports
      unified diff it will be used automatically
    - Remove the code for "mtr_show_failed_diff", the report from mysqltest
      will know include the diff so if mysqltest(or another test tool)
      fails, just display it's report what went wrong
    - Pass --tail-lines=20 to mysqltest to it will shos the last 20 lines 
      from the result in the report in case of failure.	  

  mysql-test/r/mysqltest.result@1.24.1.28, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +2 -1
    Update result file now when the output from mysqltest has been sent to /dev/null

  mysql-test/t/mysqltest.test@1.24.1.39, 2007-08-03 13:12:49+02:00, msvensson@shellback.(none) +51 -4
    - Improve tests for --diff_files
    - Remove temporary files in var/tmp generated in the fly
    - Send output from test for --diff_files to /deb/null since only the error
      code it returns are of interest and tyhe outpu may vary depending
      on what builtin diff is being used.

ChangeSet@1.1810.3243.2, 2007-08-03 12:56:45+02:00, msvensson@shellback.(none) +2 -0
  Cleanup created procedures in sp.test

  mysql-test/r/sp.result@1.170.44.1, 2007-08-03 12:56:40+02:00, msvensson@shellback.(none) +1 -0
    Cleanup created procedures

  mysql-test/t/sp.test@1.174.44.1, 2007-08-03 12:56:40+02:00, msvensson@shellback.(none) +1 -0
    Cleanup created procedures

ChangeSet@1.1810.3243.1, 2007-08-03 12:54:06+02:00, msvensson@shellback.(none) +1 -0
  Remove the temporary file created by mysql_upgrade 

  client/mysql_upgrade.c@1.6.1.18, 2007-08-03 12:54:01+02:00, msvensson@shellback.(none) +1 -0
    Remove the temporary file after it's been used 

ChangeSet@1.1810.3242.1, 2007-08-03 12:50:00+02:00, msvensson@pilot.(none) +2 -0
  Improve report on test execution time
  Define tot_real_tim locally in mtr_report.pl

  mysql-test/lib/mtr_report.pl@1.21.4.1, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +8 -3
    Improve report on test execution time
    Define tot_real_tim locally in mtr_report.pl

  mysql-test/mysql-test-run.pl@1.30.49.90, 2007-08-03 12:49:59+02:00, msvensson@pilot.(none) +0 -1
    Move global variable to local scope in the file it's being used

ChangeSet@1.2528.79.18, 2007-08-03 12:37:00+02:00, gshchepa@dl145s.mysql.com +6 -0
  Many files:
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_dd_basic.result@1.21, 2007-08-03 11:38:20+02:00, gshchepa@dl145s.mysql.com +3 -3
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_dd_ddl.result@1.18, 2007-08-03 11:48:59+02:00, gshchepa@dl145s.mysql.com +1 -1
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_gis.result@1.25, 2007-08-03 12:02:56+02:00, gshchepa@dl145s.mysql.com +2 -2
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_row_format.result@1.7, 2007-08-03 12:21:14+02:00, gshchepa@dl145s.mysql.com +1 -1
    Post-merge fix.

  mysql-test/suite/ndb/r/ndb_single_user.result@1.13, 2007-08-03 12:26:44+02:00, gshchepa@dl145s.mysql.com +5 -5
    Post-merge fix.

  mysql-test/suite/rpl/r/rpl_udf.result@1.9, 2007-08-03 11:12:47+02:00, gshchepa@dl145s.mysql.com +4 -4
    Post-merge fix.

ChangeSet@1.1810.3241.1, 2007-08-03 12:36:32+02:00, msvensson@shellback.(none) +3 -0
  Send output to var/log/mysql-test-run.log to facilitate easier debugging
  of mysql-test-run.pl

  mysql-test/lib/mtr_process.pl@1.25.2.32, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +11 -10
    Change from "print" to "mtr_debug" to get messages logged to file as well 

  mysql-test/lib/mtr_report.pl@1.21.3.3, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +44 -11
    - Add "mtr_log_init" function used for opening the log file
    - Change from "print" to "mtr_report" to get the messages logged
    - Make printout functions log to the log file

  mysql-test/mysql-test-run.pl@1.30.90.1, 2007-08-03 12:36:27+02:00, msvensson@shellback.(none) +8 -5
    - Open the mysql-test-run log file as soon as var/log has been created
    - Change from "print" to "mtr_report" to get the messgages to log as well

ChangeSet@1.2528.79.17, 2007-08-03 13:07:37+05:00, gshchepa@gleb.loc +6 -0
  Many files:
    Post-merge fix.

  mysql-test/r/binlog_unsafe.result@1.4, 2007-08-03 13:06:52+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

  mysql-test/r/events_bugs.result@1.39.1.1, 2007-08-03 13:07:01+05:00, gshchepa@gleb.loc +8 -8
    Post-merge fix.

  mysql-test/r/events_trans.result@1.4, 2007-08-03 13:07:05+05:00, gshchepa@gleb.loc +1 -1
    Post-merge fix.

  mysql-test/r/sp.result@1.288, 2007-08-03 13:07:07+05:00, gshchepa@gleb.loc +4 -4
    Post-merge fix.

  mysql-test/r/sp_gis.result@1.9, 2007-08-03 13:07:08+05:00, gshchepa@gleb.loc +2 -2
    Post-merge fix.

  mysql-test/r/xml.result@1.26, 2007-08-03 13:07:09+05:00, gshchepa@gleb.loc +9 -9
    Post-merge fix.

ChangeSet@1.2528.103.1, 2007-08-03 03:50:19+05:00, svoj@mysql.com +1 -0
  BUG#27040 - Incorrect FTS parser name output
  
  When a table uses two (or more) fulltext keys with different fulltext parsers,
  all fulltext keys (excluding those that use built-in parser) were using first
  parser that was mentioned in .frm.
  
  With this fix fulltext keys use proper (assigned during create table) fulltext
  parser.
  
  This code was contributed by Yoshinori Matsunobu ymatsunobu@mysql.com
  on 2007-03-12 The copyright was assigned and transferred under the
  terms of the MySQL Contributor License Agreement.

  sql/table.cc@1.301.4.1, 2007-08-03 03:50:09+05:00, svoj@mysql.com +1 -0
    Shift extra data segment buffer pointer by parser name length to restore
    next key parser name correctly.

ChangeSet@1.1810.3237.1, 2007-08-03 01:58:21+05:00, gshchepa@gleb.loc +5 -0
  Fixed bug #27352.
  The SELECT query with more than 31 nested dependent SELECT queries returned
  wrong result.
  
  New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.
  It will be reported as: "Too high level of nesting for select".

  mysql-test/r/select.result@1.121.1.35, 2007-08-03 01:57:44+05:00, gshchepa@gleb.loc +10 -0
    Updated test case for bug #27352.

  mysql-test/t/select.test@1.102.1.28, 2007-08-03 01:57:43+05:00, gshchepa@gleb.loc +30 -0
    Updated test case for bug #27352.

  sql/share/errmsg.txt@1.42.1.38, 2007-08-03 01:57:45+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27352.
    New error message has been added: ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT.

  sql/sql_parse.cc@1.426.160.1, 2007-08-03 01:57:24+05:00, gshchepa@gleb.loc +5 -0
    Fixed bug #27352.
    The Item_sum::register_sum_func method has been modified to return
    TRUE on exceeding of allowed level of SELECT nesting and to report
    corresponding error message.

  sql/unireg.h@1.39.1.11, 2007-08-03 01:57:41+05:00, gshchepa@gleb.loc +2 -0
    Fixed bug #27352.
    Constant definition has been added: maximal allowed level of SELECT nesting.

ChangeSet@1.2528.101.1, 2007-08-02 12:45:56-07:00, igor@olga.mysql.com +14 -0
  Fixed bug#28404.
  This patch adds cost estimation for the queries with ORDER BY / GROUP BY
  and LIMIT. 
  If there was a ref/range access to the table whose rows were required
  to be ordered in the result set the optimizer always employed this access
  though a scan by a different index that was compatible with the required 
  order could be cheaper to produce the first L rows of the result set.
  Now for such queries the optimizer makes a choice between the cheapest
  ref/range accesses not compatible with the given order and index scans
  compatible with it.

  mysql-test/r/distinct.result@1.56, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +4 -4
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/endspace.result@1.13, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/group_by.result@1.84.1.1, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/group_min_max.result@1.34, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +5 -5
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/innodb.result@1.200, 2007-08-02 12:45:48-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/innodb_mysql.result@1.45.3.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +11 -11
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/merge.result@1.67, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/order_by.result@1.68, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +55 -0
    Added a test case for bug #28404.

  mysql-test/r/select_found.result@1.25, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/r/subselect.result@1.196, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Adjusted results for test cases affected fy the fix for bug #28404.

  mysql-test/t/distinct.test@1.32, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +1 -1
    Changed a test case after adding the fix for bug #28404.

  mysql-test/t/order_by.test@1.52, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +37 -0
    Added a test case for bug #28404.

  sql/sql_select.cc@1.544.5.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +232 -76
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT. 
    Now for such queries the optimizer makes a choice between the cheapest
    ref/range accesses not compatible with the given order and index scans
    compatible with it.
    
    Modified the function test_if_skip_sort_order to make the above mentioned
    choice cost based. 

  sql/sql_select.h@1.125.1.1, 2007-08-02 12:45:49-07:00, igor@olga.mysql.com +6 -0
    Fixed bug#28404.
    This patch adds cost estimation for the queries with ORDER BY / GROUP BY
    and LIMIT. 
    Added a new field fot the JOIN_TAB structure. 

ChangeSet@1.2528.79.15, 2007-08-02 23:08:52+04:00, evgen@moonbone.local +1 -0
  mysqld.cc:
    Post merge changes.

  sql/mysqld.cc@1.660.2.2, 2007-08-02 23:08:23+04:00, evgen@moonbone.local +3 -4
    Post merge changes.

ChangeSet@1.2528.79.14, 2007-08-02 21:49:27+04:00, evgen@moonbone.local +1 -0
  sql_class.h:
    After merge changes.

  sql/sql_class.h@1.386.1.3, 2007-08-02 21:49:15+04:00, evgen@moonbone.local +2 -1
    After merge changes.

ChangeSet@1.1810.3235.2, 2007-08-02 17:11:35+03:00, gkodinov@magare.gmz +1 -0
  Bug #30193: crash during drop table and kill
  
  When DROP TABLE detects that it has been killed
  by another thread it must unlock the table names
  it locked.
  
  Fixed by backporting the 5.1 error handling code.

  sql/sql_table.cc@1.239.65.1, 2007-08-02 17:11:34+03:00, gkodinov@magare.gmz +3 -2
    Bug #30193: correct error handling when a thread 
    is killed inside DROP TABLE.

ChangeSet@1.1810.3235.1, 2007-08-02 12:35:05+03:00, gkodinov@magare.gmz +1 -0
  Addendum to bug 29325
  keep_files_on_create made a startup option

  sql/mysqld.cc@1.439.122.1, 2007-08-02 12:35:04+03:00, gkodinov@magare.gmz +7 -1
    Addendum to bug #29325
    keep_files_on_create made a startup option

ChangeSet@1.2528.90.1, 2007-08-01 08:50:38-07:00, brian@zim.(none) +2 -0
  On internals@mysql a developer at IBM pointed out that DBTYPE needed to be removed from the example (its a single line which was needed for previous versions of MySQL). Its been removed. Added a couple of comments.

  storage/example/ha_example.cc@1.57.1.2, 2007-08-01 08:50:28-07:00, brian@zim.(none) +4 -1
    Removed line, added comment about Skeleton.

  storage/example/plug.in@1.5, 2007-08-01 08:50:28-07:00, brian@zim.(none) +1 -1
    Corrected explanation

ChangeSet@1.2528.1.20, 2007-08-01 14:52:10+04:00, skozlov@mysql.com +3 -0
  Fix for Bug#28744, bug#29363

  mysql-test/suite/rpl/include/rpl_mixed_dml.inc@1.3, 2007-08-01 14:49:10+04:00, skozlov@mysql.com +3 -1
    Data file moved into var directory

  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result@1.5, 2007-08-01 14:49:11+04:00, skozlov@mysql.com +21 -23
    updated result file

  mysql-test/suite/rpl/t/disabled.def@1.9, 2007-08-01 14:49:11+04:00, skozlov@mysql.com +2 -2
    updated file disabled.def

ChangeSet@1.2482.119.2, 2007-07-31 15:09:16+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#30134 restore of backup from different endian can work for timestamp column

  storage/ndb/tools/restore/Restore.cpp@1.51.1.1, 2007-07-31 15:09:07+00:00, lzhou@dev3-63.(none) +4 -1
    Convert byte order of timestamp data type

ChangeSet@1.2482.113.3, 2007-07-30 09:01:11+00:00, lzhou@dev3-63.(none) +1 -0
  BUG#30024 Restore of backup from different endian can work for datetime

  storage/ndb/tools/restore/Restore.cpp@1.52, 2007-07-30 09:00:01+00:00, lzhou@dev3-63.(none) +12 -0
    Convert datetime datatype to native endian

ChangeSet@1.2482.8.74, 2007-07-29 14:06:11-04:00, cbell@mysql_cab_desk. +2 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch corrects a incorrect type conversion during encoding and
  decoding the length for VARCHAR fields.

  sql/log_event.cc@1.278.3.5, 2007-07-29 14:06:08-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch changes the encoding of the 16-bit length value for
    VARCHAR field correcting an undetected type conflict. 

  sql/rpl_utility.h@1.5.1.5, 2007-07-29 14:06:08-04:00, cbell@mysql_cab_desk. +3 -7
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch changes the decoding of the 16-bit length value for
    VARCHAR field correcting an undetected type conflict. 

ChangeSet@1.2482.8.73, 2007-07-28 18:46:21-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
    
  This patch changes the code to comply with different word order on Solaris

  sql/rpl_utility.h@1.5.1.4, 2007-07-28 18:46:18-04:00, cbell@mysql_cab_desk. +5 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
      
    This patch changes the code to comply with different word order on Solaris

ChangeSet@1.2482.8.72, 2007-07-28 11:30:50-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  Patch for PB testing errors.

  sql/rpl_utility.h@1.5.1.3, 2007-07-28 11:30:47-04:00, cbell@mysql_cab_desk. +8 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem detected on 64-bit platforms with BIT and
    VARCHAR fields.

ChangeSet@1.2482.8.71, 2007-07-27 23:11:36-04:00, cbell@mysql_cab_desk. +5 -0
  WL#3915 : (NDB) master's cols > slave
  
  Patch corrects minor test anomolies and build warnings.

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.2, 2007-07-27 23:11:28-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3915 : (NDB) master's cols > slave
    
    Patch masks out the port number in the show slave status results.

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.2, 2007-07-27 23:11:30-04:00, cbell@mysql_cab_desk. +221 -221
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  mysql-test/r/rpl_extraColmaster_innodb.result@1.2, 2007-07-27 23:11:29-04:00, cbell@mysql_cab_desk. +470 -471
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  mysql-test/r/rpl_extraColmaster_myisam.result@1.2, 2007-07-27 23:11:30-04:00, cbell@mysql_cab_desk. +470 -471
    WL#3915 : (NDB) master's cols > slave
    
    New result file from changed test.

  sql/field.cc@1.385.10.3, 2007-07-27 23:11:32-04:00, cbell@mysql_cab_desk. +2 -1
    WL#3915 : (NDB) master's cols > slave
    
    Removed warning for unused parameter. Parameter was include for assertion
    and future changes to string class.

ChangeSet@1.2482.8.70, 2007-07-27 16:58:23-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3915 : (NDB) master's cols > slave
  
  Minor change to fix compile problems on 64-bit.

  sql/field.h@1.226.5.3, 2007-07-27 16:58:19-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3915 : (NDB) master's cols > slave
    
    Minor change to fix compile problems on 64-bit.

ChangeSet@1.1810.3211.1, 2007-07-27 16:26:26-04:00, dkatz@damien-katzs-computer.local +1 -0
  Bug #29419 "Specifying a join_buffer > 4GB on 64 bit machines not possible."
  
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
  
  The test case for this bug is a part of the test suite for bug #5731.

  sql/sql_select.cc@1.312.164.1, 2007-07-27 16:26:22-04:00, dkatz@damien-katzs-computer.local +4 -3
    Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.

ChangeSet@1.2482.117.2, 2007-07-27 14:45:57-04:00, cbell@mysql_cab_desk. +18 -0
  WL#3915 : (NDB) master's cols > slave
  
  Slave starts accepting and handling rows of master's tables which have more columns.
  The most important part of implementation is how to caclulate the amount of bytes to
  skip for unknown by slave column.
  
  To solve that issue this WL adopts results of WL#3228 which introduces an addon to
  table_map event that carries the necessary part of information about sizes of data of columns.
  
  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@stripped, 2007-07-26 21:31:54-04:00, cbell@mysql_cab_desk. +393 -0
  WL#3915  master's cols > slave
  
  basic tests checking altering and skipping extra fields by slave.
  The fields can be of any possible types.

  mysql-test/t/rpl_extraColmaster_innodb-master.opt@1.1, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/t/rpl_extraColmaster_innodb-master.opt@1.0, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_innodb-slave.opt@1.1, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    option for innodb
    

  mysql-test/t/rpl_extraColmaster_innodb-slave.opt@1.0, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_innodb.test@1.1, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +15 -0
    WL#3915  master's cols > slave
    
    Test of innodb. Test runs in both statement- and row-based replication.
    

  mysql-test/t/rpl_extraColmaster_innodb.test@1.0, 2007-07-27 14:45:42-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_extraColmaster_myisam.test@1.1, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of myisam. Test runs in both statement- and row-based replication.
    

  mysql-test/t/rpl_extraColmaster_myisam.test@1.0, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.1, 2007-07-27 14:45:47-04:00, cbell@mysql_cab_desk. +393 -0
    WL#3915  master's cols > slave
    
    basic tests checking altering and skipping extra fields by slave.
    The fields can be of any possible types.
    

  mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test@1.0, 2007-07-27 14:45:47-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.1, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +274 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_row_extraColmaster_ndb.result@1.0, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_row_extraColmaster_ndb.test@1.1, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +12 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in row-based replication.
    

  mysql-test/t/rpl_row_extraColmaster_ndb.test@1.0, 2007-07-27 14:45:43-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_stm_extraColmaster_ndb.result@1.1, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +274 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_stm_extraColmaster_ndb.result@1.0, 2007-07-27 14:45:46-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_stm_extraColmaster_ndb.test@1.1, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +13 -0
    WL#3915  master's cols > slave
    
    Test of ndb. Test runs in statement-based replication.
    

  mysql-test/t/rpl_stm_extraColmaster_ndb.test@1.0, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test@1.7.1.1, 2007-07-27 14:45:37-04:00, cbell@mysql_cab_desk. +0 -63
    WL#3915  master's cols > slave
    
    Changed test to remove checks for error#1523 (more master cols than
    slave). This portion of the test is no longer needed.

  mysql-test/r/rpl_extraColmaster_innodb.result@1.1, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +545 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_extraColmaster_innodb.result@1.0, 2007-07-27 14:45:44-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_extraColmaster_myisam.result@1.1, 2007-07-27 14:45:45-04:00, cbell@mysql_cab_desk. +545 -0
    WL#3915  master's cols > slave
    
    new results
    

  mysql-test/r/rpl_extraColmaster_myisam.result@1.0, 2007-07-27 14:45:45-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/r/rpl_row_tabledefs_2myisam.result@1.11.3.1, 2007-07-27 14:45:37-04:00, cbell@mysql_cab_desk. +0 -192
    WL#3915  master's cols > slave
    
    Corrected results from removal of checks for error#1523 (more master 
    cols than slave). This portion of the test is no longer needed.

  mysql-test/r/rpl_row_tabledefs_3innodb.result@1.8.3.1, 2007-07-27 14:45:38-04:00, cbell@mysql_cab_desk. +0 -192
    WL#3915  master's cols > slave
    
    Corrected results from removal of checks for error#1523 (more master 
    cols than slave). This portion of the test is no longer needed.

  mysql-test/t/disabled.def@1.253.7.1, 2007-07-27 14:45:39-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3915  master's cols > slave
    
    Disabled the rpl_stm_extraColmaster_ndb test because statement-based
    replication is not supported in NDB at this time. It can be enabled
    when statement-based replication for NDB is released.

  sql/log_event.cc@1.278.3.3, 2007-07-27 14:45:40-04:00, cbell@mysql_cab_desk. +6 -13
    WL#3915  master's cols > slave
    
    copying extra (slave's) fields returns early if master's table version is wider;
    removing assert in the way of master > slave cols.

  sql/rpl_record.cc@1.2.1.2, 2007-07-27 14:45:40-04:00, cbell@mysql_cab_desk. +24 -1
    WL#3915  master's cols > slave
    
    adding a snippet that shift exectution curson donw the row skipping unknown by slave
    fields' data.

  sql/rpl_utility.cc@1.5.1.2, 2007-07-27 14:45:41-04:00, cbell@mysql_cab_desk. +0 -15
    WL#3915  master's cols > slave
    
    Remove warning message for master's cols > slave.

ChangeSet@1.2482.118.1, 2007-07-27 14:38:36-04:00, cbell@mysql_cab_desk. +26 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch adds the ability to store extra field metadata in the table
  map event. This data can include pack_length() or field_lenght() for
  fields such as CHAR or VARCHAR enabling developers to add code that
  can check for compatibilty between master and slave columns. More 
  importantly, the extra field metadata can be used to store data from the
  master correctly should a VARCHAR field on the master be <= 255 bytes 
  while the same field on the slave is > 255 bytes. '
  
  The patch also includes the needed changes to unpack to ensure that data
  which is smaller on the master can be unpacked correctly on the slave.

  mysql-test/t/rpl_colSize.test@1.1, 2007-07-27 14:38:31-04:00, cbell@mysql_cab_desk. +216 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new test designed to test the feature of having
    columns on the master that are smaller than what is on the slave. 
    

  mysql-test/t/rpl_colSize.test@1.0, 2007-07-27 14:38:31-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_log.test@1.45.2.1, 2007-07-27 14:38:17-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to display slave status vertically.

  mysql-test/r/rpl_colSize.result@1.1, 2007-07-27 14:38:32-04:00, cbell@mysql_cab_desk. +179 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 
    

  mysql-test/r/rpl_colSize.result@1.0, 2007-07-27 14:38:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/binlog_row_mix_innodb_myisam.test@1.9.3.1, 2007-07-27 14:38:24-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_rbr_to_sbr.result@1.7.3.1, 2007-07-27 14:38:18-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_basic_11bugs.result@1.16.3.1, 2007-07-27 14:38:19-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_create_table.result@1.12.3.1, 2007-07-27 14:38:19-04:00, cbell@mysql_cab_desk. +42 -42
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_flsh_tbls.result@1.5.2.1, 2007-07-27 14:38:20-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_inexist_tbl.result@1.7.3.1, 2007-07-27 14:38:21-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log.result@1.17.3.1, 2007-07-27 14:38:21-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log_innodb.result@1.17.3.1, 2007-07-27 14:38:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_max_relay_size.result@1.9.3.1, 2007-07-27 14:38:22-04:00, cbell@mysql_cab_desk. +10 -10
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_until.result@1.5.2.1, 2007-07-27 14:38:23-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_stm_log.result@1.79.3.1, 2007-07-27 14:38:23-04:00, cbell@mysql_cab_desk. +35 -3
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the rpl_log.test modifications.

  mysql-test/t/rpl_row_create_table.test@1.12.2.1, 2007-07-27 14:38:25-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/t/rpl_row_flsh_tbls.test@1.5.2.1, 2007-07-27 14:38:26-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_ndb_log.result@1.25.3.1, 2007-07-27 14:38:18-04:00, cbell@mysql_cab_desk. +38 -6
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_truncate_7ndb.result@1.10.4.1, 2007-07-27 14:38:24-04:00, cbell@mysql_cab_desk. +32 -32
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  sql/field.cc@1.385.11.1, 2007-07-27 14:38:26-04:00, cbell@mysql_cab_desk. +232 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. If the value is non-zero and less than what the field on the 
    slave is then use the from_length else use the original value from the
    field on the slave.

  sql/field.h@1.226.6.1, 2007-07-27 14:38:27-04:00, cbell@mysql_cab_desk. +31 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. 

  sql/log_event.cc@1.278.4.1, 2007-07-27 14:38:28-04:00, cbell@mysql_cab_desk. +230 -9
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds methods to calculate the field metadata size, prepare
    the field metadata for writing to the binlog, and additions to the
    Table_map_log_event::write_body method to include the field metadata 
    in the table map that is written to the binlog.

  sql/log_event.h@1.149.4.1, 2007-07-27 14:38:28-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds method declarations and variables needed to support
    storing field metadata in the table map that is written to the binlog.

  sql/rpl_record.cc@1.2.2.1, 2007-07-27 14:38:29-04:00, cbell@mysql_cab_desk. +14 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch modifies the unpack_row() method to unpack fields passing in
    the value from the table_def class. This value is the extra field
    metadata stored there from the master.

  sql/rpl_rli.h@1.14.2.1, 2007-07-27 14:38:29-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper function to retrieve the table_def for a given
    table in the RPL_TABLE_LIST structure.

  sql/rpl_utility.cc@1.5.2.1, 2007-07-27 14:38:30-04:00, cbell@mysql_cab_desk. +54 -35
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper method that retrieves the correct size 
    parameter for the field. This method is used to compare the size as
    sent by the master with that on the slave for all types of fields that
    can vary in size and storage requirements. 

  sql/rpl_utility.h@1.5.2.1, 2007-07-27 14:38:30-04:00, cbell@mysql_cab_desk. +120 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the table_def class constructor to pass in the raw
    data read from the table map and extract it into an array of dimension
    size (number of fields). It also adds a method to return the field 
    metadata for any field. The method returns the data stored in the table
    map or 0 if no data was stored for that field. Lastly, a method to return
    the results of field->maybe_null() is included so that the slave can
    determine if a field that is not on the slave is null.

ChangeSet@1.2482.117.1, 2007-07-27 13:58:37-04:00, cbell@mysql_cab_desk. +26 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  This patch adds the ability to store extra field metadata in the table
  map event. This data can include pack_length() or field_lenght() for
  fields such as CHAR or VARCHAR enabling developers to add code that
  can check for compatibilty between master and slave columns. More 
  importantly, the extra field metadata can be used to store data from the
  master correctly should a VARCHAR field on the master be <= 255 bytes 
  while the same field on the slave is > 255 bytes. '
  
  The patch also includes the needed changes to unpack to ensure that data
  which is smaller on the master can be unpacked correctly on the slave.

  mysql-test/r/rpl_colSize.result@1.1, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +179 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 
    

  mysql-test/r/rpl_colSize.result@1.0, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/t/rpl_colSize.test@1.1, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +216 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a new test designed to test the feature of having
    columns on the master that are smaller than what is on the slave. 
    

  mysql-test/t/rpl_colSize.test@1.0, 2007-07-27 13:58:32-04:00, cbell@mysql_cab_desk. +0 -0

  mysql-test/extra/rpl_tests/rpl_log.test@1.45.1.2, 2007-07-27 13:58:18-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to display slave status vertically.

  mysql-test/t/binlog_row_mix_innodb_myisam.test@1.9.2.1, 2007-07-27 13:58:25-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_rbr_to_sbr.result@1.7.2.1, 2007-07-27 13:58:19-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_basic_11bugs.result@1.16.2.1, 2007-07-27 13:58:20-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_create_table.result@1.12.2.1, 2007-07-27 13:58:20-04:00, cbell@mysql_cab_desk. +42 -42
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_flsh_tbls.result@1.5.1.1, 2007-07-27 13:58:21-04:00, cbell@mysql_cab_desk. +2 -2
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_inexist_tbl.result@1.7.2.1, 2007-07-27 13:58:21-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log.result@1.17.2.1, 2007-07-27 13:58:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_log_innodb.result@1.17.2.1, 2007-07-27 13:58:22-04:00, cbell@mysql_cab_desk. +39 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_max_relay_size.result@1.9.2.1, 2007-07-27 13:58:23-04:00, cbell@mysql_cab_desk. +10 -10
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_row_until.result@1.5.1.1, 2007-07-27 13:58:24-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_stm_log.result@1.79.2.1, 2007-07-27 13:58:24-04:00, cbell@mysql_cab_desk. +35 -3
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the rpl_log.test modifications.

  mysql-test/t/rpl_row_create_table.test@1.12.1.1, 2007-07-27 13:58:26-04:00, cbell@mysql_cab_desk. +5 -5
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/t/rpl_row_flsh_tbls.test@1.5.1.1, 2007-07-27 13:58:26-04:00, cbell@mysql_cab_desk. +1 -1
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the test to coincide with changes to binlog
    size of table map event.

  mysql-test/r/rpl_ndb_log.result@1.25.2.1, 2007-07-27 13:58:19-04:00, cbell@mysql_cab_desk. +4 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  mysql-test/r/rpl_truncate_7ndb.result@1.10.3.1, 2007-07-27 13:58:25-04:00, cbell@mysql_cab_desk. +32 -32
    WL#3228 : RBR using different table defs on slave/master
    
    This patch contains a result file for the new test designed to test the 
    feature of having columns on the master that are smaller than what is 
    on the slave. 

  sql/field.cc@1.385.10.1, 2007-07-27 13:58:27-04:00, cbell@mysql_cab_desk. +232 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. If the value is non-zero and less than what the field on the 
    slave is then use the from_length else use the original value from the
    field on the slave.

  sql/field.h@1.226.5.1, 2007-07-27 13:58:28-04:00, cbell@mysql_cab_desk. +31 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch includes updates to the unpack() methods for the variable
    length fields. A new parameter was added (from_length) that is the
    value stored in the field_metadata of the table map from the table_def
    class. 

  sql/log_event.cc@1.278.3.2, 2007-07-27 13:58:28-04:00, cbell@mysql_cab_desk. +230 -9
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds methods to calculate the field metadata size, prepare
    the field metadata for writing to the binlog, and additions to the
    Table_map_log_event::write_body method to include the field metadata 
    in the table map that is written to the binlog.

  sql/log_event.h@1.149.3.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds method declarations and variables needed to support
    storing field metadata in the table map that is written to the binlog.

  sql/rpl_record.cc@1.2.1.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +14 -4
    WL#3228 : RBR using different table defs on slave/master
    
    This patch modifies the unpack_row() method to unpack fields passing in
    the value from the table_def class. This value is the extra field
    metadata stored there from the master.

  sql/rpl_rli.h@1.14.1.1, 2007-07-27 13:58:30-04:00, cbell@mysql_cab_desk. +10 -0
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper function to retrieve the table_def for a given
    table in the RPL_TABLE_LIST structure.

  sql/rpl_utility.cc@1.5.1.1, 2007-07-27 13:58:31-04:00, cbell@mysql_cab_desk. +54 -35
    WL#3228 : RBR using different table defs on slave/master
    
    This patch adds a helper method that retrieves the correct size 
    parameter for the field. This method is used to compare the size as
    sent by the master with that on the slave for all types of fields that
    can vary in size and storage requirements. 

  sql/rpl_utility.h@1.5.1.1, 2007-07-27 13:58:31-04:00, cbell@mysql_cab_desk. +120 -7
    WL#3228 : RBR using different table defs on slave/master
    
    This patch changes the table_def class constructor to pass in the raw
    data read from the table map and extract it into an array of dimension
    size (number of fields). It also adds a method to return the field 
    metadata for any field. The method returns the data stored in the table
    map or 0 if no data was stored for that field. Lastly, a method to return
    the results of field->maybe_null() is included so that the slave can
    determine if a field that is not on the slave is null.

ChangeSet@1.1810.3202.3, 2007-07-27 17:12:53+10:00, stewart@willster.(none) +2 -0
  save the data from mysql.db that we delete (side effect that made read_only fail)

  mysql-test/r/ndb_bug26793.result@1.2, 2007-07-27 17:12:50+10:00, stewart@willster.(none) +4 -0
    save the data from mysql.db that we delete (side effect that made read_only fail)

  mysql-test/t/ndb_bug26793.test@1.2, 2007-07-27 17:12:50+10:00, stewart@willster.(none) +5 -0
    save the data from mysql.db that we delete (side effect that made read_only fail)

ChangeSet@1.2482.8.67, 2007-07-27 15:08:51+10:00, stewart@willster.(none) +1 -0
  point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled

  mysql-test/t/disabled.def@1.253.5.4, 2007-07-27 15:08:46+10:00, stewart@willster.(none) +1 -1
    point to bugs needing to be addressed before rpl_ndb_ctype_ucs2_def can be enabled

ChangeSet@1.1810.3202.2, 2007-07-26 20:25:05+10:00, stewart@flamingspork.com +1 -0
  [PATCH] Bug#26793 I_S query crashes in NDB
  
  If ::exteral_lock hadn't been called, we'd have no NDB object,
  so need to check/get one here.
  
  It looks like sql_show.cc is the only place that does this....
  or at least the other places will be well hidden.
  
  Index: ndb-work/sql/ha_ndbcluster.cc
  ===================================================================

  sql/ha_ndbcluster.cc@1.175.1.139, 2007-07-25 17:33:55+10:00, stewart@flamingspork.com +2 -0
    Bug#26793 I_S query crashes in NDB

ChangeSet@1.1810.3202.1, 2007-07-26 20:24:54+10:00, stewart@flamingspork.com +2 -0
  [PATCH] BUG#26793 test: mysqld crashes in NDB on I_S query
  
  Reduce case and formalise into something we should be
  able to use in mysql-test-run.
  
  Index: ndb-work/mysql-test/t/ndb_bug26793.test
  ===================================================================

  mysql-test/r/ndb_bug26793.result@1.1, 2007-07-26 17:07:57+10:00, stewart@flamingspork.com +9 -0
    BUG#26793 test: mysqld crashes in NDB on I_S query

  mysql-test/r/ndb_bug26793.result@1.0, 2007-07-26 17:07:57+10:00, stewart@flamingspork.com +0 -0

  mysql-test/t/ndb_bug26793.test@1.1, 2007-07-26 17:06:48+10:00, stewart@flamingspork.com +33 -0
    BUG#26793 test: mysqld crashes in NDB on I_S query

  mysql-test/t/ndb_bug26793.test@1.0, 2007-07-26 17:06:48+10:00, stewart@flamingspork.com +0 -0

ChangeSet@1.1810.3199.1, 2007-07-25 14:53:25+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#27683 Incorrect description for ndb_restore --print

  ndb/tools/restore/restore_main.cpp@1.29.18.1, 2007-07-25 14:53:23+08:00, gni@dev3-221.dev.cn.tlan +1 -1
    modify --print explaination of ndb_restore 

ChangeSet@1.2482.8.65, 2007-07-25 07:24:25+02:00, tomas@whalegate.ndb.mysql.com +2 -0
  BUG#30017 log-slave-updates incorrect behavior for cluster
  - let the receiving injector thread decide what to do

  sql/ha_ndbcluster.cc@1.457.1.5, 2007-07-25 07:24:23+02:00, tomas@whalegate.ndb.mysql.com +37 -13
    BUG#30017 log-slave-updates incorrect behavior for cluster
    - let the receiving injector thread decide what to do

  sql/ha_ndbcluster_binlog.cc@1.118.1.4, 2007-07-25 07:24:23+02:00, tomas@whalegate.ndb.mysql.com +13 -0
    BUG#30017 log-slave-updates incorrect behavior for cluster
    - let the receiving injector thread decide what to do

ChangeSet@1.2482.8.64, 2007-07-25 07:22:28+02:00, tomas@whalegate.ndb.mysql.com +1 -0
  wait_until_ready may return greater that 1 since wait time for second node to connect is 0

  storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp@1.4, 2007-07-25 07:22:25+02:00, tomas@whalegate.ndb.mysql.com +1 -1
    wait_until_ready may return greater that 1 since wait time for second node to connect is 0

ChangeSet@1.1810.3197.1, 2007-07-25 09:32:28+08:00, gni@dev3-221.dev.cn.tlan +1 -0
  BUG#28423 cluster to storage engine error code mapping problem

  sql/ha_ndbcluster.cc@1.175.81.5, 2007-07-25 09:32:26+08:00, gni@dev3-221.dev.cn.tlan +2 -2
    make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine error codes that may be caused by multiple cluster error codes

ChangeSet@1.2482.116.1, 2007-07-20 19:43:56+08:00, gni@dev3-221.dev.cn.tlan +8 -0
  BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected.
           add varchar type restoring test from 5.0 backup into 5.1

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +426 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +417 -0
    backup data

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +59 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +59 -0
    meta data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +2 -0
    log data of 5.0 backup

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@1.0, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +0 -0

  mysql-test/r/ndb_restore_compat.result@1.5.1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +6 -0
    add test result for varchar type from 5.0 version backup into 5.1

  mysql-test/t/ndb_restore_compat.test@1.4.1.1, 2007-07-20 19:43:53+08:00, gni@dev3-221.dev.cn.tlan +6 -0
    add test for varchar type restoring from 5.0 backup into 5.1 

ChangeSet@1.2528.31.1, 2007-07-17 15:49:07-05:00, jmiller@mysql.com +4 -0
  Many files:
    Added new test case for dropping column on the end of master table

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@1.4, 2007-07-17 15:48:33-05:00, jmiller@mysql.com +64 -2
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_innodb.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_extraCol_myisam.result@1.5.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

  mysql-test/r/rpl_ndb_extraCol.result@1.6.2.1, 2007-07-17 15:48:59-05:00, jmiller@mysql.com +60 -0
    Added new test case for dropping column on the end of master table

ChangeSet@1.2403.18.79, 2007-07-14 11:48:51+03:00, pekka@clam.ndb.mysql.com +8 -0
  ndb - threads and timings to hugo* pk ops

  storage/ndb/test/include/HugoTransactions.hpp@1.15, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +15 -1
    threads and timings to hugo* pk ops

  storage/ndb/test/include/NDBT_Thread.hpp@1.2, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +226 -0
    threads and timings to hugo* pk ops

  storage/ndb/test/include/NDBT_Thread.hpp@1.1, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /export/space/pekka/ndb/version/my51-dd/storage/ndb/test/include/NDBT_Thread.hpp

  storage/ndb/test/include/NDBT_Thread.hpp@1.0, 2007-07-14 11:24:20+03:00, pekka@clam.ndb.mysql.com +0 -0

  storage/ndb/test/src/HugoTransactions.cpp@1.31.2.1, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +74 -4
    threads and timings to hugo* pk ops

  storage/ndb/test/src/Makefile.am@1.11.1.1, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +1 -1
    threads and timings to hugo* pk ops

  storage/ndb/test/src/NDBT_Thread.cpp@1.2, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +283 -0
    threads and timings to hugo* pk ops

  storage/ndb/test/src/NDBT_Thread.cpp@1.1, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0
    BitKeeper file /export/space/pekka/ndb/version/my51-dd/storage/ndb/test/src/NDBT_Thread.cpp

  storage/ndb/test/src/NDBT_Thread.cpp@1.0, 2007-07-14 11:24:21+03:00, pekka@clam.ndb.mysql.com +0 -0

  storage/ndb/test/tools/hugoPkDelete.cpp@1.11, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +89 -5
    threads and timings to hugo* pk ops

  storage/ndb/test/tools/hugoPkRead.cpp@1.9, 2007-07-14 11:48:06+03:00, pekka@clam.ndb.mysql.com +85 -4
    threads and timings to hugo* pk ops

  storage/ndb/test/tools/hugoPkUpdate.cpp@1.12, 2007-07-14 11:48:07+03:00, pekka@clam.ndb.mysql.com +91 -7
    threads and timings to hugo* pk ops

ChangeSet@1.2482.115.1, 2007-07-05 07:42:12-05:00, jmiller@mysql.com +2 -0
  ndb api test case for bug 29501

  storage/ndb/test/ndbapi/testDict.cpp@1.38, 2007-07-05 07:40:36-05:00, jmiller@mysql.com +255 -0
    Added test for Bug#29501. Tested on both code without patch and code with patch. DN fails on code w/o and passed for code w/. Also includes new helper functions runWaitStarted and DropDDObjects. Along with these helper function I have included a test for DropDDObjects. I did find a case where lgman fails on the restarting DN with corrupt fs error. I will file a new bug report and test case for that.

  storage/ndb/test/run-test/daily-basic-tests.txt@1.92.1.6, 2007-07-05 07:41:16-05:00, jmiller@mysql.com +8 -0
    Added new tests for bug29501

ChangeSet@1.1810.3058.1, 2007-06-13 10:42:21+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#23354 Clear "no start" when nodes restart and add new prompting string when nodes restart

  ndb/src/common/debugger/EventLogger.cpp@1.21.16.1, 2007-06-13 10:42:16+00:00, lzhou@dev3-63.(none) +0 -2
    Remove "no start" from output when nodes restart.

  ndb/src/mgmclient/CommandInterpreter.cpp@1.49.42.1, 2007-06-13 10:42:16+00:00, lzhou@dev3-63.(none) +10 -2
    Add new prompting string when nodes restart.

ChangeSet@1.1810.3029.1, 2007-06-06 17:54:14+03:00, gkodinov@macbook.gmz +3 -0
  Bug #28701:
  Views don't have indexes. So they can't take index hints.
  Added a check and disabled the usage of hints for views.

  mysql-test/r/view.result@1.138.1.68, 2007-06-06 17:54:00+03:00, gkodinov@macbook.gmz +12 -1
    Bug #28701: test case

  mysql-test/t/view.test@1.126.1.61, 2007-06-06 17:54:01+03:00, gkodinov@macbook.gmz +21 -1
    Bug #28701: test case

  sql/sql_view.cc@1.78.23.4, 2007-06-06 17:54:03+03:00, gkodinov@macbook.gmz +9 -0
    Bug #28701: disable usage of hints for views

ChangeSet@1.2469.217.1, 2007-04-24 18:42:46+05:00, holyfoot@mysql.com +1 -0
  bug #27405 (Partitioning InnoDB auto_increment bug)
  InnoDB engine changes internal auto_increment counter only after
  ha_innodb::write_row, so two threads can't simultaneously
  operate between ha_innodb::update_autoincrement and
  ha_innodb::write_row.
  So concurrent execution of ha_partition::write_row prevented

  sql/ha_partition.cc@1.88.1.1, 2007-04-24 18:42:43+05:00, holyfoot@mysql.com +21 -2
    use table_share->mutex to avoid concurrent write_row for AUTO_INCREMENTed table

ChangeSet@1.2469.210.1, 2007-04-23 17:58:33-04:00, cmiller@zippy.cornsilk.net +3 -0
  Contributed patch from Jorge Bernal Ordovs.  CLA#42
  
  Bug#27894: mysqlbinlog formats timestamp wrong in comment
  
  Date stamps lack zero padding, and so are meaningless.
  
  Implement minimum-width zero padding for the percent-escape sequences
  used in the logging code.

  mysql-test/r/mysqlbinlog2.result@1.14, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +26 -0
    Include the long form, so we notice that it may be broken.  Replace
    away specific elements that vary from run to run.

  mysql-test/t/mysqlbinlog2.test@1.16, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +2 -1
    Include the long form, so we notice that it may be broken.  Replace
    away specific elements that vary from run to run.

  mysys/mf_iocache2.c@1.34, 2007-04-23 17:58:31-04:00, cmiller@zippy.cornsilk.net +35 -3
    Implement minimum-width padding for printf-style percent-expressions.

ChangeSet@1.1810.2832.3, 2007-04-12 09:47:45+02:00, mats@capulet.net +1 -0
  Adding build file for Solaris on AMD64

  BUILD/compile-solaris-amd64@1.1, 2007-04-12 09:47:34+02:00, mats@capulet.net +55 -0
    New BitKeeper file ``BUILD/compile-solaris-amd64''

  BUILD/compile-solaris-amd64@1.0, 2007-04-12 09:47:34+02:00, mats@capulet.net +0 -0

ChangeSet@1.2469.13.1, 2007-03-11 22:30:54+04:00, holyfoot@mysql.com +1 -0
  Bug #26527 LOAD DATA INFILE extremely slow with partitioned table
  mysql_load calls hander::start_bulk_insert(0) to prepare caches
  for big inserts. As ha_partition didn't allow these caches
  for underlaying tables, the inserts were much slower

  sql/ha_partition.cc@1.83.1.4, 2007-03-11 22:30:51+04:00, holyfoot@mysql.com +1 -6
    allow using caches for BIG inserts

ChangeSet@1.1810.2430.5, 2006-12-15 11:32:41+01:00, rafal@quant.(none) +1 -0
  BUG#21132 (Slave fails to reconnect on update_slave_list):
  
  The update_slave_list() call is a remainder from attempts to implement failsafe 
  replication. This code is now obsolete and not maintained (see comments in 
  rpl_failsafe.cc). 
  
  Inspecting the code one can see that this function do not interferre with normal 
  slave operation and thus can be safely removed. This will solve the issue 
  reported in the bug (errors on slave reconnection). 
  
  A related issue is to remove unneccessary reconnections done by slave. This is 
  handled in the patch for BUG#20435.

  sql/slave.cc@1.241.12.1, 2006-12-15 11:32:37+01:00, rafal@quant.(none) +1 -1
    Removed call to obsolete function update_slave_list() upon slave's I/O thread 
    reconnect.

ChangeSet@1.1810.1388.1, 2006-02-21 14:55:54+01:00, msvensson@neptunus.(none) +3 -0
  Bug#11589 mysqltest, --ps-protocol, strange output, float/double/real with zerofill
   - Add zerofill in client if real/float/double is bound to string and fetched using binary protocol.

  libmysql/libmysql.c@1.230.4.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +9 -1
    Add zerofill before value if column is created with zerofill 

  mysql-test/r/type_float.result@1.42.3.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +16 -0
    Update test for zerofill

  mysql-test/t/type_float.test@1.27.2.1, 2006-02-21 14:55:50+01:00, msvensson@neptunus.(none) +18 -0
    Add test for zerofill and prepared statments

