1. 02 Feb, 2012 1 commit
    • Mattias Jonsson's avatar
      Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ON · 5dd8dd5d
      Mattias Jonsson authored
                            ALTER TABLE AFTER DROP PARTITION
      Bug#13608188 - 64038: CRASH IN HANDLER::HA_THD ON ALTER TABLE AFTER
                            REPAIR NON-EXISTING PARTITION
      
      Backport of bug#13357766 from -trunk to -5.5.
      
      The state of some partitions was not reset on failure, leading
      to invalid states of partitions in consequent statements.
      
      Fixed by reverting back to original state for all partitions
      if not all partition names was resolved.
      
      Also adding extra security by forcing tables to be reopened
      in case of error in mysql_alter_table.
      
      (There is also removal of \r at the end of some lines.)
      5dd8dd5d
  2. 30 Jan, 2012 2 commits
    • Gopal Shankar's avatar
      Merged from mysql-5.1-security · 548d39de
      Gopal Shankar authored
      548d39de
    • Gopal Shankar's avatar
      Bug#13105873 :Valgrind Warning: CRASH IN FOREIGN · 5fe4986c
      Gopal Shankar authored
            KEY HANDLING ON SUBSEQUENT CREATE TABLE IF NOT EXISTS
            
            PROBLEM:
            --------
            Consider a SP routine which does CREATE TABLE
            with REFERENCES clause. The first call to this routine
            invokes parser and the parsed items are cached, so as 
            to avoid parsing for the second execution of the routine.
            
            It is obsevered that valgrind reports a warning
            upon read of thd->lex->alter_info->key_list->Foreign_key object,
            which seem to be pointing to a invalid memory address
            during second time execution of the routine. Accessing this object
            theoretically could cause a crash.
            
            ANALYSIS:
            ---------
            The problem stems from the fact that for some reason
            elements of ref_columns list in thd->lex->alter_info->
            key_list->Foreign_key object are changed to point to
            objects allocated on runtime memory root.
            
            During the first execution of routine we create
            a copy of thd->lex->alter_info object.
            As part of this process we create a clones of objects in
            Alter_info::key_list and of Foreign_key object in particular.
            Then Foreign_key object is cloned for some reason we
            perform shallow copies of both Foreign_key::ref_columns
            and Foreign_key::columns list. So new instance of 
            Foreign_key object starts to SHARE contents of ref_columns
            and columns list with the original instance.
            After that as part of cloning process we call
            list_copy_and_replace_each_value() for elements of
            ref_columns list. As result ref_columns lists in both
            original and cloned Foreign_key object start to contain
            pointers to Key_part_spec objects allocated on runtime
            memory root because of shallow copy.
            
            So when we start copying of thd->lex->alter_info object
            during the second execution of stored routine we indeed
            encounter pointer to the Key_part_spec object allocated
            on runtime mem-root which was cleared during at the end
            of previous execution. This is done in sp_head::execute(), 
            by a call to free_root(&execute_mem_root,MYF(0));
            As result we get valgrind warnings about accessing 
            unreferenced memory.
            
            FIX:
            ----
            The safest solution to this problem is to 
            fix Foreign_key(Foreign_key, MEM_ROOT) constructor to do
            a deep copy of columns lists, similar to Key(Key, MEM_ROOT) 
            constructor.
      5fe4986c
  3. 27 Jan, 2012 2 commits
    • Tor Didriksen's avatar
      Merge 5.1-security => 5.5-security · c4367254
      Tor Didriksen authored
      c4367254
    • Tor Didriksen's avatar
      Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTH · f3a7873c
      Tor Didriksen authored
      Bug#13011410 CRASH IN FILESORT CODE WITH GROUP BY/ROLLUP
      
      The assert in 13580775 is visible in 5.6 only, 
      but shows that all versions are vulnerable.
      13011410 crashes in all versions.
      
      filesort tries to re-use the sort buffer between invocations in order to save
      malloc/free overhead.
      The fix for Bug 11748783 - 37359: FILESORT CAN BE MORE EFFICIENT.
      added an assert that buffer properties (num_records, record_length) are
      consistent between invocations. Indeed, they are not necessarily consistent.
        
      Fix: re-allocate the sort buffer if properties change.
      
      
      mysql-test/r/partition.result:
        New tests.
      mysql-test/t/partition.test:
        New tests.
      sql/filesort.cc:
        If we already have allocated a sort buffer in a previous execution,
        then verify that it is big enough for the current one.
      sql/table.h:
        Add sort_keys_size; Number of bytes allocated for the sort_keys buffer.
      f3a7873c
  4. 12 Jan, 2012 8 commits
  5. 11 Jan, 2012 4 commits
  6. 10 Jan, 2012 5 commits
    • Nirbhay Choubey's avatar
      d8af27ef
    • Nirbhay Choubey's avatar
      BUG#11760384 - 52792: mysqldump in XML mode does not dump · 63f8c1e1
      Nirbhay Choubey authored
                           routines.
      
      mysqldump in xml mode did not dump routines, events or
      triggers.
      
      This patch fixes this issue by fixing the if conditions
      that disallowed the dump of above mentioned objects in
      xml mode, and added the required code to enable dump
      in xml format.
      
      
      client/mysqldump.c:
        BUG#11760384 - 52792: mysqldump in XML mode does not dump
                              routines.
        
        Fixed some if conditions to allow execution of dump methods
        for xml and further added the relevant code at places to produce
        the dump in xml format.
      mysql-test/r/mysqldump.result:
        Added a test case for Bug#11760384.
      mysql-test/t/mysqldump.test:
        Added a test case for Bug#11760384.
      63f8c1e1
    • Sneha Modi's avatar
      Bug#11748572: ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC · 51be2c2c
      Sneha Modi authored
      Moving query_cache_size_basic_32.test and query_cache_size_basic_64.test from experimental
      to disabled as a solution has still not been found.
      51be2c2c
    • Yasufumi Kinoshita's avatar
      Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUND · d7689492
      Yasufumi Kinoshita authored
      If we meet DB_TOO_MANY_CONCURRENT_TRXS during the execution tab_create_graph from row_create_table_for_mysql(), .ibd file for the table should be created already but was not deleted for the error handling.
      
      rb:875 approved by Jimmy Yang
      d7689492
    • Yasufumi Kinoshita's avatar
      Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUND · 36386696
      Yasufumi Kinoshita authored
      If we meet DB_TOO_MANY_CONCURRENT_TRXS during the execution tab_create_graph from row_create_table_for_mysql(), .ibd file for the table should be created already but was not deleted for the error handling.
      
      rb:875 approved by Jimmy Yang
      36386696
  7. 09 Jan, 2012 2 commits
    • Jon Olav Hauglid's avatar
      Merge from mysql-5.1-security to mysql-5.5-security · 95d56d0e
      Jon Olav Hauglid authored
      Text conflict in sql/sql_yacc.yy
      95d56d0e
    • Jon Olav Hauglid's avatar
      Backport from mysql-trunk of: · a66b452d
      Jon Olav Hauglid authored
      ------------------------------------------------------------
      revno: 3258
      committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
      branch nick: mysql-trunk-bug12663165
      timestamp: Thu 2011-07-14 10:05:12 +0200
      message:
        Bug#12663165 SP DEAD CODE REMOVAL DOESN'T UNDERSTAND CONTINUE HANDLERS
        
        When stored routines are loaded, a simple optimizer tries to locate
        and remove dead code. The problem was that this dead code removal
        did not work correctly with CONTINUE handlers.
        
        If a statement triggers a CONTINUE handler, the following statement
        will be executed after the handler statement has completed. This
        means that the following statement is not dead code even if the
        previous statement unconditionally alters control flow. This fact
        was lost on the dead code removal routine, which ended up with
        removing instructions that could have been executed. This could
        then lead to assertions, crashes and generally bad behavior when
        the stored routine was executed.
        
        This patch fixes the problem by marking as live code all stored
        routine instructions that are in the same scope as a CONTINUE handler.
        
        Test case added to sp.test.
      a66b452d
  8. 06 Jan, 2012 4 commits
  9. 05 Jan, 2012 1 commit
  10. 04 Jan, 2012 1 commit
  11. 03 Jan, 2012 1 commit
  12. 02 Jan, 2012 2 commits
    • Tatjana Azundris Nuernberg's avatar
      54889ff3
    • Tatjana Azundris Nuernberg's avatar
      BUG#11755281/47032: ERROR 2006 / ERROR 2013 INSTEAD OF PROPER ERROR MESSAGE · aae0f547
      Tatjana Azundris Nuernberg authored
      If init_command was incorrect, we couldn't let users execute
      queries, but we couldn't report the issue to the client either
      as it does not expect error messages before even sending a
      command. Thus, we simply disconnected them without throwing
      a clear error.
      
      We now go through the proper sequence once (without executing
      any user statements) so we can report back what the problem
      is. Only then do we disconnect the user.
      
      As always, root remains unaffected by this as init_command is
      (still) not executed for them.
      
      mysql-test/r/init_connect.result:
        We now report a proper error if init_command fails.
        Expect as much.
      mysql-test/t/init_connect.test:
        We now report a proper error if init_command fails.
        Expect as much.
      sql/sql_connect.cc:
        If init_command fails, throw an error explaining this to
        the user.
      aae0f547
  13. 29 Dec, 2011 5 commits
  14. 28 Dec, 2011 2 commits
    • Marko Mäkelä's avatar
      Merge mysql-5.1 to mysql-5.5. · 3d32eb93
      Marko Mäkelä authored
      3d32eb93
    • Marko Mäkelä's avatar
      Bug#13418934 REMOVE HAVE_PURIFY DEPENDENCES FROM INNODB · 05e267a8
      Marko Mäkelä authored
      InnoDB: Remove HAVE_purify, UNIV_INIT_MEM_TO_ZERO, UNIV_SET_MEM_TO_ZERO.
      
      The compile-time setting HAVE_purify can mask potential bugs.
      It is being set in PB2 Valgrind runs. We should simply get rid of it,
      and replace it with UNIV_MEM_INVALID() to declare uninitialized memory
      as such in Valgrind-instrumented binaries.
      
      os_mem_alloc_large(), ut_malloc_low(): Remove the parameter set_to_zero.
      
      ut_malloc(): Define as a macro that invokes ut_malloc_low().
      
      buf_pool_init(): Never initialize the buffer pool frames. All pages
      must be initialized before flushing them to disk.
      
      mem_heap_alloc(): Never initialize the allocated memory block.
      
      os_mem_alloc_nocache(), ut_test_malloc(): Unused function, remove.
      
      rb:813 approved by Jimmy Yang
      05e267a8