1. 16 Aug, 2012 1 commit
    • Marko Mäkelä's avatar
      Bug#13523839 ASSERTION FAILURES ON COMPRESSED INNODB TABLES · 95247de2
      Marko Mäkelä authored
      btr_cur_optimistic_insert(): Remove a bogus assertion. The insert may
      fail after reorganizing the page.
      
      btr_cur_optimistic_update(): Do not attempt to reorganize compressed pages,
      because compression may fail after reorganization.
      
      page_copy_rec_list_start(): Use page_rec_get_nth() to restore to the
      ret_pos, which may also be the page infimum.
      
      rb:1221
      95247de2
  2. 14 Aug, 2012 1 commit
    • Sujatha Sivakumar's avatar
      Bug#13596613:SHOW SLAVE STATUS GIVES WRONG OUTPUT WITH · 03bfc41b
      Sujatha Sivakumar authored
      MASTER-MASTER AND USING SET USE
      
      Problem:
      =======
      In a master-master set-up, a master can show a wrong
      'SHOW SLAVE STATUS' output.
      
      Requirements:
      - master-master
      - log_slave_updates
      
      This is caused when using SET user-variables and then using
      it to perform writes. From then on the master that performed
      the insert will have a SHOW SLAVE STATUS that is wrong and  
      it will never get updated until a write happens on the other
      master. On"Master A" the "exec_master_log_pos" is not
      getting updated.
      
      Analysis:
      ========
      Slave receives a "User_var" event from the master and after
      applying the event, when "log_slave_updates" option is
      enabled the slave tries to write this applied event into
      its own binary log. At the time of writing this event the
      slave should use the "originating server-id". But in the
      above case the sever always logs the  "user var events"
      by using its global server-id. Due to this in a
      "master-master" replication when the event comes back to the
      originating server the "User_var_event" doesn't get skipped.
      "User_var_events" are context based events and they always
      follow with a query event which marks their end of group.
      Due to the above mentioned problem with "User_var_event"
      logging the "User_var_event" never gets skipped where as
      its corresponding "query_event" gets skipped. Hence the
      "User_var" event always waits for the next "query event"
      and the "Exec_master_log_position" does not get updated
      properly.
      
      Fix:
      ===
      `MYSQL_BIN_LOG::write' function is used to write events
      into binary log. Within this function a new object for
      "User_var_log_event" is created and this new object is used
      to write the "User_var" event in the binlog. "User var"
      event is inherited from "Log_event". This "Log_event" has
      different overloaded constructors. When a "THD" object
      is present "Log_event(thd,...)" constructor should be used
      to initialise the objects and in the absence of a valid
      "THD" object "Log_event()" minimal constructor should be
      used. In the above mentioned problem always default minimal
      constructor was used which is incorrect. This minimal
      constructor is replaced with "Log_event(thd,...)".
      
      sql/log_event.h:
        Replaced the default constructor with another constructor
        which takes "THD" object as an argument.
      03bfc41b
  3. 11 Aug, 2012 1 commit
  4. 09 Aug, 2012 4 commits
  5. 08 Aug, 2012 1 commit
    • 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
  6. 07 Aug, 2012 2 commits
    • 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 · 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
  7. 05 Aug, 2012 1 commit
  8. 31 Jul, 2012 1 commit
  9. 27 Jul, 2012 2 commits
  10. 26 Jul, 2012 5 commits
    • 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 · b6ecca26
      Venkata Sidagam authored
      Fix for pb2 test failure.
      b6ecca26
    • 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
    • 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 1 commit
  12. 24 Jul, 2012 1 commit
  13. 19 Jul, 2012 3 commits
    • Bjorn Munch's avatar
      Reverting broken configure/make stuff · 0893a90f
      Bjorn Munch authored
      0893a90f
    • Bjorn Munch's avatar
      Bug #14035452 - MODULARIZE MYSQL_CLIENT_TEST · 6aaf1579
      Bjorn Munch authored
        Added new minimal client using same framework
        Added internal test using it
        Small changes to top level make/configure/cmake to have it built
      6aaf1579
    • Venkata Sidagam's avatar
      Bug #12615411 - server side help doesn't work as first statement · 913e3a84
      Venkata Sidagam authored
      Problem description:
      Giving "help 'contents'" in the mysql client as a first statement
      gives error
      
      Analysis:
      In com_server_help() function the "server_cmd" variable was
      initialised with buffer->ptr(). And the "server_cmd" variable is not
      updated since we are passing "'contents'"(with single quote) so the
      buffer->ptr() consists of the previous buffer values and it was sent
      to the mysql_real_query() hence we are getting error.
      
      Fix:
      We are not initialising the "server_cmd" variable and we are updating
      the variable with "server_cmd= cmd_buf" in any of the case i.e with
      single quote or without single quote for the contents.
      As part of error message improvement, added new error message in case
      of "help 'contents'".
      
      client/mysql.cc:
        com_server_help(): Properly updated the server_cmd variable and improved
        the error message.
      913e3a84
  14. 18 Jul, 2012 1 commit
    • Chaithra Gopalareddy's avatar
      Bug#11762052: 54599: BUG IN QUERY PLANNER ON QUERIES WITH · ddcd6867
      Chaithra Gopalareddy authored
                           "ORDER BY" AND "LIMIT BY" CLAUSE
      
      PROBLEM:
      When a 'limit' clause is specified in a query along with
      group by and order by, optimizer chooses wrong index
      there by examining more number of rows than required.
      However without the 'limit' clause, optimizer chooses
      the right index.
      
      ANALYSIS:
      With respect to the query specified, range optimizer chooses
      the first index as there is a range present ( on 'a'). Optimizer
      then checks for an index which would give records in sorted
      order for the 'group by' clause.
      
      While checking chooses the second index (on 'c,b,a') based on
      the 'limit' specified and the selectivity of
      'quick_condition_rows' (number of rows present in the range)
      in 'test_if_skip_sort_order' function. 
      But, it fails to consider that an order by clause on a
      different column will result in scanning the entire index and 
      hence the estimated number of rows calculated above are 
      wrong (which results in choosing the second index).
      
      FIX:
      Do not enforce the 'limit' clause in the call to
      'test_if_skip_sort_order' if we are creating a temporary
      table. Creation of temporary table indicates that there would be
      more post-processing and hence will need all the rows.
      
      This fix is backported from 5.6. This problem is fixed in 5.6 as   
      part of changes for work log #5558
      
      
      mysql-test/r/subselect.result:
        Changes for Bug#11762052 results in the correct number of rows.
      sql/sql_select.cc:
        Do not pass the actual 'limit' value if 'need_tmp' is true.
      ddcd6867
  15. 12 Jul, 2012 2 commits
  16. 11 Jul, 2012 1 commit
  17. 10 Jul, 2012 7 commits
    • unknown's avatar
      No commit message · dfa00930
      unknown authored
      No commit message
      dfa00930
    • Andrei Elkin's avatar
      merge from 5.1 repo. · cd0912a4
      Andrei Elkin authored
      cd0912a4
    • Andrei Elkin's avatar
      merge from 5.1 repo. · eca29d5f
      Andrei Elkin authored
      eca29d5f
    • Bjorn Munch's avatar
      86476179
    • Andrei Elkin's avatar
      merge from 5.1 repo. · 5be435de
      Andrei Elkin authored
      5be435de
    • Sujatha Sivakumar's avatar
      BUG#11762670:MY_B_WRITE RETURN VALUE IGNORED · 13f7f002
      Sujatha Sivakumar authored
      Problem:
      =======
      The return value from my_b_write is ignored by: `my_b_write_quoted',
      `my_b_write_bit',`Query_log_event::print_query_header'
      
      Most callers of `my_b_printf' ignore the return value. `log_event.cc' 
      has many calls to it. 
      
      Analysis:
      ========
      `my_b_write' is used to write data into a file. If the write fails it
      sets appropriate error number and error message through my_error()
      function call and sets the IO_CACHE::error == -1.
      `my_b_printf' function is also used to write data into a file, it
      internally invokes my_b_write to do the write operation. Upon
      success it returns number of characters written to file and on error
      it returns -1 and sets the error through my_error() and also sets
      IO_CACHE::error == -1.  Most of the event specific print functions
      for example `Create_file_log_event::print', `Execute_load_log_event::print'
      etc are the ones which make several calls to the above two functions and
      they do not check for the return value after the 'print' call. All the above 
      mentioned abuse cases deal with the client side.
      
      Fix:
      ===
      As part of bug fix a check for IO_CACHE::error == -1 has been added at 
      a very high level after the call to the 'print' function.  There are 
      few more places where the return value of "my_b_write" is ignored
      those are mentioned below.
      
      +++ mysys/mf_iocache2.c    2012-06-04 07:03:15 +0000
      @@ -430,7 +430,8 @@
                 memset(buffz, '0', minimum_width - length2);
               else
                 memset(buffz, ' ', minimum_width - length2);
      -        my_b_write(info, buffz, minimum_width - length2);
      
      +++ sql/log.cc	2012-06-08 09:04:46 +0000
      @@ -2388,7 +2388,12 @@
           {
             end= strxmov(buff, "# administrator command: ", NullS);
             buff_len= (ulong) (end - buff);
      -      my_b_write(&log_file, (uchar*) buff, buff_len);
      
      At these places appropriate return value handlers have been added.
      
      client/mysqlbinlog.cc:
        check for IO_CACHE::error == -1 has been added after the call to
        the event specific print functions
      mysys/mf_iocache2.c:
        Added handler to check the written value of `my_b_write'
      sql/log.cc:
        Added handler to check the written value of `my_b_write'
      sql/log_event.cc:
        Added error simulation statements in `Create_file_log_event::print`
        and `Execute_load_query_log_event::print'
      sql/rpl_utility.h:
        Removed the extra ';'
      13f7f002
    • Bjorn Munch's avatar
      b2131948
  18. 09 Jul, 2012 2 commits
  19. 05 Jul, 2012 2 commits
    • Andrei Elkin's avatar
      Bug#14275000 · e3c8fb4a
      Andrei Elkin authored
      Fixes for BUG11761686 left a flaw that managed to slip away from testing.
      Only effective filtering branch was actually tested with a regression test
      added to rpl_filter_tables_not_exist.
      The reason of the failure is destuction of too early mem-root-allocated memory 
      at the end of the deferred User-var's do_apply_event().
      
      Fixed with bypassing free_root() in the deferred execution branch.
      Deallocation of created in do_apply_event() items is done by the base code
      through THD::cleanup_after_query() -> free_items() that the parent Query
      can't miss.
      
      
      
      sql/log_event.cc:
        Do not call free_root() in case the deferred User-var event.
        Necessary methods to the User-var class are added, do_apply_event() refined.
      sql/log_event.h:
        Necessary methods to avoid destoying mem-root-based memory at
        User-var applying are defined.
      e3c8fb4a
    • Georgi Kodinov's avatar
      Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ | · 04857742
      Georgi Kodinov authored
      HANDLE_FATAL_SIGNAL IN STRNLEN
      
      Fixed the following bounds checking problems :
      1. in check_if_legal_filename() make sure the null terminated
      string is long enough before accessing the bytes in it.
      Prevents pottential read-past-buffer-end
      2. in my_wc_mb_filename() of the filename charset check
      for the end of the destination buffer before sending single
      byte characters into it.
      Prevents write-past-end-of-buffer (and garbaling stack in
      the cases reported here) errors.
      
      Added test cases.
      04857742
  20. 03 Jul, 2012 1 commit
    • Rohit Kalhans's avatar
      BUG#11762667:MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUT · 91c8e79f
      Rohit Kalhans authored
      This is a followup patch for the bug enabling the test
      i_binlog.binlog_mysqlbinlog_file_write.test
      this was disabled in mysql trunk and mysql 5.5 as in the release
      build mysqlbinlog was not debug compiled whereas the mysqld was.
      Since have_debug.inc script checks only for mysqld to be debug
      compiled, the test was not being skipped on release builds.
      
      We resolve this problem by creating a new inc file 
      mysqlbinlog_have_debug.inc which checks exclusively for mysqlbinlog
      to be debug compiled. if not it skips the test.
       
      
      mysql-test/include/mysqlbinlog_have_debug.inc:
        new inc file to check if mysqlbinlog is debug compiled.
      91c8e79f