------------------------------------------------------------
revno: 6864
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Sat 2013-11-16 21:03:41 +0100
message:
  Merged Bug #17675622 cset 6979 from trunk
------------------------------------------------------------
revno: 6863
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Fri 2013-11-08 10:19:56 +0100
message:
  Merge post-push fix WL 1509, cset 6909 from trunk
------------------------------------------------------------
revno: 6862
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Fri 2013-11-08 10:19:03 +0100
message:
  Merge Bug #17738935 cset 6906 from trunk
------------------------------------------------------------
revno: 6861
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Fri 2013-11-08 10:18:09 +0100
message:
  Merge Bug #17752288 cset 6890 from trunk
------------------------------------------------------------
revno: 6860
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Fri 2013-11-08 10:16:59 +0100
message:
  Merge post-push fix WL 7231, cset 6873 from trunk
------------------------------------------------------------
revno: 6859
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: rel-573
timestamp: Fri 2013-11-08 10:15:49 +0100
message:
  Merge Bug #17720294 cset 6866 from trunk
------------------------------------------------------------
revno: 6858 [merge]
tags: clone-5.7.3-m13-build
committer: Venkata Sidagam <venkata.sidagam@oracle.com>
branch nick: trunk
timestamp: Mon 2013-11-04 19:12:27 +0530
message:
  Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
      UPPER CASE HOST NAME ANYMORE
  Null merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.32 [merge]
    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
    branch nick: 5.6
    timestamp: Mon 2013-11-04 19:08:24 +0530
    message:
      Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
          UPPER CASE HOST NAME ANYMORE
      Null merge from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.71 [merge]
        committer: Venkata Sidagam <venkata.sidagam@oracle.com>
        branch nick: 5.5
        timestamp: Mon 2013-11-04 19:05:04 +0530
        message:
          Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
              UPPER CASE HOST NAME ANYMORE
          Null merge from mysql-5.1 to mysql-5.5
            ------------------------------------------------------------
            revno: 2661.880.65
            committer: Venkata Sidagam <venkata.sidagam@oracle.com>
            branch nick: 5.1
            timestamp: Mon 2013-11-04 19:02:57 +0530
            message:
              Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
                  UPPER CASE HOST NAME ANYMORE
              Fixing the testcase failure for mysql-5.1
------------------------------------------------------------
revno: 6857 [merge]
author: murthy.narkedimilli@oracle.com
committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 12:56:02 +0100
message:
  Null merging the changes from 5.6 after version change.
    ------------------------------------------------------------
    revno: 3902.291.31 [merge]
    author: murthy.narkedimilli@oracle.com
    committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-11-04 12:12:47 +0100
    message:
      Raise version number after cloning 5.6.15
        ------------------------------------------------------------
        revno: 2875.545.70 [merge]
        committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-11-04 11:56:38 +0100
        message:
          Cloning the branch and raising the version number for 5.5.35 build
            ------------------------------------------------------------
            revno: 2661.880.64
            author: murthy.narkedimilli@oracle.com
            committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
            branch nick: mysql-5.1
            timestamp: Mon 2013-11-04 11:29:37 +0100
            message:
              Raise version number after cloning 5.1.73
------------------------------------------------------------
revno: 6856
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-review
timestamp: Mon 2013-11-04 12:28:33 +0100
message:
  Bug#17560636: FIND_BEST_REF(): COST FOR CLUSTERED PK IS
                CALCULATED AS IF NOT COVERING
  
  Followup patch - update index_merge_innodb.result
------------------------------------------------------------
revno: 6855
committer: Thirunarayanan B<thirunarayanan.balathandayuth@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 16:49:14 +0530
message:
  Reverting changes for Bug17250787
------------------------------------------------------------
revno: 6854 [merge]
committer: Thirunarayanan B<thirunarayanan.balathandayuth@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 16:23:56 +0530
message:
  Null merge from mysql-5.6 to mysql-trunk.
  Reverting Bug17250787
    ------------------------------------------------------------
    revno: 3902.291.30
    tags: clone-5.6.15-build
    committer: Thirunarayanan B<thirunarayanan.balathandayuth@oracle.com>
    branch nick: mysql-5.6_latest
    timestamp: Mon 2013-11-04 16:21:21 +0530
    message:
      Reverting the patch
------------------------------------------------------------
revno: 6853
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-filesort
timestamp: Thu 2013-10-31 18:12:04 +0100
message:
  WL#1509 Pack values of non-sorted fields in the sort buffer
  
  New, complete patch, after pull from trunk.
------------------------------------------------------------
revno: 6852
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 10:31:51 +0100
message:
  Disabling test that started faining after push for wl#6987
------------------------------------------------------------
revno: 6851 [merge]
committer: Thirunarayanan B<thirunarayanan.balathandayuth@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 14:50:11 +0530
message:
  Merge From mysql-5.6-mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.29
    committer: Thirunarayanan B<thirunarayanan.balathandayuth@oracle.com>
    branch nick: mysql-5.6_latest
    timestamp: Mon 2013-11-04 12:04:11 +0530
    message:
      Problem:
      There is a difference in behaviour between copy algorithm and inplace
        algorithm in alter statement for decreasing the auto increment value.
        In alter table statement, inplace algorithm not able to decrease 
        the auto increment value.
         
      Solution:
       
       Inplace algorithm should set the maximum of the user defined 
       auto_increment value and maximum, non deleted auto_increment value
       from the table.
------------------------------------------------------------
revno: 6850
committer: Libing Song <libing.song@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-11-04 12:35:42 +0800
message:
  The test need debug support.
------------------------------------------------------------
revno: 6849 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Fri 2013-11-01 17:50:33 +0100
message:
  merge trunk version of fix for bug Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST
    ------------------------------------------------------------
    revno: 6847.1.1
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: trunk-fs-merge
    timestamp: Wed 2013-10-30 14:52:08 +0100
    message:
      Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUFFER_SIZE
      
      Introduce Bounds_checked_array to catch that get_cost_calc_buff_size()
      returns wrong value for the size of imerge_cost_buff.
------------------------------------------------------------
revno: 6848 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Fri 2013-11-01 17:31:02 +0100
message:
  null merge 5.6 => trunk
    ------------------------------------------------------------
    revno: 3902.291.28 [merge]
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: 5.6-merge
    timestamp: Fri 2013-11-01 17:29:04 +0100
    message:
      merge 5.5 => 5.6
        ------------------------------------------------------------
        revno: 2875.545.69 [merge]
        tags: clone-5.5.35-build
        committer: Tor Didriksen <tor.didriksen@oracle.com>
        branch nick: 5.5-merge
        timestamp: Fri 2013-11-01 16:52:21 +0100
        message:
          merge 5.1 => 5.5
            ------------------------------------------------------------
            revno: 2661.880.63
            tags: clone-5.1.73-build
            committer: Tor Didriksen <tor.didriksen@oracle.com>
            branch nick: 5.1
            timestamp: Fri 2013-11-01 16:39:19 +0100
            message:
              Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUFFER_SIZE
              
              get_cost_calc_buff_size() could return wrong value for the size of imerge_cost_buff.
------------------------------------------------------------
revno: 6847
committer: Norvald H. Ryeng <norvald.ryeng@oracle.com>
branch nick: mysql-trunk-wl1763
timestamp: Fri 2013-11-01 16:02:43 +0100
message:
  WL#1763 Avoid creating temporary table in UNION ALL
  
  Post push fix to remove gcc warning in optimized build.
  
  The local variable instantiate_tmp_table in
  st_select_lex_unit::prepare() is never set for non-union queries.
  
  Fix: The variable is only used for union queries. Initialize to
  false.
------------------------------------------------------------
revno: 6846
committer: Roy Lyseng <roy.lyseng@oracle.com>
branch nick: mysql-sb4
timestamp: Fri 2013-11-01 15:55:21 +0100
message:
  Bug#17720496: Test failure in innodb.innodb_mysql with query cache
  
  This is a regression after WL#6987.
  
  The problem can be reproduced with the following test:
  
  ./mysql-test-run --mem main.view \
  --mysqld=--query_cache_type=1 --mysqld=--query_cache_size=1M
  
  The problem was a missing rewrite of a query cache update for LOAD
  statements, so that the query cache assumed a view was updated and
  not the underlying base table.
  
  The fix is to use the same query cache invalidate function as
  INSERT does.
------------------------------------------------------------
revno: 6845
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Fri 2013-11-01 15:49:07 +0100
message:
  WL#7260: Split LOCK_thread_count
  
  Post-push fix: Add missing file.
------------------------------------------------------------
revno: 6844
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Fri 2013-11-01 15:43:47 +0100
message:
  WL#7260: Split LOCK_thread_count
  
  After the improvements made in WL#6606, performance testing has
  shown that the major bottleneck for connect/disconnect performance
  now is the LOCK_thd_count mutex.
  
  This patch increases the connect/disconnect performance by
  splitting LOCK_thd_count so that it no longer protects
  several different structures/variables. LOCK_thd_count
  is now only used to protect the list of connections (THDs).
  
  Changes made to existing usage of LOCK_thd_count:
  
  LOCK_thread_cache is introduced to protect the thread cache used
  by the default connection handler (one thread per connection).
  
  Synchronization during startup of signal handler thread is now
  done using LOCK_start_signal_handler.
  
  Synchronization during shutdown of main thread connection
  listening is now done using LOCK_socket_listener_active.
  
  The global thread_id counter is now incremented using atomics,
  rather than being protected by LOCK_thd_count.
  
  THD::current_linfo is now protected by THD::LOCK_thd_data rather
  than LOCK_thd_count.
  
  max_used_connections is now reset under protection of
  LOCK_connection_count rather than LOCK_thd_count.
------------------------------------------------------------
revno: 6843 [merge]
committer: Georgi Kodinov <georgi.kodinov@oracle.com>
branch nick: mysql-trunk-chris
timestamp: Fri 2013-11-01 14:50:58 +0200
message:
  merge
    ------------------------------------------------------------
    revno: 6840.1.1
    committer: Christopher Powers <chris.powers@oracle.com>
    branch nick: mysql-trunk-wl5864_stage
    timestamp: Fri 2013-11-01 11:06:11 +0100
    message:
      WL#5864 PERFORMANCE SCHEMA Instrument Transactions
      
      Merge to mysql-trunk
------------------------------------------------------------
revno: 6842
committer: Sivert Sorumgard <sivert.sorumgaard@oracle.com>
branch nick: trunk-16041903
timestamp: Fri 2013-11-01 13:40:41 +0100
message:
  Bug#16041903 CONTINUE HANDLER NOT INVOKED IN A STORED 
  FUNCTION AFTER A LOCK WAIT TIMEOUT
  
  Broke ndbcluster build in mysql-trunk. Post push fix. 
------------------------------------------------------------
revno: 6841
committer: Roy Lyseng <roy.lyseng@oracle.com>
branch nick: mysql-sb4
timestamp: Fri 2013-11-01 13:18:12 +0100
message:
  Bug#17713031: Assert 'table == tables[unique_counter] in multi_delete
  
  This is a regression from the refactoring of multi_delete in WL#6987.
  
  The arrays tempfiles and tables in class multi_delete have one entry
  for each table to be deleted from, which is not deleted from immediately.
  (The deletes are collected inside a Unique object and deletes happen
  after the "immediate" deletes).
  
  However, the code that incremented the counter unique_counter which
  keeps track of the tempfile object for the current table being deleted
  from was placed in a wrong location, so that when a row from an
  outer-joined table was NULL-complemented, unique_counter was not
  incremented as it should.
  
  The fix is to place the increment operation earlier, just after
  detecting that we have a table that is deleted from, and the delete
  is not immediate. This placement of the code will also prevent other
  conditionals from interfering with this logic (such as e.g. an error
  in a triggered operation).
------------------------------------------------------------
revno: 6840 [merge]
committer: horst.hunger@oracle.com
branch nick: trunk
timestamp: Fri 2013-11-01 10:57:33 +0100
message:
  Null merge due to fix a bug in 5.6. See rev 5580.
    ------------------------------------------------------------
    revno: 3902.291.27
    committer: horst.hunger@oracle.com
    branch nick: mysql-5.6
    timestamp: Fri 2013-11-01 10:50:18 +0100
    message:
      Bug #17719504: These test fail sporadically. Disabled until decision how to fix if at all.
------------------------------------------------------------
revno: 6839
committer: Sivert Sorumgard <sivert.sorumgaard@oracle.com>
branch nick: trunk-16041903
timestamp: Fri 2013-11-01 10:41:05 +0100
message:
  Bug#16041903 CONTINUE HANDLER NOT INVOKED IN A STORED 
  FUNCTION AFTER A LOCK WAIT TIMEOUT
  
  Overview
  --------
  When the SQL layer is executing a sub statement (stored
  function or trigger), some errors cannot be safely recovered
  until we leave sub statement mode. This is the case for
  e.g. ER_LOCK_WAIT_TIMEOUT. When this error is caught, the
  handler does a callback to "mark_transaction_for_rollback()"
  in the SQL layer, which makes the transaction be rolled back
  implicitly. In "mark_transaction_for_rollback()", the flag
  "THD::is_fatal_sub_stmt_error" is set. This flag is used to
  effectievly disable the execution of a condition handler in
  a stored function while handling the error. The flag is
  reset when leaving sub statement mode, in
  "restore_sub_statement_state()", if leaving the last level
  of sub statements (i.e., nested sub statements are handled
  by keeping the value of the flag when going to the previous
  "stack frame"). 
  
  The problem here is that the flag is set in
  "mark_transaction_for_rollback()" even if the SQL layer is
  not in sub statement mode. If this happens, and the
  transaction afterwards calls a stored function with a
  condition handler, the handler will be disabled since the
  flag is already set when calling the function.
  
  
  Suggested fix
  -------------
  The suggested fix is to set "is_fatal_sub_stmt_error"
  in "mark_transaction_for_rollback()" only in the case where
  the SQL layer is currently executing a sub statement
  ("in_sub_stmt==true"). If not in a sub statement,
  setting the "is_fatal_sub_stmt_error" flag really has
  no meaning. Additionally, when the flag is set when the SQL
  layer is not actually in a sub statement, the flag is never
  cleared since this happens only in
  "THD::restore_sub_statement_state()" when leaving sub
  statement mode.
------------------------------------------------------------
revno: 6838 [merge]
committer: Georgi Kodinov <georgi.kodinov@oracle.com>
branch nick: mysql-trunk-wl6791
timestamp: Fri 2013-11-01 10:50:45 +0200
message:
  merge with trunk
    ------------------------------------------------------------
    revno: 6815.1.1
    committer: Georgi Kodinov <georgi.kodinov@oracle.com>
    branch nick: mysql-trunk-wl6791
    timestamp: Thu 2013-10-31 11:35:15 +0200
    message:
      WL#6791 : Redefine client --ssl option to imply enforced encryption
      
      # Changed the meaning of the --ssl=1 option of all client binaries
      to mean force ssl, not try ssl and fail over to eunecrypted
      # Added a new MYSQL_OPT_SSL_ENFORCE mysql_options()
      option to specify that an ssl connection is required.
      # Added a new macro SSL_SET_OPTIONS() to the client
      SSL handling headers that sets all the relevant SSL options at 
      once.
      # Revamped all of the current native clients to use the new macro
      # Removed some Windows line endings.
      # Added proper handling of the new option into the ssl helper
      headers.
      # If SSL is mandatory assume that the media is secure enough 
      for the sha256 plugin to do unencrypted password exchange even
      before establishing a connection.
      # Set the default ssl cipher to DHE-RSA-AES256-SHA if none is 
      specified.
      # updated test cases that require a non-default cipher to spawn 
      a mysql command line tool binary since mysqltest has no support
      for specifying ciphers.
      # updated the replication slave connection code to always enforce
      SSL if any of the SSL config options is present.
      # test cases added and updated.
      # added a mysql_get_option() API to return mysql_options() 
      values. Used the new API inside the sha256 plugin.
      # Fixed compilation warnings because of unused variables.
      # Fixed test failures (mysql_ssl and bug13115401)
      # Fixed whitespace issues.
      # Fully implemented the mysql_get_option() function.
      # Added a test case for mysql_get_option()
      # fixed some trailing whitespace issues
      # fixed some uint/int warnings in mysql_client_test.c
      # removed shared memory option from non-windows get_options
       tests
      # moved MYSQL_OPT_LOCAL_INFILE to the uint options
------------------------------------------------------------
revno: 6837 [merge]
committer: Venkata Sidagam <venkata.sidagam@oracle.com>
branch nick: trunk
timestamp: Fri 2013-11-01 13:58:37 +0530
message:
  Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
      UPPER CASE HOST NAME ANYMORE
  Merging from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.26 [merge]
    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
    branch nick: 5.6
    timestamp: Fri 2013-11-01 13:51:02 +0530
    message:
      Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
          UPPER CASE HOST NAME ANYMORE
      Merging from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.68
        committer: Venkata Sidagam <venkata.sidagam@oracle.com>
        branch nick: 5.5
        timestamp: Fri 2013-11-01 13:48:24 +0530
        message:
          Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
              UPPER CASE HOST NAME ANYMORE
          Fixing the testcase failure
------------------------------------------------------------
revno: 6836
committer: Norvald H. Ryeng <norvald.ryeng@oracle.com>
branch nick: mysql-trunk-wl1763
timestamp: Fri 2013-11-01 09:06:00 +0100
message:
  WL#1763 Avoid creating temporary table in UNION ALL
------------------------------------------------------------
revno: 6835
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Fri 2013-11-01 06:41:51 +0100
message:
  removing mysqld_safe test from experimental list
------------------------------------------------------------
revno: 6834 [merge]
committer: Nuno Carvalho <nuno.carvalho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 23:11:03 +0000
message:
  BUG#17662398: REMOVE DUPLICATE TEST CASES
  
  Merges from mysql-5.6 into mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.291.25 [merge]
    committer: Nuno Carvalho <nuno.carvalho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-31 23:06:10 +0000
    message:
      BUG#17662398: REMOVE DUPLICATE TEST CASES
      
      Merge from mysql-5.5 into mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.67 [merge]
        committer: Nuno Carvalho <nuno.carvalho@oracle.com>
        branch nick: mysql-5.5
        timestamp: Thu 2013-10-31 22:58:07 +0000
        message:
          BUG#17662398: REMOVE DUPLICATE TEST CASES
          
          Merge from mysql-5.1 into mysql-5.5.
            ------------------------------------------------------------
            revno: 2661.880.62
            committer: Nuno Carvalho <nuno.carvalho@oracle.com>
            branch nick: mysql-5.1
            timestamp: Thu 2013-10-31 22:53:56 +0000
            message:
              BUG#17662398: REMOVE DUPLICATE TEST CASES
              
              Remove duplicate test cases.
------------------------------------------------------------
revno: 6833 [merge]
committer: Joao Gramacho <joao.gramacho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 21:55:22 +0000
message:
  Merge of BUG#16861624 patch from mysql-5.6 into mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.24
    committer: Joao Gramacho <joao.gramacho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-31 21:42:33 +0000
    message:
      Bug#16861624 KILLING WAITING SLAVE SQL THREAD:
                   M_STATUS == DA_ERROR || M_STATUS == DA_OK
      
      Problem:
      =======
      
      An assert will fail when the replication sql thread on a slave server
      is killed while waiting for commit lock will.
      
      Analysis:
      ========
      
      In the case of a failed commit attempt at
      Xid_log_event::do_apply_event(), an error message will be reported
      informing the reason why the commit could not be completed.
      
      The error message to be reported is collected using message() at
      sql_error.h that contains an assert expecting that current m_status 
      must be DA_ERROR or DA_OK before returning the message.
      
      The problem happens when the SQL thread is waiting for the commit lock
      at MDL_context::acquire_lock and is killed.
      
      In this case, the resulting wait_status will be MDL_wait::KILLED, and
      will result in acquire_lock() returning an error but without throwing
      one (both other cases, MDL_wait::VICTIM and MDL_wait::TIMEOUT, throw
      errors using my_error()).
      
      So, in the case of a thread being deliberate killed while waiting for
      a lock would lead to a case where no error was flagged, but also no
      success was flagged, making the assert expecting DA_ERROR or DA_OK to
      fail.
      
      Fix:
      ===
      
      The code in MDL_context::acquire_lock in mysql-5.7 already throws an
      error for MDL_wait::KILLED. This patch just back-ported this behavior.
      
      Added also some debug sync points to easy putting sql thread in
      "Waiting for commit lock" state.
------------------------------------------------------------
revno: 6832 [merge]
committer: Venkata Sidagam <venkata.sidagam@oracle.com>
branch nick: trunk
timestamp: Fri 2013-11-01 00:30:40 +0530
message:
  Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
      UPPER CASE HOST NAME ANYMORE
  Merging from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.23 [merge]
    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
    branch nick: 5.6
    timestamp: Thu 2013-10-31 23:59:36 +0530
    message:
      Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
          UPPER CASE HOST NAME ANYMORE
      Merging from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.66 [merge]
        committer: Venkata Sidagam <venkata.sidagam@oracle.com>
        branch nick: 5.5
        timestamp: Thu 2013-10-31 23:14:33 +0530
        message:
          Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
              UPPER CASE HOST NAME ANYMORE
          Merging from mysql-5.1 to mysql-5.5
            ------------------------------------------------------------
            revno: 2661.880.61
            committer: Venkata Sidagam <venkata.sidagam@oracle.com>
            branch nick: 5.1
            timestamp: Thu 2013-10-31 23:02:44 +0530
            message:
              Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
                  UPPER CASE HOST NAME ANYMORE
              
              Description:
              It is not possible to drop users with host names with upper case
              letters in them. i.e DROP USER 'root'@'Tmp_Host_Name'; is failing
              with error.
              
              Analysis: Since the fix 11748570 we came up with lower case hostnames
              as standard. But in the current bug the hostname is created by
              mysql_install_db script is still having upper case hostnames. 
              So, if we have the hostname with upper case letters like(Tmp_Host_Name)
              then we will have as it is stored in the mysql.user table. 
              In this case if use "'DROP USER 'root'@'Tmp_Host_Name';" it gives 
              error because we do compare with the lower case of hostname since the 
              11748570 fix.
              
              Fix: We need to convert the hostname to lower case before storing into 
              the mysql.user table when we run the mysql_install_db script.
------------------------------------------------------------
revno: 6831
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Thu 2013-10-31 19:54:12 +0100
message:
  Bug#17695635: GUNIT TESTS CANNOT BE COMPILED WITH LIBC++
  
  Revert parts of the patch - incompatible with older versions of GCC+Windows.
------------------------------------------------------------
revno: 6830
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Thu 2013-10-31 18:51:51 +0100
message:
  Bug#17695635: GUNIT TESTS CANNOT BE COMPILED WITH LIBC++
  
  GMock 1.6 assumes that <tr1/tuple> exists. But this is not true for libc++
  where tuple is in std. Added CMake check for this which makes GMock
  use it's own tuple implementation if <tr1/tuple> does't exist.
  
  Also changed stdcxx-t.cc to look for unordered_map in <unordered_map>
  rather than <tri/unordered_map> when using libc++.
------------------------------------------------------------
revno: 6829
committer: Rafal Somla <rafal.somla@oracle.com>
branch nick: mysql-trunk-methods
timestamp: Thu 2013-10-31 15:10:32 +0100
message:
  Add free_rows function to struct st_mysql_methods. This way it is
  possible to fully execute a query, read its results and do cleanup using
  functions from mysql->methods. Required by client-side plugins which
  can not use CAPI functions to execute queries.
------------------------------------------------------------
revno: 6828
committer: Georgi Kodinov <georgi.kodinov@oracle.com>
branch nick: fix-trunk-vg
timestamp: Thu 2013-10-31 16:07:57 +0200
message:
  Addendum #1 to bug #16944177 : fix the valgrind failures.
------------------------------------------------------------
revno: 6827
committer: viswanatham gudipati <viswanatham.gudipati@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 17:28:21 +0530
message:
  wl7263:  Migrate myisam specific tests
------------------------------------------------------------
revno: 6826
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 12:45:23 +0100
message:
  modified the test file
------------------------------------------------------------
revno: 6825
committer: Aditya A <aditya.a@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 17:00:51 +0530
message:
  Bug#11758237 INSERT ON DUPLICATE KEY UPDATE SOMETIMES 
               WRITES BINLOG POSITION INCORRECT
  
  Reverting the fix for Bug11758237 because of failing 
  testcase innodb_bug11758237.test in embedded mode.
------------------------------------------------------------
revno: 6824 [merge]
committer: horst.hunger@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-31 12:06:28 +0100
message:
  Null merge now with dot in revert command. gnnnn
    ------------------------------------------------------------
    revno: 3902.291.22
    committer: horst.hunger@oracle.com
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-31 11:30:31 +0100
    message:
      Repeat for Bug #17711364: Added the opt files to the tests to run them in binaries.
------------------------------------------------------------
revno: 6823
committer: horst.hunger@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-31 11:37:27 +0100
message:
  repeated null merge again.
------------------------------------------------------------
revno: 6822
committer: horst.hunger@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-31 11:26:46 +0100
message:
  repeated null merge for Bug #17711364.
------------------------------------------------------------
revno: 6821
committer: Pavan Naik<pavan.naik@oracle.com>
branch nick: mysql-innodb-fts
timestamp: Thu 2013-10-31 14:21:01 +0530
message:
  Bug #17586153 : INNODB_FTS_MISC_1: NOT ORDERED SELECTS MAY LEAD TO DIFFS IN RESULT SETS
  
  Description:
  Lot of SELECT statements produce not ordered result sets, so that differences
  in the result set let the test sporadically fail.
  
  Fix :
  Added "ORDER BY" to the select statements to produce ordered result set.
------------------------------------------------------------
revno: 6820
committer: horst.hunger@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-31 09:37:19 +0100
message:
  Null merge for Bug #17711364 as changes inly make sense in 5.6.
------------------------------------------------------------
revno: 6819 [merge]
committer: Saikumar V <saikumar.v@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 13:41:35 +0530
message:
  Cleaned up .moved folder in internal .
    ------------------------------------------------------------
    revno: 3902.291.21
    committer: Saikumar V <saikumar.v@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-31 13:24:36 +0530
    message:
      Cleaned up .moved folder in internal .
------------------------------------------------------------
revno: 6818 [merge]
committer: Saikumar V <saikumar.v@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-31 09:11:14 +0530
message:
  Synching rqg grammars/redefines to mysql-repos internal .
    ------------------------------------------------------------
    revno: 3902.291.20 [merge]
    committer: Saikumar V <saikumar.v@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-31 09:05:42 +0530
    message:
      Synching rqg grammars/redefines to mysql-repos internal .
        ------------------------------------------------------------
        revno: 2875.545.65
        committer: Saikumar V <saikumar.v@oracle.com>
        branch nick: mysql-5.5
        timestamp: Thu 2013-10-31 09:01:09 +0530
        message:
          Synching rqg grammars/redefines to mysql-repos internal.
------------------------------------------------------------
revno: 6817 [merge]
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Thu 2013-10-31 00:38:03 +0100
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.19
    committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
    branch nick: mysql-5.6-bug17696705
    timestamp: Thu 2013-10-31 00:22:43 +0100
    message:
      Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM 
      
      Rename test() macro to MY_TEST() to avoid conflict with libc++.
------------------------------------------------------------
revno: 6816
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Wed 2013-10-30 21:32:34 +0100
message:
  WL#7231: Support ICP for partitioned tables
  
  Added support for ICP for partitioned tables where
  the underlying storage engine supports it.
  
  Also added DBUG_ASSERT's to make sure the
  used buffer is table->record[0] for handler
  index read calls that uses ICP.
------------------------------------------------------------
revno: 6815
committer: Olav Sandstaa <olav.sandstaa@oracle.com>
branch nick: compile-warn2
timestamp: Wed 2013-10-30 13:36:43 +0100
message:
  Fix for Bug#17154722 REMOVE COMPILER WARNINGS PRODUCED BY SUN STUDIO COMPILER
                    
  Fixes the following compiler warning caused by a local variable having the
  same name as a class variable:
        
     Warning: keyuse hides JOIN::keyuse
        
  The solution for this is to rename the JOIN::keyuse variable to keyuse_array.
  The patch also changes make_join_statistics() and optimize_keyuse() to use 
  JOIN::keyuse_array directly instead of getting it as an argument.
------------------------------------------------------------
revno: 6814 [merge]
committer: Sivert Sorumgard <sivert.sorumgaard@oracle.com>
branch nick: trunk-13548252
timestamp: Wed 2013-10-30 13:15:16 +0100
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.18
    committer: Sivert Sorumgard <sivert.sorumgaard@oracle.com>
    branch nick: 5.6-13548252
    timestamp: Wed 2013-10-30 13:09:43 +0100
    message:
      Bug #13548252: MYSQL ASSUMES ALL ETHERNET DEVICES ARE NAMED ETHX
      Bug #63055   : mysql assumes all ethernet devices are named ethX
      
      The MySQL server is using the first non-zero hardware address of
      an arbitrary network interface for generating UUIDs. On Linux,
      the MySQL server is only trying interface names "eth{0-5}". The
      patch retrieves the list of known interface names rather than
      assuming names of a certain pattern.
      
      Patch contributed by Honza Horak
------------------------------------------------------------
revno: 6813
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-review
timestamp: Wed 2013-10-30 12:55:47 +0100
message:
  WL#7019: Add support for row value constructors in in predicates to range optimizer
  
  Post-push fix: fix broken build for -DMERGE_UNITTESTS=0
------------------------------------------------------------
revno: 6812
committer: Martin Hansson <martin.hansson@oracle.com>
branch nick: mysql-trunk-push
timestamp: Wed 2013-10-30 10:56:28 +0100
message:
  WL#7019: Add support for row value constructors in in predicates to range optimizer
------------------------------------------------------------
revno: 6811 [merge]
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Wed 2013-10-30 10:44:17 +0100
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.17
    committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
    branch nick: mysql-5.6-bug17590095
    timestamp: Wed 2013-10-30 09:55:14 +0100
    message:
      Bug#17590095: COVERITY ANALYSIS RESULTS AND PATCHES
      Bug#70591   : COVERITY ANALYSIS RESULTS AND PATCHES
      
      Fix various issues found by Coverity.
      Some by backporting the fix for
       Bug#16725945: USE_AFTER_FREE ERRORS - COVERITY SCAN
      
      Based on patches contributed by Honza Horak.
------------------------------------------------------------
revno: 6810
committer: Roy Lyseng <roy.lyseng@oracle.com>
branch nick: mysql-trunk-sb1
timestamp: Wed 2013-10-30 10:20:54 +0100
message:
  WL#6987: Refactoring: Remove TABLE object from updatable views
  
  - Remove TABLE object from updatable views
  - Simplify resolver code for INSERT statement clauses
  - Change deletion through multi-table DELETE
------------------------------------------------------------
revno: 6809
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-17560636
timestamp: Wed 2013-10-30 10:09:54 +0100
message:
  Bug#17560636: FIND_BEST_REF(): COST FOR CLUSTERED PK IS 
                CALCULATED AS IF NOT COVERING
  
  Optimize_table_order::find_best_ref() iterates through all 
  possible ways to access all usable keys for a table. The index 
  access strategy with lowest cost is chosen. However, if a 
  clustered primary key is applicable, it is considered to be 
  covering only if all columns required for the query are in
  the primary key definition. The result is that the cost for 
  clustered primary keys is calculated as though a random read 
  needs to take place for each estimated row. This is incorrect 
  when clustered primary keys are read since the data can be 
  read from the index without going to "the table".
  
  The fix is to let handler::read_time() calculate the cost 
  instead of assuming that there will be a cost of 1 x #row. 
  handler::read_time() is capable of handling the distinction
  between reading the clustered index and another index.
------------------------------------------------------------
revno: 6808 [merge]
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Wed 2013-10-30 09:49:17 +0100
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.16
    committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
    branch nick: mysql-5.6-bug16725769
    timestamp: Wed 2013-10-30 09:30:46 +0100
    message:
      Bug#16725769: VARARG ERRORS - COVERITY RESULTS
      Bug#68896   : VARARG Errors - Coverity results
      
      Add two missing va_end() to UCS2 code.
      
      Patch contributed by Jan Stan?k.
------------------------------------------------------------
revno: 6807
committer: viswanatham gudipati <viswanatham.gudipati@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-30 13:40:08 +0530
message:
  adjsuted the collection file
------------------------------------------------------------
revno: 6806
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Wed 2013-10-30 18:34:24 +1100
message:
  WL@7290 - Followup fix.
  
  Undo an unrelated change in sunny.bains@oracle.com-20131030071204-mjkydims1f9hx4vm.
------------------------------------------------------------
revno: 6805
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Wed 2013-10-30 18:12:04 +1100
message:
  WL#7290 - Follow up fix, change the ordering of the data members of 
  dyn_buf_t so that m_data is suitably aligned.
------------------------------------------------------------
revno: 6804 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-30 07:53:54 +0100
message:
  Null merge from 5.6 => trunk
    ------------------------------------------------------------
    revno: 3902.292.1
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-30 07:22:06 +0100
    message:
      Enabled DWITH_INNODB_MEMCACHED in the spec file
    ------------------------------------------------------------
    revno: 3902.291.15
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-30 07:47:07 +0100
    message:
      Enabled DWITH_INNODB_MEMCACHED in the spec file
------------------------------------------------------------
revno: 6803
committer: Pavan Naik<pavan.naik@oracle.com>
branch nick: mysql-sys_vars
timestamp: Wed 2013-10-30 11:55:23 +0530
message:
  Bug #17632868 : ADD TESTS FOR VARIABLES THAT DIFFER FOR 32-BIT AND 64-BIT IN SYS_VARS SUITE
  
  Fix :
  Reviwed the sys_vars suite for the variables that differ for 32-bit
  and 64-bit machine and added missing tests for these variables.
------------------------------------------------------------
revno: 6802 [merge]
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-30 11:18:40 +0530
message:
  Bug#17280176   TRANSACTIONS SKIPPED ON SLAVE AFTER
  "STOP/START SLAVE" USING GTID REPLICATION
  Merging fix from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.291.14
    committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-30 11:04:38 +0530
    message:
      Bug#17280176 TRANSACTIONS SKIPPED ON SLAVE AFTER
      "STOP/START SLAVE" USING GTID REPLICATION
      
      Analysis: Slave updates 'GTID_RETRIEVED' set upon receiving
      GTID_LOG_EVENT for a particular transaction which is first
      event in the event group. Say, I/O thread is stopped *after*
      adding GTID number to 'gtid_trieved' set and *before* it
      actually retrieves all the events from that GTID event
      group. Next time when this I/O thread is reconnected,
      it sends union of GTID_RETRIEVED + GTID_EXECUTED
      set to master. So Master thinks that slave is having all the
      events from this GTID set(which includes partially
      retrieved GTID) and it will not resend them again.
      Hence slave is missing some events for ever.
      
      Fix: It is not easy to find the end of a group of events.
      So mysql server is unsure whether I/O thread retrieved the
      last gtid transaction events completely or not
      (before it is going down because of a crash/normal
      shutdown/normal stop slave io_thread). It is possible that
      I/O thread would have retrieved and written only partial
      transaction events. So Server will request Master to send
      the last gtid event once again. We do this by removing
      the last I/O thread retrieved gtid event from
      "Retrieved_gtid_set".
      Possible cases:
      1) I/O thread would have retrieved full
      transaction already in the first time itself, but retrieving
      them again will not cause problem because GTID number is same,
      Hence SQL thread will not commit it again.
      2) I/O thread would have retrieved full transaction already and
      SQL thread would have already executed it. In that case,
      We are not going remove last retrieved gtid from
      "Retrieved_gtid_set" otherwise we will see gaps in "Retrieved set".
