1. 05 Sep, 2008 4 commits
    • Ramil Kalimullin's avatar
      After-merge fix. · bf2f3680
      Ramil Kalimullin authored
      bf2f3680
    • Ramil Kalimullin's avatar
      Merge · bef0ee99
      Ramil Kalimullin authored
      bef0ee99
    • Ramil Kalimullin's avatar
      Fix for bug #39021: SELECT REGEXP BINARY NULL never returns · 788be2ae
      Ramil Kalimullin authored
      Problem: SELECT ... REGEXP BINARY NULL may lead to server crash/hang.
      
      Fix: properly handle NULL regular expressions.
      
      
      mysql-test/r/func_regexp.result:
        Fix for bug #39021: SELECT REGEXP BINARY NULL never returns
          - test result.
      mysql-test/t/func_regexp.test:
        Fix for bug #39021: SELECT REGEXP BINARY NULL never returns
          - test case.
      sql/item_cmpfunc.cc:
        Fix for bug #39021: SELECT REGEXP BINARY NULL never returns
          - checking regular expressions' null_value
        we tested it without a val_xxx() call before, which is wrong.
        Now Item_func_regex::regcomp() returns -1 in the case
        and allows to handle NULL expessions properly.
      sql/item_cmpfunc.h:
        Fix for bug #39021: SELECT REGEXP BINARY NULL never returns
          - checking regular expressions' null_value
        we tested it without a val_xxx() call before, which is wrong.
        Now Item_func_regex::regcomp() returns -1 in the case
        and allows to handle NULL expessions properly.
      788be2ae
    • Ramil Kalimullin's avatar
      Merge · bcbff0b9
      Ramil Kalimullin authored
      bcbff0b9
  2. 03 Sep, 2008 8 commits
    • Mats Kindahl's avatar
      BUG#32709: Assertion failed: trx_data->empty(), file log.cc · dbbb48c3
      Mats Kindahl authored
      Incremental fixes: updating a comment and fixing a result file.
      
      sql/sql_class.h:
        Changing comment.
      dbbb48c3
    • Mats Kindahl's avatar
      Bug #32709: Assertion failed: trx_data->empty(), file log.cc · 02a43540
      Mats Kindahl authored
      The assertion indicates that some data was left in the transaction
      cache when the server was shut down, which means that a previous
      statement did not commit or rollback correctly.
      
      What happened was that a bug in the rollback of a transactional
      table caused the transaction cache to be emptied, but not reset.
      The error can be triggered by having a failing UPDATE or INSERT,
      on a transactional table, causing an implicit rollback.
      
      Fixed by always flushing the pending event to reset the state
      properly.
      
      
      mysql-test/extra/rpl_tests/rpl_row_basic.test:
        Testing that a failed update (that writes some rows to the
        transaction cache) does not cause the transaction cache to
        hold on to the data or forget to reset the transaction cache.
      sql/log.cc:
        Added call to remove pending event when the transaction cache
        is emptied instead of written to binary log. The call will also
        clear the outstanding table map count so that the cache is not
        left it in a state of "empty but not reset".
        
        Added function MYSQL_BIN_LOG::remove_pending_rows_event().
      sql/log.h:
        Added function MYSQL_BIN_LOG::remove_pending_rows_event().
      sql/sql_class.cc:
        Adding function THD::binlog_remove_pending_rows_event().
      sql/sql_class.h:
        Adding function THD::binlog_remove_pending_rows_event().
      02a43540
    • Andrei Elkin's avatar
      merging with 5.1.29. · d62f27a9
      Andrei Elkin authored
      d62f27a9
    • Ramil Kalimullin's avatar
      Fix for bug#38821: Assert table->auto_increment_field_not_null failed · f0a50bd9
      Ramil Kalimullin authored
      in open_table()
      
      Problem: repeating "CREATE... ( AUTOINCREMENT) ... SELECT" may lead to
      an assertion failure.
      
      Fix: reset table->auto_increment_field_not_null after each record 
      writing.
      
      
      mysql-test/r/create.result:
        Fix for bug#38821: Assert table->auto_increment_field_not_null failed 
        in open_table()
          - test result.
      mysql-test/t/create.test:
        Fix for bug#38821: Assert table->auto_increment_field_not_null failed 
        in open_table()
          - test case.
      sql/sql_insert.cc:
        Fix for bug#38821: Assert table->auto_increment_field_not_null failed 
        in open_table()
          - reset table->auto_increment_field_not_null after writing a record
        for "{CREATE, INSERT}..SELECT".
      f0a50bd9
    • Andrei Elkin's avatar
      Bug#36099 replicate-do-db affects replaying RBR events with mysqlbinlog · 2f8c0a16
      Andrei Elkin authored
            
      The replication filtering rules were inappropiately applied when
      executing BINLOG pseudo-query.  The rules are supposed to be active
      only at times when the slave's sql thread executes an event.
                  
      Fixed with correcting a condition to call replication rules only if
      the slave sql thread executes the event.
      
      mysql-test/suite/rpl/r/rpl_binlog_query_filter_rules.result:
        new result file
      mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules-master.opt:
        a filtering option that would refuse to replicate a row event of the main test on
        slave
      mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test:
        a regression test for the bug
      sql/log_event.cc:
        avoiding to call the filtering rules if the execution thread is not a slave.
      2f8c0a16
    • Gleb Shchepa's avatar
      merge 5.0 --> 5.1 · 5cee5b9b
      Gleb Shchepa authored
      5cee5b9b
    • Gleb Shchepa's avatar
      merge with local tree · dd1d9adb
      Gleb Shchepa authored
      dd1d9adb
    • Gleb Shchepa's avatar
      Bug #39002: The server crashes on the query: · 59b9d50c
      Gleb Shchepa authored
        INSERT .. SELECT .. ON DUPLICATE KEY UPDATE col=DEFAULT
      
      In order to get correct values from update fields that
      belongs to the SELECT part in the INSERT .. SELECT .. ON
      DUPLICATE KEY UPDATE statement, the server adds referenced
      fields to the select list. Part of the code that does this
      transformation is shared between implementations of
      the DEFAULT(col) function and the DEFAULT keyword (in
      the col=DEFAULT expression), and an implementation of
      the DEFAULT keyword is incomplete.
      
      
      mysql-test/r/default.result:
        Added test case for bug #39002.
      mysql-test/t/default.test:
        Added test case for bug #39002.
      sql/item.cc:
        The Item_default_value::transform() function has been
        modified to take into account the fact that the DEFAULT
        keyword has no arguments unlike the DEFAULT(col) function
        that always has an argument.
      59b9d50c
  3. 28 Aug, 2008 3 commits
  4. 27 Aug, 2008 11 commits
    • Gleb Shchepa's avatar
      Bug #37799: SELECT with a BIT column in WHERE clause · 54a59681
      Gleb Shchepa authored
                  returns unexpected result
      
      If:
        1. a table has a not nullable BIT column c1 with a length
           shorter than 8 bits and some additional not nullable
           columns c2 etc, and
        2. the WHERE clause is like: (c1 = constant) AND c2 ...,
      the SELECT query returns unexpected result set.
      
      
      The server stores BIT columns in a tricky way to save disk
      space: if column's bit length is not divisible by 8, the
      server places reminder bits among the null bits at the start
      of a record. The rest bytes are stored in the record itself,
      and Field::ptr points to these rest bytes.
      
      However if a bit length of the whole column is less than 8,
      there are no remaining bytes, and there is nothing to store in
      the record at its regular place. In this case Field::ptr points
      to bytes actually occupied by the next column in a record.
      If both columns (BIT and the next column) are NOT NULL,
      the Field::eq function incorrectly deduces that this is the
      same column, so query transformation/equal item elimination
      code (see build_equal_items_for_cond) may mix these columns
      and damage conditions containing references to them.
      
      
      mysql-test/r/type_bit.result:
        Added test case for bug #37799.
      mysql-test/t/type_bit.test:
        Added test case for bug #37799.
      sql/field.h:
        1. The Field::eq function has been modified to take types of
        comparing columns into account to distinguish between BIT and
        not BIT columns referencing the same bytes in a record.
        
        2. Unnecessary type comparison has been removed from the
        Field_bit::eq function (moved to Field::eq).
      54a59681
    • Mats Kindahl's avatar
      Merging 5.1 into 5.1-rpl-merge · 84b81e6c
      Mats Kindahl authored
      84b81e6c
    • Georgi Kodinov's avatar
      merged 5.1-bugteam into B37548 tree · 0b24a954
      Georgi Kodinov authored
      0b24a954
    • Georgi Kodinov's avatar
      Bug#37548: result value erronously reported being NULL in certain subqueries · cab267ec
      Georgi Kodinov authored
            
      When switching to indexed ORDER BY we must be sure to reset the index read
      flag if we are switching from a covering index to non-covering.
      
      mysql-test/r/subselect.result:
        Bug#37548: test case
      mysql-test/t/subselect.test:
        Bug#37548: test case
      sql/sql_select.cc:
        Bug#37548: update the index read flag if the index for indexed ORDER BY is not
            covering.
      cab267ec
    • Mats Kindahl's avatar
      Automerge · fc31480f
      Mats Kindahl authored
      fc31480f
    • Mats Kindahl's avatar
      Result file change. · 554203f6
      Mats Kindahl authored
      554203f6
    • Evgeny Potemkin's avatar
      Bug#38195: Incorrect handling of aggregate functions when loose index scan is · 06bf25e4
      Evgeny Potemkin authored
      used causes server crash.
            
      When the loose index scan access method is used values of aggregated functions
      are precomputed by it. Aggregation of such functions shouldn't be performed
      in this case and functions should be treated as normal ones.
      The create_tmp_table function wasn't taking this into account and this led to
      a crash if a query has MIN/MAX aggregate functions and employs temporary table
      and loose index scan.
      Now the JOIN::exec and the create_tmp_table functions treat MIN/MAX aggregate
      functions as normal ones when the loose index scan is used.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for the bug#38195.
      mysql-test/t/group_min_max.test:
        Added a test case for the bug#38195.
      sql/sql_select.cc:
        Bug#38195: Incorrect handling of aggregate functions when loose index scan is
        used causes server crash.
        The JOIN::exec and the create_tmp_table functions treat MIN/MAX aggregate
        functions as normal ones when the loose index scan is used.
      06bf25e4
    • Mats Kindahl's avatar
      Automerge · f295ea2f
      Mats Kindahl authored
      f295ea2f
    • Mats Kindahl's avatar
      2d62bacf
    • Mats Kindahl's avatar
      Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary · 02034091
      Mats Kindahl authored
                  tables open
      
      When executing a DROP DATABASE statement in ROW mode and having temporary
      tables open at the same time, the existance of temporary tables prevent
      the server from switching back to row mode after temporarily switching to
      statement mode to handle the logging of the statement.
      
      Fixed the problem by removing the code to switch to statement mode and added
      code to temporarily disable the binary log while dropping the objects in the
      database.
      
      
      mysql-test/extra/binlog_tests/database.test:
        Added test to ensure that DROP DATABASE does not affect the replication mode.
      sql/sql_db.cc:
        Removed code that clears the current_stmt_binlog_row_based flag.
        Added code to disable the binary log while dropping the objects
        in a database.
      02034091
    • Davi Arnaut's avatar
      Merge of mysql-5.1 branch. · 33338db8
      Davi Arnaut authored
      33338db8
  5. 26 Aug, 2008 14 commits