1. 10 Dec, 2009 1 commit
  2. 09 Dec, 2009 2 commits
  3. 08 Dec, 2009 3 commits
  4. 07 Dec, 2009 2 commits
  5. 05 Dec, 2009 1 commit
  6. 03 Dec, 2009 5 commits
  7. 02 Dec, 2009 2 commits
  8. 01 Dec, 2009 3 commits
    • Andrei Elkin's avatar
      Manual resolving for the following files · e8e85ed2
      Andrei Elkin authored
      Text conflict in mysql-test/collections/default.experimental
      Text conflict in mysql-test/r/show_check.result
      Text conflict in mysql-test/r/sp-code.result
      Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
      Text conflict in mysql-test/suite/rpl/t/disabled.def
      Text conflict in mysql-test/t/show_check.test
      Text conflict in mysys/my_delete.c
      Text conflict in sql/item.h
      Text conflict in sql/item_cmpfunc.h
      Text conflict in sql/log.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/repl_failsafe.cc
      Text conflict in sql/slave.cc
      Text conflict in sql/sql_parse.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_yacc.yy
      Text conflict in storage/myisam/ha_myisam.cc
      
      Corrected results for
       stm_auto_increment_bug33029.reject      2009-12-01
      		20:01:49.000000000 +0300
             <andrei> @@ -42,9 +42,6 @@
             <andrei>  RETURN i;
             <andrei>  END//
             <andrei>  CALL p1();
             <andrei> -Warnings:
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
             <andrei> -Note   1592    Statement may not be safe to log in statement
      		format.
      
      There should be indeed no Note present because there is in fact autoincrement 
      top-level query in sp() that triggers inserting in yet another auto-inc table.
      (todo: alert DaoGang to improve the test).
      e8e85ed2
    • Alexander Nozdrin's avatar
      A patch for Bug#48915 (After having switched off the ipv6 support in OS, · 761b9bde
      Alexander Nozdrin authored
      mysqld crashed in network_init()).
      
      The problem was that current_thd was not ready at that point in mysqld life,
      so ER() macro could not be used.
      
      The fix is to use ER_DEFAULT() macro, which is intented for such cases.
      761b9bde
    • Marc Alff's avatar
      WL#2360 Performance schema · fa3cfa07
      Marc Alff authored
      Part 1: Instrumentation interface
      fa3cfa07
  9. 30 Nov, 2009 3 commits
  10. 28 Nov, 2009 1 commit
  11. 27 Nov, 2009 4 commits
  12. 26 Nov, 2009 5 commits
  13. 25 Nov, 2009 8 commits
    • Magne Mahre's avatar
      Addition to BUG#36573 - myisampack --join does not create destination table · 3be90521
      Magne Mahre authored
                            .frm file
            
      Added FLUSH TABLES before myisampack --join operation to fix the test 
      warnings or errors
      Removed unused variable in create_dest_frm() method
      3be90521
    • Magne Mahre's avatar
      Fix for Bug#36573 myisampack --join does not create destination · 6002c1ad
      Magne Mahre authored
      table .frm file
                  
      Problem:
      ========
      Myisampack --join did not create the destination table .frm file. 
      The user had to copy one of the source table .frm file as destination .frm 
      file for mysql server to recognize. This is just 'user-friendliness' issue.
                  
      How it was solved
      =================
      After successful join and compression we copy the frm file from the first 
      source table.
                  
      Functionality added
      ===================
      myisampack --join=/path/t3 /path/t1 /path/t2 creates 
      /path/t3.frm (which is bascially copied from first table's frm /path/t1)
            
      Tests
      =====
      Modified myisampack.test to test two scenario's
      1. Positive myisampack --join test
         In this case after the join operation is done,we test if the destination 
         table is accessible from the server
      2. Positive myisampack --join test with an existing .frm file.
         We test the above case with an existing .frm file for the destination 
         table. It should return success even in this case.
      3. Positive myisampack --join test with no .frm file for source tables
         We test the join operation with no .frm files for source tables. It should
         complete the join operation without any warnings and error messages
      4. Negative myisampack --join test
         We test myisampack --join with existing .MYI,.MDI,.frm files for the 
         destination table. It should fail with exit status 2 in this case.
      6002c1ad
    • Magne Mahre's avatar
      Disable the testcase for BUG#45816 in partition.test in mysql-pe · 412c6c4b
      Magne Mahre authored
      branch due to BUG#46853
            
      Commented out the testcase for Bug#45816 in mysql-pe branch
      due to valgrind warnings. Please see Bug#46853
      412c6c4b
    • Magne Mahre's avatar
      Bug#40677 Archive tables joined on primary return no result · 4a70a6dc
      Magne Mahre authored
      Select queries on archive tables when joined on their primary keys
      returns no results(empty set)
            
      Archive storage doesn't inform the handler about the fetched record 
      status when it is found. Fixed the archive storage engine to update
      the record status when it fetches successfully
      4a70a6dc
    • Alexander Nozdrin's avatar
      Update result files. · 5c8ceee1
      Alexander Nozdrin authored
      5c8ceee1
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 4b28a6ce
      Alexander Nozdrin authored
      4b28a6ce
    • Alik's avatar
      Fix typo (s/_WIN_/__WIN__). · 68c8baa4
      Alik authored
      68c8baa4
    • Sergey Vojtovich's avatar
      Backport from 6.0-codebase. · 187958a9
      Sergey Vojtovich authored
      WL#3951 - MyISAM: Additional Error Logs for Data Corruption
      
      When table corruption is detected, in addition to current error message
      provide following information:
      - list of threads (and queries) accessing a table;
      - thread_id of a thread that detected corruption;
      - source file name and line number where this corruption was detected;
      - optional extra information (string).
      187958a9