1. 20 Oct, 2011 1 commit
  2. 19 Oct, 2011 4 commits
  3. 18 Oct, 2011 2 commits
  4. 17 Oct, 2011 2 commits
    • unknown's avatar
      BUG#12968567: mysql_plugin : incorrect return from bootstrap failure · 3c869a52
      unknown authored
      This patch corrects a defect whereby the bootstrap_server() method was
      returning 0 instead of the error code generated. The code has been changed to
      return the correct value returned from the bootstrap command.
      3c869a52
    • unknown's avatar
      BUG#12968815: mysql_plugin : disable requires plugin name but doesn't use it · d1846e3b
      unknown authored
      This patch corrects a defect in the building of the DELETE commands for
      disabling a plugin whereby only the original plugin data was deleted. If there
      were other plugins, the delete did not remove the rows. The code has been
      changed to remove all rows from the mysql.plugin table that were inserted when
      the plugin was loaded. The test has also been changed to correctly identify if
      all rows have been deleted.
      d1846e3b
  5. 14 Oct, 2011 1 commit
  6. 13 Oct, 2011 2 commits
  7. 12 Oct, 2011 9 commits
    • Bjorn Munch's avatar
      null upmerge · c43e207d
      Bjorn Munch authored
      c43e207d
    • Bjorn Munch's avatar
      merge 5.5 => 5.5-mtr · d5b243b7
      Bjorn Munch authored
      d5b243b7
    • Bjorn Munch's avatar
      merge 5.1 => 5.1-mtr · e37fdbb1
      Bjorn Munch authored
      e37fdbb1
    • Sergey Glukhov's avatar
      automerge · 8a2286ba
      Sergey Glukhov authored
      8a2286ba
    • Sergey Glukhov's avatar
      Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT · bd4785a6
      Sergey Glukhov authored
      When temporary tables is used for result sorting
      result field for gconcat function is created using
      group_concat_max_len size. It leads to result truncation
      when character_set_results is multi-byte character set due
      to insufficient tmp table field size.
      The fix is to increase temporary table field size for
      gconcat. Method make_string_field() is overloaded
      for Item_func_group_concat class and uses
      max_characters * collation.collation->mbmaxlen size for
      result field. max_characters is maximum number of characters
      what can fit into max_length size.
      
      
      mysql-test/r/ctype_utf16.result:
        test result
      mysql-test/r/ctype_utf32.result:
        test result
      mysql-test/r/ctype_utf8.result:
        test result
      mysql-test/t/ctype_utf16.test:
        test case
      mysql-test/t/ctype_utf32.test:
        test case
      mysql-test/t/ctype_utf8.test:
        test case
      sql/item.h:
        make Item::make_string_field() virtual
      sql/item_sum.cc:
        added Item_func_group_concat::make_string_field(TABLE *table) method
        which uses max_characters * collation.collation->mbmaxlen size for
        result item. max_characters is maximum number of characters what can
        fit into max_length size.
      sql/item_sum.h:
        added Item_func_group_concat::make_string_field(TABLE *table) method
      bd4785a6
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · 5dc19b9c
      Marko Mäkelä authored
      5dc19b9c
    • Marko Mäkelä's avatar
      Bug#13006367 62487: innodb takes 3 minutes to clean up the adaptive · 6d590649
      Marko Mäkelä authored
      hash index at shutdown
      
      btr_search_disable(): Just drop the entire adaptive hash index,
      without dropping every record separately.
      
      buf_pool_clear_hash_index(): Renamed and simplified from
      buf_pool_drop_hash_index(). Set block->index = NULL for every block in
      the buffer pool. Do not release the btr_search_latch. The caller will
      have to adjust other data structures.
      
      Remove block->is_hashed. It is redundant, should be always equal to
      block->index != NULL.
      
      Remove btr_search_fully_disabled, btr_search_enabled_mutex, and
      SYNC_SEARCH_SYS_CONF. We drop the AHI in one pass, without releasing
      the btr_search_latch in between.
      
      Replace void* with const rec_t* and add assertions on btr_search_latch
      and btr_search_enabled to ha0ha.h, ha0ha.ic, ha0ha.c.
      
      page_set_max_trx_id(): Ignore the adaptive hash index. I forgot to
      push this in rb:750.
      
      btr0sea.c: Always after acquiring btr_search_latch, check for
      block->index==NULL or !btr_search_enabled. We can now set
      block->index=NULL while only holding btr_search_latch in exclusive
      mode. Always acquire btr_search_latch before reading block->index,
      except in shortcuts when testing for block->index == NULL.
      
      ha_clear(), ha_search(): Unused function, remove.
      
      buf_page_peek_if_search_hashed(): Remove. This function may avoid
      latching a page at the cost of doing a duplicate buf_pool->page_hash
      lookup.
      
      rb:775 approved by Inaam Rana
      6d590649
    • Vinay Fisrekar's avatar
      merge 5.1 -> 5.5 · b7a4918f
      Vinay Fisrekar authored
      adjust/modify tests as they were failing if system time zone is set differently.
      b7a4918f
    • Vinay Fisrekar's avatar
      bug#11766457 - adjusting/modifying the the tests as tests were failing if... · 73db2a15
      Vinay Fisrekar authored
      bug#11766457 - adjusting/modifying the the tests as tests were failing if system time zone is set differently.
      73db2a15
  8. 10 Oct, 2011 1 commit
  9. 06 Oct, 2011 1 commit
    • Magne Mahre's avatar
      Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION · 68147625
      Magne Mahre authored
             
      Sun Studio 12 has an error when calculating the compile-time 
      length of a constant character string.  The error is only 
      present when building an optimized 32-bits version, using 
      the -xbuiltin=(%all) compiler flag. 
             
      During compilation, the compiler recognizes the use of 
      the strlen() function used on a constant string. It 
      optimizes the strlen and replaces it with the actual 
      length of the string.   This optimization seems to 
      calculate the length wrongly in this particular case. 
             
      Replacing the "const char *" with a "const char []" 
      solves the problem. 
      68147625
  10. 05 Oct, 2011 12 commits
    • Bjorn Munch's avatar
      null upmerge · 52c5c4ad
      Bjorn Munch authored
      52c5c4ad
    • Bjorn Munch's avatar
      merge 5.5-mtr => 5.5 · 2aca5a8d
      Bjorn Munch authored
      2aca5a8d
    • Bjorn Munch's avatar
      merge 5.1-mtr => 5.1 · b84202db
      Bjorn Munch authored
      b84202db
    • Bjorn Munch's avatar
      Silly mistake in gdb output: replaced print with resfile_print, · 83f3aa14
      Bjorn Munch authored
      but the latter only takes one argument, duh!
      Fixed by concatenating the args (replace , with .)
      83f3aa14
    • Bjorn Munch's avatar
      Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FORMAT_CHECK · dc265dc4
      Bjorn Munch authored
        This is a redo for 5.5
        Added 'innodb_file_format_max' as variable to ignore change to.
        Tests that had to restore this amended
        Two tests assumed it to be Antelope, make sure these run on a freshly
          started server
      dc265dc4
    • Sergey Glukhov's avatar
      automerge · 59c9d8e6
      Sergey Glukhov authored
      59c9d8e6
    • Sergey Glukhov's avatar
      automerge · 7b3cc8ee
      Sergey Glukhov authored
      7b3cc8ee
    • Sergey Glukhov's avatar
      automerge · 44145ce6
      Sergey Glukhov authored
      44145ce6
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 7141bada
      Sergey Glukhov authored
      7141bada
    • Sergey Glukhov's avatar
      Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING INSERT ... SELECT · 14dc91ff
      Sergey Glukhov authored
      Problematic query:
      insert ignore into `t1_federated` (`c1`) select `c1` from  `t1_local` a
      where not exists (select 1 from `t1_federated` b where a.c1 = b.c1);
      When this query is killed in another connection it could lead to crash.
      The problem is follwing:
      An attempt to obtain table statistics for subselect table in killed query
      fails with an error. So JOIN::optimize() for subquery is failed but
      it does not prevent further subquery evaluation.
      At the first subquery execution JOIN::optimize() is called
      (see subselect_single_select_engine::exec()) and fails with
      an error. 'executed' flag is set to TRUE and it prevents
      further subquery evaluation. At the second call
      JOIN::optimize() does not happen as 'JOIN::optimized' is TRUE
      and in case of uncacheable subquery the 'executed' flag is set
      to FALSE before subquery evaluation. So we loose 'optimize stage'
      error indication (see subselect_single_select_engine::exec()).
      In other words 'executed' flag is used for two purposes, for
      error indication at JOIN::optimize() stage and for an
      indication of subquery execution. And it seems it's wrong
      as the flag could be reset.
      
      
      mysql-test/r/error_simulation.result:
        test case
      mysql-test/t/error_simulation.test:
        test case
      sql/item_subselect.cc:
        added new flag subselect_single_select_engine::optimize_error
        which is used for error detection which could happen at optimize
        stage.
      sql/item_subselect.h:
        added new flag subselect_single_select_engine::optimize_error
      sql/sql_select.cc:
        test case
      14dc91ff
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · 99b36fe6
      Marko Mäkelä authored
      99b36fe6
    • Marko Mäkelä's avatar
      Add InnoDB UNIV_SYNC_DEBUG assertions to rw-lock code. · 16c91952
      Marko Mäkelä authored
      rw_lock_x_lock_func(): Assert that the thread is not already holding
      the lock in a conflicting mode (RW_LOCK_SHARED).
      
      rw_lock_s_lock_func(): Assert that the thread is not already holding
      the lock in a conflicting mode (RW_LOCK_EX).
      16c91952
  11. 04 Oct, 2011 5 commits