1. 11 Aug, 2012 2 commits
  2. 09 Aug, 2012 9 commits
  3. 08 Aug, 2012 2 commits
    • Rohit Kalhans's avatar
      upmerge from mysql-5.1=>mysql-5.5 · 17c5725c
      Rohit Kalhans authored
      17c5725c
    • Rohit Kalhans's avatar
      BUG#11757312: MYSQLBINLOG DOES NOT ACCEPT INPUT FROM STDIN · ff04c5bd
      Rohit Kalhans authored
      WHEN STDIN IS A PIPE
                  
      Problem: Mysqlbinlog does not accept the input from STDIN when 
      STDIN is a pipe. This prevents the users from passing the input file
      through a shell pipe.    
      
      Background: The my_seek() function does not check if the file descriptor
      passed to it is regular (seekable) file. The check_header() function in
      mysqlbinlog calls the my_b_seek() unconditionally and it fails when
      the underlying file is a PIPE.  
                  
      Resolution: We resolve this problem by checking if the underlying file
      is a regular file by using my_fstat() before calling my_b_seek(). 
      If the underlying file is not seekable we skip the call to my_b_seek()
      in check_header().
      
      client/mysqlbinlog.cc:
        Added a check to avoid the my_b_seek() call if the
        underlying file is a PIPE.
      ff04c5bd
  4. 07 Aug, 2012 5 commits
    • Nirbhay Choubey's avatar
      ffdc4bc8
    • Nirbhay Choubey's avatar
      Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST · 5ad8292c
      Nirbhay Choubey authored
                   SHOW 2012 INSTEAD OF 2011
      
      * Added a new macro to hold the current year :
        COPYRIGHT_NOTICE_CURRENT_YEAR
      * Modified ORACLE_WELCOME_COPYRIGHT_NOTICE macro
        to take the initial year as parameter and pick
        current year from the above mentioned macro.
      5ad8292c
    • Harin Vadodaria's avatar
      Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R · d0affa9b
      Harin Vadodaria authored
                    AND LIBCRYPTO
      
      Description: Merge from 5.1 to 5.5
      d0affa9b
    • Harin Vadodaria's avatar
      Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R · d86d0634
      Harin Vadodaria authored
                    AND LIBCRYPTO
      
      Problem: libmysqlclient_r exports symbols from yaSSL library which
               conflict with openSSL symbols. This issue is related to symbols
               used by CURL library and are defined in taocrypt. Taocrypt has
               dummy implementation of these functions. Due to this when a
               program which uses libcurl library functions is compiled using
               libmysqlclient_r and libcurl, it hits segmentation fault in
               execution phase.
      
      Solution: MySQL should not be exporting such symbols. However, these
                functions are not used by MySQL code at all. So avoid compiling
                them in the first place.
      d86d0634
    • Praveenkumar Hulakund's avatar
      Bug#13058122 - DML, LOCK/UNLOCK TABLES AND SELECT LEAD TO · d0766534
      Praveenkumar Hulakund authored
      FOREVER MDL LOCK
      
      Analysis:
      ----------
      While granting MDL lock for the lock requests in wait queue,
      first the lock is granted to the high priority lock types
      and then to the low priority lock types.
      
      MDL Priority Matrix,
        +-------------+----+---+---+---+----+-----+
        | Locks       |    |   |   |   |    |     |
        | has Priority|    |   |   |   |    |     |
        | over --->   |  S | SR| SW| SU| SNW| SNRW|   
        +-------------+----+---+---+---+----+-----+
        | X           |  + | + | + | + | +  | +   |
        +-------------|----|---|---|---|----|-----|
        | SNRW        |  - | + | + | - | -  | -   |
        +-------------|----|---|---|---|----|-----|
        | SNW         |  - | - | + | - | -  | -   |
        +-------------+----+---+---+---+----+-----+
      
      Here '+' means, Lock priority is higher.
           '-' means, Has same priority
      
      In the scenario where,
         *. Lock wait queue has requests of type S/SR/SW/SU.
         *. And locks of high priority X/SNRW/SNW are requested 
            continuously.
      
      In this case, while granting lock, always first high priority 
      lock requests(X/SNRW/SNW) are considered. Low priority 
      locks(S/SR/SW/SU) will not get chance and they will 
      wait forever.
      
      In the scenario for which this bug is reported, application
      executed many LOCK TABLES ... WRITE statements concurrently.
      These statements request SNRW lock. Also there were some
      connections trying to execute DML statements requesting SR
      lock. Since SNRW lock request has higher priority (and as
      they were too many waiting SNRW requests) lock is always 
      granted to it. So, lock request SR will wait forever, resulting
      in DML starvation.
      
      How is this handled in 5.1?
      ---------------------------
      Even in 5.1 we have low priority lock starvation issue.
      But, in 5.1 thread locking, system variable 
      "max_write_lock_count" can be configured to grant
      some pending read lock requests. After 
      "max_write_lock_count" of write lock grants all the low
      priority locks are granted.
      
      Why this issue is seen in 5.5/trunk?
      ---------------------------------
      In 5.5/trunk MDL locking, "max_write_lock_count" system 
      variable exists but not used in MDL, only thread lock uses
      it. So no effect of "max_write_lock_count" in MDL locking.
      This means that starvation of metadata locks is possible 
      even if max_write_lock_count is used.
      
      Looks like, customer was using "max_write_lock_count" in
      5.1 and when upgraded to 5.5, starvation is seen because
      of not having effect of "max_write_lock_count" in MDL.
      
      Fix:
      ----------
      As a fix, support for max_write_lock_count is added to MDL.
      To maintain write lock counter per MDL_lock object, new
      member "m_hog_lock_count" is added in MDL_lock.
      
      And following logic is added to increment the counter in 
      function reschedule_waiters, 
      (reschedule_waiters function is called while thread is
       releasing the lock)
          - After granting lock request from the wait queue.
          -  Check if there are any S/SR/SU/SW exists in the wait queue
            - If yes then increment the "m_hog_lock_count"
      
      And following logic is added in the same function to
      handle pending S/SU/SR/SW locks
          
          - Before granting locks 
          - Check if max_write_lock_count <= m_hog_lock_count
          - If Yes, then try to grant S/SR/SW/SU locks. 
            (Since all of these has same priority, all locks are
             granted together. But some lock grant may fail because
             of grant incompatibility)
          - Reset m_hog_lock_count if there no low priority lock
            requests in wait queue. 
          - return
      
      Note:
      --------------------------
      In the lock priority matrix explained above,
      though X has priority over the SNW and SNRW. X locks is
      taken mostly for RENAME, TRUNCATE, CREATE ... operations.
      So lock type X may not be requested in loop continuously 
      in real world applications, as compared to other lock 
      request types. So, lock request of type SNW and SNRW are 
      not starved. So, we can grant all S/SR/SU/SW in one shot,
      without considering SNW & SNRW lock request starvation.
      
      ALTER table operations take SU lock first and then 
      upgrade to SNW if required. All S, SR, SW, SU have same
      lock priority. So while granting SU, request of types
      SR, SW, S are also granted in one shot. So, lock request 
      of type SU->SNW in loop will not make other low priority 
      lock request to starve.
      
      But, when there is request for lock of type SNRW, lock
      requests of lower priority types are not granted. And if 
      SNRW is requested in loop continuously then all 
      S, SR, SW, SU are starved.
      
      This patch addresses the latter scenario.
      When we have S/SR/SW/SU in wait queue and if 
      there are
          - Continuous SNRW lock requests
          - OR one or more X and Continuous SNRW lock requests.
          - OR one SNW and Continuous SNRW lock requests.
          - OR one SNW, one or more X and continuous SNRW lock 
            requests.
      in wait queue then, S/SR/SW/SU lock request are starved.
      
      d0766534
  5. 06 Aug, 2012 1 commit
  6. 05 Aug, 2012 1 commit
  7. 02 Aug, 2012 1 commit
  8. 31 Jul, 2012 2 commits
  9. 27 Jul, 2012 4 commits
  10. 26 Jul, 2012 10 commits
    • Praveenkumar Hulakund's avatar
      Merge from 5.1 to 5.5 · 0c75ba44
      Praveenkumar Hulakund authored
      0c75ba44
    • Praveenkumar Hulakund's avatar
      BUG#13868860 - LIMIT '5' IS EXECUTED WITHOUT ERROR WHEN '5' · 44cd81da
      Praveenkumar Hulakund authored
                     IS PLACE HOLDER AND USE SERVER-SIDE 
      
      Analysis:
      LIMIT always takes nonnegative integer constant values. 
      
      http://dev.mysql.com/doc/refman/5.6/en/select.html
      
      So parsing of value '5' for LIMIT in SELECT fails.
      
      But, within prepared statement, LIMIT parameters can be
      specified using '?' markers. Value for the parameter can
      be supplied while executing the prepared statement.
      
      Passing string values, float or double value for LIMIT
      works well from CLI. Because, while setting the value
      for the parameters from the variable list (added using
      SET), if the value is for parameter LIMIT then its 
      converted to integer value. 
      
      But, when prepared statement is executed from the other
      interfaces as J connectors, or C applications etc.
      The value for the parameters are sent to the server
      with execute command. Each item in log has value and
      the data TYPE. So, While setting parameter value
      from this log, value is set to all the parameters
      with the same data type as passed.
      But here logic to convert value to integer type
      if its for LIMIT parameter is missing.
      Because of this,string '5' is set to LIMIT.
      And the same is logged into the binlog file too. 
      
      Fix:
      When executing prepared statement having parameter for
      CLI it worked fine, as the value set for the parameter
      is converted to integer. And this failed in other 
      interfaces as J connector,C Applications etc as this 
      conversion is missing.
      
      So, as a fix added check while setting value for the
      parameters. If the parameter is for LIMIT value then
      its converted to integer value.
      44cd81da
    • Venkata Sidagam's avatar
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE · fe7a28e7
      Venkata Sidagam authored
                        
      Merged pb2 test failure fix from mysql-5.1 to mysql-5.5
      fe7a28e7
    • Venkata Sidagam's avatar
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE · b6ecca26
      Venkata Sidagam authored
      Fix for pb2 test failure.
      b6ecca26
    • Nirbhay Choubey's avatar
      25154543
    • Nirbhay Choubey's avatar
      Bug#13741677 MYSQL_SECURE_INSTALLATION DOES NOT · 55f3fd4d
      Nirbhay Choubey authored
                   WORK + SAVES ROOT PASSWORD TO DISK!
      
      The secure installation scripts connect to the
      server by storing the password in a temporary
      option file. Now, if the script gets killed or
      fails for some reason, the removal of the option
      file may not take place.
      
      This patch introduces following enhancements :
      * (.sh) Made sure that cleanup happens at every
        call to 'exit 1'. This is performed implicitly
        by END{} in pl.in.
      * (.pl.in) Added a warning in case unlink fails
        to delete the option/query files.
      * (.sh/.pl.in) Added more signals to the signal
        handler list. SIG# 1, 3, 6, 15
      55f3fd4d
    • Tor Didriksen's avatar
      merge 5.1 => 5.5 · 35785ed8
      Tor Didriksen authored
      35785ed8
    • Tor Didriksen's avatar
    • Venkata Sidagam's avatar
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE · fdaafddd
      Venkata Sidagam authored
            
      Merged from mysql-5.1 to mysql-5.5
      fdaafddd
    • Venkata Sidagam's avatar
      Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLE · aef1982b
      Venkata Sidagam authored
      Problem description:
      Table 't' created with two colums having compound index on both the 
      columns under innodb/myisam engine at remote machine. In the local 
      machine same table is created undet the federated engine.
      A select having where clause with along 'AND' operation gives wrong 
      results on local machine.
      
      Analysis: 
      The given query at federated engine is wrongly transformed by 
      federated::create_where_from_key() function and the same was sent to 
      the remote machine. Hence the local machine is showing wrong results.
      
      Given query "select c1 from t where c1 <= 2 and c2 = 1;"
      Query transformed, after ha_federated::create_where_from_key() function is:
      SELECT `c1`, `c2` FROM `t` WHERE  (`c1` IS NOT NULL ) AND 
      ( (`c1` >= 2)  AND  (`c2` <= 1) ) and the same sent to real_query().
      In the above the '<=' and '=' conditions were transformed to '>=' and 
      '<=' respectively.
      
      ha_federated::create_where_from_key() function behaving as below:
      The key_range is having both the start_key and end_key. The start_key 
      is used to get "(`c1` IS NOT NULL )" part of the where clause, this 
      transformation is correct. The end_key is used to get "( (`c1` >= 2) 
      AND  (`c2` <= 1) )", which is wrong, here the given conditions('<=' and '=') 
      are changed as wrong conditions('>=' and '<=').
      The end_key is having {key = 0x39fa6d0 "", length = 10, keypart_map = 3, 
      flag = HA_READ_AFTER_KEY}
      
      The store_length is having value '5'. Based on store_length and length 
      values the condition values is applied in HA_READ_AFTER_KEY switch case.
      The switch case 'HA_READ_AFTER_KEY' is applicable to only the last part of 
      the end_key and for previous parts it is going to 'HA_READ_KEY_OR_NEXT' case, 
      here the '>=' is getting added as a condition instead of '<='.
      
      Fix:
      Updated the 'if' condition in 'HA_READ_AFTER_KEY' case to affect for all 
      parts of the end_key. i.e 'i > 0' will used for end_key, Hence added it in 
      the if condition.
      
      
      mysql-test/suite/federated/federated.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_archive.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_bug_13118.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_bug_25714.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_bug_35333.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_debug.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_innodb.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_server.test:
        modified the federated.inc file location
      mysql-test/suite/federated/federated_transactions.test:
        modified the federated.inc file location
      mysql-test/suite/federated/include/federated.inc:
        moved the file from federated suite to federated/include folder
      mysql-test/suite/federated/include/federated_cleanup.inc:
        moved the file from federated suite to federated/include folder
      mysql-test/suite/federated/include/have_federated_db.inc:
        moved the file from federated suite to federated/include folder
      storage/federated/ha_federated.cc:
        updated the 'if condition' in ha_federated::create_where_from_key() 
        function.
      aef1982b
  11. 25 Jul, 2012 3 commits