------------------------------------------------------------
revno: 3595
tags: clone-5.1.59-build
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-5.1-security
timestamp: Wed 2011-08-10 14:56:14 +0300
message:
  Bug#12626794 61240: UNUSED FUNCTIONS ...
------------------------------------------------------------
revno: 3594 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-5.1-security
timestamp: Wed 2011-08-10 14:24:22 +0300
message:
  Merge mysql-5.1 to mysql-5.1-security.
    ------------------------------------------------------------
    revno: 3560.1.21
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.1
    timestamp: Wed 2011-08-10 12:25:24 +0300
    message:
      Bug#12835650 VARCHAR maximum length performance impact
      
      row_sel_field_store_in_mysql_format(): Do not pad the unused part of
      the buffer reserved for a True VARCHAR column (introduced in 5.0.3).
      Add Valgrind instrumentation ensuring that the unused part will be
      flagged uninitialized.
      
      row_sel_copy_cached_field_for_mysql(): New function: Copy a field
      that is in the MySQL row format, not copying the unused tail of
      VARCHAR columns.
      
      row_sel_pop_cached_row_for_mysql(): Invoke
      row_sel_copy_cached_field_for_mysql() for copying fields.
      When the row is long, copy it field-by-field.
      
      rb:715 approved by Inaam Rana
