1. 08 May, 2006 11 commits
  2. 06 May, 2006 3 commits
  3. 05 May, 2006 10 commits
    • unknown's avatar
      Bug #19492 --binlog-do-db option cuases tables create issues for ndb master · 6dd4a381
      unknown authored
      - ndb system tables not created because of filter, moved chack of filter
      
      6dd4a381
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 637a4c8b
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      637a4c8b
    • unknown's avatar
      Don't use row level logging on optimize or repair table. · 78fcb9a8
      unknown authored
      (Fixes core dump in rpl_failed_optimize.test)
      Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      
      
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
        Added extra test + drop of table at end of test
      mysql-test/lib/mtr_report.pl:
        Fail if mysqld asserts or prints stack
      mysql-test/mysql-test-run.sh:
        Fail if mysqld asserts or prints stack
      mysql-test/r/exampledb.result:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/r/innodb.result:
        Extra test to see that we can do an optimize table on an active transaction
      mysql-test/r/rpl_failed_optimize.result:
        Added extra test + drop of table at end of test
      mysql-test/t/exampledb.test:
        Cleanup of events_tests (as this caused a lot of problems if it didn't work)
      mysql-test/t/innodb.test:
        Extra test to see that we can do an optimize table on an active transaction
      sql/handler.cc:
        Don't use row level logging on optimize or repair table.
      sql/log.cc:
        Simplify code (no logic changes)
      sql/mysql_priv.h:
        Added prototype
      sql/sql_base.cc:
        Better name for define
      sql/sql_class.cc:
        Indentation fix
      sql/sql_parse.cc:
        Make end_active_trans() global
      sql/sql_table.cc:
        Ensure we end active transcations if we do an admin command (like optimize, repair etc)
      78fcb9a8
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fb76d1c1
      unknown authored
      into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
      
      fb76d1c1
    • unknown's avatar
      do not install ndb slave if no slaves · 776d8d01
      unknown authored
          fixed memleak in ndbcluster_end
      
      
      mysql-test/mysql-test-run.pl:
        do not install ndb slave if no slaves
      sql/ha_ndbcluster.cc:
        fixed memleak in ndbcluster_end
      776d8d01
    • unknown's avatar
      Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed... · 42d986f7
      unknown authored
      Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started
      
      
      42d986f7
    • unknown's avatar
      Fixed wrong merge · 23c0e79c
      unknown authored
      23c0e79c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · fc57480f
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge
      fc57480f
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · 1beda216
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-bug10405
      
      1beda216
    • unknown's avatar
      After merge fix · 1aeffdca
      unknown authored
      1aeffdca
  4. 04 May, 2006 16 commits
    • unknown's avatar
      ndb: fix compile error · 0f5b7a71
      unknown authored
      0f5b7a71
    • unknown's avatar
      ndb: added missing ifdef · 479c0346
      unknown authored
      479c0346
    • unknown's avatar
      ndb disabled test case against verified bug · d70bca0d
      unknown authored
      d70bca0d
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d6c661c9
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      d6c661c9
    • unknown's avatar
      auto-include plug.in, remove the need for plugins to modify configure.in · 15682bcf
      unknown authored
      
      configure.in:
        plug.in examples
      15682bcf
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0d117501
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      0d117501
    • unknown's avatar
      After merge fix · d4e3bb0a
      unknown authored
      d4e3bb0a
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-5.0 · 5e776e6d
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_lex.cc:
        manual merge
      5e776e6d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 99450870
      unknown authored
      into  mysql.com:/home/my/mysql-5.1
      
      
      sql/mysqld.cc:
        Auto merged
      99450870
    • unknown's avatar
      Fixed wrong free in sql_view.cc · 44fd366d
      unknown authored
      mysql-test-run now fails in case of warnings
      
      
      mysql-test/lib/mtr_report.pl:
        Fail if find warnings
      mysql-test/mysql-test-run.sh:
        Fail if find warnings
      sql/sql_lex.cc:
        Initalize st_lex properly
      sql/sql_view.cc:
        Fixed problem with unaligned memory (wrong free)
      44fd366d
    • unknown's avatar
      Merge jonas@perch:/home/jonas/src/51-work · 7a677c49
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      7a677c49
    • unknown's avatar
      772cec1e
    • unknown's avatar
      Bug#19536 · 0d47bfd0
      unknown authored
        "NDB replication fails when no explicit--binlog-format given"
        fix initialization, storage engine initialization must occur after
        logging type is configured
      
      
      sql/mysqld.cc:
        Bug#19536
          fix initialization, storage engine initialization must occur after
          logging type is configured
      0d47bfd0
    • unknown's avatar
      Fixed compiler warnings · 5eb37339
      unknown authored
      Move plugin declarations after system functions have been checked
      (Fixes problem with ndb_config failing becasue SHM is not declared)
      Fixed some memory leaks
      
      
      configure.in:
        Move plugin declarations after system functions have been checked
        (Fixes problem with ndb_config failing becasue SHM is not declared)
      mysql-test/t/disabled.def:
        Disabled ndb_load, as it is in 5.0
        (Fails randomly in binlog_close_connection())
      mysql-test/t/log_tables.test:
        Update error numbers
      mysql-test/t/ndb_config.test:
        Moved test depending on SHM to ndb_config2.test
      mysql-test/t/ndb_partition_error.test:
        Update error numbers
      sql/event_timed.cc:
        Removed not needed line
      sql/ha_berkeley.cc:
        Fixed compiler warning
      sql/ha_heap.cc:
        Fixed compiler warning
      sql/ha_innodb.cc:
        Fixed compiler warning
      sql/ha_myisam.cc:
        Fixed compiler warning
      sql/ha_myisammrg.cc:
        Fixed compiler warning
      sql/ha_ndbcluster.cc:
        Fixed compiler warning
      sql/ha_partition.cc:
        Fixed compiler warning
      sql/mysql_priv.h:
        After merge fix
      sql/mysqld.cc:
        Fixed memory leak in skip_grant.test
      sql/share/errmsg.txt:
        Removed wrong error messages
      sql/sql_lex.cc:
        More debugging
        Faster lex_end()
      sql/sql_partition.cc:
        Fixed memory leak
      sql/sql_view.cc:
        Fixed memory leak
      mysql-test/r/ndb_config2.result:
        New BitKeeper file ``mysql-test/r/ndb_config2.result''
      mysql-test/t/ndb_config2.test:
        New BitKeeper file ``mysql-test/t/ndb_config2.test''
      5eb37339
    • unknown's avatar
      ndb: now no difference in behaviour between row and statement based · 85dd6969
      unknown authored
      
      mysql-test/r/ndb_alter_table3.result:
        Rename: mysql-test/r/ndb_alter_table_row.result -> mysql-test/r/ndb_alter_table3.result
      BitKeeper/deleted/.del-ndb_alter_table_stm.test~477011b3a3164cb3:
        Delete: mysql-test/t/ndb_alter_table_stm.test
      BitKeeper/deleted/.del-ndb_alter_table_stm.result~2aef3740f2ed685a:
        Delete: mysql-test/r/ndb_alter_table_stm.result
      85dd6969