1. 13 Feb, 2009 10 commits
  2. 12 Feb, 2009 14 commits
    • Davi Arnaut's avatar
      Backport from 6.0 fix for Bug#38249 · 8865766a
      Davi Arnaut authored
      2722 Konstantin Osipov	2008-10-03
      Fix Bug#38249 innodb_log_arch_dir still in support files
      Remove a non-supported variable from cnf file templates.
      8865766a
    • Magnus Svensson's avatar
      Bug#42797 mtr.pl - temporary directory are deleted when child exit's · be5cc29e
      Magnus Svensson authored
      - Since we are only using the auto cleanup in one place of mtr.pl today, disable the
      autocleanup and write our own END handler that clean up the tmpdir only when the process
      that created it exits.
      be5cc29e
    • Georgi Kodinov's avatar
      cc5809f0
    • Georgi Kodinov's avatar
      merged 5.0-bugteam to a working tree · 47c53135
      Georgi Kodinov authored
      47c53135
    • Georgi Kodinov's avatar
      Bug #33813: Schema names are case-sensitive in DROP FUNCTION · 1c5fa3b6
      Georgi Kodinov authored
            
      Additional fix:
       1. Revert the unification of DROP FUNCTION
      and DROP PROCEDURE, because DROP FUNCTION can be used to
      drop UDFs (that have a non-qualified name and don't require
      database name to be present and valid).
       2. Fixed the case sensitivity problem by adding a call to 
      check_db_name() (similar to the sp_name production).
      1c5fa3b6
    • Sergey Vojtovich's avatar
      984c2489
    • V Narayanan's avatar
      Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tables · e80537b7
      V Narayanan authored
                  
      A Query in the MyISAM merge table was crashing 
      if the index merge algorithm was being used
      
      Index Merge optimization requires the reading of 
      multiple indexes at the same time. Reading multiple 
      indexes at once with current SE API means that we 
      need to have handler instance for each to-be-read 
      index. This is done by creating clones of the handlers 
      instances. The clone internally does a open of the handler.
      
      The open for a MERGE engine is handled in the following 
      phases
      
      1) open parent table
      2) generate list of underlying
         table
      3) attach underlying tables
      
      But the current implementation does only the first 
      phase (i.e.) open parent table.
      
      The current patch fixes this at the MERGE engine level, 
      by handling the clone operation within the MERGE engine 
      rather than in the storage engine API. It opens and 
      attaches the MyISAM tables on the MyISAM storage engine 
      interface directly within the MERGE engine. The new MyISAM 
      table instances, as well as the MERGE clone itself, are not 
      visible in the table cache. This is not a problem because
      all locking is handled by the original MERGE table from which
      this is cloned of.
      
      mysql-test/r/merge.result:
        updated the result file to reflect the new tests
        added to test the fix
      mysql-test/t/merge.test:
        Added new tests to verify that the index merge
        algorithm does not crash in the merge engine.
      storage/myisammrg/ha_myisammrg.cc:
        Implement the clone method, that handles
        
        1) Cloning the handler
        2) Opening underlying MYISAM child tables
        3) Copies the state of the original handler and the children
           into the cloned instances
        4) Sets the appropriate flags
      storage/myisammrg/ha_myisammrg.h:
        Added a flag that is set to indicate that the current 
        instance is cloned. Also added the prototype or the clone 
        method.
      storage/myisammrg/myrg_open.c:
        Since we do now again use myrg_open() in the server
        removed the comments marking this as deadcode.
      e80537b7
    • Sergey Vojtovich's avatar
      5103b05d
    • Sergey Vojtovich's avatar
      Merge 5.0-bugteam -> 5.1-bugteam. · e994c4f9
      Sergey Vojtovich authored
      e994c4f9
    • Georgi Kodinov's avatar
      merged bug 33813 to 5.1-bugteam · ccca4fec
      Georgi Kodinov authored
      ccca4fec
    • Sergey Vojtovich's avatar
      BUG#36737 - having + full text operator crashes mysql · 5803e106
      Sergey Vojtovich authored
            
      MATCH() function accepts column list as an argument. It was possible to override
      this requirement with aliased non-column select expression. Which results in
      server crash.
      
      With this fix aliased non-column select expressions are not accepted by MATCH()
      function, returning an error.
      
      mysql-test/r/fulltext.result:
        A test case for BUG#36737.
      mysql-test/t/fulltext.test:
        A test case for BUG#36737.
      sql/item_func.cc:
        Only accept fields as arguments to MATCH().
      5803e106
    • Georgi Kodinov's avatar
      merged bug 33813 to 5.0-bugteam · 7df0e72c
      Georgi Kodinov authored
      7df0e72c
    • Chad MILLER's avatar
      Merge from bug tree. · b8149f09
      Chad MILLER authored
      b8149f09
    • Chad MILLER's avatar
      Merge from bug tree. · 392c53b6
      Chad MILLER authored
      392c53b6
  3. 11 Feb, 2009 5 commits
  4. 10 Feb, 2009 11 commits
    • Mats Kindahl's avatar
      Merging with 5.1-bugteam · d7439092
      Mats Kindahl authored
      d7439092
    • Mats Kindahl's avatar
      Bug #36763 · 93ef74bf
      Mats Kindahl authored
      TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
      
      Correcting some tests that was failing in pushbuild as well as fixing result
      file for some tests that are not executed in the default MTR run.
      
      mysql-test/suite/binlog/t/binlog_truncate_innodb.test:
        Need to reset master to avoid the check to be for the wrong binlog file.
      mysql-test/suite/binlog/t/binlog_truncate_myisam.test:
        Need to reset master to avoid the check to be for the wrong binlog file.
      93ef74bf
    • Georgi Kodinov's avatar
      merged 5.0-bugteam to 5.1-bugteam · 50b19265
      Georgi Kodinov authored
      50b19265
    • Georgi Kodinov's avatar
      fixed a libedit compilation problem · 45681525
      Georgi Kodinov authored
      45681525
    • Mats Kindahl's avatar
      Merging with 5.1-bugteam · 9fd1d146
      Mats Kindahl authored
      9fd1d146
    • Chad MILLER's avatar
      Merge from bugteam team tree. · 52db1b81
      Chad MILLER authored
      52db1b81
    • Mats Kindahl's avatar
      BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported. · 9b612d2c
      Mats Kindahl authored
      Post-merge fixes. Changes to some result sets.
      
      mysql-test/r/commit_1innodb.result:
        TRUNCATE TABLE does not cause the binary log to do commits any more.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        TRUNCATE TABLE is not transactional, hence does not have BEGIN/COMMIT around itself.
      mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
        STOP SLAVE was replaced with include file.
      mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
        STOP SLAVE was replaced with include file.
      9b612d2c
    • Chad MILLER's avatar
      Bug#30261: "mysqld --help" no longer possible for root · d8808625
      Chad MILLER authored
      The check for root-ness would signal an error.  Errors would make the
      server exit before usage (help) information was printed.
      
      Now, test for whether we want help regardless of whether we're going
      to exit with an error.  If plugins are not initialized by the time we 
      print usage information, inform the user that some parameters are 
      missing.
      d8808625
    • Georgi Kodinov's avatar
      merged 5.0-bugteam -> 5.1-bugteam · 29f898bb
      Georgi Kodinov authored
      29f898bb
    • Georgi Kodinov's avatar
      From jperkin : Merge libedit 2.11 and related files, · fab053cc
      Georgi Kodinov authored
      based on NetBSD CVS as of 2009/02/06 20:09:00.
      fab053cc
    • Alexey Kopytov's avatar
      Fix for bug #41868: crash or memory overrun with concat + upper, · fd8bf58c
      Alexey Kopytov authored
                          date_format functions
      
      String::realloc() did not check whether the existing string data fits in
      the newly allocated buffer for cases when reallocating a String object
      with external buffer (i.e.alloced == FALSE).  This could lead to memory
      overruns in some cases.
      
      client/sql_string.cc:
        Fixed String::realloc() to check whether the existing string data fits
        in the newly allocated buffer for cases when reallocating a String
        object with external buffer.
      mysql-test/r/func_str.result:
        Added a test case for bug #41868.
      mysql-test/t/func_str.test:
        Added a test case for bug #41868.
      sql/sql_class.cc:
        After each call to Item::send() in select_send::send_data() reset
        buffer to its original state to reduce unnecessary malloc() calls. See
        comments for bug #41868 for detailed analysis.
      sql/sql_string.cc:
        Fixed String::realloc() to check whether the existing string data fits
        in the newly allocated buffer for cases when reallocating a String
        object with external buffer.
      fd8bf58c