------------------------------------------------------------
revno: 3593 [merge]
committer: Ramil Kalimullin <ramil@mysql.com>
branch nick: mysql-5.1-security
timestamp: Tue 2011-08-09 11:42:07 +0400
message:
  Manual merge from mysql-5.1.
    ------------------------------------------------------------
    revno: 3560.1.20
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.1
    timestamp: Mon 2011-08-08 11:22:18 +0300
    message:
      Bug#12770537 I_S.TABLES.DATA_LENGTH does not show on-disk size
      for compressed InnoDB tables
      
      ha_innodb::info_low(): For calculating data_length or index_length,
      use the compressed page size for compressed tables instead of UNIV_PAGE_SIZE.
      
      rb:714 approved by Sunny Bains
    ------------------------------------------------------------
    revno: 3560.1.19
    committer: Sergey Glukhov <sergey.glukhov@oracle.com>
    branch nick: mysql-5.1
    timestamp: Tue 2011-08-02 11:33:45 +0400
    message:
      Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUNCTION IN WHERE C
      There is an optimization of DISTINCT in JOIN::optimize()
      which depends on THD::used_tables value. Each SELECT statement
      inside SP resets used_tables value(see mysql_select()) and it
      leads to wrong result. The fix is to replace THD::used_tables
      with LEX::used_tables.
    ------------------------------------------------------------
    revno: 3560.1.18
    committer: Sven Sandberg <sven.sandberg@oracle.com>
    branch nick: 5.1
    timestamp: Wed 2011-07-27 12:35:44 +0200
    message:
      Updated default.experimental; now rpl tests are up to date as of 2011-07-25.
    ------------------------------------------------------------
    revno: 3560.1.17
    committer: Sergey Glukhov <sergey.glukhov@oracle.com>
    branch nick: mysql-5.1
    timestamp: Wed 2011-07-27 12:34:25 +0400
    message:
      Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0,
      The problem is that TIME_FUZZY_DATE is explicitly used for get_arg0_date()
      function in Item_date_typecast::get_date method. The fix is to use real
      fuzzy_date value.
    ------------------------------------------------------------
    revno: 3560.1.16 [merge]
    committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
    branch nick: mysql-5.1
    timestamp: Fri 2011-07-22 11:46:45 +0400
    message:
      Manual merge from mysql-5.0.
        ------------------------------------------------------------
        revno: 1810.4001.6
        committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
        branch nick: mysql-5.0
        timestamp: Fri 2011-07-22 11:45:15 +0400
        message:
          For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT
          TOOLS
          
          Backport a fix for Bug 57094 from 5.5.
          The following revision was backported:
          
          # revision-id: alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c
          # parent: bar@mysql.com-20101006121559-am1e05ykeicwnx48
          # committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
          # branch nick: mysql-5.5-bugteam-bug57094
          # timestamp: Wed 2010-10-06 19:06:13 +0400
          # message:
          #   Fix for Bug 57094 (Copyright notice incorrect?).
          #   
          #   The fix is to:
          #     - introduce ORACLE_WELCOME_COPYRIGHT_NOTICE define to have a single place
          #       to specify copyright notice;
          #     - replace custom copyright notices with ORACLE_WELCOME_COPYRIGHT_NOTICE
          #       in programs.
    ------------------------------------------------------------
    revno: 3560.1.15
    committer: Inaam Rana <inaam.rana@oracle.com>
    branch nick: rnd_ra
    timestamp: Tue 2011-07-19 10:37:37 -0400
    message:
      Bug 12356373 - PERFORMANCE REGRESSION FROM 5.1 TO 5.5 : GROUP BY:
      
      The title of the bug is a little confusing. The actual fix is to
      reintroduce random readahead inside InnoDB with a dynamic, global
      switch innodb_random_read_ahead [default = off].
      
      Approved by: Sunny Bains
      rb://696
    ------------------------------------------------------------
    revno: 3560.1.14 [merge]
    committer: Bjorn Munch <bjorn.munch@oracle.com>
    branch nick: merge-51
    timestamp: Mon 2011-07-18 11:01:31 +0200
    message:
      merge from 5.1-mtr
        ------------------------------------------------------------
        revno: 2728.17.235 [merge]
        committer: Bjorn Munch <bjorn.munch@oracle.com>
        branch nick: merge-51
        timestamp: Fri 2011-07-15 17:10:05 +0200
        message:
          merge from 5.1 main
        ------------------------------------------------------------
        revno: 2728.17.234 [merge]
        committer: Bjorn Munch <bjorn.munch@oracle.com>
        branch nick: merge-51
        timestamp: Mon 2011-07-04 11:17:43 +0200
        message:
          merge from 5.1 main
        ------------------------------------------------------------
        revno: 2728.17.233
        committer: Bjorn Munch <bjorn.munch@oracle.com>
        branch nick: ndbc-51
        timestamp: Fri 2011-07-01 13:10:04 +0200
        message:
          Bug #11757091 49093: 5.1 CONFIGURE SCRIPT SHOULD WARN ABOUT MYSQL CLUSTER NOT BEING MAINTAINED
          Added a conditional echo at end of configure.in
        ------------------------------------------------------------
        revno: 2728.17.232 [merge]
        committer: Bjorn Munch <bjorn.munch@oracle.com>
        branch nick: merge-51
        timestamp: Wed 2011-06-29 16:06:07 +0200
        message:
          merge from 5.1 main
    ------------------------------------------------------------
    revno: 3560.1.13
    committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
    branch nick: mysql-5.1
    timestamp: Fri 2011-07-15 16:25:00 +0400
    message:
      Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).
      
      Original changeset:
      revision-id: alexander.nozdrin@oracle.com-20101221122349-6h8ammcro70a4pac
      parent: sven.sandberg@oracle.com-20101221121948-hnivuulyohzch1v4
      committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
      branch nick: mysql-trunk-bugfixing
      timestamp: Tue 2010-12-21 15:23:49 +0300
      message:
        A patch for Bug#59060 (Valgrind warning in Protocol_text::store()).
        
        We should not assume to have zero-terminated strings.
    ------------------------------------------------------------
    revno: 3560.1.12
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.1
    timestamp: Fri 2011-07-15 12:42:06 +0100
    message:
      DBUG_PRINT in solaris does not work well with NULL parameters.
      HA_ERR was returning 0 (null string) when no error happened 
      (error=0). Since HA_ERR is used in DBUG_PRINT, regardless there 
      was an error or not, the server could crash in solaris debug
      builds.
      
      We fix this by:
      
        - deploying an assertion that ensures that the function 
          is not called when no error has happened;
        - making sure that HA_ERR is only called when an error 
          happened;
        - making HA_ERR return "No Error", instead of 0, for 
          non-debug builds if it is called when no error happened.
      
      This will make HA_ERR return values to work with DBUG_PRINT on
      solaris debug builds.
    ------------------------------------------------------------
    revno: 3560.1.11
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.1
    timestamp: Thu 2011-07-14 12:15:24 +0100
    message:
      BUG#11753004: 44360: REPLICATION FAILED
                        
      The server crashes if it processes table map events that are
      corrupted, especially if they map different tables to the same
      identifier. This could happen, for instance, due to BUG 56226.
                        
      We fix this by checking whether the table map has already been
      mapped before actually applying the event. If it has been mapped
      with different settings an error is raised and the slave SQL
      thread stops. If it has been mapped with same settings the event
      is skipped. If the table is set to be ignored by the filtering
      rules, there is no change in behavior: the event is skipped and
      ids are not checked.
    ------------------------------------------------------------
    revno: 3560.1.10 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.1
    timestamp: Tue 2011-07-12 02:13:36 +0100
    message:
      BUG#12695969
      
      Manually merged from mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      
      include/Makefile.am
        ------------------------------------------------------------
        revno: 1810.4001.5
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.0
        timestamp: Tue 2011-07-12 02:10:28 +0100
        message:
          BUG#12695969
          
          Follow-up patch that adds the newly added header file to
          Makefile.am noinst_HEADERS.
    ------------------------------------------------------------
    revno: 3560.1.9 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.1
    timestamp: Mon 2011-07-11 17:13:27 +0100
    message:
      BUG#12695969
      
      Manually merged mysql-5.0 into mysql-5.1.
      
      conflicts
      =========
      client/mysqlibinlog.cc
        ------------------------------------------------------------
        revno: 1810.4001.4
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.0
        timestamp: Mon 2011-07-11 17:11:41 +0100
        message:
          BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION
          CLIENT TOOLS
                
          The fix is to backport part of revision:
                  
            - alexander.nozdrin@oracle.com-20101006150613-ls60rb2tq5dpyb5c
                
          from mysql-5.5. In detail, we add the oracle welcome notice
          header file proposed in the original patch and include/use it
          in client/mysqlbinlog.cc, replacing the existing and obsolete
          notice.
    ------------------------------------------------------------
    revno: 3560.1.8
    committer: kevin.lewis@oracle.com
    branch nick: mysql-5.1
    timestamp: Thu 2011-07-07 16:29:30 -0500
    message:
      Bug#12637786 was fixed with rb:692 by marko.  But that fix has a remaining
      bug.  It added this assert;
          ut_ad(ind_field->prefix_len);
      before a section of code that assumes there is a prefix_len.  
      
      The patch replaced code that explicitly avoided this with a check for
      prefix_len.  It turns out that the purge thread can get to that assert
      without a prefix_len because it does not use a row_ext_t* .
      When UNIV_DEBUG is not defined, the affect of this is that the purge thread
      sets the dfield->len to zero and then cannot find the entry in the index to
      purge.  So secondary index entries remain unpurged.
      
      This patch does not do the assert.  Instead, it uses
          'if (ind_field->prefix_len) {...}'
      around the section of code that assumes a prefix_len.  This is the way the
      patch I provided to Marko did it.
      
      The test case is simply modified to do a sleep(10) in order to give the
      purge thread a chance to run. Without the code change to row0row.c, this
      modified testcase will assert if InnoDB was compiled with UNIV_DEBUG.
      I tried to sleep(5), but it did not always assert.
    ------------------------------------------------------------
    revno: 3560.1.7
    committer: Joerg Bruehe <joerg.bruehe@oracle.com>
    branch nick: bug45415-5.1
    timestamp: Thu 2011-07-07 17:22:24 +0200
    message:
      Fix bug#45415: "rpm upgrade recreates test database"
      
      Let the creation of the "test" database happen only during a new
      installation, not in an RPM upgrade.