------------------------------------------------------------
revno: 6801 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-30 04:21:16 +0100
message:
  Merge 5.6 => trunk - Removed non gpl file docs/mysql.info from community package
    ------------------------------------------------------------
    revno: 3902.291.13 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-30 04:15:35 +0100
    message:
      Merge 5.5 => 5.6 - Removed non gpl file docs/mysql.info from community package
        ------------------------------------------------------------
        revno: 2875.545.64 [merge]
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-30 04:12:24 +0100
        message:
          Merge 5.1 => 5.5
            ------------------------------------------------------------
            revno: 2661.880.60
            committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
            branch nick: mysql-5.1
            timestamp: Wed 2013-10-30 04:07:07 +0100
            message:
              Removed non gpl file docs/mysql.info from community packages
------------------------------------------------------------
revno: 6800
committer: kevin.lewis@oracle.com
branch nick: mysql-trunk
timestamp: Tue 2013-10-29 19:02:38 -0500
message:
  Merge issue with previous patch caused innodb-alter-restart.test to fail.
------------------------------------------------------------
revno: 6799 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Tue 2013-10-29 19:58:22 +0100
message:
  empty merge 5.6 => trunk
    ------------------------------------------------------------
    revno: 3902.291.12 [merge]
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: 5.6-merge
    timestamp: Tue 2013-10-29 19:57:24 +0100
    message:
      null merge 5.5 => 5.6
        ------------------------------------------------------------
        revno: 2875.545.63 [merge]
        committer: Tor Didriksen <tor.didriksen@oracle.com>
        branch nick: 5.5-merge
        timestamp: Tue 2013-10-29 19:55:38 +0100
        message:
          remerge 5.1 => 5.5
------------------------------------------------------------
revno: 6798 [merge]
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Tue 2013-10-29 19:48:44 +0100
message:
  merge 5.6 => trunk
    ------------------------------------------------------------
    revno: 3902.291.11 [merge]
    committer: Tor Didriksen <tor.didriksen@oracle.com>
    branch nick: 5.6-merge
    timestamp: Tue 2013-10-29 19:41:28 +0100
    message:
      merge 5.5 => 5.6
        ------------------------------------------------------------
        revno: 2875.583.1 [merge]
        committer: Tor Didriksen <tor.didriksen@oracle.com>
        branch nick: 5.5-merge
        timestamp: Tue 2013-10-29 17:54:49 +0100
        message:
          Merge 5.1 => 5.5
            ------------------------------------------------------------
            revno: 2661.880.59
            committer: Tor Didriksen <tor.didriksen@oracle.com>
            branch nick: 5.1
            timestamp: Tue 2013-10-29 17:26:20 +0100
            message:
              Bug#17326567 MYSQL SERVER FILESORT IMPLEMENTATION HAS A VERY SERIOUS BUG
              
              The filesort implementation needs space for at least 15 records
              (plus some internal overhead) in its main sort buffer.
------------------------------------------------------------
revno: 6797 [merge]
committer: kevin.lewis@oracle.com
branch nick: mysql-trunk
timestamp: Tue 2013-10-29 13:27:40 -0500
message:
  Merge up from mysql-5.6 a fix for mysql-alter-restart.
    ------------------------------------------------------------
    revno: 3902.291.10 [merge]
    committer: kevin.lewis@oracle.com
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-29 12:58:47 -0500
    message:
      Merge up from mysql5.5 a fix for innodb-alter-restart.test
        ------------------------------------------------------------
        revno: 2875.545.62
        committer: kevin.lewis@oracle.com
        branch nick: mysql-5.5
        timestamp: Tue 2013-10-29 11:39:04 -0500
        message:
          Testcase i_innodb.innodb-alter-restart.test fails on some Windows platforms
          possibly since it was introduced in the patch for Bug#16720368 around 
          2013-04-30.  This fix is simply to adjust the mtr.add_suppression() lines
          in the testcase and to add a missing "\n" in the error message.
          
          Approved by Marko in RB 3746
------------------------------------------------------------
revno: 6796 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-29 16:32:52 +0100
message:
  Merge from 5.7.13-m13-Repo branch
    ------------------------------------------------------------
    revno: 6780.1.15
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Tue 2013-10-29 04:09:17 +0100
    message:
      Verify mysqlversion fix
    ------------------------------------------------------------
    revno: 6780.1.14
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 17:39:14 +0100
    message:
      Updated milestone values - testing
    ------------------------------------------------------------
    revno: 6780.1.13
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 13:32:29 +0100
    message:
      Updated version to match the rpm filename format
    ------------------------------------------------------------
    revno: 6780.1.12
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 11:28:50 +0100
    message:
      Fix for version and updated patch variable
    ------------------------------------------------------------
    revno: 6780.1.11
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 10:14:08 +0100
    message:
      Applied patch to fix libmysql.c issue
    ------------------------------------------------------------
    revno: 6780.1.10
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 09:10:59 +0100
    message:
      Changing permission in the source
    ------------------------------------------------------------
    revno: 6780.1.9
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 08:36:56 +0100
    message:
      Updated permission to perl  provides and requires
    ------------------------------------------------------------
    revno: 6780.1.8
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 05:59:10 +0100
    message:
      Added execute permission to Auto provides/requires filtering at prep section
    ------------------------------------------------------------
    revno: 6780.1.7
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 05:58:02 +0100
    message:
      Added execute permission to Auto provides/requires filtering
    ------------------------------------------------------------
    revno: 6780.1.6
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Mon 2013-10-28 05:56:54 +0100
    message:
      Added execute permission to Auto provides/requires filtering
    ------------------------------------------------------------
    revno: 6780.1.5
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Sun 2013-10-27 18:24:10 +0100
    message:
      Updated src_dir values
    ------------------------------------------------------------
    revno: 6780.1.4
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Sun 2013-10-27 17:28:29 +0100
    message:
      Updated src_dir values
    ------------------------------------------------------------
    revno: 6780.1.3
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Sat 2013-10-26 21:03:39 +0200
    message:
      Updated Version Variable
    ------------------------------------------------------------
    revno: 6780.1.2
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Fri 2013-10-25 21:50:28 +0200
    message:
      Updated CMakeLists.txt to include fedora and oel
    ------------------------------------------------------------
    revno: 6780.1.1
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.7.3-m13-Repo
    timestamp: Fri 2013-10-25 20:50:26 +0200
    message:
      Initial build of repo 5.7.3-m13 rpms
------------------------------------------------------------
revno: 6795 [merge]
committer: Georgi Kodinov <georgi.kodinov@oracle.com>
branch nick: B16944177-trunk
timestamp: Tue 2013-10-29 16:44:07 +0200
message:
  merge
    ------------------------------------------------------------
    revno: 6776.1.1
    committer: Georgi Kodinov <georgi.kodinov@oracle.com>
    branch nick: B16944177-trunk
    timestamp: Mon 2013-10-28 16:34:13 +0200
    message:
      Bug #16944177: IGNORE-DB-DIR GIVES AN ERROR WHEN FED VIA MY.CNF
      
      Duplicate directory names specified via multiple --ignore-db-dir options 
      are causing the server to exit.
      Fixed by making these duplicates be ignored (and a warning be printed in the
      server log). The server will still fail to start on other errors like e.g. 
      out of memory etc while processing the ignore db directories option.
      Test case added.
      Explicit type conversion added.
      Fixed the algorithm to generate the CSV out of the dirs list
------------------------------------------------------------
revno: 6794
committer: viswanatham gudipati <viswanatham.gudipati@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-29 17:54:27 +0530
message:
  i_innodb.innodb_bug11758237 : Disabled as it is failing all PB2 branches
------------------------------------------------------------
revno: 6793 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Tue 2013-10-29 16:47:21 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.9
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix2
    timestamp: Tue 2013-10-29 16:27:03 +0800
    message:
      BUG#17607956 - FTS: MORE SQL PARSER PROBLEMS, ASSERTION IN IN FILE PARS0LEX.L LINE 686
      
      The root cause is that innodb parser error occurs when parsing the
      database name. we assume database name starts by letter, not digit.
      
      The solution is quoting fts internal table name with double quote.
      
      rb#3742 is approved by Jimmy.Yang
------------------------------------------------------------
revno: 6792
committer: horst.hunger@oracle.com
branch nick: mysql-trunk
timestamp: Tue 2013-10-29 08:54:20 +0100
message:
  Bug #17667008: Moved memcachjed from mysql-test-extra to internal test suites.
------------------------------------------------------------
revno: 6791
committer: mayank prasad <mayank.prasad@oracle.com>
branch nick: trunk
timestamp: Tue 2013-10-29 12:32:30 +0530
message:
  Bug #17267760 	SPURIOUS CRASH IN LF_HASH, WITH TRUNCATE_STRESS TEST
  
  Adding an assert to make sure event_name_index is in limit.
------------------------------------------------------------
revno: 6790
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Tue 2013-10-29 15:11:17 +1100
message:
  WL#7290 - Follow up fix
------------------------------------------------------------
revno: 6789 [merge]
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Tue 2013-10-29 11:53:37 +1100
message:
  WL#7290 - Refactor the mini-transaction code.
  
  Convert all the #defines into enums, improve the dynarr performance.
  Use proper interfaces and improve extensibility. Add #define wrappers
  for existing calls to the old mtr functions, this was done to keep
  the changes to the minimum.
  
  Approved by Yasufumi Kinoshita and Kevin Lewis rb#3555.
    ------------------------------------------------------------
    revno: 6651.1.32 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Tue 2013-10-29 11:35:11 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.31 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Tue 2013-10-29 11:34:01 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.30 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Mon 2013-10-28 12:31:48 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.29 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-24 09:13:50 +1100
    message:
      WL#7290 - Merge from mysql-trunk.
    ------------------------------------------------------------
    revno: 6651.1.28
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-24 07:24:35 +1100
    message:
      WL#7290 - Adjust the debug include
    ------------------------------------------------------------
    revno: 6651.1.27
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-23 10:43:54 +1100
    message:
      WL#7290 - Rearrange the data members in mtr_t::Impl for potentially
      better packing.
    ------------------------------------------------------------
    revno: 6651.1.26 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-23 10:22:01 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.25
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-23 10:13:53 +1100
    message:
      WL#7290 - Fix compilation errors when ALL debug defines are enabled. Add an
      assertionn around the call to btr_validate_index() in btr0btr.cc.
    ------------------------------------------------------------
    revno: 6651.1.24
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Fri 2013-10-18 12:31:57 +1100
    message:
      WL#7290 - Unfix the dirty blocks after releasing the locks.
    ------------------------------------------------------------
    revno: 6651.1.23
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Fri 2013-10-18 10:29:05 +1100
    message:
      WL#7290 - Minor code cleanup.
    ------------------------------------------------------------
    revno: 6651.1.22 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Fri 2013-10-18 10:11:29 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.21
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-16 15:38:16 +1100
    message:
      WL#7290 - Undo an unrelated change.
    ------------------------------------------------------------
    revno: 6651.1.20
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-16 15:34:18 +1100
    message:
      WL#7290 - Remove a TODO
    ------------------------------------------------------------
    revno: 6651.1.19
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-16 11:05:56 +1100
    message:
      WL#7290 - Code cleanup
    ------------------------------------------------------------
    revno: 6651.1.18
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-16 10:49:06 +1100
    message:
      WL#7290 - Code cleanup
    ------------------------------------------------------------
    revno: 6651.1.17 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-16 10:13:08 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.16 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Tue 2013-10-15 09:25:32 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.15
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Tue 2013-10-15 09:24:15 +1100
    message:
      WL#7290 - Code clean up.
    ------------------------------------------------------------
    revno: 6651.1.14
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Tue 2013-10-15 07:34:03 +1100
    message:
      WL#7290 - Fix warning
    ------------------------------------------------------------
    revno: 6651.1.13 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Sat 2013-10-12 17:53:15 +1100
    message:
      WL#7290 - Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.12
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Sat 2013-10-12 17:48:58 +1100
    message:
      WL#7290 - Fix the code so that it compiles on Windows and with GCC 4.2.1.
    ------------------------------------------------------------
    revno: 6651.1.11 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Sat 2013-10-12 08:01:14 +1100
    message:
      Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.10
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Sat 2013-10-12 07:53:25 +1100
    message:
      WL#7290 - Make code compatible with GCC 4.2.1.
    ------------------------------------------------------------
    revno: 6651.1.9
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Fri 2013-10-11 15:54:01 +1100
    message:
      WL#7290 - Minor fix
    ------------------------------------------------------------
    revno: 6651.1.8 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Fri 2013-10-11 15:39:22 +1100
    message:
      Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.7
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-10 11:44:07 +1100
    message:
      WL#7290 - Code cleanup
    ------------------------------------------------------------
    revno: 6651.1.6
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-10 11:26:34 +1100
    message:
      WL#7209 - Minor cleanup
    ------------------------------------------------------------
    revno: 6651.1.5
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-10 11:04:26 +1100
    message:
      WL#7290 - Minor code clean up.
    ------------------------------------------------------------
    revno: 6651.1.4
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-10 10:52:02 +1100
    message:
      WL#7290 - Minor code cleanup
    ------------------------------------------------------------
    revno: 6651.1.3 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Thu 2013-10-10 10:35:07 +1100
    message:
      Merge from mysql-trunk
    ------------------------------------------------------------
    revno: 6651.1.2
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-09 22:01:15 +1100
    message:
      WL#7290 - Remove changes that are for future use.
    ------------------------------------------------------------
    revno: 6651.1.1 [merge]
    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
    branch nick: wl7290
    timestamp: Wed 2013-10-09 21:37:06 +1100
    message:
      WL#7920 - Factor out the changes from WL#6769. Move the mini-transaction
      specific changes to this worklog. WL#6769 was becoming unmanageable.
        ------------------------------------------------------------
        revno: 6127.1.38 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-10-09 13:48:15 +1100
        message:
          Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.37 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-10-09 09:41:01 +1100
        message:
          Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.36 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Fri 2013-09-20 08:31:38 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.35
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-09-11 12:48:33 +1000
        message:
          Fix a resize bug
        ------------------------------------------------------------
        revno: 6127.1.34 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Fri 2013-08-30 14:19:58 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.33 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-27 16:24:22 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.32 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Mon 2013-08-26 16:56:33 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.31 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-20 16:58:47 +1000
        message:
          Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.30 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-20 13:25:30 +1000
        message:
          Merge from mysql-trunk
            ------------------------------------------------------------
            revno: 6315.1.1
            committer: Sunny Bains <Sunny.Bains@Oracle.Com>
            branch nick: trunk
            timestamp: Tue 2013-08-20 13:09:17 +1000
            message:
              Bug#17320056  READVIEW::COPY_TRX_IDS CAUSES "ASSERTION FAILED: VECTOR SUBSCRIPT OUT OF RANGE"
              
              The pointer is not derefenced but it is cleaner to not make the call.
              
              Approved by Kevin Lewis in the bug report.
        ------------------------------------------------------------
        revno: 6127.1.29 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-20 10:26:43 +1000
        message:
          Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.28 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Mon 2013-08-19 13:46:10 +1000
        message:
          Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.27 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Fri 2013-08-16 09:49:54 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.26
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-15 16:55:43 +1000
        message:
          WL#6759 - Rest the used space size too.
        ------------------------------------------------------------
        revno: 6127.1.25 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-15 14:01:23 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.24 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-15 10:03:29 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.23 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-08-14 06:54:57 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.22 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-08-14 05:55:29 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.21 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-13 21:58:58 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.20 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Fri 2013-08-09 09:07:26 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.19 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-08 18:01:41 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.18 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-08 10:58:06 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.17 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-08-07 13:22:10 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.16 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-08-07 13:20:07 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.15 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-08-07 08:51:31 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.14 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-08-06 16:12:08 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.13 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Mon 2013-08-05 07:06:13 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.12 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Fri 2013-08-02 09:59:02 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.11 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-08-01 13:36:41 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.10 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-07-31 12:23:22 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.9 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Tue 2013-07-30 19:39:29 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.8 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Mon 2013-07-29 14:49:12 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.7 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Sat 2013-07-27 14:58:39 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.6 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-07-25 10:58:31 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.5 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Wed 2013-07-24 04:31:37 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.4 [merge]
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-07-18 21:49:48 +1000
        message:
          WL#6769 - Merge from mysql-trunk
        ------------------------------------------------------------
        revno: 6127.1.3
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-07-18 20:23:14 +1000
        message:
          WL#6769 - Remove WAIT_MODE_ALL_GROUPS. InnoDB has only ever had one group.
        ------------------------------------------------------------
        revno: 6127.1.2
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-07-18 19:03:28 +1000
        message:
          WL#6769 - Rename redo_log_t to RedoLog.
        ------------------------------------------------------------
        revno: 6127.1.1
        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
        branch nick: wl6769
        timestamp: Thu 2013-07-18 18:47:16 +1000
        message:
          WL#6769 - Resync with mysql-trunk
------------------------------------------------------------
revno: 6788
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Tue 2013-10-29 11:30:41 +1100
message:
  Bug#17332300 - REMOVE TRX_SYS_T::RO_TRX_LIST, IT IS NOT REQUIRED AFTER WL#6578
  
  Get rid of trx_sys_t::ro_trx_list. Adding and removing a transaction
  from the ro_trx_list is very costly. It shows up most on high-end HW.
  There is no need to put the transactions by default on the RO trx list.
  User transactions will still be put on the trx_t::mysql_trx_list. Currently,
  background RO transactions are not on any list.
  
  Approved by Jimmy Yang rb#3574
------------------------------------------------------------
revno: 6787 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Mon 2013-10-28 17:36:50 +0100
message:
  merge of post-push fix for bug#17565888/bug#14621190 into mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.8 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Mon 2013-10-28 17:25:16 +0100
    message:
      post-push fix for bug#1756588/bug#14621190
        ------------------------------------------------------------
        revno: 2875.545.61
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: test-5.5
        timestamp: Mon 2013-10-28 17:08:31 +0100
        message:
          post-push fix for bug#17565888/bug#14621190
------------------------------------------------------------
revno: 6786
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Mon 2013-10-28 16:22:40 +0100
message:
  WL#6606: Offload THD initialization and network initialization to worker thread.
  
  Fix incomplete patch for: Restore ability to interrupt threads while debugging.
------------------------------------------------------------
revno: 6785 [merge]
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: main-tr
timestamp: Mon 2013-10-28 15:04:24 +0100
message:
  Upmerge fix to file_contents.test
    ------------------------------------------------------------
    revno: 3902.291.7
    committer: Bjorn Munch <bjorn.munch@oracle.com>
    branch nick: main-56
    timestamp: Mon 2013-10-28 15:01:49 +0100
    message:
      RE ticket #46950 main.file_contents failing continuously on PB2 for 5.6 for elx-x86 platform.
      
        Fix test by adding glob pattern to also cover ULN rpms
------------------------------------------------------------
revno: 6784 [merge]
committer: Libing Song <libing.song@oracle.com>
branch nick: mysql-trunk-wl7169
timestamp: Mon 2013-10-28 18:21:31 +0800
message:
  Auto Merge to mysql-trunk
    ------------------------------------------------------------
    revno: 6748.1.2
    committer: Libing Song <libing.song@oracle.com>
    branch nick: mysql-trunk-wl7169
    timestamp: Thu 2013-10-24 14:06:49 +0800
    message:
      WL#7169 Semisync: make master wait for more than one slave to ack back
      
      Postfix:
      - Set rpl_semi_sync_master_timeout longer to guarantee it doesn't timeout
        on slow machines.
      - Adjusted coverage test order, so it can cover more code.
    ------------------------------------------------------------
    revno: 6748.1.1 [merge]
    committer: Libing Song <libing.song@oracle.com>
    branch nick: mysql-trunk-wl7169
    timestamp: Wed 2013-10-23 09:48:00 +0800
    message:
      Auto Merge
        ------------------------------------------------------------
        revno: 6738.1.1
        committer: Libing Song <libing.song@oracle.com>
        branch nick: mysql-trunk
        timestamp: Tue 2013-10-22 13:55:46 +0800
        message:
          WL#7169 Semisync: make master wait for more than one slave to ack back
          
          DESCRIPTION
          ===========
          This feature makes semisync master waits until receiving acknowledgements
          from more than one slaves. It guarantees the events are already replicated
          to more than one slaves when the transaction commit sucessfully.
          
          How many slaves it should wait are controlled by the new semisync master
          system variable "rpl_semi_sync_master_wait_slaves". Its values can be
          between 1 and 32. The default value is 1 and it can be changed dynamically.
          
          DESIGN
          ======
          Received acknowledgements are mantained in an array that its size is
          equal to rpl_semi_sync_master_wait_slaves - 1. Any semisync slave takes only
          one slot and only the latest ack of the slave is recorded. Each slot
          includes three items, they are server_id, binlog_name and binlog_position.
          
          If an ack should be inserted in the array and it is full, then the events
          before minimum ack in the array are replicated to enough slaves. So it will
          find the minimum ack in the array and report it to the module(which will update
          replied ack and wake up transactions) and remove the minimum ack from the array.
          
          Suppose rpl_semi_sync_master_wait_slaves = 4.
          
          coming acks          slot 1          slot 2           slot 3
          ===========          ==========      ==========       ==========
          1:log1:120           1:log1:120
          2:log1:120           1:log1:120      2:log1:120
          1:log1:150           1:log1:150      2:log1:120
          3:log1:120           1:log1:150      2:log1:120       3:log1:120
          
          4:log1:150           It is full. The minimum ack is log1:120. It is reported
                               and removed from the array. and the coming ack is added
                               into the array if it is greater than minimum ack.
                               Now the array looks like:
          
          coming acks          slot 1          slot 2           slot 3
          ===========          ==========      ==========       ==========
                               1:log1:150      4:log1:150
------------------------------------------------------------
revno: 6783
committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-28 12:05:16 +0530
message:
  
  Bug #17665353 RECENT REGRESSION: FAILING ASSERTION:
  THR_GET_TRX(THR)->ERROR_STATE == DB_SUCCESS
  
  Problem:
  
  The fix for the Bug #11758237 "INSERT ON DUPLICATE KEY UPDATE SOMETIMES
  WRITES BINLOG POSITION INCORRECT" caused a regression.  The fix for the
  bug#11758237 allows processing of unique secondary indexes even after
  the DB_DUPLICATE_KEY error has been detected.  Once the duplicate key
  error has been detected, no actual insert will be attempted, but just
  the necessary gap locks are taken.  The block that checks this was
  missed because of putting it as part of the else block.
  
  Solution:
  
  Once the duplicate key error is detected, we will not attempt actual
  insert of the data.  Instead only gap lock will be placed.  This 
  code block is now independently placed.  
  
  rb#3741 approved by Marko.
