1. 24 Apr, 2007 2 commits
  2. 20 Apr, 2007 1 commit
  3. 17 Apr, 2007 1 commit
  4. 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
  5. 05 Apr, 2007 9 commits
  6. 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
  7. 03 Apr, 2007 14 commits
    • unknown's avatar
      Fix a race that breaks the valgrind build. · 65e5af7b
      unknown authored
      
      mysql-test/r/information_schema.result:
        Fix a race (updated result file)
      mysql-test/t/information_schema.test:
        Fix a race in a test.
      65e5af7b
    • unknown's avatar
      Bug#17095 Cluster RBR in circle does not terminate · 502e5c93
      unknown authored
      - set correct server id
      
      
      502e5c93
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · ccdf6415
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      ccdf6415
    • unknown's avatar
      Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data · c2cde303
      unknown authored
        - insert gap event on cluster connect
      
      
      c2cde303
    • unknown's avatar
      Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data · e5a81746
      unknown authored
      - insert gap event on cluster connect
      
      
      e5a81746
    • unknown's avatar
      Bug #17095 Cluster RBR in circle does not terminate · e0f91f22
      unknown authored
      - add any value to ndb
      - use it to update correct server id in binlog thread
      
      
      sql/ha_ndbcluster.cc:
        ndb: use "any value" to set correct server_id
      sql/ha_ndbcluster_binlog.cc:
        ndb: use "any value" to set correct server_id
      storage/ndb/include/kernel/AttributeHeader.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/include/ndbapi/NdbEventOperation.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/include/ndbapi/NdbOperation.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/NdbEventOperation.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
        add any_value as psudo column, updatable from ndbapi
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
        add any_value as psudo column, updatable from ndbapi
      e0f91f22
    • unknown's avatar
      BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009. · 5203ea6c
      unknown authored
      
      mysql-test/r/ndb_autodiscover.result:
        changes ndbd error code to mysqld error code when no cluster connection
      sql/ha_ndbcluster.cc:
        map 4009 error code to mysql not connected error
      sql/handler.cc:
        define return codes to ha_table_exists_in_engine to something useful
          NOTE: in 5.1 this should call a handlerton method, not horrible ifdef ndb stuff
      sql/sql_table.cc:
        clearly define what happens on create table if exits/not exists/not connected to engine
      5203ea6c
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 62569b75
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      62569b75
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 7b1bfbb7
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/events_bugs.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/events.test:
        Auto merged
      sql/event_data_objects.cc:
        Auto merged
      sql/event_data_objects.h:
        Auto merged
      sql/event_db_repository.h:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/events.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_servers.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/r/events.result:
        Manual merge.
      sql/event_db_repository.cc:
        Manual merge.
      sql/sql_parse.cc:
        Manual merge.
      7b1bfbb7
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · b263f63b
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
      
      
      b263f63b
    • unknown's avatar
      Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · bf466eee
      unknown authored
      into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
      
      
      bf466eee
    • unknown's avatar
      Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · c18c32fe
      unknown authored
      into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
      
      
      c18c32fe
    • unknown's avatar
      Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 71803509
      unknown authored
      into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
      
      
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      71803509
    • unknown's avatar
      Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · e6c667b1
      unknown authored
      into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      e6c667b1