1. 03 Nov, 2011 1 commit
  2. 29 Oct, 2011 1 commit
  3. 28 Oct, 2011 3 commits
  4. 26 Oct, 2011 3 commits
  5. 24 Oct, 2011 2 commits
  6. 22 Oct, 2011 1 commit
  7. 21 Oct, 2011 2 commits
  8. 19 Oct, 2011 12 commits
  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 2 commits