------------------------------------------------------------
revno: 6782 [merge]
committer: bin.x.su@oracle.com
branch nick: mysql-trunk
timestamp: Sun 2013-10-27 13:55:39 +0800
message:
  BUG#16245498 SERVER CRASH WITH INNODB_BUFFER_POOL_SIZE<8M OR SMALL
  INNODB_SYNC_ARRAY_SIZE
  
  == Analysis ==
  
  There are two different bugs(defects) here:
  1. sync_array_reserve_cell will ut_error
  2. sync_array_init will trigger ut_a(n_threads > srv_sync_array_size)
  
  == Solution ==
  
  For 1, sync_array_reserve_cell should return true if a free cell is found,
  otherwise false, then the callers will choose another sync_array to reserve
  a free cell
  
  For 2, the assertion is too strict. Since the sync_wait_array doesn't require
  that each array has more than one slot, the assertion can be replaced by
  ut_a(n_threads > 0), how to use sync_array efficiently depends on users
  
  Also, this patch backports the fix for BUG#16884077 - ASSERT FAILURE IN
  SERVER WHEN LARGE NUMBER OF CLIENT EXECUTES QUERY(rb#2956).
  After this backport there shall not be any relationship between
  innodb_buffer_pool_size and number of threads. max_connections is
  introduced to get the max number of threads.
  
  rb#2464, approved by Jimmy.
    ------------------------------------------------------------
    revno: 3902.291.6
    committer: bin.x.su@oracle.com
    branch nick: mysql-5.6
    timestamp: Sun 2013-10-27 11:36:57 +0800
    message:
      BUG#16245498 SERVER CRASH WITH INNODB_BUFFER_POOL_SIZE<8M OR SMALL
      INNODB_SYNC_ARRAY_SIZE
      
      == Analysis ==
      
      There are two different bugs(defects) here:
      1. sync_array_reserve_cell will ut_error
      2. sync_array_init will trigger ut_a(n_threads > srv_sync_array_size)
      
      == Solution ==
      
      For 1, sync_array_reserve_cell should return true if a free cell is found,
      otherwise false, then the callers will choose another sync_array to reserve
      a free cell
      
      For 2, the assertion is too strict. Since the sync_wait_array doesn't require
      that each array has more than one slot, the assertion can be replaced by
      ut_a(n_threads > 0), how to use sync_array efficiently depends on users
      
      Also, this patch backports the fix for BUG#16884077 - ASSERT FAILURE IN
      SERVER WHEN LARGE NUMBER OF CLIENT EXECUTES QUERY(rb#2956).
      After this backport there shall not be any relationship between 
      innodb_buffer_pool_size and number of threads. max_connections is
      introduced to get the max number of threads.
      
      rb#2464, approved by Jimmy.
------------------------------------------------------------
revno: 6781
committer: Benny.Wang<Benny.Wang@oracle.com>
branch nick: mysql-trunk-wl7027
timestamp: Sat 2013-10-26 08:45:21 +0200
message:
  WL#7027: Deprecate EXTENDED and PARTITIONS flags of EXPLAIN
  	Fix: Make daily_build stable and fix hudson regression failures
------------------------------------------------------------
revno: 6780
committer: Benny.Wang<Benny.Wang@oracle.com>
branch nick: mysql-trunk-wl7027
timestamp: Fri 2013-10-25 14:06:47 +0200
message:
  WL#7027: Deprecate EXTENDED and PARTITIONS flags of EXPLAIN
        Fix: Fix regression test failure for daily test.
------------------------------------------------------------
revno: 6779
committer: Rohit Kalhans<rohit.kalhans@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 17:18:15 +0530
message:
  BUG#17639571: COMPILATION WARNING IN LOG_EVENT.CC AFTER WL#6314                 
                                                                                  
  Problem: After the push of WL#6813 there is warning being                       
  thrown during compilation. It is due to an incorrect if                         
  condition which throws error when compiled with                                 
  -Wlogical-not-parentheses                                                       
                                                                                  
  Fix: changed the logical condition to conditional operator '=='
  without changing the condition logic since
  file->commit_seq_offset is an unsigned int.
------------------------------------------------------------
revno: 6778 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 13:42:06 +0200
message:
  Merge from 5.6
    ------------------------------------------------------------
    revno: 3902.291.5
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 13:13:15 +0200
    message:
      updating the compatver to latest 5.1.72
------------------------------------------------------------
revno: 6777
committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 17:05:01 +0530
message:
  Fixing a pb2 issue.  There can be multiple duplicate key errors, and
  we need to restore the first index that caused the duplicate key error.
  Fix approved by Marko at #innodb channel.
------------------------------------------------------------
revno: 6776
committer: Bharathy Satish <bharathy.x.satish@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 16:54:07 +0530
message:
  Bug#17653288 MYSQL_RESET_CONNECTION DOES NOT RESET LAST_INSERT_ID
  
  Problem: mysql_reset_connection as part of this resetting session state
  it should reset last_insert_id value which it does not.
  Fix: Fix is to reset all the variables associated with last_insert_id
   in THD class.
------------------------------------------------------------
revno: 6775
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: main-tr
timestamp: Fri 2013-10-25 13:19:22 +0200
message:
  Undo mtr fix for --innodb boostrap options, it will break some tests
------------------------------------------------------------
revno: 6774 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 12:51:11 +0200
message:
  Upmerge from 5.6 - repo code change
    ------------------------------------------------------------
    revno: 3902.291.4 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 11:40:06 +0200
    message:
      -  Merge latest repo code from 5.6.14-Fedora branch
      -  Removed mysql-5.1.70.tar.gz from source
      -  Updated CMakeLists.txt to remove mysql-5.1.70.tar.gz
        ------------------------------------------------------------
        revno: 3902.280.14
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Wed 2013-10-16 12:50:48 +0200
        message:
          Added mysql.init to CMakeLists.txt
        ------------------------------------------------------------
        revno: 3902.280.13
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Wed 2013-10-16 11:42:54 +0200
        message:
          Fixed mysql_install_db usage and improved handling of plugin directory
------------------------------------------------------------
revno: 6773
committer: sayantan dutta <sayantan.dutta@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 15:19:37 +0530
message:
  Bug 16344230 - DROP --INNODB_FAST_SHUTDOWN=2 FOR FIRST MTR (BOOTSTRAP) STARTUP
------------------------------------------------------------
revno: 6772
committer: Krunal Bauskar krunal.bauskar@oracle.com
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 15:04:32 +0530
message:
  Bug #17446761: INNODB.INNODB_WL6560_DEBUG ,INNODB-LOG-FILE-SIZE GET WRONG
  ERROR FOR MYSQLD_CMD
  
  
   - To test recovery for any crash or failure during server start-up phase
     RECOVERY_CRASH technique is used.
  
    - This technique use to invoke exit(3) which in turn invokes cleanup action.
      Cleanup action at this stage can lead to error or deadlock as the parallely
      started rollback thread might be in half-cooked state when it is forced to
      cleanup.
  
    - Ideally RECOVERY_CRASH should simply kill the server instantenously to
      stimulate actual crash where-in there would no cleanup action involved.
      Fixed RECOVERY_CRASH for the same using _exit() so that exit handlers
      are not called which performs cleanup action.
  
     Patch approved by: Sunny (rb#3681) 
------------------------------------------------------------
revno: 6771 [merge]
committer: Jimmy Yang <jimmy.yang@oracle.com>
branch nick: trunk5
timestamp: Fri 2013-10-25 17:20:27 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.291.3
    committer: Jimmy Yang <jimmy.yang@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 17:18:42 +0800
    message:
      Fix Bug #17350055 - MEMORY ACCESS VIOLATION FOR A CERTAIN FTS BOOLEAN
      MODE QUERY
                        
      rb://3668 approved by Sunny Bains
------------------------------------------------------------
revno: 6770 [merge]
committer: Luis Soares <luis.soares@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 10:11:59 +0100
message:
  BUG#17460821
  
  Automerged latest mysql-5.6 into mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.291.2 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 10:07:13 +0100
    message:
      BUG#17460821
      
      Automerged from mysql-5.5 into mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.60
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-10-25 09:42:59 +0100
        message:
          BUG#17460821: ASSERTION ERROR WHEN STOPPING SLAVE AFTER SEMI-SYNC ON MASTER IS DISABLED
          
          In the test case, make sure that the IO thread is not stopped 
          during the binlog  dump request.
------------------------------------------------------------
revno: 6769
committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 12:13:26 +0530
message:
  Bug #11758237 INSERT ON DUPLICATE KEY UPDATE SOMETIMES WRITES BINLOG
  POSITION INCORRECT
  
  Problem:
  
  When concurrent INSERT ... ON DUPLICATE UPDATE statement is executed on a
  table, the final outcome is sometimes not serializable.
  
  Solution:
  
  When INSERT ... ON DUPLICATE UPDATE statement is execute, first the record
  would be inserted into the clustered index followed by the secondary indexes.
  If a duplicate error is encountered, we do not stop processing.  We continue to
  process all the unique secondary indexes and place the necessary gap locks.  We
  skip non-unique secondary indexes.  Once a duplicate error has been
  encountered, the records will not be actually inserted but only gap locks will
  be taken.
  
  rb#3196 approved by Marko
------------------------------------------------------------
revno: 6768 [merge]
committer: sayantan dutta <sayantan.dutta@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 12:02:26 +0530
message:
  17654275 upmerge 5.6 => 5.7
    ------------------------------------------------------------
    revno: 3902.291.1 [merge]
    committer: sayantan dutta <sayantan.dutta@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 11:54:50 +0530
    message:
      17654275 upmerge 5.5 => 5.6
------------------------------------------------------------
revno: 6767 [merge]
committer: sayantan dutta <sayantan.dutta@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-25 11:55:27 +0530
message:
  17654275 upmerge 5.6 => 5.7
    ------------------------------------------------------------
    revno: 3902.277.129 [merge]
    committer: sayantan dutta <sayantan.dutta@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-25 11:45:04 +0530
    message:
      17654275 upmerge 5.5 => 5.6
        ------------------------------------------------------------
        revno: 2875.545.59
        committer: sayantan dutta <sayantan.dutta@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-10-25 11:38:34 +0530
        message:
          Bug #17654275 - MTR EXTRACT_WARNING_LINES IS NOT REMOVING TIMESTAMP IN UTC FORMAT WITH TIMEZONES
------------------------------------------------------------
revno: 6766
committer: Pavan Naik<pavan.naik@oracle.com>
branch nick: mysql-sys_vars
timestamp: Fri 2013-10-25 11:41:21 +0530
message:
  Bug #17632868 : ADD TESTS FOR VARIABLES THAT DIFFER FOR 32-BIT AND 64-BIT IN SYS_VARS SUITE
  
  Fix :
  Reviwed the sys_vars suite for the variables that differ for 32-bit
  and 64-bit machine and added missing tests for these variables.
------------------------------------------------------------
revno: 6765
committer: prabakaran thirumalai <prabakaran.thirumalai@oracle.com>
branch nick: mysql-trunk-review
timestamp: Thu 2013-10-24 22:26:12 +0530
message:
  WL#6407 Code reorganization to avoid race condition between
  server main thread and the kill server thread
  
  New class Global_THD_manager is added which encapsulates
  global_thread_list and synchronization primitives related to
  this data structures such as LOCK_thread_count and COND_thread_count.
  It provides method to add/remove/find/count/do_func/traverse
  global_thread_list and guards it with LOCK_thread_count internally.
  
  Removed ready_to_exit flag and joining signal_hand thread
  with the main mysqld thread during server shutdown. Removed
  kill_server_thread and calling clean_up() only from the
  main mysqld thread. For Windows, shutdown handler thread
  is joined with main mysqld thread during server shutdown.
  
  Removed assert in storage/perfschema/pfs_lock.h which relaxes
  double free when ready_to_exit flag is set. Also enabled
  commented out code in performance schema cleanup.
------------------------------------------------------------
revno: 6764
committer: Benny.Wang<Benny.Wang@oracle.com>
branch nick: mysql-trunk-wl7027
timestamp: Thu 2013-10-24 14:24:41 +0200
message:
  WL#7027:Deprecate EXTENDED and PARTITIONS flags of EXPLAIN
  post-fix: Fix regression test failures for big-test introduced by WL7027.
------------------------------------------------------------
revno: 6763 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Thu 2013-10-24 18:28:43 +0800
message:
  Null merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.128
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Thu 2013-10-24 18:24:55 +0800
    message:
      BUG#17402002 - FTS: INNODB: TRYING TO TRUNCATE A MISSING INDEX OF TABLE
      
      Supress the warning message when it's a fts index.
      
      rb#3683 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6762
committer: Pavan Naik<pavan.naik@oracle.com>
branch nick: mysql-wl7249
timestamp: Thu 2013-10-24 15:27:40 +0530
message:
  WL#7249 : Create automated tests for mysql_config_editor --password
  
  Fix :
  Created an automated test for mysql_config_editor --password using perl expect module
  as mysql_config_editor is user interactive.
------------------------------------------------------------
revno: 6761 [merge]
committer: Tanjot Uppal <tanjot.uppal@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-24 15:02:05 +0530
message:
  Null merge from 5.6 to trunk for Backporting the skipping logic for the below perfschema tests, with Query Cache Enabled.
  
  added:
    mysql-test/include/have_QC_Disabled.inc
  modified:
    mysql-test/suite/perfschema/t/aggregate.test
    mysql-test/suite/perfschema/t/event_aggregate.test
    mysql-test/suite/perfschema/t/event_aggregate_no_a.test
    mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
    mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
    mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
    mysql-test/suite/perfschema/t/event_aggregate_no_h.test
    mysql-test/suite/perfschema/t/event_aggregate_no_u.test
    mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
    mysql-test/suite/perfschema/t/nesting.test
    mysql-test/suite/perfschema/t/view_table_io.test
    ------------------------------------------------------------
    revno: 3902.277.127
    committer: Tanjot Uppal <tanjot.uppal@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-24 14:56:21 +0530
    message:
      Backporting from trunk to 5.6 the skipping logic for the below perfschema tests, with Query Cache Enabled.
      
      added:
        mysql-test/include/have_QC_Disabled.inc
      modified:
        mysql-test/suite/perfschema/t/aggregate.test
        mysql-test/suite/perfschema/t/event_aggregate.test
        mysql-test/suite/perfschema/t/event_aggregate_no_a.test
        mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
        mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
        mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
        mysql-test/suite/perfschema/t/event_aggregate_no_h.test
        mysql-test/suite/perfschema/t/event_aggregate_no_u.test
        mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
        mysql-test/suite/perfschema/t/nesting.test
        mysql-test/suite/perfschema/t/view_table_io.test
------------------------------------------------------------
revno: 6760
committer: Krunal Bauskar krunal.bauskar@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-24 14:05:40 +0530
message:
  - Bug #17446761: INNODB.INNODB_WL6560_DEBUG ,INNODB-LOG-FILE-SIZE GET WRONG
    ERROR FOR MYSQLD_CMD
  
    - Reverting change related to bug as it is causing unexpected failure of tcs
      on Solaris/FreeBSD
------------------------------------------------------------
revno: 6759
committer: Krunal Bauskar krunal.bauskar@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-24 11:10:19 +0530
message:
  - Bug #17446761: INNODB.INNODB_WL6560_DEBUG ,INNODB-LOG-FILE-SIZE GET WRONG
    ERROR FOR MYSQLD_CMD
  
    - To test recovery for any crash or failure during server start-up phase
      RECOVERY_CRASH technique is used.
  
    - This technique use to invoke exit(3) which in turn invokes cleanup action.
      Cleanup action at this stage can lead to error or deadlock as the parallely
      started rollback thread might be in half-cooked state when it is forced to
      cleanup.
  
    - Ideally RECOVERY_CRASH should simply kill the server instantenously to
      stimulate actual crash where-in there would no cleanup action involved.
      Fixed RECOVERY_CRASH for the same.
  
    Patch approved by: Sunny (rb#3681) 
------------------------------------------------------------
revno: 6758
committer: Benny.Wang<Benny.Wang@oracle.com>
branch nick: mysql-trunk-wl7027
timestamp: Wed 2013-10-23 17:36:21 +0200
message:
  WL#7027 Deprecate EXTENDED and PARTITIONS flags of EXPLAIN
    In order to simplify code and unify handling of JSON and TRADITIONAL EXPLAIN formats
    EXTENDED and PARTITIONS flags are dropped from EXPLAIN, which now behaves like both are specified.
    Deprecation warning is thrown when any of those flags are used.
------------------------------------------------------------
revno: 6757 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-23 17:28:49 +0300
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.126
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-23 17:26:54 +0300
    message:
      Fix a test failure.
------------------------------------------------------------
revno: 6756 [merge]
committer: Ashish Agarwal<ashish.y.agarwal@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-23 16:21:15 +0530
message:
  Bug#16938568: Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.125
    committer: Ashish Agarwal<ashish.y.agarwal@oracle.com>
    branch nick: bug_16938568
    timestamp: Wed 2013-10-23 15:47:54 +0530
    message:
      Bug#16938568: ERROR 1819 (HY000): YOUR PASSWORD DOES NOT SATISFY
                    THE CURRENT POLICY REQUIREMEN
      
      PROBLEM: Grant without indentified clause was not allowed
               even if the user was previously created.
               This bug is a regression caused by bug#16346443.
               We missed as case: allow to execute grant statement
               without identified clause when user exsist.
      
      SOLUTION: Allowing grant statement (without identified clause)
                to execute when validate_password plugin is on.
------------------------------------------------------------
revno: 6755 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-23 11:17:08 +0300
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.124
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-23 10:51:18 +0300
    message:
      Bug#17624926 PREBUILT->TRX->ERROR_KEY_NUM UNINITIALIZED IN ERROR INJECTION
    ------------------------------------------------------------
    revno: 3902.277.123
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-23 10:45:20 +0300
    message:
      Bug#17512497 UPDATED ROWS REMAIN AFTER ONLINE DROP+ADD PRIMARY KEY
      Bug#17625063 REMOVE BOGUS FAULT TOLERANCE FROM ROW_LOG_TABLE_APPLY
      
      row_log_table_apply_update(): If the new PRIMARY KEY columns change
      (but the old PRIMARY KEY columns stay unchanged), always perform a
      delete followed by an insert.
      
      It should be safe to skip the trx_id comparison altogether, because
      row_merge_read_clustered_index() is performing a REPEATABLE READ when
      doing the initial copying.
      
      row_log_table_apply_convert_mrec(): Remove an outdated comment. We no
      longer track rollbacks.
      
      row_log_table_apply_update(): Remove the parameter trx_id_col. There
      is no need to compare the trx_id.  Throw an error if the record
      unexpectedly exists or does not exist.
      
      row_log_apply_op_low(): Add comments that describe the situations when
      a record already exists or does not exist. On duplicate key error,
      abort the log application immediately by flagging DB_DUPLICATE_KEY.
      
      row_log_apply(): Do not flag DB_DUPLICATE_KEY, because it will now be
      flagged in row_log_apply_op_low().
      
      rb#3638 approved by Jimmy Yang
------------------------------------------------------------
revno: 6754
committer: Shivji Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk_b17533190
timestamp: Wed 2013-10-23 13:01:26 +0530
message:
  BUG#17533190- SLAVE_OPEN_TEMP_TABLES SHOWING 0 WITH >0 OPEN 
                TEMP TABLES AT SLAVE
  
  Problem: 
  The test rpl_mts_submode_switch.test uses debug statements 
  to force the slave applier to apply events in parallel. 
  However in case of temporary-tables this does not work 
  since the tables should be deleted by any one thread at a 
  time. This is because once a worker thread takes ownership
  of any temporary tables created by a connection, those 
  tables become inaccesible to other worker threads. 
  Therefore when the slave worker thread tries to execute 
  DROP IF EXISTS, some tables while are owned by some other 
  worker thread is left behind causing the next test to 
  report a warning and hence fail.
  
  Solution: 
  Removed the debug set from the master before dropping the 
  temporary tables there-by allowing the tables to be dropped 
  'naturally' on the slave either sequentially or in parallel 
  depending on how they were dropped on the master.
------------------------------------------------------------
revno: 6753
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-plain
timestamp: Tue 2013-10-22 13:42:58 +0200
message:
  Bug#17486216: FIX NEW COMPILATION WARNINGS WITH CLANG 3.3
  
  Post-push fix: Fix GCC 4.4/4.6 compiler warning.
------------------------------------------------------------
revno: 6752
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug17486216
timestamp: Tue 2013-10-22 12:11:22 +0200
message:
  Bug#17486216: FIX NEW COMPILATION WARNINGS WITH CLANG 3.3
  
  Fix warnings of type:
  
  -Wtautological-constant-out-of-range-compare
  e.g. warning: comparison of constant 32767 with expression of type 'enum_field_types' is always true
  
  -Wconstant-logical-operand
  e.g. warning: use of logical '||' with constant operand
  
  -Wunused-function
------------------------------------------------------------
revno: 6751
committer: Neeraj Bisht <neeraj.x.bisht@oracle.com>
branch nick: lat-trunk
timestamp: Tue 2013-10-22 14:33:01 +0530
message:
  Bug#17500866 -	SELECT COUNT(DISTINCT ..) RETURNS WRONG RESULT WHEN 
                  TEMP TABLE SIZE IS LOW
  
  Problem: 
  When running a simple COUNT(DISTINCT) query on a table that 
  contains a large number of distinct values, the query can 
  return a wrong result. In most cases the query will return 0 
  or an empty result. This is most likely to happen when the 
  maximum size of internal temporary tables are set to a 
  low value by setting either tmp_table_size or 
  max_heap_table_size to a low value. 
  
  Analysis:
  Suppose the table contains records where the field for doing 
  COUNT(DISTINCT) on has the following values:
  
  
  -->1 1 9 5 4 1 0 8 11 7 12 3 6
  
  Assume that tmp_table_size is set to 16 in this example. 
  
  First we find the first 4 unique value and put it is a file in a sorted
  order (why 4? because size of field is 4 and tmp_table_size is 16)
  that is 1 4 5 9-->f1
  then second
  0 1 8 11-->f2
  third will have
  3 6 7 12-->f3
  
  NOTE:f1,f2,f3 are pointing to same file
  after fetching whole record we
  
  Doing the COUNT(DISTINCT) is done by Unique::walk() which in this case 
  will call merge_walk() to do the main job. In merge_walk() the first 
  elements from each file: 
  
  f1--> 1 4
  f2--> 0 1
  f3--> 3 6
  
  here we compare the first value, which ever is least remove 
  it(and all other which have same value from the queue and 
  increment the count distinct counter.
  
  like in this we will remove 0 from f2.then we have like
  f1--> 1 4
  f2--> 1
  f3--> 3 6
  then we will remove 1 from f1, f2  and fetch remaining value for f2
  it will be like this
  f1--> 4
  f2--> 8 11
  f3--> 3 6
  
  Like this we will get count distinct value.
  
  When counting the distinct values in merge_walk() a merge buffer 
  is used. This buffer must be able to store one record from each 
  of the file pointer (f1, f2, f3 above). The merge_buffer is allocated 
  in Unique::walk() and  with a size that is equal to 
  MIN(tmp_table_size, max_heap_table_size). When tmp_table_size or 
  max_heap_table_size is very small, there might be a large number of file 
  pointers to read from. In the case where this bug occurs, the number of 
  files is so large that there is not enough space to store one record 
  from each file pointer. This situation is detected in merge_walk() and 
  handled by just returning an error status. The COUNT(DISTINCT) operation 
  is not done and this causes 0 to be returned as the result.
  
  
  Solution:
  Try to allocate the merge buffer with a size where it have space to store 
  atleast one record from each file pointers.
  
  Note:
  Till now we are not taking care of the cases, where situation is same but 
  we can't able to allocate that much memory. In those cases again we will give 
  result as zero.
------------------------------------------------------------
revno: 6750 [merge]
committer: David Zhao <david.zhao@oracle.com>
branch nick: trunk
timestamp: Tue 2013-10-22 16:35:58 +0800
message:
  Bug #17564492 : EXPLAIN FOR CONNECTION SYNTAX ERROR IF CONNECTION_ID > 2147483647
            Fix : Use real_ulong_num to allow a wider range of unsigned integers. 
                  Use strtoll to get HEX_NUM values to cover the whole ulong range.
    ------------------------------------------------------------
    revno: 6629.3.4
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes
    timestamp: Tue 2013-10-22 16:31:10 +0800
    message:
      Bug #17564492 WL6369: EXPLAIN FOR CONNECTION SYNTAX ERROR IF CONNECTION_ID > 2147483647
      Use replace_regex to avoid result differences on different platforms.
    ------------------------------------------------------------
    revno: 6629.3.3 [merge]
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes
    timestamp: Tue 2013-10-22 14:58:13 +0800
    message:
      merge
    ------------------------------------------------------------
    revno: 6629.3.2
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes
    timestamp: Tue 2013-10-22 09:16:36 +0800
    message:
      Bug #17564492 WL6369: EXPLAIN FOR CONNECTION SYNTAX ERROR IF CONNECTION_ID > 2147483647
                  Fix : use real_ulong_num to allow a wider range of unsigned integers.
    ------------------------------------------------------------
    revno: 6629.3.1 [merge]
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes
    timestamp: Mon 2013-10-21 20:42:26 +0800
    message:
      merge
------------------------------------------------------------
revno: 6749
committer: Vinay Fisrekar <vinay.fisrekar@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-22 13:39:40 +0530
message:
  BUG 17625001 - MAIN.INSERT_SELECT HAS SPORADICLY DIFFS IN RESULT. (Test recently changed to run with innodb)
  Fix : added --sorted_result for select
------------------------------------------------------------
revno: 6748 [merge]
committer: David Zhao <david.zhao@oracle.com>
branch nick: trunk
timestamp: Tue 2013-10-22 12:50:01 +0800
message:
  Bug #17564493 : EXPLAIN FOR CONNECTION SHOULD RETURN AN ERROR FOR INVALID CONNECTION_ID
  Need to expect the returned error in test script for the cases with invalid arguments.
    ------------------------------------------------------------
    revno: 6629.2.5
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes2
    timestamp: Tue 2013-10-22 12:33:32 +0800
    message:
      Bug #17564493 : EXPLAIN FOR CONNECTION SHOULD RETURN AN ERROR FOR INVALID CONNECTION_ID
      Need to expect the returned error in test script for the cases with invalid arguments.
    ------------------------------------------------------------
    revno: 6629.2.4
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes2
    timestamp: Tue 2013-10-22 10:20:48 +0800
    message:
      merge
    ------------------------------------------------------------
    revno: 6629.2.3 [merge]
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes2
    timestamp: Tue 2013-10-22 10:18:29 +0800
    message:
      merge
    ------------------------------------------------------------
    revno: 6629.2.2 [merge]
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes2
    timestamp: Mon 2013-10-21 17:33:53 +0800
    message:
      merge in latest code from trunk
    ------------------------------------------------------------
    revno: 6629.2.1
    committer: David Zhao <david.zhao@oracle.com>
    branch nick: bugfixes2
    timestamp: Mon 2013-10-21 14:50:36 +0800
    message:
      Bug #17564493 WL6369: EXPLAIN FOR CONNECTION SHOULD RETURN AN ERROR FOR INVALID CONNECTION_ID
            Fix : Report error when unable to find thread by specified thread id.  patch version 2.
------------------------------------------------------------
revno: 6747 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Tue 2013-10-22 11:26:33 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.122
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Tue 2013-10-22 11:22:38 +0800
    message:
      BUG#17456092 - FAILING ASSERTION: RESULT != FTS_INVALID
      
      The root cause is that we remove the savepoint when rollbacking to a
      savepoint. The fix is to restore the savepoint after the removal.
      
      rb#3652 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6746 [merge]
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Mon 2013-10-21 17:47:10 +0200
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.121 [merge]
    committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
    branch nick: mysql-5.6-test
    timestamp: Mon 2013-10-21 17:43:15 +0200
    message:
      Merge from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.58
        committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
        branch nick: mysql-5.5-bug17632386
        timestamp: Mon 2013-10-21 13:14:46 +0200
        message:
          Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINED
          
          -Wl,--no-undefined (=-z defs) gives linking errors when used with WITH_ASAN.
          According to the documentation:
          "When linking shared libraries, the AddressSanitizer run-time is not linked,
          so -Wl,-z,defs may cause link errors (don?t use it with AddressSanitizer)."
          
          This patch turns off -Wl,--no-undefined if WITH_ASAN is used.
------------------------------------------------------------
revno: 6745
committer: Shivji Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk_b17572714
timestamp: Mon 2013-10-21 20:18:25 +0530
message:
  BUG#17572714- POSSIBLE BUFFER OVERFLOW IN
                TABLE_REPLICATION_CONNECTION_STATUS::MAKE_ROW()
  
  Problem:
  The source_UUID field in replication_connection_status is
  declared as char source_uuid[UUID_LENGTH]. But the memcpy()
  in make_row() copies UUID_LENGTH+1 bytes which could result
  in copying an extra byte than the allotted memory for this
  field.
  
  Fix:
  Corrected memcpy() to copy only UUID_LENGTH bytes instead of
  UUID_LENGTH+1.
  No test case was added for this bug fix because the issue was
  only caught by Fortify.
------------------------------------------------------------
revno: 6744
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug17633291
timestamp: Mon 2013-10-21 15:50:57 +0200
message:
  Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG
  
  This patch adds "-g -fno-omit-frame-pointer -fno-strict-aliasing" when
  compiling with Clang. Previously some of these were only set when
  compiling on OSX (Clang also supports Linux).
  
  The patch also removes some legacy ICC options.
------------------------------------------------------------
revno: 6743
committer: David Zhao <david.zhao@oracle.com>
branch nick: trunk
timestamp: Mon 2013-10-21 20:37:09 +0800
message:
  Bug #17564493 WL6369: EXPLAIN FOR CONNECTION SHOULD RETURN AN ERROR FOR INVALID CONNECTION_ID
        Fix : Report error when unable to find thread by specified thread id.
------------------------------------------------------------
revno: 6742 [merge]
committer: Aditya A <aditya.a@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-21 12:21:02 +0530
message:
  Bug #16051817  GOT ERROR 124 FROM STORAGE ENGINE 
                 ON DELETE FROM A PARTITIONED TABLE
  
  [Merge from mysql-5.6]
    ------------------------------------------------------------
    revno: 3902.277.120 [merge]
    committer: Aditya A <aditya.a@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-21 12:14:47 +0530
    message:
      Bug #16051817  GOT ERROR 124 FROM STORAGE ENGINE 
                     ON DELETE FROM A PARTITIONED TABLE
      
      [Merge from mysql-5.5]
        ------------------------------------------------------------
        revno: 2875.545.57
        committer: Aditya A <aditya.a@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-10-21 12:07:02 +0530
        message:
          Bug #16051817  GOT ERROR 124 FROM STORAGE ENGINE 
                         ON DELETE FROM A PARTITIONED TABLE
          
          PROBLEM
          -------
          
          The user first disables all the non unique indexes
          in the table and then rebuilds one partition.
          During rebuild the indexes on that particular
          partition are enabled. Now when we give a query 
          the optimizer is unaware that on one partition 
          indexes are enabled and if the optimizer selects
          that index,myisam thinks that the index is not 
          active and gives an error.
          
          FIX
          ---
          
          Before rebuilding a partition check whether non
          unique indexes are disabled on the partitons.
          If they are disabled then after rebuild disable
          the index on the partition. 
          
          [Approved by Mattiasj #rb3469]
------------------------------------------------------------
revno: 6741
committer: Rohit Kalhans<rohit.kalhans@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-21 11:42:47 +0530
message:
  BUG#17590616:CAN'T USE LOGICAL_CLOCK IF GTID IS ENABLED
        
  Problem: When GTID is used with Intra-schema
  multi-threaded slave the transactions are only
  assigned to the first worker, thereby compromizing
  the multi-threaded nature of replication slave.
        
  Background: Master stores the commit parent in the
  first query of a transaction (i.e. BEGIN query) if
  GTID is disabled or in GTID event if GTID is enabled.
  But in the slave we called the scheduler method for
  both the GTID event and the begin event. But since in
  case of GTID the BEGIN event does not have the commit
  parent, the scheduler logic blocks the execution of the
  event until the previous transaction is applied completely.
  This causes the slave coordinator to always assign the event
  to the first worker only.
        
  Fix: We fix this problem by calling the scheduler method for
  the "BEGIN" only when the coordinator has not seen the GTID
  event already. This ensures that it is never called for the
  first event of the transaction when GTID is enabled.
------------------------------------------------------------
revno: 6740 [merge]
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-21 11:25:16 +0530
message:
  Bug #17324516 SLAVE ASSERTS AFTER 5.6 UPGRADE
  
  Merging fix from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.277.119
    committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-21 11:20:23 +0530
    message:
      Bug #17324516 SLAVE ASSERTS AFTER 5.6 UPGRADE
      
      Problem:
      In place upgrade of slave from mysql-5.5 to mysql-5.6.12
      fails with assertion (lines >= LINES_IN_RELAY_LOG_INFO_WITH_ID
      && internal_id == 1).
      
      Analysis: mysql-5.5's relay-log.info format is different
      from mysql-5.6's format. mysql-5.5 version does not have
      some information like the number of lines in the file(1st line),
      sql_delay (6th line), number of parallel workers which is
      used when MTS is enabled (7th line), internal_id which is also
      used when MTS is enabled (8th line).
      
      While a mysql-5.6 slave server is coming up, it parses
      relay-log.info file (if already available) and regenerates
      a new content if the format is old (i.e., mysql-5.5's format).
      In the process of regeneration, a local variable temp_internal_id
      with a default value 0 is declared. If the file content is
      new format, then the value was read into temp_internal_id and
      Rpl_info::internal_id is assigned with this local temp_internal_id.
      If the file content is old format, then the default value '0'
      was assigned to Rpl_info::internal_id which is wrong value.
      
      Fix: Initialize temp_internal_id with Rpl_info::internal_id
      which is having the default value '1'.
------------------------------------------------------------
revno: 6739 [merge]
committer: Jimmy Yang <jimmy.yang@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-21 11:59:50 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.118
    committer: Jimmy Yang <jimmy.yang@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-21 11:56:33 +0800
    message:
      Fix Bug #17430207 FTS: FAILING ASSERTION: SYM_NODE->TABLE != NULL AFTER
      DISCARDING TABLESPAC
      
      rb://3603 approved by Sunny Bains
------------------------------------------------------------
revno: 6738 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Sat 2013-10-19 16:57:54 +0200
message:
  post-push fix for bug17565888
    ------------------------------------------------------------
    revno: 3902.277.117 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Sat 2013-10-19 16:11:14 +0200
    message:
      post-push fix for bug15765888
        ------------------------------------------------------------
        revno: 2875.545.56
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: test-5.5
        timestamp: Sat 2013-10-19 15:29:51 +0200
        message:
          post-push fix for bug17565888.
------------------------------------------------------------
revno: 6737 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Fri 2013-10-18 23:52:15 +0200
message:
  post-push fix for bug17565888
    ------------------------------------------------------------
    revno: 3902.277.116 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Fri 2013-10-18 23:51:12 +0200
    message:
      post-push fix for bug17565888
        ------------------------------------------------------------
        revno: 2875.545.55
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: test-5.5
        timestamp: Fri 2013-10-18 23:49:35 +0200
        message:
          post-push fix for bug17565888.
          
          Too restrictive assertion, failing during purge
------------------------------------------------------------
revno: 6736 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Fri 2013-10-18 23:41:54 +0200
message:
  post-push fix for bug17565888.
    ------------------------------------------------------------
    revno: 3902.277.115 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Fri 2013-10-18 23:40:43 +0200
    message:
      post-push fix for bug17565888.
        ------------------------------------------------------------
        revno: 2875.545.54
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: test-5.5
        timestamp: Fri 2013-10-18 23:39:15 +0200
        message:
          post-push fix for bug17565888.
          
          Too restrictive assertion, can fail during purge
------------------------------------------------------------
revno: 6735 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Fri 2013-10-18 19:31:14 +0200
message:
  merge of bug17565888 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.114 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Fri 2013-10-18 19:27:45 +0200
    message:
      manual merge of bug17565888 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.53
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: test-5.5
        timestamp: Fri 2013-10-18 19:25:59 +0200
        message:
          Bug#17565888: UP TO 75% INCREASE IN DBT3 QUERY (Q7) EXECUTION TIME
          
          Regression from bug#14621190 due to disabled optimistic restoration
          of cursor, which required full key lookup instead of verifying
          if previously positioned btree cursor could be reused.
          
          Fixed by enable optimistic restore and adjust cursor afterward.
          
          rb#3324 approved by Marko.
------------------------------------------------------------
revno: 6734
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Fri 2013-10-18 17:43:15 +0200
message:
  WL#6606: Offload THD initialization and network initialization to worker thread.
  
  Post push fix: Restored the ability to interrupt threads while debugging.
------------------------------------------------------------
revno: 6733 [merge]
committer: Anirudh Mangipudi <anirudh.mangipudi@oracle.com>
branch nick: trunk
timestamp: Fri 2013-10-18 17:17:29 +0530
message:
  Bug#17357535 BACKPORT BUG#16241992 TO 5.5
  Null Merge from 5.6
    ------------------------------------------------------------
    revno: 3902.277.113 [merge]
    committer: Anirudh Mangipudi <anirudh.mangipudi@oracle.com>
    branch nick: 5.6
    timestamp: Fri 2013-10-18 17:15:19 +0530
    message:
      Bug#17357535 BACKPORT BUG#16241992 TO 5.5
      Null Merge from 5.5
        ------------------------------------------------------------
        revno: 2875.545.52
        committer: Anirudh Mangipudi <anirudh.mangipudi@oracle.com>
        branch nick: 5.5
        timestamp: Fri 2013-10-18 17:14:39 +0530
        message:
          Bug #17357535 BACKPORT BUG#16241992 TO 5.5
          Problem:
          COM_CHANGE_USER allows brute-force attempts to crack a password at a very high
          rate as it does not cause any significant delay after a login attempt has
          failed. This issue was reproduced using John-The-Ripper password
          cracking tool through which about 5000 passwords per second could be attempted.
          
          Solution:
          The non-GA version's solution was to disconnect the connection when a login
          attempt failed. Now since our aim to to reduce the rate at which passwords 
          are tested, we introduced a sleep(1) after every login attempt failed. This
          significantly increased the delay with which the password was cracked.
------------------------------------------------------------
revno: 6732 [merge]
committer: Luis Soares <luis.soares@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-18 11:49:34 +0100
message:
  BUG#17460821
        
  Empty merge from mysql-5.6.
    ------------------------------------------------------------
    revno: 3902.277.112 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-18 11:32:00 +0100
    message:
      BUG#17460821
            
      Automerged mysql-5.5 into latest mysql-5.6.
            
      (Empty merge.)
        ------------------------------------------------------------
        revno: 2875.545.51 [merge]
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-10-18 10:50:49 +0100
        message:
          BUG#17460821
          
          Automerged from mysql-5.5 bug branch into latest mysql-5.5.
            ------------------------------------------------------------
            revno: 2875.582.1
            committer: Luis Soares <luis.soares@oracle.com>
            branch nick: mysql-5.5
            timestamp: Thu 2013-10-17 17:48:26 +0100
            message:
              BUG#17460821: ASSERTION ERROR WHEN STOPPING SLAVE AFTER SEMI-SYNC ON MASTER IS DISABLED
              
              The assertion happens when: (i) the master and slave are configured to
              use the semisync plugin; (ii) the DBA disables semisync on the master;
              (iii) and he also unsets the option to wait for slaves ACK even if the
              semisync slave count reaches 0 during the waiting period. This
              combination of factors makes the server run into an assertion as soon
              as the last semisync slave disconnects and its dump thread exits.
                
              The root of the problem is the fact that when the dump thread
              disconnects and calls the observer hook transmit_stop, which ends up
              calling ReplSemiSyncMaster::remove_slave, there is no check whether
              the master has already disabled semisync or not. If it has, the then a
              second call to the switch_off member function must be avoided.
                
              The quick fix is to avoid calling switch_off if the DBA has disabled
              the semisync plugin interactively on the master. Also, the switch_off
              member function should only be called if the plugin has not been
              switched off already. This is basically the pattern throughout the
              rest of the semisync plugin and no other calls seem vulnerable to
              similar crashes/assertions.
              
              (This a backport of the patch to 5.5, which is also vulnerable.)
------------------------------------------------------------
revno: 6731 [merge]
committer: magnus.blaudd@oracle.com
branch nick: trunk
timestamp: Fri 2013-10-18 12:29:07 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 6729.1.1 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: trunk
    timestamp: Fri 2013-10-18 12:22:40 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 6728.1.2
        committer: magnus.blaudd@oracle.com
        branch nick: trunk
        timestamp: Fri 2013-10-18 12:00:46 +0200
        message:
          Bug#17602208 MYSQL-TRUNK AND CONNECTOR/C SOURCE DOES NOT BUILD ON VS2008
             - problem  caused by patch for BUG#17581965 which increased the target windows version
             - Fix by hardcoding the value of _WIN32_WINNT_VISTA which is 0x0600 into the makefile
        ------------------------------------------------------------
        revno: 6728.1.1
        committer: magnus.blaudd@oracle.com
        branch nick: trunk
        timestamp: Fri 2013-10-18 11:47:30 +0200
        message:
          Remove left over .THIS files
          
           -these are files which have been removed
          - most likely "sombified" by changing the years at the top of the files
------------------------------------------------------------
revno: 6730 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Fri 2013-10-18 17:58:26 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.111
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Fri 2013-10-18 17:53:12 +0800
    message:
      BUG#17384979 - YIELD ON SCANNER THREAD FOR PARALLEL FTS INDEX CREATE TO MINIMIZE MEMORY USAGE
      
      Follow up fix: Modify wrong tokenizer thread exit check condition.
      
      Approved by Jimmy.Yang in IM.
------------------------------------------------------------
revno: 6729 [merge]
committer: Aditya A <aditya.a@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-18 15:08:58 +0530
message:
  Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP 
               AS A INNODB PARTITTION.
  [Merged from 5.6]             
    ------------------------------------------------------------
    revno: 3902.277.110 [merge]
    committer: Aditya A <aditya.a@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-18 15:02:18 +0530
    message:
      Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP 
                   AS A INNODB PARTITTION.
      [Merged from 5.5]             
        ------------------------------------------------------------
        revno: 2875.545.50 [merge]
        committer: Aditya A <aditya.a@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-10-18 13:49:03 +0530
        message:
          Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP 
                       AS A INNODB PARTITTION.
          [Merged from 5.1]             
            ------------------------------------------------------------
            revno: 2661.880.58
            committer: Aditya A <aditya.a@oracle.com>
            branch nick: mysql-5.1
            timestamp: Fri 2013-10-18 12:26:28 +0530
            message:
              Bug#17559867 AFTER REBUILDING,A MYISAM PARTITION ENDS UP 
                           AS A INNODB PARTITTION.
              
              PROBLEM
              -------
              The correct engine_type was not being set during 
              rebuild of the partition due to which the handler
              was always created with the default engine,
              which is innodb for 5.5+ ,therefore even if the
              table was myisam, after rebuilding the partitions
              ended up as innodb partitions.
              
              FIX
              ---
              Set the correct engine type during rebuild.  
              
              [Approved by mattiasj #rb3599]
------------------------------------------------------------
revno: 6728 [merge]
committer: magnus.blaudd@oracle.com
branch nick: trunk
timestamp: Fri 2013-10-18 11:17:31 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 6674.1.1 [merge]
    committer: magnus.blaudd@oracle.com
    branch nick: trunk
    timestamp: Fri 2013-10-11 14:44:25 +0200
    message:
      Merge trunk-cluster -> trunk
        ------------------------------------------------------------
        revno: 2876.563.3 [merge]
        committer: magnus.blaudd@oracle.com
        branch nick: trunk-cluster
        timestamp: Fri 2013-10-11 12:57:51 +0200
        message:
          Merge 7.3 -> trunk-cluster
           - (just before merge in of 5.6.14)
            ------------------------------------------------------------
            revno: 2876.565.15 [merge]
            committer: Ole John Aske <ole.john.aske@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Tue 2013-10-01 14:18:54 +0200
            message:
              Merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.128 [merge]
                committer: Ole John Aske <ole.john.aske@oracle.com>
                branch nick: mysql-5.5-cluster-7.2
                timestamp: Tue 2013-10-01 14:09:14 +0200
                message:
                  Merge 7.1 -> 7.2
                    ------------------------------------------------------------
                    revno: 2555.817.61 [merge]
                    committer: Ole John Aske <ole.john.aske@oracle.com>
                    branch nick: mysql-5.1-telco-7.1
                    timestamp: Tue 2013-10-01 14:05:51 +0200
                    message:
                      Merge 7.0 -> 7.1
                        ------------------------------------------------------------
                        revno: 2555.810.76
                        committer: Ole John Aske <ole.john.aske@oracle.com>
                        branch nick: mysql-5.1-telco-7.0
                        timestamp: Tue 2013-10-01 14:03:24 +0200
                        message:
                          Fix for bug#15907515
                          
                            RECEIVER THREAD COULD BLOCK/BUSY WAIT WHILE HOLDING RECEIVER MUTEX
                          
                          This fix removes the waiting for more job buffers to become available
                          inside performReceive() (or actually: mt_checkDoJob() called from it).
                          This was bad as the receive mutex was held during this wait.
                          Furthermore, mt_checkDoJob() was also sleep-loop waiting for
                          job buffers to be freed. Which could end up as a busy wait if
                          the receive thread was running under RealTime priority !!
                          
                          ::performReceive() will now instead return with a 'full' status
                          to the receive thread without further waiting/retry. The receive mutex
                          will then be unlocked and the receiver thread will yield() on the
                          'thr_job_queue_head::m_waiter' condition. Later, 'm_waiter' will
                          be signaled, and the receive thread awakened, when more job
                          buffers are available. (After being consumed by the worker thread.)
                          
                          Furthermore this fix also removes a bug where a negative return
                          from the initial check_job_buffer() call in the receive thread,
                          prevented the call of ::performReceive(). Thus, ::performReceive()
                          did not call TCP_Transporter::doReceive() which would ofload
                          received data from OS TCP-buffers into local 'ReceiveBufferMemory'.
                          This could probably cause premature communication blockage, or at
                          least the configured ReceiveBufferMemory to not fully being used to
                          ofload the OS TCP buffer as intended.
                          
                          NOTE: 'check job_buffer outcome' is not relevant for
                          ::performReceive() until *after* it has done a ::doReceive() on
                          all TCP transporters having avail data.
                        ------------------------------------------------------------
                        revno: 2555.810.75
                        committer: Ole John Aske <ole.john.aske@oracle.com>
                        branch nick: mysql-5.1-telco-7.0
                        timestamp: Tue 2013-10-01 13:59:19 +0200
                        message:
                          Fix for Bug#15907122
                          
                          INCORRECT HANDLING OF JOB-BUFFERS ALMOST FULL - 'SLEEPLOOP 10'
                          
                          The internal mt-job scheduler (mt.cpp) has the function 
                          update_sched_config() which is supposed to calculate how
                          many signals we are allowed to execute in the next
                          scheduling round. Allowed number of signals are restricted by
                          available job-buffers (aka 'signal buffers') for the 
                          block-threads we may communicate with.
                          
                          If the available job-buffers for *any* such thread are below 
                          a critical threshold, update_sched_config() will wait for more
                          job buffers to become available. The wait is implemented with the
                          yield() function which takes a 'thr_wait*' argument (Think of this 
                          as a condition). A 'wakeup(thr_wait*)' (from another thread) 
                          will later restart the suspended thread.
                          
                          However, the 'thr_wait*' argument used in these yield() / wakeup()
                          was the one used for signal that *incomming* signals has become
                          available. This is the opposite of what we want to wait for. The
                          effect of this was that these yields waited the maximum timeout (1ms)
                          before execution was resumed.
                          
                          This fix introduce an additional 'thr_wait*' which is signaled when
                          job buffers are released and thus becomes available.
                          
                          This fix is a collection of the following sub patches:
                          
                           
                           - Add dump of job buffer utilization before we
                             crash due to 'job buffer full'
                          
                           - Change the signature of the yield() function such that it can
                             take a more general '*check_callback()' function as arguments.
                          
                             Change the existing functions currently used as 'callbacks'
                             to the new (relaxed) signature.
                          
                          -  Refactor: Splitt out compute_free_buffers_in_queue()
                             from compute_max_signals_to_execute().
                             New function contains common code intended for reuse in later
                             patches.
                          
                          - (Fix) update_sched_config() will 'yield' the CPU and wait for
                             more job buffers to become available when it is about
                             to run out of job buffers.
                          
                             The yield() call will wait on a 'thr_wait' object, which
                             may be sent a 'wakeup()' when the waiting condition has
                             been resolved (by another thread)
                          
                             However, update_sched_config() yield'ed on the incorrect
                             'thr_wait' object intended to be used to wait for more
                             *incomming signal* - What we actually have to wait for
                             are signals to be *consumed* by the destination thread.
                             Luckily there is also defined a 'max wait' of 1ms which
                             currently will wakeup the thread. Thus, we never waited
                             forever, but added latency could be expected.
                          
                             This patch introduce a new 'thr_wait' object which is
                             signaled by the consumer, and update_sched_config()
                             will now wait on this object.
                          
                             Furthermore the patch also avoid a situation where a
                             thread could end up waiting for itself.
            ------------------------------------------------------------
            revno: 2876.565.14 [merge]
            committer: Priyanka Sangam <priyanka.sangam@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Mon 2013-09-30 15:06:05 +0530
            message:
              merge patch for Bug#16602002
                ------------------------------------------------------------
                revno: 2875.571.127
                committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                branch nick: mysql-5.5-cluster-7.2
                timestamp: Mon 2013-09-30 15:03:44 +0530
                message:
                  Bug#16602002 PROVIDE OPTION TO SKIP NODEGROUP=65536 NODES FROM
                  NDB_ERROR_REPORTER
                  
                  Fix mtr test for ndb_error_reporter in out of source build.
            ------------------------------------------------------------
            revno: 2876.565.13 [merge]
            committer: Jan Wedvik <jan.wedvik@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Fri 2013-09-27 13:37:10 +0200
            message:
              Merge 7.2->7.3.
                ------------------------------------------------------------
                revno: 2875.571.126 [merge]
                committer: Jan Wedvik <jan.wedvik@oracle.com>
                branch nick: mysql-5.5-cluster-7.2
                timestamp: Fri 2013-09-27 13:32:42 +0200
                message:
                  Merge 7.1->7.2
                    ------------------------------------------------------------
                    revno: 2555.817.60 [merge]
                    committer: Jan Wedvik <jan.wedvik@oracle.com>
                    branch nick: mysql-5.1-telco-7.1
                    timestamp: Fri 2013-09-27 13:29:24 +0200
                    message:
                      Merge 7.0->7.1
                        ------------------------------------------------------------
                        revno: 2555.810.74
                        committer: Jan Wedvik <jan.wedvik@oracle.com>
                        branch nick: mysql-5.1-telco-7.0
                        timestamp: Fri 2013-09-27 13:14:41 +0200
                        message:
                          This is a fix for Bug #17435744 'JAM EVENTS ARE SOMETIMES 
                          WRITTEN TO THE TRACE FILE OF THE WRONG THREAD'.
                                
                          In the methods that were affected by this problem, 
                          jam() calls have been replaced by either jamNoBlock(),
                          or by thrjam(<jam buffer>), where <jam buffer> is passed
                          as an argument to the method.
                           
                          This ensures that the jam event is written into the jam buffer of the
                          calling thread, rather than the thread that the block instance is assigned 
                          to.  
                           
                          jamNoBlock() reads thread local data (via pthread_getspecific()). To 
                          avoid the cost of that, a pointer to the jam buffer is passed as a 
                          function argument in most cases.
                           
                          The patch also adds an assert to thrjamLine(). This assert checks that the
                          jam buffer belongs to the calling thread. This should prevent similar errors
                          from being introduced in the future.
                           
                          As an added benefit, this patch will also serve to document which
                          block member functions that are called by "foreign" threads.
                          
                          Unrelated cleanup: Unused field Dbtup_client::m_block is removed.
            ------------------------------------------------------------
            revno: 2876.565.12
            committer: Ole John Aske <ole.john.aske@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Tue 2013-09-24 13:28:44 +0200
            message:
              Cleaned up incorrect 7.2 -> 7.3 merge of bug#16925513.
              
              Testcase for that bug ended up as being merged into the 
              section in ndb_join_pushdown.inc intended for only 
              mysql-5.6-cluster-7.3 specific tests.
              
              No code- or functional changes in this commit.
            ------------------------------------------------------------
            revno: 2876.565.11 [merge]
            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
            branch nick: mysql-7.3
            timestamp: Fri 2013-09-20 09:42:20 +0200
            message:
              merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.125 [merge]
                committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                branch nick: mysql-7.2
                timestamp: Fri 2013-09-20 09:39:57 +0200
                message:
                  merge 7.1 -> 7.2
                    ------------------------------------------------------------
                    revno: 2555.817.59 [merge]
                    committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                    branch nick: mysql-7.1
                    timestamp: Fri 2013-09-20 09:37:16 +0200
                    message:
                      merge 7.0 -> 7.1
                        ------------------------------------------------------------
                        revno: 2555.810.73
                        committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                        branch nick: mysql-7.0
                        timestamp: Fri 2013-09-20 09:17:55 +0200
                        message:
                          ndb - test: NDBT_find_binary_from_path failed to check last path
                          
                          this made ndb.test_mgmd to fail if runned from installed mysql-test
                          where ndb_mgmd is installed in $basedir/bin/.
            ------------------------------------------------------------
            revno: 2876.565.10 [merge]
            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
            branch nick: mysql-7.3
            timestamp: Thu 2013-09-19 15:57:21 +0200
            message:
              merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.124 [merge]
                committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                branch nick: mysql-7.2
                timestamp: Thu 2013-09-19 15:52:44 +0200
                message:
                  merge 7.1 -> 7.2
                    ------------------------------------------------------------
                    revno: 2555.817.58 [merge]
                    committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                    branch nick: mysql-7.1
                    timestamp: Thu 2013-09-19 15:50:15 +0200
                    message:
                      merge 7.0 -> 7.1
                        ------------------------------------------------------------
                        revno: 2555.810.72 [merge]
                        committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                        branch nick: mysql-7.0
                        timestamp: Thu 2013-09-19 15:48:09 +0200
                        message:
                          ndb - refactor: various removal of dead code and adding use of named constants
                            ------------------------------------------------------------
                            revno: 2555.826.5
                            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                            branch nick: mysql-7.0-refactor
                            timestamp: Thu 2013-09-19 15:07:26 +0200
                            message:
                              ndb - refactoring: add requestinfo methods for TupKeyReq
                            ------------------------------------------------------------
                            revno: 2555.826.4
                            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                            branch nick: mysql-7.0-refactor
                            timestamp: Thu 2013-09-19 15:06:46 +0200
                            message:
                              ndb - refactor: use named constants instead of numeric literals in tup
                              
                              Use the named constants from ScanFragReq::ReorgFlag for m_reorg
                              members instead of numeric literals 0,1, and 2.
                            ------------------------------------------------------------
                            revno: 2555.826.3
                            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                            branch nick: mysql-7.0-refactor
                            timestamp: Thu 2013-09-19 15:05:59 +0200
                            message:
                              ndb - refactor: remove unused method executeTriggers in dbtup
                            ------------------------------------------------------------
                            revno: 2555.826.2
                            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                            branch nick: mysql-7.0-refactor
                            timestamp: Thu 2013-09-19 15:04:56 +0200
                            message:
                              ndb - refactor: remove unused API version in dbtc and TCKEYREQ
                              
                              apiVersionNo and APIVersion sent with TCKEYREQ was only 16 bits
                              and more than 16 bits are needed for version.
                              
                              the api version was not used and is now removed.
                              
                              Now the attrLen field in TCKEYREQ is completely unused for
                              long TCKEYREQ, and for short TCKEYREQ the upper 16 bits are
                              unused.
                            ------------------------------------------------------------
                            revno: 2555.826.1
                            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                            branch nick: mysql-7.0-refactor
                            timestamp: Thu 2013-09-19 15:04:01 +0200
                            message:
                              ndb - refactoring: remove unused apiVersionNo in lqh and tupreq
                              
                              apiVersionNo was always zero and only used where a zero value make no difference.
            ------------------------------------------------------------
            revno: 2876.565.9 [merge]
            committer: Ole John Aske <ole.john.aske@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Thu 2013-09-19 15:41:22 +0200
            message:
              Merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.123 [merge]
                committer: Ole John Aske <ole.john.aske@oracle.com>
                branch nick: mysql-5.5-cluster-7.2
                timestamp: Thu 2013-09-19 15:23:32 +0200
                message:
                  Merge mysql-5.1-telco-7.1 --> ...5.5-cluster-7.2
                    ------------------------------------------------------------
                    revno: 2555.817.57 [merge]
                    committer: Ole John Aske <ole.john.aske@oracle.com>
                    branch nick: mysql-5.1-telco-7.1
                    timestamp: Thu 2013-09-19 15:11:17 +0200
                    message:
                      Merge mysql-5.1-telco-7.0 -> ...7.1
                        ------------------------------------------------------------
                        revno: 2555.810.71
                        committer: Ole John Aske <ole.john.aske@oracle.com>
                        branch nick: mysql-5.1-telco-7.0
                        timestamp: Thu 2013-09-19 15:07:29 +0200
                        message:
                          Fix for Bug#16925513 : HIT DBUG_ASSERT IN SPJ BLOCK, ~LINE 4406
                          
                          This fix reimplement how 'Parent Batch completion' is 
                          maintained and checked throughout the SPJ block.
                          
                          Previously each Lookup-TreeNode had a 'bool m_parent_batch_complete'
                          member which was used to keep track of this state. Maintaining 
                          'm_parent_batch_complete' required traversal of entire TreeNode 
                          branches in order to propogate the status. Furthermore,
                          'm_parent_batch_complete' was cleared immediately when complete
                          state was reached in preparation for a possible NEXTREQ.
                          
                          This has now been replaced with the BitMask 'm_completed_nodes' 
                          in the Request struct. By combining this BitMask with the existing
                          'm_ancestors' BitMask, completion state of all ancestors can be
                          mainained & checked without having to traverse the TreeNode structure.
                          Thus, Dbspj::lookup_parent_batch_complete() has become obsolete.
                          
                          It should also be noted that completion state is now maintained for all
                          TreeNode types, not only for Lookup TreeNodes. I think this is a sensible
                          change as this provides a more consistent state of entire Request, and
                          might be handy for future extensions.
            ------------------------------------------------------------
            revno: 2876.565.8 [merge]
            committer: Priyanka Sangam <priyanka.sangam@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Wed 2013-09-18 15:16:47 +0530
            message:
              merge patch for Bug#16602002
                ------------------------------------------------------------
                revno: 2875.571.122 [merge]
                committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                branch nick: mysql-5.5-cluster-7.2
                timestamp: Wed 2013-09-18 15:11:47 +0530
                message:
                  merge patch for Bug#16602002
                    ------------------------------------------------------------
                    revno: 2555.817.56 [merge]
                    committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                    branch nick: mysql-5.1-telco-7.1
                    timestamp: Wed 2013-09-18 15:08:44 +0530
                    message:
                      merge patch for Bug#16602002
                        ------------------------------------------------------------
                        revno: 2555.810.70
                        committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                        branch nick: mysql-5.1-telco-7.0
                        timestamp: Wed 2013-09-18 15:07:19 +0530
                        message:
                          Bug#16602002 PROVIDE OPTION TO SKIP NODEGROUP=65536 NODES FROM NDB_ERROR_REPORTER
                          
                          Fixed the scp command in ndb_error_reporter to handle the case where 
                          DataDir is not defined.
            ------------------------------------------------------------
            revno: 2876.565.7 [merge]
            committer: Mauritz Sundell <mauritz.sundell@oracle.com>
            branch nick: mysql-7.3
            timestamp: Wed 2013-09-18 11:03:28 +0200
            message:
              empty merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.121 [merge]
                committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                branch nick: mysql-7.2
                timestamp: Wed 2013-09-18 10:57:52 +0200
                message:
                  merge 7.1 -> 7.2
                    ------------------------------------------------------------
                    revno: 2555.817.55
                    committer: Mauritz Sundell <mauritz.sundell@oracle.com>
                    branch nick: mysql-7.1
                    timestamp: Wed 2013-09-18 10:29:48 +0200
                    message:
                      ndb - removes valgrind warnings in ndbcluster_find_files
                      
                      Backport of:
                      ------------------------------------------------------------
                      revision-id: magnus.blaudd@oracle.com-20130909114637-8e30ptt4o8xxc239
                      parent: magnus.blaudd@oracle.com-20130909105843-hd2snu2chv81c7jl
                      committer: magnus.blaudd@oracle.com
                      branch nick: 7.3
                      timestamp: Mon 2013-09-09 13:46:37 +0200
                      message:
                        Remove valgrind warnings bying rewriting fix for skipping
                        "setup of binlog" in ndbcluster_find_files() to avoid relying
                        on uninitialized variables and magic flags.
                        
                          - removes valgrind warnings
            ------------------------------------------------------------
            revno: 2876.565.6
            committer: John David Duncan <john.duncan@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Tue 2013-09-17 14:07:25 -0700
            message:
              In NDB Memcache, change the default scheduler from 73 back to S, based on 
              memslap benchmarks from peek01 & peek02.  7.3.3 with one cluster connection
              is almost as good as 7.2.14 with two connections, but not quite.
              Sample results at 25 concurrent clients:
               
               7.2.14 / S Sched / 2 cluster connections  :   16293 tps  .. 1507 usec avg
               7.3.3  / 73 Sched / 1 cluster connection  :   14838 tps  .. 1683 usec avg
               7.3.3 /  S Sched / 2 cluster conncetions  :   22214 tps  .. 1008 usec avg
            ------------------------------------------------------------
            revno: 2876.565.5 [merge]
            committer: magnus.blaudd@oracle.com
            branch nick: 7.3
            timestamp: Mon 2013-09-16 12:36:33 +0200
            message:
              Merge 7.2 -> 7.3
                ------------------------------------------------------------
                revno: 2875.571.120 [merge]
                committer: magnus.blaudd@oracle.com
                branch nick: 7.2
                timestamp: Mon 2013-09-16 12:34:09 +0200
                message:
                  Merge 7.1 -> 7.2
                    ------------------------------------------------------------
                    revno: 2555.817.54 [merge]
                    committer: magnus.blaudd@oracle.com
                    branch nick: 7.1
                    timestamp: Mon 2013-09-16 12:26:08 +0200
                    message:
                      Merge 7.0 -> 7.1
                        ------------------------------------------------------------
                        revno: 2555.810.69 [merge]
                        committer: magnus.blaudd@oracle.com
                        branch nick: 7.0
                        timestamp: Mon 2013-09-16 12:23:55 +0200
                        message:
                          Merge 6.3 -> 7.0
                            ------------------------------------------------------------
                            revno: 2555.760.80 [merge]
                            committer: magnus.blaudd@oracle.com
                            branch nick: 6.3
                            timestamp: Mon 2013-09-16 12:16:16 +0200
                            message:
                              Merge
                                ------------------------------------------------------------
                                revno: 2555.825.1
                                committer: magnus.blaudd@oracle.com
                                branch nick: 6.3
                                timestamp: Mon 2013-09-16 12:01:41 +0200
                                message:
                                  Bug#17459795 TYPO IN OUTPUT OF NDB_SIZE.PL: AVG VARSIDE DM/ROW SHOULD BE VARSIZE
                    ------------------------------------------------------------
                    revno: 2555.817.53
                    committer: bernd.ocklin@oracle.com
                    branch nick: mysql-5.1-telco-7.1
                    timestamp: Mon 2013-09-16 08:19:55 +0200
                    message:
                      disable clusterj_jpa
            ------------------------------------------------------------
            revno: 2876.565.4 [merge]
            committer: John David Duncan <john.duncan@oracle.com>
            branch nick: mysql-5.6-cluster-7.3
            timestamp: Sun 2013-09-15 22:12:09 -0700
            message:
              Merge nodejs-adapter for 7.3.3
                ------------------------------------------------------------
                revno: 0.82.96
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sun 2013-09-15 18:21:38 -0700
                message:
                  lint-related fixes
                ------------------------------------------------------------
                revno: 0.82.95
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sun 2013-09-15 17:48:16 -0700
                message:
                  Try to unify formatting of API docs & keep all lines < 80 characters
                ------------------------------------------------------------
                revno: 0.82.94
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sun 2013-09-15 16:58:39 -0700
                message:
                  Basic support for BETWEEN queries in NDB
                ------------------------------------------------------------
                revno: 0.82.93
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-14 16:12:37 -0700
                message:
                  Fix stack trace on error with -t option
                ------------------------------------------------------------
                revno: 0.82.92
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-14 12:13:17 -0700
                message:
                  Allow skip and limit to be string
                ------------------------------------------------------------
                revno: 0.82.91
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-14 12:08:35 -0700
                message:
                  Implement query between operator
                  
                  Add generic query test to test queries on any domain type
                  
                  Implement query test for timestamp type
                  
                  Add indexes to temporaltypes columns
                  
                  Insert ten rows into temporaltypes table for query tests
                  
                  Adapt temporaltypes TypeTest to avoid first 10 ids
                ------------------------------------------------------------
                revno: 0.82.90
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-09-13 09:56:44 -0700
                message:
                  Fix trivial bug in reporting results
                ------------------------------------------------------------
                revno: 0.82.89
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-09-13 09:23:15 -0700
                message:
                  New tweets-recent endpoint to fetch the last N tweets
                  test_tweets now tests the HTTP server
                ------------------------------------------------------------
                revno: 0.82.88
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 23:14:07 -0700
                message:
                  Fix mysql adapter scans with typecast types (datetime, timestamp)
                ------------------------------------------------------------
                revno: 0.82.87
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 22:01:10 -0700
                message:
                  Ignore constraints in mysql adapter
                ------------------------------------------------------------
                revno: 0.82.86
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 20:10:30 -0700
                message:
                  fix various skip/limit/order bugs in NDB scans
                ------------------------------------------------------------
                revno: 0.82.85 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 18:41:47 -0700
                message:
                  merge
                    ------------------------------------------------------------
                    revno: 0.89.1
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Thu 2013-09-12 18:04:28 -0700
                    message:
                      Improve error handling for query skip and limit
                        UserContext.js
                          if limit is specified, it must be a number between 0 and MAX_LIMIT
                          if skip is specified, it must be a number between 0 and MAX_SKIP
                            and order must be specified
                          if order is specified, it must be a string ignoreCase asc or desc
                       
                        MySQLConnection.js
                          remove restriction on limit without order
                      
                        QueryBtreeIndexScanLimitTest.js
                          test limit with no order is ok
                      
                        QueryPrimaryIndexScanLimitTest.js
                          test limit with no order is ok
                ------------------------------------------------------------
                revno: 0.82.84
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 18:39:47 -0700
                message:
                  New test script for Twitter demo
                ------------------------------------------------------------
                revno: 0.82.83
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 18:38:54 -0700
                message:
                  Failed SmokeTest counts as a failed test
                ------------------------------------------------------------
                revno: 0.82.82
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-09-12 16:06:03 -0700
                message:
                  Allow tests to run when cwd is not node-adapter/test
                  harness.js
                    construct an absolute path for the ndb.sql which sets the engine
                    for running sql commands
                  
                    this allows e.g. node test/driver --suite=test/integraltypes
                ------------------------------------------------------------
                revno: 0.82.81
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-09-11 18:50:53 -0700
                message:
                  Handle empty batches correctly
                  UserContext.js
                    if an empty batch is executed, nothing is expected to be done
                      except to call the user's callback (from execute).
                    the behavior is changed to simply call the user's callback
                      with no error
                    the dbsession is no longer called with an empty list of operations
                ------------------------------------------------------------
                revno: 0.82.80
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-09-11 18:46:57 -0700
                message:
                  Improve query handling
                  Query.js:
                    change operator "in" definition to use alternate syntax
                      because "in" is a keyword
                    fix handling of usable btree indexes; the first index column
                      must be included in a comparison in order to use the index
                ------------------------------------------------------------
                revno: 0.82.79
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-09-10 16:15:35 -0700
                message:
                  Improve handling of NDB error when encoding a value for a column
                ------------------------------------------------------------
                revno: 0.82.78
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-09-10 10:57:00 -0700
                message:
                  Remove unwanted console log from test
                ------------------------------------------------------------
                revno: 0.82.77
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-09-10 10:37:24 -0700
                message:
                  More work on Twitter demo
                ------------------------------------------------------------
                revno: 0.82.76 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-09-10 07:35:07 -0700
                message:
                  local merge
                    ------------------------------------------------------------
                    revno: 0.88.1
                    committer: John David Duncan <john.duncan@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Tue 2013-09-10 07:31:30 -0700
                    message:
                      compile-time fixes
                ------------------------------------------------------------
                revno: 0.82.75
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-09-10 07:34:03 -0700
                message:
                  Add tweet connection properties file
                ------------------------------------------------------------
                revno: 0.82.74
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-09-09 23:23:11 -0700
                message:
                  Complete twitter demo
                ------------------------------------------------------------
                revno: 0.82.73
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-09-09 23:22:25 -0700
                message:
                  Rename Query "keys" to "params"; support skip & limit in queries
                ------------------------------------------------------------
                revno: 0.82.72
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-09-09 21:01:49 -0700
                message:
                  Add top-level implicit AND group to filters so that very simple
                  one operation filters get finalised.
                ------------------------------------------------------------
                revno: 0.82.71
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-09-09 20:25:47 -0700
                message:
                  Tweet demo improvements & lint fixes
                ------------------------------------------------------------
                revno: 0.82.70 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-07 14:28:23 -0700
                message:
                  local merge
                    ------------------------------------------------------------
                    revno: 0.87.2
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Sat 2013-09-07 13:33:06 -0700
                    message:
                      Implement order, skip, and limit for queries
                      
                      If used, the order parameter must be a string that is ignoreCase 'asc' or 
                      'desc'. Ordering is not explicit; rather, the filter must resolve to 
                      an index scan. The index is scanned either ascending or descending.
                      
                      Use of skip or limit requires the order to be specified, either ascending 
                      or descending. Either or both of skip and limit may be specified. If only 
                      skip is specified, limit is MAX_INT (2^32-1). If only limit is specified, 
                      skip is 0. Skip is the number of rows to skip before returning limit rows.
                      
                      MySQLConnection.js:
                        Add a new ErrorOperation that does not execute any database operations.
                        Instead, it is put into the execution framework. When it is executed,
                        it calls back into UserContext to report the error, and then calls back
                        into TransactionHandler.
                        ErrorOperation is used to report errors during query execution but is
                        generic so it can be used in other places to report certain errors.
                      
                      QueryBtreeIndexScanLimitTest.js:
                        new test for btree index scan order, skip, and limit
                      
                      QueryPrimaryIndexScanLimitTest.js:
                        new test for primary index scan order, skip, and limit
                      
                      harness.js:
                        add TestCase.errorIfNotError to report missing errors
                ------------------------------------------------------------
                revno: 0.82.69 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-07 14:28:00 -0700
                message:
                  local merge
                    ------------------------------------------------------------
                    revno: 0.87.1
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Thu 2013-09-05 12:30:00 -0700
                    message:
                      change return type of TableMapping.applyToClass from TableMapping to Constructor
                ------------------------------------------------------------
                revno: 0.82.68
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-07 14:26:17 -0700
                message:
                  Work in progress on NDB index bounds
                ------------------------------------------------------------
                revno: 0.82.67
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-07 14:22:06 -0700
                message:
                  More work in progress on Twitter demo
                ------------------------------------------------------------
                revno: 0.82.66
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-09-07 14:21:24 -0700
                message:
                  Misc. docs fixes
                ------------------------------------------------------------
                revno: 0.82.65
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-08-29 12:05:36 -0700
                message:
                  Twitter Demo changes:
                    change tweet id from UUID to auto-increment id
                    Add author table
                    Add foreign key from author to tweet
                    Add hashtag table with foreign key reference to tweet table
                ------------------------------------------------------------
                revno: 0.82.64
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-08-05 15:23:44 -0700
                message:
                  Rationalize type converters
                  
                  Two kinds of converters are defined:
                    database type converters convert between database types and intermediate types
                      database type converters are adapter-specific
                    domain type converters convert between intermediate types and domain types
                  User-specified converter in mapping overrides system-specified domain type converter
                  
                  Date and time types need both database type converter and domain type converter
                    Date and Time database types are mapped to string
                    The mysql adapter uses felix which maps Date types to javascript Date
                      This behavior needs to be overridden to allow mapping to javascript string
                    DateTime and Timestamp database types are mapped to javascript Date
                      The intermediate type is a mysql-js type MySQLTime which supports fractional seconds
                      The domain type is a javascript Date using a standard domain type converter
                  
                  DBTableHandler:
                    during construction, use user's converter or database-default domain type converter
                    for get, apply domain type converter and then database type converter
                    for set, apply database type converter and then domain type converter
                  
                  MySQLTime:
                    add conversions to and from DateTime strings as used in database
                  
                  MySQLConnection:
                    change read by key and scan to use typeCast (felix name for driver type converter)
                  
                  MySQLConnectionPool:
                    define driver type converters, database type converters, and domain type converters
                      this allows non-loss use of DATETIME and TIMESTAMP database types
                        supports millisecond precision for javascript Date
                        supports microsecond precision for user-defined more-better-Date
                    implement string to MySQLTime for database type converter
                    implement MySQLTime to javascript Date for domain type converter
                  
                  MySQLDictionary:
                    set up default domain type converters and database type converters
                ------------------------------------------------------------
                revno: 0.82.63
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-08-05 13:34:28 -0700
                message:
                  Improve ReadWrite test to write only non-undefined data to sql
                ------------------------------------------------------------
                revno: 0.82.62
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-08-05 13:33:43 -0700
                message:
                  Improve test reporting for objects
                  
                  harness:
                    add functions to report constructor name of objects being compared
                    add function to compare strict equal
                ------------------------------------------------------------
                revno: 0.82.61
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Mon 2013-08-05 13:30:14 -0700
                message:
                  Improve temporaltypes test to avoid zero-hour bug in timezone
                  
                  TypeTest: use 1 AM instead of midnight on the epoch
                ------------------------------------------------------------
                revno: 0.82.60
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-08-01 16:32:54 -0700
                message:
                  Update Converter docs
                ------------------------------------------------------------
                revno: 0.82.59
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-08-01 12:58:37 -0700
                message:
                  #ifdef needed in wrapper
                ------------------------------------------------------------
                revno: 0.82.58
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-31 15:01:21 -0700
                message:
                  NdbWaitGroup v2 pushed into 7.3.3 and 7.2.14
                ------------------------------------------------------------
                revno: 0.82.57
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 17:32:27 -0700
                message:
                  Enable Multiwait by default
                  Detect NdbWaitGroup v1 or v2 based on NDB version number
                ------------------------------------------------------------
                revno: 0.82.56
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:56:08 -0700
                message:
                  Fix terrible bug using NativeDestructorCall<T> with wrong type.
                ------------------------------------------------------------
                revno: 0.82.55
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:53:30 -0700
                message:
                  More debugging info for fetchResults() calls
                ------------------------------------------------------------
                revno: 0.82.54
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:52:04 -0700
                message:
                  Serialize all Ndb destructor calls 
                ------------------------------------------------------------
                revno: 0.82.53
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:50:57 -0700
                message:
                  better naming
                ------------------------------------------------------------
                revno: 0.82.52
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:45:44 -0700
                message:
                  Fix wrap/unwrap inconsistencies
                ------------------------------------------------------------
                revno: 0.82.51
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:40:41 -0700
                message:
                  Fix inconsistency (const vs. non-const) in Record wrapping
                ------------------------------------------------------------
                revno: 0.82.50
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Sat 2013-07-27 15:33:33 -0700
                message:
                  Wrapper type checking
                  Add checking that all C++ types wrapped as JavaScript values are unwrapped back to the original type.
                ------------------------------------------------------------
                revno: 0.82.49
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-07-26 22:03:36 -0700
                message:
                  Use class_id in wrapped destructor call
                ------------------------------------------------------------
                revno: 0.82.48
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-07-26 21:59:26 -0700
                message:
                  minor formatting / debug message
                ------------------------------------------------------------
                revno: 0.82.47
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-07-26 21:57:31 -0700
                message:
                  Some cleanup of SPI docs.
                ------------------------------------------------------------
                revno: 0.82.46
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-07-26 21:44:43 -0700
                message:
                  NdbTransaction::close() should run as an async call
                  and be queued on the session's execQueue
                ------------------------------------------------------------
                revno: 0.82.45
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-07-25 16:02:31 -0700
                message:
                  Fix pathnames after UserContext.js move
                ------------------------------------------------------------
                revno: 0.82.44
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-07-25 15:52:02 -0700
                message:
                  Move UserContext.js into Adapter/api/
                ------------------------------------------------------------
                revno: 0.82.43
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-07-25 15:49:52 -0700
                message:
                  Move MySQLTime.js into Adapter/impl/common
                ------------------------------------------------------------
                revno: 0.82.42 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-07-18 11:47:44 -0700
                message:
                  merge
                    ------------------------------------------------------------
                    revno: 0.86.2
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Wed 2013-07-17 09:25:47 -0700
                    message:
                      Improve read-write diagnostics
                    ------------------------------------------------------------
                    revno: 0.86.1
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Tue 2013-07-16 14:54:17 -0700
                    message:
                      Improve null value handling
                      
                      The mysql adapter will be improved to avoid setting values for columns where
                      there is no value provided by the user. The previous implementation treated
                      persist different from save. With persist, two insert statements were created,
                      one with values for auto-increment columns in the primary key, and one without.
                      With save, one insert statement was created at initialization time, but if any
                      columns were missing at the time the SQL command was sent, a new SQL statement
                      was created, leaving out the columns that were null.
                      
                      During metadata processing, default values were obtained and saved for cases
                      where the user did not provide values. This worked well for primitive column types
                      but was problematic for complex column types such as time and date types.
                      
                      This change makes both persist and save work in the same way. When the object
                      is presented to persist or save, the values are analyzed to see if any are null.
                      If any values are null, a different insert statement is used. If the appropriate
                      insert statement has already been created, it is used. If not, an insert statement
                      is created and cached for future use.
                      
                      The implementation modifies DBTableHandler and in MySQLConnection.
                      
                      DBTableHandler:
                        Add a parameter to getFields and getField to record whether there are any null values.
                        For each value, call a function supplied by the user, either setDefined or
                        setUndefined. 
                      
                      MySQLConnection:
                        Create a function to track defined and undefined column values. This function
                          constructs a key e.g. 'DUUUD' where each character corresponds to the value
                          of the fields bend Defined or Undefined. 
                        Use the fieldValueDefinedKey to create INSERT and INSERT... DUPLICATE SQL
                          statements. The statements with all column values defined are created at
                          initialization. Other statements are created on demand.
                        Modify buildInsertOperation and buildWriteOperation to use the new undefined
                          column protocol.
                ------------------------------------------------------------
                revno: 0.82.41
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Thu 2013-07-18 11:42:46 -0700
                message:
                  Map SQL Date to JS String in test case and in NDB converter
                ------------------------------------------------------------
                revno: 0.82.40
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-17 18:07:13 -0700
                message:
                  AsyncNdbContext:
                    Add call to handleErrors() after tx execute is completed
                    Add NDB_MAGIC_TICKET assert, which should verify 1-to-1 correspondence 
                     of push() to pop().
                    Add debugging messages.
                ------------------------------------------------------------
                revno: 0.82.39 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-10 17:45:36 -0700
                message:
                  merge
                    ------------------------------------------------------------
                    revno: 0.85.2 [merge]
                    committer: John David Duncan <john.duncan@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Tue 2013-07-09 18:20:03 -0700
                    message:
                      merge
                    ------------------------------------------------------------
                    revno: 0.85.1
                    committer: Craig L Russell <Craig.Russell@oracle.com>
                    branch nick: nodejs-adapter
                    timestamp: Fri 2013-06-07 18:13:24 -0700
                    message:
                      Implement ReadWrite framework to test reading and writing data with mysql adapter
                      and sql drivers. 
                      
                      The framework allows a test program to specify a table name or constructor,
                      test data, and one or more test scenarios to run:
                      write using adapter, read using adapter
                      write using adapter, read using sql
                      write using sql, read using adapter
                      write using sql, read using sql
                      
                      test/lib/read_write.js:
                        this is the test framework suitable for any table or constructor
                      
                      test/t_basic/ReadWriteTest.js
                        this test is specific to t_basic and exercises all 8 combinations of read/write/tableNameOrConstructor
                ------------------------------------------------------------
                revno: 0.82.38
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-10 17:43:27 -0700
                message:
                  Multiwait Async NDB API
                   - Use NdbWaitGroup v2 if available
                   - Disable multiwait on early 7.3 releases
                ------------------------------------------------------------
                revno: 0.82.37
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-10 17:38:46 -0700
                message:
                  Use magic number to help with type safety of unwrapped pointers
                ------------------------------------------------------------
                revno: 0.82.36
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-10 17:27:33 -0700
                message:
                  NdbWaitGroup header file:
                   - previous version was copied from storage/ndb/src/ndbapi
                   - new version is an interface-only header and includes both V1 and V2 of NdbWaitGroup
                ------------------------------------------------------------
                revno: 0.82.35
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Wed 2013-07-10 17:26:07 -0700
                message:
                  fix indentation
                ------------------------------------------------------------
                revno: 0.82.34
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Tue 2013-07-09 18:00:55 -0700
                message:
                  Treat TIME datatype as a string, in the same way as MySQL server.
                ------------------------------------------------------------
                revno: 0.82.33
                committer: Craig L Russell <Craig.Russell@oracle.com>
                branch nick: nodejs-adapter
                timestamp: Fri 2013-05-31 11:36:48 -0700
                message:
                  Fix lint errors
            ------------------------------------------------------------
            revno: 2876.565.3
            committer: John David Duncan <john.duncan@oracle.com>
            branch nick: cluster-7.3-merge
            timestamp: Fri 2013-09-13 11:29:49 -0700
            message:
              fix for compiler warning
            ------------------------------------------------------------
            revno: 2876.565.2 [merge]
            committer: John David Duncan <john.duncan@oracle.com>
            branch nick: cluster-7.3-merge
            timestamp: Fri 2013-09-13 09:52:10 -0700
            message:
              merge
                ------------------------------------------------------------
                revno: 2876.566.1 [merge]
                committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Fri 2013-09-13 17:47:54 +0530
                message:
                  merge patch for Bug#11756666
                    ------------------------------------------------------------
                    revno: 2875.571.119 [merge]
                    committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                    branch nick: mysql-5.5-cluster-7.2
                    timestamp: Fri 2013-09-13 17:40:25 +0530
                    message:
                      merge patch for Bug#11756666
                        ------------------------------------------------------------
                        revno: 2555.817.52 [merge]
                        committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                        branch nick: mysql-5.1-telco-7.1
                        timestamp: Fri 2013-09-13 17:37:34 +0530
                        message:
                          merge patch for Bug#11756666
                            ------------------------------------------------------------
                            revno: 2555.810.68
                            committer: Priyanka Sangam <priyanka.sangam@oracle.com>
                            branch nick: mysql-5.1-telco-7.0
                            timestamp: Fri 2013-09-13 17:34:20 +0530
                            message:
                              Bug#11756666 RFE: NDB_ERROR_REPORTER NEEDS --HELP
                              
                              Added --help to ndb_error_reporter and modified error-handling
                              to print the usage message before exiting when the config
                              file is not found.
            ------------------------------------------------------------
            revno: 2876.565.1 [merge]
            committer: John David Duncan <john.duncan@oracle.com>
            branch nick: cluster-7.3-merge
            timestamp: Thu 2013-09-12 20:48:32 -0700
            message:
              local merge
                ------------------------------------------------------------
                revno: 2876.564.6 [merge]
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Wed 2013-07-31 13:56:38 -0700
                message:
                  local merge
                ------------------------------------------------------------
                revno: 2876.564.5
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Wed 2013-06-26 17:45:27 -0700
                message:
                  Memcache: configurable settings in 7.3 scheduler
                ------------------------------------------------------------
                revno: 2876.564.4
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Mon 2013-06-24 23:19:57 -0700
                message:
                  Refactor memcache Scheduler API
                  Change so that the scheduler itself calls whatever variant of
                  executeAsynch() / executeAsynchPrepare() / etc. is appropriate.
                ------------------------------------------------------------
                revno: 2876.564.3
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Sun 2013-06-23 16:04:52 -0700
                message:
                  New scheduler for memcached in 7.3
                ------------------------------------------------------------
                revno: 2876.564.2
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Sun 2013-06-23 09:04:16 -0700
                message:
                  Reconcile 7.2 and 7.3 versions of NdbWaitGroup
                  Eliminate gratuitous differences, leaving only the technically necessary
                  differences.
                ------------------------------------------------------------
                revno: 2876.564.1
                committer: John David Duncan <john.duncan@oracle.com>
                branch nick: mysql-5.6-cluster-7.3
                timestamp: Sat 2013-06-15 16:23:14 -0700
                message:
                     NdbWaitGroup version 2 (revised again).
                     Version 1 API is single-threaded and uses a fixed-size list of Ndbs.
                     Version 2 push() and pop() are thread-safe, but only one thread can wait(); 
                     the Ndb list size will grow as needed.
                     New test case in testAsynchMultiwait
                     Removed ndb_global.h #define from earlier commit.
        ------------------------------------------------------------
        revno: 2876.563.2
        committer: magnus.blaudd@oracle.com
        branch nick: trunk-cluster
        timestamp: Thu 2013-10-10 13:06:42 +0200
        message:
          Remove MCP from sql_partition.cc which is no longer needed after fix for bug 17526814
        ------------------------------------------------------------
        revno: 2876.563.1
        committer: magnus.blaudd@oracle.com
        branch nick: trunk-cluster
        timestamp: Thu 2013-10-10 13:05:39 +0200
        message:
          Cherrypick fix for bug 17526814 from trunk
------------------------------------------------------------
revno: 6727
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug17497869
timestamp: Fri 2013-10-18 09:24:05 +0200
message:
  Bug#17497869: NEW DEPRECATION WARNINGS INTRODUCE UNWANTED
                PERFORMANCE DEGRADATION SIDE-EFFECT
  
  This patch changes the implementation of deprecation warnings
  to avoid using current_thd. This will slightly speedup
  generation of such warnings.
  
  But note that the generation of deprecation warnings is
  not free (due to e.g. memory allocation and localization).
  So deprecation a function will make it slower.
------------------------------------------------------------
revno: 6726 [merge]
committer: Jimmy Yang <jimmy.yang@oracle.com>
branch nick: trunk5
timestamp: Fri 2013-10-18 14:39:28 +0800
message:
  merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.109
    committer: Jimmy Yang <jimmy.yang@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-18 14:37:11 +0800
    message:
      Fix a cast issue that breaks windows' build with #17371537 checkin
------------------------------------------------------------
revno: 6725 [merge]
committer: Jimmy Yang <jimmy.yang@oracle.com>
branch nick: trunk5
timestamp: Fri 2013-10-18 14:29:04 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.290.1
    committer: Jimmy Yang <jimmy.yang@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-18 14:22:30 +0800
    message:
      Fix a cast issue that breaks windows' build with #17371537 checkin
------------------------------------------------------------
revno: 6724 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Fri 2013-10-18 14:06:21 +0800
message:
  Null merge for BUG#17536995 - ASSERT RBT_EMPTY(INDEX_CACHE->WORDS)
    ------------------------------------------------------------
    revno: 3902.277.108
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Fri 2013-10-18 13:56:04 +0800
    message:
      BUG#17536995 - ASSERT RBT_EMPTY(INDEX_CACHE->WORDS) IN ALTER TABLE CHANGE COLUMN
      
      The root cause is that if a index is to_be_dropped, words is not freed,
      so that we get assert failure in fts_cache_clear while free_words is false.
      
      In the fix, we remove free_words and assert in fts_cache_clear, and also
      fix a bug related to DICT_TF2_FTS.
      
      rb#3623 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6723
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Fri 2013-10-18 14:00:26 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
------------------------------------------------------------
revno: 6722
committer: Neeraj Bisht <neeraj.x.bisht@oracle.com>
branch nick: trunk
timestamp: Fri 2013-10-18 11:05:26 +0530
message:
  Bug#11746789 : SPURIOUS ERROR WHEN COUNTING ROWS IN VIEW WITH 
  	       ORDER BY CLAUSE
  		--fix the test case failing in pb2(while using ps-protocol).
------------------------------------------------------------
revno: 6721
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-18 13:47:54 +0900
message:
  WL#7050 - Follow up fix.
  race condition around log_sys->flush_event state change
  
  Approved by Sunny directly
------------------------------------------------------------
revno: 6720 [merge]
committer: Jimmy Yang <jimmy.yang@oracle.com>
branch nick: trunk5
timestamp: Fri 2013-10-18 11:40:57 +0800
message:
  Merge mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.107
    committer: Jimmy Yang <jimmy.yang@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-18 11:25:17 +0800
    message:
      Fix bug #17371537 TRX_CREATE() AND TRX_FREE() ARE CALLED AT EVERY MEMCACHED
      GET REQUES
      
      rb://3505 approved by Sunny Bains
------------------------------------------------------------
revno: 6719 [merge]
committer: Luis Soares <luis.soares@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 16:23:41 +0100
message:
  BUG#17460821
  
  Automerged mysql-5.6 into latest mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.106 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-17 16:22:33 +0100
    message:
      BUG#17460821
      
      Automerged mysql-5.6 bug branch into latest mysql-5.6.
        ------------------------------------------------------------
        revno: 3902.289.1
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.6
        timestamp: Mon 2013-09-30 14:16:56 +0100
        message:
          BUG#17460821: ASSERTION ERROR WHEN STOPPING SLAVE AFTER SEMI-SYNC ON MASTER IS DISABLED
          
          The crash happens when: (i) the master and slave are configured to use
          the semisync plugin; (ii) the DBA disables semisync on the master;
          (iii) and he also unsets the option to wait for slaves ACK even if the
          semisync slave count reaches 0 during the waiting period. This
          combination of factors makes the server run into an assertion and
          crash as soon as the last semisync slave disconnects and its dump
          thread exits.
          
          The root of the problem is the fact that when the dump thread
          disconnects and calls the observer hook transmit_stop, which ends up
          calling ReplSemiSyncMaster::remove_slave, there is no check whether
          the master has already disabled semisync or not. If it has, the then a
          second call to the switch_off member function must be avoided.
          
          The quick fix is to avoid calling switch_off if the DBA has disabled
          the semisync plugin interactively on the master. Also, the switch_off
          member function should only be called if the plugin has not been
          switched off already. This is basically the pattern throughout the
          rest of the semisync plugin and no other calls seem vulnerable to
          similar crashes/assertions.
------------------------------------------------------------
revno: 6718 [merge]
committer: Anil Toshniwal <anil.toshniwal@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 18:18:37 +0530
message:
  Bug#17513737 INTRODUCE CHECK TABLE...QUICK
  Upmerge from 5.6 -> trunk
    ------------------------------------------------------------
    revno: 3902.277.105 [merge]
    committer: Anil Toshniwal <anil.toshniwal@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-17 18:13:36 +0530
    message:
      Bug#17513737 INTRODUCE CHECK TABLE...QUICK
      
      Upmerge from 5.5 -> 5.6
        ------------------------------------------------------------
        revno: 2875.545.49
        committer: Anil Toshniwal <anil.toshniwal@oracle.com>
        branch nick: mysql-5.5
        timestamp: Thu 2013-10-17 18:09:04 +0530
        message:
          Bug#17513737  INTRODUCE CHECK TABLE...QUICK
          
          --Implemented CHECK TABLE...QUICK.
            Introduce CHECK TABLE...QUICK that would skip the btr_validate_index()
            and btr_search_validate() call, and count the no. of records in each index.
          
          Approved by Marko and Kevin. (rb#3567).
------------------------------------------------------------
revno: 6717 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 18:03:14 +0530
message:
  Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
                 AND 'KILL SESSION' LEAD TO CRASH 
  
  Merging from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.104 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-17 18:01:24 +0530
    message:
      Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
      
      Merging from 5.5 to 5.6.
        ------------------------------------------------------------
        revno: 2875.545.48
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql-5.5
        timestamp: Thu 2013-10-17 17:59:45 +0530
        message:
          Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
                         AND 'KILL SESSION' LEAD TO CRASH     
          
          Fixing pb2 failure on embedded version.
------------------------------------------------------------
revno: 6716 [merge]
committer: Luis Soares <luis.soares@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 12:32:47 +0100
message:
  BUG#17508351
  
  Upmerged mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.103 [merge]
    committer: Luis Soares <luis.soares@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-17 12:29:17 +0100
    message:
      BUG#17508351
      
      Up merged mysql-5.5 to mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.47 [merge]
        committer: Luis Soares <luis.soares@oracle.com>
        branch nick: mysql-5.5
        timestamp: Thu 2013-10-17 12:27:45 +0100
        message:
          BUG#17508351
          
          Merging mysql-5.5 bug branch into latest mysql-5.5.
            ------------------------------------------------------------
            revno: 2875.581.1
            committer: Luis Soares <luis.soares@oracle.com>
            branch nick: mysql-5.5
            timestamp: Tue 2013-10-08 18:37:43 +0100
            message:
              BUG#17508351: REDUNDANT CODE IN REPLSEMISYNCMASTER::UPDATESYNCHEADER
              
              ReplSemiSyncMaster::updateSyncHeader contains redundant assignments
              to the local variable sync.
              
              This patch removes them.
------------------------------------------------------------
revno: 6715
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 19:05:54 +0900
message:
  WL#7050 - InnoDB: Refactor redo log write code for better performance
  
  - This is rewrite of log_write_up_to() to improve its performance in case where innodb_flush_log_at_trx_commit = 2.
  
  In log_write_up_to():
  
  * Remove wait mode. We always wait with one exception. And that is when doing log 
  sync from master thread. It makes that synchronous as well because that happens 
  only once per second.
  
  * Because we only have one log group therefore we don't need two flush_events.
  * Remove unnecessary fields like written_to_some_lsn, written_to_all_lsn.
  * If only write is requested we don't have to acquire the log_sys::mutex after we 
  release it. We currently do that only to do event handling but event handling is 
  really only needed in case where flush is requested i.e.: a thread should be 
  waiting on the event iff it is interested in flushing. Writes are serialized under 
  log_sys::mutex.
  
  This patch was originally written by Inaam Rana.
  
  rb#2389 Approved by Sunny and Yasufumi
  
  ===========
  
  Adjustment for performance was done therough inherited rb#3373
  
  - optimize log_write_up_to() more
  	* remove the second log_sys->mutex obtain also for "innodb_flush_log_at_trx_commit = 1" path
  	* remove unnecessary ut_memcpy. (because log_group_write_buf() is protected by log_sys->mutex)
  	* remove dirty-read from flush_to_disk=true case. (to avoid regression at some cases)
  	  (to keep current arbitration for write/fsync contention between log and data file)
  	* fix wrong handling of O_DSYNC
  - revive log_buffer_sync_in_background(). (because it needs to be used)
------------------------------------------------------------
revno: 6714 [merge]
committer: Nuno Carvalho <nuno.carvalho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 10:17:07 +0100
message:
  WL#6663: Make the MTR binlog suite GTID_MODE agnostic
  
  Merge from mysql-5.6 into mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.102
    committer: Nuno Carvalho <nuno.carvalho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-17 10:09:29 +0100
    message:
      WL#6663: Make the MTR binlog suite GTID_MODE agnostic
      
      Removed test binlog_tmp_table_gtid, which forced execution with
      gtid-mode=ON, since we already run all binlog suite with that option.
------------------------------------------------------------
revno: 6713
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 10:57:08 +0200
message:
  Modified mysqld_safe
------------------------------------------------------------
revno: 6712
committer: Neeraj Bisht <neeraj.x.bisht@oracle.com>
branch nick: trunk
timestamp: Thu 2013-10-17 14:12:21 +0530
message:
  Bug#11746789 : SPURIOUS ERROR WHEN COUNTING ROWS IN VIEW WITH 
  	       ORDER BY CLAUSE
  
  Problem:-
  In select query where number of field in projection list is 
  less than the number in view order by clause, will generate 
  an error.
  
  Analysis:-
  
  When we use VIEW_ALGORITHM_MERGE and we have order by in view.
  
  We convert query like
  create view v2 as select x,y,z from t1 order by 2
  select x from v2;
  
  to(by VIEW_ALGORITHM_MERGE)
  
  select x from t1 order by 2;
  Which will generate error.
  
  
  Solution:-
  To make sure that the body of the view cannot contain "ORDER BY
  ordinal" anymore (instead they will contain the referenced item).
  This will fix the problem for all newly created views (views
  created by a server which has the bugfix). Older views will still
  produce an error (because they have the ordinal in their body),
  then people will just have to drop and re-create their view.
  
  This solution still create problem in query like
  create view v1 as select 5 from t1 order by 1;
  select x from v1;
  
  Because select will be read as
  select x from t1 order by 5;
  In this case, instead of writting order by 5 we will change
  grouping/ordering by a constant string.
------------------------------------------------------------
revno: 6711
committer: Sneha Modi <sneha.modi@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 13:41:14 +0530
message:
  Bug#16851753 : CREATE TEST TO MEASURE STARTUP AND SHUTDOWN TIME FOR THE SERVER
  
  Renaming the test from startup_shutdown.test to server_startup_shutdown_time.test 
  and removing it from experimental as the test is now stable on pb2.
------------------------------------------------------------
revno: 6710
committer: Bharathy Satish <bharathy.x.satish@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-17 10:18:25 +0530
message:
  WL6797: Method for clearing session state.
  
  Probelm: main.mysql_upgrade tests fails on rhel5-x86-64bit-valgrind platform. 
  Fix: As part of WL6797 in main.mysql i have introduced a testcase which does not 
  do a cleanup of a table wl6797.t1, because of which there is a result content
  mismatch in mysqlcheck.result file. The issue is fixed by doing a proper cleanup.
  This is a test file issue.
  	
------------------------------------------------------------
revno: 6709 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push2
timestamp: Thu 2013-10-17 00:08:21 +0200
message:
  Merge mysql-5.6 --> mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.101 [merge]
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-push2
    timestamp: Wed 2013-10-16 23:41:36 +0200
    message:
      Push to mysql-5.6
        ------------------------------------------------------------
        revno: 3902.288.1
        committer: Marc Alff <marc.alff@oracle.com>
        branch nick: mysql-5.6-bug17542370
        timestamp: Wed 2013-10-16 12:28:59 +0200
        message:
          Bug#17542370 SEGMENTATION FAULT WHILE EXECUTING SELECT ON
          SESSION_CONNECT_ATTRS 
          
          Before this fix, executing a select on table
          performance_schema.session_connect_attrs could crash the server,
          when executed under load.
          
          The root cause is that the code that scans records:
          - does not honor the PFS_thread::m_sesion_lock lock,
          - does parse the live session attribute data,
            while it can possibly be modified
          
          Race conditions could occur:
          - when writing session attributes, shortly after a thread connect
          - when erasing session attributes, shortly before a thread disconnect
          
          The fix is to:
          - use an optimist lock on PFS_thread::m_sesion_lock
          - make a copy of the session connect attributes,
          - only when the optimist lock was successful,
            (meaning the data was not concurently modified),
            parse the safe copy of the content of it to extract attributes.
------------------------------------------------------------
revno: 6708
committer: kevin.lewis@oracle.com
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 15:30:10 -0500
message:
  Non-functional cleanup issues collected from recent work;
  
  1) Recent compiler warnings in ha_innodb.cc and i_s.cc that occur
     on VS2010-64.
  2) Converted some fprintf(stderr,...) mesages to ib_logf() in
     fil0fil.cc
  3) Fixed innodb_bug16066351 so that it will only run on
     lower_case_table_names=0 machines instead of trying to skip
     windows and certain versions of MacOS.  It did not list MacOS 10.8
     and was failing there.
  4) A message in srv/srv0space.cc Tablespace::check_file_spec() was
     not displaying the correct info.  Fixed in the code and
     in innodb-log-file.test.
  5) A couple other minor cleanups. 
  
  Approved in rb:3616 by Marko
------------------------------------------------------------
revno: 6707 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 22:36:28 +0300
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.100
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-16 22:17:44 +0300
    message:
      Correct the merge from mysql-5.5 to mysql-5.6 of
      Bug#17446090 TESTCASE INNODB_BUG16752251.TEST FAILS RANDOMLY ON PB2
      
      dict_stats_update_transient_for_index(): Skip the statistics
      on secondary indexes if innodb_change_buffering_debug (ibuf_debug) is set.
      This should get rid of change buffering test failures when using
      PERSISTENT_STATS=0 on MySQL 5.6 and later.
      
      Approved on IM by Kevin Lewis
------------------------------------------------------------
revno: 6706 [merge]
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 22:24:44 +0530
message:
  Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
  REPLICATION FILTERS ARE USED.
  Merging fix from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.277.99 [merge]
    committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-16 22:20:19 +0530
    message:
      Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
      REPLICATION FILTERS ARE USED.
      Merging fix from mysql-5.5
        ------------------------------------------------------------
        revno: 2875.545.46 [merge]
        committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-16 22:15:59 +0530
        message:
          Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
          REPLICATION FILTERS ARE USED.
          Merging fix from mysql-5.1
            ------------------------------------------------------------
            revno: 2661.880.57
            committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
            branch nick: mysql-5.1
            timestamp: Wed 2013-10-16 22:12:23 +0530
            message:
              Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
              REPLICATION FILTERS ARE USED.
              
              Problem:
              When Filtered-slave applies Int_var_log_event and when it
              tries to write the event to its own binlog, LAST_INSERT_ID
              value is written wrongly.
              
              Analysis:
              THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
              is a variable which is set when LAST_INSERT_ID() is used by
              a statement. If it is set, first_successful_insert_id_in_
              prev_stmt_for_binlog will be stored in the statement-based
              binlog. This variable is CUMULATIVE along the execution of
              a stored function or trigger: if one substatement sets it
              to 1 it will stay 1 until the function/trigger ends,
              thus making sure that first_successful_insert_id_in_
              prev_stmt_for_binlog does not change anymore and is
              propagated to the caller for binlogging. This is achieved
              using the following code
              if(!stmt_depends_on_first_successful_insert_id_in_prev_stmt)               
              {                                                                           
                /* It's the first time we read it */                                      
                first_successful_insert_id_in_prev_stmt_for_binlog=                       
                first_successful_insert_id_in_prev_stmt;                                
                stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1;               
              }
              
              Slave server, after receiving Int_var_log_event event from
              master, it is setting
              stmt_depends_on_first_successful_insert_id_in_prev_stmt
              to true(*which is wrong*) and not setting
              first_successful_insert_id_in_prev_stmt_for_binlog. Because
              of this problem, when the actual DML statement with
              LAST_INSERT_ID() is parsed by slave SQL thread,
              first_successful_insert_id_in_prev_stmt_for_binlog is not
              set. Hence the value zero (default value) is written to
              slave's binlog.
              
              Why only *Filtered slave* is effected when the code is
              in common place:
              -------------------------------------------------------
              In Query_log_event::do_apply_event,
              THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
              is reset to zero at the end of the function. In case of
              normal slave (No Filters), this variable will be reset. 
              In Filtered slave, Slave SQL thread defers all IRU events's
              execution until IRU's Query_log event is received. Once it
              receives Query_log_event it executes all pending IRU events
              and then it executes Query_log_event. Hence the variable is
              not getting reset to 0, causing this bug.
              
              Fix: As described above, the root cause was setting 
              THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
              when Int_var_log_event was executed by a SQL thread. Hence
              removing the problematic line from the code.
------------------------------------------------------------
revno: 6705
committer: Martin Hansson <martin.hansson@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 14:26:24 +0200
message:
  Bug#11748775: Fix of test case for --mysqld=--innodb_page_size=4k
------------------------------------------------------------
revno: 6704 [merge]
committer: Venkata Sidagam <venkata.sidagam@oracle.com>
branch nick: trunk
timestamp: Wed 2013-10-16 14:41:13 +0530
message:
  Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
        
  Merging from mysql-5.5 to mysql-5.6
  Note: In mysql-5.6 these changes were present in 
  sql/sql_acl.cc. Now the functions acl_get and 
  check_grant_db have been moved to 
  sql/auth/sql_auth_cache.cc and 
  sql/auth/sql_authorization.cc respectively.
    ------------------------------------------------------------
    revno: 3902.277.98 [merge]
    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
    branch nick: 5.6
    timestamp: Wed 2013-10-16 14:20:09 +0530
    message:
      Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
      
      Merging from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.45 [merge]
        committer: Venkata Sidagam <venkata.sidagam@oracle.com>
        branch nick: 5.5
        timestamp: Wed 2013-10-16 14:16:32 +0530
        message:
          Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
          
          Merging from mysql-5.1 to mysql-5.5
            ------------------------------------------------------------
            revno: 2661.880.56
            committer: Venkata Sidagam <venkata.sidagam@oracle.com>
            branch nick: 5.1
            timestamp: Wed 2013-10-16 14:14:44 +0530
            message:
              Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
              
              Description: Fix for bug CVE-2012-5611 (bug 67685) is 
              incomplete. The ACL_KEY_LENGTH-sized buffers in acl_get() and 
              check_grant_db() can be overflown by up to two bytes. That's 
              probably not enough to do anything more serious than crashing 
              mysqld.
              Analysis: In acl_get() when "copy_length" is calculated it 
              just adding the variable lengths. But when we are using them 
              with strmov() we are adding +1 to each. This will lead to a 
              three byte buffer overflow (i.e two +1's at strmov() and one 
              byte for the null added by strmov() function). Similarly it 
              happens for check_grant_db() function as well.
              Fix: We need to add "+2" to "copy_length" in acl_get() 
              and "+1" to "copy_length" in check_grant_db(). 
------------------------------------------------------------
revno: 6703
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Wed 2013-10-16 20:08:31 +1100
message:
  Bug#17516062 - BUF_FLUSH_EVENT IS CREATED TOO LATE, MAY CAUSE RECOVERY FAILURE
  
  Create the flush event at server startup not at flush thread startup. Also
  don't set the event if --innodb-read-only is set because the event is
  not created in read-only mode.
  
  Approved by Marko over IM.
------------------------------------------------------------
revno: 6702
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-17303649
timestamp: Wed 2013-10-16 11:00:42 +0200
message:
  WL#7052 - followup patch
  
  Additional cleanup requested by reviewers.
------------------------------------------------------------
revno: 6701
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-17303649
timestamp: Wed 2013-10-16 10:29:24 +0200
message:
  Bug#17303649: INCORRECT COST COMPARISON IN FIND_BEST_REF()
  
  The cost comparison at the end of find_best_ref() is incorrect. 
  It uses 
  "read cost of ref access for all rows from earlier tables" +
  "CPU cost of handling rows returned from a single ref access"
  
  Thus, the read cost and the CPU cost is not comparable. The CPU
  cost also needs to be "for all rows from earlier tables".
------------------------------------------------------------
revno: 6700
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug16924125
timestamp: Wed 2013-10-16 09:56:18 +0200
message:
  Bug#16924125: LOG_SLOW_STATEMENT COULD BAIL OUT EARLIER IF
                SLOW LOGGING IS DISABLED
  
  The problem was that checking if the slow query log was enabled,
  was one of the last checks that was done before writing to the
  slow query log. Since the slow query log by default is disabled,
  it makes sense to have this check earlier.
  
  This patch moves the check from Query_logger::slow_log_write() to
  the start of log_slow_applicable().
  
  As this is a minor optimization with no changes of behavior,
  no test case is added.
  
  The patch also fixes the --log-throttle-queries-not-using-indexes
  startup option so that it requires a value (=# instead of [=#]).
------------------------------------------------------------
revno: 6699
committer: Sneha Modi <sneha.modi@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 12:18:51 +0530
message:
  Bug#16851753 : 
  
  Modifying the test to skip it on valgrind. The test takes a very long time to run on valgrind
  builds. Hence, skipping it as it doesn't really make sense to run the test for 
  valgrind.
------------------------------------------------------------
revno: 6698 [merge]
committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
branch nick: Bug17429677_mysql-trunk
timestamp: Wed 2013-10-16 11:57:31 +0530
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.97 [merge]
    committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
    branch nick: Bug17429677_mysql-5.6
    timestamp: Wed 2013-10-16 11:52:57 +0530
    message:
      Merge from mysql-5.5 to mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.44
        committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
        branch nick: Bug17429677_mysql-5.5
        timestamp: Wed 2013-10-16 11:49:00 +0530
        message:
          Bug#17429677:LAST ARGUMENT OF LOAD DATA ...SET ...STATEMENT
          REPEATED TWICE IN BINLOG
          
          Problem:
          =======
          If LOAD DATA ... SET ... is used the last argument of SET is
          repeated twice in replication binlog.
          
          Analysis:
          ========
          LOAD DATA statements are reconstructed once again before
          they are written to the binary log. When SET clauses are
          specified as part of LOAD DATA statement, these SET clause
          user command strings need to be stored in order to rebuild
          the original user command. During parsing each column and
          the value in the SET command are stored in two differenet
          lists. All the values are stored in a string list.
          
          When SET expression has more than one value as shown in the
          following example:
          SET a = @a, b = CONCAT(@b, '| 123456789');
          
          Parser extracts values in the following manner i.e Item name
          , value string, actual length of the value of the item with
          in the string.
          
          Item a:
          Value for a:"= @a, b = CONCAT(@b, '| 123456789')
          str_length = 4
          Item b:
          Value for b:"= CONCAT(@b, '| 123456789')
          str_length = 27
          
          During reconstructing the LOAD DATA command the above
          strings are retrived as it is and appended to the LOAD DATA
          statement. Hence it becomes as shown below.
          
          SET `a`= @a, b = CONCAT(@b, '| 123456789'),
          `b`= CONCAT(@b, '| 123456789')
          
          Fix:
          ===
          During reconstruction of SET command, retrieve exact item
          value string rather than reading the entire string.
------------------------------------------------------------
revno: 6697 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-16 11:12:22 +0530
message:
  Upmerge for bug 17584523 from 5.6
    ------------------------------------------------------------
    revno: 3902.277.96 [merge]
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-16 11:07:24 +0530
    message:
      Upmerge for bug 17584523
        ------------------------------------------------------------
        revno: 2875.545.43
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-16 11:05:20 +0530
        message:
          Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS MSI PACKAGE
------------------------------------------------------------
revno: 6696 [merge]
committer: Atanu Ghosh <atanu.ghosh@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 19:21:52 +0530
message:
  Merging the patch for Bug#14040071 from mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.95
    committer: Atanu Ghosh <atanu.ghosh@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-15 19:08:47 +0530
    message:
      Bug#14040071:RECURSION LEADS TO STACK OVERFLOW WITH XML FUNCTIONS
      
      Problem: The problem is that when the XPATH expression
               exceeds limit, there is a stack overflow.
      
      Solution: As a fix, a call to check_stack_overrun was added,
                which throws the required error on stackoverflow.
------------------------------------------------------------
revno: 6695
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 14:51:43 +0200
message:
  Fix for 4k and 8k failure in mysqld_safe
------------------------------------------------------------
revno: 6694
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 14:49:30 +0200
message:
  making mysqld_safe experimental
------------------------------------------------------------
revno: 6693
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 17:46:38 +0530
message:
  BUG#14653594 - INSTALL PLUGIN HANGS SERVER WITH INVALID
                 UTF8 CHARACTERS IN PATH.
                 
  Post-push fix. Fix failing unit tests in Windows.    
------------------------------------------------------------
revno: 6692
committer: Bharathy Satish <bharathy.x.satish@oracle.com>
branch nick: bug17503460
timestamp: Tue 2013-10-15 16:52:46 +0530
message:
  Bug #17503460 MYSQL READ ONLY DOESN'T WORK FOR DROP TRIGGER
  
  Problem: Drop Trigger succeeds even after setting read_only variable to ON.
  Fix: Fix is to report the standard error (ER_OPTION_PREVENTS_STATEMENT) 
       when global read_only variable is set to ON.
   
------------------------------------------------------------
revno: 6691
committer: Vinay Fisrekar <vinay.fisrekar@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 16:33:45 +0530
message:
  Subtest need page size more than 8k.Skip run with page sizes 4k and 8k.
------------------------------------------------------------
revno: 6690 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 15:37:52 +0530
message:
  upmerge from 5.6 to put the mysql_install_db.pl back in windows
    ------------------------------------------------------------
    revno: 3902.277.94
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-15 15:34:04 +0530
    message:
      fix to to put mysql_install_db.pl back in windows installation
------------------------------------------------------------
revno: 6689
committer: Bharathy Satish <bharathy.x.satish@oracle.com>
branch nick: mysql.wl6797
timestamp: Tue 2013-10-15 14:18:09 +0530
message:
  Bug #17159662 WASTED WORK IN METHOD MY_XML_ERROR_POS()
  
  Problem: The execution of the loop at line 553 does not perform
  any useful work when s[0] is '\n'.
  Fix: Fix would be to iterate variable 's' from end and break when
  s[0] is '\n' thus saving some cpu.
------------------------------------------------------------
revno: 6688
committer: Bharathy Satish <bharathy.x.satish@oracle.com>
branch nick: mysql.wl6797
timestamp: Tue 2013-10-15 13:24:09 +0530
message:
  WL#6797 Method for clearing session state
        
  As of today connection pools partitioned by user use COM_CHANGE_USER during 
  recycle of a connection, by pool manager which does a re-authentication which
  is not needed. This WL will introduce a new RPC COM_RESET_CONNECTION which 
  will only do the cleanup of the session context without re-authentication.
------------------------------------------------------------
revno: 6687
committer: Akhila Maddukuri<akhila.x.maddukuri@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-15 11:20:12 +0530
message:
  Fix for a bad merge. 
------------------------------------------------------------
revno: 6686 [merge]
committer: Nuno Carvalho <nuno.carvalho@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-14 16:02:53 +0100
message:
  WL#7266: Dump-thread additional concurrency tests
  
  Merge from mysql-5.6 into mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.93 [merge]
    committer: Nuno Carvalho <nuno.carvalho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-14 15:57:06 +0100
    message:
      WL#7266: Dump-thread additional concurrency tests
      
      Merge from mysql-5.5 into mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.42 [merge]
        committer: Nuno Carvalho <nuno.carvalho@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-10-14 15:51:09 +0100
        message:
          WL#7266: Dump-thread additional concurrency tests
          
          Merge from mysql-5.1 into mysql-5.5.
            ------------------------------------------------------------
            revno: 2661.880.55
            committer: Nuno Carvalho <nuno.carvalho@oracle.com>
            branch nick: mysql-5.1
            timestamp: Mon 2013-10-14 15:45:12 +0100
            message:
              WL#7266: Dump-thread additional concurrency tests                                                                                                                           
              
              This worklog aims at testing the two following scenarios:
              
              1) Whenever the mysql_binlog_send method (dump thread)
              reaches the end of file when reading events from the binlog, before
              checking if it should wait for more events, there was a test to
              check if the file being read was still active, i.e, it was the last
              known binlog. However, it was possible that something was written to
              the binary log and then a rotation would happen, after EOF was
              detected and before the check for active was performed. In this
              case, the end of the binary log would not be read by the dump
              thread, and this would cause the slave to lose updates.
              This test verifies that the problem has been fixed. It waits during
              this window while forcing a rotation in the binlog.
              
              2) Verify dump thread can send events in active file, correctly after
              encountering an IO error.
------------------------------------------------------------
revno: 6685
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug17465503
timestamp: Mon 2013-10-14 15:06:30 +0200
message:
  Bug#17465503: STACKTRACE CODE REFERENCES OLD MANUAL LINKS
  
  This patch changes the strack trace error log message
  on Solaris so that it doesn't statically refer to a 5.1
  web page, but instead uses MYSQL_VERSION_MAJOR and
  MYSQL_VERSION_MINOR to refer to the web page matching
  the current release.
------------------------------------------------------------
revno: 6684
committer: Norvald H. Ryeng <norvald.ryeng@oracle.com>
branch nick: mysql-trunk-14359340
timestamp: Mon 2013-10-14 15:00:32 +0200
message:
  Bug#14359340 SELECT IFNULL(NULL, ~1) RETURNS INCORRECT VALUE
  
  Problem: IFNULL, COALESCE and CASE return signed values when they
  should return unsigned values if there is a NULL literal in a
  particular parameter position.
  
  Item_func_ifnull, Item_func_coalesce and Item_func_case all use
  agg_result_type() to find a data type that covers all argument types,
  and this function correctly ignores NULL literals. However, signedness
  is not computed the same way, so each item class has its own
  implementation, and those don't ignore NULL literals.
  
  Fix: Compute signedness of the combined data type in
  agg_result_type().
------------------------------------------------------------
revno: 6683
committer: Rafal Somla <rafal.somla@oracle.com>
branch nick: bug17514554-headers
timestamp: Mon 2013-10-14 14:03:56 +0200
message:
  Bug#17582168 CLEANUP CLIENT LIBRARY HEADER DEPENDENCIES
  
  Remove unnecessary dependencies from client-side plugin headers:
  
  1. Define MYSQL_PLUGIN_EXPORT macro required by plugin declarations 
     directly in <mysql/client_plugin.h> instead of using definition from 
     <mysql/plugin.h>. This macro was the only thing required by 
     client-side plugins and declared in server-side header 
     <mysql/plugin.h>.
  
  2. Do not use C_MODE_START/END in <mysql/plugin_trace.h> - thus no need 
     to include <my_global.h>.
  
  Source of qa_auth_client plugin is modified to test that extra
  dependencies are no longer needed.
------------------------------------------------------------
revno: 6682
committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-14 15:24:19 +0400
message:
  Updated test case result for the bug#17566396.
------------------------------------------------------------
revno: 6681 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Mon 2013-10-14 18:14:29 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.92
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Mon 2013-10-14 18:12:00 +0800
    message:
      Follow up fix for bug #17483582 - EXCESSIVE MEMORY USAGE WHEN QUERYING INFORMATION_SCHEMA.INNODB_FT_INDEX."
      initialize the total_memory in fts index optimization code path.
      
      Approved by Jimmy.Yang in IM.
------------------------------------------------------------
revno: 6680
committer: Martin Hansson <martin.hansson@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-14 09:03:27 +0200
message:
  WL#2241: Comments only.
------------------------------------------------------------
revno: 6679 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Sat 2013-10-12 15:33:16 +0200
message:
  Merge mysql-5.6 --> mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.91
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-push
    timestamp: Sat 2013-10-12 15:24:01 +0200
    message:
      Build and test cleanup
------------------------------------------------------------
revno: 6678 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix1
timestamp: Sat 2013-10-12 12:32:03 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.90
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix1
    timestamp: Sat 2013-10-12 11:09:38 +0800
    message:
      BUG#17483582 - EXCESSIVE MEMORY USAGE WHEN QUERYING INFORMATION_SCHEMA.INNODB_FT_INDEX
      
      Analysis & Solution:
      We first fetch all fts index records into memory and then store them into myisam temp table,
      so it will consumes huge memory when the fts index is big enough.
      
      In this patch, we limit the memory usage by INNODB_FT_RESULT_CACHE_LIMIT.
      When we reach the limit, do more fetches until we have all records
      
      rb://3398 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6677 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Sat 2013-10-12 05:05:10 +0200
message:
  Merge mysql-5.6 --> mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.89
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-push
    timestamp: Sat 2013-10-12 04:17:21 +0200
    message:
      Fixed number of rwlock, adjusted tests
------------------------------------------------------------
revno: 6676 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Sat 2013-10-12 01:41:18 +0200
message:
  Merge mysql-5.6 --> mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.88 [merge]
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-push
    timestamp: Sat 2013-10-12 01:22:41 +0200
    message:
      Merge to mysql-5.6
        ------------------------------------------------------------
        revno: 3902.287.1
        committer: Marc Alff <marc.alff@oracle.com>
        branch nick: mysql-5.6-bug17590161
        timestamp: Fri 2013-10-11 17:31:42 +0200
        message:
          Bug#17590161 READ/WRITE MUTEXES ON BINLOG DELEGATE CLASSES ARE NOT COUNTED
          ON PERF SCHEMA 
          
          Prior to this fix, the read write lock Delegate::lock was not instrumented 
          for the performance schema.
          This lock is used in particular for the following classes:
          - Trans_delegate
          - Binlog_storage_delegate
          - Binlog_transmit_delegate
          - Binlog_relay_IO_delegate
          
          With this fix, the read write lock is instrumented.
          For clarity, a different name is used for each sub class,
          to have distinct statistics for distinct uses.
          
          The instruments added are visible in table 
          performance_schema.setup_instruments as:
          - wait/synch/rwlock/sql/Trans_delegate::lock
          - wait/synch/rwlock/sql/Binlog_storage_delegate::lock
          - wait/synch/rwlock/sql/Binlog_transmit_delegate::lock
          - wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock
------------------------------------------------------------
revno: 6675 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-11 22:36:57 +0300
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.87
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-11 21:55:53 +0300
    message:
      Bug#16884217 BTR_VALIDATE_LEVEL() FAILS ON THE CHANGE BUFFER TREE
      
      ibuf_restore_pos(): If the change buffer cursor restoration fails,
      do not invoke btr_validate_index() on the change buffer, but instead
      crash as fast as possible, so that we would have more useful information
      in the core dump.
      
      When WL#5522 (transportable tablespaces) was pushed, it added checks to
      btr_validate_level(), checking that each page is marked as allocated.
      Because the allocation of change buffer pages is handled differently from
      other B-tree pages, these checks would fail on the change buffer.
      
      This was the only call to btr_validate_index() on the change buffer.
      Normally, btr_validate_index() is invoked for indexes of user tables,
      as part of CHECK TABLE.
      
      Approved by Jimmy Yang over IM.
    ------------------------------------------------------------
    revno: 3902.277.86 [merge]
    committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-10-11 12:34:14 +0400
    message:
      Auto-merged fix for the bug#17566396.
        ------------------------------------------------------------
        revno: 3902.286.1
        committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
        branch nick: bug17566396-5.6
        timestamp: Fri 2013-10-11 12:26:18 +0400
        message:
          Bug#17566396: MATERIALIZATION IS NOT CHOSEN FOR LONG UTF8 VARCHAR FIELD
          Semi-join materialization relies on heap tables, and thus have to take into
          account their limitations. Among other things, heap tables can't handle blob
          objects, so if a string field would be converted to a blob, semijoin
          materialization strategy can't be used. To check that, Item::is_blob_field()
          function is used. It compares item's max_length with
          CONVERT_IF_BIGGER_TO_BLOB constant. The cause of the bug is that byte length
          was used in comparison instead of char length. This made sj mat strategy
          unavailable for varchar fields in utf8 longer than 170 chars.
          
          Now Item::is_blob_field() uses char length in comparison.
          Also create_tmp_table() now uses char length to make decision on whether it
          should use index for grouping or revert to unique constraint for blobs.
------------------------------------------------------------
revno: 6674
committer: Vasil Dimov <vasil.dimov@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-11 14:31:48 +0300
message:
  Non-functional change - make buf_relocate() private within buf0buf.cc
  since it is used solely in that file.
------------------------------------------------------------
revno: 6673
committer: mithun <mithun.c.y@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-11 15:04:48 +0530
message:
  BUG#16386136 : CRASH, HANDLER READ OF INVALID 
                       INDEX COMPARING COLUMNS
  ISSUE:
        Before calling Item_func::fix_fields, we should
        set the table->map. table->map will decide
        whether fields in condition are constant or not.
        But we never set the table->map for handler read statement
        And if table->map is not set the fields related to table are 
        wrongly considered as constants.  And hence execution 
        followed the wrong path and crashed.
        
  SOLUTION:
        We consider handle statements operate on table number 0. 
        And in concert we set the table->map to 2^0.
------------------------------------------------------------
revno: 6672
committer: kevin.lewis@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-10 15:16:19 -0500
message:
  Convert ibool to bool in fil0file.cc and os0file.cc and all callers
  of thos fnctions.  As part of the review process, there were some other
  code cleanup changes made.  But none of these changes are functional.
  
  Approved by Marko on RB3474
------------------------------------------------------------
revno: 6671 [merge]
committer: Joao Gramacho <joao.gramacho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-10 18:21:55 +0100
message:
  Merge from mysql-5.6 into mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.85
    committer: Joao Gramacho <joao.gramacho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-10 18:15:38 +0100
    message:
      Bug#17032712 SET @@GLOBAL.GTID_PURGED='UUID:1-1000000000000000000' ASSERTS
      
      Problem:
      =======
      The get_string_length() function is failing to assert the correct string
      length of numbers with 19 digits.
      
      Analysis:
      ========
      The get_string_length() function returns the length a string must have in
      order to store a given number. It is used to calculate the string length
      of a GTID set.
      
      Because this function is static at rpl_gtid_set.cc, it is not trivial to
      make unit tests to verify its functionality. So, there is an assert
      executed only in debug enabled versions that checks if the value to be
      returned is equal to the length of printing the number in a string with
      snprintf().
      
      Because of the precision of the rpl_gno data type (int64), an auxiliary
      variable may overflow when the number to be evaluated has 19 digits. The
      currently implemented code doesn't take into account this overflow 
      possibility, making that every 19 digit number be evaluated as having 20
      digits in length. This divergence cause the assert to fail.
      
      Fix:
      ===
      Changed the function code replacing the length calculation algorithm with
      one that is simple, easy to read and overflow free.
------------------------------------------------------------
revno: 6670
committer: shipjain@oracle.com
branch nick: mysql-trunk
timestamp: Thu 2013-10-10 18:23:10 +0200
message:
  WL6446
------------------------------------------------------------
revno: 6669
committer: Joao Gramacho <joao.gramacho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-10 17:14:17 +0100
message:
  Reverting merge
------------------------------------------------------------
revno: 6668 [merge]
committer: Joao Gramacho <joao.gramacho@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-10 16:59:56 +0100
message:
  Bug#17032712 SET @@GLOBAL.GTID_PURGED='UUID:1-1000000000000000000' ASSERTS
  
  Problem:
  =======
  The get_string_length() function is failing to assert the correct string
  length of numbers with 19 digits.
  
  Analysis:
  ========
  The get_string_length() function returns the length a string must have in
  order to store a given number. It is used to calculate the string length
  of a GTID set.
  
  Because this function is static at rpl_gtid_set.cc, it is not trivial to
  make unit tests to verify its functionality. So, there is an assert
  executed only in debug enabled versions that checks if the value to be
  returned is equal to the length of printing the number in a string with
  snprintf().
  
  Because of the precision of the rpl_gno data type (int64), an auxiliary
  variable may overflow when the number to be evaluated has 19 digits. The
  currently implemented code doesn't take into account this overflow 
  possibility, making that every 19 digit number be evaluated as having 20
  digits in length. This divergence cause the assert to fail.
  
  Fix:
  ===
  Changed the function code replacing the length calculation algorithm with
  one that is simple, easy to read and overflow free.
    ------------------------------------------------------------
    revno: 3902.285.1
    committer: Joao Gramacho <joao.gramacho@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-10 16:56:33 +0100
    message:
      Bug#17032712 SET @@GLOBAL.GTID_PURGED='UUID:1-1000000000000000000' ASSERTS
      
      Problem:
      =======
      The get_string_length() function is failing to assert the correct string
      length of numbers with 19 digits.
      
      Analysis:
      ========
      The get_string_length() function returns the length a string must have in
      order to store a given number. It is used to calculate the string length
      of a GTID set.
      
      Because this function is static at rpl_gtid_set.cc, it is not trivial to
      make unit tests to verify its functionality. So, there is an assert
      executed only in debug enabled versions that checks if the value to be
      returned is equal to the length of printing the number in a string with
      snprintf().
      
      Because of the precision of the rpl_gno data type (int64), an auxiliary
      variable may overflow when the number to be evaluated has 19 digits. The
      currently implemented code doesn't take into account this overflow 
      possibility, making that every 19 digit number be evaluated as having 20
      digits in length. This divergence cause the assert to fail.
      
      Fix:
      ===
      Changed the function code replacing the length calculation algorithm with
      one that is simple, easy to read and overflow free.
------------------------------------------------------------
revno: 6667
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-review
timestamp: Thu 2013-10-10 13:55:38 +0200
message:
  Bug#17405466: USE_COUNT: WRONG COUNT FOR KEY AT 0X27547278, 
                3 SHOULD BE 4
        
  Consider an index (kp1, kp2, kp3), and a WHERE clause involving
  all three keyparts ('kpx_pred' represents a predicate usable by 
  the range access method on keypart 'x'):
        
  "WHERE (kp2_pred OR kp2_pred) AND 
          kp3_pred AND 
         (kp1_pred OR kp1_pred)"
        
  The range optimizer first creates a SEL_ARG tree for kp2 with
  two SEL_ARGs, then another SEL_ARG tree for kp3. Both SEL_ARGs
  for kp2 will point to this kp3-SEL_ARG via the next_key_part 
  pointer. The use_count of the root of the SEL_ARG tree for
  kp2 is now 1 (it is pointed to by SEL_TREE::keys[]), and 
  the use_count of the root of the SEL_ARG tree for kp3 is 2 
  (next_key_part pointers from both kp2 SEL_ARGs).
        
  Now the range optimizer creates a SEL_ARG tree with two 
  SEL_ARGs for kp1. Both these need to point to the SEL_ARG tree
  for kp2 via the next_key_part pointer. This should increase the
  use_count of the kp2 SEL_ARG tree by 1 (+2 next_key_part 
  pointers for the kp1 SEL_ARG tree, -1 since SEL_TREE::keys[]
  now points to the kp1 SEL_ARG tree and not directly to the
  kp2 SEL_ARG tree). 
        
  This increase in use_count also needs to be propagated to the 
  kp3 SEL_ARG tree, and this is where the bug was: instead of 
  increasing the use count for each next_key_part pointing to 
  the kp3 SEL_ARG tree, only the next_key_part of the root of 
  kp2 SEL_ARG tree was increased. The fix is to propagate the
  increase to all SEL_ARG trees pointed to by all SEL_ARGs.
     
  Debugging this without printing the full SEL_ARG range trees
  would have been very hard. The patch therefore also adds a
  parameter to print_tree() so that a full printout is done when
  printing to the debug trace but not when printing to optimizer
  trace.
------------------------------------------------------------
revno: 6666
committer: magnus.blaudd@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-10 12:15:28 +0200
message:
  Restore behaviuor of mtr.pl to enable ndbcluster when mysqld supports ndbcluster
   - Nothing is built with ndbcluster by default except in MySQL Cluster trees.
   - Use --skip-ndbcluster to disable
------------------------------------------------------------
revno: 6665 [merge]
committer: magnus.blaudd@oracle.com
branch nick: trunk
timestamp: Thu 2013-10-10 10:59:44 +0200
message:
  Merge trunk-bug17526814 -> trunk
    ------------------------------------------------------------
    revno: 6565.1.1
    committer: magnus.blaudd@oracle.com
    branch nick: trunk-bug17526814
    timestamp: Fri 2013-09-27 11:12:00 +0200
    message:
      Bug#17526814 CAN NOT CREATE NDB TABLE WITH FOREIGN KEY USING ALTER TABLE
      
       - change the restriction for no fk for partiotioned to only
         concern ha_partition partioned tables.
       - tested with existing ndb_fk_* tests
------------------------------------------------------------
revno: 6664 [merge]
committer: Georgi Kodinov <georgi.kodinov@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 17:55:30 +0300
message:
  merge
    ------------------------------------------------------------
    revno: 6655.1.1
    committer: Georgi Kodinov <georgi.kodinov@oracle.com>
    branch nick: mysql-trunk
    timestamp: Wed 2013-10-09 17:24:25 +0300
    message:
      Bug #17581965: MYSQL-TRUNK FAILS TO COMPILE ON VS2013RC
      
      The fix for bug #17332056 was incomplete as it didn't bump up the minimum windows version required 
      through _WIN32_WINNT.
      
      Fixed by updating the CMAKE windows script to require the actual minimal version.
      Also added a check for VS2013RC implementing isnan in math.h before emabrking on 
      the workaround to define is as a synonim for _isnan().
      
      No test case needed
------------------------------------------------------------
revno: 6663 [merge]
committer: Satya Bodapati <satya.bodapati@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 18:49:29 +0530
message:
  Merge the testcase fix for BUG#17446090 from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.84 [merge]
    committer: Satya Bodapati <satya.bodapati@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 18:44:35 +0530
    message:
      Merge the testcase fix for BUG#17446090 from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.41
        committer: Satya Bodapati <satya.bodapati@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-09 18:42:27 +0530
        message:
          BUG#17446090 - TESTCASE INNODB_BUG16752251.TEST FAILS RANDOMLY ON PB2
          
          DBUG_SUICIDE() hangs valgrind. Disable the test under valgrind
------------------------------------------------------------
revno: 6662 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 17:18:26 +0530
message:
  Null merging the changes from 5.6
    ------------------------------------------------------------
    revno: 3902.277.83 [merge]
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 17:12:58 +0530
    message:
      Null Merging the changes from 5.5
        ------------------------------------------------------------
        revno: 2875.545.40
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-09 17:08:45 +0530
        message:
          BUG 17560050 - MYSQL_INSTALL_DB SCRIPT FAILING WITH RESOLVEIP ISSUES.
------------------------------------------------------------
revno: 6661 [merge]
committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 16:48:33 +0530
message:
  Null Merge: Copyright changes from 5.6
    ------------------------------------------------------------
    revno: 3902.277.82
    committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 16:47:06 +0530
    message:
      Bug# 16919882: Changing the copyright header format
------------------------------------------------------------
revno: 6660 [merge]
committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 16:43:53 +0530
message:
  Null merging the copyright changes.
    ------------------------------------------------------------
    revno: 3902.284.1
    committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 16:15:58 +0530
    message:
      Bug# 16919882: Updating the copyright header format for 5.6 files.
------------------------------------------------------------
revno: 6659 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix2
timestamp: Wed 2013-10-09 19:04:17 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.81
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bugfix2
    timestamp: Wed 2013-10-09 19:00:56 +0800
    message:
      BUG#17458835 - INNODB FULLTEXT SEARCH DOESN'T FIND RECORDS WHEN SAVEPOINTS ARE INVOLVED
      
      Analysis & Solution:
      we simply free a savepoint when releasing a savepoint in which holds all rows
      including newly inserted rows, so we get rows lost.
      
      The solution is putting the last savepoint's rows to top savepoint.
      
      rb://3529 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6658 [merge]
committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 13:55:20 +0400
message:
  Auto-merged.
    ------------------------------------------------------------
    revno: 6653.1.1
    committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
    branch nick: mysql-trunk
    timestamp: Wed 2013-10-09 11:37:48 +0400
    message:
      The test case for the bug#17434385 is moved to the
      proper test file.
------------------------------------------------------------
revno: 6657
committer: Martin Hansson <martin.hansson@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 11:19:03 +0200
message:
  Bug#11748775: Added ANALYZE TABLE to test case.
------------------------------------------------------------
revno: 6656 [merge]
committer: Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com>
branch nick: mysql-trunk-17024290
timestamp: Wed 2013-10-09 14:30:50 +0530
message:
  BUG#17024290: RENAMING A COLUMN IN ONLINE DDL REQUIRES TABLE
                COPY FOR BINARY DATA TYPES
  
  Merge from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.80
    committer: Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com>
    branch nick: mysql-5.6-17024290
    timestamp: Wed 2013-10-09 14:19:42 +0530
    message:
      BUG#17024290: RENAMING A COLUMN IN ONLINE DDL REQUIRES TABLE 
                    COPY FOR BINARY DATA TYPES
      
      Info
      ----
      Backport of the patch provided for BUG#14735373.
      
      Note: Have added additional test cases to cover
      the scenarios mentioned in the report of this bug.
------------------------------------------------------------
revno: 6655 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 13:37:53 +0530
message:
  Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
  
  Merging from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.79 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 13:34:35 +0530
    message:
      Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
      
      Merging from 5.5 to 5.6
        ------------------------------------------------------------
        revno: 2875.545.39
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-09 13:32:31 +0530
        message:
          Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
                         AND 'KILL SESSION' LEAD TO CRASH               
          
          Analysis:
          --------
          This situation occurs when the connection executes query 
          "show engine innodb status" and this connection is killed by
          executing statement "kill <con>" by another connection.
          
          In function "innodb_show_status", function "stat_print"
          is called to print the status but return value of function
          is not checked.  After killing connection, if write to 
          connection fails then error is returned and same is set
          in Diagnostic area. Since FALSE is returned from
          "innodb_show_status" now, assert to check no error
          is set in function "set_eof_status" (called from
          my_eof) is failing. 
          
          Fix:
          ----
          Changed code to check return value of function "stat_print"
          in "innodb_show_status".
------------------------------------------------------------
revno: 6654 [merge]
committer: Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 13:02:22 +0530
message:
  Merge from 5.6 to trunk
    ------------------------------------------------------------
    revno: 3902.277.78
    committer: Chaithra Gopalareddy <chaithra.gopalareddy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 12:54:21 +0530
    message:
      Bug#16894092: PERFORMANCE REGRESSION IN 5.6.6+ FOR INSERT
                    INTO .... SELECT ... FROM
      
      Problem:
      The performance regression is related to writing the temporary table
      into MyISAM. If we configure tmp_table_size and max_heap_table_size
      sufficiently high (in this case setting them to 96M) in order to ensure that
      the temporary table can be stored in the Memory engine, the performance
      regression is no longer present.
      Regression source was found to be WL#6071.
      
      Analysis:
      While creating temporary table, a random scan is initialized.
      This initialization internally frees buffers in case of myisam.
      As a result writes/reads happen to disk rather than
      cache. And hence the performance hit when we try to create
      tmp table in myisam.
      
      Solution:
      Initialize the scan without freeing buffers which can be done
      by calling ha_rnd_init(1).
------------------------------------------------------------
revno: 6653
committer: Vinay Fisrekar <vinay.fisrekar@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 12:31:28 +0530
message:
  wl#7279 : Add engine clause to main suite subtest which requires myisam
  
  Few tests are failing (when run with innodb as default engine) because one/more
  subtests from ".test" file are myisam specific. We can't skip run of entire test with
  innodb as only small part of test is myisam.
  We added engine=myisam clause to create table statement where subtest is myisam specific.
  Hence it will make subtest run with myisam and rest of test with default engine.
  Result file modified with related to this change and for additional expected difference.
------------------------------------------------------------
revno: 6652 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-09 11:39:21 +0530
message:
  upmerge for bug 13878021
    ------------------------------------------------------------
    revno: 3902.277.77 [merge]
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-10-09 11:26:33 +0530
    message:
      upmerge for bug 13878021
        ------------------------------------------------------------
        revno: 2875.545.38
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Wed 2013-10-09 11:10:46 +0530
        message:
          Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBRARIES USED
------------------------------------------------------------
revno: 6651 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-merge
timestamp: Tue 2013-10-08 23:52:58 +0200
message:
  Merge mysql-5.6 --> mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.76
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-bug70552
    timestamp: Tue 2013-10-08 22:48:13 +0200
    message:
      BUG#17576516 HOST_CACHE_SIZE VALUE IS IGNORED  
      
      Before this fix, starting the server with
        host_cache_size = N
      in the my.cnf file had no effect.
      The internal host cache size was always 128.
      
      The root cause is in hostname_cache_init(),
      which is using 'HOST_CACHE_SIZE' (a #define to 128)
      instead of 'host_cache_size' (the C global variable that corresponds to the
      SQL system value named host_cache_size).
      
      Overall, the initialization of the host cache is not satisfactory, and needs
      to be cleaned up.
      
      In particular, the fact that there are distinct:
      - data path (mysqld.cc setting the host_cache_size global variable, 
        to be used by hostname.cc)
      - control path (mysqld.cc calling hostname_cache_init with no parameters)
      can only be a source of confusion.
      
      This fix:
      - moves the global variable host_cache_size to mysqld, where it belongs,
        because this is a server global variable
      - changes the variable type from ulong to uint, given that the size really
        is an unsigned int, per hash_filo::m_size
      - changes hostname_cache_init() to take explicitely a size,
        for consistency with hostname_cache_resize(),
        and for a cleaner interface.
------------------------------------------------------------
revno: 6650 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-08 14:39:25 +0200
message:
  Null merge
    ------------------------------------------------------------
    revno: 3902.277.75
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-08 14:36:10 +0200
    message:
      Updated dist version for 5.6.15, fixed rpm-uln advanced build error
------------------------------------------------------------
revno: 6649
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-08 15:26:43 +0530
message:
  BUG#14653594 - "INSTALL PLUGIN" HANGS SERVER WITH INVALID UTF8 CHARACTERS IN PATH
  Post-push fix for failing test case
------------------------------------------------------------
revno: 6648
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-08 15:08:39 +0530
message:
  BUG#14653594 - "INSTALL PLUGIN" HANGS SERVER WITH INVALID UTF8 CHARACTERS IN PATH
  Fix compile error
------------------------------------------------------------
revno: 6647
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-08 14:34:05 +0530
message:
  BUG#14653594 - "INSTALL PLUGIN" HANGS SERVER WITH INVALID UTF8 CHARACTERS IN PATH
  Post-push fix for a failing unit test case.
------------------------------------------------------------
revno: 6646
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-08 12:13:10 +0530
message:
  BUG#14653594 - "INSTALL PLUGIN" HANGS SERVER WITH INVALID
                  UTF8 CHARACTERS IN PATH
  PROBLEM AND FIX:
  If the shared library name in INSTALL PLUGIN contains an
  invalid UTF8 character, then it causes hang in the release
  build and it raises an assert in the function my_strcspn
  in debug builds.
  
  The reason for this failure is because in macro SCAN_STRING,
  my_mbcharlen returns zero if there is any invalid encoding
  of the character which results in assertion being 
  triggered in debug builds and in release build it gets into 
  an infinite loop causing a hang. The client can supply an 
  invalid utf8 encoded character and cause a hang of session,
  the assert needs to be removed and fixed.
  
  The fix is to return zero to the caller if my_mbcharlen
  returns zero in SCAN_STRING. The function my_strchr has
  also been modified to return NULL if it encounters an        
  invalid UTF8 char while walking through the supplied
  string. Also other uses of my_mbcharlen have been 
  identified and error has been propagated.
  
  NOTE:The 'CHARSET UTF8' needs to be executed prior to using 
  utf8 in the windows OS at mysql client prompt to read utf8
  encoded characters.
------------------------------------------------------------
revno: 6645 [merge]
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bug17384979
timestamp: Tue 2013-10-08 12:30:51 +0800
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.74
    committer: Shaohua Wang <shaohua.wang@oracle.com>
    branch nick: mysql-5.6-bug17384979
    timestamp: Tue 2013-10-08 11:22:51 +0800
    message:
      BUG 17384979 - YIELD ON SCANNER THREAD FOR PARALLEL FTS INDEX CREATE TO MINIMIZE MEMORY USAGE
      
      Solution:
      1. Let scanner thread sleep for a while if fts_doc_list memory exceeds the limit;
      2. Free doc_item once it's tokenized(a mutex is created to protect fts_doc_list).
      
      rb#3335 approved by Jimmy.Yang
------------------------------------------------------------
revno: 6644 [merge]
committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 20:53:03 +0400
message:
  Auto-merged fix for the bug#17434385.
    ------------------------------------------------------------
    revno: 6623.1.1
    committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
    branch nick: bug17434385-trunk
    timestamp: Mon 2013-10-07 13:45:43 +0400
    message:
      Bug#17434385: SHOW PROCEDURE CODE ASSERTION FAILED: AT SQL_LEX.CC:2831
      
      After WL#6369 all explainable statements are supposed to be not cleaned till
      the end of the statement in order to provide plan for EXPLAIN FOR CONNECTION.
      To ensure that an assert at sql_lex.cc:2831 was added. SHOW PROCEDURE CODE
      can't be explained, so it's ok to skip this assert.
      Also, "<already_cleaned_up>" isn't printed on a clena unit since it's essentially
      useless: if unit is clean all select list items are reverted to initial state and
      don't point to a tmp table anymore, so it's safe to print them.
------------------------------------------------------------
revno: 6643 [merge]
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 22:08:25 +0530
message:
  Bug#16960133 MYSQLBINLOG VERBOSE OUTPUT, INVALID MEMORY
  ACCESS IN MY_B_WRITE_QUOTED
  
  Merging fix from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.277.73
    committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 21:46:54 +0530
    message:
      Bug#16960133 MYSQLBINLOG VERBOSE OUTPUT, INVALID MEMORY
      ACCESS IN MY_B_WRITE_QUOTED
      
      Analysis: IN RBR mode and binlog_row_image is set to
      MINIMAL, only the changed columns are logged in binlog.
      And the meta data (eg: null bytes) will also be written
      only for these effected columns. `mysqlbinlog` tool in
      verbose mode (-v) skips these null bytes before reading
      the actual row. This tool assumes that for each column
      in the table there is one null bit which is not always
      true(eg: binlog_row_image=minimal) and calculates the
      number of total null bytes written in the binlog wrongly
      (ie., skips wrong number of bytes) and finally ends up
      in interpreting the row in wrong way. This problem could
      lead to invalid memory reads. The formula used to calculate
      the metadata bytes was ((number of columns in the table + 7) /8).
      
      For example, if we have 9 columns in a table and if there
      is a two columns insert/update event, master would have
      written two bits (i.e., one byte) in row metadata. If
      we calculate based on number of columns in table, it 
      results 2 bytes instead of 1 byte.
      
      Fix:
      The formula should be based on the number of columns
      written in the event instead of the total number of columns
      in the table. Changed new formula is
      ((number of columns written in the event) + 7)/8)
------------------------------------------------------------
revno: 6642
committer: matthias.leich@oracle.com
branch nick: mysql-trunk_merge1
timestamp: Mon 2013-10-07 16:56:38 +0200
message:
  Bug#17298829 	INNODB_WL6326_BIG FAILS WITH INNODB_PAGE_SIZE 4K AND 8K + SPORADIC FAILURES
  1. Make the expected results independent of actual InnoDB page size.
  2. Reordering of sub tests etc. in order to avoid the sporadic failures.
  3. Minor cleanup in the test and especially comments.
  4. Remove the test from disabled.def and add it to default.experimental because the test
     might stay risky.
------------------------------------------------------------
revno: 6641 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 18:21:52 +0530
message:
  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
  
  Merging from 5.6 to trunk
    ------------------------------------------------------------
    revno: 3902.277.72 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 18:19:21 +0530
    message:
      Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
      
      Merging from 5.5 to 5.6
        ------------------------------------------------------------
        revno: 2875.545.37
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql_5_5
        timestamp: Mon 2013-10-07 18:17:26 +0530
        message:
          Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
                
          Fixing pb2 test failure for 5.5 version on solaris platform.
------------------------------------------------------------
revno: 6640 [merge]
committer: Kent Boortz <kent.boortz@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 13:51:05 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 3902.277.71 [merge]
    committer: Kent Boortz <kent.boortz@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 13:47:03 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 2875.545.36 [merge]
        committer: Kent Boortz <kent.boortz@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-10-07 13:05:49 +0200
        message:
          Corrections of copyright headers (RE-request 45781)
            ------------------------------------------------------------
            revno: 2661.880.54 [merge]
            committer: Kent Boortz <kent.boortz@oracle.com>
            branch nick: mysql-5.1
            timestamp: Mon 2013-10-07 12:44:38 +0200
            message:
              Corrections of copyright headers (RE-request 45781)
    ------------------------------------------------------------
    revno: 3902.277.70 [merge]
    committer: Kent Boortz <kent.boortz@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 13:06:48 +0200
    message:
      Corrections of copyright headers (RE-request 45781)
        ------------------------------------------------------------
        revno: 2875.545.35 [merge]
        committer: Kent Boortz <kent.boortz@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-10-07 12:45:05 +0200
        message:
          Corrections of copyright headers (RE-request 45781)
------------------------------------------------------------
revno: 6639 [merge]
committer: Kent Boortz <kent.boortz@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 13:39:32 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 6636.1.1
    committer: Abhishek Ranjan <abhishek.ar.ranjan@oracle.com>
    branch nick: bug11748566-trunk
    timestamp: Mon 2013-10-07 17:00:55 +0530
    message:
      BUG#11748566 - MYSQL SHOWS WRONG DEFAULT VALUE FOR PK IF
                       NOT NULL NOT SPECIFIED
      
      Post Push fix for failing test cases.
------------------------------------------------------------
revno: 6638 [merge]
committer: Kent Boortz <kent.boortz@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 13:08:11 +0200
message:
  Corrections of copyright headers (RE-request 45781)
    ------------------------------------------------------------
    revno: 3902.277.69 [merge]
    committer: Kent Boortz <kent.boortz@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 12:46:18 +0200
    message:
      Corrections of copyright headers (RE-request 45781)
------------------------------------------------------------
revno: 6637 [merge]
committer: Kent Boortz <kent.boortz@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 12:48:08 +0200
message:
  Corrections of copyright headers (RE-request 45781)
    ------------------------------------------------------------
    revno: 6629.1.1 [merge]
    committer: Kent Boortz <kent.boortz@oracle.com>
    branch nick: mysql-trunk
    timestamp: Mon 2013-10-07 02:10:14 +0200
    message:
      Corretions of copyright headers (RE-request 45781)
        ------------------------------------------------------------
        revno: 3902.283.1 [merge]
        committer: Kent Boortz <kent.boortz@oracle.com>
        branch nick: mysql-5.6
        timestamp: Sun 2013-10-06 23:37:40 +0200
        message:
          Corretions of copyright headers (RE-request 45781)
            ------------------------------------------------------------
            revno: 2875.580.1 [merge]
            committer: Kent Boortz <kent.boortz@oracle.com>
            branch nick: mysql-5.5
            timestamp: Sun 2013-10-06 18:16:09 +0200
            message:
              Corretions of copyright headers (RE-request 45781)
                ------------------------------------------------------------
                revno: 2661.887.1
                committer: Kent Boortz <kent.boortz@oracle.com>
                branch nick: mysql-5.1
                timestamp: Fri 2013-10-04 13:51:13 +0200
                message:
                  Corretions of copyright headers (RE-request 45781)
------------------------------------------------------------
revno: 6636
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-stmtmap-reset
timestamp: Mon 2013-10-07 10:51:32 +0200
message:
  Bug#17560986 DO NOT GRAB LOCK_PREPARED_STMT_COUNT TO SUBTRACT ZERO FROM PREPARED_STMT_COUNT
  
  During logout processing we decrement the global number of prepared statements.
  If the connection has not used prepared statements, or has already deallocated them,
  then there's no point in grabbing the global mutex.
  
  The result is: less contention on LOCK_prepared_stmt_count during logout processing.
------------------------------------------------------------
revno: 6635 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 14:10:57 +0530
message:
  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
  
  Merging from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.68 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 14:09:29 +0530
    message:
      Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
      
      Merging from 5.5 to 5.6.
        ------------------------------------------------------------
        revno: 2875.545.34
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql_5_5
        timestamp: Mon 2013-10-07 14:03:57 +0530
        message:
          Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
                    
          Fixing pb2 test failure.
------------------------------------------------------------
revno: 6634
committer: prabakaran thirumalai <prabakaran.thirumalai@oracle.com>
branch nick: mysql-trunk-mdl
timestamp: Mon 2013-10-07 12:14:51 +0530
message:
  Bug#16328164 	PORTION OF ALTER TABLE STATEMENT IGNORED
  WHEN COMMENT QUOTED WITH BACKSLASH
  
  Notes:
  Duplicate Root Cause - Bug #12762377
  Adding test case mentioned in bug report.
------------------------------------------------------------
revno: 6633
committer: Sneha Modi <sneha.modi@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 12:08:50 +0530
message:
  
  Bug#16851753 : CREATE TEST TO MEASURE STARTUP AND SHUTDOWN TIME FOR THE SERVER
  
  Creating a new test to measure the server startup and shutdown time.
------------------------------------------------------------
revno: 6632 [merge]
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 15:21:23 +0900
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.67 [merge]
    committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 15:19:07 +0900
    message:
      Merge mysql-5.5 to mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.33 [merge]
        committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-10-07 15:17:56 +0900
        message:
          Merge mysql-5.1 to mysql-5.5.
            ------------------------------------------------------------
            revno: 2661.880.53
            committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
            branch nick: mysql-5.1
            timestamp: Mon 2013-10-07 15:16:31 +0900
            message:
              Bug#17431533 : FAILING ASSERTION: INDEX->PAGE != 0XFFFFFFFF AFTER DISCARDING TABLESPACE
              
              ha_innobase::records_in_range() should return HA_POS_ERROR for the table during discarded without requesting pages.
              The later other handler method should treat the error correctly.
              
              Approved by Sunny in rb#3433
------------------------------------------------------------
revno: 6631
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 14:52:48 +0900
message:
  Bug#17534131 : MYSQL BUILD ERROR ON X86
  
  Fix build error for innorwlocktest at some definitions.
  
  Approved by Sunny in rb#3470
------------------------------------------------------------
revno: 6630 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-10-07 09:54:55 +0530
message:
  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
  
  Merging from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.66 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-10-07 09:51:28 +0530
    message:
      Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
      
      Merging from 5.5 to 5.6
        ------------------------------------------------------------
        revno: 2875.545.32
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql_5_5
        timestamp: Mon 2013-10-07 09:49:32 +0530
        message:
          Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
          
          Fixing pb2 test failure for 5.5 version on solaris platform.
------------------------------------------------------------
revno: 6629
committer: Abhishek Ranjan <abhishek.ar.ranjan@oracle.com>
branch nick: bug11748566-trunk
timestamp: Mon 2013-10-07 00:38:10 +0530
message:
  BUG#11748566 - MYSQL SHOWS WRONG DEFAULT VALUE FOR PK IF
                 NOT NULL NOT SPECIFIED
  
  Post Push fix for failing test cases.
------------------------------------------------------------
revno: 6628 [merge]
committer: Shivji Kumar Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk
timestamp: Sun 2013-10-06 23:51:04 +0530
message:
  Bug#17514406- MISMATCH BETWEEN SLAVE_WORKER_INFO AND
                REPLICATION_EXECUTE_STATUS_BY_WORKER
        
  Problem:
  =======
  The Slave_worker class has an atribute called "id"
  that starts indexing from 0. But this is not used
  by the table mysqld.slave_worker_info. This table
  instead uses Rpl_info::internal_id which starts
  indexing with 1. The performance schma table for
  worker used Slave_worker::id and hence the bug.
        
  Fix:
  ===
  Changed performance schma table for worker to use
  Rpl_info::internal_id.
    ------------------------------------------------------------
    revno: 6578.1.1
    committer: Shivji Kumar Jha <shivji.jha@oracle.com>
    branch nick: mysql-trunk
    timestamp: Sat 2013-09-28 03:47:18 +0530
    message:
      Bug#17514406- MISMATCH BETWEEN SLAVE_WORKER_INFO AND
                    REPLICATION_EXECUTE_STATUS_BY_WORKER
      
      Problem:
      =======
      The Slave_worker class has an atribute called "id"
      that starts indexing from 0. But this is not used
      by the table mysqld.slave_worker_info. This table
      instead uses Rpl_info::internal_id which starts
      indexing with 1. The performance schma table for
      worker used Slave_worker::id and hence the bug.
      
      Fix:
      ===
      Changed performance schma table for worker to use
      Rpl_info::internal_id.
------------------------------------------------------------
revno: 6627
committer: Abhishek Ranjan <abhishek.ar.ranjan@oracle.com>
branch nick: bug11748566-trunk
timestamp: Sun 2013-10-06 19:40:10 +0530
message:
  BUG#11748566 - MYSQL SHOWS WRONG DEFAULT VALUE FOR PK IF
                 NOT NULL NOT SPECIFIED
  
  DESCRIPTION:
  
  Two different, but equivalent ways of declaring a column
  as primary key does not end-up with the same result. When the
  column is declared primary key inline as:
      CREATE TABLE t (a INT PRIMARY KEY)
  it has no default value. In this case the flag
  NO_DEFAULT_VALUE_FLAG for the column is set while parsing.
  On the other hand, in the second case when column is declared
  primary key as index:
      CREATE TABLE t (a INT, PRIMARY KEY(a))
  the flag is not set. This results in a default value for
  the primary key column.
  
  FIX:
  
  When a column is declared as primary key as index, the flag
  NO_DEFAULT_VALUE_FLAG is set for that column if user has not
  provided an explicit default value for the column. For the
  TIMESTAMP/DATETIME fields, if explicit_defaults_for_timestamp
  variable is not set, default value assigned due to first
  timestamp column promotion is retained. Default constant value
  assigned due to implicit promotion of second timestamp column
  is removed.
------------------------------------------------------------
revno: 6626 [merge]
committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
branch nick: mysql-trunk
timestamp: Sat 2013-10-05 15:37:47 +0530
message:
  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
  
  Merging from 5.6 to trunk
    ------------------------------------------------------------
    revno: 3902.277.65 [merge]
    committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
    branch nick: mysql-5.6
    timestamp: Sat 2013-10-05 15:29:57 +0530
    message:
      Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
      
      Merging from 5.5 to 5.6
        ------------------------------------------------------------
        revno: 2875.545.31
        committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
        branch nick: mysql_5_5
        timestamp: Sat 2013-10-05 15:29:02 +0530
        message:
          Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
          
          Description:
          ------------
          There are 2 issues reported in the bug report,
          
          1. One session running a "long" select, then, from the other
          session, you kill that first one, while select is
          running, and it receives that message "Server shutdown in
          progress".
          Reported Date: 02-Apr-2006
          
          => Looks like this isuse is already fixed in 2009 by the patch
             pushed for bug28141. 
          
          2. Killing query which goes to filesort, logs error entries like:
          
          120416  9:17:28 [ERROR] mysqld: Sort aborted: Server shutdown in
                                                        progress 
          120416  9:18:48 [ERROR] mysqld: Sort aborted: Server shutdown in
                                                        progress 
          120416  9:19:39 [ERROR] mysqld: Sort aborted: Server shutdown in
                                                        progress 
          Reported Date: 16-Apr-2012                                              
          
          => This issue is introduced in 5.5+ versions. Fixing this issue
             in this patch.
          
          
          Analysis:
          ---------
          In function "filesort()", on error we are logging error message.
          To the error message, the message related THD::killed_errno is
          also appeneded, if it is set.(THD::kill_errno value is obtained
          by calling member function THD::killed_errno)
          
          In the scenario mentioned in this bug report, when we kill the
          connection, THD::kill_errno is set to the THD::KILL_CONNECTION.
          Enum type THD::KILL_CONNECTION corressponds to value 
          ER_SERVER_SHUTDOWN. Because of this, "Server shutdown in ...." is
          appended to the message logged.
          
          Fix:
          ----
          Modified code of "filesort()" function to append "KILL_QUERY"
          status to error message when thread is killed and server
          shutdown is not in progress.
------------------------------------------------------------
revno: 6625 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Fri 2013-10-04 22:24:58 +0200
message:
  Null merge
    ------------------------------------------------------------
    revno: 3902.277.64
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-5.6-bug17310878
    timestamp: Fri 2013-10-04 22:21:58 +0200
    message:
      Bug#17310878 PFS OVERHEAD ON FREQUENT CONNECT/DISCONNECT
      
      This fix is a back port from 5.7 to 5.6
      
      This fix is a performance improvement.
      
      The issue was that the call to PSI_THREAD_CALL(delete_current_thread)(),
      which is executed each time a thread disconnects,
      was placed inside a critical section involving LOCK_thread_count.
      
      The fix is to perform the same call sooner,
      before entering the LOCK_thread_count critical section.
      
      Serializing all calls to pfs_delete_current_thread_v1() was the major
      cause of performance overhead, for frequent connect/disconnect.
------------------------------------------------------------
revno: 6624
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-bug17310878-v2
timestamp: Fri 2013-10-04 21:30:18 +0200
message:
  Bug#17310878 PFS OVERHEAD ON FREQUENT CONNECT/DISCONNECT
  
  This fix is for MySQL 5.7
  
  This fix is a performance improvement.
  
  The issue was that the call to PSI_THREAD_CALL(delete_current_thread)(),
  which is executed each time a thread disconnects,
  was placed inside a critical section involving LOCK_thread_count.
  
  The fix is to perform the same call sooner,
  before entering the LOCK_thread_count critical section.
  
  Serializing all calls to pfs_delete_current_thread_v1() was the major
  cause of performance overhead, for frequent connect/disconnect.
------------------------------------------------------------
revno: 6623
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-signal-handler
timestamp: Fri 2013-10-04 13:54:01 +0200
message:
  WL#6606: Offload THD initialization and network initialization
           to worker thread
  
  Follow-up patch.
  
  This patch removes the "end_thread_signal" signal handler.
  It was currently unused. It was designed to allow sigint to be
  sent to individual threads in debug mode. The problem with
  the signal handler was that it used unsafe functions.
  
  The patch also includes several code simplifications made possible
  by the removal of "end_thread_signal".
------------------------------------------------------------
revno: 6622
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Fri 2013-10-04 13:52:20 +0200
message:
  Bug#16817580 SERVER CRASHES WHEN OPT_TRACE SUITE RUN WITH EMBEDDED AND PS MODE
  
  The embedded version of mysqltest does not work with --ps-protocol,
  (misc assertions and segfaults, depending on version) so we disable it.
------------------------------------------------------------
revno: 6621
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-bug17557396
timestamp: Fri 2013-10-04 13:28:41 +0200
message:
  Bug#17557396: CONDITIONAL INCLUDE OF SYS/RESOURCE.H USES
                INCORRECT GUARD DEFINE
  
  Properly protect #include <sys/resource.h>
  with #ifdef HAVE_SYS_RESOURCE_H
------------------------------------------------------------
revno: 6620
committer: Akhila Maddukuri<akhila.x.maddukuri@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-04 16:48:25 +0530
message:
  Removed crash recovery test run. 
------------------------------------------------------------
revno: 6619
committer: Raghav Kapoor <raghav.kapoor@oracle.com>
branch nick: mysql-trunk-bug-13995622
timestamp: Fri 2013-10-04 16:24:13 +0530
message:
  Post Push fix of failing testcases in engines suite after push of Bug#13995622
------------------------------------------------------------
revno: 6618 [merge]
committer: Manish Kumar<manish.4.kumar@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-04 11:16:29 +0530
message:
  BUG#17515780 - PUBLIC TEST CASE FAILS BECAUSE IT REFERS TO FILE IN INTERNAL
  
  Problem - The binlog.binlog_rewrite_suppress_use test, which is a test in the 
            public test suite, fails when run from a public source tarball since 
            it refers to a file in internal test suite.
  
  Solution - The problem is fixed by adding a new .inc file in the public test 
             suite which does the same function of doing a grep of a particular 
             pattern in the file passed as a parameter. This will not prevent 
             the test when running on the public source tarball.
    ------------------------------------------------------------
    revno: 6580.1.1
    committer: Manish Kumar<manish.4.kumar@oracle.com>
    branch nick: mysql-trunk
    timestamp: Sat 2013-09-28 17:41:03 +0530
    message:
      BUG#17515780 - PUBLIC TEST CASE FAILS BECAUSE IT REFERS TO FILE IN INTERNAL
      
      Problem - The binlog.binlog_rewrite_suppress_use test, uses incorrect path 
                for call to an inc file. This causes the test to fail with the file
                not found error.
      
      Solution - The problem is fixed by adding the correct file path in the test.
                 This will prevent error of file not found.
------------------------------------------------------------
revno: 6617
committer: mayank prasad <mayank.prasad@oracle.com>
branch nick: trunk
timestamp: Fri 2013-10-04 09:34:31 +0530
message:
  pushing to trunk
------------------------------------------------------------
revno: 6616
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-04 09:31:37 +0530
message:
  WL#6606 - Offload thd initialization to worker thread.
  Fix an assignment of 64-bit signed type to 32-bit unsigned type.
------------------------------------------------------------
revno: 6615
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-10-04 05:51:15 +0200
message:
  Fixed bug number
------------------------------------------------------------
revno: 6614 [merge]
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: main-tr
timestamp: Thu 2013-10-03 21:18:43 +0200
message:
  Merge 17515220 5.6 -> trunk
    ------------------------------------------------------------
    revno: 3902.277.63
    committer: Bjorn Munch <bjorn.munch@oracle.com>
    branch nick: nostl-56
    timestamp: Thu 2013-10-03 21:08:13 +0200
    message:
      Bug #17515220 CANNOT RUN MTR ON DELIVERED SOLARIS PACKAGES UNLESS HAVING SUN STUDIO INSTALLED
        
        Problem is that the my_safe_process executable is (unnecessarily)
        linked with libstlport but this is not in the right relative path.
      
        Fix is to remove " -library=stlport4" from flags for this binary
        We also remove no longer relevant -R link options
------------------------------------------------------------
revno: 6613
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-03 15:50:41 +0200
message:
  Fix for Bug17363350 - Replaced --log_warnings with --log_error_verbosity as it has been deprecated
------------------------------------------------------------
revno: 6612 [merge]
committer: Ole John Aske <ole.john.aske@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-03 15:08:11 +0200
message:
  Merge 5.6 -> trunk
    ------------------------------------------------------------
    revno: 3902.277.62
    committer: Ole John Aske <ole.john.aske@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-03 14:50:13 +0200
    message:
      Fix for bug#16999886 ORDER BY DOESN'T WORK WITH JOIN
      
      Fix for incorrect sort order for *pushed joins* in
      combination with DESC'ending order by. Thus this fix
      will only affect *cluster* branches but are pushed to the
      5.6 main branch as it affect the common optimizer code.
      Permission has been granted for 5.6 push by Sveta and Srini.
      
      When a DESCending order by is optimized to use an ordered
      index access, test_if_skip_sort_order() will set the
      access function pointers to refer join_read_last_key &
      join_read_prev_same. These will implement reversed read
      through the ordered index.
      
      However, the function pick_table_access_method() later
      overwrote these access function pointers with similar
      'forward read' functions.
      
      This fix modifies pick_table_access_methods() such that
      these functions pointers are not set of already assigned
      a non-NULL value even for pushed joins.
      NOTE: This check already existed, but due to an incorrect
      'else', didn't have effect for the root of a pushed join.
------------------------------------------------------------
revno: 6611
committer: Raghav Kapoor <raghav.kapoor@oracle.com>
branch nick: mysql-trunk-bug-13995622
timestamp: Thu 2013-10-03 18:30:15 +0530
message:
  BUG#13995622 - MYSQL SILENTLY REFUSES TO MAKE PRIMARY KEY COLUMN NULL
  BUG#15967545 - MISSING ERROR MESSAGE / WARNING WHEN TRYING TO CREATE A PRIMARY KEY WITH NULL VALUE
  BUG#16545198 - NOT REJECTING ALTER TABLE ADD PRIMARY KEY(X), ADD COLUMN X ... DEFAULT NULL
  
  BACKGROUND:
  The crux of the problem reported in the bug report is in the
  current behaviour when we specify NULL for any column that is
  part of a PRIMARY KEY, then the column is implicitly assigned
  a NOT NULL qualifier.
  According to bug requirement, When the user explicitly asks for
  a PRIMARY KEY column to be NULL, that statement should be rejected.
  
  ANALYSIS:
  This implicit assignment of NULL to NOT NULL is done by a parser
  rule in sql_yacc.yy NULL_SYM { Lex->type&= ~ NOT_NULL_FLAG; }.
  With this rule, we cannot distinguish whether NULL was
  specified explicitly or not. Further down the line we do not
  remember or know if we visited NULL keyword at any point of time.
  
  FIX:
  As a fix for this bug, a new flag EXPLICIT_NULL_FLAG is introduced
  in LEX::type/Create_field::flags bitmaps (similar to NOT_NULL_FLAG).
  The parser rule is modified accordingly. Then later in
  mysql_prepare_create_table() function, while iterating over all
  keys, this flag is used to identify fields participating in
  primary key which were explicitly requested to be nullable (by using
  NULL clause) and appropriate error is emitted.
  
  NOTE:This Patch also fixes problems mentioned in Bug#15967545.
  and Bug#16545198. Additional Test Coverage is added for the reported
  bugs.
------------------------------------------------------------
revno: 6610 [merge]
committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-03 16:31:47 +0530
message:
  Merge from mysql-5.6 to mysql-5.7
    ------------------------------------------------------------
    revno: 3902.277.61
    committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
    branch nick: mysql-5.6
    timestamp: Thu 2013-10-03 15:17:17 +0530
    message:
      Bug #17253499 INNODB STATS INTERFERES WITH INNODB FORCE RECOVERY
      AND DROP/CREATE TABLES
      
      Problem:
      
      During force recovery (SRV_FORCE_NO_TRX_UNDO), create and drop table is
      not working. 
      
      Solution:
      
      The semantics of the force recovery level SRV_FORCE_NO_TRX_UNDO has been
      misinterpreted.  The force recovery level SRV_FORCE_NO_TRX_UNDO means that
      rollback of recovered transactions must not be done.  This should not prevent
      other transactions being assigned a rollback segment.  So while assigning
      rollback segments, do not check the level of innodb_force_recovery.
      
      Also, when the innodb_force_recovery is greater than SRV_FORCE_NO_TRX_UNDO
      we now make InnoDB to become read only. 
      
      rb#3473 approved by Marko
------------------------------------------------------------
revno: 6609
committer: Thayumanavar <thayumanavar.x.sachithanantha@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-03 16:27:59 +0530
message:
  Post push fix for bug#16959022.
  Reopen bug#17461335 it it still appears in pb2 tests.
------------------------------------------------------------
revno: 6608
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-review
timestamp: Thu 2013-10-03 11:18:09 +0200
message:
  BUG#14155295: MAIN.INDEX_MERGE_INNODB TEST FAILS ON TRUNK
        
  * Test descriptions and comments in index_merge*.inc are 
    now echo'ed to make it easier to map future incorrect results
    with the test files.
  * Stabilizing test. The result with "intersect(key4,key3)"
    is as correct as the recorded result "intersect(key3,key4)"
------------------------------------------------------------
revno: 6607
committer: Rafal Somla <rafal.somla@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-10-03 10:59:27 +0200
message:
  WL#6226 follow up
  
  Fixing typos in client-side protocol tracing code. Changes only in commments, strings and spaces.
------------------------------------------------------------
revno: 6606
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Thu 2013-10-03 09:55:46 +0200
message:
  Bug#17429539: STRMOV() CAN BE DEFINED TO STPCPY()
  
  Follow-up patch: Remove mysql-strmov.patch used
  for rpm-uln builds, now made obsolete.
------------------------------------------------------------
revno: 6605 [merge]
committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-10-02 13:34:41 +0400
message:
  Manual merge of bug#17428655.
    ------------------------------------------------------------
    revno: 6314.1.1
    committer: Evgeny Potemkin <evgeny.potemkin@oracle.com>
    branch nick: mysql-trunk
    timestamp: Mon 2013-09-09 11:10:38 +0400
    message:
      Bug#17428655: INCORRECT EXPLAIN JSON PRINTOUT OF MATERIALIZED VIEWS
      After refactoring done for EXPLAIN FOR CONNECTION in order to correctly
      print subqueries they should be appropriately marked during parse time.
      However, this wasn't done for views, as each view is parsed in a separate
      lex. This made EXPLAIN code to think that view's subquery were optimized
      away.
      Now mysql_make_view correctly marks top SELECT_LEX_UNIT of newly created
      lex.
------------------------------------------------------------
revno: 6604 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Tue 2013-10-01 23:52:20 +0200
message:
  Push to mysql-trunk
    ------------------------------------------------------------
    revno: 6594.1.1
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-trunk-bug17539520
    timestamp: Tue 2013-10-01 18:55:07 +0200
    message:
      Bug#17539520 PERFORMANCE_SCHEMA THREAD CREATION PERFORMS TOO MUCH INITIALIZATION
      
      This fix is a performance improvement.
      
      A lot of code present in create_thread() initialized the per thread internal
      buffers that support:
      - table events_waits_current
      - table events_stages_current
      - table events_statements_current
      
      Executing this code to fully initialize every member for every row is in
      fact un necessary, and the code has been removed.
      
      Only the initialization of the default NESTING_EVENT_ID and
      NESTING_EVENT_TYPE for the thread waits and stages is required,
      and the overall initialization of these columns has been cleaned up.
      
      As a related fix,
      PFS_events_waits::m_thread was redundant with PFS_events::m_thread_internal_id,
      and has been removed.
      
      Logic in table_events_waits_common::make_row() that was in fact specific to
      only two sub classes has been moved to
      - table_events_waits_current::make_row()
      - table_events_waits_history::make_row()
------------------------------------------------------------
revno: 6603 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 15:31:58 +0200
message:
  null merge
    ------------------------------------------------------------
    revno: 3902.277.60 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 15:24:23 +0200
    message:
       Refresh mysql-install patch and mysqld service naming for repo project
------------------------------------------------------------
revno: 6602
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-test
timestamp: Tue 2013-10-01 14:39:58 +0200
message:
  Bug#17341731: ASSERTION: MODE != LOCK_S ||
                LOCK_TABLE_HAS(THR_GET_TRX(THR), INDEX->TABLE, LOCK
  
  Post-push fix:
  
  Improve test case reliability by checking I_S.innodb_trx
  rather than I_S.processlist to see when we are waiting
  for locks inside InnoDB. 
  
  Issue noticed by Marko.
------------------------------------------------------------
revno: 6601 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 13:40:47 +0200
message:
  null merge
    ------------------------------------------------------------
    revno: 3902.282.1 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 13:25:22 +0200
    message:
      Refresh mysql-install patch and service renaming
------------------------------------------------------------
revno: 6600 [merge]
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 14:27:48 +0300
message:
  Merge mysql-5.6 to mysql-trunk.
    ------------------------------------------------------------
    revno: 3902.277.59 [merge]
    committer: Marko M?kel? <marko.makela@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 14:24:36 +0300
    message:
      Merge mysql-5.5 to mysql-5.6.
        ------------------------------------------------------------
        revno: 2875.545.30
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: mysql-5.5
        timestamp: Tue 2013-10-01 14:17:35 +0300
        message:
          Followup to Bug#17446090 fix:
          
          Now that ibuf_change_buffering_debug a.k.a. ibuf_debug should work
          reliably (no "surprise" merges), make some tests stricter
          (require that the server crashes where we expect it to).
------------------------------------------------------------
revno: 6599 [merge]
committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 13:19:47 +0200
message:
  null merge from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.281.1 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 09:21:25 +0200
    message:
      Refresh mysql-install patch and service renaming
        ------------------------------------------------------------
        revno: 3902.280.12
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Fri 2013-09-27 18:53:22 +0200
        message:
          Renamed patch file names
        ------------------------------------------------------------
        revno: 3902.280.11
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Fri 2013-09-27 17:58:55 +0200
        message:
          Refresh mysql-install patch and service renaming
------------------------------------------------------------
revno: 6598 [merge]
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
branch nick: topush-trunk
timestamp: Tue 2013-10-01 11:50:23 +0200
message:
  manual merge of bug#14621190 into mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.58 [merge]
    committer: Mattias Jonsson <mattias.jonsson@oracle.com>
    branch nick: topush-5.6
    timestamp: Tue 2013-10-01 11:23:10 +0200
    message:
      manual merge of bug#14621190 into mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.29
        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
        branch nick: b14621190-55
        timestamp: Tue 2013-10-01 10:05:45 +0200
        message:
          Bug#14621190: HA_INNOBASE::INDEX_NEXT SKIPS A RECORD IF PREVIOUS
          INDEX_READ_MAP HAD NO MATCH
          
          If index_read_map is called for exact search and no matching records
          exists it will position the cursor on the next record, but still having the
          relative position to BTR_PCUR_ON.
          This will make a call for index_next to read yet another next record,
          instead of returning the record the cursor points to.
          
          Fixed by setting pcur->rel_pos = BTR_PCUR_BEFORE if an exact
          [prefix] search is done, but failed.
          
          Also avoids optimistic restoration if rel_pos != BTR_PCUR_ON,
          since btr_cur may be different than old_rec.
          
          rb#3324, approved by Marko and Jimmy
------------------------------------------------------------
revno: 6597
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
branch nick: mysql-trunk-strmov
timestamp: Tue 2013-10-01 11:09:09 +0200
message:
  Bug#17429539: STRMOV() CAN BE DEFINED TO STPCPY()
  
  The MySQL implementation of strmov() supports overlapping
  source and destination. This makes sense given the name
  as it is similar to the C API function memmove().
  
  However, on platforms which support the POSIX function stpcpy(),
  we did "#define strmov(A,B) stpcpy((A),(B))". This is a problem
  as stpcpy() does not support overlapping source and destination.
  Therefore strmov() could have different behavior from platform
  to platform.
  
  Another (smaller) issue, was that strmov() sounds like it
  returns a pointer to the destination (like strcpy()) and not,
  as in fact does, a pointer to the terminating NULL (as stpcpy()).
  
  This patch does the following:
  1) Renames strmov() to my_stpmov() and strnmov() to my_stpnmov().
  2) Adds my_stpcpy() which is stpcpy() if supported,
     my_stpmov() otherwise.
  3) Adds my_stpncpy() which is stpncpy() if supported,
     my_stpnmov() otherwise.
  4) Replaces existing calls to strmov() with my_stpcpy().
  5) Replaces existing calls to strnmov() with my_stpncpy() or
     my_stpnmov().
  5) Removes strmov_overlapp() and replaces its usage by my_stpmov().
