ChangeSet@1.2575, 2008-02-04 13:19:29+01:00, mkindahl@dl145h.mysql.com +1 -0
  Updating result file.

  mysql-test/r/rpl_user.result@1.2, 2008-02-04 13:19:20+01:00, mkindahl@dl145h.mysql.com +11 -8
    Result change.

ChangeSet@1.2574, 2008-02-04 12:22:37+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to make rpl_user test pass in pushbuild.

  mysql-test/t/rpl_user.test@1.2, 2008-02-04 12:22:28+01:00, mkindahl@dl145h.mysql.com +9 -3
    Removing redundant reset master and deleting users from master
    and slave without using binary log.

ChangeSet@1.2571.1.1, 2008-02-01 13:11:03-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
  
  This patch adds code to convert the path for LOAD DATA INFILE 
  events to a Unix path which is needed for running mysql client
  on Windows. 

  client/mysqlbinlog.cc@1.141, 2008-02-01 13:10:54-05:00, cbell@mysql_cab_desk. +7 -0
    BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
    
    This patch adds code to convert the path for LOAD DATA INFILE 
    events to a Unix path which is needed for running mysql client
    on Windows. 
    
    The 'd:\x\y\z' path becomes 'd:xyz' when run in the client.

ChangeSet@1.2572, 2008-02-01 17:26:28+01:00, mkindahl@dl145h.mysql.com +2 -0
  Again blanking out some numbers in file names that is dependent
  on the context.

  mysql-test/r/mysqlbinlog.result@1.40, 2008-02-01 17:26:16+01:00, mkindahl@dl145h.mysql.com +8 -8
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.53, 2008-02-01 17:26:21+01:00, mkindahl@dl145h.mysql.com +11 -0
    Blanking out yet some numbers in file names.

ChangeSet@1.2571, 2008-02-01 15:34:34+01:00, mkindahl@dl145h.mysql.com +2 -0
  Fixes to make tests pass in pushbuild.

  mysql-test/r/mysqlbinlog.result@1.39, 2008-02-01 15:34:22+01:00, mkindahl@dl145h.mysql.com +4 -4
    Result file change.

  mysql-test/t/mysqlbinlog.test@1.52, 2008-02-01 15:34:27+01:00, mkindahl@dl145h.mysql.com +1 -0
    Fixing test to not be dependent on the sequence numbers
    for file names generated by mysqlbinlog. 

ChangeSet@1.2570, 2008-02-01 13:18:27+01:00, mkindahl@dl145h.mysql.com +3 -0
  Various fixes to make tests pass on Windows.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.39, 2008-02-01 13:18:09+01:00, mkindahl@dl145h.mysql.com +4 -2
    Result change

  mysql-test/t/binlog_start_comment.test@1.5, 2008-02-01 13:18:15+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding --local-load to mysqlbinlog to prevent it from failing
    on Windows. Also adding --short-form.

  mysql-test/t/mix_innodb_myisam_binlog.test@1.34, 2008-02-01 13:18:20+01:00, mkindahl@dl145h.mysql.com +2 -1
    Extending LIKE pattern to use either \n or \r\n in order to work
    on Windows.

ChangeSet@1.2569, 2008-02-01 10:46:02+01:00, mkindahl@dl145h.mysql.com +1 -0
  Changes to make tests pass on vanilla build.

  mysql-test/t/binlog_start_comment.test@1.4, 2008-02-01 10:45:52+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding --local-infile=1 to enable local infile for mysql client.

ChangeSet@1.2559.17.7, 2008-01-31 12:17:40+01:00, mkindahl@dl145h.mysql.com +4 -0
  Changes to fix tests in pushbuild.

  mysql-test/include/have_local_infile.inc@1.1, 2008-01-31 12:15:03+01:00, mkindahl@dl145h.mysql.com +4 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/include/have_local_infile.inc

  mysql-test/include/have_local_infile.inc@1.0, 2008-01-31 12:15:03+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/r/have_local_infile.require@1.1, 2008-01-31 12:15:04+01:00, mkindahl@dl145h.mysql.com +2 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/r/have_local_infile.require

  mysql-test/r/have_local_infile.require@1.0, 2008-01-31 12:15:04+01:00, mkindahl@dl145h.mysql.com +0 -0

  mysql-test/t/binlog_start_comment.test@1.3, 2008-01-31 12:17:19+01:00, mkindahl@dl145h.mysql.com +4 -2
    Test requires that local_infile is on, so added require for that.

  mysql-test/t/rpl_sp.test@1.18, 2008-01-31 12:17:25+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding missing sync_slave_with_master causing following tests to fail.

ChangeSet@1.2559.17.6, 2008-01-31 07:19:29+01:00, mkindahl@dl145h.mysql.com +1 -0
  Fixes to make code compile on Windows.

  sql/sql_repl.cc@1.167, 2008-01-31 07:19:20+01:00, mkindahl@dl145h.mysql.com +1 -1
    Adding cast to remove compile error on Windows platform.

ChangeSet@1.2559.17.5, 2008-01-30 18:24:28+01:00, mkindahl@dl145h.mysql.com +1 -0
  Disabling rpl_transaction test for non-debug builds.

  mysql-test/t/rpl_transaction.test@1.3, 2008-01-30 18:24:21+01:00, mkindahl@dl145h.mysql.com +1 -0
    Test only works for debug build.

