1. 28 Apr, 2007 1 commit
    • unknown's avatar
      Bug#19710 · deca8bd3
      unknown authored
      revert patch because these two test cases still fail on Solaris & Power BE machines
      
      
      BitKeeper/deleted/.del-rpl_ndb_myisam2ndb.result:
        Delete: mysql-test/r/rpl_ndb_myisam2ndb.result
      BitKeeper/deleted/.del-rpl_ndb_innodb2ndb.result:
        Delete: mysql-test/r/rpl_ndb_innodb2ndb.result
      mysql-test/t/disabled.def:
        revert patch
      mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
        revert patch
      mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
        revert patch
      deca8bd3
  2. 27 Apr, 2007 3 commits
  3. 26 Apr, 2007 2 commits
  4. 25 Apr, 2007 3 commits
    • unknown's avatar
      BUG#27207 Return correct error message when ndb_mgmd start with wrong... · ffe14d87
      unknown authored
      BUG#27207 Return correct error message when ndb_mgmd start with wrong config.ini parameter in TCP section
      
      
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        return false when configuration is wrong in TCP section
      ffe14d87
    • unknown's avatar
      BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted · a67b02a0
      unknown authored
      
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.
      storage/ndb/src/ndbapi/ndberror.c:
        change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error
      a67b02a0
    • unknown's avatar
      Bug#25431, Adding index to table with BLOB is not done on-line · ec57e081
      unknown authored
      add a new method is_equal in class Field_blob to compare BLOB field when alter table
      
      
      sql/field.cc:
        add a method compare_str_field_flags in class Field_str
        add a method is_equal in class Field_blob to compare BLOB field when alter table
      sql/field.h:
        add corresponding declaration of new method in class definition
      ec57e081
  5. 24 Apr, 2007 5 commits
  6. 20 Apr, 2007 1 commit
  7. 17 Apr, 2007 1 commit
  8. 16 Apr, 2007 1 commit
    • unknown's avatar
      BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map... · 44271d49
      unknown authored
      BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code 
      
      
      mysql-test/r/ndb_autodiscover.result:
        changes ndbd error code 4009 to mysqld error code 157 when no cluster connection
      sql/ha_ndbcluster.cc:
        define return codes to ndbcluster_table_exists_in_engine to something useful
      sql/handler.cc:
        define return codes to ha_table_exists_in_engine to something useful
      sql/sql_plugin.cc:
        Add a comment
      sql/sql_table.cc:
        clearly define what happens on create table if exists/not exists/not connected to engine
      storage/ndb/src/ndbapi/ndberror.c:
        map 4009 ndb error code to 157 mysqld error code
      44271d49
  9. 06 Apr, 2007 1 commit
    • unknown's avatar
      BUG#19710 Cluster replication to partition table fails on DELETE FROM statement · 68d74c0a
      unknown authored
      update rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb testcase's option and result
      
      
      mysql-test/t/disabled.def:
        recover test case 'rpl_ndb_innodb2ndb' and 'rpl_ndb_myisam2ndb'
      mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
        add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"
      mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
        add "--new=ture" option to mysqld, that means "Use very new possible 'unsafe' functions"
      mysql-test/r/rpl_ndb_innodb2ndb.result:
        get the test result by 'mysql-test-run.pl --record rpl_ndb_innodb2ndb'
      mysql-test/r/rpl_ndb_myisam2ndb.result:
        get the test result by 'mysql-test-run.pl --record rpl_ndb_myisam2ndb'
      68d74c0a
  10. 05 Apr, 2007 9 commits
  11. 04 Apr, 2007 12 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8bbbff63
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      8bbbff63
    • unknown's avatar
      Fix a failure of this test case on HP-UX. · a0c4e184
      unknown authored
      
      mysql-test/r/information_schema.result:
        Fix a race in the test case (second attempt).
      mysql-test/t/information_schema.test:
        Fix a race in the test case (second attempt).
      a0c4e184
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 18bddf14
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      18bddf14
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 7279edc7
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      include/my_base.h:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Merge
      7279edc7
    • unknown's avatar
      Merge from 5.0 · 59a64c2b
      unknown authored
      
      mysql-test/r/ndb_trigger.result:
        Re-generated
      sql/mysql_priv.h:
        Merge
      sql/sql_insert.cc:
        Merge
      sql/sql_load.cc:
        Merge
      sql/sql_update.cc:
        Merge
      59a64c2b
    • unknown's avatar
      set name for ndb tools · ef217b88
      unknown authored
      ef217b88
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 2770bf0b
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      2770bf0b
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 655a58d8
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      sql/ha_ndbcluster.h:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      mysql-test/r/ndb_trigger.result:
        Using local, will re-generate.
      include/my_base.h:
        Merge
      mysql-test/t/ndb_trigger.test:
        Merge
      sql/ha_ndbcluster.cc:
        Merge
      sql/mysql_priv.h:
        Merge
      sql/sql_delete.cc:
        Merge
      sql/sql_insert.cc:
        Merge
      sql/sql_load.cc:
        Merge
      sql/sql_update.cc:
        Merge
      655a58d8
    • unknown's avatar
      Bug #26242 UPDATE with subquery and triggers failing with cluster tables · 2efc0f51
      unknown authored
      In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
      subject table didn't see the results of operation which caused invocation
      of those triggers. In other words AFTER trigger invoked as result of update
      (or deletion) of particular row saw version of this row before update (or
      deletion).
      
      The problem occured because NDB handler in those cases postponed actual
      update/delete operations to be able to perform them later as one batch.
      
      This fix solves the problem by disabling this optimization for particular
      operation if subject table has AFTER trigger for this operation defined.
      To achieve this we introduce two new flags for handler::extra() method:
      HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
      These are called if there exists AFTER DELETE/UPDATE triggers during a
      statement that potentially can generate calls to delete_row()/update_row().
      This includes multi_delete/multi_update statements as well as insert statements
      that do delete/update as part of an ON DUPLICATE statement.
      
      
      include/my_base.h:
        Added HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH to inform handler when batching of delete/update is not possible.
      mysql-test/r/ndb_trigger.result:
        Bug #26242  UPDATE with subquery and triggers failing with cluster tables
        ---
        Added new test cases
      mysql-test/t/ndb_trigger.test:
        Bug #26242  UPDATE with subquery and triggers failing with cluster tables
        ---
        Added new test cases
      sql/ha_ndbcluster.cc:
        Bug #26242  UPDATE with subquery and triggers failing with cluster tables: Use HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH to inform handler when batching of delete/update is not possible
      sql/ha_ndbcluster.h:
        Bug #26242  UPDATE with subquery and triggers failing with cluster tables: Added member variables for handling of HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH to inform handler when batching of delete/update is not possible
      sql/mysql_priv.h:
        Added new method prepare_triggers_for_insert_stmt to check if batching of delete/update must be disallowed.
      sql/sql_delete.cc:
        Use HA_EXTRA_DELETE_CANNOT_BATCH to inform handler when batching of delete is not possible
      sql/sql_insert.cc:
        Added method prepare_triggers_for_insert_stmt to check if batching of delete/update must be dissallowed.
        Use HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH to inform handler
         when batching of delete/update is not possible
      sql/sql_load.cc:
        Call prepare_triggers_for_insert_stmt to check if batching of delete/update must be dissallowed and
        mark fields used by triggers for the insert statement.
      sql/sql_trigger.h:
        Added has_triggers to support what particular triggers exist on a table.
      sql/sql_update.cc:
        Use HA_EXTRA_UPDATE_CANNOT_BATCH to inform handler when batching of update is not possible
      2efc0f51
    • unknown's avatar
      recovery from 5.0 merge for bug18676 · ee58034f
      unknown authored
      
      mysql-test/r/ndb_autodiscover.result:
        recovery for bug#18676 merge in 5.0
      sql/ha_ndbcluster.cc:
        recovery for bug#18676 merge in 5.0
      sql/handler.cc:
        recovery for bug#18676 merge in 5.0
      sql/sql_table.cc:
        recovery for bug#18676 merge in 5.0
      ee58034f
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676 · 5ca5d5de
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
      
      
      mysql-test/r/ndb_autodiscover.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      storage/ndb/src/common/transporter/TCP_Transporter.cpp:
        Auto merged
      storage/ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        merge 5.0-ndb-bj for bug#18676 into 5.1-ndb-bj
      sql/sql_table.cc:
        merge 5.0-ndb-bj for bug#18676 into 5.1-ndb-bj
      5ca5d5de
  12. 03 Apr, 2007 1 commit