------------------------------------------------------------
revno: 6596 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 11:03:46 +0530
message:
  upmerge for file presence check and mysql_ssl missing pdb file
    ------------------------------------------------------------
    revno: 3902.277.57
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 10:54:52 +0530
    message:
      Fix to add mysys_ssl missing pdb file
    ------------------------------------------------------------
    revno: 3902.277.56
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-10-01 10:47:18 +0530
    message:
      Fix to check for file presence before install
------------------------------------------------------------
revno: 6595
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 06:28:34 +0200
message:
  Disabling rpl_mts_submode_switch since it does not cleanup and affects the following test
------------------------------------------------------------
revno: 6594 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Tue 2013-10-01 06:04:19 +0200
message:
  Push to mysql-trunk
    ------------------------------------------------------------
    revno: 6577.1.1
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-trunk-bug17503130
    timestamp: Fri 2013-09-27 12:02:22 +0200
    message:
      Bug#17503130 TABLE PERFORMANCE_SCHEMA.TABLE_HANDLES BECOMES EMPTY AFTER A
      BIG WORKLOAD
      
      Before this fix, the implementation of table performance_schema.table_handle
      would appear empty after the server executed some code,
      causing spurious failures in test cases like mdl_func.
      
      The failure was spurious, because the same test did work after a server
      restart.
      
      The root cause is that the logic to check for locks in
      table_table_handles::make_row() is broken, mismatched locks are used.
      
      It works only by accident after a server restart,
      because the PFS_table::m_lock and the PFS_table_share::m_lock happen to be
      initialized to the same initial value.
      
      The fix is to use the proper lock for end_optimistic_lock().