ChangeSet@1.2559.17.4, 2008-01-30 15:58:35+01:00, mkindahl@dl145h.mysql.com +3 -0
  Changes to make tests pass in pushbuild.

  mysql-test/r/bdb_notembedded.result@1.2, 2008-01-30 15:58:17+01:00, mkindahl@dl145h.mysql.com +6 -0
    Result change.

  mysql-test/r/rpl_loaddata_map.result@1.4, 2008-01-30 15:58:22+01:00, mkindahl@dl145h.mysql.com +4 -6
    Result change.

  mysql-test/t/rpl_loaddata_map.test@1.4, 2008-01-30 15:58:27+01:00, mkindahl@dl145h.mysql.com +1 -1
    Blanking out file id as well.

ChangeSet@1.2541.41.13, 2008-01-29 19:21:21+08:00, hezx@mail.hezx.com +1 -0
  update test result

  mysql-test/r/rpl_grant.result@1.3, 2008-01-29 19:21:19+08:00, hezx@mail.hezx.com +2 -2
    update result

ChangeSet@1.2541.107.1, 2008-01-29 11:56:48+08:00, hezx@mail.hezx.com +1 -0
  BUG#26489 Corruption in relay logs
  
  Here is the scenario that causes the failure.(by Mats)
  
  1. The to-be corrupt log event (let's call it X), is split into two
     packets B and C on the network level (net_write_buff()). The parts
     are X = (x',x''). The part x' ends up in packet B and part x''
     ends up in packet C. Prior to the corrupt event X, the event Y has
     been written successfully, but has been split into two packets as
     well, which we call (y',y'').
  2. The master sends packet A = (y'',x') to the slave, increases the
     packet sequence number, the slave receives the packet, but fails
     to reply before the master gets a timeout.
  3. Since the master got a timeout, it reports failure, and aborts
     sending the binary log by exiting mysql_binlog_send(). However, it
     leaves the buffer intact, still holding y'' (but not x', since the
     write_pos is not increased).
  4. After exiting mysql_binlog_send(), the master does a
     disconnection of the client thread, which involves sending an
     error message e to the client (i.e., the slave).
  5. In this case, net_write_buff() is used again, but this time the
     old contents of the packet is used so that the new packet is
     D = (y'',e). Note that this will use a new packet sequence number,
     since the packet number was increased in step 2.
  6. The slave receives the tail y'' of the Y log event, concatenates
     this with x' (which it already received), and writes the event
     (x',y'') it to the relay log since it hasn't noticed anything is
     amiss.
  7. It then tries to read more bytes, which is either e (if the length
     given for X just happened to match the length given for Y, or just
     plain garbage because the slave is out of sync with what is
     actually sent.
  8. After a while, the SQL thread tries to execute the event (x',y''),
     which is very likely to be just nonsense.
  
  The problem can be fixed by not resetting net->error after the call of 
  mysql_binlog_send, so the error message will not be sent and the connection
  will be closed.

  sql/sql_parse.cc@1.641.1.1, 2008-01-29 11:56:46+08:00, hezx@mail.hezx.com +0 -1
    Do not reset net->error, if net->error == 2, we should not try to use the connection again

ChangeSet@1.2567, 2008-01-27 14:28:50-07:00, tsmith@ramayana.hindu.god +2 -0
  Fix test case for Bug #25347 so that it actually tests the code fix,
  and so that it works correctly on Windows.

  mysql-test/r/mysqlcheck.result@1.6, 2008-01-27 14:28:49-07:00, tsmith@ramayana.hindu.god +1 -0
    Flush tables before monkeying around with underlying MyISAM data files

  mysql-test/t/mysqlcheck.test@1.7, 2008-01-27 14:28:49-07:00, tsmith@ramayana.hindu.god +2 -1
    Fix the test case for bug #25347 so that it actually does test the behavior.
    Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
    underlying MyISAM files open while we try to corrupt them on disk.
    
    Flush tables before monkeying around with underlying MyISAM data files;
    --use-frm, so that mysqlcheck will succeed.

ChangeSet@1.2566, 2008-01-25 16:00:15-07:00, tsmith@ramayana.hindu.god +1 -0
  Un-break test case on Windows, for bug #25347

  mysql-test/t/mysqlcheck.test@1.6, 2008-01-25 16:00:11-07:00, tsmith@ramayana.hindu.god +3 -2
    Use --remove_file and --write_file instead of --exec rm and --exec touch.

ChangeSet@1.2541.41.12, 2008-01-25 15:02:26+08:00, hezx@mail.hezx.com +3 -0
  BUG#33862 completely failed DROP USER statement gets replicated
  
  The problem is when create/rename/drop users, the statement was logged regardless of error, even if no data has been changed, the statement was logged.
  
  After this patch, create/rename/drop users don't write the binlog if the statement makes no changes, if the statement does make any changes, log the statement with possible error code.
  
  This patch is based on the patch for BUG#29749, which is not pushed

  mysql-test/r/rpl_user.result@1.1, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +42 -0
    New BitKeeper file ``mysql-test/r/rpl_user.result''

  mysql-test/r/rpl_user.result@1.0, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/t/rpl_user.test@1.1, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +56 -0
    New BitKeeper file ``mysql-test/t/rpl_user.test''

  mysql-test/t/rpl_user.test@1.0, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +0 -0

  sql/sql_acl.cc@1.223.1.3, 2008-01-25 15:02:24+08:00, hezx@mail.hezx.com +17 -7
    when create/rename/drop users, don't write the binlog if the statement make no changes

ChangeSet@1.2559.27.3, 2008-01-23 14:52:40-07:00, malff@lambda.hsd1.co.comcast.net. +1 -0
  manual merge

  mysql-test/r/sp.result@1.247, 2008-01-23 14:52:38-07:00, malff@lambda.hsd1.co.comcast.net. +16 -0
    manual merge

ChangeSet@1.2559.28.1, 2008-01-23 13:26:41-07:00, malff@lambda.hsd1.co.comcast.net. +11 -0
  Bug#33618 (Crash in sp_rcontext)
  Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
  
  The server used to crash when REPEAT or another control instruction
  was used in conjunction with labels and a LEAVE instruction.
  
  The crash was caused by a missing "pop" of handlers or cursors in the
  code representing the stored program. When executing the code in a loop,
  this missing "pop" would result in a stack overflow, corrupting memory.
  
  Code generation has been fixed to produce the missing h_pop/c_pop
  instructions.
  
  Also, the logic checking that labels at the beginning and the end of a
  statement are matched was incorrect, causing Bug 33983.
  End labels, when used, must match the label used at the beginning of a block.

  mysql-test/r/sp-code.result@1.12, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +109 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/r/sp-error.result@1.117, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +48 -0
    Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

  mysql-test/r/sp.result@1.244.1.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +35 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/t/sp-code.test@1.9, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +77 -0
    Bug#33618 (Crash in sp_rcontext)

  mysql-test/t/sp-error.test@1.118, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +63 -0
    Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

  mysql-test/t/sp.test@1.232.1.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +51 -0
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_head.cc@1.256.1.1, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +6 -0
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_head.h@1.102, 2008-01-23 13:26:38-07:00, malff@lambda.hsd1.co.comcast.net. +3 -2
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_rcontext.cc@1.47, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +75 -1
    Bug#33618 (Crash in sp_rcontext)

  sql/sp_rcontext.h@1.37, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +6 -34
    Bug#33618 (Crash in sp_rcontext)

  sql/sql_yacc.yy@1.542.1.1, 2008-01-23 13:26:39-07:00, malff@lambda.hsd1.co.comcast.net. +76 -13
    Bug#33618 (Crash in sp_rcontext)

ChangeSet@1.2563, 2008-01-23 11:37:46-05:00, cmiller@zippy.cornsilk.net +3 -0
  Patch contributed by Jocelyn Fournier.  CLA received 2007-02-27.
  
  Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
  
  mysqlcheck tests nullness of the engine type to know whether the
  "table" is a view or not.  That also falsely catches tables that 
  are severly damaged.
  
  Instead, use SHOW FULL TABLES to test whether a "table" is a view
  or not.
  
  (Don't add new function.  Instead, get original data a smarter way.)
  
  Make it safe for use against databases before when views appeared.

  client/mysqlcheck.c@1.61, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +12 -7
    Use SHOW FULL TABLES to test better whether a name in the table
    list is one of a view.  Checking that the engine is NULL is 
    insufficient.
    
    Implemented suggestion from jimw that involved removing most of 
    original patch and getting data a better way

  mysql-test/r/mysqlcheck.result@1.5, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +10 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

  mysql-test/t/mysqlcheck.test@1.5, 2008-01-23 11:37:44-05:00, cmiller@zippy.cornsilk.net +16 -0
    Verify that tables that have NULL/unreadable engine types are 
    processed and not interpreted as views.

ChangeSet@1.2562, 2008-01-23 11:34:08-05:00, cmiller@zippy.cornsilk.net +2 -0
  Bug#27427: resolveip fails on hostnames with a leading digit
  
  Patch by Kasper Dupont.  No CLA required for this size of patch.
  
  "resolveip" program produces incorrect result if given a hostname
  starting with a digit.  Someone seems to have thought that names 
  can not have digits at the beginning.
  
  Instead, use the resolver library to work out the rules of hostnames, 
  as it will undoubtedly be better at it than we are.

  configure.in@1.467, 2008-01-23 11:34:07-05:00, cmiller@zippy.cornsilk.net +2 -0
    See if we need to a library for address lookups.

  extra/resolveip.c@1.26, 2008-01-23 11:34:07-05:00, cmiller@zippy.cornsilk.net +4 -2
    Don't use silly heuristic to know whether a string is a dotted
    quad.  Instead, pass the whole thing into the resolver and let
    its smarts do all the work.

ChangeSet@1.2559.24.6, 2008-01-20 13:46:55+03:00, kaa@kaamos.(none) +2 -0
  Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
  of cleanups in the test case for bug33794.

  mysql-test/r/subselect.result@1.205, 2008-01-20 13:46:54+03:00, kaa@kaamos.(none) +1 -1
    Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
    of cleanups in the test case for bug33794.

  mysql-test/t/subselect.test@1.163, 2008-01-20 13:46:54+03:00, kaa@kaamos.(none) +2 -1
    Fixed a PushBuild failure of the system_mysql_db test caused by the lack 
    of cleanups in the test case for bug33794.

ChangeSet@1.2559.26.1, 2008-01-18 22:50:36+03:00, sergefp@mysql.com +3 -0
  BUG#33794 "MySQL crashes executing specific query":
  The problem occurred when one had a subquery that had an equality X=Y where 
  Y referred to a named select list expression from the parent select. MySQL 
  crashed when trying to use the X=Y equality for ref-based access. 
  
  Fixed by allowing non-Item_field items in the described case.

  mysql-test/r/subselect.result@1.204, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +48 -0
    BUG#33794 "MySQL crashes executing specific query"
    - Testcase

  mysql-test/t/subselect.test@1.162, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +55 -0
    BUG#33794 "MySQL crashes executing specific query"
    - Testcase

  sql/sql_select.cc@1.550.1.7, 2008-01-18 22:50:30+03:00, sergefp@mysql.com +2 -1
    BUG#33794 "MySQL crashes executing specific query"
    get_store_key() assumed that if it got a reference
      t.key=Item_outer_ref(Item_direct_ref(x)) 
    then x was an Item_field object, which is not the case when one refers to a
    named select list expression out ot subquery.

ChangeSet@1.2521.79.1, 2008-01-14 16:16:36+01:00, mhansson@linux-st28.site +4 -0
  Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result
  
  The ROUND(X, D) function would change the Item::decimals field during
  execution to achieve the effect of a dynamic number of decimal digits.
  This caused a series of bugs:
  Bug #30617:Round() function not working under some circumstances in InnoDB
  Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
  Bug #30889:filesort and order by with float/numeric crashes server
  Fixed by never changing the number of shown digits for DECIMAL when
  used with a nonconstant number of decimal digits.

  mysql-test/r/type_decimal.result@1.43.2.1, 2008-01-14 16:16:00+01:00, mhansson@linux-st28.site +62 -1
    Bug#33143: Test result

  mysql-test/t/type_decimal.test@1.33.2.1, 2008-01-14 16:16:31+01:00, mhansson@linux-st28.site +43 -0
    Bug#33143: Test case

  sql/item_func.cc@1.355.1.3, 2008-01-14 16:16:32+01:00, mhansson@linux-st28.site +6 -6
    Bug#33143: 
    - Moved the DECIMAL_MAX_SCALE limitation to fix_length_and_dec.
    - Removed resetting of Item::decimals field.
    - set the frac field of the output value to current scale.

  strings/decimal.c@1.82, 2008-01-14 16:16:32+01:00, mhansson@linux-st28.site +14 -2
    Bug#33143: It is necessary to set all digits in the buffer following the 
    rounded one to zero, as they may now be displayed.

ChangeSet@1.2521.78.1, 2008-01-11 18:50:54+01:00, mhansson@linux-st28.site +3 -0
  Bug#31797: error while parsing subqueries -- WHERE is parsed as HAVING
  
  The name resolution for correlated subqueries and HAVING clauses
  failed to distinguish which of two was being performed when there 
  was a reference to an outer aliased field.
  Fixed by adding the condition that HAVING clause name resulotion
  is being performed.

  mysql-test/r/group_by.result@1.80.1.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +36 -0
    Bug#31797: Test result

  mysql-test/t/group_by.test@1.65.1.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +48 -0
    Bug#31797: Test case

  sql/item.cc@1.285.2.1, 2008-01-11 18:50:52+01:00, mhansson@linux-st28.site +2 -1
    Bug#31797: 
    Corrected function comment.
    The fix, raising the error is restricted to HAVING name resolution.

ChangeSet@1.2559.24.2, 2008-01-11 20:10:54+03:00, evgen@moonbone.local +3 -0
  Bug#29477: Not all fields of the target table were checked to have a default
  value when inserting into a view.
  
  The mysql_prepare_insert function checks all fields of the target table that
  directly or indirectly (through a view) are specified in the INSERT
  statement to have a default value. This check can be skipped if the INSERT
  statement doesn't mention any insert fields. In case of a view this allows
  fields that aren't mentioned in the view to bypass the check.
  
  Now fields of the target table are always checked to have a default value
  when insert goes into a view.

  mysql-test/r/view.result@1.210, 2008-01-11 19:54:26+03:00, evgen@moonbone.local +16 -0
    Added a test case for the bug#29477: Not all fields of the target table were 
    checked to have a default value when inserting into a view.

  mysql-test/t/view.test@1.191, 2008-01-11 19:54:15+03:00, evgen@moonbone.local +14 -0
    Added a test case for the bug#29477: Not all fields of the target table were 
    checked to have a default value when inserting into a view.

  sql/sql_insert.cc@1.256, 2008-01-11 20:03:15+03:00, evgen@moonbone.local +2 -1
    Bug#29477: Not all fields of the target table were checked to have a default
    value when inserting into a view.
    Now fields of the target table are always checked to have a default value
    when insert goes into a view.

ChangeSet@1.2559.21.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.126, 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.2541.106.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.65, 2008-01-09 16:49:11+02:00, gkodinov@macbook.gmz +12 -0
    Bug #33133: test case

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

  sql/sql_base.cc@1.396.1.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.2559.21.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.203, 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.161, 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.125, 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.2559.17.2, 2008-01-08 22:22:40+01:00, mats@unknown.kindahl.net +3 -0
  Post-merge fixes to make tests pass.

  mysql-test/r/blackhole.result@1.12.1.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +2 -2
    Result change.

  mysql-test/r/mysqlbinlog2.result@1.11.1.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +226 -113
    Result change.

  mysql-test/t/blackhole.test@1.12.1.1, 2008-01-08 22:22:37+01:00, mats@unknown.kindahl.net +1 -0
    Fixing test to ignore file_id for exec_load_file events.

ChangeSet@1.2559.22.1, 2008-01-08 18:43:25-02:00, davi@mysql.com +2 -0
  Bug#29770 Two handlers are allowed to catch an error in an stored procedure.
  
  Add test case.

  mysql-test/r/sp.result@1.245, 2008-01-08 18:43:24-02:00, davi@mysql.com +16 -0
    Add test case result for Bug#29770

  mysql-test/t/sp.test@1.233, 2008-01-08 18:43:24-02:00, davi@mysql.com +24 -0
    Add test case for Bug#29770

ChangeSet@1.2541.41.11, 2008-01-06 20:16:28+08:00, hezx@mail.hezx.com +1 -0
  Replace one overlooked return with DBUG_RETURN in function log_loaded_block

  sql/sql_repl.cc@1.166, 2008-01-06 20:16:25+08:00, hezx@mail.hezx.com +1 -1
    Replace one overlooked return with DBUG_RETURN in function log_loaded_block

ChangeSet@1.2541.105.1, 2008-01-06 15:27:42+08:00, hezx@mail.hezx.com +5 -0
  Fixed some test case after push of BUG#32205

  mysql-test/r/binlog_start_comment.result@1.3, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -0
    Drop tables used in the test case when done

  mysql-test/r/blackhole.result@1.13, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +2 -2
    Mask out file_id in show binlog events output

  mysql-test/r/case.result@1.28.1.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -1
    Drop table t2 too if it exists at the start of the test

  mysql-test/t/blackhole.test@1.13, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -0
    Mask out file_id in show binlog events output

  mysql-test/t/case.test@1.21.1.1, 2008-01-06 15:27:40+08:00, hezx@mail.hezx.com +1 -1
    Drop table t2 too if it exists at the start of the test

ChangeSet@1.2541.104.1, 2008-01-06 15:17:47+08:00, hezx@mail.hezx.com +1 -0
  Add missing include test file for rpl_server_id test

  mysql-test/include/show_binlog_events2.inc@1.1, 2008-01-06 15:17:45+08:00, hezx@mail.hezx.com +5 -0
    New BitKeeper file ``mysql-test/include/show_binlog_events2.inc''

  mysql-test/include/show_binlog_events2.inc@1.0, 2008-01-06 15:17:45+08:00, hezx@mail.hezx.com +0 -0

ChangeSet@1.2559.14.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.12, 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.14, 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.2541.100.5, 2007-12-23 11:18:46+02:00, aelkin@koti.dsl.inet.fi +4 -0
  bug#30435
  
  changes due to non-determinism in value of read_buffer_size.

  mysql-test/r/rpl_loaddata_map.result@1.3, 2007-12-23 11:18:42+02:00, aelkin@koti.dsl.inet.fi +3 -6
    results changed

  mysql-test/std_data/bug30435_10k_items.txt@1.1, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +10000 -0
    data for bug#30435 regression testing

  mysql-test/std_data/bug30435_10k_items.txt@1.0, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/std_data/bug30435_5k.txt@1.1, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +5000 -0
    data for bug#30435 regression testing

  mysql-test/std_data/bug30435_5k.txt@1.0, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map.test@1.3, 2007-12-23 11:18:43+02:00, aelkin@koti.dsl.inet.fi +1 -2
    showing only the fact that the buffer size is larger than the packet size.

ChangeSet@1.2541.100.4, 2007-12-22 19:59:47+02:00, aelkin@koti.dsl.inet.fi +2 -0
  bug#30435
  
  refining the test after it failed on pb.

  mysql-test/r/rpl_loaddata_map.result@1.2, 2007-12-22 19:59:39+02:00, aelkin@koti.dsl.inet.fi +2 -2
    results changed

  mysql-test/t/rpl_loaddata_map.test@1.2, 2007-12-22 19:59:39+02:00, aelkin@koti.dsl.inet.fi +2 -0
    refining the test

ChangeSet@1.2541.103.1, 2007-12-21 22:34:43+02:00, aelkin@koti.dsl.inet.fi +6 -0
  BUG#30435 loading large LOAD DATA INFILE breaks slave with 
            read_buffer_size set on master
  BUG#33413 show binlog events fails if binlog has event size of close
            to max_allowed_packet
  
  
  The size of Append_block replication event was determined solely by
  read_buffer_size whereas the rest of replication code deals with
  max_allowed_packet.
  When the former parameter was set to larger than the latter there were
  two artifacts: the master could not read events from binlog;
  show master events did not show.
  
  Fixed with 
  - fragmenting the used io-cached buffer into pieces each size of less
    than max_allowed_packet (bug#30435)
  - incrementing show-binlog-events handling thread's max_allowed_packet
    with the max estimated for the replication header size

  include/my_sys.h@1.198.3.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +6 -0
    accessor-macros added in order not to mess with the io cache's implementation
    details in code that merely exploits the io-cache.

  mysql-test/r/rpl_loaddata_map.result@1.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +31 -0
    New BitKeeper file ``mysql-test/r/rpl_loaddata_map.result''

  mysql-test/r/rpl_loaddata_map.result@1.0, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map-master.opt@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +1 -0
    specific options to trigger  BUG#30435,  BUG#33413 situations

  mysql-test/t/rpl_loaddata_map-master.opt@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map-slave.opt@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +1 -0
    max_allowed_packet to be compatible with the master's version.

  mysql-test/t/rpl_loaddata_map-slave.opt@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  mysql-test/t/rpl_loaddata_map.test@1.1, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +51 -0
    regression tests for two bugs.

  mysql-test/t/rpl_loaddata_map.test@1.0, 2007-12-21 22:34:41+02:00, aelkin@koti.dsl.inet.fi +0 -0

  sql/sql_repl.cc@1.163.1.1, 2007-12-21 22:34:40+02:00, aelkin@koti.dsl.inet.fi +44 -25
    BUG#33413: incrementing thd->variables.max_allowed_packet with 
    the max estimation for the replication header size (from bug#19402);
    refactoring log_loaded_block() to fragment the io_cache buffer in case
     read_buffer_size > max_allowed_packet.

ChangeSet@1.2541.102.1, 2007-12-21 20:30:23+01:00, sven@riska.(none) +10 -0
  BUG#26395: if crash during autocommit update to transactional table on master, slave fails
  Now, every transaction (including autocommit transactions) start with
  a BEGIN and end with a COMMIT/ROLLBACK in the binlog.
  Added a test case, and updated lots of test case result files.

  mysql-test/r/mix_innodb_myisam_binlog.result@1.38, 2007-12-21 20:30:22+01:00, sven@riska.(none) +44 -37
    Updated result file

  mysql-test/r/multi_update.result@1.48, 2007-12-21 20:30:22+01:00, sven@riska.(none) +2 -2
    Updated result file

  mysql-test/r/rpl_transaction.result@1.2, 2007-12-21 20:30:22+01:00, sven@riska.(none) +4 -4
    New result file for new test case.

  mysql-test/r/rpl_transaction.result@1.1, 2007-12-21 20:07:12+01:00, sven@riska.(none) +95 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/r/rpl_transaction.result

  mysql-test/r/rpl_transaction.result@1.0, 2007-12-21 20:07:12+01:00, sven@riska.(none) +0 -0

  mysql-test/r/sp_trans_log.result@1.4, 2007-12-21 20:30:22+01:00, sven@riska.(none) +1 -0
    Updated result file

  mysql-test/r/variables-big.result@1.2, 2007-12-21 20:30:22+01:00, sven@riska.(none) +9 -5
    Updated result file

  mysql-test/t/rpl_transaction-master.opt@1.1, 2007-12-21 20:25:03+01:00, sven@riska.(none) +1 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-master.opt

  mysql-test/t/rpl_transaction-master.opt@1.0, 2007-12-21 20:25:03+01:00, sven@riska.(none) +0 -0

  mysql-test/t/rpl_transaction-slave.opt@1.1, 2007-12-21 20:25:03+01:00, sven@riska.(none) +1 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-slave.opt

  mysql-test/t/rpl_transaction-slave.opt@1.0, 2007-12-21 20:25:03+01:00, sven@riska.(none) +0 -0

  mysql-test/t/rpl_transaction.test@1.2, 2007-12-21 20:30:22+01:00, sven@riska.(none) +3 -1
    New test case.

  mysql-test/t/rpl_transaction.test@1.1, 2007-12-21 20:07:12+01:00, sven@riska.(none) +104 -0
    BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction.test

  mysql-test/t/rpl_transaction.test@1.0, 2007-12-21 20:07:12+01:00, sven@riska.(none) +0 -0

  sql/log.cc@1.221.1.1, 2007-12-21 20:30:22+01:00, sven@riska.(none) +71 -29
     - Always write BEGIN and COMMIT around statements, even in autocommit
       mode.
     - Added comments for binlog_commit and binlog_rollback.

  sql/log_event.cc@1.245, 2007-12-21 20:30:22+01:00, sven@riska.(none) +1 -0
    Added debug trigger to avoid writing xid events to the binlog.

ChangeSet@1.2559.19.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.49, 2007-12-21 12:44:21+02:00, gkodinov@macbook.gmz +0 -4
    Bug #33256: removed redundant warnings

  sql/field.h@1.213.1.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.296, 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.218, 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.151.3.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.79.1.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.2559.18.4, 2007-12-21 11:28:34+01:00, serg@janus.mylan +1 -0
  cast corrected

  sql/set_var.cc@1.193.3.3, 2007-12-21 11:28:31+01:00, serg@janus.mylan +2 -2
    typo :(

ChangeSet@1.2559.18.3, 2007-12-21 10:31:47+01:00, serg@janus.mylan +1 -0
  warning on windows

  sql/set_var.cc@1.193.3.2, 2007-12-21 10:31:44+01:00, serg@janus.mylan +2 -2
    warning on windows

ChangeSet@1.2541.101.1, 2007-12-21 10:13:54+02:00, aelkin@koti.dsl.inet.fi +1 -0
  Bug #31359  change_master sets group_master_log_pos twice, 
              ignores future_group_master_log_p
  
  There was a redundant assignement. However, that's the only artifact.
  Wrt to future_group_master_log_position, there is no issue.
  The counter is supposed to be set at Log_event::exec_event().
  It's used only by Innodb for recovery purposes.

  sql/sql_repl.cc@1.164, 2007-12-21 10:13:51+02:00, aelkin@koti.dsl.inet.fi +1 -3
    removing a redundant line which arrived with the revision 1.102.1.7.

ChangeSet@1.2541.99.1, 2007-12-21 11:02:48+08:00, hezx@mail.hezx.com +3 -0
  BUG#28908 Replication: set global server_id is not setting the session server_id 
  
  When set the server-id dynamically, the server_id member of current thread is not updated.
  
  Update the server_id member of current thread after updated the global variable value.

  mysql-test/r/rpl_server_id.result@1.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +34 -0
    Add test for BUG#28908

  mysql-test/r/rpl_server_id.result@1.0, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +0 -0

  mysql-test/t/rpl_server_id.test@1.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +29 -0
    Add test for BUG#28908

  mysql-test/t/rpl_server_id.test@1.0, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +0 -0

  sql/set_var.cc@1.192.1.1, 2007-12-21 11:02:44+08:00, hezx@mail.hezx.com +1 -0
    Update server_id of current thread

ChangeSet@1.2559.20.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.244.1.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.2541.98.1, 2007-12-20 16:07:54+01:00, mats@capulet.kindahl.net +3 -0
  BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
  
  Complementary patch since LOAD DATA INFILE was not covered in
  the previous patch.
  
  This patch adds a check so that the slave skip counter is not
  decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT,
  APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot
  end a group. The group is terminated by an EXECUTE_LOAD_QUERY_
  EVENT or DELETE_FILE_EVENT.

  mysql-test/r/rpl_slave_skip.result@1.2, 2007-12-20 16:07:51+01:00, mats@capulet.kindahl.net +101 -3
    Result change.

  mysql-test/t/rpl_slave_skip.test@1.2, 2007-12-20 16:07:51+01:00, mats@capulet.kindahl.net +166 -3
    Adding tests to test that the first event of a LOAD DATA INFILE
    can be skipped safely for both transactional and non-transactional
    tables. Also include a case that will generate a DELETE_FILE event
    last in the group, and this should be properly skipped as well.

  sql/slave.cc@1.304, 2007-12-20 16:07:52+01:00, mats@capulet.kindahl.net +4 -1
    Not decrementing slave skip counter to zero when seeing a
    BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT
    since these cannot end a group.

ChangeSet@1.2521.75.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.545.8.2, 2007-12-20 10:58:19+01:00, mhansson@linux-st28.site +1 -1
    Bug#32848: Warnings elimination

ChangeSet@1.2559.18.1, 2007-12-19 21:31:04+01:00, serg@janus.mylan +3 -0
  correct invalid values in SET GLOBAL var=DEFAULT
  bug#33382

  mysql-test/r/variables.result@1.97, 2007-12-19 21:31:00+01:00, serg@janus.mylan +1 -1
    typo in a test case

  mysql-test/t/variables.test@1.75, 2007-12-19 21:31:01+01:00, serg@janus.mylan +1 -1
    typo in a test case

  sql/set_var.cc@1.193.3.1, 2007-12-19 21:31:01+01:00, serg@janus.mylan +19 -7
    correct invalid values in SET GLOBAL var=DEFAULT

ChangeSet@1.2541.41.7, 2007-12-18 15:43:51+08:00, hezx@hezx.(none) +3 -0
  Fixed some test case for BUG#32205

  mysql-test/r/binlog_start_comment.result@1.2, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +1 -0
    update result

  mysql-test/r/mysqlbinlog2.result@1.12, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +226 -113
    Update result for BUG#32205

  mysql-test/t/binlog_start_comment.test@1.2, 2007-12-18 15:43:48+08:00, hezx@hezx.(none) +7 -1
    Reset master at the start of test, use a file instead of a pipe, do clean up

ChangeSet@1.2559.16.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.12, 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.11, 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.3120.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.2541.41.6, 2007-12-15 19:50:23+08:00, hezx@hezx.(none) +10 -0
  BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
  
  The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
  output with a delimeter appended right after it, if the query string ends with a '--'
  comment, then the delimeter would be considered as part of the comment, if there are any
  statements after this query, then it will cause a syntax error.
  
  Start a newline before appending delimiter after a query string

  mysql-test/r/binlog_start_comment.result@1.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +13 -0
    Add test for BUG#32205

  mysql-test/r/binlog_start_comment.result@1.0, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/r/ctype_ucs_binlog.result@1.9, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +2 -1
    Update test result for BUG#32205

  mysql-test/r/mix_innodb_myisam_binlog.result@1.37, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +2 -2
    Update test result for BUG#32205

  mysql-test/r/mysqlbinlog.result@1.38, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +72 -36
    Update test result for BUG#32205

  mysql-test/r/rpl_charset.result@1.24, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +46 -23
    Update test result for BUG#32205

  mysql-test/r/rpl_timezone.result@1.18, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +12 -6
    Update test result for BUG#32205

  mysql-test/r/user_var-binlog.result@1.8, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +4 -2
    Update test result for BUG#32205

  mysql-test/t/binlog_start_comment.test@1.1, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +16 -0
    Add test for BUG#32205

  mysql-test/t/binlog_start_comment.test@1.0, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +0 -0

  mysql-test/t/mix_innodb_myisam_binlog.test@1.33, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +1 -1
    Fixed for BUG#32205

  sql/log_event.cc@1.244, 2007-12-15 19:50:21+08:00, hezx@hezx.(none) +3 -3
    Start a newline before appending delimiter after a query string

ChangeSet@1.2559.13.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.91.2.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.99.2.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.543, 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.2559.8.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.466, 2007-12-14 16:58:00+01:00, kent@mysql.com +2 -2
    Raise version number after cloning 5.0.54

ChangeSet@1.2541.87.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.46, 2007-12-14 15:42:40+00:00, jperkin@chorlton.adsl.perkin.org.uk +1 -2
    Rationalise setting $FROM.

ChangeSet@1.2521.77.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.71.1.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.58.1.1, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +43 -0
    Bug#32798: Test case

  sql/item_sum.cc@1.214.1.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.114, 2007-12-14 12:24:18+01:00, mhansson@linux-st28.site +18 -10
    Bug#32798: Declarations and comments.

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

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

ChangeSet@1.2559.11.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.252.2.1, 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.2559.10.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.48, 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.117, 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.2559.1.18, 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.29, 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.2521.76.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.91.1.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.99.1.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +59 -0
    Bug#32858: Test case

  sql/sql_class.cc@1.277.2.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.346.3.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.534.4.1, 2007-12-13 11:19:03+01:00, mhansson@linux-st28.site +16 -9
    Bug#32858: The fix.

ChangeSet@1.2521.75.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.92, 2007-12-11 20:14:59+01:00, mhansson@linux-st28.site +24 -0
    Bug#32848: Test result

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

  sql/field.cc@1.361.2.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.210.1.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.285.1.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.545.8.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.2559.1.16, 2007-12-11 11:41:19+01:00, tomas@whalegate.ndb.mysql.com +2 -0
  remoce compiler warnings

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

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

ChangeSet@1.2541.88.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.52.1.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.20.2.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.37.2.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.18.2.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.364.2.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.211.1.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.149.2.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.78.1.1, 2007-12-11 10:12:04+01:00, tnurnberg@mysql.com +1 -0
    Add get_time() declaration to DATE-cast object.

ChangeSet@1.2541.29.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.108.1.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.2541.96.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.6, 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.6, 2007-12-10 16:16:20+01:00, thek@adventure.(none) +0 -1
    Removing non deterministic test results from test.

ChangeSet@1.2541.95.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.86, 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.73, 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.151.2.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.2541.78.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.5, 2007-12-07 15:39:40+01:00, thek@adventure.(none) +31 -0
    Updated result file

  mysql-test/t/read_only.test@1.5, 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.637.1.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.2469.1.28, 2007-12-07 14:03:54+01:00, mskold@mysql.com +1 -0
  Removed illegal cast

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

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

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

ChangeSet@1.2469.1.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

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@1.116, 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.62, 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

  sql/ha_ndbcluster.cc@1.317.1.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

ChangeSet@1.2469.1.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.10, 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.22, 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.14, 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

  ndb/include/kernel/signaldata/TcKeyRef.hpp@1.3, 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.4, 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.60, 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.47, 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.115, 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.43, 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.25, 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.61, 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.59, 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

  sql/ha_ndbcluster.cc@1.317.1.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

ChangeSet@1.1616.3120.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.1.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.2541.92.1, 2007-12-05 12:26:21+04:00, bar@mysql.com +1 -0
  sql_string.cc:
    Fixing a wrong comment.

  sql/sql_string.cc@1.99.1.1, 2007-12-05 12:26:10+04:00, bar@mysql.com +2 -2
    Fixing a wrong comment.

ChangeSet@1.2541.87.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.45, 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.2541.41.4, 2007-12-03 13:11:40+08:00, hezx@hezx.(none) +3 -0
  Bug#30998 Drop View breaks replication if view does not exist
    
  When executing drop view statement on the master, the statement is written
  into bin-log without checking for possible errors, so the statement would 
  always be bin-logged with error code cleared even if some error might occur, 
  for example, some of the views being dropped does not exist. This would cause 
  failure on the slave.
  
  Writing bin-log after check for errors, if at least one view has been dropped
  the query is bin-logged possible with an error.

  mysql-test/r/rpl_drop_view.result@1.1, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +27 -0
    Add test result for bug#30998

  mysql-test/r/rpl_drop_view.result@1.0, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +0 -0

  mysql-test/t/rpl_drop_view.test@1.1, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +31 -0
    Add test for bug#30998

  mysql-test/t/rpl_drop_view.test@1.0, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +0 -0

  sql/sql_view.cc@1.120, 2007-12-03 13:11:31+08:00, hezx@hezx.(none) +19 -13
    Writing bin-log after check for errors, if at least one view has been dropped
    the query is bin-logged possible with an error.

ChangeSet@1.2521.70.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.240.3.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.135.1.1, 2007-11-26 09:13:22+01:00, tnurnberg@mysql.com +1 -1
    off-by-one buffer-size.

ChangeSet@1.1616.3120.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.2541.15.5, 2007-11-10 11:03:07+01:00, mats@capulet.net +4 -0
  Adding build scripts for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64@1.2, 2007-11-10 11:03:04+01:00, mats@capulet.net +8 -53
    Changing build script to be in line with the other build scripts
    using GCC.

  BUILD/compile-solaris-amd64-debug@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +10 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-debug@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

  BUILD/compile-solaris-amd64-forte@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +52 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-forte@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

  BUILD/compile-solaris-amd64-forte-debug@1.1, 2007-11-10 11:03:04+01:00, mats@capulet.net +54 -0
    Adding build script for Solaris 10 on AMD64.

  BUILD/compile-solaris-amd64-forte-debug@1.0, 2007-11-10 11:03:04+01:00, mats@capulet.net +0 -0

ChangeSet@1.2469.8.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.31, 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.21, 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.74, 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.33, 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.57, 2007-11-07 20:57:19+01:00, jonas@perch.ndb.mysql.com +4 -0
    testcase

ChangeSet@1.2469.1.23, 2007-11-06 10:28:11+01:00, mskold@mysql.com +1 -0
  Removed compiler warnings

  sql/ha_ndbcluster.cc@1.317.1.5, 2007-11-06 10:28:04+01:00, mskold@mysql.com +6 -7
    Removed compiler warnings

ChangeSet@1.2469.1.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.13, 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.15, 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.317.1.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.118, 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.609.7.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.2469.8.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.39, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +24 -0
    new testcase

  mysql-test/t/ndb_basic.test@1.41, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +20 -2
    new testcase

  ndb/src/ndbapi/NdbOperationDefine.cpp@1.24.1.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.30, 2007-10-26 08:42:31+02:00, jonas@perch.ndb.mysql.com +23 -7
    pad varsize keys

ChangeSet@1.1616.2862.2, 2006-11-10 12:13:52-07:00, tsmith@siva.hindu.god +13 -0
  Backport patch of bugfix for:
  - Bug #15815: Very poor performance with multiple queries running concurrently
  - Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
  
  This is a patch from an e-mail; it is not included (yet) in an InnoDB snapshot.

  innobase/buf/buf0buf.c@1.38.1.3, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +115 -56
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/buf/buf0flu.c@1.25.1.2, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +67 -29
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/buf/buf0lru.c@1.19.1.3, 2006-11-10 12:13:49-07:00, tsmith@siva.hindu.god +24 -1
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/buf0buf.h@1.23.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +28 -12
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/buf0buf.ic@1.17.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +12 -7
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0arr.h@1.7.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +4 -9
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0rw.h@1.8.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +1 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0rw.ic@1.9.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +4 -2
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/include/sync0sync.h@1.16.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +1 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/os/os0sync.c@1.24.1.2, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +52 -3
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0arr.c@1.20.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +41 -78
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0rw.c@1.16.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +2 -0
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

  innobase/sync/sync0sync.c@1.29.1.1, 2006-11-10 12:13:50-07:00, tsmith@siva.hindu.god +6 -2
    branches/5.0: Merge r999 from trunk:
    
    Reduce buffer pool mutex contention under >= 4 big concurrent
    CPU-bound SELECT queries.  (Bug #22868)
    
    Fix: replace the mutex by one mutex protecting the 'flush list'
    (and the free list) and several mutexes protecting portions of the
    buffer pool, where we keep several indivudual LRU lists of pages.
    
    This patch is from Sunny Bains and Heikki Tuuri.

