1. 05 Sep, 2008 4 commits
  2. 29 Aug, 2008 3 commits
  3. 27 Aug, 2008 1 commit
  4. 25 Aug, 2008 2 commits
  5. 22 Aug, 2008 1 commit
    • Mats Kindahl's avatar
      Fixning compiler warnings. Fixing build failure for valgrind platform. · d2371154
      Mats Kindahl authored
      
      include/my_global.h:
        Moving YESNO() macro here from log.cc (it prints either "yes" or "no" depending on a boolean value).
      sql/log.cc:
        Moving YESNO() function to my_global.h.
      sql/sql_class.cc:
        Adding default case to printout function to avoid warning.
        Only defining function for debug builds since it isn't used 
        in non-debug build (hence produce a warning).
      sql/sql_class.h:
        Printing yes/no answer instead of memory address since the
        case produces an error/warning on valgrind platform.
      d2371154
  6. 20 Aug, 2008 2 commits
    • Mats Kindahl's avatar
      Merging with 5.1-rpl. · b277ed34
      Mats Kindahl authored
      b277ed34
    • Mats Kindahl's avatar
      Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary tables open · 8805fda0
      Mats Kindahl authored
      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.
      mysql-test/suite/binlog/r/binlog_database.result:
        Result file change.
      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.
      8805fda0
  7. 19 Aug, 2008 2 commits
    • Mats Kindahl's avatar
      Merging with 5.1-rpl · 6dd9048c
      Mats Kindahl authored
      6dd9048c
    • Mats Kindahl's avatar
      Bug #34707: Row based replication: slave creates table within wrong database · 2bcec934
      Mats Kindahl authored
      The failure was caused by executing a CREATE-SELECT statement that creates a
      table in another database than the current one. In row-based logging, the
      CREATE statement was written to the binary log without the database, hence
      creating the table in the wrong database, causing the following inserts to
      fail since the table didn't exist in the given database.
      
      Fixed the bug by adding a parameter to store_create_info() that will make
      the function print the database name before the table name and used that
      in the calls that write the CREATE statement to the binary log. The database
      name is only printed if it is different than the currently selected database.
      
      The output of SHOW CREATE TABLE has not changed and is still printed without
      the database name.
      
      mysql-test/suite/rpl/r/rpl_row_create_table.result:
        Result file change.
      mysql-test/suite/rpl/t/rpl_row_create_table.test:
        Added test to check that CREATE-SELECT into another database than the
        current one replicates.
      sql/sql_insert.cc:
        Adding parameter to calls to store_create_info().
      sql/sql_show.cc:
        Adding parameter to calls to store_create_info().
        
        Extending store_create_info() with parameter 'show_database' that will cause
        the database to be written before the table name.
      sql/sql_show.h:
        Adding parameter to call to store_create_info() to tell if the database should be shown or not.
      sql/sql_table.cc:
        Adding parameter to calls to store_create_info().
      2bcec934
  8. 15 Aug, 2008 1 commit
    • He Zhenxing's avatar
      post fixes after merge · 429b8954
      He Zhenxing authored
      mysql-test/suite/binlog/r/binlog_killed_simulate.result:
        update result
      mysql-test/suite/rpl/r/rpl_stm_log.result:
        update result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
        correct a typo
      429b8954
  9. 14 Aug, 2008 6 commits
  10. 13 Aug, 2008 5 commits
  11. 12 Aug, 2008 4 commits
  12. 11 Aug, 2008 9 commits
    • Davi Arnaut's avatar
      Bug#38486: Crash when using cursor protocol · 7d67dda7
      Davi Arnaut authored
      Post-merge fix: mysql_client_test.c is compiled by C compilers
      and some C compilers don't support mixed declarations and code
      and it's explicitly forbidden by ISO C90.
      
      tests/mysql_client_test.c:
        Don't mix declarations and code.
      7d67dda7
    • Marc Alff's avatar
      Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam · 52fa3fdd
      Marc Alff authored
      Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
      52fa3fdd
    • Marc Alff's avatar
      Merge mysql-5.0-bugteam -> local bugfix branch · 00f22e76
      Marc Alff authored
      00f22e76
    • Marc Alff's avatar
      Bug#37302 (missing DBUG_RETURN macro in function "find_key_block" (5.0 only)) · 1eec5ca1
      Marc Alff authored
      Fixed missing DBUG_RETURN in the function find_key_block
      1eec5ca1
    • Chad MILLER's avatar
      Merge from bugteam 5.0 trunk. · ed644f3a
      Chad MILLER authored
      ed644f3a
    • Marc Alff's avatar
      Bug#38296 (low memory crash with many conditions in a query) · 5d265802
      Marc Alff authored
      This fix is for 5.0 only : back porting the 6.0 patch manually
      
      The parser code in sql/sql_yacc.yy needs to be more robust to out of
      memory conditions, so that when parsing a query fails due to OOM,
      the thread gracefully returns an error.
      
      Before this fix, a new/alloc returning NULL could:
      - cause a crash, if dereferencing the NULL pointer,
      - produce a corrupted parsed tree, containing NULL nodes,
      - alter the semantic of a query, by silently dropping token values or nodes
      
      With this fix:
      - C++ constructors are *not* executed with a NULL "this" pointer
      when operator new fails.
      This is achieved by declaring "operator new" with a "throw ()" clause,
      so that a failed new gracefully returns NULL on OOM conditions.
      
      - calls to new/alloc are tested for a NULL result,
      
      - The thread diagnostic area is set to an error status when OOM occurs.
      This ensures that a request failing in the server properly returns an
      ER_OUT_OF_RESOURCES error to the client.
      
      - OOM conditions cause the parser to stop immediately (MYSQL_YYABORT).
      This prevents causing further crashes when using a partially built parsed
      tree in further rules in the parser.
      
      No test scripts are provided, since automating OOM failures is not
      instrumented in the server.
      Tested under the debugger, to verify that an error in alloc_root cause the
      thread to returns gracefully all the way to the client application, with
      an ER_OUT_OF_RESOURCES error.
      5d265802
    • Chad MILLER's avatar
      null-merge of backported changes. · d8e44f24
      Chad MILLER authored
      d8e44f24
    • Chad MILLER's avatar
      c1cadb10
    • Davi Arnaut's avatar
      Post-merge fix: Remove Remove unused variable. · b65b1ca3
      Davi Arnaut authored
      client/mysql_upgrade.c:
        Remove Remove unused variable.
      b65b1ca3