------------------------------------------------------------
revno: 6593
committer: Bill Qu <bill.qu@Oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-10-01 09:27:48 +0800
message:
  Bug #17258782 	MASTER DIDN'T WRITE ERROR MESSAGE IN THE LOG FILE FOR INCIDENT
  
  Post-fix failed rpl.rpl_do_grant.
------------------------------------------------------------
revno: 6592
committer: Christopher Powers <chris.powers@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 18:15:28 -0500
message:
  BUG#17267760 SPURIOUS CRASH IN LF_HASH, WITH TRUNCATE_STRESS TEST
  
  Restored i_perfschema.truncate_stress to experimental status
------------------------------------------------------------
revno: 6591
committer: Tiago Jorge <tiago.jorge@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 18:08:27 +0100
message:
  BUG#11763963 - BINARY LOG ACTIVATION SETS SERVER_ID IMPLICITLY,
                 BUT REPLICATION FAILS
  
  Problem:
  When one enables binary logging without setting a server id, letting it
  default to 0, the server changes it to 1, but replication does not work.
  According to the documentation, a server id > 0, should be a legal configuration
  to allow slave to connect and replication to work.
  
  Analysis:
  Apparently, this happens since the dawn of time as a design decision, meaning
  that binlog => server_id.
  
  In mysqld.cc::main()
  
  [...]
  
    if (opt_bin_log && server_id == 0)
    {
      server_id= 1;
  #ifdef EXTRA_DEBUG
      sql_print_warning("You have enabled the binary log, but you haven't set "
                        "server-id to a non-zero value: we force server id to
  1; "
                        "updates will be logged to the binary log, but "
                        "connections from slaves will not be accepted.");
  #endif
    }
  [...]
  
  What happened is that, when a slave tried to connect, it would get an error
  stating that the master was misconfigured, even with server-id = 1.
  
  After some testing we concluded that not even the documentation was accurate
  enough. The test conducted were:
  
  1) Start master with no options. Make sure that slave cannot connect (control
  experience)
  2) Start master with only binlog active. Make sure that slave cannot connect
  (the bug situation)
  3) Start master with binlog active and server-id == 0 in the command line.
  Make sure that slave cannot connect. (as documented)
  4) Start master with binlog active and server-id == 1 in the command line.
  Change server_id to 0 using SQL before connecting slave. Make sure that slave
  cannot connect.(as documented)
  
  Situations 1) and 2) are OK and according with expected and analyzed
  behavior. With 3) and 4) things are not as documented.
  
  In Situation 3) the server starts and implicitly sets server id to 1. When
  one starts a slave after configuring the master, there is no error in "SHOW
  SLAVE STATUS". It connects and works. Bin and Relay log have a server id of
  1.
  
  In Situation 4) in which one explicitly change the server_id in runtime, the
  behavior is the same as in Situation 3). Contents of the relay log and bin
  log have a server id == 0
  
  Fix:
  For trunk only the decision was:
  - Server_id must be explicitly set if binlog is active. If not, the server
  will not start.
  - if you set server_id=0, no slaves can connect, but your statements will be
  binlogged with the provided server_id.
  - if no server_id is set, it will have the default configured value and have
  the same behaviour as the above, if the default is 0.
  
  This patch will bring the code closer to which is documented. The dynamic change
  of server-id was not addressed here.
  
  For the previous version, one thinks that the documentation should be augmented
  according to the information detailed in the bug page.
