1. 25 Jan, 2011 3 commits
  2. 24 Jan, 2011 2 commits
  3. 21 Jan, 2011 2 commits
  4. 20 Jan, 2011 1 commit
  5. 19 Jan, 2011 7 commits
  6. 18 Jan, 2011 17 commits
    • Libing Song's avatar
      Automerge · 921dcabe
      Libing Song authored
      921dcabe
    • Anitha Gopi's avatar
      automerge · 72a109bf
      Anitha Gopi authored
      72a109bf
    • Anitha Gopi's avatar
    • Libing Song's avatar
      Manual merge · 2d0fcc1d
      Libing Song authored
      2d0fcc1d
    • Libing Song's avatar
      Bug#58546 test rpl_packet timeout failure sporadically on PB · 5d75729c
      Libing Song authored
                  
      rpl_packet got a timeout failure sporadically on PB when stopping
      slave. The real reason of this bug is that STOP SLAVE stopped
      IO thread first and then stopped SQL thread. It was
      possible that IO thread stopped after replicating part of a
      transaction which SQL thread was executing. SQL thread would
      be hung if the transaction could not be rolled back safely.
                  
      After this patch, STOP SLAVE will stop SQL thread first and then stop IO
      thread, which guarantees that IO thread will fetch the reset of the
      events of the transaction that SQL thread is executing, so that SQL
      thread can finish the transaction if it cannot be rolled back safely.
                  
      Added below auxiliary files to make the test code neater.
      restart_slave_sql.inc
      rpl_connection_master.inc
      rpl_connection_slave.inc
      rpl_connection_slave1.inc
      5d75729c
    • John H. Embretsen's avatar
      Post push test fix for show_check.test. · 634b1025
      John H. Embretsen authored
      Fix for bug#45740 introduced test case using SHOW TABLE STATUS against a Memory table using latin1 character in table name.
      The test failed on Windows and FreeBSD due to a difference in the value for Avg_row_length.
      The average row length normally depends on the values for data length and row count. According to the 5.5 manual data length is approximate with Memory tables.
      With MyISAM and InnoDB the Avg_row_length is the same on Windows and Solaris.
      The solution implemented by this patch is to mask out the value for Avg_row_length, as it may vary when using Memory tables.
      634b1025
    • Bjorn Munch's avatar
      upmerge undo of 59063 · 8379f01b
      Bjorn Munch authored
      8379f01b
    • Bjorn Munch's avatar
      Bug #59063 rpl_migration_crash_safe fails on Windows · 9c7abc25
      Bjorn Munch authored
      Undoing the patch, it complicates the code but is not the solution
      
      I do not beleive newline mismatch could be the cause of this failure
      First, I cannot see how this could be a problem, mtr ignores the newline
        when reading the expect file, and the file is written and read on Windows.
      Second, if this really was the problem it should have been deterministic:
        either the newline is correctly interepreted or it is not.
      9c7abc25
    • Bjorn Munch's avatar
      oops forgot one file in last commit · 813af29b
      Bjorn Munch authored
      813af29b
    • Bjorn Munch's avatar
      Some more copyright fixes in mtr · 9093399b
      Bjorn Munch authored
      9093399b
    • Bjorn Munch's avatar
      Some more copyright fixes in mtr · 89aa03ae
      Bjorn Munch authored
      89aa03ae
    • Bjorn Munch's avatar
      Fixed copyright headers in mtr src files · 7b9c4380
      Bjorn Munch authored
      7b9c4380
    • Bjorn Munch's avatar
      Fixed copyright headers in mtr src files · 097445eb
      Bjorn Munch authored
      097445eb
    • Alexander Barkov's avatar
      Merging from 5.1. · 8a576b83
      Alexander Barkov authored
      8a576b83
    • Alexander Barkov's avatar
      Bug#44332 my_xml_scan reads behind the end of buffer · cf0e22fe
      Alexander Barkov authored
      Problem: the scanner function tested for strings "<![CDATA[" and
      "-->" without checking input string boundaries, which led to valgrind's
      "Conditional jump or move depends on uninitialised value(s)" error.
      
      Fix: Adding boundary checking.
      
        @ mysql-test/r/xml.result
        @ mysql-test/t/xml.test
        Adding test
      
        @ strings/xml.c
        Adding a helper function my_xml_parser_prefix_cmp(),
        with input string boundary check.
      cf0e22fe
    • Vinay Fisrekar's avatar
      Merge from mysql-5.1 for · 3712d6c1
      Vinay Fisrekar authored
      sys_vars.innodb_max_dirty_pages_pct_func fails sporadically
            
      3712d6c1
    • Vinay Fisrekar's avatar
      · f25ab9fe
      Vinay Fisrekar authored
      BUG#58858 : sys_vars.innodb_max_dirty_pages_pct_func fails sporadically
      
      Committing After latest merge.      
      Modified check_pct procedure to check return value of wait condition instead 
      of calling "dirty_pct".
         
      Adding Review comments:
      1) Added comment for success variable value
      2) Procedure check_pct changed For Adding BOOLEAN input and SELECT QUERY Change
      f25ab9fe
  7. 17 Jan, 2011 8 commits
    • Luis Soares's avatar
      BUG#42879: CHANGE MASTER RELAY_LOG_FILE=path fails on windows · f6e9720f
      Luis Soares authored
      Re-enabling the test case on windows since BUG#12190 has fixed
      the issue.
      f6e9720f
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · d30ba619
      Magnus Blåudd authored
        - Support for graceful shutdown of cluster by using "ndb_mgm -e 'shutdown'"
      d30ba619
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · abed4d16
      Magnus Blåudd authored
       - Make it possible to use MTR_MAXNDB to set the upper limit of number of
        parallel ndb test to run.
       - Very useful on machines with many cores and lots of RAM
      abed4d16
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · 93486750
      Magnus Blåudd authored
       -  Find ndbmtd and use it round robin
      93486750
    • Alexander Barkov's avatar
      Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string function · 18e4f23a
      Alexander Barkov authored
      Introduced by the fix for bug#44766.
      
      Problem: it's not correct to use args[0]->str_value as a buffer,
      because args[0] may need this buffer for its own purposes.
      
      Fix: adding a new class member tmp_value to use as return value.
      
        @ mysql-test/r/ctype_many.result
        @ mysql-test/t/ctype_many.test
        Adding tests
      
        @ sql/item_strfunc.cc
        Changing code into traditional style:
        use "str" as a buffer for the argument and tmp_value for the result value.
      
        @ sql/item_strfunc.h
        Adding tmp_value
      18e4f23a
    • Bjorn Munch's avatar
      null upmerge · 2d3b1b7f
      Bjorn Munch authored
      2d3b1b7f
    • Bjorn Munch's avatar
      merge from 5.5 main · 15661ae0
      Bjorn Munch authored
      15661ae0
    • Alexander Barkov's avatar
      Bug#59149 valgrind warnings with "like .. escape .." function · 1c9515f6
      Alexander Barkov authored
            
      Problem: when processing a query like:
        SELECT '' LIKE '1' ESCAPE COUNT(1);
      escape_item->val_str() was never executed and the "escape" class member
      stayed initialized, which led to valgrind uninitialized memory error.
            
      Note, a query with some tables in "FROM" clause
      returns ER_WRONG_ARGUMENTS in the same situation:
      
         SELECT '' LIKE '1' ESCAPE COUNT(1) FROM t1;
         ERROR 1210 (HY000): Incorrect arguments to ESCAPE
      
      Fix: disallowing using aggregate functions in ESCAPE clause,
      even if there are no tables used. There is no much use of that anyway.
      1c9515f6