1. 03 Oct, 2008 9 commits
    • Mattias Jonsson's avatar
      Bug#37719: Crash if rename Archive table to same name with different · 8c996f02
      Mattias Jonsson authored
      case and then select
      
      Problem was that the archive share was using a case insensitive
      charset when comparing table names
      
      Solution was to use a case sensitive char set when the table
      names are case sensitive
      
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result:
        Bug#37719: Crash if rename Archive table to same name with different
        case and then select
        
        Updated to correct result.
      storage/archive/ha_archive.cc:
        Bug#37719: Crash if rename Archive table to same name with different
        case and then select
        
        system_charset_info is case insensitive, table_alias_charset depends
        on the filesystem/lower_case_table_names variable.
        
        since there could be two tables that used the same share, unpredicted
        things could happen.
      8c996f02
    • Mattias Jonsson's avatar
      merge · 803555c1
      Mattias Jonsson authored
      803555c1
    • Mats Kindahl's avatar
      Merging with 5.1-5.1.29-rc. · f5f68f19
      Mats Kindahl authored
      f5f68f19
    • Mats Kindahl's avatar
      The test rpl_blackhole was executed even when · 80a3a529
      Mats Kindahl authored
      there were no blackhole installed. This patch
      adds a check for that.
      
      mysql-test/suite/rpl/t/rpl_blackhole.test:
        Adding include of have_blackhole.
      80a3a529
    • Georgi Kodinov's avatar
      Bug #38370: The test ndb.ndb_index_ordered fails with the community features on · 3adfa465
      Georgi Kodinov authored
      The problem was caused by a wrong merge. Fixed by enabling the correct ndb variables
      initialization.
      
      mysql-test/suite/ndb/t/disabled.def:
        Bug #38370: remove disabled test case
      sql/mysqld.cc:
        Bug #38370: corrected a wrong merge to have all the NDB variables intiialized
        correctly
      3adfa465
    • Georgi Kodinov's avatar
      merged 5.1.29-rc · 2bb97ce2
      Georgi Kodinov authored
      2bb97ce2
    • Mattias Jonsson's avatar
      post push fix for bug#38804 (back port of bug#33479) · 929fd6aa
      Mattias Jonsson authored
      Removes the regression bug#38751.
      
      sql/ha_partition.cc:
        post push fix for bug#38804 (back port of bug#33479)
        Removes the regression bug#38751.
        
        archive relies on a ha_archive::info call to flush data before
        the copy takes place in alter table.
        
        This ensures that all partitions gets a info call, without having
        to always forward info(HA_STATUS_AUTO) to all partitions.
      929fd6aa
    • Georgi Kodinov's avatar
      merged 5.1-5.1.29-rc · 7b7ce569
      Georgi Kodinov authored
      7b7ce569
    • Mats Kindahl's avatar
      Merging with 5.1-5.1.29-rc. · 8a55f64a
      Mats Kindahl authored
      8a55f64a
  2. 02 Oct, 2008 6 commits
    • Mats Kindahl's avatar
      Bug #38360: BLACKHOLE replication with RBR is broken · 14c8ffae
      Mats Kindahl authored
      Incremental patch to add comments to test cases.
      14c8ffae
    • Georgi Kodinov's avatar
      Bug #37348: Crash in or immediately after JOIN::make_sum_func_list · 47f405f5
      Georgi Kodinov authored
            
      The optimizer pulls up aggregate functions which should be aggregated in
      an outer select. At some point it may substitute such a function for a field
      in the temporary table. The setup_copy_fields function doesn't take this
      into account and may overrun the copy_field buffer.
            
      Fixed by filtering out the fields referenced through the specialized
      reference for aggregates (Item_aggregate_ref).
      Added an assertion to make sure bugs that cause similar discrepancy 
      don't go undetected.
      
      mysql-test/r/func_group.result:
        Bug #37348: test case
      mysql-test/t/func_group.test:
        Bug #37348: test case
      sql/item.cc:
        Bug #37348: Added a way to distinguish Item_aggregate_ref from the other types of refs
      sql/item.h:
        Bug #37348: Added a way to distinguish Item_aggregate_ref from the other types of refs
      sql/sql_select.cc:
        Bug #37348: 
         - Don't consider copying field references
            seen through Item_aggregate_ref
         - check for discrepancies between the number of expected 
           fields that need copying and the actual fields copied.
      47f405f5
    • Mats Kindahl's avatar
      Bug #38360: BLACKHOLE replication with RBR is broken · a5429f3e
      Mats Kindahl authored
      The Blackhole engine did not support row-based replication
      since the delete_row(), update_row(), and the index and range
      searching functions were not implemented.
      
      This patch adds row-based replication support for the
      Blackhole engine by implementing the two functions mentioned
      above, and making the engine pretend that it has found the
      correct row to delete or update when executed from the slave
      SQL thread by implementing index and range searching functions.
      
      It is necessary to only pretend this for the SQL thread, since
      a SELECT executed on the Blackhole engine will otherwise never
      return EOF, causing a livelock.
      
      
      mysql-test/extra/binlog_tests/blackhole.test:
        Blackhole now handles row-based replication.
      mysql-test/extra/rpl_tests/rpl_blackhole.test:
        Test helper file for testing that blackhole actually
        writes something to the binary log on the slave.
      mysql-test/suite/binlog/t/binlog_multi_engine.test:
        Replication now handles row-based replcation.
      mysql-test/suite/rpl/t/rpl_blackhole.test:
        Test that Blackhole works with primary key, index, or none.
      sql/log_event.cc:
        Correcting code to only touch filler bits and leave
        all other bits alone. It is necessary since there is
        no guarantee that the engine will be able to fill in
        the bits correctly (e.g., the blackhole engine).
      storage/blackhole/ha_blackhole.cc:
        Adding definitions for update_row() and delete_row() to return OK
        when executed from the slave SQL thread with thd->query == NULL
        (indicating that row-based replication events are being processed).
        
        Changing rnd_next(), index_read(), index_read_idx(), and
        index_read_last() to return OK when executed from the slave SQL
        thread (faking that the row has been found so that processing
        proceeds to update/delete the row).
      storage/blackhole/ha_blackhole.h:
        Enabling row capabilities for engine.
        Defining write_row(), update_row(), and delete_row().
        Making write_row() private (as it should be).
      a5429f3e
    • Andrei Elkin's avatar
      2da503fb
    • Andrei Elkin's avatar
      Bug #36968 rpl_temporary_errors.test produces warning in pushbuild · b07c9540
      Andrei Elkin authored
      backporting a part of the bug patch to 5.1.29 tree which uses an older version of mtr.
      
      mysql-test/lib/mtr_report.pl:
        refining a suppression rule.
      b07c9540
    • Ramil Kalimullin's avatar
      Merge · 7fd877ea
      Ramil Kalimullin authored
      7fd877ea
  3. 01 Oct, 2008 16 commits
  4. 30 Sep, 2008 9 commits
    • Davi Arnaut's avatar
      Merge from main branch. · 90acf5e2
      Davi Arnaut authored
      90acf5e2
    • Davi Arnaut's avatar
      Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmalloc · 63fada64
      Davi Arnaut authored
      Link with mtmalloc on Solaris as it is done in our release builds.
      Replace deprecated flag with the newer option as already done in
      other scripts.
      
      BUILD/compile-solaris-amd64-forte:
        Link to mtmalloc and replace deprecated flag.
      BUILD/compile-solaris-amd64-forte-debug:
        Replace deprecated flag.
      BUILD/compile-solaris-sparc:
        Link to mtmalloc.
      BUILD/compile-solaris-sparc-forte:
        Link to mtmalloc
      63fada64
    • Patrick Crews's avatar
      automerge · d662efe9
      Patrick Crews authored
      d662efe9
    • Patrick Crews's avatar
      Merge 5.0 -> 5.1 · 05cef245
      Patrick Crews authored
      05cef245
    • Patrick Crews's avatar
      Automerge · e217dd78
      Patrick Crews authored
      e217dd78
    • Davi Arnaut's avatar
      Bug#34306: Can't make copy of log tables when server binary log is enabled · 7ca8a7fb
      Davi Arnaut authored
      Post-merge bug fix: lock_type is a enumeration type and not a bit mask.
      
      sql/sql_cache.cc:
        Check for lock type explicitly. Also err on the safe side and
        invalidate the query cache for any write lock.
      7ca8a7fb
    • Gleb Shchepa's avatar
      manual merge 5.0-bugteam --> 5.1-bugteam · 98e81c01
      Gleb Shchepa authored
      98e81c01
    • Gleb Shchepa's avatar
      Fixed bug #17823: 'arc' directories inside database directories. · 18876585
      Gleb Shchepa authored
      Server created "arc" directories inside database directories and
      maintained there useless copies of .frm files.
      
      Creation and renaming procedures of those copies as well as
      creation of "arc" directories has been discontinued.
      Removal procedure has been kept untouched to be able to
      cleanup existent database directories by the DROP DATABASE
      query. Also view renaming procedure has been updated to remove
      these directories.
      
      
      sql/parse_file.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        View/table creation and renaming procedures maintained
        backup copies of .frm files. Those copies are unused yet,
        so this feature was incomplete and unnecessary.
        
        1. Unwanted code has been hidden by FRM_ARCHIVE ifdefs
        (the FRM_ARCHIVE macro is not defined).
        
        2. Renaming procedure has been modified to remove obsolete
        "arc" directories.
      sql/parse_file.h:
        Fixed bug #17823: 'arc' directories inside database directories.
        The "thd" parameter has been added to the rename_in_schema_file()
        function.
      sql/sql_db.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Scope of the mysql_rm_arc_files() function has been changed to
        global for use from the parse_file.cc file.
      sql/sql_view.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Added the "thd" argument to rename_in_schema_file() calls.
      18876585
    • Alexey Botchkov's avatar
      merging · 1f970c8b
      Alexey Botchkov authored
      1f970c8b