------------------------------------------------------------
revno: 6590 [merge]
committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 19:09:11 +0530
message:
  Upmerge for the Bugs: 16619754, 16053094 & 13878021 from mysql5.6
    ------------------------------------------------------------
    revno: 3902.277.55 [merge]
    committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-30 19:05:39 +0530
    message:
      Upmerge for the Bugs: 16619754, 16053094 & 13878021
        ------------------------------------------------------------
        revno: 2875.545.28
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-09-30 13:01:17 +0530
        message:
          Bug #16619754 - MYSQL_INSTALL_DB.PL FAILS TO CREATE DATABASE ON WINDOWS.
          
          As this mysql_install_db.pl file has always generated lots of confusion on Windows.  This fix will make sure to get it removed only from Windows
        ------------------------------------------------------------
        revno: 2875.545.27
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-09-30 12:41:22 +0530
        message:
          Fix for Bug:16053094
                Registry redirection was improper and hence not able to pick the value for the OLDERVERSION property. as a result in the install upgrade dialog null value wa being passed.
        ------------------------------------------------------------
        revno: 2875.545.26
        committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-09-30 12:29:10 +0530
        message:
          Fix to copy missing pdb files BUG 13878021
------------------------------------------------------------
revno: 6589 [merge]
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-17458273
timestamp: Mon 2013-09-30 12:29:14 +0200
message:
  Automerge BUG#17458273 5.6 -> trunk
    ------------------------------------------------------------
    revno: 3902.277.54
    committer: Jorgen Loland <jorgen.loland@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-30 12:27:07 +0200
    message:
      BUG#17458273: KEY LENGTHS LEAD TO INCOMPLETE RESULT SETS; 
                    UNHINTED SCANS PREFER SUCH INDEXES
      
      Consider a table with an index over a prefix of column 'x' and
      a query with a range condition over 'x':
      
      CREATE TABLE (... INDEX (x(4)))
      SELECT ... WHERE 'foobar2' < x and x < 'foobar5';
      
      The index will not be able to distinguish between rows with 
      x-values like "foobar", "foobaz" or "foobar3" since only the 
      first four characters ("foob") will be stored in the index.
      
      Since all rows with an x-value prefix "foob" look equal, the
      range optimizer has to translate '<' and '>' to '<=' and '>=',
      respectively, for such indexes.
      
      In this bug, only "'foobar2' < x" is correctly translated. 
      Later, when key_and() is executed on the the two ranges
      "'foob' <= x" and "NULL < x < 'foob'", key_and() correctly
      finds that these ranges together form an impossible condition.
      The fix is to also translate '<' to '<=' for prefix indexes
      so that key_and() can ultimately create the range 
      "'foob' <= x <= 'foob'".