------------------------------------------------------------
revno: 3592 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: 5.1-security
timestamp: Mon 2011-07-18 09:08:19 +0200
message:
  automerge 5.0->security => 5.1-security
    ------------------------------------------------------------
    revno: 1810.3997.30
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: 5.0-security-bug12406055set_real
    timestamp: Mon 2011-07-18 09:06:59 +0200
    message:
      Bug#12406055 post-push fix: ignore float output
------------------------------------------------------------
revno: 3591 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: 5.1-security
timestamp: Fri 2011-07-15 14:08:14 +0200
message:
  merge 5.0-security => 5.1-security
    ------------------------------------------------------------
    revno: 1810.3997.29
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: 5.0-security-bug12406055set_real
    timestamp: Fri 2011-07-15 14:07:38 +0200
    message:
      Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REAL
      
      The buffer was simply too small.
      In 5.5 and trunk, the size is 311 + 31,
      in 5.1 and below, the size is 331
------------------------------------------------------------
revno: 3590
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: 5.1-security
timestamp: Mon 2011-07-11 11:20:19 +0200
message:
  Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNCTIONS
  
  We must allocate a larger ref_pointer_array. We failed to account for extra
  items allocated here:
  #0  find_order_in_list 
    uint el= all_fields.elements;
    all_fields.push_front(order_item); /* Add new field to field list. */
    ref_pointer_array[el]= order_item;
    order->item= ref_pointer_array + el;
  #1  setup_order
  #2  setup_without_group
  #3  JOIN::prepare
------------------------------------------------------------
revno: 3589 [merge]
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-security
timestamp: Thu 2011-07-07 14:29:42 +0300
message:
  empty weave merge mysql-5.0-security->mysql-5.1-security
    ------------------------------------------------------------
    revno: 1810.3997.28 [merge]
    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
    branch nick: merge-5.0-security
    timestamp: Thu 2011-07-07 14:27:20 +0300
    message:
      weave merge of mysql-5.0->mysql-5.0-security
------------------------------------------------------------
revno: 3588 [merge]
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
branch nick: merge-5.1-security
timestamp: Thu 2011-07-07 14:27:26 +0300
message:
  weave merge of mysql-5.1->mysql-5.1-security
    ------------------------------------------------------------
    revno: 3560.1.6 [merge]
    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
    branch nick: merge-5.1
    timestamp: Thu 2011-07-07 11:06:59 +0300
    message:
      empty weave merge from mysql-5.0
        ------------------------------------------------------------
        revno: 1810.4001.3 [merge]
        committer: Sunanda Menon <sunanda.menon@oracle.com>
        branch nick: mysql-5.0
        timestamp: Wed 2011-07-06 11:36:39 +0200
        message:
          Merge from mysql-5.0.94-release
    ------------------------------------------------------------
    revno: 3560.1.5 [merge]
    committer: Karen Langford <karen.langford@oracle.com>
    branch nick: mysql-5.1
    timestamp: Wed 2011-07-06 00:56:51 +0200
    message:
      Merge from mysql-5.1.58-release
        ------------------------------------------------------------
        revno: 3583.1.2
        tags: mysql-5.1.58
        committer: Karen Langford <karen.langford@oracle.com>
        branch nick: mysql-5.1.58-release
        timestamp: Fri 2011-07-01 17:18:27 +0200
        message:
          Small update to Patch to fix SS #12698716
