1. 13 Feb, 2008 8 commits
    • unknown's avatar
      correct merge error · 24fdba78
      unknown authored
      24fdba78
    • unknown's avatar
      correct manual merge · 9ab7ecc4
      unknown authored
      9ab7ecc4
    • unknown's avatar
      Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge · b9445e23
      unknown authored
      into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      b9445e23
    • unknown's avatar
      correction of merge · 2c957837
      unknown authored
      2c957837
    • unknown's avatar
      Removing non-deterministic tests from events_scheduling test. · 0f19e844
      unknown authored
      
      mysql-test/r/events_scheduling.result:
        Result change.
      mysql-test/t/events_scheduling.test:
        Removing a test that only confirms that event scheduling is
        inexact, hence causing sporadic failures on loaded machines.
      0f19e844
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge · f343addf
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      f343addf
    • unknown's avatar
      The test rpl_row_charset and it dependent rpl_ndb_charset is · 4a7d3293
      unknown authored
      irrelevant to execute since the charset information does not
      affect replication for row-based replication. The row-based
      versions of the tests were removed, and the statement-based
      version of the test was made executable by all three modes.
      
      This involves removing any lines that causes the test to be
      dependent on the contents of the binary log, and instead we
      just check that the replication works as it should.
      
      
      BitKeeper/deleted/.del-rpl_ndb_charset.test:
        Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
      BitKeeper/deleted/.del-rpl_ndb_charset.result:
        Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
      BitKeeper/deleted/.del-rpl_row_charset.test:
        Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
      BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
      BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
      BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
      BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
        Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
      BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
        Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
      BitKeeper/deleted/.del-rpl_row_charset.result:
        Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
      mysql-test/extra/rpl_tests/rpl_charset.test:
        Test is not dependent on binlog format any more.
        Using --echo instead of "select" to print text.
        Removing lines causing the test to be dependent on binlog contents.
      mysql-test/suite/rpl/r/rpl_charset.result:
        Result change.
      mysql-test/suite/rpl/t/rpl_charset.test:
        Using renamed version of test file.
      4a7d3293
    • unknown's avatar
      Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge · 62ed949d
      unknown authored
      into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      62ed949d
  2. 12 Feb, 2008 5 commits
  3. 11 Feb, 2008 14 commits
  4. 10 Feb, 2008 1 commit
  5. 09 Feb, 2008 5 commits
  6. 08 Feb, 2008 7 commits
    • unknown's avatar
      BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination · 5db7ee3e
      unknown authored
      Problem: mysqlbinlog does not free memory if an error happens.
      Fix: binlog-processing functions do not call exit() anymore. Instead, they
      print an error and return an error code. Error codes are propagated all
      the way back to main, and all allocated memory is freed on the way.
      
      
      client/mysqlbinlog.cc:
        - New error handling policy: functions processing binlogs don't just
          exit() anymore. Instead, they print a message and return an error
          status.
        - New policy for the global `mysql' and `glob_description_event': these
          are not passed as parameters anymore. The global pointer is used
          instead.
        - More error situations are detected and reported.
        - Better error messages: the program never terminates with exit status 1
          without explanation any more. Fixed spelling errors. Use consistent
          format of messages (a single line beginning with "ERROR: " or
          "WARNING: " and ending with "." is printed to stderr.)
        - New memory handling: memory is always freed on program termination.
        - Better comments: more functions are explained, doxygen is used, and
          more precise formulations in some existing comments.
      mysql-test/suite/binlog/r/binlog_base64_flag.result:
        Result file updated since output format of mysqlbinlog changed while the
        test was disabled.
      mysql-test/suite/binlog/t/binlog_killed.test:
        Mysqlbinlog now works as described when the binlog is open. Hence, the
        --force-if-open flag must be passed
      mysql-test/suite/binlog/t/binlog_killed_simulate.test:
        Mysqlbinlog now works as described when the binlog is open. Hence, the
        --force-if-open flag must be passed
      mysql-test/suite/binlog/t/disabled.def:
        Now that mysqlbinlog cleans up after itself on abnormal termination, we
        can enable this test again.
      5db7ee3e
    • unknown's avatar
      Bug#34424: query_cache_debug.test leads to valgrind warnings · 1e2a9caf
      unknown authored
      Disable the test case.
      
      
      mysql-test/t/disabled.def:
        Disable query_cache_debug.test.
      1e2a9caf
    • unknown's avatar
      Fix create.test: use latin1 instead ucs2. · d84f322a
      unknown authored
      d84f322a
    • unknown's avatar
      Fix -ansi -pedantic compilation error · 13e44e30
      unknown authored
      13e44e30
    • unknown's avatar
      Merge dipika.(none):/opt/local/work/mysql-5.0-runtime · cb603541
      unknown authored
      into  dipika.(none):/opt/local/work/mysql-5.1-runtime
      
      
      configure.in:
        Manual merge.
      cb603541
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 81ac684b
      unknown authored
      into  dipika.(none):/opt/local/work/mysql-5.1-runtime
      
      
      include/my_sys.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      81ac684b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 65c7d300
      unknown authored
      into  dipika.(none):/opt/local/work/mysql-5.0-runtime
      
      
      65c7d300