------------------------------------------------------------
revno: 6588
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-wl7052
timestamp: Mon 2013-09-30 11:20:45 +0200
message:
  WL#7052: Make best_access_path() more readable.
        
  * Factor out the big if() block containing ref analysis
    to a separate member function
  * Factor out calculation of scan cost to a separate member
    function
  * Get rid of generic and reused variables to make the code 
    easier to read
------------------------------------------------------------
revno: 6587
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 11:43:51 +0300
message:
  mysql_load(): Fix a compiler warning about transactional_table being unused
  when building EMBEDDED_LIBRARY.
  
  Approved by Marc Alff on IM.
------------------------------------------------------------
revno: 6586
committer: Shaohua Wang <shaohua.wang@oracle.com>
branch nick: mysql-trunk-bugfix2
timestamp: Mon 2013-09-30 16:36:12 +0800
message:
  Fix compilation warnings introduced in wl#6943 checkin.
  
  Approved by Jimmy.Yang in IM.
------------------------------------------------------------
revno: 6585 [merge]
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 15:06:14 +0900
message:
  Null merge
    ------------------------------------------------------------
    revno: 3902.277.53 [merge]
    committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-30 15:04:51 +0900
    message:
      merge from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.25
        committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-09-30 15:02:54 +0900
        message:
          Adjustment for fix for Bug#11758196
          
          log_buffer_extend() should fill the new buffer with 0.
------------------------------------------------------------
revno: 6584
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 14:46:28 +0900
message:
  Fix for merging fix for Bug#11758196
------------------------------------------------------------
revno: 6583 [merge]
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 13:44:44 +0900
message:
  Merge fix for Bug#11758196 from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.52 [merge]
    committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-30 13:43:28 +0900
    message:
      Merge fix for Bug#11758196 from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.24
        committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
        branch nick: mysql-5.5
        timestamp: Mon 2013-09-30 13:41:48 +0900
        message:
          Bug#11758196 : INNODB ASSERTION FAILURE WHEN CONVERTING FROM MYISAM TO INNODB
          
          Changed to try to extend log buffer instead of crash, when log size is too large for the size.
          
          Approved by Marko in rb#3229
------------------------------------------------------------
revno: 6582
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
branch nick: trunk
timestamp: Mon 2013-09-30 12:20:49 +1000
message:
  Bug#17429480 REGRESSIONS IN INNODB PERFORMANCE INSTRUMENTATION IN 5.7
  
  In WL#6044 the call to try lock was calling PSI_MUTEX_TRYLOCK instead of
  PSI_MUTEX_LOCK.
  
  Approved by Jimmy and Yasufumi over IM.
------------------------------------------------------------
revno: 6581
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-30 03:14:59 +0200
message:
  Bug #17506885: Moved rpl.rpl_parallel to experimental list
------------------------------------------------------------
revno: 6580
committer: Tor Didriksen <tor.didriksen@oracle.com>
branch nick: trunk-merge
timestamp: Fri 2013-09-27 15:13:37 +0200
message:
  BUG#14765080 - DEBUG_SYNC CAN LOSE SIGNAL
  Post push fix, ADDRESSSANITIZER found bug with current_thd in unit test.
