1. 07 May, 2008 2 commits
    • unknown's avatar
      BUG#36398: 'DROP TEMPORARY TABLE' in ROLLBACK transaction causes transaction to be logged · e1a2bb92
      unknown authored
      Temporarily checking in an incorrect test case. Rationale: the impact of
      this bug is negligible (it's almost a feature request). We need 5.1 to be
      stable, and making a real fix is a bit risky. So the fix is postponed
      to 6.0.
      
      
      mysql-test/suite/rpl/r/rpl_ddl.result:
        Updated result file.
      mysql-test/suite/rpl/t/disabled.def:
        Enabling test case rpl_ddl.test
      e1a2bb92
    • unknown's avatar
      BUG#36379: please re-enable rpl_innodb_bug28430 · fcec0b01
      unknown authored
      The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
      BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
      it. The test and result file needed to be updated too.
      
      
      mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
        Updated result file.
      mysql-test/suite/rpl/t/disabled.def:
        Enabled the rpl_innodb_bug28430 test case.
      mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
        show slave status is not needed since we have select count(*)
      fcec0b01
  2. 01 Apr, 2008 6 commits
  3. 31 Mar, 2008 12 commits
  4. 30 Mar, 2008 3 commits
  5. 29 Mar, 2008 10 commits
    • unknown's avatar
      Bug #35675 reset master finds assert if a binlog file can not be deleted · 2a001d53
      unknown authored
      If a binlog file is manually replaced with a namesake directory the internal purging did
      not handle the error of deleting the file so that eventually
      a post-execution guards fires an assert.
      
      Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
      at an attempt to delete it.
      The same applied to the index file deletion.
      
      The cset carries pieces of manual merging.
      
      
      mysql-test/r/binlog_index.result:
        new results
      mysql-test/r/ctype_big5.result:
        results changed
      mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result:
        new results
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        new results
      mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
        cleanup. still todo: to let the test run multiple times w/o restarting the server (just ./mtr test)
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result:
        results changed
      mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test:
        guarding the test with statement format condition as the logics of the test requires
      sql/log.cc:
        two changes. One for the bug, other manual merge.
        The bug change needs MYF(0) to pass to my_delete because not all error out of the function
        are critical. The finer check is done on the caller of my_delete similarly how it was implemented
        for bug@18199 fixes. Non-existance of a file is not a critical error.
      sql/sql_class.cc:
        manual merge, removing extra automatically brought hunk.
      2a001d53
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam · 08acf2ed
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
      
      
      mysys/mf_keycache.c:
        null-merge
      sql/item_func.cc:
        null-merge
      sql/lock.cc:
        null-merge
      sql/sql_analyse.cc:
        null-merge
      storage/csv/ha_tina.cc:
        null-merge
      storage/myisam/mi_check.c:
        null-merge
      storage/myisam/mi_keycache.c:
        null-merge
      08acf2ed
    • unknown's avatar
      fixed warnings from the fix of 26243 · 11714e68
      unknown authored
      11714e68
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam · 96704ae4
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
      
      
      BitKeeper/deleted/.del-ha_berkeley.cc:
        null-merge
      extra/charset2html.c:
        Auto merged
      sql/mysqld.cc:
        null-merge
      sql/sql_union.cc:
        null-merge
      96704ae4
    • unknown's avatar
      8ae5aa3b
    • unknown's avatar
      Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl · 6630d2e1
      unknown authored
      into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
      
      
      BitKeeper/deleted/.del-binlog_killed_simulate.result:
        Auto merged
      BitKeeper/deleted/.del-show_binlog_events.inc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_user.result:
        Auto merged
      storage/blackhole/ha_blackhole.cc:
        Auto merged
      BitKeeper/deleted/.del-show_binary_logs.inc:
        Delete: mysql-test/include/show_binary_logs.inc
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        manual merge ul.
      mysql-test/extra/binlog_tests/blackhole.test:
        manual merge
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        manual merge
      sql/log.cc:
        manual merge
      sql/share/errmsg.txt:
        manual merge
      sql/sql_class.cc:
        manual merge
      6630d2e1
    • unknown's avatar
      Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 · cfc42097
      unknown authored
      into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      cfc42097
    • unknown's avatar
      Fixing rpl suite disabled.def: rpl_stm_extraColmaster_ndb does not exist in the suite. · fdb9d029
      unknown authored
      
      mysql-test/suite/rpl/t/disabled.def:
        removing the line because there is no such test in the suite anymore.
      fdb9d029
    • unknown's avatar
      Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam · 4795e493
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
      
      
      configure.in:
        null merge
      libmysql/libmysql.c:
        null merge
      sql/ha_ndbcluster.cc:
        null merge
      sql/ha_ndbcluster_cond.cc:
        null merge
      sql-common/client.c:
        null merge
      storage/federated/ha_federated.cc:
        null merge
      storage/heap/hp_test2.c:
        SCCS merged
      storage/innobase/handler/ha_innodb.cc:
        null merge
      storage/myisam/mi_check.c:
        null merger
      storage/myisam/mi_delete.c:
        null merge
      storage/myisam/mi_dynrec.c:
        null merge
      storage/myisam/mi_key.c:
        null merge
      storage/myisam/mi_open.c:
        null merge
      storage/myisam/mi_packrec.c:
        null merge
      storage/myisam/mi_page.c:
        null merge
      storage/myisam/mi_search.c:
        null merge
      storage/myisam/mi_statrec.c:
        null merge
      storage/myisam/mi_test1.c:
        SCCS merged
      storage/myisam/mi_test2.c:
        null merge
      storage/myisam/mi_test3.c:
        SCCS merged
      storage/myisam/mi_write.c:
        null merge
      storage/myisammrg/myrg_rkey.c:
        null merge
      storage/ndb/src/ndbapi/DictCache.cpp:
        null merge
      storage/ndb/src/ndbapi/NdbBlob.cpp:
        null merge
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        null merge
      storage/ndb/src/ndbapi/NdbOperationInt.cpp:
        null merge
      storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
        null merge
      4795e493
    • unknown's avatar
      18a01ce9
  6. 28 Mar, 2008 7 commits
    • unknown's avatar
      Merge amd64.(none):/src/bug26243/my50-bug26243 · cde93cd1
      unknown authored
      into  amd64.(none):/src/bug26243/my51-bug26243
      
      
      libmysql/libmysql.c:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisam/mi_open.c:
        Auto merged
      storage/myisammrg/ha_myisammrg.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      cde93cd1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · a9a85303
      unknown authored
      into  amd64.(none):/src/bug26243/my51-bug26243
      
      
      a9a85303
    • unknown's avatar
      Fix manual merge. · 49384c0b
      unknown authored
      49384c0b
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt · 45ffe718
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged
      
      
      mysql-test/t/loaddata.test:
        Auto merged
      mysql-test/r/loaddata.result:
        Manually merged.
      sql/share/errmsg.txt:
        Manually merged.
      sql/sql_load.cc:
        Manually merged.
      45ffe718
    • unknown's avatar
      Merge amd64.(none):/src/mysql-5.1-bugteam · d01c2687
      unknown authored
      into  amd64.(none):/src/bug26243/my51-bug26243
      
      
      d01c2687
    • unknown's avatar
      Merge amd64.(none):/src/mysql-5.0-bugteam · 396b24a5
      unknown authored
      into  amd64.(none):/src/bug26243/my50-bug26243
      
      
      396b24a5
    • unknown's avatar
      Fix tree: · 7021064a
      unknown authored
        1. Use 'dat' extension, because it is handled in Makefile.am;
        2. Fix typo: the bug id is 35469, not 35649.
      
      
      mysql-test/std_data/bug35469.dat:
        Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat
      mysql-test/r/loaddata.result:
        Update result file.
      mysql-test/t/loaddata.test:
        1. Use 'dat' extension, because it is handled in Makefile.am;
        2. Fix typo: the bug id is 35469, not 35649.
      7021064a