1. 19 Sep, 2012 2 commits
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · eb69278b
      Marko Mäkelä authored
      eb69278b
    • Marko Mäkelä's avatar
      Bug#14636528 INNODB CHANGE BUFFERING IS NOT ENTIRELY CRASH-SAFE · b3e0fa54
      Marko Mäkelä authored
      Delete-mark change buffer records when resorting to a pessimistic
      delete from the change buffer B-tree. Skip delete-marked records in
      the change buffer merge and when estimating whether an operation can
      be buffered. Without this fix, we could try to apply the same buffered
      changes multiple times if the server was killed at the right moment.
      
      In MySQL 5.5 and later: ibuf_get_volume_buffered_count_func(): Ignore
      delete-marked (already processed) records.
      
      ibuf_delete_rec(): Add a crash point before optimistic delete. If the
      optimistic delete fails, flag the record processed before
      mtr_commit().
      
      ibuf_merge_or_delete_for_page(): Ignore delete-marked (already
      processed) records.
      
      Backport to 5.1: Rename btr_cur_del_unmark_for_ibuf() to
      btr_cur_set_deleted_flag_for_ibuf() and add a parameter.
      
      rb:1307 approved by Jimmy Yang
      b3e0fa54
  2. 18 Sep, 2012 1 commit
    • Tor Didriksen's avatar
      Bug#14542543 FIX BUG #12694872 IN 5.5 · e86a7cbc
      Tor Didriksen authored
      Bug#14530242 CRASH / MEMORY CORRUPTION IN FILESORT_BUFFER::GET_RECORD_BUFFER WITH MYISAM
      
      This is a backport of
      Bug#12694872 - VALGRIND: 18,816 BYTES IN 196 BLOCKS ARE DEFINITELY LOST
      Bug#13340270: assertion table->sort.record_pointers == __null
      Bug#14536113 CRASH IN CLOSEFRM (TABLE.CC) OR UNPACK (FIELD.H) ON SUBQUERY WITH MYISAM TABLES
      
      Also:
      removed and re-added test files with file-ids from trunk.
      e86a7cbc
  3. 17 Sep, 2012 9 commits
    • Marko Mäkelä's avatar
      Null merge mysql-5.1 to mysql-5.5. · 3628708e
      Marko Mäkelä authored
      3628708e
    • Marko Mäkelä's avatar
      Merge mysql-5.5 to working copy. · d857cd89
      Marko Mäkelä authored
      d857cd89
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to working copy. · 45d56fc0
      Marko Mäkelä authored
      45d56fc0
    • Harin Vadodaria's avatar
      Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST · 7ccfd19a
      Harin Vadodaria authored
                    INC_HOST_ERRORS() IS CALLED.
      
      Description : Merge from MySQL-5.1 to MySQL-5.5
      7ccfd19a
    • Harin Vadodaria's avatar
      Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST · b03ed386
      Harin Vadodaria authored
                    INC_HOST_ERRORS() IS CALLED.
      
      Issue       : Sequence of calling inc_host_errors()
                    and reset_host_errors() required some
                    changes in order to maintain correct
                    connection error count.
      
      Solution    : Call to reset_host_errors() is shifted
                    to a location after which no calls to
                    inc_host_errors() are made.
      b03ed386
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · 636224c4
      Marko Mäkelä authored
      636224c4
    • Marko Mäkelä's avatar
      Bug#12701488 ASSERT PAGE_ZIP_VALIDATE, UNIV_ZIP_DEBUG · cff9c64b
      Marko Mäkelä authored
      page_zip_validate(), page_zip_validate_low(): Add a parameter for the
      B-tree index.
      
      page_zip_validate_low(): If the page contents does not match, check
      that the record link chains match. Furthermore, if dict_index_t is
      passed, check that the records match. (This reduces coverage a bit: if
      index=NULL, we will ignore differences in record contents, that is,
      the page payload.)
      
      rb:1264 approved by Inaam Rana
      cff9c64b
    • Sujatha Sivakumar's avatar
      merge from 5.1 to 5.5 · cf05efe7
      Sujatha Sivakumar authored
      cf05efe7
    • Sujatha Sivakumar's avatar
      Bug#11750014:ASSERTION TRX_DATA->EMPTY() IN BINLOG_CLOSE_CONNECTION · cf642d27
      Sujatha Sivakumar authored
      Problem:
      =======
      
      trx_data->empty() assert happens at `binlog_close_connection'
      
      Analysis:
      ========
      
      trx_data->empty() function checks for no pending events
      and the transaction cache to be empty.This function returns
      "true" if no pending events are present and cache is empty.
      Otherwise it returns false. `binlog_close_connection' call
      expects the above function to return true. But if the
      return value is false then assert is raised.
      
      This bug was reproducible in a diskfull scenario. In this
      disk full scenario try to do an insert operation so that
      a new pending event is created and flushing this pending
      event fails. Due to this failure the server goes down
      and invokes `binlog_close_connection' for clean closure.
      Since the pending event still remains the assert is caused.
      This assert is caused only in non transactional databases.
      
      
      Fix:
      ===
      
      In a disk full scenario when the insertion fails the
      transaction is rolled back and `binlog_end_trans`
      is called to flush the pending events. But flush operation
      fails as the disk is full and the function simply returns
      `1' without taking any action to delete the pending event.
      
      This leaves the event to remain till the closure of
      connection.  `delete pending' statement has been added to 
      do the required clean up action.
      
      sql/log.cc:
        Added "delete pending" statement to clean pending event
      cf642d27
  4. 12 Sep, 2012 4 commits
  5. 11 Sep, 2012 2 commits
  6. 10 Sep, 2012 2 commits
    • Andrei Elkin's avatar
      merge bug14597605 to the main repo. · f876fac1
      Andrei Elkin authored
      f876fac1
    • Andrei Elkin's avatar
      Bug#14597605 Issue with Null-value user on slave · 3896f010
      Andrei Elkin authored
      An "orthographic" typo in User_var::set_deferred() was made in fixes for
      bug@14275000. While editing the signature of the initial patch to remove
      the only argument, the assigned value of the argument remained in the body ... 
      to be successfully compiled (!) thanks to names coincidence:
      the arg to User_var method and its member.
      
      Fixed with correcting the typo.
      3896f010
  7. 07 Sep, 2012 1 commit
  8. 05 Sep, 2012 1 commit
  9. 03 Sep, 2012 1 commit
  10. 31 Aug, 2012 2 commits
    • Annamalai Gurusami's avatar
      Bug #13453036 ERROR CODE 1118: ROW SIZE TOO LARGE - EVEN · e5817934
      Annamalai Gurusami authored
      THOUGH IT IS NOT.
      
      The following error message is misleading because it claims 
      that the BLOB space is not counted.  
      
      "ERROR 1118 (42000): Row size too large. The maximum row size for 
      the used table type, not counting BLOBs, is 8126. You have to 
      change some columns to TEXT or BLOBs"
      
      When the ROW_FORMAT=compact or ROW_FORMAT=REDUNDANT is used,
      the BLOB prefix is stored inline along with the row.  So 
      the above error message is changed as follows depending on
      the row format used:
      
      For ROW_FORMAT=COMPRESSED or ROW_FORMAT=DYNAMIC, the error
      message is as follows:
      
      "ERROR 42000: Row size too large (> 8126). Changing some
      columns to TEXT or BLOB may help. In current row format, 
      BLOB prefix of 0 bytes is stored inline."
      
      For ROW_FORMAT=COMPACT or ROW_FORMAT=REDUNDANT, the error
      message is as follows:
      
      "ERROR 42000: Row size too large (> 8126). Changing some
      columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or 
      ROW_FORMAT=COMPRESSED may help. In current row
      format, BLOB prefix of 768 bytes is stored inline."
      
      rb://1252 approved by Marko Makela
      e5817934
    • unknown's avatar
      No commit message · 237b124b
      unknown authored
      No commit message
      237b124b
  11. 30 Aug, 2012 2 commits
    • Marko Mäkelä's avatar
      Bug#14554000 CRASH IN PAGE_REC_GET_NTH_CONST(NTH=0) DURING COMPRESSED · d608e1ab
      Marko Mäkelä authored
      PAGE SPLIT
      
      page_rec_get_nth_const(): Map nth==0 to the page infimum.
      
      btr_compress(adjust=TRUE): Add a debug assertion for nth>0. The cursor
      should never be positioned on the page infimum.
      
      btr_index_page_validate(): Add test instrumentation for checking the
      return values of page_rec_get_nth_const() during CHECK TABLE, and for
      checking that the page directory slot 0 always contains only one
      record, the predefined page infimum record.
      
      page_cur_delete_rec(), page_delete_rec_list_end(): Add debug
      assertions guarding against accessing the page slot 0.
      
      page_copy_rec_list_start(): Clarify a comment about ret_pos==0.
      
      rb:1248 approved by Jimmy Yang
      d608e1ab
    • Marko Mäkelä's avatar
      Bug#14547952: DEBUG BUILD FAILS ASSERTION IN RECORDS_IN_RANGE() · e8a59559
      Marko Mäkelä authored
      ha_innodb::records_in_range(): Remove a debug assertion
      that prohibits an open range (full table).
      
      The patch by Jorgen Loland only removed the assertion from the
      built-in InnoDB, not from the InnoDB Plugin.
      e8a59559
  12. 28 Aug, 2012 1 commit
  13. 27 Aug, 2012 1 commit
    • Georgi Kodinov's avatar
      Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR · 3a2dea85
      Georgi Kodinov authored
      TO DEFAULT IGNOR
      
      The test in mysqld_safe for the presence of the --plugin-dir and assigning a default
      value to it were performed before the actual argument parsing.
      This is wrong, as PLUGIN_DIR mysqld_safe code also uses MY_BASEDIR_VERSION to 
      look for version specific plugin directory if present.
      Fixed by moving the PLUGIN_DIR logic after the parse_arguments() call.
      3a2dea85
  14. 24 Aug, 2012 1 commit
    • Georgi Kodinov's avatar
      Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL · 8bfa1fee
      Georgi Kodinov authored
      The script is different from what's used on unixes.
      It was not playing the table insertion script (mysql_system_tables_data.sql),
      although it was checking for the presence of this script.
      Fixed by re-enabling the lookup for this file and replaying it at bootstrap
      time. Note that on the Unixes "SELECT @@hostname" does return a fully qualified
      name, whereas on Windows it returns only a hostname.
      So by default we're filtering records in the mysql.user table until we ensure
      this is fixed.
      8bfa1fee
  15. 10 Sep, 2012 1 commit
  16. 07 Sep, 2012 6 commits
  17. 05 Sep, 2012 1 commit
  18. 04 Sep, 2012 1 commit
    • Annamalai Gurusami's avatar
      Bug #14500557 CRASH WHEN USING LONG INNODB INDEXES · bb3265b6
      Annamalai Gurusami authored
      The ha_innobase table handler contained two search key buffers
      (srch_key_val1, srch_key_val2) of fixed size used to store the search
      key.  The size of these buffers where fixed at
      REC_VERSION_56_MAX_INDEX_COL_LEN + 2.  But this size is not sufficient
      to hold the search key.  Hence the following assert in
      row_sel_convert_mysql_key_to_innobase() failed.
      
      2438                 /* Storing may use at most data_len bytes of buf */
      2439 
      2440                 if (UNIV_LIKELY(!is_null)) {
      2441                         ut_a(buf + data_len <= original_buf + buf_len);
      2442                         row_mysql_store_col_in_innobase_format(
      2443                                 dfield, buf,
      2444                                 FALSE, /* MySQL key value format col */
      2445                                 key_ptr + data_offset, data_len,
      2446                                 dict_table_is_comp(index->table));
      2447                         buf += data_len;
      2448                 }
      
      The buffer size is now calculated with the formula
      MAX_KEY_LENGTH + MAX_REF_PARTS*2.  This properly takes into account
      the extra bytes needed to store the length for each column.  An index
      can contain a maximum of MAX_REF_PARTS columns in it, and for each
      column 2 bytes are needed to store length.  
      
      rb://1238 approved by Marko and Vasil Dimov.
      bb3265b6
  19. 03 Sep, 2012 1 commit