------------------------------------------------------------
revno: 6579 [merge]
committer: Satya Bodapati <satya.bodapati@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 18:37:01 +0530
message:
  Merge fix for BUG#17446090 from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.51 [merge]
    committer: Satya Bodapati <satya.bodapati@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-09-27 18:34:37 +0530
    message:
      Merge fix for BUG#17446090 from mysql-5.5 to mysql-5.6
      
      The testcase for this bug fails randomly due to two reasons.
      1. Due to ibuf merge happening background
      2. Due to dict stats update which brings the evicted page back into
      buffer pool.
      
      Fix ibuf_merge() to not do any merges with ibuf_debug enabled and
      also changed dict_stats_update() to return fake statistics without brining
      the secondary index pages into buffer pool.
      
      Approved by Marko. rb#3420
        ------------------------------------------------------------
        revno: 2875.545.23 [merge]
        committer: Satya Bodapati <satya.bodapati@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-09-27 18:32:13 +0530
        message:
          Merge fix for BUG#17446090 from mysql-5.1 to mysql-5.5
          
          The testcase for this bug fails randomly due to two reasons.
          1. Due to ibuf merge happening background
          2. Due to dict stats update which brings the evicted page back into
             buffer pool.
          
          Fix ibuf_contract_ext() to not do any merges with ibuf_debug enabled and
          also changed dict_stats_update() to return fake statistics without
          bringing the secondary index pages into buffer pool.
          
          Approved by Marko. rb#3419
            ------------------------------------------------------------
            revno: 2661.880.52
            committer: Satya Bodapati <satya.bodapati@oracle.com>
            branch nick: mysql-5.1
            timestamp: Fri 2013-09-27 18:30:46 +0530
            message:
              BUG#17446090 - TESTCASE INNODB_BUG16752251.TEST FAILS RANDOMLY ON PB2
              
              Enable disabled testcases.
------------------------------------------------------------
revno: 6578 [merge]
committer: Shivji Kumar Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 17:04:12 +0530
message:
  BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
                DURING INNODB RECOVERY
  post push fix
    ------------------------------------------------------------
    revno: 3902.277.50
    committer: Shivji Kumar Jha <shivji.jha@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-09-27 16:59:11 +0530
    message:
      BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
                    DURING INNODB RECOVERY
      post push fix
------------------------------------------------------------
revno: 6577
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 12:47:37 +0530
message:
  WL#7057: MAKE --REPLICATION-* FILTER SETTINGS DYNAMIC
  
  Fixing post push valgrind & windows failure issue.
------------------------------------------------------------
revno: 6576 [merge]
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 09:01:24 +0200
message:
  Merged up from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.277.49
    committer: Anitha Gopi <anitha.gopi@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-09-27 08:51:30 +0200
    message:
      default.weekly.basic do not run --big-tests and hence do not need longer timeout
    ------------------------------------------------------------
    revno: 3902.277.48
    committer: Anitha Gopi <anitha.gopi@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-09-27 06:06:06 +0200
    message:
      Added default.weekly.basic. This defines reduced suite for tier3/3 platforms
      
      Following changes to default.weekly:
      * Improved comments
      * Fixed typos
      * Restricted binlog-checksum=CRC32 runs to rpl and binlog suites
      * Removed run with ps-protocol for rpl and binlog suites. This is already covered by the ps-protocol run of default suites
------------------------------------------------------------
revno: 6575
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 06:17:59 +0200
message:
  Merge up from mysql-5.6
------------------------------------------------------------
revno: 6574 [merge]
committer: Shivji Kumar Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk
timestamp: Fri 2013-09-27 01:33:09 +0530
message:
  BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
                DURING INNODB RECOVERY
        
  bzr merge mysql-5.6->trunk
    ------------------------------------------------------------
    revno: 3902.277.47 [merge]
    committer: Shivji Kumar Jha <shivji.jha@oracle.com>
    branch nick: mysql-5.6
    timestamp: Fri 2013-09-27 01:29:56 +0530
    message:
      BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
                    DURING INNODB RECOVERY
      
      bzr merge mysql-5.5->5.6
        ------------------------------------------------------------
        revno: 2875.545.22
        committer: Shivji Kumar Jha <shivji.jha@oracle.com>
        branch nick: mysql-5.5
        timestamp: Fri 2013-09-27 01:24:16 +0530
        message:
          BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
                        DURING INNODB RECOVERY
          
          Problem:
          =======
          The connection 'master' is dropped by mysqltest after
          rpl_end.inc. At this point, dropping temporary tables
          at the connection 'master' are not synced at slave.
          So, the temporary tables replicated from master remain
          on slave leading to an inconsistent close of the test.
          The following test thus complains about the presence of
          temporary table(s) left over from the previous test.
          
          Fix:
          ===
          - Put explicit drop commands in replication tests so
            that the temporary tables are dropped at slave as well.
          - Added the check for Slave_open_temp_tables in
            mtr_check.sql to warn about the remaining temporary
            table, if any, at the close of a test.
------------------------------------------------------------
revno: 6573 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Thu 2013-09-26 22:34:57 +0200
message:
  Merge to mysql-trunk
    ------------------------------------------------------------
    revno: 6567.1.1
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-trunk-bug17507853
    timestamp: Thu 2013-09-26 14:04:57 +0200
    message:
      Bug#17507853 PREVENT FALSE SHARING OF CPU CACHE LINE FOR SENSITIVE COUNTERS
      
      This fix is a code cleanup to avoid risks of performance degradations.
      
      In the performance schema code, several internal counters are highly
      sensitive, because they are used very often, and used with atomic
      operations.
      
      For these counters, it is critical that the counter is allocated on a CPU
      cache line, and that no other variable is allocated in the same memory area,
      which can end up in the same CPU cache line.
      
      This fix introduce PFS_cacheline_uint32 and PFS_cacheline_uint64,
      to enforce this property.
      
      Al internal counters related to allocation internal objects have been
      changed to use PFS_cacheline_uint32/64.
      
      Whether CPU cache line collision did happened in the past,
      causing performance degradations, is unknown, so this fix may not improve
      current performance.
      
      What this fix does however, is to make sure that cache line collisions are
      now impossible, to prevent any regressions when using:
      - different compilers
      - different compiler options
      - different CPUs
      
      Also, the allocation algorithm for PFS_account, PFS_user and PFS_host have
      been changed to follow the mainline code.
      
      PFS_scan has been removed, this way of performing allocations is no longer
      needed.
------------------------------------------------------------
revno: 6572
committer: Raghav Kapoor <raghav.kapoor@oracle.com>
branch nick: mysql-trunk-bug-16985214
timestamp: Thu 2013-09-26 13:55:03 +0530
message:
  BUG#16985214 - VALGRIND ERRORS, INCONSISTENT RESULT IN STORED PROCEDURE
  
  BACKGROUND:
  When mysqld is started with valgrind and we run the minimal 
  testcase provided in the bug report (In a Stored Procedure,
  we declare a variable of type geometry, copy the value 
  contained in the table to this variable and then just display 
  this variable with SELECT statement on the console) 
  valgrind complains of reading freed memory.
  
  ANALYSIS:
  Looking at the valgrind stacktrace, while sending the data
  back to the client (in SELECT e statement) valgrind complains
  of reading freed memory.
  After some more analysis, it is found that actual problem is 
  happening in SELECT z into e from t1; statement
  After analyzing the call flow the problem happens while
  copying with memmove() where it copies from->ptr to to->ptr
  
  How blobs are represented in Memory?
  For field class we have ptr variable which stores the pointer
  to the actual data. However for blobs, it stores the
  packlength in first 4 bytes and in rest 8 bytes it stores
  the starting address of the memory where blob is actually
  stored in memory.
  NOTE: Packlength is the number of bytes used to represnt blobs
  in memory.
  
  from->ptr
  ----------------------------	      ------------------ 	
  |packlength| blob pointer   |-------> |Actual blob data|
  ----------------------------          ------------------
  
  With memmove we are just copying the from->ptr to to->ptr.
  Basically we are doing a "shallow copy". to->ptr is also 
  pointing to the same temporary memory location where from->ptr
  is pointing.
  How copying with memmove looks in memory
  
  from->ptr
  ----------------------------	      ------------------ 	
  |packlength| blob pointer---|-------> |Actual blob data|
  ----------------------------          -------^----------
  				             |
  to->ptr					     |
  ----------------------------	      	     |
  |packlength| blob pointer---|---------------->
  ----------------------------          
  
  Later on after select z into e from t1 statement is finished 
  executing it calls ha_innobase::reset() where it frees
  the temporary heap memory allocated by calling mem_area_free().
  After that in SP when we do 3rd statement select e statement
  we get valgrind error, Invalid read of freed memory.
  This is the root cause of this bug.
  
  How we prevent this valgrind error? 
  
  We prevent this valgrind error by doing a "deep copy" of blobs.
  Blob class has a member called String value. We allocate 
  a new block of memory to hold the data pointed to by 
  blob pointer and copy the starting address to 
  value->Ptr.
  
  from->ptr
  --------------------------	    ------------------ 	
  |packlength| blob pointer |-------> |Actual blob data|
  --------------------------          ------------------
  
  We first take out blob pointer from from->ptr by calling
  from->val_str() function. 
  Then in Field_blob::store it calls Field_geom::store_internal
  which calls value.copy().
  This function allocates a new block of memory and copies the data
  pointed to by blob pointer and returns the starting address of
  this memory location and puts it in value->Ptr.
  
  String value        
  ------------------           -----------------------
  | blob pointer1---|-------> | Copy Actual blob data |
  ------------------	    | from blob pointer     |
  value->Ptr		     -----------------------
  
  
  Till now this is how it looks like in memory.
  
  Then we copy this blob pointer 1 to to->ptr.
  This is how it looks like in memory. 
  
  to->ptr
  ----------------------------	      	
  |packlength| blob pointer1--|----------> 
  -----------------^----------           |
                   |                     |
  	         |                     |
  String value     |                     V
  ----------------------          -----------------------
  | blob pointer 1------|-------> |New Actual blob data |
  ----------------------          -----------------------
  value->Ptr
  
  Now both value->Ptr and to->ptr containg the starting address 
  of newly allocated blob data
  Basically we do a "deep copy" of blobs.
  Now we have two copies of blob data 
  1. blob pointer which is stored in from->ptr and is pointing
  to actual blob data.
  2. As a result of deep copy, blob pointer1 which is stored in
  to->Ptr and is pointing to the same actual blob data in memory.
  
  WHY VALGRIND WARNING DOES NOT COME OUTSIDE OF SP FOR THESE TWO CASES
  THOUGH THEY ALSO INVOKE field_conv() function?
  
  Case 1: CREATE TABLE t2 AS SELECT z FROM t1;
  
  Case 2: CREATE TABLE t3(zz POINT);
          INSERT INTO t3(zz) SELECT z FROM t1; 
  
  To understand why valgrind warning does not come for these two
  cases, we have to first understand how 
  
  SELECT z from t1 works.(t1 refers to the table created in
                          minimal testcase in bug report)
  
  When we issue the above query, storage engine innodb has a persistent
  pointer named data which is pointing to actual data of blob in memory.
  In row_sel_store_mysql_field_func() function in innodb,
  1. It allocates a temporary heap for blob
  2. It copies the data from persistent memory location pointed to 
     by data to this heap.
  3. It displays the data to the user by calling 
     Protocol::send_result_set_row ()which calls 
     Protocol_text::store() and so on.
  4. When this is finished executing, it calls close_thread_table() 
     which in turn calls ha_innobase::reset() which calls
     if (prebuilt->blob_heap) {
                  row_mysql_prebuilt_free_blob_heap(prebuilt);
          }
  
  Then it frees the temporary heap created for blobs by calling 
  mem_heap_free() function.
  
  For Case 1: 
  Although this statement also invokes field_conv() function
  and copies the data using memmove() (basically shallow copy), 
  this data is first made persistent on disk by calling 
  ha_innobase::write_row() and it is inserted into the table.
  
  Afterwards the temporary heap allocated for blobs in 
  SELECT z from t1 is freed by calling mem_area_free().
  Therefore afterwards, when we do SELECT z from t2, since the data 
  is already made persistent by storage engine by the above statement
  we do not get valgrind warning of invalid read of freed memory.
  NOTE: SELECT z from t2 also follows the same working steps described
  for SELECT z from t1.
  
  Same reasoning applies to Case 2 INSERT INTO t3(zz) SELECT z FROM t1;
  statement. First data is made persistent by Innodb with write_record()
  which calls ha_innobase::write_row() etc,
  then it frees the temporary heap created for blobs with
  in SELECT z FROM t1 statement.
  
  FIX:
  As a fix for this Valgrind bug, a small check has been added
  in field_conv() function to prevent the copy using memmove().
  The callflow is changed to prevent the shallow copy using 
  memmove () and do a deep copy of Geometry datatype as it is 
  already done for blobs. This is because Since Geometry is also
  represented in memory as blob type since it is a subclass of 
  Field_blob.
  It is also verified that the user-reported problem of inconsistent
  results in the initial part of bug report was triggered by the 
  incorrect copy method. With the fix, it is working correctly.
  
  NOTE:
  
  1. The patch for this bug also fixes Bug#17339396.
  The root cause of the problem mentioned in that bug is the
  same as root cause and analysis done in this bug.
  Additional test coverage is added for Bug#17339396.
  It is verified that patch for Bug#16985214 fixes the problem
  mentioned in Bug#17339396. Bug#17339396 can be marked 
  as duplicate of Bug#16985214 and can be closed.
  
  2. This valgrind bug happens only with Geometry datatype
  in Stored Procedure. Without SP, if we do like this
  SELECT z into @e from t1;
  SELECT @e;
  It does not happen, since it follows the correct call
  sequence and calls the right method to copy the values.
  Basically does a deep copy. This is also verified.
  
  3. Also it is verified that it does not happen with any other 
  datatype inside or outside of SP.
------------------------------------------------------------
revno: 6571
committer: Allen lai <zheng.lai@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-09-26 11:21:00 +0800
message:
  Fixed build warning in building memcached lib.
  
  Approved by Jimmy on IM.
------------------------------------------------------------
revno: 6570
committer: Dmitry Lenev <Dmitry.Lenev@oracle.com>
branch nick: mysql-trunk-mdlpfs
timestamp: Wed 2013-09-25 19:25:47 -0700
message:
  Follow-up for WL#5879 "PERFORMANCE SCHEMA, MDL lock instrumentation".
  
  Improve scalability of MDL_context::try_acquire_lock_impl() call
  by moving invocation of mysql_mdl_create() PFS call out of critical
  section. This function relies on its internal synchronization and
  doesn't need additional protection.
------------------------------------------------------------
revno: 6569
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Thu 2013-09-26 06:34:54 +0530
message:
  Bug#15877941-MAKE REPLICATION FILTER SETTINGS DYNAMIC
  WL#7057: MAKE --REPLICATION-* FILTER SETTINGS DYNAMIC
  
  Forgot to update one .result file in the previous push.
------------------------------------------------------------
revno: 6568
committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-09-25 18:46:07 +0530
message:
  Bug#15877941-MAKE REPLICATION FILTER SETTINGS DYNAMIC
  WL#7057: MAKE --REPLICATION-* FILTER SETTINGS DYNAMIC
  
  Problem:      
  The slave options --replicate-* are not dynamic.
  Hence these options cannot be changed while
  the server is running.
  
  Fix: Introduced "CHANGE REPLICATION FILTER" command
  which enables users to modify replication filtering
  rules without having to stop and restart the server. 
  This is accomplished by just stopping the sql thread alone
  when these options are set dynamically. Since filtering rules
  are only used by the slave SQL thread, setting them while
  the thread is not running avoids the need for locking.
  Eg:
  CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1,db2,`db3`);
  CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB=(db1,db2,`db3`);
  CHANGE REPLICATION FILTER REPLICATE_DO_TABLE=(db1.t1);
  CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE=(db1.t1);
  CHANGE REPLICATION FILTER REPLICATE_WILD_DO_TABLE=('db.t%');
  CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE=('db.t%');
  CHANGE REPLICATION FILTER REPLICATE_REWRITE_DB=((db1,db2), (from_db, to_db));
  
  Following are the few behavioral points about the command:
  
  a) Users should be able to set multiple filter rules in one 
  command like 
  CHANGE REPLICATION FILTER REPLICATE_DO_DB=(db1),
  REPLICATE_IGNORE_TABLE=(db1.t1), ..;
  
  b) To reset the filter value, they have to use void brackets
  "()" syntax, i.e, empty list will clear the existing values
  and set it to an empty value
  For example: 
  CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ();
  
  c) The non-empty list filter rules will clear the existing values
  and set the value to new list.
  CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = (db1.t1);
  will reset all existing values and set it the rule to db1.t1 value. 
  
  d) Unspecified filter rules will be unchanged. For example:
  CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = (db1.t1);
  will change REPLICATION_IGNORE_TABLE rule only and rest of the
  filter rules will not be changed and existing values will be continued.
  
  e) If some rule is specified multiple times, the latter list will be
  considered and the earlier list will be ignored.
  For example: CHANGE REPLICATION FILTER REPLICATION_DO_DB=(db1,db2),
  REPLICATE_DO_DB=(db3,db4); db1 and db2 list will be ignored and
  REPLICATE_DO_DB list will be updated with db3 and db4 values.
  
  f) In case of OUT OF MEMORY error, the command might get
  executed partially i.e., few of the filter rules might
  get executed and few of them might not get executed. User needs
  to verify them manually to see which ones are executed.
------------------------------------------------------------
revno: 6567
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-09-25 12:27:11 +0300
message:
  Bug#17492672 REPLACE MEM_ALLOC() WITH UT_MALLOC()
  
  In InnoDB, the functions mem_alloc() and mem_free() are wrappers for
  mem_heap_alloc() and mem_heap_free(). They create an anonymous
  InnoDB memory heap for the single user object.
  
  Because the functions are defined inline, their invocation will generate
  quite a bit of code.
  
  It is questionable if there is any benefit of using mem_alloc() instead of
  ut_malloc(). There clearly is some CPU and memory overhead. The only possible
  benefit could be the extra debugging info, which is the subject of
  Bug#16924719 69422: small performance impact with heap block debugging info
  in release builds
  
  ut_malloc_low(): Remove the always-true parameter and rename to
  ut_malloc().  Remove ut_mem_null_ptr. Use a simple assertion also with
  the InnoDB memory heaps.
  
  ut_zalloc(): New function, to replace mem_zalloc().
  
  mem_alloc(): Replace with ut_malloc().
  mem_free(): Replace with ut_free().
  
  mem_alloc2(): Replace with ut_malloc().
  We will no longer determine the true allocated size of the block,
  but instead use the requested size only.
  
  os_mem_alloc_large(): Remove an #elif branch that contained non-compiling code.
  (The third argument of ut_malloc_low() had been removed a long time ago.)
  
  Do not check if the pointer is NULL before calling ut_free(), because ut_free()
  will check that. The caller-side check was needed for mem_free().
  
  rb#3397 approved by Kevin Lewis
------------------------------------------------------------
revno: 6566 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Wed 2013-09-25 12:18:10 +0200
message:
  Merge to mysql-trunk
    ------------------------------------------------------------
    revno: 6563.1.1
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-trunk-bug17504345
    timestamp: Wed 2013-09-25 00:03:01 +0200
    message:
      
      Bug#17504345 - PERFORMANCE OVERHEAD, THREAD AGGREGATE ON DISCONNECT 
      
      Before this fix,
      
      1)
      
      On thread connect, the performance schema needs to evaluate if the thread is
      instrumented or not.
      
      The logic used did look up the content of performance_schema.setup_actors
      for the connecting account, every time.
      
      2)
      
      On thread disconnect, the performance schema needs to aggregate statistics
      for parent users / account / hosts or globally, based on statistics
      collected by the disconnecting thread.
      
      The logic did perform this aggregation all the time, even when nothing was
      collected during the thread life time, for example when the performance
      schema is disabled.
      
      With this fix,
      
      1)
      
      A new attribute PFS_account::m_enabled is created,
      that saves the result of the setup_actors look up.
      
      Whenever the content of the setup_actors table is changed,
      the code re evaluates PFS_acount::m_enabled for every account,
      to reflect new rules in setup_actors.
      
      When a thread connects, the corresponding PFS_account::m_enabled flag is
      used to decide if the thread is to be instrumented, if found.
      
      This avoids looking up setup_actors on every connection,
      the look up only happen the first time a given account connects.
      
      This flag is internal, there are no visible end user changes.
      
      2)
      
      A new attribute PFS_thread::m_aggregate_on_disconnect is created,
      that indicates if aggregation during disconnect is needed.
      
      When the performance schema is disabled, this flag is always false.
      
      When the performance schema is enabled, and in particular:
      - when the 'global_instrumentation' consumer is enabled
      - when the 'thread_instrumentation' consumer is enabled
      - when the 'instrumented' column in table thread is enabled
      this flag PFS_thread::m_aggregate_on_disconnect is re evaluated,
      for every running thread if necessary.
      
      The m_aggregate_on_disconnect flag is only set when a thread can collect per
      thread statistics.
      
      During disconnect, aggregation is done only when the flag is set.
      
      The net effect of this change is that aggregation on disconnect only happens
      when necessary, saving CPU when no per thread stats are ever collected.
      
      This flag is internal, there are no visible end user changes.
------------------------------------------------------------
revno: 6565
committer: Pavan Naik<pavan.naik@oracle.com>
branch nick: mysql-sys_vars
timestamp: Wed 2013-09-25 12:19:24 +0530
message:
  Bug#17468295   ADD MISSING OUT-OF-BOUND TESTS FOR VARIABLES IN SYS_VAR SUITE
        
  Fix:
  ----
  This bug is a repreat of Bug#13875534. But there were missing tests in Bug#13875534. 
  Reviewed the entire sys_vars suite and added missing testcases in following tests.
                
    mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test
    mysql-test/suite/sys_vars/t/auto_increment_offset_basic.t     Bug#17468295   ADD MISSING OUT-OF-BOUND TESTS FOR VARIABLES IN SYS_VAR SUITE
              
        Fix:
        ----
        This bug is a repreat of Bug#13875534. But there were missing tests in Bug#13875534. 
        Reviewed the entire sys_vars suite and added missing testcases in following tests.
                      
          mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test
          mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test
          mysql-test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test
          mysql-test/suite/sys_vars/t/connect_timeout_basic.test
          mysql-test/suite/sys_vars/t/host_cache_size_basic.test
          mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_lwm_basic.test
          mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test
          mysql-test/suite/sys_vars/t/innodb_api_bk_commit_interval_basic.test
          mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
          mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
          mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test
          mysql-test/suite/sys_vars/t/lock_wait_timeout_basic.test
          mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
          mysql-test/suite/sys_vars/t/table_open_cache_basic.testest
    mysql-test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test
    mysql-test/suite/sys_vars/t/connect_timeout_basic.test
    mysql-test/suite/sys_vars/t/host_cache_size_basic.test
    mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_lwm_basic.test
    mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test
    mysql-test/suite/sys_vars/t/innodb_api_bk_commit_interval_basic.test
    mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
    mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
    mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test
    mysql-test/suite/sys_vars/t/lock_wait_timeout_basic.test
    mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
    mysql-test/suite/sys_vars/t/table_open_cache_basic.test
------------------------------------------------------------
revno: 6564 [merge]
committer: Allen lai <zheng.lai@oracle.com>
branch nick: mysql-trunk
timestamp: Wed 2013-09-25 11:37:27 +0800
message:
  Bug#17358875 MEMCACHED: THE BINLOG SEQUENCE IS NOT CORRECT
  
  Merge from 5.6 to trunk.
    ------------------------------------------------------------
    revno: 3902.277.46
    committer: Allen lai <zheng.lai@oracle.com>
    branch nick: mysql-5.6
    timestamp: Wed 2013-09-25 10:31:20 +0800
    message:
      Bug#17358875 MEMCACHED: THE BINLOG SEQUENCE IS NOT CORRECT
      
      Approved by Jimmy on rb://3213.
      
      This bug is because we commit innodb transaction before write binlog.
      This will cause other thread write its binlog before current thread.
      
      The fix patch is moving write binlog before commit transaction. It'll
      guarantee binlog is written according to transaction commit order.
      
      This patch also contains a follow up patch for Bug#16498810 WRONG
      FILENAME IN ERROR MESSAGE FOR INNODB MEMCACHED CONFIG.
------------------------------------------------------------
revno: 6563 [merge]
committer: Marc Alff <marc.alff@oracle.com>
branch nick: mysql-trunk-push
timestamp: Tue 2013-09-24 21:30:40 +0200
message:
  Push to mysql-trunk
    ------------------------------------------------------------
    revno: 6549.1.1
    committer: Marc Alff <marc.alff@oracle.com>
    branch nick: mysql-trunk-bug17493868
    timestamp: Mon 2013-09-23 13:12:00 +0200
    message:
      Bug#17493868 IMPROVE PERFORMANCE_SCHEMA MEMORY INSTRUMENTATION
      
      Before this fix,
      
      1)
      
      The memory instrumentation code could spent time performing
      operations in struct PFS_memory_stat
      
      2)
      
      Memory allocated internally by the performance schema
      was not reported by the performance schema memory instrumentation.
      
      With this fix,
      
      1)
      
      A new member, PFS_memory_stat::m_used, is added.
      This flags makes the code path much shorter.
      
      For cases when no memort instrumentation is enabled (the default),
      there are no stats to maintain.
      
      Even when the memory instrumentation is used, it is very unlikely that a 
      given session has statistics for every kind of memory instrument, so most 
      statistics will be unused.
      
      This is a performance improvement.
      
      2)
      
      A new instrument is added, named 
      "memory/performance_schema/internal_buffers".
      The performance schema now reports its own memory usage as well.
------------------------------------------------------------
revno: 6562
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-09-24 17:20:14 +0200
message:
  bug#17503130 - Making test experimental
------------------------------------------------------------
revno: 6561
committer: Shivji Kumar Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-09-24 18:11:24 +0530
message:
  BUG#17185647- RESET SLAVE ALL DOESN'T RESET ALL CONNECTION PARAMETERS
                IN MASTER_INFO
  
  post push fix
------------------------------------------------------------
revno: 6560
committer: mayank prasad <mayank.prasad@oracle.com>
branch nick: trunk
timestamp: Tue 2013-09-24 14:31:57 +0530
message:
  Bug #17472833 	ONLY TABLES LOGGED IN OBJECTS_SUMMARY_GLOBAL_BY_TYPE
  
  Follow-up patch to resolve sporadic failure on PB2.
------------------------------------------------------------
revno: 6559
committer: Marko M?kel? <marko.makela@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-09-24 09:20:49 +0300
message:
  Bug#17492627 ABORT() SHOULD BE INLINED IN UT_DBG_ASSERTION_FAILED
  
  The macros ut_a and ut_error in InnoDB would invoke ut_dbg_assertion_failed()
  followed by ut_abort(). The function ut_abort() is not invoked from anywhere
  else than these macro expansions.
  
  Furthermore, on some platforms, ut_a() would dereference a dummy variable
  ut_dbg_zero, which is always zero.
  
  ut_abort(): Remove.
  ut_dbg_zero: Remove. This was an always-zero global variable.
  
  ut_dbg_assertion_failed(): Invoke fflush() and abort() at the end.
  
  rb#3396 approved by Kevin Lewis
------------------------------------------------------------
revno: 6558
committer: Anitha Gopi <anitha.gopi@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-09-24 05:32:23 +0200
message:
  main.index_merge_innodb is passing now. Removing from experimental list
------------------------------------------------------------
revno: 6557 [merge]
committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
branch nick: mysql-trunk
timestamp: Tue 2013-09-24 11:55:07 +0900
message:
  empty merge
    ------------------------------------------------------------
    revno: 3902.277.45
    committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
    branch nick: mysql-5.6
    timestamp: Tue 2013-09-24 11:52:14 +0900
    message:
      Bug#16870041 I_INNODB.INNODB-ALTER-DEBUG FAILED REGULARLY IN DIFFERENT RUNS WITH TIMEOUT
      
      mtr script adjustment and debug build adjustment backporting from mysql-trunk
------------------------------------------------------------
revno: 6556 [merge]
committer: Aditya A <aditya.a@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-23 21:46:28 +0530
message:
  Bug #17441867 [ERROR] INNODB: FAILED TO SET O_DIRECT ON FILE
  
  [Merge from 5.6]
    ------------------------------------------------------------
    revno: 3902.277.44
    committer: Aditya A <aditya.a@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-23 21:44:36 +0530
    message:
      Bug #17441867 [ERROR] INNODB: FAILED TO SET O_DIRECT ON FILE
      
      PROBLEM
      -------
      
      Setting the O_DIRECT flag on file on tmpfs fails 
      and error messages are printed in error logs.
      The customer was creating lot of temporary tables 
      in tmpfs and because of which error log was 
      flooded with these error messages. We however 
      ignore these errors and continue to create the
      tables.These error messages were causing problem 
      with the their monitoring system.
      
      FIX
      ---
      
      The fix is to downgrade the error with a warning
      and printing this warning only once in the error
      log. 
------------------------------------------------------------
revno: 6555
committer: kevin.lewis@oracle.com
branch nick: mysql-trunk
timestamp: Mon 2013-09-23 09:43:48 -0500
message:
  Bug#17378106 - VALGRIND FAILURE IN TWO RPL TESTS / WEEKLY RUN
  
  In the implementation of row_scan_index_for_mysql() which is called from
  handler::records() and handler::check()a buffer is allocated with size
  UNIV_PAGE_SIZE for row_search_for_mysql(). Then a mysql-formatted buffer
  is put into it.  If the TABLE_SHARE::record length is > UNIV PAGE SIZE,
  this valgrind assert could occur in 5.7 due to the call of
  handler::records() for any count(*) because ::records() presets
  prebuilt->mysql_row_len to the actual TABLE_SHARE record length.
  
  This is only an issue with a valgrind assert.  There is never an actual
  buffer overrun because row_scan_index_for_mysql() never reads of-page
  columns, so the record read is never actually longer than UNIV_PAGE_SIZE.
  
  The fix is simply to allocate the buffer to receive the record as the
  maximum of UNIV_PAGE_SIZE and prebuilt->mysql_row_len.
  
  Approved by Marko in rb3286
------------------------------------------------------------
revno: 6554 [merge]
committer: MySQL Build Team <mysql-build@oss.oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-23 15:49:18 +0200
message:
  Null merge from mysql-5.6
    ------------------------------------------------------------
    revno: 3902.277.43 [merge]
    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
    branch nick: mysql-5.6
    timestamp: Mon 2013-09-23 13:46:57 +0200
    message:
      Merge from 5.6.14-Fedora for repo project
        ------------------------------------------------------------
        revno: 3902.280.10
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Mon 2013-09-16 11:47:00 +0200
        message:
          Added fedora and oel to CMakeLists
        ------------------------------------------------------------
        revno: 3902.280.9
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Mon 2013-09-16 10:51:19 +0200
        message:
          Removed uncessary bak files
        ------------------------------------------------------------
        revno: 3902.280.8
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Mon 2013-09-16 09:20:37 +0200
        message:
          Build 5.6.14 Fedora/OEL rpms, updated dist version
        ------------------------------------------------------------
        revno: 3902.280.7
        author: balasubramanian.kandasamy@oracle.com
        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
        branch nick: mysql-5.6.14-Fedora
        timestamp: Fri 2013-09-13 21:50:42 +0200
        message:
          Build 5.6.14 repo rpms
------------------------------------------------------------
revno: 6553
committer: Jorgen Loland <jorgen.loland@oracle.com>
branch nick: mysql-trunk-review
timestamp: Mon 2013-09-23 15:19:25 +0200
message:
  WL#6510
  
  Followup patch: record index_merge_innodb.result
------------------------------------------------------------
revno: 6552
committer: Shivji Kumar Jha <shivji.jha@oracle.com>
branch nick: mysql-trunk
timestamp: Mon 2013-09-23 16:19:24 +0530
message:
  Bug#17440991- THREAD_ID IN REPLICATION RELATED P_S TABLES                       
                IS NOT THE INTERNAL PFS THREAD_ID                                 
                                                                                        
  Problem:                                                                        
  =======                                                                         
  The thread_id fields in the performance schema tables show                      
  the PFS_thread::m_thread_internal_id. But the replication                       
  related Performance schema tables show THD::thread_id.                          
  The two can be different numbers for a given thread.                            
                                                                                        
  Analysis:                                                                       
  ========                                                                        
  THD::thread is the connection_id. For background threads                        
  (threads not associated with a user connection), these are                      
  not incremented. Performance schema instruments background                      
  threads as well and hence maintains a different counter,                        
  PFS_thread::m_thread_internal_id.                                               
                                                                                      
  Fix:                                                                            
  ===                                                                             
  Modify replication related P_S tables to use                                    
  PFS::m_thread_internal_id instead of THD::thread_id.  
------------------------------------------------------------
revno: 6551 [merge]
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: 572-tr
timestamp: Mon 2013-09-23 12:13:53 +0200
message:
  forgot to tag 5.7.2
    ------------------------------------------------------------
    revno: 6301.1.13
    committer: Bjorn Munch <bjorn.munch@oracle.com>
    branch nick: rel-572
    timestamp: Mon 2013-09-23 12:12:14 +0200
    message:
      forgot to tag
------------------------------------------------------------
revno: 6550 [merge]
committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
branch nick: Bug17327454_mysql-trunk
timestamp: Mon 2013-09-23 14:57:53 +0530
message:
  Merge from mysql-5.6 to mysql-trunk
    ------------------------------------------------------------
    revno: 3902.277.42 [merge]
    committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
    branch nick: Bug17327454_mysql-5.6
    timestamp: Mon 2013-09-23 14:02:32 +0530
    message:
      Merge from mysql-5.5 to mysql-5.6
        ------------------------------------------------------------
        revno: 2875.545.21
        committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
        branch nick: Bug17327454_mysql-5.5
        timestamp: Mon 2013-09-23 12:13:37 +0530
        message:
          Bug#17327454:SEMI-SYNC REPLICATION MASTER CRASH WHEN SET
          RPL_SEMI_SYNC_MASTER_ENABLED OFF.
          
          Problem:
          =======
          If master is waiting for a reply from slave, at this time
          set global rpl_semi_sync_master_enabled=OFF, the master
          server will crash.
          
          Analysis:
          ========
          When master is waiting for a reply from slave, at this time
          if semi sync is switched off on master, during switch off if
          active transactions are present the transactions will be
          cleared and "active_tranxs_" variable will be set to NULL.
          
          When the waiting master connection finds that semi sync is
          switched of it tries to access "active_tranxs_" without
          checking if the transaction list exists or not. Accessing
          NULL transaction list causes the crash.
          
          Fix:
          ===
          A check has been added to see a valid list exists before
          accessing the "active_tranxs_".
------------------------------------------------------------
revno: 6549 [merge]
committer: Bjorn Munch <bjorn.munch@oracle.com>
branch nick: 572-tr
timestamp: Mon 2013-09-23 10:45:27 +0200
message:
  Null merge from 5.7.2 release clone
    ------------------------------------------------------------
    revno: 6301.1.12
    tags: mysql-5.7.2
    committer: Bjorn Munch <bjorn.munch@oracle.com>
    branch nick: rel-572
    timestamp: Wed 2013-09-11 13:47:54 +0200
    message:
      Bug #17420109, CS 6473 from trunk
